Merge pull request #6650 from bithyve/staging

Build 584

android/app/build.gradle

@@ -59,8 +59,8 @@ android {
         applicationId "io.hexawallet.hexa"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 582
-        versionName "2.2.0"
+        versionCode 584
+        versionName "2.2.1"
         missingDimensionStrategy 'react-native-camera', 'general'
         multiDexEnabled true
         resValue "string", "build_config_package", "io.hexawallet.hexa"

ios/HEXA.xcodeproj/project.pbxproj

@@ -1059,7 +1059,7 @@
 				CODE_SIGN_ENTITLEMENTS = HEXA/Hexa.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 582;
+				CURRENT_PROJECT_VERSION = 584;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
@@ -1072,7 +1072,7 @@
 					"$(SDKROOT)/usr/lib/swift",
 					"$(inherited)",
 				);
-				MARKETING_VERSION = 2.2.0;
+				MARKETING_VERSION = 2.2.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1098,7 +1098,7 @@
 				CODE_SIGN_ENTITLEMENTS = HEXA/Hexa.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 582;
+				CURRENT_PROJECT_VERSION = 584;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = Y5TCB759QL;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = Y5TCB759QL;
@@ -1111,7 +1111,7 @@
 					"$(SDKROOT)/usr/lib/swift",
 					"$(inherited)",
 				);
-				MARKETING_VERSION = 2.2.0;
+				MARKETING_VERSION = 2.2.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1137,7 +1137,7 @@
 				CODE_SIGN_ENTITLEMENTS = HEXA/Hexa.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 582;
+				CURRENT_PROJECT_VERSION = 584;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = Y5TCB759QL;
 				ENABLE_BITCODE = NO;
@@ -1154,7 +1154,7 @@
 					"$(SDKROOT)/usr/lib/swift",
 					"$(inherited)",
 				);
-				MARKETING_VERSION = 2.2.0;
+				MARKETING_VERSION = 2.2.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1180,7 +1180,7 @@
 				CODE_SIGN_ENTITLEMENTS = HEXA/Hexa.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 582;
+				CURRENT_PROJECT_VERSION = 584;
 				DEVELOPMENT_TEAM = Y5TCB759QL;
 				INFOPLIST_FILE = "HEXA/HEXA.Dev-Info.plist";
 				INFOPLIST_KEY_CFBundleDisplayName = "Bitcoin Tribe dev";
@@ -1191,7 +1191,7 @@
 					"$(SDKROOT)/usr/lib/swift",
 					"$(inherited)",
 				);
-				MARKETING_VERSION = 2.2.0;
+				MARKETING_VERSION = 2.2.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1216,7 +1216,7 @@
 				CODE_SIGN_ENTITLEMENTS = HEXA/Hexa.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 582;
+				CURRENT_PROJECT_VERSION = 584;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = Y5TCB759QL;
 				ENABLE_BITCODE = NO;
@@ -1229,7 +1229,7 @@
 					"$(SDKROOT)/usr/lib/swift",
 					"$(inherited)",
 				);
-				MARKETING_VERSION = 2.2.0;
+				MARKETING_VERSION = 2.2.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1255,7 +1255,7 @@
 				CODE_SIGN_ENTITLEMENTS = HEXA/Hexa.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 582;
+				CURRENT_PROJECT_VERSION = 584;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = Y5TCB759QL;
 				INFOPLIST_FILE = "HEXA/HEXA.Stage-Info.plist";
@@ -1267,7 +1267,7 @@
 					"$(SDKROOT)/usr/lib/swift",
 					"$(inherited)",
 				);
-				MARKETING_VERSION = 2.2.0;
+				MARKETING_VERSION = 2.2.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

src/components/border-wallet/RecoverBorderWalletModal.tsx

@@ -66,7 +66,7 @@ export default function RecoverBorderWalletModal( props ) {
                 marginTop: wp( '2%' ),
               }}
             >
-            Recovering a border wallet involves using an Entropy Grid, user-generated patterns, and a Final Word <Text style={styles.boldText}>Number</Text>. These components reconstruct the Bitcoin seed phrases.
+            Recovering a border wallet involves using an Entropy Grid, user-generated patterns, and a Final Word. These components reconstruct the Bitcoin seed phrases.
             </Text>
             <View style={{
               justifyContent: 'center', alignItems: 'center'

src/pages/NewBHR/BackupMethods.tsx

@@ -222,7 +222,7 @@ export default function BackupMethods( { navigation } ) {
               <Text style={{
                 fontSize: RFValue( 11 ), fontFamily: Fonts.Regular, color: Colors.black, margin: 10, textAlign: 'center'
               }}>
-              Created with Border wallet
+              Backup with Border wallet
               </Text>
             </TouchableOpacity>
 

src/pages/NewWalletName.tsx

@@ -79,7 +79,7 @@ export default function NewWalletName( props ) {
   const [ message, setMessage ] = useState( strings.Creatingyourwallet )
   const [ signUpStarted, setSignUpStarted ] = useState( false )
   const mnemonic = props.navigation.getParam( 'mnemonic' ) || null
-  const initialMnemonic = props.navigation.getParam( 'initialMnemonic' ) || null
+  const initialMnemonic = props.navigation.getParam( 'initialMnemonic' ) || ''
 
   useEffect( () => {
     if ( walletSetupCompleted ) {

src/pages/WalletInitializationScreen.tsx

@@ -121,7 +121,7 @@ const WalletInitializationScreen = props => {
             <View style={styles.textView}>
               <Text style={styles.touchableText}>
                 {
-                  'Create a Border Wallet'
+                  'Create with Border Wallet'
                 }
               </Text>
             </View>
@@ -214,7 +214,7 @@ const WalletInitializationScreen = props => {
             <View style={styles.textView}>
               <Text style={styles.touchableText}>
                 {
-                  'Using a Border Wallet'
+                  'Using Border Wallet'
                 }
               </Text>
             </View>

src/pages/borderwallet/BorderWalletGridScreen.tsx

@@ -114,9 +114,6 @@ const styles = StyleSheet.create( {
   selectionNextBtn:{
     padding: 20,
     backgroundColor: '#69A2B0',
-    position: 'absolute',
-    bottom: 35,
-    right: 35,
     zIndex: 10,
     borderRadius: 10,
     flexDirection: 'row'
@@ -158,9 +155,9 @@ const styles = StyleSheet.create( {
   },
   bottomViewWrapper: {
     width: '100%',
-    backgroundColor: Colors.LIGHT_BACKGROUND,
+    backgroundColor: 'rgba(242, 242, 242,0.6)',
     position: 'absolute',
-    bottom: 15,
+    bottom: 0,
     flexDirection: 'row',
     alignItems: 'center',
     justifyContent: 'flex-end',
@@ -170,7 +167,8 @@ const styles = StyleSheet.create( {
   },
   startAgainBtnWrapper: {
     flexDirection: 'row',
-    alignItems: 'center'
+    alignItems: 'center',
+    marginRight: 10
   },
   startAgainBtnText: {
     fontSize: RFValue( 13 ),
@@ -271,7 +269,7 @@ const BorderWalletGridScreen = ( { navigation } ) => {
       selected.push( index )
       setSelected( [ ...selected ] )
     }else{
-      Toast( 'Pattern limits reached.' )
+      Toast( 'Pattern selection limit reached. You have selected 11 words' )
     }
   }
 
@@ -400,7 +398,7 @@ const BorderWalletGridScreen = ( { navigation } ) => {
               overScrollMode="never"
               bounces={false}
               scrollEnabled={false}
-              showsHorizontalScrollIndicator={false}
+              showsVerticalScrollIndicator={false}
               renderItem={( { item } ) => (
                 <View style={styles.cell}>
                   <Text style={styles.ceilText}>{( '000' + ( item + 1 ) ).substr( -3 )}</Text>

src/pages/borderwallet/ConfirmDownload.tsx

@@ -1,4 +1,4 @@
-import React, { useContext, useState } from 'react'
+import React, { useContext, useEffect, useState } from 'react'
 import {
   View,
   SafeAreaView,
@@ -7,12 +7,13 @@ import {
   FlatList,
   Text,
   TouchableOpacity,
+  ActivityIndicator
 } from 'react-native'
 import Colors from '../../common/Colors'
 import { RFValue } from 'react-native-responsive-fontsize'
 import SeedHeaderComponent from '../NewBHR/SeedHeaderComponent'
 import Fonts from '../../common/Fonts'
-import { hp } from '../../common/data/responsiveness/responsive'
+import { hp, windowHeight } from '../../common/data/responsiveness/responsive'
 import LinearGradient from 'react-native-linear-gradient'
 import ModalContainer from '../../components/home/ModalContainer'
 import BorderWalletSuccessModal from '../../components/border-wallet/BorderWalletSuccessModal'
@@ -23,6 +24,7 @@ const ConfirmDownload = ( props ) => {
   const common = translations[ 'common' ]
   const [ headerTitle, setHeaderTitle ]=useState( 'Memorise/Download' )
   const [ successModal, setSuccessModal ] = useState( false )
+  const [ loading, setLoading ] = useState( true )
   const mnemonic = props.navigation.getParam( 'mnemonic' )
   const grid = Array( 2048 ).fill( 0 )
   const pattern = props.navigation.getParam( 'selected' )
@@ -63,6 +65,7 @@ const ConfirmDownload = ( props ) => {
             renderItem={( { item, index } )=>(
               <View style={pattern.includes( index ) ?  styles.patternPreviewStyle : styles.previewStyle}/>
             )}
+            initialNumToRender={1000}
             numColumns={16}
             keyExtractor={item => item.id}
           />
@@ -182,7 +185,7 @@ const styles = StyleSheet.create( {
     flexDirection: 'row',
     width: '100%',
     marginHorizontal: 20,
-    height: '70%'
+    height: windowHeight>800? '70%' : '66%'
 
   },
   patternWrapper: {

src/pages/borderwallet/CreateWithBorderWallet.tsx

@@ -54,7 +54,7 @@ const CreateWithBorderWallet = ( props ) => {
         onPressBack={() => {
           props.navigation.goBack()
         }}
-        info1={'Step 1 of Creating a Border Wallet'}
+        info1={'Step 1 of Creating with Border Wallet'}
         info={'Note down these 12 word Regeneration Mnemonic'}
         selectedTitle={headerTitle}
       />

src/pages/borderwallet/PreviewPattern.tsx

@@ -79,13 +79,6 @@ const styles = StyleSheet.create( {
     fontSize: 12,
     color: '#BEBBBB'
   },
-  textSeq: {
-    textAlign: 'left',
-    fontSize: 9,
-    color: '#F8F8F8',
-    top: -6,
-    left: -10
-  },
   headerWrapper: {
     width: '100%',
     flexDirection: 'row',
@@ -120,12 +113,21 @@ const styles = StyleSheet.create( {
     width: windowWidth/22,
     backgroundColor: '#B5B5B5',
     margin: 1,
+    justifyContent:'center',
+    alignItems: 'center'
   },
   patternPreviewStyle: {
     height: blockheight,
     width: windowWidth/22,
     backgroundColor: '#304E55',
     margin: 1,
+    justifyContent:'center',
+    alignItems: 'center'
+  },
+  textSeq: {
+    color: 'white',
+    fontSize: 9,
+    fontFamily: Fonts.Regular
   }
 } )
 
@@ -246,10 +248,17 @@ const PreviewPattern = ( { navigation } ) => {
                 <FlatList
                   scrollEnabled={false}
                   bounces={false}
+                  showsVerticalScrollIndicator={false}
                   data={grid}
-                  renderItem={( { item, index } )=>(
-                    <View style={pattern.includes( index ) ?  styles.patternPreviewStyle : styles.previewStyle}/>
-                  )}
+                  renderItem={( { item, index } )=> {
+                    const isIncluded = pattern.includes( index )
+                    return (
+                      <View style={isIncluded ?  styles.patternPreviewStyle : styles.previewStyle}>
+                        {isIncluded && ( <Text style={styles.textSeq}>{pattern.indexOf( index )+1}</Text> )}
+                      </View>
+                    )
+                  }
+                  }
                   numColumns={16}
                   keyExtractor={item => item.id}
                 />

src/pages/borderwallet/RecoverBorderWallet.tsx

@@ -148,7 +148,7 @@ const RecoverBorderWallet = ( props ) => {
         onPressBack={() => {
           props.navigation.goBack()
         }}
-        info1={'Step 1 of Recover a Border Wallet'}
+        info1={'Step 1 of Recover Border Wallet'}
         selectedTitle={'Enter Entropy Grid Regeneration Mnemonic'}
         info={'Enter 1 - 6 of 12 word Entropy Grid Regeneration Mnemonic'}
       />

src/pages/borderwallet/RegenerateEntropyGrid.tsx

@@ -34,7 +34,7 @@ const RegenerateEntropyGrid = ( props ) => {
         onPressBack={() => {
           props.navigation.goBack()
         }}
-        info1={'Step 1 of Recover a Border Wallet'}
+        info1={'Step 1 of Recover Border Wallet'}
         selectedTitle={'Regenerate Entropy Grid'}
         info={'Enter the 12 word Entropy Grid Regeneration Mnemonic'}
       />

src/pages/borderwallet/SelectChecksumWord.tsx

@@ -12,7 +12,7 @@ import Colors from '../../common/Colors'
 import { RFValue } from 'react-native-responsive-fontsize'
 import SeedHeaderComponent from '../NewBHR/SeedHeaderComponent'
 import Fonts from '../../common/Fonts'
-import { hp, wp } from '../../common/data/responsiveness/responsive'
+import { hp, windowHeight, wp } from '../../common/data/responsiveness/responsive'
 import LinearGradient from 'react-native-linear-gradient'
 import deviceInfoModule from 'react-native-device-info'
 import IconArrowDown from '../../assets/images/svgs/icon_arrow_down.svg'
@@ -184,7 +184,7 @@ const SelectChecksumWord = ( props ) => {
       </TouchableOpacity>
       <View
         style={{
-          height: '40%',
+          height: windowHeight> 800? '40%' : '36%',
         }}
       >
         {showDropdown && (
@@ -223,7 +223,7 @@ const SelectChecksumWord = ( props ) => {
           onPress={onPressNext}
         >
           <LinearGradient
-            colors={[ Colors.blue, Colors.darkBlue ]}
+            colors={checksumWord !== 'Select checksum word'?[ Colors.blue, Colors.darkBlue ]: [ Colors.greyTextColor, Colors.greyTextColor ]}
             start={{
               x: 0,
               y: 0,