From ebe081df3779df82c300e5ffbd7273c7f7749484 Mon Sep 17 00:00:00 2001 From: Raheel1258 Date: Thu, 20 Oct 2022 17:01:52 +0500 Subject: [PATCH 1/8] text change --- src/screens/Inheritance/SetupInheritance.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/screens/Inheritance/SetupInheritance.tsx b/src/screens/Inheritance/SetupInheritance.tsx index 86ebf380c..3fe965add 100644 --- 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 } From 0ba493b4872507ecc0ffbb6e2a99163b66ab1394 Mon Sep 17 00:00:00 2001 From: PraneethGunas Date: Thu, 20 Oct 2022 18:59:01 +0530 Subject: [PATCH 2/8] MARKETING VERSION 91 --- ios/hexa_keeper.xcodeproj/project.pbxproj | 24 +++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/ios/hexa_keeper.xcodeproj/project.pbxproj b/ios/hexa_keeper.xcodeproj/project.pbxproj index a13cc984a..581cf7790 100644 --- 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 */, ); @@ -716,7 +716,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 0.0.90; + MARKETING_VERSION = 0.0.91; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -745,7 +745,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 0.0.90; + MARKETING_VERSION = 0.0.91; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -897,7 +897,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 0.0.90; + MARKETING_VERSION = 0.0.91; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -926,7 +926,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 0.0.90; + MARKETING_VERSION = 0.0.91; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", From c6b3e77b7ca8f586a823f1c464b924c15d661847 Mon Sep 17 00:00:00 2001 From: PraneethGunas Date: Thu, 20 Oct 2022 19:27:34 +0530 Subject: [PATCH 3/8] Fix: Lag in iOS Modals --- src/components/KeeperModal.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/KeeperModal.tsx b/src/components/KeeperModal.tsx index b102c4740..901e44d2c 100644 --- 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({ ios: bottom, android: 10 }); + if (!visible) { + return null; + } return ( Date: Thu, 20 Oct 2022 19:29:32 +0530 Subject: [PATCH 4/8] Updated signer list --- src/screens/Vault/SigningDeviceList.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/screens/Vault/SigningDeviceList.tsx b/src/screens/Vault/SigningDeviceList.tsx index bea92de62..60bd2d4ff 100644 --- 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, From 80f95dcb28a82966da5bcfd882ed8aa77b16c384 Mon Sep 17 00:00:00 2001 From: Parsh Date: Fri, 21 Oct 2022 10:43:31 +0530 Subject: [PATCH 5/8] max-min policy: sub-text update --- src/screens/Vault/ChoosePolicyNew.tsx | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/screens/Vault/ChoosePolicyNew.tsx b/src/screens/Vault/ChoosePolicyNew.tsx index 39e333226..611b0c0ba 100644 --- a/src/screens/Vault/ChoosePolicyNew.tsx +++ b/src/screens/Vault/ChoosePolicyNew.tsx @@ -85,12 +85,7 @@ const ChoosePolicyNew = ({ navigation, route }) => { {title} - + {subTitle} @@ -99,7 +94,7 @@ const ChoosePolicyNew = ({ navigation, route }) => { { setSelectedPolicy('min')} value={minTransaction} @@ -145,14 +140,14 @@ const ChoosePolicyNew = ({ navigation, route }) => { setSelectedPolicy('max')} value={maxTransaction} /> - 700 ? 40 : 0)} > + 700 ? 40 : 0)}> @@ -164,7 +159,7 @@ const ChoosePolicyNew = ({ navigation, route }) => { ok={() => { console.log('ok'); }} - clear={() => { }} + clear={() => {}} color={'#073E39'} height={windowHeight >= 850 ? 80 : 60} darkDeleteIcon={true} From 277c3d131c2fac1363cf1ca4a16b5df5c6ce0b59 Mon Sep 17 00:00:00 2001 From: pratyakxx <64364241+pratyakxx@users.noreply.github.com> Date: Fri, 21 Oct 2022 10:58:53 +0530 Subject: [PATCH 6/8] App Crash fix (#1202) --- src/screens/Vault/SigningDeviceDetails.tsx | 4 +- .../WalletDetailScreen/WalletDetails.tsx | 91 +++++++++---------- src/store/sagas/uai.ts | 2 +- 3 files changed, 46 insertions(+), 51 deletions(-) diff --git a/src/screens/Vault/SigningDeviceDetails.tsx b/src/screens/Vault/SigningDeviceDetails.tsx index fda494b41..afe1ae76d 100644 --- a/src/screens/Vault/SigningDeviceDetails.tsx +++ b/src/screens/Vault/SigningDeviceDetails.tsx @@ -419,9 +419,7 @@ const SigningDeviceDetails = ({ route }) => { - - You will be reminded in 90 days Lorem ipsum dolor sit amet, consectetur adipiscing elit, - + You will be reminded in 90 for the health check { const navigation = useNavigation(); @@ -53,6 +61,8 @@ const WalletDetails = () => { const carasualRef = useRef>(null); const { useQuery } = useContext(RealmWrapperContext); const wallets: Wallet[] = useQuery(RealmSchema.Wallet).map(getJSONFromRealmObject); + const vaults: Vault[] = useQuery(RealmSchema.Vault).map(getJSONFromRealmObject); + const vaultExsist = Boolean(vaults.length); const netBalance = useAppSelector((state) => state.wallet.netBalance); const introModal = useAppSelector((state) => state.wallet.introModal); @@ -155,12 +165,7 @@ const WalletDetails = () => { {getAmount(walletBalance)} - + {getUnit()} @@ -231,12 +236,7 @@ const WalletDetails = () => { marginRight={3} > {getAmount(transaction.amount)} - + {getUnit()} @@ -337,12 +337,7 @@ const WalletDetails = () => { {getAmount(netBalance)} - + {getUnit()} @@ -367,39 +362,41 @@ const WalletDetails = () => { {walletIndex !== wallets.length ? ( <> {/* {Transfer pollicy} */} - - - - Transfer Policy is set at{' '} - ฿ {wallets[walletIndex].specs.transferPolicy}sats - - - - + { + if (vaultExsist) { navigation.navigate('SendConfirmation', { isVaultTransfer: true, walletId: wallets[walletIndex].id, - }) - } + }); + } else Alert.alert('Vault is not created'); + }} + > + + + + Transfer Policy is set at{' '} + ฿ {wallets[walletIndex].specs.transferPolicy}sats + + + - - + + {/* {Transactions} */} diff --git a/src/store/sagas/uai.ts b/src/store/sagas/uai.ts index b818cd86c..238985870 100644 --- a/src/store/sagas/uai.ts +++ b/src/store/sagas/uai.ts @@ -42,7 +42,7 @@ function* uaiChecksWorker({ payload }) { for (var vault of vaults) { for (var signer of vault.signers) { const lastHealthCheckDays = healthCheckRemider(signer); - if (lastHealthCheckDays >= 1) { + if (lastHealthCheckDays >= 90) { const uais = dbManager.getObjectByField(RealmSchema.UAI, signer.signerId, 'entityId'); if (!uais.length) { yield put( From b8ab949fc7129d883d4742c9941691a149d756ad Mon Sep 17 00:00:00 2001 From: Raheel1258 Date: Fri, 21 Oct 2022 12:29:46 +0500 Subject: [PATCH 7/8] textual changes --- src/common/content/language/en.json | 4 ++-- src/common/content/language/es.json | 4 ++-- src/screens/SignTransaction/SignerModals.tsx | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/common/content/language/en.json b/src/common/content/language/en.json index 7ad32d4a6..98eab8af8 100644 --- 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" } -} +} \ No newline at end of file diff --git a/src/common/content/language/es.json b/src/common/content/language/es.json index 198be2973..fdd6516c3 100644 --- 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" } -} +} \ No newline at end of file diff --git a/src/screens/SignTransaction/SignerModals.tsx b/src/screens/SignTransaction/SignerModals.tsx index 92bd474c4..ed770505e 100644 --- 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 + @@ -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={() => } From 4ab8a3d3329463c3e735fd367405413ffe3428fd Mon Sep 17 00:00:00 2001 From: Shashank Shinde Date: Fri, 21 Oct 2022 13:14:21 +0530 Subject: [PATCH 8/8] build v0.0.92(75) --- android/app/build.gradle | 4 ++-- ios/hexa_keeper.xcodeproj/project.pbxproj | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 7cfd815bd..e588cdc7c 100644 --- 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 index 581cf7790..c3ac921f9 100644 --- a/ios/hexa_keeper.xcodeproj/project.pbxproj +++ b/ios/hexa_keeper.xcodeproj/project.pbxproj @@ -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.91; + MARKETING_VERSION = 0.0.92; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -737,7 +737,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; INFOPLIST_FILE = hexa_keeper/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; @@ -745,7 +745,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 0.0.91; + 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.91; + MARKETING_VERSION = 0.0.92; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -918,7 +918,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; INFOPLIST_FILE = "hexa_keeper_dev-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 12.0; @@ -926,7 +926,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 0.0.91; + MARKETING_VERSION = 0.0.92; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC",