From 07ca1f7494eb5c551e408531f36c9be4c39d32d2 Mon Sep 17 00:00:00 2001 From: akshay8551 Date: Mon, 14 Aug 2023 10:44:59 +0530 Subject: [PATCH 01/20] Resolved - White line on the grid #6637 --- src/pages/borderwallet/BorderWalletGridScreen.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/borderwallet/BorderWalletGridScreen.tsx b/src/pages/borderwallet/BorderWalletGridScreen.tsx index 2f167960e..5c21af01e 100644 --- a/src/pages/borderwallet/BorderWalletGridScreen.tsx +++ b/src/pages/borderwallet/BorderWalletGridScreen.tsx @@ -10,6 +10,7 @@ import { FlatList, InteractionManager, ActivityIndicator, + Platform, } from 'react-native' import Colors from '../../common/Colors' import FontAwesome from 'react-native-vector-icons/FontAwesome' @@ -160,7 +161,7 @@ const styles = StyleSheet.create( { width: '100%', backgroundColor: Colors.LIGHT_BACKGROUND, position: 'absolute', - bottom: 15, + bottom: Platform.OS === 'ios' ? 15 : 0, flexDirection: 'row', alignItems: 'center', justifyContent: 'flex-end', From 5a685daf5bbe67cd5b89dfb2abdbba419092d566 Mon Sep 17 00:00:00 2001 From: akshay8551 Date: Mon, 14 Aug 2023 10:45:55 +0530 Subject: [PATCH 02/20] Update Message - Grid selection 12th word #6627 --- src/pages/borderwallet/BorderWalletGridScreen.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/borderwallet/BorderWalletGridScreen.tsx b/src/pages/borderwallet/BorderWalletGridScreen.tsx index 5c21af01e..6def91490 100644 --- a/src/pages/borderwallet/BorderWalletGridScreen.tsx +++ b/src/pages/borderwallet/BorderWalletGridScreen.tsx @@ -272,7 +272,7 @@ const BorderWalletGridScreen = ( { navigation } ) => { selected.push( index ) setSelected( [ ...selected ] ) }else{ - Toast( 'Pattern limits reached.' ) + Toast( 'Pattern selection limit reached. You have selected 11 words' ) } } From 4115be2e84ef4e89f45a549d5fa165cf2b3008cb Mon Sep 17 00:00:00 2001 From: Shashank Shinde Date: Mon, 14 Aug 2023 13:41:17 +0530 Subject: [PATCH 03/20] minor --- src/pages/NewWalletName.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/NewWalletName.tsx b/src/pages/NewWalletName.tsx index 34f6037aa..09a6097ac 100644 --- a/src/pages/NewWalletName.tsx +++ b/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 ) { From b54c152b0e5fd896ba0f792c5a7422f86bb1dd24 Mon Sep 17 00:00:00 2001 From: akshay8551 Date: Mon, 14 Aug 2023 14:06:10 +0530 Subject: [PATCH 04/20] Resolved - CTA does not respond #6639 --- src/pages/borderwallet/BorderWalletGridScreen.tsx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/pages/borderwallet/BorderWalletGridScreen.tsx b/src/pages/borderwallet/BorderWalletGridScreen.tsx index 6def91490..3c42056f5 100644 --- a/src/pages/borderwallet/BorderWalletGridScreen.tsx +++ b/src/pages/borderwallet/BorderWalletGridScreen.tsx @@ -115,9 +115,6 @@ const styles = StyleSheet.create( { selectionNextBtn:{ padding: 20, backgroundColor: '#69A2B0', - position: 'absolute', - bottom: 35, - right: 35, zIndex: 10, borderRadius: 10, flexDirection: 'row' @@ -161,7 +158,7 @@ const styles = StyleSheet.create( { width: '100%', backgroundColor: Colors.LIGHT_BACKGROUND, position: 'absolute', - bottom: Platform.OS === 'ios' ? 15 : 0, + bottom: 0, flexDirection: 'row', alignItems: 'center', justifyContent: 'flex-end', @@ -171,7 +168,8 @@ const styles = StyleSheet.create( { }, startAgainBtnWrapper: { flexDirection: 'row', - alignItems: 'center' + alignItems: 'center', + marginRight: 10 }, startAgainBtnText: { fontSize: RFValue( 13 ), @@ -211,7 +209,7 @@ const BorderWalletGridScreen = ( { navigation } ) => { const [ createMemorablePattern, setCreateMemorablePattern ] = useState( false ) useEffect( ()=> { - if( isNewWallet ) setCreateMemorablePattern( true ) + // if( isNewWallet ) setCreateMemorablePattern( true ) }, [] ) const rnd11Bit = ( limit = 2048 ) => { From 1df1334ebf016cdf53712cc1e2212ec3ce0a93ad Mon Sep 17 00:00:00 2001 From: akshay8551 Date: Mon, 14 Aug 2023 14:06:57 +0530 Subject: [PATCH 05/20] minor --- src/pages/borderwallet/BorderWalletGridScreen.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pages/borderwallet/BorderWalletGridScreen.tsx b/src/pages/borderwallet/BorderWalletGridScreen.tsx index 3c42056f5..c7550ffcb 100644 --- a/src/pages/borderwallet/BorderWalletGridScreen.tsx +++ b/src/pages/borderwallet/BorderWalletGridScreen.tsx @@ -10,7 +10,6 @@ import { FlatList, InteractionManager, ActivityIndicator, - Platform, } from 'react-native' import Colors from '../../common/Colors' import FontAwesome from 'react-native-vector-icons/FontAwesome' @@ -209,7 +208,7 @@ const BorderWalletGridScreen = ( { navigation } ) => { const [ createMemorablePattern, setCreateMemorablePattern ] = useState( false ) useEffect( ()=> { - // if( isNewWallet ) setCreateMemorablePattern( true ) + if( isNewWallet ) setCreateMemorablePattern( true ) }, [] ) const rnd11Bit = ( limit = 2048 ) => { From f6dc0b7810d3d10387ce22e5c1da23a067974083 Mon Sep 17 00:00:00 2001 From: akshay8551 Date: Mon, 14 Aug 2023 14:10:45 +0530 Subject: [PATCH 06/20] Resolved - Checksum small devices UI issue --- src/pages/borderwallet/SelectChecksumWord.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/borderwallet/SelectChecksumWord.tsx b/src/pages/borderwallet/SelectChecksumWord.tsx index 37f4cef92..58e57cd65 100644 --- a/src/pages/borderwallet/SelectChecksumWord.tsx +++ b/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 ) => { 800? '40%' : '36%', }} > {showDropdown && ( From a223bc2df4dc7deb1ccea36052890fdb28f3662d Mon Sep 17 00:00:00 2001 From: akshay8551 Date: Mon, 14 Aug 2023 14:12:20 +0530 Subject: [PATCH 07/20] Resolved - Memorise/Download screens small devices UI issue --- src/pages/borderwallet/ConfirmDownload.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/borderwallet/ConfirmDownload.tsx b/src/pages/borderwallet/ConfirmDownload.tsx index 3f11cd4ad..e0829bbe9 100644 --- a/src/pages/borderwallet/ConfirmDownload.tsx +++ b/src/pages/borderwallet/ConfirmDownload.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 } 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' @@ -182,7 +182,7 @@ const styles = StyleSheet.create( { flexDirection: 'row', width: '100%', marginHorizontal: 20, - height: '70%' + height: windowHeight>800? '70%' : '66%' }, patternWrapper: { From 0b88c07accee0c5b46a9ad88289e4bc1ade4ee34 Mon Sep 17 00:00:00 2001 From: akshay8551 Date: Mon, 14 Aug 2023 14:13:27 +0530 Subject: [PATCH 08/20] Backup - content changes --- src/pages/NewBHR/BackupMethods.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/NewBHR/BackupMethods.tsx b/src/pages/NewBHR/BackupMethods.tsx index b2c805ae1..da9f0c934 100644 --- a/src/pages/NewBHR/BackupMethods.tsx +++ b/src/pages/NewBHR/BackupMethods.tsx @@ -222,7 +222,7 @@ export default function BackupMethods( { navigation } ) { - Created with Border wallet + Backup with Border wallet From 244563f8b83d7c21027f4ca9a3328032b8f22e31 Mon Sep 17 00:00:00 2001 From: akshay8551 Date: Mon, 14 Aug 2023 14:17:55 +0530 Subject: [PATCH 09/20] Done - Content changes --- src/pages/WalletInitializationScreen.tsx | 4 ++-- src/pages/borderwallet/RecoverBorderWallet.tsx | 2 +- src/pages/borderwallet/RegenerateEntropyGrid.tsx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/WalletInitializationScreen.tsx b/src/pages/WalletInitializationScreen.tsx index ccd68aaa5..5cc6c2213 100644 --- a/src/pages/WalletInitializationScreen.tsx +++ b/src/pages/WalletInitializationScreen.tsx @@ -121,7 +121,7 @@ const WalletInitializationScreen = props => { { - 'Create a Border Wallet' + 'Create with Border Wallet' } @@ -214,7 +214,7 @@ const WalletInitializationScreen = props => { { - 'Using a Border Wallet' + 'Using Border Wallet' } diff --git a/src/pages/borderwallet/RecoverBorderWallet.tsx b/src/pages/borderwallet/RecoverBorderWallet.tsx index 4d4bbf298..090f8b69e 100644 --- a/src/pages/borderwallet/RecoverBorderWallet.tsx +++ b/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'} /> diff --git a/src/pages/borderwallet/RegenerateEntropyGrid.tsx b/src/pages/borderwallet/RegenerateEntropyGrid.tsx index bd8ca5dbe..4a069ad5e 100644 --- a/src/pages/borderwallet/RegenerateEntropyGrid.tsx +++ b/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'} /> From 1345c0f90a71707bca3a51e5dbbbc63a17eeb176 Mon Sep 17 00:00:00 2001 From: akshay8551 Date: Mon, 14 Aug 2023 14:20:18 +0530 Subject: [PATCH 10/20] Content --- src/components/border-wallet/RecoverBorderWalletModal.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/border-wallet/RecoverBorderWalletModal.tsx b/src/components/border-wallet/RecoverBorderWalletModal.tsx index 354deffe1..c4d0d9bc8 100644 --- a/src/components/border-wallet/RecoverBorderWalletModal.tsx +++ b/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 Number. 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. Date: Mon, 14 Aug 2023 14:21:10 +0530 Subject: [PATCH 11/20] minor --- src/pages/borderwallet/BorderWalletGridScreen.tsx | 2 +- src/pages/borderwallet/PreviewPattern.tsx | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/borderwallet/BorderWalletGridScreen.tsx b/src/pages/borderwallet/BorderWalletGridScreen.tsx index c7550ffcb..f21d07fbf 100644 --- a/src/pages/borderwallet/BorderWalletGridScreen.tsx +++ b/src/pages/borderwallet/BorderWalletGridScreen.tsx @@ -398,7 +398,7 @@ const BorderWalletGridScreen = ( { navigation } ) => { overScrollMode="never" bounces={false} scrollEnabled={false} - showsHorizontalScrollIndicator={false} + showsVerticalScrollIndicator={false} renderItem={( { item } ) => ( {( '000' + ( item + 1 ) ).substr( -3 )} diff --git a/src/pages/borderwallet/PreviewPattern.tsx b/src/pages/borderwallet/PreviewPattern.tsx index 27278b5de..c11de8798 100644 --- a/src/pages/borderwallet/PreviewPattern.tsx +++ b/src/pages/borderwallet/PreviewPattern.tsx @@ -246,6 +246,7 @@ const PreviewPattern = ( { navigation } ) => { ( From 65e755c44269ba877f4dedb7fe3d6d7bc88aad1a Mon Sep 17 00:00:00 2001 From: Shashank Shinde Date: Mon, 14 Aug 2023 14:27:57 +0530 Subject: [PATCH 12/20] build v2.2.1(583) --- android/app/build.gradle | 4 ++-- ios/HEXA.xcodeproj/project.pbxproj | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 952ab05c3..19d00006f 100644 --- a/android/app/build.gradle +++ b/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 583 + versionName "2.2.1" missingDimensionStrategy 'react-native-camera', 'general' multiDexEnabled true resValue "string", "build_config_package", "io.hexawallet.hexa" diff --git a/ios/HEXA.xcodeproj/project.pbxproj b/ios/HEXA.xcodeproj/project.pbxproj index b5ed6a5f8..178ef6f0d 100644 --- a/ios/HEXA.xcodeproj/project.pbxproj +++ b/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 = 583; 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 = 583; 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 = 583; 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 = 583; 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 = 583; 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 = 583; 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", From 014093a4e14b33a27fdda076d9b05f47028a7c6d Mon Sep 17 00:00:00 2001 From: akshay8551 Date: Mon, 14 Aug 2023 14:47:08 +0530 Subject: [PATCH 13/20] Grid CTA - Added transperent background --- src/pages/borderwallet/BorderWalletGridScreen.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/borderwallet/BorderWalletGridScreen.tsx b/src/pages/borderwallet/BorderWalletGridScreen.tsx index c7550ffcb..af0cc1735 100644 --- a/src/pages/borderwallet/BorderWalletGridScreen.tsx +++ b/src/pages/borderwallet/BorderWalletGridScreen.tsx @@ -155,7 +155,7 @@ const styles = StyleSheet.create( { }, bottomViewWrapper: { width: '100%', - backgroundColor: Colors.LIGHT_BACKGROUND, + backgroundColor: 'rgba(142, 142, 142,0.3)', position: 'absolute', bottom: 0, flexDirection: 'row', From c0e7ba17c615f1ce7de9fc215305fea444580e31 Mon Sep 17 00:00:00 2001 From: Shashank Shinde Date: Mon, 14 Aug 2023 14:57:28 +0530 Subject: [PATCH 14/20] show sequence --- src/pages/borderwallet/PreviewPattern.tsx | 28 +++++++++++++++-------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/src/pages/borderwallet/PreviewPattern.tsx b/src/pages/borderwallet/PreviewPattern.tsx index c11de8798..cce4346ad 100644 --- a/src/pages/borderwallet/PreviewPattern.tsx +++ b/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 } } ) @@ -248,9 +250,15 @@ const PreviewPattern = ( { navigation } ) => { bounces={false} showsVerticalScrollIndicator={false} data={grid} - renderItem={( { item, index } )=>( - - )} + renderItem={( { item, index } )=> { + const isIncluded = pattern.includes( index ) + return ( + + {isIncluded && ( {pattern.indexOf( index )+1} )} + + ) + } + } numColumns={16} keyExtractor={item => item.id} /> From 6346ebcc1ee92f9cf1e3f3d065b2daeff53639ce Mon Sep 17 00:00:00 2001 From: akshay8551 Date: Mon, 14 Aug 2023 15:50:46 +0530 Subject: [PATCH 15/20] Resolved - delay pattern flatlist item render --- src/pages/borderwallet/ConfirmDownload.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pages/borderwallet/ConfirmDownload.tsx b/src/pages/borderwallet/ConfirmDownload.tsx index e0829bbe9..df46ff2d9 100644 --- a/src/pages/borderwallet/ConfirmDownload.tsx +++ b/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,6 +7,7 @@ import { FlatList, Text, TouchableOpacity, + ActivityIndicator } from 'react-native' import Colors from '../../common/Colors' import { RFValue } from 'react-native-responsive-fontsize' @@ -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 } )=>( )} + initialNumToRender={1000} numColumns={16} keyExtractor={item => item.id} /> From 77023aefd07435895b944babdc97da01d3afadae Mon Sep 17 00:00:00 2001 From: akshay8551 Date: Mon, 14 Aug 2023 17:10:53 +0530 Subject: [PATCH 16/20] Resolved - Select Checksum CTA validation(disable/enable) --- src/pages/borderwallet/SelectChecksumWord.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/borderwallet/SelectChecksumWord.tsx b/src/pages/borderwallet/SelectChecksumWord.tsx index 58e57cd65..b1f4a72cc 100644 --- a/src/pages/borderwallet/SelectChecksumWord.tsx +++ b/src/pages/borderwallet/SelectChecksumWord.tsx @@ -223,7 +223,7 @@ const SelectChecksumWord = ( props ) => { onPress={onPressNext} > Date: Mon, 14 Aug 2023 17:20:00 +0530 Subject: [PATCH 17/20] ValidateBorderWalletPattern - resolved cta alignment issue --- .../borderwallet/ValidateBorderWalletPattern.tsx | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/pages/borderwallet/ValidateBorderWalletPattern.tsx b/src/pages/borderwallet/ValidateBorderWalletPattern.tsx index 0f277ab85..76d9d595c 100644 --- a/src/pages/borderwallet/ValidateBorderWalletPattern.tsx +++ b/src/pages/borderwallet/ValidateBorderWalletPattern.tsx @@ -116,9 +116,6 @@ const styles = StyleSheet.create( { selectionNextBtn:{ padding: 20, backgroundColor: '#69A2B0', - position: 'absolute', - bottom: 35, - right: 35, zIndex: 10, borderRadius: 10, flexDirection: 'row' @@ -160,9 +157,9 @@ const styles = StyleSheet.create( { }, bottomViewWrapper: { width: '100%', - backgroundColor: Colors.LIGHT_BACKGROUND, + backgroundColor: 'rgba(142, 142, 142,0.3)', position: 'absolute', - bottom: 15, + bottom: 0, flexDirection: 'row', alignItems: 'center', justifyContent: 'flex-end', @@ -172,7 +169,8 @@ const styles = StyleSheet.create( { }, startAgainBtnWrapper: { flexDirection: 'row', - alignItems: 'center' + alignItems: 'center', + marginRight: 10 }, startAgainBtnText: { fontSize: RFValue( 13 ), @@ -268,7 +266,7 @@ const ValidateBorderWalletPattern = ( { navigation } ) => { selected.push( index ) setSelected( [ ...selected ] ) }else{ - Toast( 'Pattern limits reached.' ) + Toast( 'Pattern selection limit reached. You have selected 11 words' ) } } From 3826fb94ec2aec02d11d620f16636c2ecfbdc2ce Mon Sep 17 00:00:00 2001 From: akshay8551 Date: Mon, 14 Aug 2023 17:50:13 +0530 Subject: [PATCH 18/20] Changed background color --- src/pages/borderwallet/BorderWalletGridScreen.tsx | 2 +- src/pages/borderwallet/ValidateBorderWalletPattern.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/borderwallet/BorderWalletGridScreen.tsx b/src/pages/borderwallet/BorderWalletGridScreen.tsx index 09bb05a0b..301ee994e 100644 --- a/src/pages/borderwallet/BorderWalletGridScreen.tsx +++ b/src/pages/borderwallet/BorderWalletGridScreen.tsx @@ -155,7 +155,7 @@ const styles = StyleSheet.create( { }, bottomViewWrapper: { width: '100%', - backgroundColor: 'rgba(142, 142, 142,0.3)', + backgroundColor: 'rgba(242, 242, 242,0.6)', position: 'absolute', bottom: 0, flexDirection: 'row', diff --git a/src/pages/borderwallet/ValidateBorderWalletPattern.tsx b/src/pages/borderwallet/ValidateBorderWalletPattern.tsx index 76d9d595c..d53227b6a 100644 --- a/src/pages/borderwallet/ValidateBorderWalletPattern.tsx +++ b/src/pages/borderwallet/ValidateBorderWalletPattern.tsx @@ -157,7 +157,7 @@ const styles = StyleSheet.create( { }, bottomViewWrapper: { width: '100%', - backgroundColor: 'rgba(142, 142, 142,0.3)', + backgroundColor: 'rgba(242, 242, 242,0.6)', position: 'absolute', bottom: 0, flexDirection: 'row', From 0e37c3b3c4df0a5b9fd1164c00ff14ddd6ffaa01 Mon Sep 17 00:00:00 2001 From: akshay8551 Date: Mon, 14 Aug 2023 17:51:08 +0530 Subject: [PATCH 19/20] change content --- src/pages/borderwallet/CreateWithBorderWallet.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/borderwallet/CreateWithBorderWallet.tsx b/src/pages/borderwallet/CreateWithBorderWallet.tsx index 14b9d004c..847b23f69 100644 --- a/src/pages/borderwallet/CreateWithBorderWallet.tsx +++ b/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} /> From 27c063c1df89c8a489beb71bd577561fa6d47a6d Mon Sep 17 00:00:00 2001 From: Shashank Shinde Date: Mon, 14 Aug 2023 17:58:17 +0530 Subject: [PATCH 20/20] build 584 --- android/app/build.gradle | 2 +- ios/HEXA.xcodeproj/project.pbxproj | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 19d00006f..eeee0a37d 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -59,7 +59,7 @@ android { applicationId "io.hexawallet.hexa" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 583 + versionCode 584 versionName "2.2.1" missingDimensionStrategy 'react-native-camera', 'general' multiDexEnabled true diff --git a/ios/HEXA.xcodeproj/project.pbxproj b/ios/HEXA.xcodeproj/project.pbxproj index 178ef6f0d..a4b52b79b 100644 --- a/ios/HEXA.xcodeproj/project.pbxproj +++ b/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 = 583; + CURRENT_PROJECT_VERSION = 584; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = ""; ENABLE_BITCODE = NO; @@ -1098,7 +1098,7 @@ CODE_SIGN_ENTITLEMENTS = HEXA/Hexa.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 583; + CURRENT_PROJECT_VERSION = 584; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = Y5TCB759QL; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = Y5TCB759QL; @@ -1137,7 +1137,7 @@ CODE_SIGN_ENTITLEMENTS = HEXA/Hexa.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 583; + CURRENT_PROJECT_VERSION = 584; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = Y5TCB759QL; ENABLE_BITCODE = NO; @@ -1180,7 +1180,7 @@ CODE_SIGN_ENTITLEMENTS = HEXA/Hexa.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 583; + CURRENT_PROJECT_VERSION = 584; DEVELOPMENT_TEAM = Y5TCB759QL; INFOPLIST_FILE = "HEXA/HEXA.Dev-Info.plist"; INFOPLIST_KEY_CFBundleDisplayName = "Bitcoin Tribe dev"; @@ -1216,7 +1216,7 @@ CODE_SIGN_ENTITLEMENTS = HEXA/Hexa.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 583; + CURRENT_PROJECT_VERSION = 584; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = Y5TCB759QL; ENABLE_BITCODE = NO; @@ -1255,7 +1255,7 @@ CODE_SIGN_ENTITLEMENTS = HEXA/Hexa.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 583; + CURRENT_PROJECT_VERSION = 584; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = Y5TCB759QL; INFOPLIST_FILE = "HEXA/HEXA.Stage-Info.plist";