be-components 5.6.5 → 5.6.8

package/src/GolfScoreboard/index.tsx

@@ -27,7 +27,7 @@ type GolfScoreboardProps = {
 const scorecard_sections = ['course', 'my_action', 'toggle','search','leaderboard', 'open_bets', 'holes'];
 const GolfScoreboard = ({ player_id, my_orders, tournament_id, markets, best_available, onOrder, onClose }:GolfScoreboardProps) => {
     const Colors = useColors();
-    const [ module_width, setModuleWidth ] = useState(0);
+    const [ module_size, setModuleSize ] = useState({ width:0, height:0 });
     const [ active_tab, setActiveTab ] = useState<'scorecard'|'holes'|'bets'>('scorecard');
     const [ search, setSearch ] = useState<string>('');
     const [ my_data, setMyData ] = useState<{
@@ -342,11 +342,11 @@ const GolfScoreboard = ({ player_id, my_orders, tournament_id, markets, best_ava
                     </View>
                 )
             case 'my_action':
-                if(module_width == 0){ return <></> }
+                if(module_size.width == 0){ return <></> }
                 if(hole_orders.length == 0){ return <></> }
                 let padding = (3 * 10) + 20
                 
-                const kpi_card_width = ((module_width - padding) / 3)
+                const kpi_card_width = ((module_size.width - padding) / 3)
                 return (
                     <View>
                         <View style={{ padding:10 }}>
@@ -437,8 +437,8 @@ const GolfScoreboard = ({ player_id, my_orders, tournament_id, markets, best_ava
     return (
         <View style={{ flex:1 }}>
             <View style={{ flex:1 }} onLayout={(ev) => {
-                const { width } = ev.nativeEvent.layout
-                setModuleWidth(width);
+                const { width, height } = ev.nativeEvent.layout
+                setModuleSize({ width, height });
             }}>
                 {loading ?
                 <ActivityIndicator
@@ -467,6 +467,7 @@ const GolfScoreboard = ({ player_id, my_orders, tournament_id, markets, best_ava
             {tournament && order_leader && order_athlete ?
             <LeaderBetsList
                 markets={markets}
+                max_height={module_size.height - 50}
                 orders={hole_orders}
                 active_round={active_round}
                 golf_leader={order_leader}

package/src/Poll/api/index.ts

@@ -171,6 +171,15 @@ const PollCampaignGoalApi = {
 }
 
 const PollResponseApi = {
+    createPMOrder: async(poll_option_id:string, stake:number):Promise<{ poll_response:PollResponseProps, my_leader:PollCampaignLeaderProps, poll_campaign:PollCampaignProps } | undefined> => {
+        try {
+            const resp = await axios.post(`${AUTH_SVC_API}/v2/pm/action/order`, { poll_option_id, stake });
+            return resp.data
+        } catch (e) {
+            console.log(e);
+            return undefined
+        }
+    },
     createPollResponse : async(poll_response:PollResponseProps):Promise<PollResponseProps> => {
         const resp = await axios.post(`${AUTH_SVC_API}/v1/polls/poll/response/create`, { poll_response })
         return resp.data.poll_response

package/src/Poll/components/CampaignHeader.tsx

@@ -7,14 +7,23 @@ import { useColors } from '../../constants/useColors';
 
 type CampaignHeaderProps = {
     poll_campaign:PollCampaignProps,
+    onBack?:() => void,
     onSharePollCampaign:(pc:PollCampaignProps) => void
 }
 
-const CampaignHeader = ({ poll_campaign, onSharePollCampaign }:CampaignHeaderProps) => {
+const CampaignHeader = ({ poll_campaign, onSharePollCampaign, onBack }:CampaignHeaderProps) => {
     const Colors = useColors();
     return (
         <View>
             <View type='header' nativeID="competition_header" style={{ flexDirection:'row', alignItems:'center', padding:20, borderBottomWidth:1 }}>
+                {onBack ?
+                <Button
+                    transparent
+                    style={{ paddingLeft:0, paddingRight:20 }}
+                >
+                    <Icons.ChevronIcon direction='left' color={Colors.text.h1} size={10} />
+                </Button>
+                :<></>}
                 <View transparent>
                     <Image
                         source={{ uri: poll_campaign.campaign_image?.url ?? 'https://res.cloudinary.com/hoabts6mc/image/upload/v1649737862/be_logo_jte2ux.webp' }}

package/src/Poll/components/CampaignLeaderboard.tsx

@@ -100,9 +100,9 @@ const CampaignLeaderboard = ({ poll_campaign, height, mode, view_mode, onShowFul
     }
 
     return (
-        <View float style={{ flex:1, borderRadius:22,  maxHeight: height-20, width: mode == 'desktop'?500:undefined  }}>
+        <View float style={{ flex:1,  maxHeight: height-20, width: mode == 'desktop'?500:undefined  }}>
             {my_leader && me ?
-            <View type='header' nativeID="my_results" style={{ padding:10, borderTopRightRadius:22, borderTopLeftRadius:22 }}>
+            <View type='header' nativeID="my_results" style={{ padding:10 }}>
                 <Text style={{ padding:10 }} size={14} theme='h1' weight='bold'>My Results</Text>
                 <View float style={{ flexDirection:'row', alignItems:'center', margin:4, padding:5, borderRadius:22 }}>
                     <View transparent nativeID="player" style={{ flex:1, flexDirection:'row', alignItems:'center' }}>

package/src/Poll/index.tsx

@@ -17,14 +17,17 @@ type PollCampaignModuleProps = {
     player_id?:string,
     view_mode:'desktop'|'mobile',
     distinct_id:string,
+    insets?:{ top:number, bottom:number, left:number, right:number },
+    onBack?:() => void,
     onEvent?:(be_event:BEEventProps) => void,
     onRequestAuthenticate: (auth_strategy_id?:string, company_id?:string) => void,
     onSharePollCampaign: (poll_campaign:PollCampaignProps) => void,
     onComplete:() => void
+
 }
 
 const sections = ['header', 'progress', 'results','questions']
-const PollCampaign = ({ distinct_id, view_mode, poll_campaign_id, player_id, onRequestAuthenticate, onSharePollCampaign }: PollCampaignModuleProps ) => {
+const PollCampaign = ({ distinct_id, view_mode, poll_campaign_id, player_id, insets, onBack, onRequestAuthenticate, onSharePollCampaign }: PollCampaignModuleProps ) => {
     const [ needs_reload, setNeedsReload ] = useState(false);
     const [ socket_polls, setSocketPolls ] = useState<PollProps[]>([]);
     const [ socket_campaign, setSocketCampaign ] = useState<PollCampaignProps|undefined>(undefined);
@@ -96,12 +99,15 @@ const PollCampaign = ({ distinct_id, view_mode, poll_campaign_id, player_id, onR
     const handleSubmitResponse = async(pr:PollResponseProps) => {
         if(!player_id){ return onRequestAuthenticate(poll_campaign?.auth_strategy_id, poll_campaign?.company_id) }
         try {
+            if(!pr.poll_option_id || !pr.stake){ return }
             if(action_loading){ return }
             setMyData({ ...my_data, action_loading: true })
-            let new_pr = await PollResponseApi.createPollResponse(pr);
+            //let new_pr = await PollResponseApi.createPollResponse(pr);
+            let response = await PollResponseApi.createPMOrder(pr.poll_option_id, parseFloat(pr.stake as string))
+            if(!response){ return setMyData({ ...my_data, action_loading:false }) }
             setMyData({
                 ...my_data,
-                poll_responses: poll_responses.filter(pr => pr.poll_response_id != new_pr.poll_response_id).concat(new_pr)
+                poll_responses: poll_responses.filter(pr => pr.poll_response_id != response.poll_response.poll_response_id).concat(response.poll_response)
             })
         } catch (e) {
             alert('Unable to process!')
@@ -126,6 +132,7 @@ const PollCampaign = ({ distinct_id, view_mode, poll_campaign_id, player_id, onR
                 if(!poll_campaign){ return <></> }
                 return (
                     <CampaignHeader
+                        onBack={onBack}
                         poll_campaign={poll_campaign}
                         onSharePollCampaign={onSharePollCampaign}
                     />
@@ -191,7 +198,7 @@ const PollCampaign = ({ distinct_id, view_mode, poll_campaign_id, player_id, onR
                 transparent
                 visible={active_poll_id ? true : false}
                 >
-                <View type='blur' style={view_mode=='desktop'?{flex:1, justifyContent:'center', alignItems:'center'}:{ flex:1, justifyContent:'flex-end', padding:12 }}>
+                <View type='blur' style={view_mode=='desktop'?{flex:1, justifyContent:'center', alignItems:'center'}:{ flex:1, justifyContent:'flex-end', padding:12, paddingBottom:(insets?.bottom??0) + 12, paddingTop:(insets?.top??0) + 12 }}>
                     <PollCard
                         poll_id={active_poll_id}
                         action_loading={action_loading}
@@ -213,7 +220,7 @@ const PollCampaign = ({ distinct_id, view_mode, poll_campaign_id, player_id, onR
                 visible={full_leaderboard?true:false}
                 style={{ flex:1 }}
             >
-                <View type='blur' style={view_mode=='desktop'?{flex:1, justifyContent:'center', alignItems:'center'}:{ flex:1, justifyContent:'flex-end', padding:12 }}>
+                <View type='blur' style={view_mode=='desktop'?{flex:1, justifyContent:'center', alignItems:'center'}:{ flex:1, justifyContent:'flex-end', padding:12, paddingBottom:(insets?.bottom??0) + 12, paddingTop:(insets?.top??0) + 12 }}>
                         <CampaignLeaderboard
                             poll_campaign={poll_campaign}
                             view_mode='full'

package/src/types.d.ts

@@ -729,6 +729,8 @@ export interface PollCampaignProps {
     admins:string[],
     phone:string,
     total_responses:number,
+    prize_image?:any,
+    prize_override?:string,
     status: string,
     campaign_type: 'predict'|'trivia'|'feedback',
     active_polls?:number,
@@ -770,18 +772,24 @@ export interface PollCampaignGoalProps {
 }
 
 
+
 export interface PollCampaignLeaderProps {
     poll_campaign_leader_id:string,
     poll_campaign_id:string,
     player_id:string,
     place:number,
+    status: 'inprogress'|'closed',
     winnings:number,
-    stake:number,
+    potential_winnings:number,
+    staked:number,
     responses:number,
+    earnings:number,
+    resolved_datetime?:any,
     create_datetime:any,
     last_update_datetime:any
 }
 
+
 export interface PollProps {
     poll_id:string,
     poll_campaign_id:string,