Skip to content

Commit 15568ca

Browse files
cakesoft-shashankcakesoft-shashank
authored
Merge pull request bithyve#3013 from bithyve/dev
Build 206
2 parents 7d5f16b + 9373372 commit 15568ca

File tree

27 files changed

+120
-106
lines changed

27 files changed

+120
-106
lines changed

‎android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ android {
147147
applicationId "io.hexawallet.keeper"
148148
minSdkVersion rootProject.ext.minSdkVersion
149149
targetSdkVersion rootProject.ext.targetSdkVersion
150-
versionCode 205
150+
versionCode 206
151151
versionName "1.0.7"
152152
missingDimensionStrategy 'react-native-camera', 'general'
153153
missingDimensionStrategy 'store', 'play'

‎ios/hexa_keeper.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -780,7 +780,7 @@
780780
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
781781
CLANG_ENABLE_MODULES = YES;
782782
CODE_SIGN_ENTITLEMENTS = hexa_keeper/hexa_keeper.entitlements;
783-
CURRENT_PROJECT_VERSION = 205;
783+
CURRENT_PROJECT_VERSION = 206;
784784
DEVELOPMENT_TEAM = Y5TCB759QL;
785785
ENABLE_BITCODE = NO;
786786
HEADER_SEARCH_PATHS = (
@@ -909,7 +909,7 @@
909909
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
910910
CLANG_ENABLE_MODULES = YES;
911911
CODE_SIGN_ENTITLEMENTS = hexa_keeper/hexa_keeper.entitlements;
912-
CURRENT_PROJECT_VERSION = 205;
912+
CURRENT_PROJECT_VERSION = 206;
913913
DEVELOPMENT_TEAM = Y5TCB759QL;
914914
HEADER_SEARCH_PATHS = (
915915
"$(inherited)",
@@ -1159,7 +1159,7 @@
11591159
ASSETCATALOG_COMPILER_APPICON_NAME = "dev-AppIcon";
11601160
CLANG_ENABLE_MODULES = YES;
11611161
CODE_SIGN_ENTITLEMENTS = hexa_keeper_dev.entitlements;
1162-
CURRENT_PROJECT_VERSION = 205;
1162+
CURRENT_PROJECT_VERSION = 206;
11631163
DEVELOPMENT_TEAM = Y5TCB759QL;
11641164
ENABLE_BITCODE = NO;
11651165
HEADER_SEARCH_PATHS = (
@@ -1290,7 +1290,7 @@
12901290
ASSETCATALOG_COMPILER_APPICON_NAME = "dev-AppIcon";
12911291
CLANG_ENABLE_MODULES = YES;
12921292
CODE_SIGN_ENTITLEMENTS = hexa_keeper_dev.entitlements;
1293-
CURRENT_PROJECT_VERSION = 205;
1293+
CURRENT_PROJECT_VERSION = 206;
12941294
DEVELOPMENT_TEAM = Y5TCB759QL;
12951295
HEADER_SEARCH_PATHS = (
12961296
"$(inherited)",

‎src/common/content/language/en.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -227,13 +227,13 @@
227227
"Transferbitcoincustody": "Transfer bitcoin custody",
228228
"ActivateTransfer": "Activate Transfer",
229229
"Thebestinheritance": "The best inheritance in history",
230-
"UpgradetoElitetier": "Upgrade to Elite tier and setup the vault with 5 signing devices",
230+
"UpgradetoElitetier": "Upgrade to Elite tier and setup the Vault with 5 signing devices",
231231
"ActivateInheritance": "Activate Inheritance",
232232
"Downloadandsafelykeepinheritencedocuments": "Download and safely keep inheritence documents. Safekeeping best practices. Will template for digital assets. Inheritance recovery instructions",
233233
"Setupfalserecoveryalert": "Setup false recovery alert (optional)",
234234
"tryingtorecoveryourwallet": "If someone is trying to recover your wallet, make sure you get notified to approve or deny the recovery",
235235
"IndependentRecovery": "Independent Recovery",
236-
"UnderstandhowyoucanrecoveryourVault": "Understand how you can recover your vault even without the Keeper app or any service from the company",
236+
"UnderstandhowyoucanrecoveryourVault": "Understand how you can recover your Vault even without the Keeper app or any service from the company",
237237
"Practicehealthcheck": "Practice health check",
238238
"Makessureyousignersareaccessible": "Make sure you signing devices are accessible. Change them if that is not the case"
239239
},
@@ -254,7 +254,7 @@
254254
"BlueWallet": "Blue Wallet",
255255
"MunnWallet": "Munn Wallet",
256256
"Blockchain": "Blockchain.com",
257-
"AddVault": "Add a vault",
257+
"AddVault": "Add a Vault",
258258
"AddWallet": "Add a Wallet",
259259
"Setupawalletforyoubitcoin": "Set up a wallet for you bitcoin",
260260
"Creatingyourwallet": "Creating your wallet",
@@ -296,7 +296,7 @@
296296
"TransNow": "Transfer Now"
297297
},
298298
"vault": {
299-
"SetupyourVault": "Setup your vault",
299+
"SetupyourVault": "Setup your Vault",
300300
"VaultDesc": "A signing device is an air gapped device which helps you keep your Vault safe",
301301
"SetupNow": "Setup Now",
302302
"Addsigner": "Add a signing device",
@@ -308,11 +308,11 @@
308308
"Setupinheritancetoyoursats": "Set up inheritance to your sats",
309309
"Setup": "Setup",
310310
"VaultCreated": "Vault Created",
311-
"VaultCreationDesc": "Your Basic vault has been successfully setup You can start receiving bitcoin in it",
312-
"ViewVault": "View vault",
311+
"VaultCreationDesc": "Your Basic Vault has been successfully setup You can start receiving bitcoin in it",
312+
"ViewVault": "View Vault",
313313
"AddNow": "Add Now",
314314
"SelectSigner": "Select Signing Device",
315-
"ForVault": "For your vault",
315+
"ForVault": "For your Vault",
316316
"VaultInfo": "A signing device can be a hardware wallet or a signing device or an app. Most popular ones are listed above. Want support for more?",
317317
"CustomPriority": "Custom Priority",
318318
"EditDescription": "Edit Description",
@@ -332,7 +332,7 @@
332332
"recoveryPhrase": "Recovery Phrase",
333333
"enterRecoveryPhrase": "Enter the Wallet Recovery Phrase",
334334
"recoverYourKeeperApp": "Recovering your Keeper app",
335-
"recoverYourKeeperAppSubTitle": "Recovering your wallets and vault for the Keeper app"
335+
"recoverYourKeeperAppSubTitle": "Recovering your wallets and Vault for the Keeper app"
336336
},
337337
"healthcheck": {
338338
"ChangeSigningDevice": "Change signing device",
@@ -471,14 +471,14 @@
471471
"slide03Title": "Secure bitcoin for you and\nyour loved ones, anywhere",
472472
"slide03Paragraph": "Use all the Keeper features, including inheritance, no matter which country you are located in as long as the app is available in your country.",
473473
"slide04Title": "All that you will need for\nsecuring your bitcoin",
474-
"slide04Paragraph": "BIP 85 hot wallets, auto-transfer to vault, buy bitcoin directly in to your cold storage, and much more",
474+
"slide04Paragraph": "BIP 85 hot wallets, auto-transfer to Vault, buy bitcoin directly in to your cold storage, and much more",
475475
"slide05Title": "Works just with the mobile app,\nno computer needed",
476476
"slide05Paragraph": "More security with NFC and QR code compatibility. Connect directly to the hardware signing devices, without any intermediate step",
477477
"slide06Title": "Upgrade Keeper, with your bitcoin journey",
478-
"slide06Paragraph": "Pleb - Hodler - Diamond Hands. Three levels for the vault with increased multi-sig security. The last tier enables inheritance.",
478+
"slide06Paragraph": "Pleb - Hodler - Diamond Hands. Three levels for the Vault with increased multi-sig security. The last tier enables inheritance.",
479479
"slide07Title": "Ensure forward looking privacy \nwith",
480480
"whirlpool": "Whirlpool",
481-
"slide07Paragraph": "You can remix your sats for free for enhanced privacy before storing them in your vault"
481+
"slide07Paragraph": "You can remix your sats for free for enhanced privacy before storing them in your Vault"
482482
},
483483
"choosePlan": {
484484
"choosePlantitle": "Choose your plan",

‎src/common/content/language/es.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -227,13 +227,13 @@
227227
"Transferbitcoincustody": "Transfer bitcoin custody",
228228
"ActivateTransfer": "Activate Transfer",
229229
"Thebestinheritance": "The best inheritance in history",
230-
"UpgradetoElitetier": "Upgrade to Elite tier and setup the vault with 5 signing devices",
230+
"UpgradetoElitetier": "Upgrade to Elite tier and setup the Vault with 5 signing devices",
231231
"ActivateInheritance": "Activate Inheritance",
232232
"Downloadandsafelykeepinheritencedocuments": "Download and safely keep inheritence documents. Safekeeping best practices. Will template for digital assets. Inheritance recovery instructions",
233233
"Setupfalserecoveryalert": "Setup false recovery alert (optional)",
234234
"tryingtorecoveryourwallet": "If someone is trying to recover your wallet, make sure you get notified to approve or deny the recovery",
235235
"IndependentRecovery": "Independent Recovery",
236-
"UnderstandhowyoucanrecoveryourVault": "Understand how you can recover your vault even without the Keeper app or any service from the company",
236+
"UnderstandhowyoucanrecoveryourVault": "Understand how you can recover your Vault even without the Keeper app or any service from the company",
237237
"Practicehealthcheck": "Practice health check",
238238
"Makessureyousignersareaccessible": "Make sure you signing devices are accessible. Change them if that is not the case"
239239
},
@@ -253,7 +253,7 @@
253253
"BlueWallet": "Blue Wallet",
254254
"MunnWallet": "Munn Wallet",
255255
"Blockchain": "Blockchain.com",
256-
"AddVault": "Add a vault",
256+
"AddVault": "Add a Vault",
257257
"AddWallet": "Add a Wallet",
258258
"Setupawalletforyoubitcoin": "Set up a wallet for you bitcoin",
259259
"Creatingyourwallet": "Creating your wallet",
@@ -291,8 +291,8 @@
291291
"ViewDetails": "View Details"
292292
},
293293
"vault": {
294-
"SetupyourVault": "Setup your vault",
295-
"VaultDesc": "A signing device is an an air gapped device which helps you keep your vault safe",
294+
"SetupyourVault": "Setup your Vault",
295+
"VaultDesc": "A signing device is an an air gapped device which helps you keep your Vault safe",
296296
"SetupNow": "Setup Now",
297297
"Addsigner": "Add a signing device",
298298
"Vault": "Vault",
@@ -303,11 +303,11 @@
303303
"Setupinheritancetoyoursats": "Set up inheritance to your sats",
304304
"Setup": "Setup",
305305
"VaultCreated": "Vault created",
306-
"VaultCreationDesc": "Your Basic vault has been successfully setup You can start receiving bitcoin in it",
307-
"ViewVault": "View vault",
306+
"VaultCreationDesc": "Your Basic Vault has been successfully setup You can start receiving bitcoin in it",
307+
"ViewVault": "View Vault",
308308
"AddNow": "Add Now",
309309
"SelectSigner": "Select a Signing Devices",
310-
"ForVault": "For your vault",
310+
"ForVault": "For your Vault",
311311
"VaultInfo": "A signing device can be a hardware wallet or a signing device or an app. Most popular ones are listed above. Want support for more?",
312312
"CustomPriority": "Custom Priority",
313313
"EditDescription": "Edit Description",
@@ -464,14 +464,14 @@
464464
"slide03Title": "Secure bitcoin for you and\nyour loved ones, anywhere",
465465
"slide03Paragraph": "Use all the Keeper features, including inheritance, no matter which country you are located in as long as the app is available in your country.",
466466
"slide04Title": "All that you will need for\nsecuring your bitcoin",
467-
"slide04Paragraph": "BIP 85 hot wallets, auto-transfer to vault, buy bitcoin directly in to your cold storage, and much more",
467+
"slide04Paragraph": "BIP 85 hot wallets, auto-transfer to Vault, buy bitcoin directly in to your cold storage, and much more",
468468
"slide05Title": "Works just with the mobile app,\nno computer needed",
469469
"slide05Paragraph": "More security with NFC and QR code compatibility. Connect directly to the hardware signing devices, without any intermediate step",
470470
"slide06Title": "Affordable plans\nand a great offer",
471-
"slide06Paragraph": "And now for a limited time, all tiers for the Keeper are free for the first 6 months. Download Keeper and setup your vault now.",
471+
"slide06Paragraph": "And now for a limited time, all tiers for the Keeper are free for the first 6 months. Download Keeper and setup your Vault now.",
472472
"slide07Title": "Ensure forward looking privacy \nwith",
473473
"whirlpool": "Whirlpool",
474-
"slide07Paragraph": "You can remix your sats for free for enhanced privacy before storing them in your vault"
474+
"slide07Paragraph": "You can remix your sats for free for enhanced privacy before storing them in your Vault"
475475
},
476476
"choosePlan": {
477477
"choosePlantitle": "Choose your plan",

‎src/screens/AddTapsigner/SetupTapsigner.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ import { VaultSigner } from 'src/core/wallets/interfaces/vault';
3131
import useAsync from 'src/hooks/useAsync';
3232
import NfcManager from 'react-native-nfc-manager';
3333
import DeviceInfo from 'react-native-device-info';
34+
import { healthCheckSigner } from 'src/store/sagaActions/bhr';
3435
import { checkSigningDevice } from '../Vault/AddSigningDevice';
3536
import MockWrapper from '../Vault/MockWrapper';
36-
import { healthCheckSigner } from 'src/store/sagaActions/bhr';
3737

3838
function SetupTapsigner({ route }) {
3939
const [cvc, setCvc] = React.useState('');
@@ -163,6 +163,7 @@ function SetupTapsigner({ route }) {
163163
title={isHealthcheck ? 'Verify TAPSIGNER' : 'Setting up TAPSIGNER'}
164164
subtitle="Enter the 6-32 digit code printed on back of your TAPSIGNER"
165165
onPressHandler={() => navigation.goBack()}
166+
paddingLeft={wp(25)}
166167
/>
167168
<MockWrapper signerType={SignerType.TAPSIGNER}>
168169
<ScrollView>

‎src/screens/AppSettings/Node/NodeSettings.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ function NodeSettings() {
155155
const onSelectedNodeitem = (selectedItem: NodeDetail) => {
156156
setCurrentlySelectedNodeItem(selectedItem);
157157
};
158-
158+
console.log('windowHeight', windowHeight)
159159
return (
160160
<ScreenWrapper backgroundColor="light.mainBackground" barStyle="dark-content">
161161
<HeaderTitle
@@ -284,7 +284,7 @@ function NodeSettings() {
284284
closeOnOverlayClick={false}
285285
Content={() => AddNode(Node.getModalParams(currentlySelectedNode), onSaveCallback)}
286286
/>
287-
<Modal animationType="none" transparent visible={loading} onRequestClose={() => {}}>
287+
<Modal animationType="none" transparent visible={loading} onRequestClose={() => { }}>
288288
<View style={styles.activityIndicator}>
289289
<ActivityIndicator color="#017963" size="large" />
290290
</View>
@@ -335,10 +335,10 @@ const styles = StyleSheet.create({
335335
height: 45,
336336
},
337337
nodesListWrapper: {
338-
marginBottom: 4,
338+
marginVertical: 10,
339339
flexDirection: 'row',
340340
width: '100%',
341-
height: windowHeight > 800 ? '58%' : '50%',
341+
height: windowHeight > 800 ? '65%' : '50%',
342342
// alignItems: 'center',
343343
},
344344
nodeListTitle: {

‎src/screens/AppSettings/TorSettings.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import SettingsCard from 'src/components/SettingComponent/SettingsCard';
1313
import KeeperModal from 'src/components/KeeperModal';
1414
import Note from 'src/components/Note/Note';
1515
import { ScaledSheet } from 'react-native-size-matters';
16-
import { hp } from 'src/common/data/responsiveness/responsive';
16+
import { hp, wp } from 'src/common/data/responsiveness/responsive';
1717
import Buttons from 'src/components/Buttons';
1818
import TorStatusTag from 'src/components/TorStatus';
1919
import TorModalMap from './TorModalMap';
@@ -65,6 +65,7 @@ function TorSettings() {
6565
<HeaderTitle
6666
title="Tor Settings"
6767
subtitle="Tor improves your network privacy. To learn more visit: https://www.torproject.org/"
68+
paddingLeft={wp(25)}
6869
/>
6970
<Box paddingTop={10}>
7071
<Box>

‎src/screens/Mix/MixProgress.tsx

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ function MixProgress({
245245
</Box>
246246
)}
247247
</Box>
248-
<Box flexDirection="column">
248+
<Box style={styles.progressStepsTextWrapper} >
249249
<Text color="light.secondaryText" style={styles.timeLineTitle}>
250250
{title}
251251
</Text>
@@ -294,11 +294,7 @@ function MixProgress({
294294
useEffect(() => {
295295
if (mixFailed) {
296296
const toastDuration = 3000;
297-
showToast(
298-
'Mix failed. Please try again later, our best minds are working on it.',
299-
<ToastErrorIcon />,
300-
toastDuration
301-
);
297+
showToast('Mix failed. Please try again later, our best minds are working on it.', <ToastErrorIcon />, toastDuration);
302298
setTimeout(() => {
303299
navigation.goBack();
304300
}, toastDuration);
@@ -330,11 +326,7 @@ function MixProgress({
330326
external: { incrementBy: 1 },
331327
})
332328
);
333-
showToast(
334-
'Mix completed successfully. Your UTXOs will be available in your postmix account shortly.',
335-
<TickIcon />,
336-
3000
337-
);
329+
showToast('Mix completed successfully. Your UTXOs will be available in your postmix account shortly.', <TickIcon />, 3000);
338330
const postmixTags: BIP329Label[] = [];
339331
const userLabels = [];
340332
Object.keys(labels).forEach((key) => {
@@ -436,8 +428,7 @@ function MixProgress({
436428
setStatus(updatedArray);
437429
const toastDuration = 3000;
438430
showToast(
439-
` ${
440-
err.message ? err.message : `${isRemix ? 'Remix' : 'Mix'} failed`
431+
` ${err.message ? err.message : `${isRemix ? 'Remix' : 'Mix'} failed`
441432
}. Please refresh the ${isRemix ? 'Postmix' : 'Premix'} account and try again.`,
442433
<ToastErrorIcon />,
443434
toastDuration
@@ -588,30 +579,31 @@ const getStyles = (clock) =>
588579
},
589580
timeLineWrapper: {
590581
alignItems: 'center',
591-
marginHorizontal: wp(10),
582+
marginHorizontal: wp(5),
592583
justifyContent: 'center',
584+
width: '15%'
593585
},
594586
timeLineProgressWrapper: {
595587
alignItems: 'center',
596588
marginHorizontal: wp(5),
597589
justifyContent: 'center',
590+
width: '15%'
598591
},
599592
contentWrapper: {
600593
flexDirection: 'row',
594+
width: '100%'
601595
},
602596
timeLineTitle: {
603-
fontSize: 14,
604-
letterSpacing: 0.5,
605-
marginLeft: wp(18),
597+
fontSize: 13,
598+
letterSpacing: 0.4,
599+
marginLeft: wp(5),
606600
marginTop: hp(3),
607-
width: wp(280),
601+
width: '100%',
608602
flexWrap: 'wrap',
609603
},
610-
settingUpTitle: {
611-
marginTop: hp(12),
612-
paddingLeft: 5,
613-
fontWeight: 'bold',
614-
width: wp(270),
604+
progressStepsTextWrapper: {
605+
flexDirection: "column",
606+
width: '85%'
615607
},
616608
note: {
617609
position: 'absolute',

‎src/screens/Mix/PoolSelection.tsx

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -268,8 +268,8 @@ export default function PoolSelection({ route, navigation }) {
268268
<Box style={styles.noteWrapper}>
269269
<Note title="Note" subtitle="Pool may take sometime to load" />
270270
</Box>
271-
<Box style={{ flexDirection: 'row', justifyContent: 'space-between' }}>
272-
<Box style={{ alignSelf: 'center', paddingBottom: 4, paddingLeft: 20 }}>
271+
<Box style={styles.footerWrapper}>
272+
<Box style={styles.pageIndicatorWrapper}>
273273
<PageIndicator currentPage={1} totalPage={2} />
274274
</Box>
275275
<Box style={styles.footerItemContainer}>
@@ -323,19 +323,24 @@ const styles = StyleSheet.create({
323323
marginTop: 20,
324324
marginLeft: 40,
325325
},
326+
footerWrapper: {
327+
flexDirection: 'row',
328+
width: '100%',
329+
alignItems: 'center',
330+
bottom: 10
331+
},
326332
footerContainer: {
327333
position: 'absolute',
328334
bottom: 0,
329-
width: wp(375),
335+
width: '100%',
330336
paddingHorizontal: 5,
331337
},
332338
footerItemContainer: {
333-
flexDirection: 'row',
334-
marginTop: windowHeight > 800 ? 5 : 5,
335-
marginBottom: windowHeight > 800 ? hp(10) : 0,
336-
paddingBottom: 15,
337-
justifyContent: 'flex-end',
338-
marginHorizontal: 16,
339+
marginTop: 5,
340+
width: '65%',
341+
},
342+
pageIndicatorWrapper: {
343+
width: '40%'
339344
},
340345
poolTextDirection: {
341346
flexDirection: 'row',

0 commit comments

Comments
 (0)