Skip to content

Commit d682b9d

Browse files
cakesoft-shashankcakesoft-shashank
authored
Merge pull request #6649 from bithyve/development
Build 584
2 parents aac60bf + a14369a commit d682b9d

14 files changed

+61
-53
lines changed

‎android/app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ android {
5959
applicationId "io.hexawallet.hexa"
6060
minSdkVersion rootProject.ext.minSdkVersion
6161
targetSdkVersion rootProject.ext.targetSdkVersion
62-
versionCode 582
63-
versionName "2.2.0"
62+
versionCode 584
63+
versionName "2.2.1"
6464
missingDimensionStrategy 'react-native-camera', 'general'
6565
multiDexEnabled true
6666
resValue "string", "build_config_package", "io.hexawallet.hexa"

‎ios/HEXA.xcodeproj/project.pbxproj

+12-12
Original file line numberDiff line numberDiff line change
@@ -1059,7 +1059,7 @@
10591059
CODE_SIGN_ENTITLEMENTS = HEXA/Hexa.entitlements;
10601060
CODE_SIGN_IDENTITY = "Apple Development";
10611061
CODE_SIGN_STYLE = Automatic;
1062-
CURRENT_PROJECT_VERSION = 582;
1062+
CURRENT_PROJECT_VERSION = 584;
10631063
DEAD_CODE_STRIPPING = YES;
10641064
DEVELOPMENT_TEAM = "";
10651065
ENABLE_BITCODE = NO;
@@ -1072,7 +1072,7 @@
10721072
"$(SDKROOT)/usr/lib/swift",
10731073
"$(inherited)",
10741074
);
1075-
MARKETING_VERSION = 2.2.0;
1075+
MARKETING_VERSION = 2.2.1;
10761076
OTHER_LDFLAGS = (
10771077
"$(inherited)",
10781078
"-ObjC",
@@ -1098,7 +1098,7 @@
10981098
CODE_SIGN_ENTITLEMENTS = HEXA/Hexa.entitlements;
10991099
CODE_SIGN_IDENTITY = "iPhone Distribution";
11001100
CODE_SIGN_STYLE = Manual;
1101-
CURRENT_PROJECT_VERSION = 582;
1101+
CURRENT_PROJECT_VERSION = 584;
11021102
DEAD_CODE_STRIPPING = YES;
11031103
DEVELOPMENT_TEAM = Y5TCB759QL;
11041104
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = Y5TCB759QL;
@@ -1111,7 +1111,7 @@
11111111
"$(SDKROOT)/usr/lib/swift",
11121112
"$(inherited)",
11131113
);
1114-
MARKETING_VERSION = 2.2.0;
1114+
MARKETING_VERSION = 2.2.1;
11151115
OTHER_LDFLAGS = (
11161116
"$(inherited)",
11171117
"-ObjC",
@@ -1137,7 +1137,7 @@
11371137
CODE_SIGN_ENTITLEMENTS = HEXA/Hexa.entitlements;
11381138
CODE_SIGN_IDENTITY = "Apple Development";
11391139
CODE_SIGN_STYLE = Automatic;
1140-
CURRENT_PROJECT_VERSION = 582;
1140+
CURRENT_PROJECT_VERSION = 584;
11411141
DEAD_CODE_STRIPPING = YES;
11421142
DEVELOPMENT_TEAM = Y5TCB759QL;
11431143
ENABLE_BITCODE = NO;
@@ -1154,7 +1154,7 @@
11541154
"$(SDKROOT)/usr/lib/swift",
11551155
"$(inherited)",
11561156
);
1157-
MARKETING_VERSION = 2.2.0;
1157+
MARKETING_VERSION = 2.2.1;
11581158
OTHER_LDFLAGS = (
11591159
"$(inherited)",
11601160
"-ObjC",
@@ -1180,7 +1180,7 @@
11801180
CODE_SIGN_ENTITLEMENTS = HEXA/Hexa.entitlements;
11811181
CODE_SIGN_IDENTITY = "iPhone Developer";
11821182
CODE_SIGN_STYLE = Manual;
1183-
CURRENT_PROJECT_VERSION = 582;
1183+
CURRENT_PROJECT_VERSION = 584;
11841184
DEVELOPMENT_TEAM = Y5TCB759QL;
11851185
INFOPLIST_FILE = "HEXA/HEXA.Dev-Info.plist";
11861186
INFOPLIST_KEY_CFBundleDisplayName = "Bitcoin Tribe dev";
@@ -1191,7 +1191,7 @@
11911191
"$(SDKROOT)/usr/lib/swift",
11921192
"$(inherited)",
11931193
);
1194-
MARKETING_VERSION = 2.2.0;
1194+
MARKETING_VERSION = 2.2.1;
11951195
OTHER_LDFLAGS = (
11961196
"$(inherited)",
11971197
"-ObjC",
@@ -1216,7 +1216,7 @@
12161216
CODE_SIGN_ENTITLEMENTS = HEXA/Hexa.entitlements;
12171217
CODE_SIGN_IDENTITY = "iPhone Developer";
12181218
CODE_SIGN_STYLE = Manual;
1219-
CURRENT_PROJECT_VERSION = 582;
1219+
CURRENT_PROJECT_VERSION = 584;
12201220
DEAD_CODE_STRIPPING = YES;
12211221
DEVELOPMENT_TEAM = Y5TCB759QL;
12221222
ENABLE_BITCODE = NO;
@@ -1229,7 +1229,7 @@
12291229
"$(SDKROOT)/usr/lib/swift",
12301230
"$(inherited)",
12311231
);
1232-
MARKETING_VERSION = 2.2.0;
1232+
MARKETING_VERSION = 2.2.1;
12331233
OTHER_LDFLAGS = (
12341234
"$(inherited)",
12351235
"-ObjC",
@@ -1255,7 +1255,7 @@
12551255
CODE_SIGN_ENTITLEMENTS = HEXA/Hexa.entitlements;
12561256
CODE_SIGN_IDENTITY = "iPhone Developer";
12571257
CODE_SIGN_STYLE = Manual;
1258-
CURRENT_PROJECT_VERSION = 582;
1258+
CURRENT_PROJECT_VERSION = 584;
12591259
DEAD_CODE_STRIPPING = YES;
12601260
DEVELOPMENT_TEAM = Y5TCB759QL;
12611261
INFOPLIST_FILE = "HEXA/HEXA.Stage-Info.plist";
@@ -1267,7 +1267,7 @@
12671267
"$(SDKROOT)/usr/lib/swift",
12681268
"$(inherited)",
12691269
);
1270-
MARKETING_VERSION = 2.2.0;
1270+
MARKETING_VERSION = 2.2.1;
12711271
OTHER_LDFLAGS = (
12721272
"$(inherited)",
12731273
"-ObjC",

‎src/components/border-wallet/RecoverBorderWalletModal.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export default function RecoverBorderWalletModal( props ) {
6666
marginTop: wp( '2%' ),
6767
}}
6868
>
69-
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.
69+
Recovering a border wallet involves using an Entropy Grid, user-generated patterns, and a Final Word. These components reconstruct the Bitcoin seed phrases.
7070
</Text>
7171
<View style={{
7272
justifyContent: 'center', alignItems: 'center'

‎src/pages/NewBHR/BackupMethods.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ export default function BackupMethods( { navigation } ) {
222222
<Text style={{
223223
fontSize: RFValue( 11 ), fontFamily: Fonts.Regular, color: Colors.black, margin: 10, textAlign: 'center'
224224
}}>
225-
Created with Border wallet
225+
Backup with Border wallet
226226
</Text>
227227
</TouchableOpacity>
228228

‎src/pages/NewWalletName.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export default function NewWalletName( props ) {
7979
const [ message, setMessage ] = useState( strings.Creatingyourwallet )
8080
const [ signUpStarted, setSignUpStarted ] = useState( false )
8181
const mnemonic = props.navigation.getParam( 'mnemonic' ) || null
82-
const initialMnemonic = props.navigation.getParam( 'initialMnemonic' ) || null
82+
const initialMnemonic = props.navigation.getParam( 'initialMnemonic' ) || ''
8383

8484
useEffect( () => {
8585
if ( walletSetupCompleted ) {

‎src/pages/WalletInitializationScreen.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ const WalletInitializationScreen = props => {
121121
<View style={styles.textView}>
122122
<Text style={styles.touchableText}>
123123
{
124-
'Create a Border Wallet'
124+
'Create with Border Wallet'
125125
}
126126
</Text>
127127
</View>
@@ -214,7 +214,7 @@ const WalletInitializationScreen = props => {
214214
<View style={styles.textView}>
215215
<Text style={styles.touchableText}>
216216
{
217-
'Using a Border Wallet'
217+
'Using Border Wallet'
218218
}
219219
</Text>
220220
</View>

‎src/pages/borderwallet/BorderWalletGridScreen.tsx

+6-8
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,6 @@ const styles = StyleSheet.create( {
114114
selectionNextBtn:{
115115
padding: 20,
116116
backgroundColor: '#69A2B0',
117-
position: 'absolute',
118-
bottom: 35,
119-
right: 35,
120117
zIndex: 10,
121118
borderRadius: 10,
122119
flexDirection: 'row'
@@ -158,9 +155,9 @@ const styles = StyleSheet.create( {
158155
},
159156
bottomViewWrapper: {
160157
width: '100%',
161-
backgroundColor: Colors.LIGHT_BACKGROUND,
158+
backgroundColor: 'rgba(242, 242, 242,0.6)',
162159
position: 'absolute',
163-
bottom: 15,
160+
bottom: 0,
164161
flexDirection: 'row',
165162
alignItems: 'center',
166163
justifyContent: 'flex-end',
@@ -170,7 +167,8 @@ const styles = StyleSheet.create( {
170167
},
171168
startAgainBtnWrapper: {
172169
flexDirection: 'row',
173-
alignItems: 'center'
170+
alignItems: 'center',
171+
marginRight: 10
174172
},
175173
startAgainBtnText: {
176174
fontSize: RFValue( 13 ),
@@ -271,7 +269,7 @@ const BorderWalletGridScreen = ( { navigation } ) => {
271269
selected.push( index )
272270
setSelected( [ ...selected ] )
273271
}else{
274-
Toast( 'Pattern limits reached.' )
272+
Toast( 'Pattern selection limit reached. You have selected 11 words' )
275273
}
276274
}
277275

@@ -400,7 +398,7 @@ const BorderWalletGridScreen = ( { navigation } ) => {
400398
overScrollMode="never"
401399
bounces={false}
402400
scrollEnabled={false}
403-
showsHorizontalScrollIndicator={false}
401+
showsVerticalScrollIndicator={false}
404402
renderItem={( { item } ) => (
405403
<View style={styles.cell}>
406404
<Text style={styles.ceilText}>{( '000' + ( item + 1 ) ).substr( -3 )}</Text>

‎src/pages/borderwallet/ConfirmDownload.tsx

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { useContext, useState } from 'react'
1+
import React, { useContext, useEffect, useState } from 'react'
22
import {
33
View,
44
SafeAreaView,
@@ -7,12 +7,13 @@ import {
77
FlatList,
88
Text,
99
TouchableOpacity,
10+
ActivityIndicator
1011
} from 'react-native'
1112
import Colors from '../../common/Colors'
1213
import { RFValue } from 'react-native-responsive-fontsize'
1314
import SeedHeaderComponent from '../NewBHR/SeedHeaderComponent'
1415
import Fonts from '../../common/Fonts'
15-
import { hp } from '../../common/data/responsiveness/responsive'
16+
import { hp, windowHeight } from '../../common/data/responsiveness/responsive'
1617
import LinearGradient from 'react-native-linear-gradient'
1718
import ModalContainer from '../../components/home/ModalContainer'
1819
import BorderWalletSuccessModal from '../../components/border-wallet/BorderWalletSuccessModal'
@@ -23,6 +24,7 @@ const ConfirmDownload = ( props ) => {
2324
const common = translations[ 'common' ]
2425
const [ headerTitle, setHeaderTitle ]=useState( 'Memorise/Download' )
2526
const [ successModal, setSuccessModal ] = useState( false )
27+
const [ loading, setLoading ] = useState( true )
2628
const mnemonic = props.navigation.getParam( 'mnemonic' )
2729
const grid = Array( 2048 ).fill( 0 )
2830
const pattern = props.navigation.getParam( 'selected' )
@@ -63,6 +65,7 @@ const ConfirmDownload = ( props ) => {
6365
renderItem={( { item, index } )=>(
6466
<View style={pattern.includes( index ) ? styles.patternPreviewStyle : styles.previewStyle}/>
6567
)}
68+
initialNumToRender={1000}
6669
numColumns={16}
6770
keyExtractor={item => item.id}
6871
/>
@@ -182,7 +185,7 @@ const styles = StyleSheet.create( {
182185
flexDirection: 'row',
183186
width: '100%',
184187
marginHorizontal: 20,
185-
height: '70%'
188+
height: windowHeight>800? '70%' : '66%'
186189

187190
},
188191
patternWrapper: {

‎src/pages/borderwallet/CreateWithBorderWallet.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ const CreateWithBorderWallet = ( props ) => {
5454
onPressBack={() => {
5555
props.navigation.goBack()
5656
}}
57-
info1={'Step 1 of Creating a Border Wallet'}
57+
info1={'Step 1 of Creating with Border Wallet'}
5858
info={'Note down these 12 word Regeneration Mnemonic'}
5959
selectedTitle={headerTitle}
6060
/>

‎src/pages/borderwallet/PreviewPattern.tsx

+19-10
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,6 @@ const styles = StyleSheet.create( {
7979
fontSize: 12,
8080
color: '#BEBBBB'
8181
},
82-
textSeq: {
83-
textAlign: 'left',
84-
fontSize: 9,
85-
color: '#F8F8F8',
86-
top: -6,
87-
left: -10
88-
},
8982
headerWrapper: {
9083
width: '100%',
9184
flexDirection: 'row',
@@ -120,12 +113,21 @@ const styles = StyleSheet.create( {
120113
width: windowWidth/22,
121114
backgroundColor: '#B5B5B5',
122115
margin: 1,
116+
justifyContent:'center',
117+
alignItems: 'center'
123118
},
124119
patternPreviewStyle: {
125120
height: blockheight,
126121
width: windowWidth/22,
127122
backgroundColor: '#304E55',
128123
margin: 1,
124+
justifyContent:'center',
125+
alignItems: 'center'
126+
},
127+
textSeq: {
128+
color: 'white',
129+
fontSize: 9,
130+
fontFamily: Fonts.Regular
129131
}
130132
} )
131133

@@ -246,10 +248,17 @@ const PreviewPattern = ( { navigation } ) => {
246248
<FlatList
247249
scrollEnabled={false}
248250
bounces={false}
251+
showsVerticalScrollIndicator={false}
249252
data={grid}
250-
renderItem={( { item, index } )=>(
251-
<View style={pattern.includes( index ) ? styles.patternPreviewStyle : styles.previewStyle}/>
252-
)}
253+
renderItem={( { item, index } )=> {
254+
const isIncluded = pattern.includes( index )
255+
return (
256+
<View style={isIncluded ? styles.patternPreviewStyle : styles.previewStyle}>
257+
{isIncluded && ( <Text style={styles.textSeq}>{pattern.indexOf( index )+1}</Text> )}
258+
</View>
259+
)
260+
}
261+
}
253262
numColumns={16}
254263
keyExtractor={item => item.id}
255264
/>

‎src/pages/borderwallet/RecoverBorderWallet.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ const RecoverBorderWallet = ( props ) => {
148148
onPressBack={() => {
149149
props.navigation.goBack()
150150
}}
151-
info1={'Step 1 of Recover a Border Wallet'}
151+
info1={'Step 1 of Recover Border Wallet'}
152152
selectedTitle={'Enter Entropy Grid Regeneration Mnemonic'}
153153
info={'Enter 1 - 6 of 12 word Entropy Grid Regeneration Mnemonic'}
154154
/>

‎src/pages/borderwallet/RegenerateEntropyGrid.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ const RegenerateEntropyGrid = ( props ) => {
3434
onPressBack={() => {
3535
props.navigation.goBack()
3636
}}
37-
info1={'Step 1 of Recover a Border Wallet'}
37+
info1={'Step 1 of Recover Border Wallet'}
3838
selectedTitle={'Regenerate Entropy Grid'}
3939
info={'Enter the 12 word Entropy Grid Regeneration Mnemonic'}
4040
/>

‎src/pages/borderwallet/SelectChecksumWord.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import Colors from '../../common/Colors'
1212
import { RFValue } from 'react-native-responsive-fontsize'
1313
import SeedHeaderComponent from '../NewBHR/SeedHeaderComponent'
1414
import Fonts from '../../common/Fonts'
15-
import { hp, wp } from '../../common/data/responsiveness/responsive'
15+
import { hp, windowHeight, wp } from '../../common/data/responsiveness/responsive'
1616
import LinearGradient from 'react-native-linear-gradient'
1717
import deviceInfoModule from 'react-native-device-info'
1818
import IconArrowDown from '../../assets/images/svgs/icon_arrow_down.svg'
@@ -184,7 +184,7 @@ const SelectChecksumWord = ( props ) => {
184184
</TouchableOpacity>
185185
<View
186186
style={{
187-
height: '40%',
187+
height: windowHeight> 800? '40%' : '36%',
188188
}}
189189
>
190190
{showDropdown && (
@@ -223,7 +223,7 @@ const SelectChecksumWord = ( props ) => {
223223
onPress={onPressNext}
224224
>
225225
<LinearGradient
226-
colors={[ Colors.blue, Colors.darkBlue ]}
226+
colors={checksumWord !== 'Select checksum word'?[ Colors.blue, Colors.darkBlue ]: [ Colors.greyTextColor, Colors.greyTextColor ]}
227227
start={{
228228
x: 0,
229229
y: 0,

0 commit comments

Comments
 (0)