be-components 6.9.0 → 6.9.2

package/src/CompetitionManager/components/ContestSelector.tsx

@@ -1,20 +1,22 @@
 import React, { useEffect, useState } from 'react';
-import { FlatList, ScrollView, Image, ActivityIndicator } from "react-native"
+import { FlatList, Image, ActivityIndicator } from "react-native"
 import { Switch } from '../../Components';
 import DropDown from '../../Components/Dropdown';
-import type { EventProps, LeagueProps } from '../../types';
-import { ManageCompetitionMatchApi } from '../api';
+import type { EventProps, LeagueProps, MarketProps, TradeProps } from '../../types';
+import { ManageCompetitionApi, ManageCompetitionMarketApi, ManageCompetitionMatchApi } from '../api';
 import moment from 'moment-mini';
 import SearchBox from '../../Components/SearchBox';
 import { useColors } from '../../constants/useColors';
 import { Button, Text, View } from '../../Components/Themed';
+import { MarketComponentHelpers } from '../../MarketComponents/api';
 
 type ContestSelectorProps = {
     action_loading:boolean,
     leagues:LeagueProps[],
+    active_markets?:string[],
     selected_team_events:EventProps[],
-    onSelectTeamEvent:(event:EventProps) => void,
-    onSelectTeamEvents: (events:EventProps[]) => void,
+    onSelectTeamEvent:(event:EventProps, trades:TradeProps[]) => void,
+    onSelectTeamEvents: (events:EventProps[], trades:TradeProps[]) => void,
     onDeselectTeamEvent: (event:EventProps) => void,
     onClose:() => void
 }
@@ -30,17 +32,21 @@ const ContestSelector = ({ action_loading, leagues, selected_team_events, onClos
     const [ selector_data, setData ] = useState<{
         loading:boolean,
         events:EventProps[],
+        markets:MarketProps[],
+        trades:TradeProps[],
         range_dates:string[],
         active_league?:LeagueProps,
         active_date: string
     }>({
         loading:false,
+        markets:[],
         events: [],
+        trades:[],
         range_dates: [],
         active_date: moment().format('YYYY/MM/DD')
     })
 
-    const { loading, events, range_dates, active_league, active_date } = selector_data;
+    const { loading, events, range_dates, trades, markets, active_league, active_date } = selector_data;
 
     let filtered_events = events.filter(e => `${e.event_id} ${e.away?.market_name} ${e.away?.name} ${e.home?.market_name} ${e.home?.name}`.toLowerCase().includes(search_value.toLowerCase()))
     .filter(e => moment(e.scheduled_datetime).format('YYYY/MM/DD') == active_date)
@@ -69,6 +75,7 @@ const ContestSelector = ({ action_loading, leagues, selected_team_events, onClos
 
     const show_add_all = filtered_events.filter(e => !selected_team_events.map(e => e.event_id.toString()).includes(e.event_id)).length > 0 ? true : false
 
+    const spread_market = markets.find(mk => mk.type == 'Spread');
 
     useEffect(() => {
         if(leagues.length == 0){ return }
@@ -89,7 +96,13 @@ const ContestSelector = ({ action_loading, leagues, selected_team_events, onClos
         if(!best_day){
             best_day = unique_dates[0] ?? moment().format('YYYY/MM/DD')
         }
-        setData({ ...selector_data, loading:false, events: resp.events, range_dates: unique_dates, active_date: best_day })
+        
+        //Lets grab all the last trades for events that we have
+        let ev_markets = await ManageCompetitionApi.getMarkets();
+        let event_trades = await ManageCompetitionMarketApi.getLatestTradesByEventIds(resp.events.map(e => e.event_id), 'team');
+
+
+        setData({ ...selector_data, loading:false, events: resp.events, range_dates: unique_dates, active_date: best_day, trades: event_trades.filter(t => t.market_type == 'FOR_MONEY'), markets:ev_markets })
     }
 
     const renderDivisions = (data: { item:string, index:number }) => {
@@ -123,6 +136,9 @@ const ContestSelector = ({ action_loading, leagues, selected_team_events, onClos
     const renderEvents = (data: { item:EventProps, index:number }) => {
         const selected = selected_team_events.map(e => e.event_id.toString()).includes(data.item.event_id.toString()) ? true : false
         const is_live = moment(data.item.scheduled_datetime).isBefore(moment()) ? true : false
+        const event_trades = trades.filter(t => t.event_type == 'team' && t.event_id == data.item.event_id && t.market_type == 'FOR_MONEY')
+        const spread_trades = event_trades.filter(t => t.market_id == spread_market?.market_id);
+        const home_trade = spread_trades.find(t => t.side_id == data.item.home_team_id)
         return (
             <View type='row' style={{  padding:10, borderBottomWidth:1, borderColor:Colors.borders.light }}>
                 <View style={{ flexDirection:'row', alignItems:'center', paddingRight:10, borderRightWidth:1, borderColor:Colors.borders.light }}>
@@ -139,7 +155,7 @@ const ContestSelector = ({ action_loading, leagues, selected_team_events, onClos
                     />
                 </View>
                 <View style={{ flex:1, marginLeft: 10 }}>
-                    <Text theme='h2'>{data.item.event_title}</Text>
+                    <Text theme='h2'>{data.item.event_title}{home_trade && spread_market?` ${MarketComponentHelpers.getVar1Label(spread_market, home_trade.var_1)}`:''}</Text>
                     <Text style={{ marginTop:3 }} theme='description'>{data.item.time_detail == 'scheduled' ? moment(data.item.scheduled_datetime).format('MMM DD hh:mm a'): data.item.time_detail}</Text>
                 </View>
                 {!is_live ?
@@ -149,7 +165,7 @@ const ContestSelector = ({ action_loading, leagues, selected_team_events, onClos
                     onChange={() => {
                         if(action_loading){ return }
                         if(selected){ return onDeselectTeamEvent(data.item) } 
-                        return onSelectTeamEvent(data.item)
+                        return onSelectTeamEvent(data.item, event_trades)
                     }}
                 />
                 :<></>}
@@ -159,7 +175,7 @@ const ContestSelector = ({ action_loading, leagues, selected_team_events, onClos
 
     return (
         <View float style={{ flex:1 }}>
-            <View type='header' style={{ flexDirection:'row', alignItems:'center', padding:10, borderTopRightRadius:8, borderTopLeftRadius:8 }}>
+            <View type='header' style={{ flexDirection:'row', zIndex:10, alignItems:'center', padding:10, borderTopRightRadius:8, borderTopLeftRadius:8 }}>
                 {active_league ?
                 <Image
                     source={{ uri: active_league.league_image }}
@@ -171,7 +187,7 @@ const ContestSelector = ({ action_loading, leagues, selected_team_events, onClos
                     <Text theme='h1'>MANAGE CONTESTS</Text>
                     <Text style={{ marginTop:3 }} theme='description'>Add / Remove contests from the competition</Text>
                 </View>
-                <View style={{ position: 'absolute', zIndex:1, top:10, right:10, justifyContent:'center', alignItems:'center' }}>
+                <View style={{ position: 'absolute', top:10, right:10, justifyContent:'center', alignItems:'center' }}>
                     <DropDown
                         dropdown_options={[
                             {value:'league_id', eligible_options: leagues.sort((a,b) => a.priority - b.priority).map(l => l.league_name)}
@@ -184,7 +200,7 @@ const ContestSelector = ({ action_loading, leagues, selected_team_events, onClos
                     />
                 </View>
             </View> 
-            <ScrollView style={{ flex:1 }}>
+            <View style={{ flex:1 }}>
                 <View style={{ padding:10 }}>
                     <FlatList
                         data={range_dates}
@@ -224,7 +240,7 @@ const ContestSelector = ({ action_loading, leagues, selected_team_events, onClos
                     />
                 </View>
                 :<></>}
-                <View style={{ padding:10 }}>
+                <View style={{ flex:1, padding:10 }}>
                     {loading ?
                     <ActivityIndicator style={{ padding:20, alignSelf:'center' }} size='large' color={Colors.text.h1} />
                     :<></>}
@@ -234,7 +250,7 @@ const ContestSelector = ({ action_loading, leagues, selected_team_events, onClos
                         keyExtractor={(item) => item.event_id.toString()}
                     />
                 </View>
-            </ScrollView>
+            </View>
             <View type='footer' style={{ flexDirection:'row', padding:10 }}>
                 {filtered_events.length > 0 ?
                 <Button
@@ -246,7 +262,7 @@ const ContestSelector = ({ action_loading, leagues, selected_team_events, onClos
                     onPress={() => {
                         ///First remove any event that is already selected
                         let add_events = filtered_events.filter(e => !selected_team_events.map(e => e.event_id.toString()).includes(e.event_id))
-                        onSelectTeamEvents(add_events);
+                        onSelectTeamEvents(add_events, trades);
                     }}
                 />
                 :<></>}

package/src/CompetitionManager/components/ContestSettingsForm.tsx

@@ -121,10 +121,21 @@ const ContestSettingsForm = ({ init_expanded, onFocusPosition, competition, comp
                         style={{ flex:1, minWidth:100, textAlign:'center', margin:5 }}
                         onChangeText={(text) => setDraftCompetition({ ...draft_competition, max_pick_count: text })}
                         placeholder="0"
+                        onFocus={() => {
+                            if(draft_competition.max_pick_count == 0){ setDraftCompetition({ ...draft_competition, max_pick_count: '' }) }
+                        }}
                         onFocusPosition={onFocusPosition}
                         keyboardType="decimal-pad"
                         value={draft_competition.max_pick_count.toString()}
                     />
+                    {is_changed ?
+                    <Button
+                        title='SAVE'
+                        type='success'
+                        style={{ margin:5, padding:15, flexGrow:1 }}
+                        onPress={() => onCompetitionUpdate(draft_competition)}
+                    />
+                    :<></>}
                 </View>
                 :<></>}
                 {competition_type?.type == 'wager' ?
@@ -142,6 +153,14 @@ const ContestSettingsForm = ({ init_expanded, onFocusPosition, competition, comp
                         keyboardType="decimal-pad"
                         value={draft_competition.initial_balance.toString()}
                     />
+                    {is_changed ?
+                    <Button
+                        title='SAVE'
+                        type='success'
+                        style={{ margin:5, padding:15, flexGrow:1 }}
+                        onPress={() => onCompetitionUpdate(draft_competition)}
+                    />
+                    :<></>}
                 </View>
                 :<></>}
                 <View style={{ padding:20 }}>

package/src/CompetitionManager/components/MarketSelector.tsx

@@ -55,13 +55,11 @@ const MarketSelector = ({ markets, selected_markets, onSelectMarket, onDeselectM
                 />
             </View>
             <View style={{ flex:1 }}>
-                <View type='body'>
-                    <FlatList
-                        data={filtered_markets}
-                        renderItem={renderMarkets}
-                        keyExtractor={(item) => item.market_id.toString()}
-                    />
-                </View>
+                <FlatList
+                    data={filtered_markets}
+                    renderItem={renderMarkets}
+                    keyExtractor={(item) => item.market_id.toString()}
+                />
             </View>
             <View type='footer' style={{ flexDirection:'row', alignItems:'center', padding:10, borderBottomRightRadius:8, borderBottomLeftRadius:8 }}>
                 <Button

package/src/CompetitionManager/index.tsx

@@ -249,7 +249,7 @@ const CompetitionManager = ({ float, header_style, footer_style, player_id, onFo
         const addEvents = new_events.map(async e => {
             const cm = await ManageCompetitionMatchApi.createCompetitionMatch(competition_id, e.event_id, 'team', 'event', undefined, undefined, undefined);
             added_matches.push(cm)
-        })
+        });
         await Promise.all(addEvents);
         const e_trades = await ManageCompetitionMarketApi.getLatestTradesByEventIds(new_events.map(e => e.event_id), 'team');
         setCompetitionData({
@@ -257,7 +257,7 @@ const CompetitionManager = ({ float, header_style, footer_style, player_id, onFo
             competition: { ...competition, scheduled_datetime: undefined },
             competition_matches: competition_matches.concat(added_matches),
             events: events.filter(e => !new_events.find(ne => ne.event_id == e.event_id)).concat(new_events),
-            trades: trades.filter(t => !events.map(e => e.event_id.toString()).includes(t.event_id)).concat(e_trades)
+            trades: trades.filter(t => !new_events.map(e => e.event_id.toString()).includes(t.event_id.toString())).concat(e_trades)
         })
         setActionLoading(false)
     }
@@ -280,18 +280,26 @@ const CompetitionManager = ({ float, header_style, footer_style, player_id, onFo
     const handleRemoveCompetitionMatch = async(competition_match_id:string) => {
         if(action_loading){ return }
         setActionLoading(true);
-        await ManageCompetitionMatchApi.deleteCompetitionMatch(competition_match_id);
+        let result = await ManageCompetitionMatchApi.deleteCompetitionMatch(competition_match_id);
+        if(!result){
+            setActionLoading(false);
+            return alert('Unable to remove this market.  It could either be the event has already started or a player has already made a pick on it.')
+        }
         setCompetitionData({
             ...competition_data,
             competition_matches: competition_matches.filter(cm => cm.competition_match_id != competition_match_id)
-        })
+        });
         setActionLoading(false)
     }
 
     const handleRemoveCompetitionMatchMarkets = async(cmms:CompetitionMatchMarketProps[]) => {
         if(action_loading){ return }
         setActionLoading(true);
-        await ManageCompetitionMatchApi.deleteCompetitionMatchMarkets(cmms.map(cmm => cmm.competition_match_market_id));
+        let result = await ManageCompetitionMatchApi.deleteCompetitionMatchMarkets(cmms.map(cmm => cmm.competition_match_market_id));
+        if(!result){
+            setActionLoading(false);
+            return alert('Unable to remove this market.  It could either be the event has already started or a player has already made a pick on it.')
+        }
         setCompetitionData({
             ...competition_data,
             competition_match_markets: competition_match_markets.filter(cmm => !cmms.map(rmm => rmm.competition_match_market_id.toString()).includes(cmm.competition_match_market_id))
@@ -365,6 +373,7 @@ const CompetitionManager = ({ float, header_style, footer_style, player_id, onFo
         let markets_removed:string[] = []
         const rem_non_primary = non_primary_matches.map(async cm => {
             const del_response = await ManageCompetitionMatchApi.deleteCompetitionMatch(cm.competition_match_id);
+            if(!del_response){ return } //We had an issue tring to remove this
             matches_removed = matches_removed.concat(del_response.competition_match.competition_match_id)
             markets_removed = markets_removed.concat(del_response.competition_match_markets.map(cmm => cmm.competition_match_market_id))
         })
@@ -427,7 +436,6 @@ const CompetitionManager = ({ float, header_style, footer_style, player_id, onFo
         if(market.level == 'event'){
             //If the level is event - we need to create some events
             let market_trades = trades.filter(t => t.market_type == 'FOR_MONEY' && t.event_id == contest_id && t.event_type == contest_type && t.market_id == market.market_id)
-            console.log(`market trades are ${market_trades.length}`)
             let event_cmms:CompetitionMatchMarketProps[] = []
             market_trades.map(t => {
                 event_cmms.push({ ...ManageCompetitionHelpers.createCompetitionMatchMarketFromTrade(t), competition_match_id: new_cm.competition_match_id })
@@ -691,7 +699,7 @@ const CompetitionManager = ({ float, header_style, footer_style, player_id, onFo
          </View>
             :<></>}
             {show_markets.contest_id && show_markets.contest_type && showing_market_event ?
-            <View type='blur' style={{ position:'absolute', top:0, left:0, right:0, bottom:0, paddingBottom:insets?.bottom, paddingTop:insets?.top }}>
+            <View type='blur' style={{  position:'absolute', top:0, left:0, right:0, bottom:0, paddingBottom:insets?.bottom, paddingTop:insets?.top }}>
                 <MarketSelector
                     markets={markets.filter(m => m.event_type == show_markets.contest_type && showing_market_event.supported_markets?.map(m => m.market_id.toString()).includes(m.market_id.toString()))}
                     onClose={() => setShowMarkets({})}

package/src/Components/Dropdown.tsx

@@ -37,7 +37,7 @@ const DropDown = ({ invalid, errors, read_only, selected_value, dropdown_options
     const renderOptions = (data: { item: string, index:number }) => {
         const last_item = data.index == options.length - 1 ? true : false
         return (
-            <Button transparent style={{ paddingTop:10, paddingBottom:last_item?0:10, borderBottomWidth:last_item?0:1, borderColor:Colors.borders.light }} onPress={() => handleOptionSelect(data.item)}>
+            <Button transparent style={{ borderRadius:0, paddingTop:10, paddingBottom:last_item?0:10, borderBottomWidth:last_item?0:1, borderColor:Colors.borders.light }} onPress={() => handleOptionSelect(data.item)}>
                 <Text size={14} theme='description'>{data.item}</Text>
             </Button>
         )

package/src/CreateEngagement/index.tsx

@@ -31,7 +31,7 @@ const steps:CreateEngagementStepProps[] = [
     { step_key: 'intro', num: 1, title: 'BettorEdge Engagements', description: 'Create an engagement and share with friends to play along' },
     { step_key: 'options', num:2, title: 'Engagement Types', description: 'Select an engagement type below to get started!' },
     { step_key: 'group', num:3, title: 'Add Group', description: 'Select one of your groups to add this engagement to!' },
-    { step_key: 'company', num:4, title: 'Add Company', description: 'Select one of your companie to add this engagement to!' },
+    { step_key: 'company', num:4, title: 'Add Company', description: 'Select one of your companies to add this engagement to!' },
     { step_key: 'image', num:5, title:'Add an Image!', description: 'Add an image to your engagement to make it stand out!' },
     { step_key: 'create', num:6, title: 'Create Engagement', description: 'Complete the step below to create this BettorEdge Engagement!' },
     { step_key: 'success', num:7, title: 'Engagement Successfully Created!', description: 'Your engagement is in pending status. You can activate it when ready from your dashboard or the engagement screen!' }