be-components 7.0.6 → 7.0.8

package/src/FlashMarket/index.tsx

@@ -19,6 +19,7 @@ type FlashMarketProps = {
     hide_image?:boolean,
     location?:LocationProps,
     card_style?:any,
+    onManageFlash?:(poll:PollProps) => void,
     init_expanded?:boolean,
     hide_timer?:boolean,
     onReload:() => void,
@@ -31,7 +32,7 @@ type FlashMarketProps = {
     onFocusPosition?: (position:{ x:number, y:number, width:number, height:number }) => void,
     onRequestAuthenticate: () => void
 }
-const FlashMarket = ({ loading, poll, hide_footer, hide_timer, poll_options, poll_summaries, poll_campaign, flash_market_fees, hide_image, init_expanded, card_style, header_style, footer_style, onReload, location, player, player_id, onRequestAuthenticate, onFocusPosition, onRequestLocation }:FlashMarketProps) => {
+const FlashMarket = ({ loading, poll, hide_footer, hide_timer, poll_options, poll_summaries, poll_campaign, flash_market_fees, hide_image, init_expanded, card_style, header_style, footer_style, onReload, location, player, player_id, onManageFlash, onRequestAuthenticate, onFocusPosition, onRequestLocation }:FlashMarketProps) => {
     const Colors = useColors();
     const [ admin_action, setAdminActions ] = useState<{
         selected_option_id?:string,
@@ -66,7 +67,7 @@ const FlashMarket = ({ loading, poll, hide_footer, hide_timer, poll_options, pol
     
     const is_inactive = poll && ['pending','paused'].includes(poll?.status) ? true : false
     const is_upcoming = poll && poll.start_datetime && moment().isBefore(moment(poll.start_datetime)) ? true : false
-
+    const is_admin = player?.role == 'admin' ? true : poll?.admins && poll.admins.includes(player?.player_id ?? '0') ? true : false
     useEffect(() => {
         if(!poll){ return }
         FlashMarketApi.setEnvironment();
@@ -83,7 +84,7 @@ const FlashMarket = ({ loading, poll, hide_footer, hide_timer, poll_options, pol
     const isResolveable = () => {
         if(!poll){ return false }
         if(!player){ return false }
-        if(player.role != 'admin'){ return false }
+        if(!is_admin){ return false }
         if(!['paused','active'].includes(poll.status)){ return false }
         if(!poll.winning_option_id){ return false }
         if(poll.winning_option_id != selected_option_id){ return false }
@@ -206,7 +207,7 @@ const FlashMarket = ({ loading, poll, hide_footer, hide_timer, poll_options, pol
         const admin_checked = selected_option_id == data.item.poll_option_id ? true : false
         return (
             <View transparent style={{ borderRadius:8, flexDirection:'row', alignItems:'center', borderWidth:my_option?1:0, borderColor:Colors.text.action, padding:10 }}>
-                {!selected && poll?.status != 'closed' && player?.role == 'admin' ?
+                {!selected && poll?.status != 'closed' && is_admin ?
                 <Checkbox
                     style={{ marginRight:5 }}
                     checked={admin_checked}
@@ -343,7 +344,7 @@ const FlashMarket = ({ loading, poll, hide_footer, hide_timer, poll_options, pol
                             renderItem={renderOptions}
                             keyExtractor={(item) => item.poll_option_id.toString()}
                         />
-                        {is_inactive && player?.role != 'admin' ?
+                        {is_inactive && is_admin ?
                         <View type='blur' style={{ position:'absolute', top:0, left:0, right:0, bottom:0, justifyContent:'center', alignItems:'center' }}>
                             <View float style={{ flexDirection:'row', alignItems:'center', padding:20 }}>
                                 <Icons.PausedIcon size={35} color={Colors.text.h1} />
@@ -375,9 +376,14 @@ const FlashMarket = ({ loading, poll, hide_footer, hide_timer, poll_options, pol
                 </View>
                 }
             </View>
-            {player?.role == 'admin' ?
+            {is_admin ?
             <View type='footer' style={{ flexDirection:'row', padding:5 }}>
-                {poll.flash_active ?
+                {onManageFlash ?
+                <Button float style={{ margin:5, padding:16 }} onPress={() => onManageFlash(poll)}>
+                    <Icons.SettingsIcon size={16} color={Colors.text.h1} />
+                </Button>
+                :<></>}
+                {player?.role =='admin' && poll.flash_active ?
                 <Button
                     title={`Unflash`}
                     style={{ flex:0.5, margin:4 }}
@@ -392,7 +398,7 @@ const FlashMarket = ({ loading, poll, hide_footer, hide_timer, poll_options, pol
                         setAdminActions({ ...admin_action, admin_loading: false });
                     }}
                 />
-                :['active','paused'].includes(poll.status) ?
+                :['active','paused'].includes(poll.status) && player?.role == 'admin' ?
                 <Button
                     title={`Flash`}
                     style={{ flex:0.5, margin:4 }}

package/src/Group/api/index.ts

@@ -1,6 +1,6 @@
 import axios from "axios";
 import { APIOverrides } from "../../ApiOverrides"
-import type { BracketCompetitionProps, CompetitionPayoutTypeProps, CompetitionPlayerProps, CompetitionProps, CompetitionRecordProps, CompetitionResultProps, CompetitionResultTypeProps, CompetitionSeasonProps, CompetitionTypeProps, CreateGroupStepProps, EventProps, GroupMessageProps, GroupPlayerProps, GroupProps, NewOverallAnalytics, OrderAnalyticsProps, OrderProps, PollCampaignProps, PostProps, PublicPlayerProps, SquaresCompetitionProps } from "../../types";
+import type { BracketCompetitionProps, CompetitionPayoutTypeProps, CompetitionPlayerProps, CompetitionProps, CompetitionRecordProps, CompetitionResultProps, CompetitionResultTypeProps, CompetitionSeasonProps, CompetitionTypeProps, CreateGroupStepProps, EventProps, GroupMessageProps, GroupPlayerProps, GroupProps, NewOverallAnalytics, OrderAnalyticsProps, OrderProps, PollCampaignProps, PollProps, PostProps, PublicPlayerProps, SquaresCompetitionProps } from "../../types";
 import type { Moment } from "moment-mini";
 import moment from "moment-mini";
 
@@ -161,12 +161,12 @@ const GroupApi = {
             return { competition_players:[], competition_records:[], competition_results:[], competitions:[] }
         }
     },
-    getActivePolls: async(group_id:string):Promise<PollCampaignProps[]> => {
+    getActivePolls: async(group_id:string):Promise<{poll_campaigns:PollCampaignProps[], polls:PollProps[]}> => {
         try {
             const resp = await axios.get(`${AUTH_SVC_API}/v1/polls/group/active/${group_id}`);
-            return resp.data.poll_campaigns
+            return resp.data
         } catch (e) {
-            return []
+            return { poll_campaigns: [], polls:[] }
         }
     },
     getHistoryPolls: async(group_id:string, offset:number):Promise<PollCampaignProps[]> => {
@@ -250,7 +250,7 @@ const GroupHelpers = {
         competitions.map(c => data.push({ id:c.competition_id, type: 'competition', scheduled_datetime: moment(c.scheduled_datetime) }));
         bracket_competitions.map(bc => data.push({ id: bc.bracket_competition_id, type: 'bracket', scheduled_datetime: moment(bc.scheduled_datetime) }));
         squares_competitions.map(sc => data.push({ id: sc.sq_comp_id, type: 'squares', scheduled_datetime: moment(sc.begin_datetime) }));
-        poll_campaigns.map(pc => data.push({ id: pc.poll_campaign_id, type: 'poll_campaign', scheduled_datetime: moment(pc.create_datetime) }));
+        poll_campaigns.filter(pc => pc.market_type == 'FREE').map(pc => data.push({ id: pc.poll_campaign_id, type: 'poll_campaign', scheduled_datetime: moment(pc.create_datetime) }));
         return data.sort((a,b) => a.scheduled_datetime.unix() - b.scheduled_datetime.unix())
     },
     generateGroup: ():GroupProps => {

package/src/Group/index.tsx

@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import { Button, Text, TextInput, View } from "../Components/Themed"
 import { GroupApi, GroupHelpers } from './api';
-import type { ArticleProps, CompetitionPayoutTypeProps, CompetitionPlayerProps, CompetitionProps, CompetitionRecordProps, CompetitionResultProps, CompetitionResultTypeProps, CompetitionTypeProps, EventProps, FocusPositionProps, GroupMessageProps, GroupPlayerProps, GroupProps, MyPlayerProps, NewOverallAnalytics, OrderAnalyticsProps, OrderProps, PollCampaignProps, PostProps, PublicPlayerProps, SquaresCompetitionProps, TextTagProps } from '../types';
+import type { ArticleProps, CompetitionPayoutTypeProps, CompetitionPlayerProps, CompetitionProps, CompetitionRecordProps, CompetitionResultProps, CompetitionResultTypeProps, CompetitionTypeProps, EventProps, FocusPositionProps, GroupMessageProps, GroupPlayerProps, GroupProps, MyPlayerProps, NewOverallAnalytics, OrderAnalyticsProps, OrderProps, PollCampaignProps, PollProps, PostProps, PublicPlayerProps, SquaresCompetitionProps, TextTagProps } from '../types';
 import { ActivityIndicator, FlatList, Image } from 'react-native';
 import { Icons, Toggle } from '../Components';
 import { useColors } from '../constants/useColors';
@@ -22,6 +22,7 @@ type GroupComponentProps = {
     mode:'desktop'|'mobile',
     init_invite_code?:string,
     refresh_key:string,
+    onSelectFlashMarket:(poll:PollProps) => void,
     onViewComments?:(post_id:string, post_type:string) => void,
     onFocusPosition:(pos:FocusPositionProps) => void,
     onSelectChat?:(group:GroupProps) => void
@@ -64,16 +65,16 @@ type TimeOptionProps = {
     option:string,
     label:string
 }
-const sections = ['header','chat','toggle','me', 'competition_toggle', 'new_competition', 'members', 'competitions', 'activity']
+const sections = ['header','chat','flash','toggle','me', 'competition_toggle', 'new_competition', 'members', 'competitions', 'activity']
 const member_stat_options:{ stat_key:string, label:string, multiplier:number, prefix?:string, suffix?:string }[] = [
     { stat_key: 'roi_pct', label: 'ROI Percent', multiplier:100, suffix: '%' },
-    { stat_key: 'winnings', label: 'Winnings', multiplier:1 , prefix: '$'},
+    //{ stat_key: 'winnings', label: 'Winnings', multiplier:1 , prefix: '$'},
     { stat_key: 'win_pct', label: 'Win Percent', multiplier: 100, suffix: '%' },
-    { stat_key: 'fulfilled_positions', label: 'Matched Bets', multiplier:1, suffix: ' Bets' },
-    { stat_key: 'original_stake', label: 'Betting Volume', multiplier: 1, prefix: '$' }
+    //{ stat_key: 'fulfilled_positions', label: 'Matched Bets', multiplier:1, suffix: ' Bets' },
+    //{ stat_key: 'original_stake', label: 'Betting Volume', multiplier: 1, prefix: '$' }
 ]
 
-const GroupComponent = ({ refresh_key, group_id, player, mode, init_invite_code, onViewComments, onCopyOrder, onFadeOrder, onSelectArticle, onSelectImage, onSelectTag, onCreateEngagement, onRequestAuthenticate, onFocusPosition, onShareGroup, onInvitePlayer, onSelectCompetition, onSelectChat, onSelectPlayer, onNudgePlayer, onSelectPollCampaign, onSelectSquaresCompetition } : GroupComponentProps) => {
+const GroupComponent = ({ refresh_key, group_id, player, mode, init_invite_code, onViewComments, onCopyOrder,onSelectFlashMarket, onFadeOrder, onSelectArticle, onSelectImage, onSelectTag, onCreateEngagement, onRequestAuthenticate, onFocusPosition, onShareGroup, onInvitePlayer, onSelectCompetition, onSelectChat, onSelectPlayer, onNudgePlayer, onSelectPollCampaign, onSelectSquaresCompetition } : GroupComponentProps) => {
     const Colors = useColors();
     const leader_options:TimeOptionProps[] = [
         { to: moment().subtract(1, 'days').unix(), from: moment().unix(), option: '24_hours', label: '24 Hours'  },
@@ -93,6 +94,16 @@ const GroupComponent = ({ refresh_key, group_id, player, mode, init_invite_code,
         orders:[],
         offset:0
     });
+    const [ flash_data, setFlashData ] = useState<{
+        expanded?:boolean,
+        flash_campaigns:PollCampaignProps[],
+        flash_markets:PollProps[]
+    }>({
+        flash_campaigns: [],
+        expanded:false,
+        flash_markets: []
+    });
+    const { expanded, flash_campaigns, flash_markets } = flash_data;
     const [ comp_data, setCompData ] = useState<{
         loading:boolean,
         toggle: 'upcoming'|'history',
@@ -152,7 +163,6 @@ const GroupComponent = ({ refresh_key, group_id, player, mode, init_invite_code,
     const admin = player?.player_id == group?.group_admin ? true : false;
     const { sorted_players, player_analytics } = GroupHelpers.sortMembers(group_players, order_analytics, active_stat?.stat_key);
     const sorted_engagements = GroupHelpers.sortCompetitionAction([], comp_data.active_competitions, [], comp_data.squares_competitions, comp_data.poll_campaigns);
-
     useEffect(() => {
         getGroupData(group_id);
     },[group_id, refresh_key]);
@@ -197,7 +207,8 @@ const GroupComponent = ({ refresh_key, group_id, player, mode, init_invite_code,
         let server_events:EventProps[] = []
         if(type == 'upcoming'){
             resp = await GroupApi.getActiveCompetitions(group_id);
-            server_polls = await GroupApi.getActivePolls(group_id);
+            let flash_resp = await GroupApi.getActivePolls(group_id);
+            server_polls = flash_resp.poll_campaigns.filter(pc => pc.market_type == 'FREE');
             server_sq = await GroupApi.getActiveSquares(group_id);
             let event_ids = server_sq.map(sq => sq.event_id);
             server_events = await GroupApi.getEventsByIds(event_ids);
@@ -213,7 +224,7 @@ const GroupComponent = ({ refresh_key, group_id, player, mode, init_invite_code,
             ...comp_data,
             loading:false,
             toggle: type,
-            poll_campaigns: server_polls,
+            poll_campaigns: server_polls.filter(p => p.market_type == 'FREE'),
             squares_competitions: server_sq,
             events: server_events,
             competition_players: resp.competition_players,
@@ -249,6 +260,10 @@ const GroupComponent = ({ refresh_key, group_id, player, mode, init_invite_code,
         let player_ids = [ ...new Set(g_data.group_players.map(p => p.player_id).concat(g_data.group_messages.map(m => m.player_id)))]
         let plyers = await GroupApi.getPlayersByIds(player_ids);
         let my_gp = g_data.my_group_player && g_data.my_group_player.status == 'inactive' ? undefined : g_data.my_group_player
+        
+        let server_flash = await GroupApi.getActivePolls(group_id);
+        setFlashData({ flash_campaigns: server_flash.poll_campaigns, flash_markets: server_flash.polls.filter(p => p.status != 'pending') });
+
         setGroupData({
             ...group_data,
             loading: false,
@@ -260,6 +275,8 @@ const GroupComponent = ({ refresh_key, group_id, player, mode, init_invite_code,
             group_players: g_data.group_players,
             my_group_player: my_gp
         });
+
+
     }
 
     const renderPlayers = (data:{ item:GroupPlayerProps, index:number }) => {
@@ -374,6 +391,32 @@ const GroupComponent = ({ refresh_key, group_id, player, mode, init_invite_code,
         )
     }
 
+    const renderFlash = (data: { item: PollProps, index:number }) => {
+        return (
+            <View transparent style={{ flexDirection:'row', alignItems:'center', padding:10, borderBottomWidth:1, borderColor:Colors.borders.light }}>
+                {data.item.poll_image?.url ?
+                <Image
+                    source={{ uri: data.item.poll_image.url }}
+                    style={{ height:30, width: 30 }}
+                    resizeMode='contain'
+                />
+                :
+                <Icons.FlameIcon size={30} color={Colors.text.error} />
+                }
+                <View transparent style={{ flex:1, marginLeft:10 }}>
+                    <Text theme='h1'>{data.item.poll_question}</Text>
+                    <Text theme='description' style={{ marginTop:3 }}>{data.item.status.toUpperCase()}</Text>
+                </View>
+                <Button
+                    style={{ padding:10, marginLeft:5 }}
+                    type={data.item.status == 'active' ? 'success' : 'action'}
+                    title={data.item.status == 'active' ? 'BUY' : 'VIEW'}
+                    onPress={() => onSelectFlashMarket(data.item)}
+                />
+            </View>
+        )
+    }
+
     const renderEngagements = (data: { item:{id:string, type:string, scheduled_datetime:any}, index: number }) => {
         switch (data.item.type){
             case 'competition':
@@ -501,6 +544,36 @@ const GroupComponent = ({ refresh_key, group_id, player, mode, init_invite_code,
                         />
                     </View>
                 )
+            case 'flash':
+                if(flash_campaigns.length == 0){ return <></> }
+                return (
+                    <View float style={{ margin:10 }}>
+                        <Button style={{ backgroundColor:Colors.views.header, flexDirection:'row', alignItems:'center', padding:10, borderBottomLeftRadius:expanded?0:8, borderBottomRightRadius:expanded?0:8 }} onPress={() => setFlashData({ ...flash_data, expanded: !expanded })}>
+                          <Icons.FlameIcon size={35} color={Colors.text.error} />
+                          <View transparent style={{ flex:1, marginLeft:10 }}>
+                            <Text theme='h1'>Flash Markets Available!</Text>
+                            <Text theme='description' style={{ marginTop:3 }}>Press here to see all flash markets for this group</Text>
+                          </View>
+                          <View float style={{ borderRadius:100, height:25, width:25, justifyContent:'center', alignItems:'center' }}>
+                            <Text theme='h1'>{flash_markets.length}</Text>
+                          </View>
+                        </Button>
+                        {expanded ?
+                        <View transparent>
+                            <FlatList
+                                data={flash_markets.sort((a,b) => {
+                                    let a_status = a.status == 'active' ? 2 : a.status == 'paused' ? 1 : 0
+                                    let b_status = b.status == 'active' ? 2 : b.status == 'paused' ? 1 : 0
+                                    return b_status - a_status || moment(a.end_datetime).unix() - moment(b.end_datetime).unix()
+                                })}
+                                renderItem={renderFlash}
+                                key={'flash_markets_group'}
+                                keyExtractor={item => item.poll_campaign_id.toString()}
+                            />
+                        </View>
+                        :<></>}
+                    </View>
+                )
             case 'new_competition':
                 if(active_toggle != 'competitions' || !group){ return <></> }
                 if(!onCreateEngagement){ return <></> }
@@ -703,6 +776,8 @@ const GroupComponent = ({ refresh_key, group_id, player, mode, init_invite_code,
                 <FlatList
                     data={sections}
                     key={'group_list'}
+                    refreshing={loading}
+                    onRefresh={() => getGroupData(group_id)}
                     keyExtractor={item => item}
                     renderItem={renderSections}
                 />

package/src/Poll/api/index.ts

@@ -147,9 +147,7 @@ const PollApi = {
         return resp.data.polls
     },
     getPollById : async(poll_id:string):Promise<{ poll:PollProps, poll_options:PollOptionProps[], poll_summaries: PollSummaryProps[] }> => {
-        console.log('getting data')
         const resp = await axios.get(`${AUTH_SVC_API}/v1/polls/poll/${poll_id}`)
-
         const { poll, poll_options, poll_summaries } = resp.data;
         return { poll, poll_options, poll_summaries }
     }

package/src/constants/useColors.tsx

@@ -44,6 +44,7 @@ export const useColors = (props?:UseColorProps) => {
                 success: Colors.utility.success,
                 action: Colors.brand.electric,
                 error: Colors.utility.error,
+                warning: Colors.utility.warning,
                 close: Colors.shades.white,
                 info: Colors.shades.white,
                 squares: Colors.highlights.highlight100,
@@ -125,6 +126,7 @@ export const useColors = (props?:UseColorProps) => {
                 success: Colors.brand.successDark, // **(NEW)** #395B4A
                 action: Colors.brand.electricLight,
                 error: Colors.brand.errorDark, // **(NEW)** #5A2A2A
+                warning: Colors.utility.warning,
                 close: Colors.shades.black, // #111111
                 info: Colors.shades.black, // #111111,
                 squares: Colors.highlights.highlight100Faded, // rgba(98, 10, 255, 0.4)

package/src/index.tsx

@@ -62,6 +62,7 @@ import CreateGroupWizard from './Group/components/CreateGroupWizard';
 import CreateEngagement from './CreateEngagement';
 import SquaresManager from './SquaresManager';
 import DiscordConnectionManager from './Discord';
+import ManageFlashMarket from './FlashMarket/components/ManageFlashMarket';
 export {
   Authenticator,
   Observer,
@@ -69,6 +70,7 @@ export {
   DiscordConnectionManager,
   BEEventApi,
   RankingsCard,
+  ManageFlashMarket,
   BELinkApi,
   SquaresManager,
   GuideView,

package/src/types.d.ts

@@ -929,6 +929,7 @@ export interface PollCampaignProps {
     name: string,
     player_id:string,
     company_id?:string,
+    group_id?:string,
     admins:string[],
     phone:string,
     market_type:'FREE'|'FOR_MONEY',
@@ -1001,9 +1002,11 @@ export interface PollProps {
     market_type:'FOR_MONEY'|'FREE',
     status:string,
     minimum_pool?:number,
+    admins?:string[],
     stake_increase_allowed?:boolean,
     multi_responses_allowed?:boolean,
     poll_open_time?:any,
+    base_stake:number,
     coupon_campaign_id?:string,
     coupon_payout_type?:any,
     flash_active?:boolean,
@@ -1046,6 +1049,8 @@ export interface PollSummaryProps {
     poll_option_id:string,
     count:number,
     stake:number,
+    winnings:number,
+    player_ids:[],
     pct:number
 }
 
@@ -1054,9 +1059,11 @@ export interface PollOptionProps {
     poll_id:string,
     option_type: 'select'|'input',
     option_name: string,
+    probability_locked?:boolean,
     option_value:string,
     input_type?:string,
-    input_result:number,
+    input_result?:number,
+    initial_odds?: number,
     priority:number,
     status:string,
     result_ind?:'win'|'lose'|'draw'