Merge pull request #1204 from bithyve/dev

merge dev into main build v0.0.92(75)
bithyve · Oct 21, 2022 · 9a098dc · 9a098dc
2 parents 33226f6 + 4ab8a3d
commit 9a098dc
Show file tree

Hide file tree

Showing 12 changed files with 83 additions and 90 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -147,8 +147,8 @@ android {
         applicationId "io.hexawallet.keeper"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 74
-        versionName "0.0.90"
+        versionCode 75
+        versionName "0.0.92"
         missingDimensionStrategy 'react-native-camera', 'general'
         missingDimensionStrategy 'store', 'play'
         multiDexEnabled true

diff --git a/ios/hexa_keeper.xcodeproj/project.pbxproj b/ios/hexa_keeper.xcodeproj/project.pbxproj
@@ -14,9 +14,9 @@
 		13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; };
 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
-		18788ED8284652050002EFFD /* BuildFile in Resources */ = {isa = PBXBuildFile; };
+		18788ED8284652050002EFFD /* (null) in Resources */ = {isa = PBXBuildFile; };
 		18B4D55F2847898D004AB91F /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 18B4D55E2847898D004AB91F /* GoogleService-Info.plist */; };
-		18BD1AA02834FA4100DB19E0 /* BuildFile in Resources */ = {isa = PBXBuildFile; };
+		18BD1AA02834FA4100DB19E0 /* (null) in Resources */ = {isa = PBXBuildFile; };
 		1F481833B9F94AB6A8820D24 /* RobotoCondensed-Italic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E67B572D2F3047D6ABD3C5B2 /* RobotoCondensed-Italic.ttf */; };
 		2EE0712077A446F0A113BE41 /* RobotoCondensed-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 072D5B51C9E5412188F5F708 /* RobotoCondensed-Light.ttf */; };
 		81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
@@ -27,12 +27,12 @@
 		F49B77E42848DF5200F9AFBD /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
 		F49B77E82848DF5200F9AFBD /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
 		F49B77E92848DF5200F9AFBD /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
-		F49B77EA2848DF5200F9AFBD /* BuildFile in Resources */ = {isa = PBXBuildFile; };
+		F49B77EA2848DF5200F9AFBD /* (null) in Resources */ = {isa = PBXBuildFile; };
 		F49B77EB2848DF5200F9AFBD /* RobotoCondensed-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 4CF8AD973412457498BBED89 /* RobotoCondensed-Bold.ttf */; };
 		F49B77EC2848DF5200F9AFBD /* RobotoCondensed-BoldItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 66D87152631A4BA28BFF1B44 /* RobotoCondensed-BoldItalic.ttf */; };
 		F49B77ED2848DF5200F9AFBD /* RobotoCondensed-Italic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E67B572D2F3047D6ABD3C5B2 /* RobotoCondensed-Italic.ttf */; };
 		F49B77EE2848DF5200F9AFBD /* RobotoCondensed-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 072D5B51C9E5412188F5F708 /* RobotoCondensed-Light.ttf */; };
-		F49B77EF2848DF5200F9AFBD /* BuildFile in Resources */ = {isa = PBXBuildFile; };
+		F49B77EF2848DF5200F9AFBD /* (null) in Resources */ = {isa = PBXBuildFile; };
 		F49B77F12848DF5200F9AFBD /* RobotoCondensed-LightItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 0165F274E9EB4FC08B1A5F5F /* RobotoCondensed-LightItalic.ttf */; };
 		F49B77F22848DF5200F9AFBD /* RobotoCondensed-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 399257CB0DEE494B9A06CFFE /* RobotoCondensed-Regular.ttf */; };
 		F4F207EE2849D20A005E79DA /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = F4F207ED2849D20A005E79DA /* GoogleService-Info.plist */; };
@@ -352,12 +352,12 @@
 			files = (
 				81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */,
 				13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
-				18BD1AA02834FA4100DB19E0 /* BuildFile in Resources */,
+				18BD1AA02834FA4100DB19E0 /* (null) in Resources */,
 				9819EF4D6004499582832416 /* RobotoCondensed-Bold.ttf in Resources */,
 				FC2BB76F4FCB47F787279B0C /* RobotoCondensed-BoldItalic.ttf in Resources */,
 				1F481833B9F94AB6A8820D24 /* RobotoCondensed-Italic.ttf in Resources */,
 				2EE0712077A446F0A113BE41 /* RobotoCondensed-Light.ttf in Resources */,
-				18788ED8284652050002EFFD /* BuildFile in Resources */,
+				18788ED8284652050002EFFD /* (null) in Resources */,
 				18B4D55F2847898D004AB91F /* GoogleService-Info.plist in Resources */,
 				C3AFCD97B1C74642870953EA /* RobotoCondensed-LightItalic.ttf in Resources */,
 				0AF9AD0E7FED4BCEA686872C /* RobotoCondensed-Regular.ttf in Resources */,
@@ -371,13 +371,13 @@
 				F4F207EE2849D20A005E79DA /* GoogleService-Info.plist in Resources */,
 				F49B77E82848DF5200F9AFBD /* LaunchScreen.storyboard in Resources */,
 				F49B77E92848DF5200F9AFBD /* Images.xcassets in Resources */,
-				F49B77EA2848DF5200F9AFBD /* BuildFile in Resources */,
+				F49B77EA2848DF5200F9AFBD /* (null) in Resources */,
 				F49B77EB2848DF5200F9AFBD /* RobotoCondensed-Bold.ttf in Resources */,
 				F49B77EC2848DF5200F9AFBD /* RobotoCondensed-BoldItalic.ttf in Resources */,
 				F49B77ED2848DF5200F9AFBD /* RobotoCondensed-Italic.ttf in Resources */,
 				F49B77EE2848DF5200F9AFBD /* RobotoCondensed-Light.ttf in Resources */,
 				F42D52AF284A3D2600235E3E /* hexa_keeper_dev-Info.plist in Resources */,
-				F49B77EF2848DF5200F9AFBD /* BuildFile in Resources */,
+				F49B77EF2848DF5200F9AFBD /* (null) in Resources */,
 				F49B77F12848DF5200F9AFBD /* RobotoCondensed-LightItalic.ttf in Resources */,
 				F49B77F22848DF5200F9AFBD /* RobotoCondensed-Regular.ttf in Resources */,
 			);
@@ -707,7 +707,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = hexa_keeper/hexa_keeper.entitlements;
-				CURRENT_PROJECT_VERSION = 74;
+				CURRENT_PROJECT_VERSION = 75;
 				DEVELOPMENT_TEAM = Y5TCB759QL;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = hexa_keeper/Info.plist;
@@ -716,7 +716,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.0.90;
+				MARKETING_VERSION = 0.0.92;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -737,15 +737,15 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = hexa_keeper/hexa_keeper.entitlements;
-				CURRENT_PROJECT_VERSION = 74;
+				CURRENT_PROJECT_VERSION = 75;
 				DEVELOPMENT_TEAM = Y5TCB759QL;
 				INFOPLIST_FILE = hexa_keeper/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.0.90;
+				MARKETING_VERSION = 0.0.92;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -888,7 +888,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = "dev-AppIcon";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = hexa_keeper_dev.entitlements;
-				CURRENT_PROJECT_VERSION = 74;
+				CURRENT_PROJECT_VERSION = 75;
 				DEVELOPMENT_TEAM = Y5TCB759QL;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = "hexa_keeper_dev-Info.plist";
@@ -897,7 +897,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.0.90;
+				MARKETING_VERSION = 0.0.92;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -918,15 +918,15 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = "dev-AppIcon";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = hexa_keeper_dev.entitlements;
-				CURRENT_PROJECT_VERSION = 74;
+				CURRENT_PROJECT_VERSION = 75;
 				DEVELOPMENT_TEAM = Y5TCB759QL;
 				INFOPLIST_FILE = "hexa_keeper_dev-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.0.90;
+				MARKETING_VERSION = 0.0.92;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

diff --git a/src/common/content/language/en.json b/src/common/content/language/en.json
@@ -302,7 +302,7 @@
     "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",
-    "Description": "Lorem ipsum dolor sit amet, consectetur eiusmod tempor"
+    "Description": ""
   },
   "seed": {
     "EnterSeed": "Enter Seeds",
@@ -507,4 +507,4 @@
     "12502": "We recommend signing in as it easily allows you to backup your wallet on your personal drive.",
     "default": "We encountered a non-standard error. Please try again after sometime or contact us"
   }
-}
+}
diff --git a/src/common/content/language/es.json b/src/common/content/language/es.json
@@ -301,7 +301,7 @@
     "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",
-    "Description": "Lorem ipsum dolor sit amet, consectetur eiusmod tempor"
+    "Description": ""
   },
   "seed": {
     "EnterSeed": "Enter Seeds",
@@ -506,4 +506,4 @@
     "12502": "We recommend signing in as it easily allows you to backup your wallet on your personal drive.",
     "default": "We encountered a non-standard error. Please try again after sometime or contact us"
   }
-}
+}
diff --git a/src/components/KeeperModal.tsx b/src/components/KeeperModal.tsx
@@ -48,12 +48,15 @@ const KeeperModal = (props: {
     dismissible = true,
     showButtons = true,
     learnMore = false,
-    learnMoreCallback = () => { },
+    learnMoreCallback = () => {},
     closeOnOverlayClick = true,
   } = props;
   const { bottom } = useSafeAreaInsets();
 
   const bottomMargin = Platform.select<number>({ ios: bottom, android: 10 });
+  if (!visible) {
+    return null;
+  }
   return (
     <Modal
       closeOnOverlayClick={closeOnOverlayClick}

diff --git a/src/screens/Inheritance/SetupInheritance.tsx b/src/screens/Inheritance/SetupInheritance.tsx
@@ -34,13 +34,13 @@ const SetupInheritance = () => {
     {
       title: 'Letter to the Attorney',
       subTitle: 'For the estate management company',
-      description: 'A partly pre-filled pdf template uniquely identifying the Vault and ability to add the beneficiary details',
+      description: 'A partly pre-filled pdf template uniquely identifying the vault and ability to add the beneficiary details',
       Icon: SettingUp
     },
     {
       title: 'Recovery Instructions',
       subTitle: 'For the heir or beneficiary',
-      description: 'A document that will help the beneficiary recover the Vault with or without the Keeper app',
+      description: 'A document that will help the beneficiary recover the vault with or without the Keeper app',
       Icon: Recovery
 
     }

diff --git a/src/screens/SignTransaction/SignerModals.tsx b/src/screens/SignTransaction/SignerModals.tsx
@@ -154,8 +154,7 @@ const PasswordEnter = ({ signTransaction }) => {
           color={'light.modalText'}
           marginTop={2}
         >
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt
-          ut labore et
+
         </Text>
         <Box mt={10} alignSelf={'flex-end'} mr={2}>
           <Box>
@@ -339,7 +338,7 @@ const SignerModals = ({
                   setPasswordModal(false);
                 }}
                 title={'Enter your password'}
-                subTitle={'Lorem ipsum dolor sit amet, '}
+                subTitle={''}
                 modalBackground={['#F7F2EC', '#F7F2EC']}
                 textColor={'#041513'}
                 Content={() => <PasswordEnter signTransaction={signTransaction} />}

diff --git a/src/screens/Vault/ChoosePolicyNew.tsx b/src/screens/Vault/ChoosePolicyNew.tsx
@@ -85,12 +85,7 @@ const ChoosePolicyNew = ({ navigation, route }) => {
           <Text fontWeight={200} fontSize={13} letterSpacing={0.96}>
             {title}
           </Text>
-          <Text
-            color={'light.GreyText'}
-            fontWeight={200}
-            fontSize={10}
-            letterSpacing={0.5}
-          >
+          <Text color={'light.GreyText'} fontWeight={200} fontSize={10} letterSpacing={0.5}>
             {subTitle}
           </Text>
         </Box>
@@ -99,7 +94,7 @@ const ChoosePolicyNew = ({ navigation, route }) => {
           <Box
             style={{
               marginLeft: wp(25),
-              width: wp(100)
+              width: wp(100),
             }}
           >
             <Input
@@ -137,22 +132,22 @@ const ChoosePolicyNew = ({ navigation, route }) => {
             <Field
               title={'Max no-check amount'}
               subTitle={
-                'If the transaction amount is more than this amount, the Signing Server will not sign it. You will have to use other devices for it.'
+                'The Signing Server will sign a transaction of this amount or lower, even w/o a 2FA verification code'
               }
               onPress={() => setSelectedPolicy('min')}
               value={minTransaction}
             />
             <Field
               title={'Max allowed amount'}
               subTitle={
-                'The Signing Server will sign a transaction of this amount or lower, even w/o a 2FA verification code'
+                'If the transaction amount is more than this amount, the Signing Server will not sign it. You will have to use other devices for it'
               }
               onPress={() => setSelectedPolicy('max')}
               value={maxTransaction}
             />
           </Box>
 
-          <Box marginTop={hp(windowHeight > 700 ? 40 : 0)} >
+          <Box marginTop={hp(windowHeight > 700 ? 40 : 0)}>
             <Buttons primaryText="Next" primaryCallback={onNext} />
           </Box>
         </Box>
@@ -164,7 +159,7 @@ const ChoosePolicyNew = ({ navigation, route }) => {
           ok={() => {
             console.log('ok');
           }}
-          clear={() => { }}
+          clear={() => {}}
           color={'#073E39'}
           height={windowHeight >= 850 ? 80 : 60}
           darkDeleteIcon={true}

diff --git a/src/screens/Vault/SigningDeviceDetails.tsx b/src/screens/Vault/SigningDeviceDetails.tsx
@@ -419,9 +419,7 @@ const SigningDeviceDetails = ({ route }) => {
         </Box>
       </ScrollView>
       <Box px={'10%'} py={'10%'}>
-        <Text fontSize={13}>
-          You will be reminded in 90 days Lorem ipsum dolor sit amet, consectetur adipiscing elit,
-        </Text>
+        <Text fontSize={13}>You will be reminded in 90 for the health check</Text>
 
         <HStack justifyContent={'space-between'}>
           <FooterItem

diff --git a/src/screens/Vault/SigningDeviceList.tsx b/src/screens/Vault/SigningDeviceList.tsx
@@ -90,6 +90,7 @@ const getDeviceStatus = (
     case SignerType.JADE:
     case SignerType.KEYSTONE:
     case SignerType.KEEPER:
+    case SignerType.PASSPORT:
       return {
         message: 'Coming soon',
         disabled: false,