Merge pull request #5584 from bithyve/dev

release v1.2.19

android/app/build.gradle

@@ -86,8 +86,8 @@ android {
         applicationId "io.hexawallet.keeper"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 413
-        versionName "1.2.18"
+        versionCode 415
+        versionName "1.2.19"
         missingDimensionStrategy 'react-native-camera', 'general'
         missingDimensionStrategy 'store', 'play'
         multiDexEnabled true

ios/hexa_keeper.xcodeproj/project.pbxproj

@@ -796,8 +796,8 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "cc28f9e0-ec33-42fe-8e22-38f1ba23923b";
-				PROVISIONING_PROFILE_SPECIFIER = "Keeper Distribution";
+				PROVISIONING_PROFILE = "dcc403d2-5657-4b83-a081-42585d31ea59";
+				PROVISIONING_PROFILE_SPECIFIER = "Keeper Development";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/hexa_keeper.app/hexa_keeper";
 			};
 			name = Release;
@@ -811,7 +811,7 @@
 				CODE_SIGN_ENTITLEMENTS = hexa_keeper/hexa_keeper.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 413;
+				CURRENT_PROJECT_VERSION = 415;
 				DEVELOPMENT_TEAM = Y5TCB759QL;
 				ENABLE_BITCODE = NO;
 				HEADER_SEARCH_PATHS = (
@@ -912,7 +912,7 @@
 					"$(inherited)",
 					"\"$(SRCROOT)\"",
 				);
-				MARKETING_VERSION = 1.2.18;
+				MARKETING_VERSION = 1.2.19;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -936,7 +936,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = hexa_keeper/hexa_keeper.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Distribution: Bithyve UK Ltd (Y5TCB759QL)";
-				CURRENT_PROJECT_VERSION = 413;
+				CURRENT_PROJECT_VERSION = 415;
 				DEVELOPMENT_TEAM = Y5TCB759QL;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = Y5TCB759QL;
 				HEADER_SEARCH_PATHS = (
@@ -1037,16 +1037,16 @@
 					"$(inherited)",
 					"\"$(SRCROOT)\"",
 				);
-				MARKETING_VERSION = 1.2.18;
+				MARKETING_VERSION = 1.2.19;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
 					"-lc++",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = io.hexawallet.keeper;
 				PRODUCT_NAME = hexa_keeper;
-				PROVISIONING_PROFILE = "cc28f9e0-ec33-42fe-8e22-38f1ba23923b";
-				PROVISIONING_PROFILE_SPECIFIER = "Keeper Distribution";
+				PROVISIONING_PROFILE = "dcc403d2-5657-4b83-a081-42585d31ea59";
+				PROVISIONING_PROFILE_SPECIFIER = "Keeper Development";
 				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Keeper Distribution";
 				SWIFT_OBJC_BRIDGING_HEADER = "whirlpool/hexa_keeper-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -1192,7 +1192,7 @@
 				CODE_SIGN_ENTITLEMENTS = hexa_keeper_dev.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 413;
+				CURRENT_PROJECT_VERSION = 415;
 				DEVELOPMENT_TEAM = Y5TCB759QL;
 				ENABLE_BITCODE = NO;
 				HEADER_SEARCH_PATHS = (
@@ -1294,7 +1294,7 @@
 					"$(PROJECT_DIR)",
 					"\"$(SRCROOT)\"",
 				);
-				MARKETING_VERSION = 1.2.18;
+				MARKETING_VERSION = 1.2.19;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1320,7 +1320,7 @@
 				CODE_SIGN_ENTITLEMENTS = hexa_keeper_dev.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
-				CURRENT_PROJECT_VERSION = 413;
+				CURRENT_PROJECT_VERSION = 415;
 				DEVELOPMENT_TEAM = Y5TCB759QL;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = Y5TCB759QL;
 				HEADER_SEARCH_PATHS = (
@@ -1422,16 +1422,16 @@
 					"$(PROJECT_DIR)",
 					"\"$(SRCROOT)\"",
 				);
-				MARKETING_VERSION = 1.2.18;
+				MARKETING_VERSION = 1.2.19;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
 					"-lc++",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = io.hexawallet.hexakeeper.dev;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "cc28f9e0-ec33-42fe-8e22-38f1ba23923b";
-				PROVISIONING_PROFILE_SPECIFIER = "Keeper Distribution";
+				PROVISIONING_PROFILE = "dcc403d2-5657-4b83-a081-42585d31ea59";
+				PROVISIONING_PROFILE_SPECIFIER = "Keeper Development";
 				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Keeper Development";
 				SWIFT_OBJC_BRIDGING_HEADER = "whirlpool/hexa_keeper-Bridging-Header.h";
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "hexa_keeper-Swift.h";

ios/hexa_keeper/Info.plist

@@ -36,7 +36,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>413</string>
+	<string>415</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NFCReaderUsageDescription</key>

ios/hexa_keeperTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>413</string>
+	<string>415</string>
 </dict>
 </plist>

ios/hexa_keeper_dev-Info.plist

@@ -36,7 +36,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>413</string>
+	<string>415</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NFCReaderUsageDescription</key>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexa_keeper",
-  "version": "1.2.18",
+  "version": "1.2.19",
   "private": true,
   "scripts": {
     "ios": "react-native run-ios",

src/context/Localization/language/en.json

@@ -558,7 +558,7 @@
     "Desc2of3": "2-of-3 Multi-key",
     "CollaborativeWalletCreated": "A 2 of 3 collaborative wallet will be created",
     "WalletCreated": "Wallet Created Successfully!",
-    "CollaborativeWalletSubtitle": "A collaborative with three App Keys on three separate devices.",
+    "CollaborativeWalletSubtitle": "You have successfully created a collaborative wallet with three app keys on three separate devices.",
     "CollaborativeWalletDesc": "You should ensure you have a copy of the wallet configuration file for this vault",
     "highCustom": "Network fee is more than 10% of the amount being sent. Consider using custom fee option.",
     "highWait": "Network fee is 10% higher than usual. If not urgent, consider waiting for the fee to go down.",
@@ -1055,7 +1055,7 @@
   "ramp": {
     "byProceedRampParagraph": "By proceeding, you understand that Ramp will process the payment and transfer for the purchased bitcoin",
     "bitcoinTransfer": "Bitcoin will be transferred to",
-    "addressForRamp": "Address for ramp transactions",
+    "addressForRamp": "Address for Ramp transactions",
     "buyBitcoinRamp": "Buy bitcoin with Ramp",
     "buyBitcoinRampSubTitle": "Ramp enables BTC purchases using Apple Pay, Debit/Credit card, Bank Transfer and open banking where available payment methods available may vary based on your country"
   },

src/context/Localization/language/es.json

@@ -558,7 +558,7 @@
     "Desc2of3": "2-of-3 Multi-key",
     "CollaborativeWalletCreated": "A 2 of 3 collaborative wallet will be created",
     "WalletCreated": "Wallet Created Successfully!",
-    "CollaborativeWalletSubtitle": "A collaborative with three App Keys on three separate devices.",
+    "CollaborativeWalletSubtitle": "You have successfully created a collaborative wallet with three app keys on three separate devices.",
     "CollaborativeWalletDesc": "You should ensure you have a copy of the wallet configuration file for this vault",
     "highCustom": "Network fee is more than 10% of the amount being sent. Consider using custom fee option.",
     "highWait": "Network fee is 10% higher than usual. If not urgent, consider waiting for the fee to go down.",
@@ -1052,7 +1052,7 @@
   "ramp": {
     "byProceedRampParagraph": "By proceeding, you understand that Ramp will process the payment and transfer for the purchased bitcoin",
     "bitcoinTransfer": "Bitcoin will be transferred to",
-    "addressForRamp": "Address for ramp transactions",
+    "addressForRamp": "Address for Ramp transactions",
     "buyBitcoinRamp": "Buy bitcoin with Ramp",
     "buyBitcoinRampSubTitle": "Ramp enables BTC purchases using Apple Pay, Debit/Credit card, Bank Transfer and open banking where available payment methods available may vary based on your country"
   },

src/hardware/tapsigner/index.ts

@@ -146,6 +146,7 @@ export const changePin = async (card: CKTapCard, oldCVC: string, newCVC: string)
 
 export const signWithTapsigner = async (
   card: CKTapCard,
+  cardMfp: string,
   inputsToSign: {
     digest: string;
     subPath: string;
@@ -161,6 +162,14 @@ export const signWithTapsigner = async (
   const status = await card.first_look();
   const isLegit = await card.certificate_check();
   if (isLegit) {
+    if (cardMfp) {
+      const xfp = (await card.get_xfp(cvc)).toString('hex').toUpperCase();
+      if (xfp !== cardMfp.toUpperCase()) {
+        throw Error(
+          'Wrong TAPSIGNER used, please ensure you use the same one slected for signing.'
+        );
+      }
+    }
     try {
       if (status.path) {
         if (status.is_testnet !== isTestnet) {
@@ -175,7 +184,6 @@ export const signWithTapsigner = async (
         }
         return inputsToSign;
       }
-      Alert.alert('Please set up card before signing!');
       throw Error('Please set up card before signing!');
     } catch (e) {
       captureError(e);
@@ -205,6 +213,8 @@ export const handleTapsignerError = (error, navigation) => {
     errorMessage = 'Something went wrong, please try again!';
   } else if (error.toString() === 'Error' || error.toString() === '[Error]') {
     errorMessage = 'Operation cancelled. Please try again.';
+  } else {
+    errorMessage = error?.message || null;
   }
 
   if (errorMessage) {

src/hooks/useConfigReocvery.tsx

@@ -12,6 +12,7 @@ import { CommonActions, useNavigation } from '@react-navigation/native';
 import { resetRealyVaultState } from 'src/store/reducers/bhr';
 import { generateVaultId } from 'src/services/wallets/factories/VaultFactory';
 import TickIcon from 'src/assets/images/icon_tick.svg';
+import ToastErrorIcon from 'src/assets/images/toast_error.svg';
 import useToastMessage from './useToastMessage';
 import useVault from './useVault';
 
@@ -105,6 +106,8 @@ const useConfigRecovery = () => {
       setRecoveryLoading(false);
       recoveryError.failed = true;
       recoveryError.message = err;
+      showToast(err.message ? err.message : err.toString(), <ToastErrorIcon />);
+      navigation.goBack();
     }
   };
 

src/navigation/Navigator.tsx

@@ -85,7 +85,6 @@ import UnlockTapsigner from 'src/screens/SigningDevices/UnlockTapsigner';
 import ChangeTapsignerPin from 'src/screens/SigningDevices/ChangeTapsignerPin';
 import UTXOSelection from 'src/screens/Send/UTXOSelection';
 import VaultSetup from 'src/screens/Vault/VaultSetup';
-import NFCScanner from 'src/screens/Vault/NFCScanner';
 import PrivacyAndDisplay from 'src/screens/AppSettings/PrivacyAndDisplay';
 import NetworkSetting from 'src/screens/AppSettings/NetworkSetting';
 import VaultCreationOptions from 'src/screens/Vault/VaultCreationOptions';
@@ -298,7 +297,6 @@ function AppStack() {
           options={{ gestureEnabled: false }}
         />
         <Stack.Screen name="AssignSignerType" component={AssignSignerType} />
-        <Stack.Screen name="NFCScanner" component={NFCScanner} />
         <Stack.Screen name="AddWallet" component={AddWallet} />
         <Stack.Screen name="ManageSigners" component={ManageSigners} />
         <Stack.Screen name="BuyBitcoin" component={BuyBitcoinScreen} />

src/navigation/types.ts

@@ -122,7 +122,6 @@ export type AppStackParams = {
   SigningDeviceConfigRecovery: undefined;
   MixProgress: undefined;
   AssignSignerType: undefined;
-  NFCScanner: undefined;
   AddWallet: undefined;
   CanaryWallets: undefined;
   AssistedKeys: undefined;

src/screens/BuyBitcoin/BuyBitcoinScreen.tsx

@@ -21,7 +21,7 @@ function BuyBitcoinScreen({ route }) {
   const { colorMode } = useColorMode();
   const { currencyCode } = useAppSelector((state) => state.settings);
   const { translations } = useContext(LocalizationContext);
-  const { common } = translations;
+  const { common, ramp: rampTranslations } = translations;
 
   const { wallet } = route.params;
   const receivingAddress = wallet.specs.receivingAddress;
@@ -86,7 +86,7 @@ function BuyBitcoinScreen({ route }) {
 
         <Box style={styles.toWalletWrapper} backgroundColor={`${colorMode}.seashellWhite`}>
           <Text fontSize={13} color={`${colorMode}.primaryText`}>
-            Address for ramp transactions
+            {rampTranslations.addressForRamp}
           </Text>
           <Box style={styles.iconContainer}>
             <HexagonIcon

src/screens/NFCChannel/ShareWithNfc.tsx

@@ -31,6 +31,7 @@ function ShareWithNfc({
   sendConfirmationRouteParams,
   tnxDetails,
   fileName,
+  useNdef = false,
 }: {
   data: string;
   signer?: Signer;
@@ -43,6 +44,7 @@ function ShareWithNfc({
   sendConfirmationRouteParams?: SendConfirmationRouteParams;
   tnxDetails?: tnxDetailsProps;
   fileName?: string;
+  useNdef?: boolean; // For hardware wallets interactions
 }) {
   const { session } = useContext(HCESessionContext);
   const navigation = useNavigation<any>();
@@ -53,17 +55,15 @@ function ShareWithNfc({
   const cleanUp = () => {
     setVisible(false);
     Vibration.cancel();
-    if (isAndroid) {
+    if (isAndroid && !useNdef) {
       NFC.stopTagSession(session);
     }
   };
   useEffect(() => {
     const unsubDisconnect = session.on(HCESession.Events.HCE_STATE_DISCONNECTED, () => {
       cleanUp();
     });
-    const unsubRead = session.on(HCESession.Events.HCE_STATE_READ, () => {
-      showToast('Cosigner details shared successfully', <TickIcon />);
-    });
+    const unsubRead = session.on(HCESession.Events.HCE_STATE_READ, () => {});
     return () => {
       cleanUp();
       unsubRead();
@@ -76,7 +76,10 @@ function ShareWithNfc({
 
   const shareWithNFC = async () => {
     try {
-      if (isIos) {
+      if (isIos || useNdef) {
+        if (!isIos) {
+          setVisible(true);
+        }
         Vibration.vibrate([700, 50, 100, 50], true);
         const enc = NFC.encodeTextRecord(data);
         await NFC.send([NfcTech.Ndef], enc);

src/screens/QRScreens/RegisterWithChannel.tsx

@@ -122,7 +122,7 @@ function RegisterWithChannel() {
     <ScreenWrapper backgroundcolor={`${colorMode}.primaryBackground`}>
       <KeeperHeader
         title="Register with Keeper Desktop App"
-        subtitle={`Please download the Bitcoin Keeper desktop app from our website: ${KEEPER_WEBSITE_BASE_URL} to register this signer.`}
+        subtitle={`Please download the Bitcoin Keeper desktop app from our website: ${KEEPER_WEBSITE_BASE_URL}/desktop to register this signer.`}
       />
       <Box style={styles.qrcontainer}>
         <ScanAndInstruct onBarCodeRead={onBarCodeRead} />

src/screens/QRScreens/RegisterWithQR.tsx

@@ -74,7 +74,7 @@ function RegisterWithQR({ route, navigation }: any) {
           )}
         </Box>
         <Box style={styles.centerBottom}>
-          <ShareWithNfc data={walletConfig} signer={signer} />
+          <ShareWithNfc data={walletConfig} signer={signer} useNdef />
         </Box>
         <Buttons
           primaryText="Confirm Registration"

src/screens/Recovery/SigningDeviceConfigRecovery.tsx

@@ -144,10 +144,10 @@ function SigningDeviceConfigRecovery({ navigation }) {
             borderBottomRadius={last ? 15 : 0}
           >
             <Box style={styles.walletMapContainer}>
-              <Box style={styles.walletMapWrapper}>{SDIcons(type).Icon}</Box>
+              <Box style={styles.walletMapWrapper}>{SDIcons(type, colorMode === 'dark').Icon}</Box>
               <Box backgroundColor={`${colorMode}.divider`} style={styles.divider} />
               <Box style={styles.walletMapLogoWrapper}>
-                {SDIcons(type).Logo}
+                {SDIcons(type, colorMode === 'dark').Logo}
                 <Text color={`${colorMode}.inActiveMsg`} style={styles.messageText}>
                   {message}
                 </Text>

src/screens/SignTransaction/SignerModals.tsx

@@ -906,7 +906,7 @@ function SignerModals({
                 setLedgerModal(false);
               }}
               title="Get your Ledger Ready"
-              subTitle={`Please download the Bitcoin Keeper desktop app from our website: ${KEEPER_WEBSITE_BASE_URL} to connect with Ledger.`}
+              subTitle={`Please download the Bitcoin Keeper desktop app from our website: ${KEEPER_WEBSITE_BASE_URL}/desktop to connect with Ledger.`}
               textColor={`${colorMode}.primaryText`}
               Content={() => <LedgerContent />}
               buttonText="Proceed"
@@ -1147,7 +1147,7 @@ function SignerModals({
                 setTrezorModal(false);
               }}
               title="Keep Trezor Ready"
-              subTitle={`Please download the Bitcoin Keeper desktop app from our website: ${KEEPER_WEBSITE_BASE_URL} to connect with Trezor.`}
+              subTitle={`Please download the Bitcoin Keeper desktop app from our website: ${KEEPER_WEBSITE_BASE_URL}/desktop to connect with Trezor.`}
               textColor={`${colorMode}.primaryText`}
               Content={() => <TrezorContent />}
               buttonText="Proceed"
@@ -1164,7 +1164,7 @@ function SignerModals({
                 setBitbox02Modal(false);
               }}
               title="Keep BitBox02 Ready"
-              subTitle={`Please download the Bitcoin Keeper desktop app from our website: ${KEEPER_WEBSITE_BASE_URL} to connect with BitBox02.`}
+              subTitle={`Please download the Bitcoin Keeper desktop app from our website: ${KEEPER_WEBSITE_BASE_URL}/desktop to connect with BitBox02.`}
               textColor={`${colorMode}.primaryText`}
               Content={() => <BitBox02Content />}
               buttonText="Proceed"