be-components 5.3.2 → 5.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "be-components",
-  "version": "5.3.2",
+  "version": "5.3.4",
   "description": "Components for BettorEdge Apps",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/src/ProfileManager/Components/BasicInfoManager.tsx

@@ -61,8 +61,8 @@ const BasicInfoManager = ({ player, walkthrough, onFocusPosition, onPlayerUpdate
     const allow_next = username_valid.valid && !username_valid.loading && draft_player.first_name && draft_player.last_name ? true : false
 
     return (
-        <View style={{ flexGrow:1 }}>
-            <ScrollView style={{ flexGrow:1 }}>
+        <View style={{ flex:1 }}>
+            <ScrollView style={{ flex:1 }}>
                 {walkthrough ?
                 <View style={{ padding:20 }}>
                     <Text size={30} theme='h1'>Let's start with the basics</Text>

package/src/ProfileManager/Components/BasicStatus.tsx

@@ -31,8 +31,8 @@ const BasicStatus = ({ onVerify, code_details, player, onClose }:BasicStatusProp
     const errors = getStatus(player)
 
     return (
-        <View style={{ flexGrow:1 }}>
-            <ScrollView style={{ flexGrow:1 }}>
+        <View style={{ flex:1 }}>
+            <ScrollView style={{ flex:1 }}>
                
                 <View style={{ justifyContent:'center', alignItems:'center' }}>
                     <Image

package/src/ProfileManager/Components/CodeRedeem.tsx

@@ -85,10 +85,10 @@ const CodeRedeem = ({ walkthrough, onVerify, onClose, onRedeemCode, onFocusPosit
     const try_allowed = draft_code ? true : false
     const change_allowed = !loading && ProfileHelpers.isChangeCodeAllowed(code_request) ? true : false
     return (
-        <TouchableWithoutFeedback style={{ flexGrow:1 }} onPress={() => Keyboard.dismiss()}>
+        <TouchableWithoutFeedback style={{ flex:1 }} onPress={() => Keyboard.dismiss()}>
 
-        <View style={{ flexGrow:1 }}>
-            <View style={{ flexGrow:1, padding:20 }}>
+        <View style={{ flex:1 }}>
+            <View style={{ flex:1, padding:20 }}>
             <View style={{ padding:20 }}>
                     <Text size={30} theme='h1'>How Did You Find Us?</Text>
                     <Text style={{ marginTop:15 }} size={16} theme='h2'>All new players are eligible for a one-time sign up bonus. Below is the code / referrer used during sign up.</Text>

package/src/ProfileManager/Components/DOBManager.tsx

@@ -83,13 +83,13 @@ const DOBManager = ({ player, walkthrough, onFocusPosition, onPlayerUpdate, onNe
 
 
     return (
-            <View style={{ flexGrow:1 }}>
-            <View style={{ flexGrow:1, justifyContent:'center'}}>
+            <View style={{ flex:1 }}>
+            <View style={{ flex:1, justifyContent:'center'}}>
                 <View style={{ padding:20 }}>
                     <Text size={30} theme='h1'>Date Of Birth</Text>
                     <Text style={{ marginTop:15 }} size={16} theme='h2'>In order to participate in real-money gaming you must be over 18.</Text>
                 </View>
-                <View style={{ padding:30, flexGrow:1 }}>
+                <View style={{ padding:30, flex:1 }}>
                     <View type='input' style={{flexDirection:'row', alignItems:'center' }}>
                         <View transparent style={{ paddingLeft:15, paddingRight:15 }}>
                             <Icons.BirthdayIcon

package/src/ProfileManager/Components/EmailManager.tsx

@@ -92,8 +92,8 @@ const EmailManager = ({ player, walkthrough, onFocusPosition, onPlayerUpdate, on
 
 
     return (
-            <View style={{ flexGrow:1 }}>
-            <View style={{ flexGrow:1 }}>
+            <View style={{ flex:1 }}>
+            <View style={{ flex:1 }}>
                 <View style={{ padding:20 }}>
                     <Text size={30} theme='h1'>Confirm Your Email</Text>
                     <Text style={{ marginTop:15 }} size={16} theme='h2'>Confirming your email will help secure your account and is required for real-money activities</Text>
@@ -111,7 +111,7 @@ const EmailManager = ({ player, walkthrough, onFocusPosition, onPlayerUpdate, on
                             value={draft_player.email}
                             keyboardType='email-address'
                             onFocusPosition={onFocusPosition}
-                            style={{ flexGrow:1 }}
+                            style={{ flex:1 }}
                             onChangeText={(text) => {
                                 if(update_error){ setUpdateError(undefined) }
                                 setDraftPlayer({ ...draft_player, email: text })

package/src/ProfileManager/Components/PasswordManager.tsx

@@ -96,7 +96,7 @@ const PasswordManager = ({ player, walkthrough, onPlayerUpdate, onFocusPosition,
     }
 
     return (
-        <View style={{ flexGrow:1}}>
+        <View style={{ flex:1}}>
             {walkthrough ?
             <View style={{ padding:20 }}>
                 <Text size={30} theme='h1'>Secure Your Account</Text>
@@ -104,7 +104,7 @@ const PasswordManager = ({ player, walkthrough, onPlayerUpdate, onFocusPosition,
             </View>
             :<></>}
             {draft_player.no_password || change_visible ?
-            <View style={{ flexGrow:1, padding:20  }}>
+            <View style={{ flex:1, padding:20  }}>
                 {!draft_player.no_password ?
                 <View type='input' style={{ margin:10, flexDirection:'row', alignItems:'center' }}>
                     <View transparent style={{ paddingLeft:15, paddingRight:15 }}>
@@ -161,7 +161,7 @@ const PasswordManager = ({ player, walkthrough, onPlayerUpdate, onFocusPosition,
 
             </View>
             :
-            <View style={{ flexGrow:1, justifyContent:'center', alignItems:'center', padding:10 }}>
+            <View style={{ flex:1, justifyContent:'center', alignItems:'center', padding:10 }}>
                 <View float style={{ borderRadius:8, backgroundColor:C.views.background, justifyContent:'center', alignItems:'center', padding:30 }}>
                     
                     <Text style={{ marginBottom:30 }} size={24} theme='h1'>Password Set</Text>

package/src/ProfileManager/Components/PhoneManager.tsx

@@ -98,8 +98,8 @@ const PhoneManager = ({ player, walkthrough, onPlayerUpdate, onFocusPosition, on
 
 
     return (
-                <View style={{ flexGrow:1 }}>
-            <View style={{ flexGrow:1 }}>
+                <View style={{ flex:1 }}>
+            <View style={{ flex:1 }}>
                     <View style={{ padding:20 }}>
                         <Text size={30} theme='h1'>Confirm Your Phone Number</Text>
                         <Text style={{ marginTop:15 }} size={16} theme='h2'>Confirming your phone number will help secure your account and is required for real-money activities</Text>

package/src/ProfileManager/Components/ProfilePicManager.tsx

@@ -28,8 +28,8 @@ const ProfilePicManager = ({ player, onPlayerUpdate, walkthrough, onNext, onClos
 
 
     return (
-        <View style={{ flexGrow:1 }}>
-            <ScrollView style={{ flexGrow:1 }}>
+        <View style={{ flex:1 }}>
+            <ScrollView style={{ flex:1 }}>
                 {walkthrough ?
                 <View style={{ padding:20 }}>
                     <Text size={30} theme='h1'>Update Your Picture</Text>

package/src/ProfileManager/Components/ProfileWelcome.tsx

@@ -23,8 +23,8 @@ const ProfileWelcome = ({ player, code_details, onStartSetup, onClose }:ProfileW
     const C = useColors();
     const { code_request, promo, referrer } = code_details;
     return (
-        <View style={{ flexGrow:1 }}>
-            <ScrollView style={{ flexGrow:1 }}>
+        <View style={{ flex:1 }}>
+            <ScrollView style={{ flex:1 }}>
                 <View style={{ padding:20 }}>
                     <Text size={30} theme='h2'>Welcome @{player.username}!</Text>
                     <Text style={{ marginTop:15 }} size={16} theme='h2'>We are so glad that you found us! Use the setup wizard to complete your account setup.</Text>

package/src/ProfileManager/Components/ProfileWizard.tsx

@@ -302,10 +302,10 @@ const ProfileWizard = ({  player, view_mode, hide_powered_by, settings, player_s
 
 
     return (
-        <View style={{ flexGrow:1 }}>
+        <View style={{ flex:1 }}>
             {!active_level && !show_code_request ?
-            <View transparent style={{ flexGrow:1 }}>
-                <View style={{ flexGrow:1 }}>
+            <View transparent style={{ flex:1 }}>
+                <View style={{ flex:1 }}>
                     <FlatList
                         data={groups}
                         renderItem={renderGroups}
@@ -362,7 +362,7 @@ const ProfileWizard = ({  player, view_mode, hide_powered_by, settings, player_s
                 :<></>}
             </View>
             :
-            <View style={{ flexGrow:1 }}>
+            <View style={{ flex:1 }}>
             {!walkthrough && active_level ?
             <TouchableOpacity style={{  flexDirection:'row', alignItems:'center', padding:10, borderTopWidth:2, borderColor:C.borders.light}} onPress={() => {
                 setActiveLevel(undefined)
@@ -396,7 +396,7 @@ const ProfileWizard = ({  player, view_mode, hide_powered_by, settings, player_s
             </View>
             :<></>}
             </View>
-            <View style={{ flexGrow:1 }}>
+            <View style={{ flex:1 }}>
                 {!active_step && show_code_request ?
                 <CodeRedeem
                     walkthrough={false}

package/src/ProfileManager/Components/SettingsManager.tsx

@@ -128,8 +128,8 @@ const SettingsManager = ({ player, title, description, icon, settings, player_se
     }
 
     return (
-        <View style={{ flexGrow:1 }}>
-            <ScrollView style={{ flexGrow:1 }}>
+        <View style={{ flex:1 }}>
+            <ScrollView style={{ flex:1 }}>
                 <View nativeID='preference_settings' style={{ padding:10 }}>
                     <View nativeID='header' style={{ flexDirection:'row', alignItems:'center' }}>
                         <View float style={{ padding:10, borderRadius:8 }}>

package/src/ProfileManager/Components/VouchCard.tsx

@@ -205,8 +205,8 @@ const VouchCard = ({ player, view_mode, walkthrough, insets, code_details, onVou
     }
 
     return (
-        <View style={{ flexGrow:1 }}>
-            <View style={{ flexGrow:1 }}>
+        <View style={{ flex:1 }}>
+            <View style={{ flex:1 }}>
                 <FlatList
                     data={sections}
                     key={'vouch_sections'}

package/src/ProfileManager/index.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import { Image, ActivityIndicator } from 'react-native';
+import { Image, ActivityIndicator, FlatList } from 'react-native';
 import Colors from '../constants/colors';
 import ProfileWizard from './Components/ProfileWizard';
 import { ProfileApi } from './api';
@@ -9,7 +9,6 @@ import { Text, View } from '../Components/Themed';
 
 type ProfileOverviewProps = {
     show_welcome?:boolean,
-    //access_token:string,
     hide_powered_by?:boolean,
     hide_profile_header?:boolean,
     player?:MyPlayerProps,
@@ -70,11 +69,9 @@ const ProfileManager = ({ profile_attribute, view_mode, hide_profile_header, ins
         } catch (e) {
             console.log(e)
         }
-
         setLoading(false);
     }
 
-
     const handleLogout = () => {
         setDraftPlayer(undefined);
         setPlayerBalance(undefined);
@@ -82,20 +79,60 @@ const ProfileManager = ({ profile_attribute, view_mode, hide_profile_header, ins
         onClose()
     }
 
+    const renderProfile = (data:{ item:string, index:number }) => {
+        switch(data.item){
+            case 'profile':
+                if(!draft_player){ return <></> }
+                return (
+                    <ProfileWizard
+                        player={draft_player}
+                        player_settings={player_settings}
+                        onVouching={(active) => {
+                            if(active && onVouchStart){ onVouchStart() }
+                            setVouching(active)
+                        }}
+                        width={width}
+                        onRedeemCode={onRedeemCode}
+                        settings={settings}
+                        insets={insets}
+                        view_mode={view_mode}
+                        show_welcome={show_welcome}
+                        onFocusPosition={onFocusPosition}
+                        hide_powered_by={hide_powered_by}
+                        hidden_groups={hidden_groups}
+                        hidden_steps={hidden_steps}
+                        hidden_levels={hidden_levels}
+                        init_walkthrough={walkthrough}
+                        onNextStep={(step:string) => onNextStep ? onNextStep(step) : console.log()}
+                        onClose={() => onClose()}
+                        onLogout={() => handleLogout()}
+                        profile_attribute={profile_attribute}
+                        onSelectLevel={(level) => console.log(level)}
+                        onUpdatePlayerSetting={(new_ps) => setPlayerSettings(player_settings.filter(ps => ps.player_setting_id != new_ps.player_setting_id).concat(new_ps))}
+                        onPlayerUpdate={(player, attribute) => {
+                            setDraftPlayer(player)
+                            if(onPlayerUpdate){ onPlayerUpdate(player, attribute) }
+                        }}
+                    />
+                )
+            default: return <></>
+        }
+    }
+
     if(!draft_player || loading){
         return (
-            <View style={{ flexGrow:1 }}>
+            <View style={{ flex:1 }}>
                 <ActivityIndicator size={'large'} color={Colors.brand.midnight} />
             </View>
         )
     }
 
     return (
-        <View style={{ flexGrow:1 }} onLayout={(ev) => {
+        <View style={{ flex:1 }} onLayout={(ev) => {
             const { width } = ev.nativeEvent.layout
             setModuleWidth(width)
         }}>
-            <View style={{ flexGrow:1 }}>
+            <View style={{ flex:1 }}>
                 {!hide_profile_header && !walkthrough && !vouching ?
                 <View style={{ flexDirection:'row', alignItems:'center' }}>
                     <View nativeID='profile_picture' style={{ padding:10 }}>
@@ -117,38 +154,15 @@ const ProfileManager = ({ profile_attribute, view_mode, hide_profile_header, ins
                     :<></>}
                 </View>
                 :<></>}
-                <View style={{ marginTop:10, flexGrow:1 }}>
-                        <ProfileWizard
-                            player={draft_player}
-                            player_settings={player_settings}
-                            onVouching={(active) => {
-                                if(active && onVouchStart){ onVouchStart() }
-                                setVouching(active)
-                            }}
-                            width={width}
-                            onRedeemCode={onRedeemCode}
-                            settings={settings}
-                            insets={insets}
-                            view_mode={view_mode}
-                            show_welcome={show_welcome}
-                            onFocusPosition={onFocusPosition}
-                            hide_powered_by={hide_powered_by}
-                            hidden_groups={hidden_groups}
-                            hidden_steps={hidden_steps}
-                            hidden_levels={hidden_levels}
-                            init_walkthrough={walkthrough}
-                            onNextStep={(step:string) => onNextStep ? onNextStep(step) : console.log()}
-                            onClose={() => onClose()}
-                            onLogout={() => handleLogout()}
-                            profile_attribute={profile_attribute}
-                            onSelectLevel={(level) => console.log(level)}
-                            onUpdatePlayerSetting={(new_ps) => setPlayerSettings(player_settings.filter(ps => ps.player_setting_id != new_ps.player_setting_id).concat(new_ps))}
-                            onPlayerUpdate={(player, attribute) => {
-                                setDraftPlayer(player)
-                                if(onPlayerUpdate){ onPlayerUpdate(player, attribute) }
-                            }}
-                        />
+                <View style={{ flex:1 }}>
+                    <FlatList
+                        data={['profile']}
+                        key={'profile_list'}
+                        keyExtractor={item => item}
+                        renderItem={renderProfile}
+                    />
                 </View>
+
             </View>
         </View>
     )