be-components 6.3.2 → 6.3.4

package/src/FlashMarket/FlashHolder.tsx

@@ -18,10 +18,14 @@ type FlashHolderProps = {
     player?:MyPlayerProps,
     init_expanded?:boolean,
     contest_type?:string,
+    parent_style?:ViewStyle,
+    hide_footer?:boolean,
     contest_id?:string,
     hide_tabs?:boolean,
     style?:ViewStyle,
     side_type?:string,
+    hide_timer?:boolean,
+    no_highlight?:boolean,
     location?:LocationProps,
     side_id?:string,
     poll_id?:string,
@@ -31,7 +35,7 @@ type FlashHolderProps = {
     onRequestAuthenticate: () => void
 }
 const sections = [ 'selector','explainer','flash_market','options','footer' ]
-const FlashHolder = ({ float, compact, style, distinct_id, hide_tabs, league_id, init_expanded, player_id, player, location, contest_type, contest_id, side_type, side_id, poll_id, onSelectCompactPoll, onRequestAuthenticate, onFocusPosition, onRequestLocation } : FlashHolderProps) => {
+const FlashHolder = ({ float, compact, style, hide_timer, distinct_id, hide_footer, no_highlight, hide_tabs, parent_style, league_id, init_expanded, player_id, player, location, contest_type, contest_id, side_type, side_id, poll_id, onSelectCompactPoll, onRequestAuthenticate, onFocusPosition, onRequestLocation } : FlashHolderProps) => {
     const Colors = useColors();
     const [ needs_reload, setNeedsReload ] = useState(false);
     const [ socket_campaigns, setSocketCampaigns ] = useState<PollCampaignProps[]>([]);
@@ -190,7 +194,7 @@ const FlashHolder = ({ float, compact, style, distinct_id, hide_tabs, league_id,
         return (
             <Button
                 float={selected}
-                style={{ padding:4, margin:1, borderRadius:0, borderTopRightRadius:8, borderTopLeftRadius:8, borderWidth:2, borderBottomWidth:0, borderColor:selected ? Colors.text.success : Colors.borders.light, opacity:selected?1:0.5 }}
+                style={{ padding:4, margin:1, borderRadius:0, borderTopRightRadius:8, borderTopLeftRadius:8, borderWidth:2, borderBottomWidth:0, borderColor:selected && !no_highlight ? Colors.text.success : Colors.borders.light, opacity:selected?1:0.5 }}
                 onPress={() => handleSelectPoll(data.item.poll_id)}
             >
                 {data.item.poll_image ?
@@ -267,11 +271,13 @@ const FlashHolder = ({ float, compact, style, distinct_id, hide_tabs, league_id,
                             poll={flash_market}
                             poll_options={poll_options}
                             poll_summaries={poll_summaries}
+                            hide_footer={hide_footer}
                             poll_campaign={poll_campaign}
                             flash_market_fees={flash_market_fees}
                             loading={loading || holder_loading}
                             hide_image
-                            card_style={{ borderWidth:2, borderColor:Colors.text.success, borderBottomRightRadius:8, borderBottomLeftRadius:8 }}
+                            hide_timer={hide_timer}
+                            card_style={{ borderWidth:2, borderColor:!no_highlight?Colors.text.success:Colors.borders.light, borderBottomRightRadius:8, borderBottomLeftRadius:8 }}
                             init_expanded={init_expanded}
                             footer_style={{ borderBottomRightRadius:8, borderBottomLeftRadius:8 }}
                             header_style={{ borderTopRightRadius:0, borderTopLeftRadius:0 }}
@@ -286,7 +292,7 @@ const FlashHolder = ({ float, compact, style, distinct_id, hide_tabs, league_id,
         }
     }
     return (
-        <View transparent>
+        <View transparent style={{ ...parent_style }}>
             {flash_markets.length > 0 || active_flash_market ?
             <View float={float} style={{ ...style }}>
                 <FlatList

package/src/FlashMarket/index.tsx

@@ -20,8 +20,10 @@ type FlashMarketProps = {
     location?:LocationProps,
     card_style?:any,
     init_expanded?:boolean,
+    hide_timer?:boolean,
     onReload:() => void,
     header_style?:any,
+    hide_footer?:boolean,
     footer_style?:any,
     player_id?:string
     player?:MyPlayerProps,
@@ -29,7 +31,7 @@ type FlashMarketProps = {
     onFocusPosition?: (position:{ x:number, y:number, width:number, height:number }) => void,
     onRequestAuthenticate: () => void
 }
-const FlashMarket = ({ loading, poll, 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, onRequestAuthenticate, onFocusPosition, onRequestLocation }:FlashMarketProps) => {
     const Colors = useColors();
     const [ admin_action, setAdminActions ] = useState<{
         selected_option_id?:string,
@@ -329,7 +331,7 @@ const FlashMarket = ({ loading, poll, poll_options, poll_summaries, poll_campaig
                 <View transparent>
                     {expanded ?
                     <View transparent type='body' style={{ padding:10 }}>
-                        {!is_upcoming && poll.status == 'active' ?
+                        {!hide_timer && !is_upcoming && poll.status == 'active' ?
                         <MarketTimer
                             poll={poll}
                             onTimesUp={() => onReload()}
@@ -464,7 +466,7 @@ const FlashMarket = ({ loading, poll, poll_options, poll_summaries, poll_campaig
                 :<></>}
             </View>
             :<></>}
-            {expanded ?
+            {expanded && !hide_footer ?
             <View type='footer' style={{ flexDirection:'row', alignItems:'center', padding:10, ...footer_style }}>
                 <Button transparent style={{ justifyContent:'center', alignItems:'center', borderRadius:0, padding:5, paddingRight:10, marginRight:10, borderRightWidth:1, borderColor:Colors.borders.light }}
                 onPress={() => setShowHelp(!show_help)}>

package/src/Poll/api/index.ts

@@ -253,6 +253,14 @@ const PollOptionApi = {
     updatePollOption : async(poll_option:PollOptionProps):Promise<PollOptionProps> => {
         const resp = await axios.post(`${AUTH_SVC_API}/v1/polls/poll/option/update`, { poll_option })
         return resp.data.poll_option
+    },
+    getPollOptionsByPollIds: async(poll_ids:string[]):Promise<PollOptionProps[]> => {
+        try {
+            const resp = await axios.post(`${AUTH_SVC_API}/v1/polls/options/bulk/get`, { poll_ids });
+            return resp.data.poll_options
+        } catch (error) {
+            return []
+        }
     }
 }
 

package/src/Poll/index.tsx

@@ -17,6 +17,7 @@ type PollCampaignModuleProps = {
     player_id?:string,
     view_mode:'desktop'|'mobile',
     distinct_id:string,
+    onFlashSelect?:(poll_id:string) => void,
     insets?:{ top:number, bottom:number, left:number, right:number },
     onBack?:() => void,
     onEvent?:(be_event:BEEventProps) => void,
@@ -27,7 +28,7 @@ type PollCampaignModuleProps = {
 }
 
 const sections = ['header', 'progress', 'results','questions']
-const PollCampaign = ({ distinct_id, view_mode, poll_campaign_id, player_id, insets, onBack, onRequestAuthenticate, onSharePollCampaign }: PollCampaignModuleProps ) => {
+const PollCampaign = ({ distinct_id, view_mode, poll_campaign_id, player_id, insets, onBack, onFlashSelect, onRequestAuthenticate, onSharePollCampaign }: PollCampaignModuleProps ) => {
     const [ needs_reload, setNeedsReload ] = useState(false);
     const [ socket_polls, setSocketPolls ] = useState<PollProps[]>([]);
     const [ socket_campaign, setSocketCampaign ] = useState<PollCampaignProps|undefined>(undefined);
@@ -171,6 +172,9 @@ const PollCampaign = ({ distinct_id, view_mode, poll_campaign_id, player_id, ins
                             onSelectPoll={(p) => {
                                 if(!player_id){ return onRequestAuthenticate(poll_campaign.auth_strategy_id, poll_campaign.company_id) }
                                 if(['paused','pending','inactive'].includes(p.status)){ return Alert.alert('This question is not active. Please open when it becomes active') }
+                                if(poll_campaign.market_type == 'FOR_MONEY' && onFlashSelect){
+                                    return onFlashSelect(p.poll_id)
+                                }
                                 setModuleData({ ...module_data, active_poll_id: p.poll_id })
                             }}
                         />

package/src/Wallet/api/index.ts

@@ -326,6 +326,9 @@ const WalletHelpers = {
         if(!wallet_settings.agreed_to_terms || !wallet_settings.pin || !wallet_settings.auth_end_datetime || moment().isAfter(moment(wallet_settings.auth_end_datetime))){ return false }
         return true
     },
+    formateTimeToExpireDate: (date:any) => {
+        return moment.parseZone(date).utc().format('MM/YYYY')
+    },
     formatBalance: (balance:number) => {
         let round_down_balance = Math.round(balance * 100) / 100;
         let str_balance = round_down_balance.toFixed(2).replace(/(\d)(?=(\d{3})+(?!\d))/g, '$1,');

package/src/Wallet/components/AccountCard.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
 import type { AccountProps } from '../../types';
 import { Icons } from '../../Components';
-import moment from 'moment-mini';
 import { Button, Text, View } from '../../Components/Themed';
 import { useColors } from '../../constants/useColors';
+import { WalletHelpers } from '../api';
 
 type AccountCardProps = {
     account:AccountProps,
@@ -61,7 +61,7 @@ const AccountCard = ({ account, hide_status, onSelectAccount }: AccountCardProps
                 return account.ach_detail.account_type.toUpperCase()
             case 'card':
                 if(!account.card_detail){ return '' }
-                return `EXP ${moment(account.card_detail.expiration_date).format('MM/YYYY')}`
+                return `EXP ${WalletHelpers.formateTimeToExpireDate(account.card_detail.expiration_date)}`
             case 'paypal':
                 return `Login to your Paypal and transact`
             default: return ''

package/src/types.d.ts

@@ -731,7 +731,7 @@ export interface CampaignProps {
     campaign_name:string,
     description?:string,
     status:'active'|'inactive',
-    sponsors?:bigint[],
+    sponsors?:string[],
     prize_description?:string,
     raffle_options?:string[],
     poll_campaign_ids?:string[],