be-components 1.7.8 → 1.8.0

package/src/CompetitionManager/components/CompetitionSettingsForm.tsx

@@ -1,6 +1,6 @@
 import { FlatList, TextInput, TouchableOpacity, View, Image } from "react-native"
 import React, { useEffect, useState } from "react";
-import type { CompetitionProps, CompetitionResultTypeProps, PublicPlayerProps } from "../../types";
+import type { CompetitionProps, CompetitionResultTypeProps, MyPlayerProps, PublicPlayerProps } from "../../types";
 import { ManageCompetitionApi } from "../api";
 import Colors from "../../constants/colors";
 import { Button, Icons, Text } from "../../Components";
@@ -9,7 +9,7 @@ import DropDown from "../../Components/Dropdown";
 import moment from "moment-mini";
 
 type CompetitionSettingsFormProps = {
-    player?: PublicPlayerProps,
+    player?: MyPlayerProps,
     competition: CompetitionProps,
     width:number,
     is_valid?:boolean,
@@ -24,7 +24,7 @@ const CompetitionSettingsForm = ({ is_valid, player, width, competition, competi
     const [ expanded, setExpanded ] = useState(false);
     const [ draft_competition, setDraftCompetition ] = useState<CompetitionProps | undefined>(undefined);
     //const [ player_selector_visible, setPlayerSelectorVisible ] = useState(false);
-    const [ pacer, setPacer ] = useState<PublicPlayerProps>();
+    const [ pacer, setPacer ] = useState<PublicPlayerProps | MyPlayerProps>();
 
     const competition_result_type = competition_result_types.find(crt => crt.competition_result_type_id == competition?.competition_result_type_id);
 

package/src/CompetitionManager/index.tsx

@@ -467,6 +467,7 @@ const CompetitionManager = ({ player_id, competition_id, onClose }:CompetitionMa
                         is_valid={competition_valid.settings}
                         competition={competition}
                         width={module_size.width - 20}
+                        player={player}
                         onShowPacers={() => setShowPacers(true)}
                         competition_result_types={competition_result_types}
                         onCompetitionUpdate={async(comp) => {
@@ -478,6 +479,7 @@ const CompetitionManager = ({ player_id, competition_id, onClose }:CompetitionMa
                         action_loading={action_loading}
                         is_valid={competition_valid.contests}
                         width={module_size.width - 20}
+                        player={player}
                         competition={competition}
                         competition_matches={competition_matches}
                         competition_match_markets={competition_match_markets}
@@ -494,6 +496,10 @@ const CompetitionManager = ({ player_id, competition_id, onClose }:CompetitionMa
                         onDeleteMarket={(contest_id, contest_type, market) => handleRemoveMarket(contest_id, contest_type, market)}
                         onShowAthletes={(contest_id, contest_type, market_id) => setShowAthletes({ contest_id, contest_type, market_id, filtered_positions:[] })}
                         onShowMarkets={(contest_id, contest_type) => setShowMarkets({ contest_id, contest_type })}
+                        onUpdateCompetition={async(comp) => {
+                            const new_c = await ManageCompetitionApi.updateCompetition(comp);
+                            setCompetitionData({ ...competition_data, competition: new_c });
+                        }}
                         onShowContests={() => setShowContests({ visible:true })}
                         onSaveCompetitionMatch={() => console.log('SAVE EVENT')}
                         onDeleteCompetitionMatch={(competition_match_id) => handleRemoveCompetitionMatch(competition_match_id)}

package/src/MarketComponents/components/TeamEventMarket/api/index.ts

@@ -18,18 +18,15 @@ const TeamEventMarketHelpers = {
         return event.time_detail
     },
     sortNonPrimaryMarkets: (markets:MarketProps[], event_order_stats:EventOrderStatProps[], latest_trades:TradeProps[]) => {
-        let available = false
+        let available = latest_trades.find(t => markets.map(m => m.market_id.toString()).includes(t.market_id)) ? true : false
         let sorted_stats = event_order_stats.filter(s => s.market_type == 'FOR_MONEY' && markets.map(m => m.market_id.toString()).includes(s.market_id.toString()));
+        
         //Now need to combine event level markets
         let event_level_markets:EventOrderStatProps[] = []
         let non_event_level_markets:EventOrderStatProps[] = []
         sorted_stats.map(ss => {
             let market = markets.find(m => m.market_id == ss.market_id);
             if(!market){ return }
-            if(!available){
-                let trade = latest_trades.find(t => t.market_id == ss.market_id)
-                if(trade){ available = true }
-            }
             if(market.level == 'event'){ return event_level_markets.push(ss) }
             return non_event_level_markets.push(ss)
         })

package/src/MarketComponents/components/TeamEventMarket/index.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import { View, Image, FlatList, TouchableOpacity, ActivityIndicator } from 'react-native';
+import { View, Image, FlatList, TouchableOpacity, ActivityIndicator, ScrollView } from 'react-native';
 import type { AthleteProps, BestAvailableOrderProps, CompetitionProps, EventOrderStatProps, EventProps, MarketProps, MarketSideOptionProps, OrderProps, SquaresCompetitionProps, TradeProps } from '../../../types';
 import { view_styles } from '../../../constants/styles';
 import { Button, Icons, LinearDiagnal, Text } from '../../../Components';
@@ -16,7 +16,7 @@ type TeamEventMarketProps = {
     event:EventProps,
     markets:MarketProps[],
     init_expanded?:boolean,
-    competition?:CompetitionProps,
+    competitions?:CompetitionProps[],
     show_id?:string,
     squares_competition?:SquaresCompetitionProps,
     latest_trades:TradeProps[],
@@ -34,7 +34,7 @@ type TeamEventMarketProps = {
     onActivate?:(event_id:string, event_type:string) => void
     activate_loading?:boolean
 }
-const TeamEventMarket = ({ event, init_expanded, show_id, activate_loading, competition, squares_competition, show_grades, markets, latest_trades, best_available_orders, event_order_stats, default_price_view, onSquaresSelect, onCompetitionSelect, onExpand, onOrder, onView, onViewAdditionalMarkets, onTradeLongPress, onActivate }:TeamEventMarketProps) => {
+const TeamEventMarket = ({ event, init_expanded, show_id, activate_loading, competitions, squares_competition, show_grades, markets, latest_trades, best_available_orders, event_order_stats, default_price_view, onSquaresSelect, onCompetitionSelect, onExpand, onOrder, onView, onViewAdditionalMarkets, onTradeLongPress, onActivate }:TeamEventMarketProps) => {
     const [ expanded_data, setExpandedData ] = useState<{
         expanded:boolean,
         loaded:boolean,
@@ -46,9 +46,10 @@ const TeamEventMarket = ({ event, init_expanded, show_id, activate_loading, comp
         expanded:false,
         athletes:[]
     })
+    const [ competitions_expanded, setCompetitionsExpanded ] = useState(false);
     const { expanded, athletes, loaded, loading } = expanded_data;
     const event_status = TeamEventMarketHelpers.getEventStatus(event);
-
+    console.log(competitions)
     useEffect(() => {
         MarketComponentApi.setEnvironment();
         if(init_expanded){ expandedEvent(); }
@@ -76,6 +77,30 @@ const TeamEventMarket = ({ event, init_expanded, show_id, activate_loading, comp
     
     const primary_markets = TeamEventMarketHelpers.getPrimaryMarkets(event, markets);
     
+    const handleSelectCompetition = () => {
+        if(!competitions || competitions.length == 0){ return }
+        if(competitions.length == 1 && competitions[0]){ return onCompetitionSelect(competitions[0].competition_id) }
+        return setCompetitionsExpanded(true);
+    }
+
+    const renderCompetitions = (data:{ item:CompetitionProps, index: number }) => {
+        return (
+            <TouchableOpacity style={{ ...view_styles.body_row, padding:10, borderBottomWidth:1, borderColor:Colors.shades.shade600 }} onPress={() => {
+                setCompetitionsExpanded(false);
+                onCompetitionSelect(data.item.competition_id)
+            }}>
+                <Image
+                    source={{ uri: data.item.image?.url }}
+                    style={{ height:25, width:25 }}
+                    resizeMode='cover'
+                />
+                <View style={{ flex:1, marginLeft:10 }}>
+                    <Text theme='header_2'>{data.item.competition_name}</Text>
+                </View>
+                <Icons.ChevronIcon direction='right' size={10} color={Colors.brand.midnight} />
+            </TouchableOpacity>
+        )
+    }
 
     const renderSides = (data:{ item:MarketSideOptionProps, index:number, market:MarketProps, is_locked:boolean }) => {
         const ba_order = best_available_orders.find(o => o.market_id == data.market.market_id && o.side == data.item.side)
@@ -185,9 +210,7 @@ const TeamEventMarket = ({ event, init_expanded, show_id, activate_loading, comp
     if(!event.away || !event.home){ return <></> }
 
     const { liquidity, open_order_count } = MarketComponentHelpers.getLiqudity(event_order_stats);
-
     const { non_primary_markets, available } = TeamEventMarketHelpers.sortNonPrimaryMarkets(TeamEventMarketHelpers.getNonPrimaryMarkets(event, markets), event_order_stats, latest_trades)
-
     return (
         <View style={{ ...view_styles.section, borderWidth:1, borderColor:Colors.shades.shade600 }}>
             <View nativeID='event_header_data' style={{ flexDirection:'row', padding:10, borderBottomWidth:1, borderBottomColor:Colors.shades.shade600 }}>
@@ -301,18 +324,18 @@ const TeamEventMarket = ({ event, init_expanded, show_id, activate_loading, comp
                 </TouchableOpacity>
                 {squares_competition ?
                 <TouchableOpacity 
-                    style={{ marginRight:10, flexDirection:'row', alignItems:'center', padding:10, borderRadius:22, backgroundColor:Colors.highlights.highlight100, ...view_styles.float }}
+                    style={{ marginRight:5, flexDirection:'row', alignItems:'center', padding:10, borderRadius:22, backgroundColor:Colors.highlights.highlight100, ...view_styles.float }}
                     onPress={() => onSquaresSelect(squares_competition.sq_comp_id)}>
                     <Icons.SquaresIcon size={18} color={Colors.shades.white} />
                     <Text style={{ marginLeft:5 }} size={14} color={Colors.shades.white} weight='semibold'>Squares</Text>
                 </TouchableOpacity>
                 :<></>}
-                {competition ?
+                {competitions ?
                 <TouchableOpacity 
-                    style={{ marginRight:10, flexDirection:'row', alignItems:'center', padding:10, borderRadius:22, backgroundColor:Colors.highlights.highlight500, ...view_styles.float }}
-                    onPress={() => onCompetitionSelect(competition.competition_id)}>
-                    <Icons.PickEmIcon size={18} color={Colors.shades.white} />
-                    <Text style={{ marginLeft:5 }} size={14} color={Colors.shades.white} weight='semibold'>Pick 6</Text>
+                    style={{ marginRight:5, flexDirection:'row', alignItems:'center', padding:10, borderRadius:22, backgroundColor:Colors.highlights.highlight500, ...view_styles.float }}
+                    onPress={() => handleSelectCompetition()}>
+                    <Icons.PickEmIcon size={14} color={Colors.shades.white} />
+                    <Text style={{ marginLeft:5 }} size={14} color={Colors.shades.white} weight='semibold'>MultiPick</Text>
                 </TouchableOpacity>
                 :<></>}
                 {non_primary_markets.length > 0 ?
@@ -327,6 +350,30 @@ const TeamEventMarket = ({ event, init_expanded, show_id, activate_loading, comp
                     onPress={() => onViewAdditionalMarkets(event.event_id, 'team')}
                 />
                 :<></>}
+                {competitions && competitions_expanded ?
+                <View style={{ position:'absolute', bottom:0, right:0, ...view_styles.section, minWidth:300, maxHeight:220 }}>
+                    <TouchableOpacity style={{ ...view_styles.section_header, padding:15, paddingRight:10, backgroundColor:Colors.highlights.highlight500 }} onPress={() => setCompetitionsExpanded(false)}>
+                        <Icons.PickEmIcon size={16} color={Colors.shades.white} />
+                        <Text style={{ flex:1, marginLeft:10 }} size={16} weight='bold' color={Colors.shades.white}>Select Competition</Text>
+                        <Button
+                            title='X'
+                            backgroundColor='transparent'
+                            title_color={Colors.utility.error}
+                            disabled
+                            title_size={16}
+                            padding={0}
+                            onPress={() => console.log('')}
+                        />
+                    </TouchableOpacity>
+                    <ScrollView style={{flex:1}}>
+                        <FlatList
+                            data={competitions}
+                            renderItem={renderCompetitions}
+                            keyExtractor={(item) => item.competition_id.toString()}
+                        />
+                    </ScrollView>
+                </View>
+                :<></>}
             </View>
             :<></>}
             {expanded ?

package/src/types.d.ts

@@ -1041,6 +1041,7 @@ export interface CompetitionProps {
     template?:boolean,
     buy_in:number | string,
     linked_event_id?:string,
+    linked_event_ids?:string[],
     linked_event_type?:string,
     league_name?:string,
     template_competition_id?:string,