Merge pull request #3013 from bithyve/dev

Build 206

android/app/build.gradle

@@ -147,7 +147,7 @@ android {
         applicationId "io.hexawallet.keeper"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 205
+        versionCode 206
         versionName "1.0.7"
         missingDimensionStrategy 'react-native-camera', 'general'
         missingDimensionStrategy 'store', 'play'

ios/hexa_keeper.xcodeproj/project.pbxproj

@@ -780,7 +780,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = hexa_keeper/hexa_keeper.entitlements;
-				CURRENT_PROJECT_VERSION = 205;
+				CURRENT_PROJECT_VERSION = 206;
 				DEVELOPMENT_TEAM = Y5TCB759QL;
 				ENABLE_BITCODE = NO;
 				HEADER_SEARCH_PATHS = (
@@ -909,7 +909,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = hexa_keeper/hexa_keeper.entitlements;
-				CURRENT_PROJECT_VERSION = 205;
+				CURRENT_PROJECT_VERSION = 206;
 				DEVELOPMENT_TEAM = Y5TCB759QL;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1159,7 +1159,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = "dev-AppIcon";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = hexa_keeper_dev.entitlements;
-				CURRENT_PROJECT_VERSION = 205;
+				CURRENT_PROJECT_VERSION = 206;
 				DEVELOPMENT_TEAM = Y5TCB759QL;
 				ENABLE_BITCODE = NO;
 				HEADER_SEARCH_PATHS = (
@@ -1290,7 +1290,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = "dev-AppIcon";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = hexa_keeper_dev.entitlements;
-				CURRENT_PROJECT_VERSION = 205;
+				CURRENT_PROJECT_VERSION = 206;
 				DEVELOPMENT_TEAM = Y5TCB759QL;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",

src/common/content/language/en.json

@@ -227,13 +227,13 @@
     "Transferbitcoincustody": "Transfer bitcoin custody",
     "ActivateTransfer": "Activate Transfer",
     "Thebestinheritance": "The best inheritance in history",
-    "UpgradetoElitetier": "Upgrade to Elite tier and setup the vault with 5 signing devices",
+    "UpgradetoElitetier": "Upgrade to Elite tier and setup the Vault with 5 signing devices",
     "ActivateInheritance": "Activate Inheritance",
     "Downloadandsafelykeepinheritencedocuments": "Download and safely keep inheritence documents. Safekeeping best practices. Will template for digital assets. Inheritance recovery instructions",
     "Setupfalserecoveryalert": "Setup false recovery alert (optional)",
     "tryingtorecoveryourwallet": "If someone is trying to recover your wallet, make sure you get notified to approve or deny the recovery",
     "IndependentRecovery": "Independent Recovery",
-    "UnderstandhowyoucanrecoveryourVault": "Understand how you can recover your vault even without the Keeper app or any service from the company",
+    "UnderstandhowyoucanrecoveryourVault": "Understand how you can recover your Vault even without the Keeper app or any service from the company",
     "Practicehealthcheck": "Practice health check",
     "Makessureyousignersareaccessible": "Make sure you signing devices are accessible. Change them if that is not the case"
   },
@@ -254,7 +254,7 @@
     "BlueWallet": "Blue Wallet",
     "MunnWallet": "Munn Wallet",
     "Blockchain": "Blockchain.com",
-    "AddVault": "Add a vault",
+    "AddVault": "Add a Vault",
     "AddWallet": "Add a Wallet",
     "Setupawalletforyoubitcoin": "Set up a wallet for you bitcoin",
     "Creatingyourwallet": "Creating your wallet",
@@ -296,7 +296,7 @@
     "TransNow": "Transfer Now"
   },
   "vault": {
-    "SetupyourVault": "Setup your vault",
+    "SetupyourVault": "Setup your Vault",
     "VaultDesc": "A signing device is an air gapped device which helps you keep your Vault safe",
     "SetupNow": "Setup Now",
     "Addsigner": "Add a signing device",
@@ -308,11 +308,11 @@
     "Setupinheritancetoyoursats": "Set up inheritance to your sats",
     "Setup": "Setup",
     "VaultCreated": "Vault Created",
-    "VaultCreationDesc": "Your Basic vault has been successfully setup You can start receiving bitcoin in it",
-    "ViewVault": "View vault",
+    "VaultCreationDesc": "Your Basic Vault has been successfully setup You can start receiving bitcoin in it",
+    "ViewVault": "View Vault",
     "AddNow": "Add Now",
     "SelectSigner": "Select Signing Device",
-    "ForVault": "For your vault",
+    "ForVault": "For your Vault",
     "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?",
     "CustomPriority": "Custom Priority",
     "EditDescription": "Edit Description",
@@ -332,7 +332,7 @@
     "recoveryPhrase": "Recovery Phrase",
     "enterRecoveryPhrase": "Enter the Wallet Recovery Phrase",
     "recoverYourKeeperApp": "Recovering your Keeper app",
-    "recoverYourKeeperAppSubTitle": "Recovering your wallets and vault for the Keeper app"
+    "recoverYourKeeperAppSubTitle": "Recovering your wallets and Vault for the Keeper app"
   },
   "healthcheck": {
     "ChangeSigningDevice": "Change signing device",
@@ -471,14 +471,14 @@
     "slide03Title": "Secure bitcoin for you and\nyour loved ones, anywhere",
     "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.",
     "slide04Title": "All that you will need for\nsecuring your bitcoin",
-    "slide04Paragraph": "BIP 85 hot wallets, auto-transfer to vault, buy bitcoin directly in to your cold storage, and much more",
+    "slide04Paragraph": "BIP 85 hot wallets, auto-transfer to Vault, buy bitcoin directly in to your cold storage, and much more",
     "slide05Title": "Works just with the mobile app,\nno computer needed",
     "slide05Paragraph": "More security with NFC and QR code compatibility. Connect directly to the hardware signing devices, without any intermediate step",
     "slide06Title": "Upgrade Keeper, with your bitcoin journey",
-    "slide06Paragraph": "Pleb - Hodler - Diamond Hands. Three levels for the vault with increased multi-sig security. The last tier enables inheritance.",
+    "slide06Paragraph": "Pleb - Hodler - Diamond Hands. Three levels for the Vault with increased multi-sig security. The last tier enables inheritance.",
     "slide07Title": "Ensure forward looking privacy \nwith",
     "whirlpool": "Whirlpool",
-    "slide07Paragraph": "You can remix your sats for free for enhanced privacy before storing them in your vault"
+    "slide07Paragraph": "You can remix your sats for free for enhanced privacy before storing them in your Vault"
   },
   "choosePlan": {
     "choosePlantitle": "Choose your plan",

src/common/content/language/es.json

@@ -227,13 +227,13 @@
     "Transferbitcoincustody": "Transfer bitcoin custody",
     "ActivateTransfer": "Activate Transfer",
     "Thebestinheritance": "The best inheritance in history",
-    "UpgradetoElitetier": "Upgrade to Elite tier and setup the vault with 5 signing devices",
+    "UpgradetoElitetier": "Upgrade to Elite tier and setup the Vault with 5 signing devices",
     "ActivateInheritance": "Activate Inheritance",
     "Downloadandsafelykeepinheritencedocuments": "Download and safely keep inheritence documents. Safekeeping best practices. Will template for digital assets. Inheritance recovery instructions",
     "Setupfalserecoveryalert": "Setup false recovery alert (optional)",
     "tryingtorecoveryourwallet": "If someone is trying to recover your wallet, make sure you get notified to approve or deny the recovery",
     "IndependentRecovery": "Independent Recovery",
-    "UnderstandhowyoucanrecoveryourVault": "Understand how you can recover your vault even without the Keeper app or any service from the company",
+    "UnderstandhowyoucanrecoveryourVault": "Understand how you can recover your Vault even without the Keeper app or any service from the company",
     "Practicehealthcheck": "Practice health check",
     "Makessureyousignersareaccessible": "Make sure you signing devices are accessible. Change them if that is not the case"
   },
@@ -253,7 +253,7 @@
     "BlueWallet": "Blue Wallet",
     "MunnWallet": "Munn Wallet",
     "Blockchain": "Blockchain.com",
-    "AddVault": "Add a vault",
+    "AddVault": "Add a Vault",
     "AddWallet": "Add a Wallet",
     "Setupawalletforyoubitcoin": "Set up a wallet for you bitcoin",
     "Creatingyourwallet": "Creating your wallet",
@@ -291,8 +291,8 @@
     "ViewDetails": "View Details"
   },
   "vault": {
-    "SetupyourVault": "Setup your vault",
-    "VaultDesc": "A signing device is an an air gapped device which helps you keep your vault safe",
+    "SetupyourVault": "Setup your Vault",
+    "VaultDesc": "A signing device is an an air gapped device which helps you keep your Vault safe",
     "SetupNow": "Setup Now",
     "Addsigner": "Add a signing device",
     "Vault": "Vault",
@@ -303,11 +303,11 @@
     "Setupinheritancetoyoursats": "Set up inheritance to your sats",
     "Setup": "Setup",
     "VaultCreated": "Vault created",
-    "VaultCreationDesc": "Your Basic vault has been successfully setup You can start receiving bitcoin in it",
-    "ViewVault": "View vault",
+    "VaultCreationDesc": "Your Basic Vault has been successfully setup You can start receiving bitcoin in it",
+    "ViewVault": "View Vault",
     "AddNow": "Add Now",
     "SelectSigner": "Select a Signing Devices",
-    "ForVault": "For your vault",
+    "ForVault": "For your Vault",
     "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?",
     "CustomPriority": "Custom Priority",
     "EditDescription": "Edit Description",
@@ -464,14 +464,14 @@
     "slide03Title": "Secure bitcoin for you and\nyour loved ones, anywhere",
     "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.",
     "slide04Title": "All that you will need for\nsecuring your bitcoin",
-    "slide04Paragraph": "BIP 85 hot wallets, auto-transfer to vault, buy bitcoin directly in to your cold storage, and much more",
+    "slide04Paragraph": "BIP 85 hot wallets, auto-transfer to Vault, buy bitcoin directly in to your cold storage, and much more",
     "slide05Title": "Works just with the mobile app,\nno computer needed",
     "slide05Paragraph": "More security with NFC and QR code compatibility. Connect directly to the hardware signing devices, without any intermediate step",
     "slide06Title": "Affordable plans\nand a great offer",
-    "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.",
+    "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.",
     "slide07Title": "Ensure forward looking privacy \nwith",
     "whirlpool": "Whirlpool",
-    "slide07Paragraph": "You can remix your sats for free for enhanced privacy before storing them in your vault"
+    "slide07Paragraph": "You can remix your sats for free for enhanced privacy before storing them in your Vault"
   },
   "choosePlan": {
     "choosePlantitle": "Choose your plan",

src/screens/AddTapsigner/SetupTapsigner.tsx

@@ -31,9 +31,9 @@ import { VaultSigner } from 'src/core/wallets/interfaces/vault';
 import useAsync from 'src/hooks/useAsync';
 import NfcManager from 'react-native-nfc-manager';
 import DeviceInfo from 'react-native-device-info';
+import { healthCheckSigner } from 'src/store/sagaActions/bhr';
 import { checkSigningDevice } from '../Vault/AddSigningDevice';
 import MockWrapper from '../Vault/MockWrapper';
-import { healthCheckSigner } from 'src/store/sagaActions/bhr';
 
 function SetupTapsigner({ route }) {
   const [cvc, setCvc] = React.useState('');
@@ -163,6 +163,7 @@ function SetupTapsigner({ route }) {
           title={isHealthcheck ? 'Verify TAPSIGNER' : 'Setting up TAPSIGNER'}
           subtitle="Enter the 6-32 digit code printed on back of your TAPSIGNER"
           onPressHandler={() => navigation.goBack()}
+          paddingLeft={wp(25)}
         />
         <MockWrapper signerType={SignerType.TAPSIGNER}>
           <ScrollView>

src/screens/AppSettings/Node/NodeSettings.tsx

@@ -155,7 +155,7 @@ function NodeSettings() {
   const onSelectedNodeitem = (selectedItem: NodeDetail) => {
     setCurrentlySelectedNodeItem(selectedItem);
   };
-
+  console.log('windowHeight', windowHeight)
   return (
     <ScreenWrapper backgroundColor="light.mainBackground" barStyle="dark-content">
       <HeaderTitle
@@ -284,7 +284,7 @@ function NodeSettings() {
         closeOnOverlayClick={false}
         Content={() => AddNode(Node.getModalParams(currentlySelectedNode), onSaveCallback)}
       />
-      <Modal animationType="none" transparent visible={loading} onRequestClose={() => {}}>
+      <Modal animationType="none" transparent visible={loading} onRequestClose={() => { }}>
         <View style={styles.activityIndicator}>
           <ActivityIndicator color="#017963" size="large" />
         </View>
@@ -335,10 +335,10 @@ const styles = StyleSheet.create({
     height: 45,
   },
   nodesListWrapper: {
-    marginBottom: 4,
+    marginVertical: 10,
     flexDirection: 'row',
     width: '100%',
-    height: windowHeight > 800 ? '58%' : '50%',
+    height: windowHeight > 800 ? '65%' : '50%',
     // alignItems: 'center',
   },
   nodeListTitle: {

src/screens/AppSettings/TorSettings.tsx

@@ -13,7 +13,7 @@ import SettingsCard from 'src/components/SettingComponent/SettingsCard';
 import KeeperModal from 'src/components/KeeperModal';
 import Note from 'src/components/Note/Note';
 import { ScaledSheet } from 'react-native-size-matters';
-import { hp } from 'src/common/data/responsiveness/responsive';
+import { hp, wp } from 'src/common/data/responsiveness/responsive';
 import Buttons from 'src/components/Buttons';
 import TorStatusTag from 'src/components/TorStatus';
 import TorModalMap from './TorModalMap';
@@ -65,6 +65,7 @@ function TorSettings() {
       <HeaderTitle
         title="Tor Settings"
         subtitle="Tor improves your network privacy. To learn more visit: https://www.torproject.org/"
+        paddingLeft={wp(25)}
       />
       <Box paddingTop={10}>
         <Box>

src/screens/Mix/MixProgress.tsx

@@ -245,7 +245,7 @@ function MixProgress({
             </Box>
           )}
         </Box>
-        <Box flexDirection="column">
+        <Box style={styles.progressStepsTextWrapper} >
           <Text color="light.secondaryText" style={styles.timeLineTitle}>
             {title}
           </Text>
@@ -294,11 +294,7 @@ function MixProgress({
   useEffect(() => {
     if (mixFailed) {
       const toastDuration = 3000;
-      showToast(
-        'Mix failed. Please try again later, our best minds are working on it.',
-        <ToastErrorIcon />,
-        toastDuration
-      );
+      showToast('Mix failed. Please try again later, our best minds are working on it.', <ToastErrorIcon />, toastDuration);
       setTimeout(() => {
         navigation.goBack();
       }, toastDuration);
@@ -330,11 +326,7 @@ function MixProgress({
           external: { incrementBy: 1 },
         })
       );
-      showToast(
-        'Mix completed successfully. Your UTXOs will be available in your postmix account shortly.',
-        <TickIcon />,
-        3000
-      );
+      showToast('Mix completed successfully. Your UTXOs will be available in your postmix account shortly.', <TickIcon />, 3000);
       const postmixTags: BIP329Label[] = [];
       const userLabels = [];
       Object.keys(labels).forEach((key) => {
@@ -436,8 +428,7 @@ function MixProgress({
       setStatus(updatedArray);
       const toastDuration = 3000;
       showToast(
-        ` ${
-          err.message ? err.message : `${isRemix ? 'Remix' : 'Mix'} failed`
+        ` ${err.message ? err.message : `${isRemix ? 'Remix' : 'Mix'} failed`
         }. Please refresh the ${isRemix ? 'Postmix' : 'Premix'} account and try again.`,
         <ToastErrorIcon />,
         toastDuration
@@ -588,30 +579,31 @@ const getStyles = (clock) =>
     },
     timeLineWrapper: {
       alignItems: 'center',
-      marginHorizontal: wp(10),
+      marginHorizontal: wp(5),
       justifyContent: 'center',
+      width: '15%'
     },
     timeLineProgressWrapper: {
       alignItems: 'center',
       marginHorizontal: wp(5),
       justifyContent: 'center',
+      width: '15%'
     },
     contentWrapper: {
       flexDirection: 'row',
+      width: '100%'
     },
     timeLineTitle: {
-      fontSize: 14,
-      letterSpacing: 0.5,
-      marginLeft: wp(18),
+      fontSize: 13,
+      letterSpacing: 0.4,
+      marginLeft: wp(5),
       marginTop: hp(3),
-      width: wp(280),
+      width: '100%',
       flexWrap: 'wrap',
     },
-    settingUpTitle: {
-      marginTop: hp(12),
-      paddingLeft: 5,
-      fontWeight: 'bold',
-      width: wp(270),
+    progressStepsTextWrapper: {
+      flexDirection: "column",
+      width: '85%'
     },
     note: {
       position: 'absolute',

src/screens/Mix/PoolSelection.tsx

@@ -268,8 +268,8 @@ export default function PoolSelection({ route, navigation }) {
         <Box style={styles.noteWrapper}>
           <Note title="Note" subtitle="Pool may take sometime to load" />
         </Box>
-        <Box style={{ flexDirection: 'row', justifyContent: 'space-between' }}>
-          <Box style={{ alignSelf: 'center', paddingBottom: 4, paddingLeft: 20 }}>
+        <Box style={styles.footerWrapper}>
+          <Box style={styles.pageIndicatorWrapper}>
             <PageIndicator currentPage={1} totalPage={2} />
           </Box>
           <Box style={styles.footerItemContainer}>
@@ -323,19 +323,24 @@ const styles = StyleSheet.create({
     marginTop: 20,
     marginLeft: 40,
   },
+  footerWrapper: {
+    flexDirection: 'row',
+    width: '100%',
+    alignItems: 'center',
+    bottom: 10
+  },
   footerContainer: {
     position: 'absolute',
     bottom: 0,
-    width: wp(375),
+    width: '100%',
     paddingHorizontal: 5,
   },
   footerItemContainer: {
-    flexDirection: 'row',
-    marginTop: windowHeight > 800 ? 5 : 5,
-    marginBottom: windowHeight > 800 ? hp(10) : 0,
-    paddingBottom: 15,
-    justifyContent: 'flex-end',
-    marginHorizontal: 16,
+    marginTop: 5,
+    width: '65%',
+  },
+  pageIndicatorWrapper: {
+    width: '40%'
   },
   poolTextDirection: {
     flexDirection: 'row',