be-components 1.7.2 → 1.7.4

package/src/CompetitionManager/components/CompetitionInfoForm.tsx

@@ -6,7 +6,7 @@ import type { CompetitionProps, MyPlayerProps } from '../../types';
 import { Button, Icons, Switch, Text, TextInput } from '../../Components';
 import Colors from '../../constants/colors';
 import ImageUploader from '../../Components/ImageUploader';
-//import DropDown from '../../Components/Dropdown';
+import DropDown from '../../Components/Dropdown';
 
 type CompetitionInfoFormProps = {
     competition:CompetitionProps,
@@ -98,7 +98,36 @@ const CompetitionInfoForm = ({ is_valid, player, competition, width, onCompetiti
                         placeholderTextColor={Colors.brand.slate}
                     />
                 </View>
-
+                {player?.role == 'admin' ?
+                <View nativeID="competition_description" style={{ ...view_styles.body_row, flexWrap:'wrap', maxWidth:width, marginTop:10, borderBottomWidth:1, borderColor:Colors.shades.shade600 }}>
+                    <View style={{ flex:1, margin:5, minWidth:200  }}>
+                        <Text theme='header_2'>Linked Event</Text>
+                        <Text style={{ marginTop:3 }} theme='body'>Is this competitions a same game pick-em or wager?  If so, add the event here.</Text>
+                    </View>
+                    <TextInput
+                        style={{ ...view_styles.input, flexGrow:1, margin:5 }}
+                        onChangeText={(text) => setDraftCompetition({ ...draft_competition, linked_event_id:text })}
+                        value={draft_competition.linked_event_id}
+                        placeholder="Enter the event id"
+                        placeholderTextColor={Colors.brand.slate}
+                    />
+                </View>
+                :<></>}
+                {draft_competition.linked_event_id ?
+                <View nativeID="competition_description" style={{ ...view_styles.body_row, flexWrap:'wrap', maxWidth:width, marginTop:10, borderBottomWidth:1, borderColor:Colors.shades.shade600 }}>
+                    <View style={{ flex:1, margin:5, minWidth:200  }}>
+                        <Text theme='header_2'>Linked Event</Text>
+                        <Text style={{ marginTop:3 }} theme='body'>Is this competitions a same game pick-em or wager?  If so, add the event here.</Text>
+                    </View>
+                    <DropDown
+                        dropdown_options={[
+                            { value: 'linked_event_type', eligible_options: ['team','tournament','match'] }
+                        ]}
+                        selected_value={draft_competition.linked_event_type ?? ''}
+                        onOptionSelect={(value) => onCompetitionUpdate({ ...draft_competition, linked_event_type:value })}
+                    />
+                </View>
+                :<></>}
                 <View nativeID="invite_only" style={{ ...view_styles.body_row, flexWrap:'wrap', marginTop:10, borderBottomWidth:1, borderColor:Colors.shades.shade600  }}>
                     <View style={{ flex:1, margin:5, marginRight:15 }}>
                         <Text theme='header_2'>Make Private</Text>
@@ -118,7 +147,6 @@ const CompetitionInfoForm = ({ is_valid, player, competition, width, onCompetiti
                         <Text style={{ marginTop:3 }} theme='body'>This will allow for other users to copy this competition and create it for themselves.</Text>
                     </View>
                     <Switch
-                    
                         value={competition.template ? true : false}
                         switch_type="on_off"
                         onChange={(value) => onCompetitionUpdate({ ...draft_competition, template: value })}

package/src/CompetitionManager/components/CompetitionSettingsForm.tsx

@@ -178,6 +178,22 @@ const CompetitionSettingsForm = ({ is_valid, player, width, competition, competi
                         placeholderTextColor={Colors.brand.slate}
                     />
                 </View>
+                {player?.role == 'admin' ?
+                <View nativeID="buy_in" style={{ ...view_styles.body_row, flexWrap:'wrap', maxWidth:width}}>
+                    <View style={{ flex:1, margin:5, minWidth:200 }}>
+                        <Text theme="header_2">Guaranteed Payout</Text>
+                        <Text style={{ marginTop:3 }} theme="body">ADMIN ONLY - How much is guaranteed to be paid out?</Text>
+                    </View>
+                    <TextInput
+                        style={{ ...view_styles.input, textAlign:'center', margin:5, width:100, backgroundColor:Colors.shades.white }}
+                        onChangeText={(text) => setDraftCompetition({ ...draft_competition, guaranteed_payout: text })}
+                        placeholder="0"
+                        editable={competition.competition_season_id ? false : true}
+                        value={draft_competition.guaranteed_payout as string}
+                        placeholderTextColor={Colors.brand.slate}
+                    />
+                </View>
+                :<></>}
                     
                     <View nativeID="Max Tickets" style={{ flexDirection:'row', flexWrap:'wrap', padding:10, borderBottomWidth:1, borderBottomColor:Colors.shades.white }}>
                         <View style={{ flex:1, marginRight:5 }}>

package/src/Engage/components/CompetitionCard.tsx

@@ -19,7 +19,7 @@ const CompetitionCard = ({ competition, competition_type, company, admin, onComp
     const cl = competition.market_type == 'FOR_MONEY' ? '$' : 'E'
     let current_payout = competition.ticket_revenue
     if(competition.promo_payout){ current_payout += competition.promo_payout }
-    if(competition.guaranteed_payout && competition.guaranteed_payout > current_payout){ current_payout = competition.guaranteed_payout }
+    if(competition.guaranteed_payout && parseFloat(competition.guaranteed_payout as string) > current_payout){ current_payout = parseFloat(competition.guaranteed_payout as string) }
 
     const tickets_available = parseFloat(competition.available_tickets as string) - competition.tickets_sold
     const is_live = moment().isAfter(moment(competition.scheduled_datetime)) ? true : false

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

@@ -17,9 +17,44 @@ const TeamEventMarketHelpers = {
         if(['scheduled','created'].includes(event.status)){ return moment(event.scheduled_datetime).format('MM/DD @ hh:mm a') }
         return event.time_detail
     },
-    sortNonPrimaryMarkets: (markets:MarketProps[], event_order_stats:EventOrderStatProps[]) => {
+    sortNonPrimaryMarkets: (markets:MarketProps[], event_order_stats:EventOrderStatProps[], latest_trades:TradeProps[]) => {
+        let available = 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()));
-        return sorted_stats.sort((a,b) => parseInt(b.open_order_count as string) - parseInt(a.open_order_count as string))
+        //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)
+        })
+        let unique_ev_markets = [ ...new Set(event_level_markets.map(m => m.market_id)) ]
+        let combined_ev_marktes:EventOrderStatProps[] = []
+        unique_ev_markets.map(ss => {
+            let find_one = event_level_markets.find(m => m.market_id == ss)
+            if(!find_one){ return }
+            let markets_need_combined = event_level_markets.filter(m => m.market_id == ss)
+            let ss_market:EventOrderStatProps = {
+                market_id: ss,
+                open_order_count: markets_need_combined.reduce((a,b) => a + parseInt(b.open_order_count as string), 0),
+                open_order_amount: markets_need_combined.reduce((a,b) => a + b.open_order_amount, 0),
+                event_id: find_one.event_id,
+                event_type: find_one.event_type,
+                side_id: find_one.side_id,
+                side_type: find_one.side_type,
+                market_type: find_one.market_type
+            }
+            combined_ev_marktes.push(ss_market)
+        })
+        sorted_stats = non_event_level_markets.concat(combined_ev_marktes)
+
+
+        return { non_primary_markets: sorted_stats.sort((a,b) => parseInt(b.open_order_count as string) - parseInt(a.open_order_count as string)), available }
     },
     sortAthleteMarkets: (market:MarketProps, event_order_stats:EventOrderStatProps[], latest_trades:TradeProps[], athletes:AthleteProps[]):AthleteProps[] => {
         if(!market){ return [] }

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

@@ -17,6 +17,7 @@ type TeamEventMarketProps = {
     markets:MarketProps[],
     init_expanded?:boolean,
     competition?:CompetitionProps,
+    show_id?:string,
     squares_competition?:SquaresCompetitionProps,
     latest_trades:TradeProps[],
     best_available_orders:BestAvailableOrderProps[],
@@ -33,7 +34,7 @@ type TeamEventMarketProps = {
     onActivate?:(event_id:string, event_type:string) => void
     activate_loading?:boolean
 }
-const TeamEventMarket = ({ event, init_expanded, 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, 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 [ expanded_data, setExpandedData ] = useState<{
         expanded:boolean,
         loaded:boolean,
@@ -54,8 +55,11 @@ const TeamEventMarket = ({ event, init_expanded, activate_loading, competition,
     },[])
 
     const expandedEvent = async() => {
+        if(!event){ return }
         if(onExpand){ onExpand(expanded ? false : true) }
         if(expanded){ return setExpandedData({ ...expanded_data, expanded: false }) }
+        //Check if we have any non-primary markets sorted
+
         if(loaded){ return setExpandedData({ ...expanded_data, expanded: true }) }
         setExpandedData({ ...expanded_data, expanded:true, loading:true });
 
@@ -182,7 +186,7 @@ const TeamEventMarket = ({ event, init_expanded, activate_loading, competition,
 
     const { liquidity, open_order_count } = MarketComponentHelpers.getLiqudity(event_order_stats);
 
-    const non_primary_markets = TeamEventMarketHelpers.sortNonPrimaryMarkets(TeamEventMarketHelpers.getNonPrimaryMarkets(event, markets), 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 }}>
@@ -198,7 +202,10 @@ const TeamEventMarket = ({ event, init_expanded, activate_loading, competition,
                     onPress={() => onActivate(event.event_id, 'team')}
                 />
                 :<></>}
-                <View style={{ flex:1 }}>
+                <View style={{ flex:1, flexDirection:'row', alignItems:'center' }}>
+                    {!show_id ?
+                    <Text size={12} color={Colors.brand.midnight} weight='semibold' selectable>{event.event_id} </Text>
+                    :<></>}
                     {event.event_sub_title ?
                     <Text size={12} color={Colors.brand.midnight} weight='semibold'>{event.event_sub_title}</Text>
                     :<></>}
@@ -308,9 +315,18 @@ const TeamEventMarket = ({ event, init_expanded, activate_loading, competition,
                     <Text style={{ marginLeft:5 }} size={14} color={Colors.shades.white} weight='semibold'>Pick 6</Text>
                 </TouchableOpacity>
                 :<></>}
+                {non_primary_markets.length > 0 ?
                 <TouchableOpacity style={{ height:35, width:35, justifyContent:'center', borderRadius:100, alignItems:'center', backgroundColor:Colors.shades.white, ...view_styles.float }} onPress={() => expandedEvent()}>
                    <Icons.ChevronIcon direction={expanded ? 'up' : 'down'} size={8} color={Colors.brand.midnight} />
                 </TouchableOpacity>
+                :available ?
+                <Button
+                    title='MORE'
+                    title_color={Colors.shades.white}
+                    backgroundColor={Colors.brand.electric}
+                    onPress={() => onViewAdditionalMarkets(event.event_id, 'team')}
+                />
+                :<></>}
             </View>
             :<></>}
             {expanded ?

package/src/types.d.ts

@@ -1040,12 +1040,14 @@ export interface CompetitionProps {
     competition_description:string,
     template?:boolean,
     buy_in:number | string,
+    linked_event_id?:string,
+    linked_event_type?:string,
     league_name?:string,
     template_competition_id?:string,
     admin_id:string,
     company_id?:string,
     admin?:PublicPlayerProps,
-    guaranteed_payout?:number,
+    guaranteed_payout?:number | string,
     winner_id?:string,
     image?:{url:string},
     winner?:PublicPlayerProps,