be-components 6.9.1 → 6.9.3

package/src/Squares/index.tsx

@@ -33,7 +33,7 @@ type SquaresModuleProps = {
     onEvent:(ev:BEEventProps) => void
 }
 
-const squares_sections = ['header', 'toggle', 'event', 'board', 'board_stats', 'my_stats', 'results', 'my_squares', 'winners','hidden_prizes','details', 'owners']
+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 C = useColors();
@@ -92,6 +92,33 @@ const SquaresModule = ({ sq_comp_id, view_mode, insets, player_id, distinct_id,
     const home_abbr = event?.home?.abbr??squares_competition?.event_backup?.home?.abbr
     const away_abbr = event?.away?.abbr??squares_competition?.event_backup?.away?.abbr
     
+
+    const dedupeWithMaxPrice = (arr: SquareOfferProps[]): SquareOfferProps[] => {
+        const map = arr.reduce((acc, item) => {
+            const existing = acc.get(item.sq_player_square_id);
+            if (!existing || item.amount > existing.amount) {
+                acc.set(item.sq_offer_id, item);
+            }
+            return acc;
+        }, new Map<string, SquareOfferProps>());
+
+        return Array.from(map.values());
+    }
+
+    const filterRelevantOffers = (offers:SquareOfferProps[]) => {
+        let sell_offers = offers.filter(o => o.buy_sell_ind == 'sell')
+        if(!player_id){ return sell_offers }
+        //Now - only do buy offers that I am the offeree for
+        let my_buy_offers = offers.filter(o => o.buy_sell_ind == 'buy' && o.offerer_id == player_id)
+        let offered_to_me_buys = offers.filter(o => o.buy_sell_ind == 'buy' && o.offeree_id == player_id);
+        offered_to_me_buys = dedupeWithMaxPrice(offered_to_me_buys)
+        //We need to only get the max of the buys!
+
+        return sell_offers.concat(my_buy_offers).concat(offered_to_me_buys)
+    }
+
+    let relevant_offers = filterRelevantOffers(square_offers)
+
     let toggle_options = [
         { key: 'info', label: 'Info', icon: <Icons.MenuIcon size={18} color={active_tab=='info'?C.text.white:C.text.action}/> },
         { key: 'board', label: 'Board', icon: <Icons.SquaresIcon size={18} color={active_tab=='board'?C.text.white:C.text.action}/> },
@@ -140,7 +167,7 @@ const SquaresModule = ({ sq_comp_id, view_mode, insets, player_id, distinct_id,
         const d = await SquaresApi.getSquareCompetitionById(sq_comp_id);
         const evs = await SquaresApi.getEventsByEventIds([d.squares_competition.event_id]);
         const league_id = evs[0]?.league_id
-        let unique_player_ids = [ ...new Set(d.player_squares.map(ps => ps.player_id)) ]
+        let unique_player_ids = [ ...new Set(d.square_offers.map(so => so.offerer_id).concat(d.player_squares.map(ps => ps.player_id))) ]
         if(player_id){ 
             unique_player_ids.push(player_id) 
             const pb = await SquaresApi.getMyBalance();
@@ -260,7 +287,7 @@ const SquaresModule = ({ sq_comp_id, view_mode, insets, player_id, distinct_id,
         } else {
             new_purchase_price = square_offer.amount - 1
         }
-        if(new_purchase_price <= player_square.purchase_price){ return } //Do not change if the price is less than the initial cost
+        if(new_purchase_price <= 0){ return } //Do not change if the price is less than the initial cost
         square_offer = { ...square_offer, amount:new_purchase_price }
         setBoardData({ ...board_data, draft_square_offers: draft_square_offers.filter(o => o.sq_player_square_id != square_offer.sq_player_square_id).concat(square_offer) })
     }
@@ -359,6 +386,22 @@ const SquaresModule = ({ sq_comp_id, view_mode, insets, player_id, distinct_id,
                         league={league}
                     />
                 )
+            case 'offers':
+                if(relevant_offers.length == 0 || !squares_competition){ return <></> }
+                return (
+                    <View>
+                        <SquareOffersCard
+                            player_squares={player_squares}
+                            square_offers={relevant_offers}
+                            player_id={player_id}
+                            squares={squares}
+                            players={players}
+                            home_abbr={home_abbr}
+                            away_abbr={away_abbr}
+                            onRequestAuthenticate={() => onRequestAuthenticate(squares_competition.auth_strategy_id)}
+                        />
+                    </View>
+                )
             case 'toggle':
                 return (
                     <View style={{ padding:8, width:view_mode == 'desktop'?800: undefined, alignSelf:view_mode == 'desktop'?'center':undefined }}>
@@ -521,25 +564,16 @@ const SquaresModule = ({ sq_comp_id, view_mode, insets, player_id, distinct_id,
         <View style={{ flex:1 }} onLayout={(ev) => {
             const { width, height } = ev.nativeEvent.layout
             setModuleSize({ width, height })
-        }}>
+        }}> 
+            <View transparent style={{ flex:1 }}>
                 <FlatList
                     key='squares_section'
                     data={squares_sections}
                     renderItem={renderSections}
                     keyExtractor={(item) => item}
-                />            
-            {square_offers.length > 0 ?
-            <SquareOffersCard
-                player_squares={player_squares}
-                square_offers={square_offers}
-                player_id={player_id}
-                squares={squares}
-                home_abbr={home_abbr}
-                away_abbr={away_abbr}
-                onRequestAuthenticate={() => onRequestAuthenticate(squares_competition.auth_strategy_id)}
-            />
-            :<></>}
-            
+                /> 
+            </View>           
+           
             <SocketManager 
                 //access_token={access_token}
                 onConnect={() => {
@@ -568,8 +602,8 @@ const SquaresModule = ({ sq_comp_id, view_mode, insets, player_id, distinct_id,
                 visible={bid_form_expanded}
                 animationType={view_mode=='desktop' ? 'fade' : 'slide'}
             >
-            <View type='blur' style={view_mode=='desktop'?{ flex:1, justifyContent:'center', alignItems:'center' }:{ flex:1, justifyContent:'flex-end', paddingBottom:insets?.bottom }}>
-                <View style={view_mode=='desktop'?{ width:500 }:undefined}>
+            <View type='blur' style={view_mode=='desktop'?{ flex:1, justifyContent:'center', alignItems:'center' }:{ flex:1, justifyContent:'flex-end', paddingBottom:insets?.bottom, padding:10 }}>
+                <View transparent style={view_mode=='desktop'?{ width:500 }:undefined}>
                 <BidForm
                     player_id={player_id}
                     player_balance={player_balance}
@@ -595,29 +629,31 @@ const SquaresModule = ({ sq_comp_id, view_mode, insets, player_id, distinct_id,
             </Modal>
             <Modal
                 transparent
-                visible={draft_square_offers.length > 0 ? true: false}
-                animationType='slide'
+                visible={draft_square_offers?.length > 0?true:false}
+                animationType={view_mode=='desktop' ? 'fade' : 'slide'}
             >
-                <View type='blur' style={{ flex:1, justifyContent:'flex-end', paddingBottom:insets?.bottom }}>
-                    <OfferForm
-                        player_id={player_id}
-                        draft_square_offers={draft_square_offers}
-                        home_abbr={home_abbr}
-                        player_balance={player_balance}
-                        width={module_size.width}
-                        away_abbr={away_abbr}
-                        squares={squares}
-                        submit_ready={submit_ready}
-                        market_type={squares_competition.market_type}
-                        player_squares={player_squares}
-                        onClearOffers={handleClearOffers}
-                        onRequestAuthenticate={() => {
-                            setBoardData({ ...board_data, draft_square_offers:[], submit_ready:{ is_loading: false, is_ready: false } })
-                            setTimeout(() => onRequestAuthenticate(squares_competition.auth_strategy_id), 500);
-                        }}
-                        onOfferAmountChange={(offer, player_square, direction) => handleOfferAmountChange(offer, player_square, direction)}
-                        onSubmitOffer={() => handleSubmitOffer()}
-                    />
+                <View type='blur' style={view_mode=='desktop'?{ flex:1, justifyContent:'center', alignItems:'center' }:{ flex:1, justifyContent:'flex-end', paddingBottom:insets?.bottom, padding:10 }}>
+                    <View transparent style={view_mode=='desktop'?{ width:500 }:undefined}>
+                        <OfferForm
+                            player_id={player_id}
+                            draft_square_offers={draft_square_offers}
+                            home_abbr={home_abbr}
+                            player_balance={player_balance}
+                            width={module_size.width}
+                            away_abbr={away_abbr}
+                            squares={squares}
+                            submit_ready={submit_ready}
+                            market_type={squares_competition.market_type}
+                            player_squares={player_squares}
+                            onClearOffers={handleClearOffers}
+                            onRequestAuthenticate={() => {
+                                setBoardData({ ...board_data, draft_square_offers:[], submit_ready:{ is_loading: false, is_ready: false } })
+                                setTimeout(() => onRequestAuthenticate(squares_competition.auth_strategy_id), 500);
+                            }}
+                            onOfferAmountChange={(offer, player_square, direction) => handleOfferAmountChange(offer, player_square, direction)}
+                            onSubmitOffer={() => handleSubmitOffer()}
+                        />
+                    </View>
                 </View>
             </Modal>
              {square_bids.length > 0 && !bid_form_expanded ?