be-components 6.9.3 → 6.9.5

package/src/SocialComponents/PostCard/index.tsx

@@ -24,6 +24,7 @@ type PostCardProps = {
     orders:OrderProps[],
     player_id?:string,
     width:number,
+    refresh_key?:string,
     onSelectImage:(image:{ url:string, width?:number, height?:number}) => void,
     onSelectTag:(tag:TextTagProps) => void,
     onSelectArticle:(article:ArticleProps) => void,
@@ -36,7 +37,7 @@ type PostCardProps = {
 
 const sections = ['header', 'title', 'body', 'orders','images','articles', 'urls', 'footer']
 
-const PostCard = ({ player_id, width, articles, post, player, orders, onRequestAuthenticate, onSelectArticle, onCopyOrder, onFadeOrder, onViewComments, onSelectImage, onSelectPlayer, onSelectTag }:PostCardProps) => {
+const PostCard = ({ player_id, width, articles, post, player, orders, refresh_key, onRequestAuthenticate, onSelectArticle, onCopyOrder, onFadeOrder, onViewComments, onSelectImage, onSelectPlayer, onSelectTag }:PostCardProps) => {
     const Colors = useColors();
     const [ post_data, setPostData ] = useState<{
         loading:boolean,
@@ -64,14 +65,23 @@ const PostCard = ({ player_id, width, articles, post, player, orders, onRequestA
     const is_in_viewport = useIsInViewport(post_ref);
 
     useEffect(() => {
-        if(!is_in_viewport || reactions_loaded){ return }
+        if(!is_in_viewport){ return }
+        if(reactions_loaded){ return }
         SocialProfileApi.setEnvironment();
         getPostReactionData();
         if(player_id){ getMyData(player_id) }
     },[is_in_viewport]);
 
-    const getMyData = async(player_id:string) => {
-        setMyData({ ...my_data, my_data_loading: true });
+    useEffect(() => {
+        if(!refresh_key){ return }
+        if(!reactions_loaded){ return }
+        if(!is_in_viewport){ return }
+        getPostReactionData(true);
+        if(player_id){ getMyData(player_id, true) }
+    },[refresh_key]);
+
+    const getMyData = async(player_id:string, quiet?:boolean) => {
+        if(!quiet){ setMyData({ ...my_data, my_data_loading: true }) }
         const mr = await SocialProfileApi.getReactionsByPostAndPlayer(player_id, post.memo_post_id, 'memo');
         setMyData({
             ...my_data,
@@ -80,8 +90,8 @@ const PostCard = ({ player_id, width, articles, post, player, orders, onRequestA
         })
     }
 
-    const getPostReactionData = async() => {
-        setPostData({ ...post_data, loading: true });
+    const getPostReactionData = async(quiet?:boolean) => {
+        if(!quiet){ setPostData({ ...post_data, loading: true }) }
         const pr_stats = await SocialProfileApi.getReactionStatsByPostId(post.memo_post_id, 'memo');
         const pc_stat = await SocialProfileApi.getCommentStatsByPostId(post.memo_post_id, 'memo');
         setPostData({
@@ -215,7 +225,7 @@ const PostCard = ({ player_id, width, articles, post, player, orders, onRequestA
             case 'footer':
                 return (
                     <View type='footer' style={{ flexDirection:'row', alignItems:'center', padding:5, borderBottomRightRadius:8, borderBottomLeftRadius:8 }}>
-                        <View float transparent style={{ padding:5 }}>
+                        <View transparent style={{ flex:1, padding:5 }}>
                             <PostReactionBar
                                 loading={my_data_loading}
                                 post_id={post.memo_post_id}
@@ -226,7 +236,8 @@ const PostCard = ({ player_id, width, articles, post, player, orders, onRequestA
                         </View>
                         {onViewComments ?
                         <Button
-                            style={{ flex:1, flexDirection:'row', alignItems:'center', justifyContent:'flex-end' }}
+                          transparent
+                            style={{ flexDirection:'row', alignItems:'center', justifyContent:'flex-end' }}
                             onPress={() => onViewComments(post.memo_post_id)}
                         >
                             <Text style={{ marginRight:4 }} theme='h2'>{post_comment_stat.comment_count}</Text>

package/src/SocialComponents/Poster/index.tsx

@@ -48,7 +48,7 @@ const Poster = ({ width, post_id, insets, onCreatePost, onSelectImage, onClose }
         let ords:OrderProps[] = []
         let playrs:PublicPlayerProps[] = []
         if(post_id){
-            existing_post = await SocialComponentApi.getPostById(post_id);
+            existing_post = await SocialComponentApi.getPostById(post_id, 'memo');
             if(existing_post){
                 const set_up_data = await SocialComponentHelpers.getPostsData([existing_post]);
                 ords = set_up_data.orders

package/src/SocialComponents/api/index.ts

@@ -1,6 +1,6 @@
 import axios from "axios";
 import { APIOverrides } from "../../ApiOverrides";
-import type { AthleteProps, EventProps, LeagueProps, MatchProps, OrderProps, PlayerFollowerProps, PlayerPodcastEpisodeProps, PlayerPodcastProps, PodcastEpisodesProps, PodcastProps, PostReactionProps, PublicPlayerProps, TextTagProps, TeamProps, TournamentProps, GroupProps, GroupMessageProps, GroupPlayerProps, MyPlayerProps, URLMetadataProps, PostProps, ArticleProps } from "../../types";
+import type { AthleteProps, EventProps, LeagueProps, MatchProps, OrderProps, PlayerFollowerProps, PlayerPodcastEpisodeProps, PlayerPodcastProps, PodcastEpisodesProps, PodcastProps, PostReactionProps, PublicPlayerProps, TextTagProps, TeamProps, TournamentProps, GroupProps, GroupMessageProps, GroupPlayerProps, MyPlayerProps, URLMetadataProps, PostProps, ArticleProps, PostCommentProps } from "../../types";
 import Colors from "../../constants/colors";
 import moment from "moment-mini";
 
@@ -27,6 +27,27 @@ const SocialComponentApi = {
             return []
         }
     },
+    getPostComments: async(post_id:string, offset:number):Promise<PostCommentProps[]> => {
+        try {
+            console.log(post_id)
+            const resp = await axios.get(`${SOCIAL_SVC_API}/v1/posts/comments/post/${post_id}?post_type=memo&offset=${offset}`);
+            console.log(resp.data)
+            return resp.data.post_comments
+        } catch (e) {
+            console.log(e)
+            return []
+        }
+    },
+    createComment: async(post_comment:PostCommentProps):Promise<undefined | PostCommentProps> => {
+        try {
+            const resp = await axios.post(`${SOCIAL_SVC_API}/v1/posts/comment/create`, { post_comment });
+            console.log(resp.data)
+            return resp.data.post_comment
+        } catch (e) {
+            console.log(e);
+            return undefined
+        }
+    },
     getPlayersByIds: async(player_ids:string[]):Promise<PublicPlayerProps[]> => {
         try {
             if(player_ids.length == 0){ return [] }
@@ -52,9 +73,9 @@ const SocialComponentApi = {
         const resp = await axios.post(`${SOCIAL_SVC_API}/v1/followers/player/create`, { player_follower })
         return resp.data.player_follower
     },
-    getPostById: async(memo_post_id:string):Promise<PostProps | undefined> => {
+    getPostById: async(memo_post_id:string, post_type:string):Promise<PostProps | undefined> => {
         try {
-            const resp = await axios.get(`${SOCIAL_SVC_API}/v1/posts/post/${memo_post_id}`);
+            const resp = await axios.get(`${SOCIAL_SVC_API}/v1/posts/post/${memo_post_id}?post_type=${post_type}`);
             return resp.data.post
         } catch (e) {
             console.log(e)
@@ -575,6 +596,36 @@ const SocialComponentHelpers = {
             }
         }
     },
+    getEmptyComment:():PostCommentProps => {
+        return {
+            activity_post_id: '',
+            player_id:'',
+            comment_images: [],
+            comment_orders:[],
+            comment_urls:[],
+            comment_videos:[],
+            formatted_text:'',
+            post_comment_id:'',
+            message: '',
+            formatted_body: {
+                blocks: [],
+                entityMap: {
+                    value: {
+                        type:'',
+                        mutability: '',
+                        data: {}
+                    }
+                }
+            },
+            status:'visible',
+            post_type: 'memo',
+            edited: false,
+            my_reactions:[],
+            reaction_details: [],
+            create_datetime:'', last_update_datetime:''
+
+        }
+    },
     extractTagsFromText: (text:string, cursor?:number):TextTagProps[] => {
         let tags:TextTagProps[] = []
         let split_text = text.split(' ');

package/src/SocialComponents/index.tsx

@@ -11,12 +11,13 @@ import { FormattedText } from "./FormattedTextInput/FormattedText";
 import InputBar from "./InputBar";
 import GroupChat from "./GroupChat";
 import Poster from "./Poster";
-
+import ActivityDetail from "./ActivityDetail";
 export {
     PlayerCard,
     PlayerList,
     FormattedTextInput,
     InputBar,
+    ActivityDetail,
     Poster,
     FormattedText,
     PlayerProfile,

package/src/Squares/api/index.ts

@@ -30,6 +30,17 @@ const SquaresApi = {
         const resp = await axios.get(`${EVENT_SVC_API}/v1/leagues/league/${league_id}`)
         return resp.data.league
     },
+    getSquaresCompetitionsByCompany:async(company_id:string, status: 'active'|'closed', offset:number):Promise<SquaresCompetitionProps[]> => {
+      try {
+        console.log(company_id, status, offset)
+        const resp = await axios.get(`${TP_SVC_API}/v1/squares/competitions/company/${company_id}?status=${status}&offset=${offset}`);
+        console.log(resp.data)
+        return resp.data.squares_competitions
+      } catch (e) {
+        console.log(e);
+        return []
+      }
+    },
     buySquares: async(sq_comp_id:string, player_squares:PlayerSquareProps[], promo_balance?:boolean):Promise<BuySquaresResponseProps> => {
         const resp = await axios.post(`${TP_SVC_API}/tp/squares/square/buy`, { sq_comp_id, player_squares, promo_balance })
         if(resp.data.saved_player_squares.length != player_squares.length){ alert('Some of your bids could not be processed as they were outbid before purchasing') }

package/src/Squares/index.tsx

@@ -23,6 +23,7 @@ import { useColors } from "../constants/useColors";
 type SquaresModuleProps = {
     player_id?:string,
     distinct_id:string,
+    info_header?:boolean,
     view_mode:'desktop'|'mobile',
     sq_comp_id:string,
     onManageSquares?:(sc:SquaresCompetitionProps) => void,
@@ -35,7 +36,7 @@ type SquaresModuleProps = {
 
 const squares_sections = ['header', 'offers', 'toggle', 'event', 'board', 'board_stats', 'my_stats', 'results', 'my_squares', 'winners','hidden_prizes','details', 'owners']
 
-const SquaresModule = ({ sq_comp_id, view_mode, insets, player_id, distinct_id, onManageSquares, onRequestAuthenticate, onShareCompetition, onPlayerSelect }:SquaresModuleProps) => {
+const SquaresModule = ({ sq_comp_id, info_header, view_mode, insets, player_id, distinct_id, onManageSquares, onRequestAuthenticate, onShareCompetition, onPlayerSelect }:SquaresModuleProps) => {
     const C = useColors();
     const [ active_tab, setActiveTab ] = useState('board');
     const [ needs_reload, setNeedsReload ] = useState(false);
@@ -353,6 +354,7 @@ const SquaresModule = ({ sq_comp_id, view_mode, insets, player_id, distinct_id,
         switch(data.item){
             case 'header':
                 if(!squares_competition){ return <></> }
+                if(info_header && active_tab != 'info'){ return <></> }
                 return (
                     <View type='header' nativeID="squares_header" style={{ flexDirection:'row', alignItems:'center', padding:20 }}>
                         <View transparent>
@@ -404,7 +406,7 @@ const SquaresModule = ({ sq_comp_id, view_mode, insets, player_id, distinct_id,
                 )
             case 'toggle':
                 return (
-                    <View style={{ padding:8, width:view_mode == 'desktop'?800: undefined, alignSelf:view_mode == 'desktop'?'center':undefined }}>
+                    <View style={{ padding:8 }}>
                         <Toggle
                             options={toggle_options}
                             active_toggle_color={C.text.action}
@@ -487,13 +489,16 @@ const SquaresModule = ({ sq_comp_id, view_mode, insets, player_id, distinct_id,
             case 'details':
                 if(!squares_competition){ return <></> }
                 return (
-                    <SquaresDetails
-                        squares_competition={squares_competition}
-                        hidden={active_tab == 'info' ? false : true}
-                        disable_collapse
-                        squares_payout_type={squares_payout_type}
-                        squares_type={squares_type}
-                    />
+                    <View transparent>
+                        <SquaresDetails
+                            squares_competition={squares_competition}
+                            hidden={active_tab == 'info' ? false : true}
+                            disable_collapse
+                            squares_payout_type={squares_payout_type}
+                            squares_type={squares_type}
+                        />
+                    </View>
+                    
                     
                 )
             case 'owners':

package/src/Wallet/components/DepositCard.tsx

@@ -25,6 +25,7 @@ type DepositCardProps = {
 const sections = [ 'header', 'input', 'limits' ]
 const DepositCard = ({ wallet_settings, code_details, account, deposit_limit, onFocusPosition, onTransact, onCancel }:DepositCardProps) => {
     const Colors = useColors();
+    const [ loaded, setLoaded ] = useState(false);
     const [ draft_order, setDraftOrder ] = useState<ItemOrderProps>();
     const [ instant_disclaimer, setInstantDisclaimer ] = useState(false);
     const [ account_snooze, setAccountSnooze ] = useState<AccountSnoozeProps>();
@@ -38,6 +39,7 @@ const DepositCard = ({ wallet_settings, code_details, account, deposit_limit, on
         const as = await WalletApi.getSnoozeByAccountId(account.account_id);
         setAccountSnooze(as)
         setDraftOrder(ItemOrderHelpers.genDepositOrder(item, account))
+        setLoaded(true)
     }
 
     const handleTransact = () => {
@@ -207,8 +209,8 @@ const DepositCard = ({ wallet_settings, code_details, account, deposit_limit, on
                         </View>
                     </Button>
                 </View>
-                :<></>}                
-                {errors.length > 0 ?
+                :<></>}
+                {errors.length > 0 && loaded ?
                 <View float nativeID='errors' style={{ borderBottomRightRadius:0, borderBottomLeftRadius:0 }}>
                     <View transparent style={{ flexDirection:'row', alignItems:'center', padding:15, borderTopRightRadius:8, borderTopLeftRadius:8, backgroundColor:Colors.text.error, borderBottomWidth:1, borderBottomColor:Colors.borders.light  }}>
                         <Icons.AlertIcon color={Colors.text.white} size={24}/>

package/src/Wallet/index.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import { ActivityIndicator, FlatList } from 'react-native';
+import { ActivityIndicator, FlatList, type ViewStyle } from 'react-native';
 import { ItemOrderApi, WalletApi, WalletHelpers } from './api';
 import WalletSetup from './components/WalletSetup';
 import type { AccountProps, BEEventProps, CodeRequestProps, FocusPositionProps, ItemOrderProps, ItemProps, MyPlayerProps, PlayerAddressProps, PlayerBalanceProps, PlayerDepositLimitProps, PlayerReferralProps, PlayerWithdrawLimitProps, PromoProps, PublicPlayerProps, RewardOptionProps, WalletSettingsProps } from '../types';
@@ -27,6 +27,8 @@ import { useColors } from '../constants/useColors';
 
 type MyWalletProps = {
     account_id?:string,
+    header_style?:ViewStyle,
+    footer_style?:ViewStyle,
     new_balance?:PlayerBalanceProps,
     height?:number,
     view_mode?:'desktop'|'mobile',
@@ -37,7 +39,7 @@ type MyWalletProps = {
     onTransact: (item_order:ItemOrderProps, account_id?:string) => void
 }
 
-const MyWallet = ({ height, new_balance, account_id, view_mode, insets, onFocusPosition, onTransact, onClose, onEvent }:MyWalletProps) => {
+const MyWallet = ({ height, new_balance, account_id, view_mode, insets, header_style, footer_style, onFocusPosition, onTransact, onClose, onEvent }:MyWalletProps) => {
     const Colors = useColors();
     const [ wallet_size, setWalletSize ] = useState({ height:0, width:0 });
     const [ view, setView ] = useState<{
@@ -190,7 +192,7 @@ const MyWallet = ({ height, new_balance, account_id, view_mode, insets, onFocusP
 
     if(!loaded || !player || !wallet_settings || !player_balance || !deposit_limit || !withdraw_limit){
         return (
-            <View style={{ flex:1, height, padding:20 }}>
+            <View style={{ flex:1, height, padding:20, ...header_style, ...footer_style }}>
                 <Text size={16} theme='h1' textAlign='center'>LOADING YOUR WALLET</Text>
                 <ActivityIndicator size='large' color={Colors.text.h1} style={{ alignSelf:'center', marginTop:30 }} />
             </View>
@@ -376,7 +378,7 @@ const MyWallet = ({ height, new_balance, account_id, view_mode, insets, onFocusP
         )
     }
     return (
-        <View style={{ flex:1, height }}>
+        <View style={{ flex:1, height, ...header_style, ...footer_style }}>
             {!WalletHelpers.isWalletAuthenticated(wallet_settings) ?
             <WalletSetup
                 player={player}

package/src/types.d.ts

@@ -2935,10 +2935,12 @@ export interface PostCommentProps {
     activity_post_id:string, 
     player_id:string, 
     message:string, 
-    status:'active'|'hidden', 
+    tags?:TextTagProps[],
+    status:'visible'|'hidden', 
+    formatted_text:string,
     edited:boolean, 
     post_type: 'memo' | 'activity', 
-    related_comment_id:string, 
+    related_comment_id?:string, 
     create_datetime:any, 
     last_update_datetime:any, 
     playerDetails?:PublicPlayerProps,