Skip to content

Commit 79eb69e

Browse files
Merge pull request #6767 from bithyve/staging
build v2.2.5(601)
2 parents a1143a5 + 2e1f845 commit 79eb69e

File tree

10 files changed

+238
-29
lines changed

10 files changed

+238
-29
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 600
63-
versionName "2.2.4"
62+
versionCode 601
63+
versionName "2.2.5"
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 = 600;
1062+
CURRENT_PROJECT_VERSION = 601;
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.4;
1075+
MARKETING_VERSION = 2.2.5;
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 = 600;
1101+
CURRENT_PROJECT_VERSION = 601;
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.4;
1114+
MARKETING_VERSION = 2.2.5;
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 = 600;
1140+
CURRENT_PROJECT_VERSION = 601;
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.4;
1157+
MARKETING_VERSION = 2.2.5;
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 = 600;
1183+
CURRENT_PROJECT_VERSION = 601;
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.4;
1194+
MARKETING_VERSION = 2.2.5;
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 = 600;
1219+
CURRENT_PROJECT_VERSION = 601;
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.4;
1232+
MARKETING_VERSION = 2.2.5;
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 = 600;
1258+
CURRENT_PROJECT_VERSION = 601;
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.4;
1270+
MARKETING_VERSION = 2.2.5;
12711271
OTHER_LDFLAGS = (
12721272
"$(inherited)",
12731273
"-ObjC",
+9
Loading

src/common/Colors.js

+1
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ const Colors = {
8282
// lightning account
8383
orange: '#FF7761',
8484
mango: '#FABA5F',
85+
bwBackground: '#E9983E',
8586

8687
shadowBlack: '#1F000000',
8788
numberBg: '#F4F4F4',

src/common/content/language/en.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -459,8 +459,8 @@
459459
"test6": "Let your imagination run wild, try sending test sats to, and receiving sats, from multiple friends in different permutations and combinations!",
460460
"clickhere": "click here",
461461
"toknowmore": "To know more,",
462-
"checking1": "Store some sats here, but not all. The sats here are your everyday sats - great for spending online or sending to your friends & family",
463-
"checking2": "For safely storing larger amounts of sats, you can use your Savings Account. This will keep your bitcoin safe and sound with better security!",
462+
"checking1": "Checking Account is your default bitcoin wallet. It is a single signature hot wallet",
463+
"checking2": "Store only the amount of funds you would keep in your pocket. Make sure you do the backup using one of the methods provided",
464464
"checking3": "Your Checking Account is a single signature account. Your Savings Account is a 2 of 3 multi-signature account, secured by an authenticator",
465465
"checking4": "Transactions from your Checking Account have lower fees compared to the Savings Account - keep bitcoin here for short-term holding or spending",
466466
"checking5": "Be careful! Someone having your phone's and Bitcoin Tribe wallet’s passcodes, could easily spend or send sats out of your Checking Account. Don't keep sats here you don't expect to use soon",

src/components/account-details/AccountDetailsCard.tsx

+12-10
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import {
3737
import { withNavigation } from 'react-navigation'
3838
import { widthPercentageToDP } from 'react-native-responsive-screen'
3939
import { translations } from '../../common/content/LocContext'
40-
import { hp } from '../../common/data/responsiveness/responsive'
40+
import BWDetailsIcon from '../../assets/images/svgs/bwdetailsIcon.svg'
4141

4242
export type Props = {
4343
accountShell: AccountShell;
@@ -174,13 +174,15 @@ const AccountDetailsCard: React.FC<Props> = ( {
174174
}}
175175
>
176176
<View style={styles.accountKindBadgeImage}>
177-
{getAvatarForSubAccount(
178-
primarySubAccount,
179-
false,
180-
false,
181-
true,
182-
isBorderWallet
183-
)}
177+
{ accountShell.primarySubAccount.type === AccountType.BORDER_WALLET?
178+
<BWDetailsIcon/>
179+
:getAvatarForSubAccount(
180+
primarySubAccount,
181+
false,
182+
false,
183+
true,
184+
isBorderWallet
185+
)}
184186
</View>
185187
<View
186188
style={{
@@ -234,7 +236,7 @@ const AccountDetailsCard: React.FC<Props> = ( {
234236
isTestAccount={isTestAccount}
235237
/>
236238
{accountShell.primarySubAccount.type !== AccountType.SWAN_ACCOUNT &&
237-
!isBorderWallet && <KnowMoreButton />}
239+
<KnowMoreButton />}
238240
</View>
239241
)
240242
}
@@ -311,7 +313,7 @@ const AccountDetailsCard: React.FC<Props> = ( {
311313
...StyleSheet.absoluteFillObject,
312314
backgroundColor:
313315
accountShell.primarySubAccount.type === AccountType.BORDER_WALLET
314-
? Colors.mango
316+
? Colors.bwBackground
315317
: shadowColorForAccountKind( primarySubAccount ),
316318
borderRadius: 15,
317319
}}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,191 @@
1+
import React, { useState, useRef } from 'react'
2+
import { View, Image, Text, StyleSheet } from 'react-native'
3+
import {
4+
widthPercentageToDP as wp,
5+
heightPercentageToDP as hp,
6+
} from 'react-native-responsive-screen'
7+
import Colors from '../../common/Colors'
8+
import Fonts from '../../common/Fonts'
9+
import { RFValue } from 'react-native-responsive-fontsize'
10+
import { AppBottomSheetTouchableWrapper } from '../AppBottomSheetTouchableWrapper'
11+
import FontAwesome from 'react-native-vector-icons/FontAwesome'
12+
import { ScrollView } from 'react-native-gesture-handler'
13+
import { translations } from '../../common/content/LocContext'
14+
import CrossButton from '../../assets/images/svgs/icons_close.svg'
15+
16+
export default function BorderWalletKnowMore( props ) {
17+
const scrollViewRef = useRef<ScrollView>()
18+
const strings = translations[ 'accounts' ]
19+
20+
return (
21+
<View style={{
22+
...styles.modalContainer, ...props.containerStyle
23+
}}>
24+
<View style={{
25+
height: hp( 81 )
26+
}}>
27+
<View
28+
style={{
29+
flexDirection: 'row', justifyContent: 'center', alignItems: 'center'
30+
}}
31+
>
32+
<Text style={styles.headerText}>Border Wallet</Text>
33+
<AppBottomSheetTouchableWrapper style={{
34+
width: wp( 8 ),
35+
height: wp( 8 ),
36+
borderRadius: wp( 4 ),
37+
backgroundColor: Colors.blue,
38+
justifyContent: 'center',
39+
alignItems: 'center',
40+
marginRight: wp( 2 ),
41+
marginLeft: -wp( 10 )
42+
}}
43+
onPress={() => props.titleClicked && props.titleClicked()}>
44+
<CrossButton />
45+
</AppBottomSheetTouchableWrapper>
46+
</View>
47+
<View style={styles.headerSeparator} />
48+
<ScrollView
49+
ref={scrollViewRef}
50+
style={{
51+
// flex: 1,
52+
backgroundColor: Colors.blue,
53+
}}
54+
snapToInterval={hp( '85%' )}
55+
decelerationRate="fast"
56+
>
57+
<View style={styles.ElementView}>
58+
<Text
59+
style={{
60+
...styles.infoText,
61+
// marginTop: wp( '5%' ),
62+
}}
63+
>
64+
This is a wallet account added to your Tribe app using Border Wallet feature by either adding a new one or by importing an existing grid
65+
</Text>
66+
<View style={{
67+
justifyContent: 'center', alignItems: 'center'
68+
}}>
69+
<Image
70+
source={require( '../../assets/images/icons/checking_account_info_1.png' )}
71+
style={styles.helperImage}
72+
/>
73+
</View>
74+
<Text
75+
style={{
76+
...styles.infoText,
77+
marginBottom: wp( '5%' ),
78+
}}
79+
>
80+
If you restore the app, all the accounts including this one will be reinstated. Alternatively you can back this up separately by going into account settings
81+
</Text>
82+
{/* <AppBottomSheetTouchableWrapper
83+
style={{
84+
alignItems: 'center'
85+
}}
86+
onPress={() => {
87+
scrollViewRef.current &&
88+
scrollViewRef.current.scrollTo( {
89+
x: 0,
90+
y: hp( '75%' ),
91+
animated: true,
92+
} )
93+
}}
94+
>
95+
<FontAwesome
96+
name="angle-double-down"
97+
color={Colors.white}
98+
size={40}
99+
/>
100+
</AppBottomSheetTouchableWrapper> */}
101+
<View style={{
102+
justifyContent: 'center', alignItems: 'center'
103+
}}>
104+
</View>
105+
</View>
106+
</ScrollView>
107+
</View>
108+
</View>
109+
)
110+
}
111+
const styles = StyleSheet.create( {
112+
modalContainer: {
113+
// height: '80%',
114+
backgroundColor: Colors.blue,
115+
alignSelf: 'center',
116+
width: '100%',
117+
elevation: 10,
118+
shadowColor: Colors.borderColor,
119+
shadowOpacity: 10,
120+
shadowOffset: {
121+
width: 0, height: 2
122+
},
123+
},
124+
headerText: {
125+
color: Colors.white,
126+
fontFamily: Fonts.Medium,
127+
fontSize: RFValue( 20 ),
128+
marginTop: hp( '2%' ),
129+
marginBottom: hp( '1%' ),
130+
flex: 1,
131+
textAlign: 'center'
132+
},
133+
headerSeparator: {
134+
backgroundColor: Colors.homepageButtonColor,
135+
height: 1,
136+
marginLeft: wp( '5%' ),
137+
marginRight: wp( '5%' ),
138+
marginBottom: hp( '1%' ),
139+
},
140+
infoText: {
141+
textAlign: 'center',
142+
color: Colors.white,
143+
fontSize: RFValue( 13 ),
144+
fontFamily: Fonts.Regular,
145+
marginLeft: wp( '8%' ),
146+
marginRight: wp( '8%' ),
147+
},
148+
clickHereText: {
149+
color: Colors.white,
150+
fontSize: RFValue( 13 ),
151+
fontFamily: Fonts.Regular,
152+
textDecorationLine: 'underline',
153+
textAlign: 'center',
154+
},
155+
toKnowMoreText: {
156+
color: Colors.white,
157+
fontSize: RFValue( 13 ),
158+
fontFamily: Fonts.Regular,
159+
},
160+
linkView: {
161+
flexDirection: 'row',
162+
marginLeft: wp( '10%' ),
163+
marginRight: wp( '10%' ),
164+
justifyContent: 'center',
165+
flexWrap: 'wrap',
166+
},
167+
ElementView: {
168+
height: hp( '75%' ),
169+
justifyContent: 'space-between',
170+
},
171+
separatorView: {
172+
width: wp( '70%' ),
173+
height: 0,
174+
alignSelf: 'center',
175+
marginBottom: wp( '1%' ),
176+
borderStyle: 'dotted',
177+
borderWidth: 1,
178+
borderRadius: 1,
179+
borderColor: Colors.white,
180+
},
181+
helperImage: {
182+
width: wp( '80%' ),
183+
height: wp( '60%' ),
184+
resizeMode: 'contain',
185+
},
186+
bottomLinkView: {
187+
marginLeft: wp( '10%' ),
188+
marginRight: wp( '10%' ),
189+
marginBottom: wp( '15%' ),
190+
},
191+
} )

0 commit comments

Comments
 (0)