From 3f3e4a846c7f2aa0d134184a51e04b569df21df8 Mon Sep 17 00:00:00 2001 From: Akshay Chavan Date: Wed, 12 Jul 2023 11:23:03 +0530 Subject: [PATCH 01/20] minor --- src/screens/AppSettings/Node/NodeSettings.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/screens/AppSettings/Node/NodeSettings.tsx b/src/screens/AppSettings/Node/NodeSettings.tsx index eea94e773..0df4d4b8f 100644 --- a/src/screens/AppSettings/Node/NodeSettings.tsx +++ b/src/screens/AppSettings/Node/NodeSettings.tsx @@ -155,7 +155,7 @@ function NodeSettings() { const onSelectedNodeitem = (selectedItem: NodeDetail) => { setCurrentlySelectedNodeItem(selectedItem); }; - + console.log('windowHeight', windowHeight) return ( AddNode(Node.getModalParams(currentlySelectedNode), onSaveCallback)} /> - {}}> + { }}> @@ -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: { From c719ba17df4e6571cb6fcfae0621a0b1acc3ce5a Mon Sep 17 00:00:00 2001 From: Akshay Chavan Date: Thu, 13 Jul 2023 11:12:28 +0530 Subject: [PATCH 02/20] Resolved - Preview pre-mix btn alignment issue --- src/screens/Mix/PoolSelection.tsx | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/screens/Mix/PoolSelection.tsx b/src/screens/Mix/PoolSelection.tsx index 02bd13fce..0a67da445 100644 --- a/src/screens/Mix/PoolSelection.tsx +++ b/src/screens/Mix/PoolSelection.tsx @@ -268,8 +268,8 @@ export default function PoolSelection({ route, navigation }) { - - + + @@ -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', From 2da391c40a631165d260d01b0b04c07302f73c4c Mon Sep 17 00:00:00 2001 From: Akshay Chavan Date: Thu, 13 Jul 2023 11:18:18 +0530 Subject: [PATCH 03/20] resolved header alignment --- src/screens/AddTapsigner/SetupTapsigner.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/screens/AddTapsigner/SetupTapsigner.tsx b/src/screens/AddTapsigner/SetupTapsigner.tsx index 2a1ea2a45..4f358b39a 100644 --- a/src/screens/AddTapsigner/SetupTapsigner.tsx +++ b/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)} /> From d5e8393bb18275960c6d461a5480753092a60e8f Mon Sep 17 00:00:00 2001 From: Akshay Chavan Date: Thu, 13 Jul 2023 12:28:01 +0530 Subject: [PATCH 04/20] Added left margin --- src/screens/SignTransaction/SignTransactionScreen.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/screens/SignTransaction/SignTransactionScreen.tsx b/src/screens/SignTransaction/SignTransactionScreen.tsx index d47d9774f..f061df0b6 100644 --- a/src/screens/SignTransaction/SignTransactionScreen.tsx +++ b/src/screens/SignTransaction/SignTransactionScreen.tsx @@ -19,7 +19,7 @@ import SigningServer from 'src/core/services/operations/SigningServer'; import { cloneDeep } from 'lodash'; import { finaliseVaultMigration } from 'src/store/sagaActions/vaults'; import { getJSONFromRealmObject } from 'src/storage/realm/utils'; -import { hp } from 'src/common/data/responsiveness/responsive'; +import { hp, wp } from 'src/common/data/responsiveness/responsive'; import ToastErrorIcon from 'src/assets/images/toast_error.svg'; import idx from 'idx'; import { sendPhaseThreeReset, updatePSBTEnvelops } from 'src/store/reducers/send_and_receive'; @@ -318,6 +318,7 @@ function SignTransactionScreen() { title="Sign Transaction" subtitle={`Chose any ${scheme.m} to sign the transaction`} paddingTop={hp(5)} + paddingLeft={wp(25)} /> Date: Thu, 13 Jul 2023 12:41:16 +0530 Subject: [PATCH 05/20] Tor settings - added left padding for header title --- src/screens/AppSettings/TorSettings.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/screens/AppSettings/TorSettings.tsx b/src/screens/AppSettings/TorSettings.tsx index f98f482e6..19f19159e 100644 --- a/src/screens/AppSettings/TorSettings.tsx +++ b/src/screens/AppSettings/TorSettings.tsx @@ -9,9 +9,10 @@ import SettingsSwitchCard from 'src/components/SettingComponent/SettingsSwitchCa import { setTorEnabled } from 'src/store/reducers/settings'; import { TorContext } from 'src/store/contexts/TorContext'; import { useDispatch } from 'react-redux'; -import TorModalMap from './TorModalMap'; import useToastMessage from 'src/hooks/useToastMessage'; import { ActivityIndicator } from 'react-native'; +import { wp } from 'src/common/data/responsiveness/responsive'; +import TorModalMap from './TorModalMap'; function TorSettings() { const { torStatus, orbotTorStatus, inAppTor, openOrbotApp } = useContext(TorContext); @@ -48,7 +49,7 @@ function TorSettings() { return ( - + {`Status: ${torStatus}`} From 41a2606c56d77426cf75dbb4edcb77ab0e4dfb87 Mon Sep 17 00:00:00 2001 From: Akshay Chavan Date: Thu, 13 Jul 2023 14:03:26 +0530 Subject: [PATCH 06/20] Resolved swiper content alignment --- src/screens/Mix/components/SwiperModal.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/screens/Mix/components/SwiperModal.tsx b/src/screens/Mix/components/SwiperModal.tsx index 1336bda36..a81de30d4 100644 --- a/src/screens/Mix/components/SwiperModal.tsx +++ b/src/screens/Mix/components/SwiperModal.tsx @@ -147,7 +147,7 @@ function SwiperModal({ enable }) { const styles = StyleSheet.create({ contentContaner: { - width: wp(286), + width: wp(290), }, swiperModalIcon: { alignSelf: 'center', From ce44fdfe8b42502b47ed81eb5a099bd66c9cee3f Mon Sep 17 00:00:00 2001 From: Akshay Chavan Date: Thu, 13 Jul 2023 14:04:04 +0530 Subject: [PATCH 07/20] Added - illustration immage in Skip health check modal --- src/screens/Vault/SigningDeviceDetails.tsx | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/screens/Vault/SigningDeviceDetails.tsx b/src/screens/Vault/SigningDeviceDetails.tsx index 94d54ab15..2b33edc07 100644 --- a/src/screens/Vault/SigningDeviceDetails.tsx +++ b/src/screens/Vault/SigningDeviceDetails.tsx @@ -20,6 +20,7 @@ import PassportSVG from 'src/assets/images/illustration_passport.svg'; import AdvnaceOptions from 'src/assets/images/Advancedoptions.svg'; import Change from 'src/assets/images/change.svg'; import HealthCheck from 'src/assets/images/heathcheck.svg'; +import SkipHealthCheck from 'src/assets/images/skipHealthCheck.svg'; import TapsignerSetupImage from 'src/assets/images/TapsignerSetup.svg'; import ColdCardSetupImage from 'src/assets/images/ColdCardSetup.svg'; import MobileKeyIllustration from 'src/assets/images/mobileKey_illustration.svg'; @@ -33,11 +34,11 @@ import { RealmWrapperContext } from 'src/storage/realm/RealmProvider'; import { Vault, VaultSigner } from 'src/core/wallets/interfaces/vault'; import { RealmSchema } from 'src/storage/realm/enum'; import { getJSONFromRealmObject } from 'src/storage/realm/utils'; +import { SignerType } from 'src/core/wallets/enums'; +import { healthCheckSigner } from 'src/store/sagaActions/bhr'; import SigningDeviceChecklist from './SigningDeviceChecklist'; import { SDIcons } from './SigningDeviceIcons'; -import { SignerType } from 'src/core/wallets/enums'; import HardwareModalMap, { ModalTypes } from './HardwareModalMap'; -import { healthCheckSigner } from 'src/store/sagaActions/bhr'; function SigningDeviceDetails({ route }) { const navigation = useNavigation(); @@ -191,16 +192,19 @@ function SigningDeviceDetails({ route }) { } }; - const HealthCheckContentTapsigner = () => { + function HealthCheckContentTapsigner() { return ( + + + You can choose to manually confirm the health of the Signing Device if you are sure that they are secure and accessible. Or you can choose to do the Health Check when you can ); - }; + } function FooterItem({ Icon, title, onPress }) { return ( @@ -339,10 +343,8 @@ function SigningDeviceDetails({ route }) { setSkipHealthCheckModalVisible(false)} - title={'Skipping Health Check'} - subTitle={ - 'It is very important that you keep your Signing Devices secure and fairly accessible at all times.' - } + title="Skipping Health Check" + subTitle="It is very important that you keep your Signing Devices secure and fairly accessible at all times." buttonText="Do Later" secondaryButtonText="Confirm Access" buttonTextColor="light.white" @@ -365,6 +367,9 @@ const styles = StyleSheet.create({ paddingVertical: 2, left: -7, }, + skipHealthIllustration: { + marginLeft: wp(25) + } }); export default SigningDeviceDetails; From b5911f72a3d9995838dfb56c1fda022d6de0f4fa Mon Sep 17 00:00:00 2001 From: Akshay Chavan Date: Thu, 13 Jul 2023 14:04:18 +0530 Subject: [PATCH 08/20] minor --- src/screens/Mix/MixProgress.tsx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/screens/Mix/MixProgress.tsx b/src/screens/Mix/MixProgress.tsx index 84fdb71e1..e4db789ab 100644 --- a/src/screens/Mix/MixProgress.tsx +++ b/src/screens/Mix/MixProgress.tsx @@ -436,8 +436,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.`, , toastDuration @@ -602,9 +601,9 @@ const getStyles = (clock) => timeLineTitle: { fontSize: 14, letterSpacing: 0.5, - marginLeft: wp(18), + marginLeft: wp(15), marginTop: hp(3), - width: wp(280), + width: wp(285), flexWrap: 'wrap', }, settingUpTitle: { From 21b9ec8fe621f02f01ba41a468664347fed72690 Mon Sep 17 00:00:00 2001 From: Akshay Chavan Date: Thu, 13 Jul 2023 15:57:42 +0530 Subject: [PATCH 09/20] fixed mix progress message's alignment --- src/screens/Mix/MixProgress.tsx | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/screens/Mix/MixProgress.tsx b/src/screens/Mix/MixProgress.tsx index e4db789ab..4daed7905 100644 --- a/src/screens/Mix/MixProgress.tsx +++ b/src/screens/Mix/MixProgress.tsx @@ -245,7 +245,7 @@ function MixProgress({ )} - + {title} @@ -587,30 +587,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(15), + fontSize: 13, + letterSpacing: 0.4, + marginLeft: wp(5), marginTop: hp(3), - width: wp(285), + width: '100%', flexWrap: 'wrap', }, - settingUpTitle: { - marginTop: hp(12), - paddingLeft: 5, - fontWeight: 'bold', - width: wp(270), + progressStepsTextWrapper: { + flexDirection: "column", + width: '85%' }, note: { position: 'absolute', From 8746ebc4c4e8249f33f6337a3f181025a7ccaa8a Mon Sep 17 00:00:00 2001 From: Akshay Chavan Date: Thu, 13 Jul 2023 15:58:47 +0530 Subject: [PATCH 10/20] update/increase width of uai msg --- .../components/HeaderDetails/components/UAIView.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/screens/NewHomeScreen/components/HeaderDetails/components/UAIView.tsx b/src/screens/NewHomeScreen/components/HeaderDetails/components/UAIView.tsx index 9b58ca468..a4c5ba230 100644 --- a/src/screens/NewHomeScreen/components/HeaderDetails/components/UAIView.tsx +++ b/src/screens/NewHomeScreen/components/HeaderDetails/components/UAIView.tsx @@ -47,7 +47,7 @@ const styles = StyleSheet.create({ uaiMessageText: { color: '#24312E', fontSize: 12, - width: 170, + width: 185, fontFamily: Fonts.RobotoCondensedSemiBold, letterSpacing: 0.6 }, From 450bcfe5809fa01a85fc3d9d86b149d4afbb14fa Mon Sep 17 00:00:00 2001 From: Akshay Chavan Date: Fri, 14 Jul 2023 11:05:15 +0530 Subject: [PATCH 11/20] Resolved - Capital V across the app in vault #2997 --- src/common/content/language/en.json | 22 +++++++++---------- src/common/content/language/es.json | 22 +++++++++---------- src/screens/Send/SendConfirmation.tsx | 2 +- .../VaultConfigurationRecovery.tsx | 6 ++--- src/screens/VaultRecovery/VaultRecovery.tsx | 6 ++--- .../WalletDetailScreen/WalletDetails.tsx | 2 +- .../WalletDetailScreen/WalletSettings.tsx | 2 +- .../components/LearnMoreModal.tsx | 2 +- .../components/LearnMoreModal.tsx | 2 +- 9 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/common/content/language/en.json b/src/common/content/language/en.json index 7022ef968..42c678a07 100644 --- a/src/common/content/language/en.json +++ b/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", diff --git a/src/common/content/language/es.json b/src/common/content/language/es.json index 45d5c693c..c56046907 100644 --- a/src/common/content/language/es.json +++ b/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", diff --git a/src/screens/Send/SendConfirmation.tsx b/src/screens/Send/SendConfirmation.tsx index d937b10b6..1f643765b 100644 --- a/src/screens/Send/SendConfirmation.tsx +++ b/src/screens/Send/SendConfirmation.tsx @@ -663,7 +663,7 @@ function SendConfirmation({ route }) { {transferType === TransferType.VAULT_TO_VAULT ? ( ) : null} diff --git a/src/screens/VaultRecovery/VaultConfigurationRecovery.tsx b/src/screens/VaultRecovery/VaultConfigurationRecovery.tsx index 62647274f..767b1dbe6 100644 --- a/src/screens/VaultRecovery/VaultConfigurationRecovery.tsx +++ b/src/screens/VaultRecovery/VaultConfigurationRecovery.tsx @@ -24,8 +24,8 @@ function VaultConfigurationRecovery() { > Alert.alert( - 'Warning: No vault is assocaited with this signer, please reomve and try with another signer' + 'Warning: No Vault is assocaited with this signer, please reomve and try with another signer' ) : () => navigation.navigate('LoginStack', { screen: 'SignersList' }) } @@ -248,7 +248,7 @@ function VaultRecovery({ navigation }) { { }} diff --git a/src/screens/WalletDetailScreen/WalletDetails.tsx b/src/screens/WalletDetailScreen/WalletDetails.tsx index 8ae629865..f255b6c70 100644 --- a/src/screens/WalletDetailScreen/WalletDetails.tsx +++ b/src/screens/WalletDetailScreen/WalletDetails.tsx @@ -276,7 +276,7 @@ function WalletDetails({ route }) { Keeper - When the funds in a wallet cross a threshold, a transfer to the vault is triggered. This + When the funds in a wallet cross a threshold, a transfer to the Vault is triggered. This ensures you don’t have more sats in hot wallets than you need. diff --git a/src/screens/WalletDetailScreen/WalletSettings.tsx b/src/screens/WalletDetailScreen/WalletSettings.tsx index 27404fa09..1074db629 100644 --- a/src/screens/WalletDetailScreen/WalletSettings.tsx +++ b/src/screens/WalletDetailScreen/WalletSettings.tsx @@ -243,7 +243,7 @@ function WalletSettings({ route }) { /> - {fee?.time} - + {fee?.time} + {fee?.fee} {fee?.fee > 1 ? 'sats' : 'sat'}/vB @@ -365,7 +365,7 @@ const styles = StyleSheet.create({ color: '#656565', fontSize: 13, textAlign: 'left', - width: 120, + width: 110, }, feeItem: { @@ -384,7 +384,6 @@ const styles = StyleSheet.create({ }, feeItemText: { color: '#656565', - width: 100, fontSize: 13, textAlign: 'left', }, From 1201d5ff3dcdc5949d733fdbec7bc34004a282cf Mon Sep 17 00:00:00 2001 From: Akshay Chavan Date: Fri, 14 Jul 2023 13:54:24 +0530 Subject: [PATCH 14/20] Resolved - Recovery: Signing device with Vault details #2999 --- src/screens/QRScreens/ScanQR.tsx | 2 +- src/screens/QRScreens/ShowQR.tsx | 3 ++- src/screens/SignTransaction/SignWithQR.tsx | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/screens/QRScreens/ScanQR.tsx b/src/screens/QRScreens/ScanQR.tsx index 1657a6fda..1125bb421 100644 --- a/src/screens/QRScreens/ScanQR.tsx +++ b/src/screens/QRScreens/ScanQR.tsx @@ -29,7 +29,7 @@ function ScanQR() { const { title = '', subtitle = '', - onQrScan = () => {}, + onQrScan = () => { }, setup = false, type, isHealthcheck = false, diff --git a/src/screens/QRScreens/ShowQR.tsx b/src/screens/QRScreens/ShowQR.tsx index 983345fd8..8fbcb5439 100644 --- a/src/screens/QRScreens/ShowQR.tsx +++ b/src/screens/QRScreens/ShowQR.tsx @@ -4,6 +4,7 @@ import HeaderTitle from 'src/components/HeaderTitle'; import React from 'react'; import ScreenWrapper from 'src/components/ScreenWrapper'; import { StyleSheet } from 'react-native'; +import { wp } from 'src/common/data/responsiveness/responsive'; import DisplayQR from '../QRScreens/DisplayQR'; function ShowQR() { @@ -17,7 +18,7 @@ function ShowQR() { return ( - + diff --git a/src/screens/SignTransaction/SignWithQR.tsx b/src/screens/SignTransaction/SignWithQR.tsx index 44dae1c13..fc870a623 100644 --- a/src/screens/SignTransaction/SignWithQR.tsx +++ b/src/screens/SignTransaction/SignWithQR.tsx @@ -17,8 +17,8 @@ import { updatePSBTEnvelops } from 'src/store/reducers/send_and_receive'; import useVault from 'src/hooks/useVault'; import { getTxHexFromKeystonePSBT } from 'src/hardware/keystone'; import { updateSignerDetails } from 'src/store/sagaActions/wallets'; -import DisplayQR from '../QRScreens/DisplayQR'; import { healthCheckSigner } from 'src/store/sagaActions/bhr'; +import DisplayQR from '../QRScreens/DisplayQR'; function SignWithQR() { const serializedPSBTEnvelops = useAppSelector( From d5b2544ccab2da9a8d88f5a5b62f5ed0292072e1 Mon Sep 17 00:00:00 2001 From: Akshay Chavan Date: Fri, 14 Jul 2023 13:55:15 +0530 Subject: [PATCH 15/20] Resolved - Toast message required here #3000 --- src/screens/VaultRecovery/VaultRecovery.tsx | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/screens/VaultRecovery/VaultRecovery.tsx b/src/screens/VaultRecovery/VaultRecovery.tsx index 22df4a9ae..d48b60154 100644 --- a/src/screens/VaultRecovery/VaultRecovery.tsx +++ b/src/screens/VaultRecovery/VaultRecovery.tsx @@ -30,18 +30,22 @@ import { hash256 } from 'src/core/services/operations/encryption'; import { updateSignerForScheme } from 'src/hooks/useSignerIntel'; import KeeperModal from 'src/components/KeeperModal'; import { setTempShellId } from 'src/store/reducers/vaults'; +import useToastMessage from 'src/hooks/useToastMessage'; +import ToastErrorIcon from 'src/assets/images/toast_error.svg'; import { SDIcons } from '../Vault/SigningDeviceIcons'; + const allowedSignerLength = [1, 3, 5]; function AddSigningDevice({ error }) { const navigation = useNavigation(); + const { showToast } = useToastMessage(); return ( - Alert.alert( + showToast( 'Warning: No Vault is assocaited with this signer, please reomve and try with another signer' ) : () => navigation.navigate('LoginStack', { screen: 'SignersList' }) @@ -131,6 +135,7 @@ function SuccessModalContent() { } function VaultRecovery({ navigation }) { + const { showToast } = useToastMessage(); const dispatch = useDispatch(); const { signingDevices, relayVaultError, relayVaultUpdate } = useAppSelector( (state) => state.bhr @@ -194,7 +199,7 @@ function VaultRecovery({ navigation }) { setSuccessModalVisible(true); } if (relayVaultError) { - Alert.alert('Something went wrong!'); + showToast('Something went wrong!', ); } }, [relayVaultUpdate, relayVaultError]); @@ -206,7 +211,7 @@ function VaultRecovery({ navigation }) { setScheme(response.scheme); } else { setRecoveryLoading(false); - Alert.alert('Vault does not exist with this signer combination'); + showToast('Vault does not exist with this signer combination', ); } }; From 0b539f59ec81f0b3b6acba4a856afecf70620651 Mon Sep 17 00:00:00 2001 From: Akshay Chavan Date: Fri, 14 Jul 2023 13:56:12 +0530 Subject: [PATCH 16/20] Resolved - #2999 --- src/screens/VaultRecovery/QrRecovery.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/screens/VaultRecovery/QrRecovery.tsx b/src/screens/VaultRecovery/QrRecovery.tsx index 2d11a8096..414db4ca0 100644 --- a/src/screens/VaultRecovery/QrRecovery.tsx +++ b/src/screens/VaultRecovery/QrRecovery.tsx @@ -14,6 +14,7 @@ import Note from 'src/components/Note/Note'; import { ImageLibraryOptions, launchImageLibrary } from 'react-native-image-picker'; import useToastMessage from 'src/hooks/useToastMessage'; import UploadImage from 'src/components/UploadImage'; +import { wp } from 'src/common/data/responsiveness/responsive'; import MockWrapper from '../Vault/MockWrapper'; const { width } = Dimensions.get('screen'); @@ -27,7 +28,7 @@ function QrRecovery() { const { title = '', subtitle = '', - onQrScan = () => {}, + onQrScan = () => { }, setup = true, type, } = route.params as any; @@ -100,7 +101,7 @@ function QrRecovery() { - + Date: Fri, 14 Jul 2023 14:12:29 +0530 Subject: [PATCH 17/20] Resolved - Alignment #3002 --- src/screens/Recovery/ScanQRFileRecovery.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/screens/Recovery/ScanQRFileRecovery.tsx b/src/screens/Recovery/ScanQRFileRecovery.tsx index 4cd219ff4..a64ebe50a 100644 --- a/src/screens/Recovery/ScanQRFileRecovery.tsx +++ b/src/screens/Recovery/ScanQRFileRecovery.tsx @@ -11,6 +11,7 @@ import Note from 'src/components/Note/Note'; import useToastMessage from 'src/hooks/useToastMessage'; import UploadFile from 'src/components/UploadFile'; import useConfigRecovery from 'src/hooks/useConfigReocvery'; +import { wp } from 'src/common/data/responsiveness/responsive'; const { width } = Dimensions.get('screen'); let decoder = new URRegistryDecoder(); @@ -64,8 +65,9 @@ function ScanQRFileRecovery({ route }) { Date: Fri, 14 Jul 2023 16:15:27 +0530 Subject: [PATCH 18/20] minor --- src/screens/Mix/MixProgress.tsx | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/screens/Mix/MixProgress.tsx b/src/screens/Mix/MixProgress.tsx index 4daed7905..6d15ff8ea 100644 --- a/src/screens/Mix/MixProgress.tsx +++ b/src/screens/Mix/MixProgress.tsx @@ -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.', - , - toastDuration - ); + showToast('Mix failed. Please try again later, our best minds are working on it.', , 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.', - , - 3000 - ); + showToast('Mix completed successfully. Your UTXOs will be available in your postmix account shortly.', , 3000); const postmixTags: BIP329Label[] = []; const userLabels = []; Object.keys(labels).forEach((key) => { From 8153d8f535b5347ba8168f7c2f364ef13ead3fef Mon Sep 17 00:00:00 2001 From: Akshay Chavan Date: Sat, 15 Jul 2023 16:58:16 +0530 Subject: [PATCH 19/20] Minor - added extra space for continue btn --- .../components/HeaderDetails/components/UAIView.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/screens/NewHomeScreen/components/HeaderDetails/components/UAIView.tsx b/src/screens/NewHomeScreen/components/HeaderDetails/components/UAIView.tsx index a4c5ba230..92b9ff481 100644 --- a/src/screens/NewHomeScreen/components/HeaderDetails/components/UAIView.tsx +++ b/src/screens/NewHomeScreen/components/HeaderDetails/components/UAIView.tsx @@ -47,12 +47,12 @@ const styles = StyleSheet.create({ uaiMessageText: { color: '#24312E', fontSize: 12, - width: 185, + width: '100%', fontFamily: Fonts.RobotoCondensedSemiBold, letterSpacing: 0.6 }, skipWrapper: { - width: '19%', + width: '16%', alignItems: 'center', }, skipText: { @@ -60,7 +60,7 @@ const styles = StyleSheet.create({ fontSize: 12, }, addNowWrapper: { - width: '22%', + width: '24%', }, addNowCTAWrapper: { padding: 5, From a29386b9001a55ef6c51aba78f415d67c1b98404 Mon Sep 17 00:00:00 2001 From: Shashank Shinde Date: Sat, 15 Jul 2023 19:57:32 +0530 Subject: [PATCH 20/20] build 206 --- android/app/build.gradle | 2 +- ios/hexa_keeper.xcodeproj/project.pbxproj | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index c835b9de8..2e0a773da 100644 --- a/android/app/build.gradle +++ b/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' diff --git a/ios/hexa_keeper.xcodeproj/project.pbxproj b/ios/hexa_keeper.xcodeproj/project.pbxproj index 83f54d3fc..43255c2c6 100644 --- a/ios/hexa_keeper.xcodeproj/project.pbxproj +++ b/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)",