[FEAT] biometric for sending

bitpay · Jul 19, 2022 · 29a0891 · 29a0891
1 parent 15e821c
commit 29a0891
Show file tree

Hide file tree

Showing 11 changed files with 115 additions and 9 deletions.
diff --git a/src/Root.tsx b/src/Root.tsx
@@ -210,6 +210,9 @@ export default () => {
   );
   const introCompleted = useAppSelector(({APP}) => APP.introCompleted);
   const appIsLoading = useAppSelector(({APP}) => APP.appIsLoading);
+  const checkingBiometricForSending = useAppSelector(
+    ({APP}) => APP.checkingBiometricForSending,
+  );
   const appColorScheme = useAppSelector(({APP}) => APP.colorScheme);
   const currentRoute = useAppSelector(({APP}) => APP.currentRoute);
   const appLanguage = useAppSelector(({APP}) => APP.defaultLanguage);
@@ -255,7 +258,10 @@ export default () => {
       };
 
       if (onboardingCompleted) {
-        if (status === 'active' && !appIsLoading) {
+        if (status === 'active' && checkingBiometricForSending) {
+          dispatch(AppActions.checkingBiometricForSending(false));
+          dispatch(AppActions.showBlur(false));
+        } else if (status === 'active' && !appIsLoading) {
           if (lockAuthorizedUntil) {
             const now = Math.floor(Date.now() / 1000);
             const totalSecs = lockAuthorizedUntil - now;
@@ -286,6 +292,7 @@ export default () => {
     pinLockActive,
     lockAuthorizedUntil,
     biometricLockActive,
+    checkingBiometricForSending,
     appIsLoading,
     failedAppInit,
   ]);

diff --git a/src/navigation/services/swap-crypto/screens/ChangellyCheckout.tsx b/src/navigation/services/swap-crypto/screens/ChangellyCheckout.tsx
@@ -508,6 +508,9 @@ const ChangellyCheckout: React.FC = () => {
           break;
         case 'password canceled':
           break;
+        case 'biometric check failed':
+          setResetSwipeButton(true);
+          break;
         default:
           logger.error(JSON.stringify(err));
           const msg = t('Uh oh, something went wrong. Please try again later');

diff --git a/src/navigation/wallet-connect/screens/WalletConnectConfirm.tsx b/src/navigation/wallet-connect/screens/WalletConnectConfirm.tsx
@@ -148,6 +148,9 @@ const WalletConnectConfirm = () => {
           break;
         case 'password canceled':
           break;
+        case 'biometric check failed':
+          setResetSwipeButton(true);
+          break;
         default:
           await showErrorMessage(
             CustomErrorMessage({

diff --git a/src/navigation/wallet-connect/screens/WalletConnectRequestDetails.tsx b/src/navigation/wallet-connect/screens/WalletConnectRequestDetails.tsx
@@ -271,6 +271,7 @@ const WalletConnectRequestDetails = () => {
       switch (err) {
         case 'invalid password':
         case 'password canceled':
+        case 'biometric check failed':
           await sleep(800);
           setApproveButtonState('loading');
           await sleep(200);

diff --git a/src/navigation/wallet/screens/TransactionProposalDetails.tsx b/src/navigation/wallet/screens/TransactionProposalDetails.tsx
@@ -523,6 +523,9 @@ const TransactionProposalDetails = () => {
                   break;
                 case 'password canceled':
                   break;
+                case 'biometric check failed':
+                  setResetSwipeButton(true);
+                  break;
                 default:
                   await showErrorMessage(
                     CustomErrorMessage({

diff --git a/src/navigation/wallet/screens/send/confirm/Confirm.tsx b/src/navigation/wallet/screens/send/confirm/Confirm.tsx
@@ -497,6 +497,9 @@ const Confirm = () => {
                 break;
               case 'password canceled':
                 break;
+              case 'biometric check failed':
+                setResetSwipeButton(true);
+                break;
               default:
                 await showErrorMessage(
                   CustomErrorMessage({

diff --git a/src/store/app/app.actions.ts b/src/store/app/app.actions.ts
@@ -275,3 +275,10 @@ export const activeModalUpdated = (id: ModalId | null): AppActionType => ({
   type: AppActionTypes.ACTIVE_MODAL_UPDATED,
   payload: id,
 });
+
+export const checkingBiometricForSending = (
+  payload: boolean,
+): AppActionType => ({
+  type: AppActionTypes.CHECKING_BIOMETRIC_FOR_SENDING,
+  payload,
+});
diff --git a/src/store/app/app.reducer.ts b/src/store/app/app.reducer.ts
@@ -84,6 +84,7 @@ export interface AppState {
   keyMigrationFailureModalHasBeenShown: boolean;
   activeModalId: ModalId | null;
   failedAppInit: boolean;
+  checkingBiometricForSending: boolean;
 }
 
 const initialState: AppState = {
@@ -142,6 +143,7 @@ const initialState: AppState = {
   keyMigrationFailureModalHasBeenShown: false,
   activeModalId: null,
   failedAppInit: false,
+  checkingBiometricForSending: false,
 };
 
 export const appReducer = (
@@ -477,6 +479,12 @@ export const appReducer = (
         failedAppInit: action.payload,
       };
 
+    case AppActionTypes.CHECKING_BIOMETRIC_FOR_SENDING:
+      return {
+        ...state,
+        checkingBiometricForSending: action.payload,
+      };
+
     default:
       return state;
   }

diff --git a/src/store/app/app.types.ts b/src/store/app/app.types.ts
@@ -65,6 +65,7 @@ export enum AppActionTypes {
   SET_SHOW_KEY_MIGRATION_FAILURE_MODAL = 'APP/SET_SHOW_KEY_MIGRATION_FAILURE_MODAL',
   SET_KEY_MIGRATION_FAILURE_MODAL_HAS_BEEN_SHOWN = 'APP/SET_KEY_MIGRATION_FAILURE_MODAL_HAS_BEEN_SHOWN',
   ACTIVE_MODAL_UPDATED = 'APP/ACTIVE_MODAL_UPDATED',
+  CHECKING_BIOMETRIC_FOR_SENDING = 'APP/CHECKING_BIOMETRIC_FOR_SENDING',
 }
 
 interface NetworkChanged {
@@ -294,6 +295,11 @@ interface ActiveModalUpdated {
   payload: ModalId | null;
 }
 
+interface checkingBiometricForSending {
+  type: typeof AppActionTypes.CHECKING_BIOMETRIC_FOR_SENDING;
+  payload: boolean;
+}
+
 export type AppActionType =
   | NetworkChanged
   | SuccessAppInit
@@ -343,4 +349,5 @@ export type AppActionType =
   | SetShowKeyMigrationFailureModal
   | SetKeyMigrationFailureModalHasBeenShown
   | SetDefaultAltCurrency
-  | ActiveModalUpdated;
+  | ActiveModalUpdated
+  | checkingBiometricForSending;
diff --git a/src/store/wallet-connect/wallet-connect.effects.ts b/src/store/wallet-connect/wallet-connect.effects.ts
@@ -24,6 +24,7 @@ import {checkEncryptPassword} from '../wallet/utils/wallet';
 import {WrongPasswordError} from '../../navigation/wallet/components/ErrorMessages';
 import {LogActions} from '../log';
 import {t} from 'i18next';
+import {checkBiometricForSending} from '../wallet/effects/send/send';
 
 const BWC = BwcProvider.getInstance();
 
@@ -354,10 +355,19 @@ const getPrivKey =
     return new Promise(async (resolve, reject) => {
       try {
         const {keys} = getState().WALLET;
+        const {biometricLockActive} = getState().APP;
         const key: Key = keys[keyId];
 
         let password: string | undefined;
 
+        if (biometricLockActive) {
+          try {
+            await dispatch(checkBiometricForSending());
+          } catch (error) {
+            return reject(error);
+          }
+        }
+
         if (key.isPrivKeyEncrypted) {
           password = await new Promise<string>((_resolve, _reject) => {
             dispatch(

diff --git a/src/store/wallet/effects/send/send.ts b/src/store/wallet/effects/send/send.ts
@@ -34,6 +34,7 @@ import {BWCErrorMessage, getErrorName} from '../../../../constants/BWCError';
 import {Invoice} from '../../../shop/shop.models';
 import {GetPayProDetails, HandlePayPro, PayProOptions} from '../paypro/paypro';
 import {
+  checkingBiometricForSending,
   dismissBottomNotificationModal,
   dismissDecryptPasswordModal,
   dismissOnGoingProcessModal,
@@ -49,6 +50,14 @@ import {t} from 'i18next';
 import {startOnGoingProcessModal} from '../../../app/app.effects';
 import {OnGoingProcessMessages} from '../../../../components/modal/ongoing-process/OngoingProcess';
 import {LogActions} from '../../../log';
+import TouchID from 'react-native-touch-id';
+import {
+  authOptionalConfigObject,
+  BiometricErrorNotification,
+  isSupportedOptionalConfigObject,
+  TO_HANDLE_ERRORS,
+} from '../../../../constants/BiometricError';
+import {Platform} from 'react-native';
 
 export const createProposalAndBuildTxDetails =
   (
@@ -654,11 +663,6 @@ export const startSendPayment =
               );
               return resolve(broadcastedTx);
             } catch (e) {
-              try {
-                await removeTxp(wallet, proposal);
-              } catch (removeTxpErr) {
-                console.log('Could not delete payment proposal');
-              }
               return reject(e);
             }
           },
@@ -679,14 +683,26 @@ export const publishAndSign =
     recipient,
     password,
   }: {
-    txp: Partial<TransactionProposal>;
+    txp: TransactionProposal;
     key: Key;
     wallet: Wallet;
     recipient?: Recipient;
     password?: string; // when signing multiple proposals from a wallet we ask for decrypt password before
   }): Effect<Promise<Partial<TransactionProposal> | void>> =>
   async (dispatch, getState) => {
     return new Promise(async (resolve, reject) => {
+      const {
+        APP: {biometricLockActive},
+      } = getState();
+
+      // TODO android
+      if (biometricLockActive && Platform.OS === 'ios') {
+        try {
+          await dispatch(checkBiometricForSending());
+        } catch (error) {
+          return reject(error);
+        }
+      }
       if (key.isPrivKeyEncrypted && !password) {
         try {
           password = await new Promise<string>((_resolve, _reject) => {
@@ -763,7 +779,15 @@ export const publishAndSign =
 
         resolve(broadcastedTx);
       } catch (err) {
-        console.log(err);
+        // if broadcast fails, remove transaction proposal
+        try {
+          await removeTxp(wallet, txp);
+        } catch (removeTxpErr: any) {
+          console.log(
+            'Could not delete payment proposal',
+            removeTxpErr?.message,
+          );
+        }
         reject(err);
       }
     });
@@ -1214,3 +1238,33 @@ export const showNoWalletsModal =
       }),
     );
   };
+
+export const checkBiometricForSending =
+  (): Effect<Promise<any>> => async dispatch => {
+    // preventing for asking biometric again when the app goes to background ( ios only )
+    if (Platform.OS === 'ios') {
+      dispatch(checkingBiometricForSending(true));
+    }
+    await TouchID.isSupported(isSupportedOptionalConfigObject)
+      .then(biometryType => {
+        if (biometryType === 'FaceID') {
+          console.log('FaceID is supported.');
+        } else {
+          console.log('TouchID is supported.');
+        }
+        return TouchID.authenticate(
+          'Authentication Check',
+          authOptionalConfigObject,
+        );
+      })
+      .catch(error => {
+        if (error.code && TO_HANDLE_ERRORS[error.code]) {
+          const err = TO_HANDLE_ERRORS[error.code];
+          dispatch(
+            showBottomNotificationModal(BiometricErrorNotification(err)),
+          );
+        }
+        return Promise.reject('biometric check failed');
+      });
+    return Promise.resolve();
+  };