[FEAT] biometric for sending

bitpay · Jun 6, 2022 · 0a87755 · 0a87755
1 parent 8a1548d
commit 0a87755
Show file tree

Hide file tree

Showing 11 changed files with 101 additions and 4 deletions.
diff --git a/src/Root.tsx b/src/Root.tsx
@@ -180,6 +180,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);
@@ -223,7 +226,9 @@ export default () => {
       };
 
       if (onboardingCompleted) {
-        if (status === 'active' && !appIsLoading) {
+        if (status === 'active' && checkingBiometricForSending) {
+          dispatch(AppActions.checkingBiometricForSending(false));
+        } else if (status === 'active' && !appIsLoading) {
           if (lockAuthorizedUntil) {
             const now = Math.floor(Date.now() / 1000);
             const totalSecs = lockAuthorizedUntil - now;
@@ -239,7 +244,7 @@ export default () => {
           } else {
             showLockOption();
           }
-        } else {
+        } else if (!checkingBiometricForSending) {
           dispatch(AppActions.showBlur(true));
         }
       }
@@ -252,6 +257,7 @@ export default () => {
     pinLockActive,
     lockAuthorizedUntil,
     biometricLockActive,
+    checkingBiometricForSending,
     appIsLoading,
   ]);
 

diff --git a/src/navigation/services/swap-crypto/screens/ChangellyCheckout.tsx b/src/navigation/services/swap-crypto/screens/ChangellyCheckout.tsx
@@ -484,6 +484,9 @@ const ChangellyCheckout: React.FC = () => {
         case 'password canceled':
           setResetSwipeButton(true);
           break;
+        case 'biometric check failed':
+          setResetSwipeButton(true);
+          break;
         default:
           logger.error(JSON.stringify(err));
         // TODO: handle this case

diff --git a/src/navigation/wallet-connect/screens/WalletConnectConfirm.tsx b/src/navigation/wallet-connect/screens/WalletConnectConfirm.tsx
@@ -133,6 +133,9 @@ const WalletConnectConfirm = () => {
         case 'password canceled':
           setResetSwipeButton(true);
           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
@@ -260,6 +260,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
@@ -510,6 +510,9 @@ const TransactionProposalDetails = () => {
                 case 'password canceled':
                   setResetSwipeButton(true);
                   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
@@ -412,6 +412,9 @@ const Confirm = () => {
               case 'password canceled':
                 setResetSwipeButton(true);
                 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
@@ -266,3 +266,10 @@ export const activeModalUpdated = (id: ModalId | null): AppActionType => ({
   type: AppActionTypes.ACTIVE_MODAL_UPDATED,
   payload: id,
 });
+
+export const checkingBiometricForSending = (
+  checkingBiometricForSending: boolean,
+): AppActionType => ({
+  type: AppActionTypes.CHECKING_BIOMETRIC_FOR_SENDING,
+  checkingBiometricForSending,
+});
diff --git a/src/store/app/app.reducer.ts b/src/store/app/app.reducer.ts
@@ -76,6 +76,7 @@ export interface AppState {
   showKeyMigrationFailureModal: boolean;
   keyMigrationFailureModalHasBeenShown: boolean;
   activeModalId: ModalId | null;
+  checkingBiometricForSending: boolean;
 }
 
 const initialState: AppState = {
@@ -132,6 +133,7 @@ const initialState: AppState = {
   showKeyMigrationFailureModal: false,
   keyMigrationFailureModalHasBeenShown: false,
   activeModalId: null,
+  checkingBiometricForSending: false,
 };
 
 export const appReducer = (
@@ -443,6 +445,12 @@ export const appReducer = (
         activeModalId: action.payload,
       };
 
+    case AppActionTypes.CHECKING_BIOMETRIC_FOR_SENDING:
+      return {
+        ...state,
+        checkingBiometricForSending: action.checkingBiometricForSending,
+      };
+
     default:
       return state;
   }

diff --git a/src/store/app/app.types.ts b/src/store/app/app.types.ts
@@ -63,6 +63,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 {
@@ -283,6 +284,11 @@ interface ActiveModalUpdated {
   payload: ModalId | null;
 }
 
+interface checkingBiometricForSending {
+  type: typeof AppActionTypes.CHECKING_BIOMETRIC_FOR_SENDING;
+  checkingBiometricForSending: boolean;
+}
+
 export type AppActionType =
   | NetworkChanged
   | SuccessAppInit
@@ -330,4 +336,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
@@ -23,6 +23,7 @@ import {
 import {checkEncryptPassword} from '../wallet/utils/wallet';
 import {WrongPasswordError} from '../../navigation/wallet/components/ErrorMessages';
 import {LogActions} from '../log';
+import {checkBiometricForSending} from '../wallet/effects/send/send';
 
 const BWC = BwcProvider.getInstance();
 
@@ -345,10 +346,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,
   showBottomNotificationModal,
@@ -44,6 +45,13 @@ import {CommonActions} from '@react-navigation/native';
 import {BwcProvider} from '../../../../lib/bwc';
 import {ToCashAddress} from '../address/address';
 import {WalletRowProps} from '../../../../components/list/WalletRow';
+import TouchID from 'react-native-touch-id';
+import {
+  authOptionalConfigObject,
+  BiometricErrorNotification,
+  isSupportedOptionalConfigObject,
+  TO_HANDLE_ERRORS,
+} from '../../../../constants/BiometricError';
 
 export const createProposalAndBuildTxDetails =
   (
@@ -534,9 +542,20 @@ export const publishAndSign =
     wallet: Wallet;
     recipient?: Recipient;
   }): Effect<Promise<Partial<TransactionProposal> | void>> =>
-  async dispatch => {
+  async (dispatch, getState) => {
     return new Promise(async (resolve, reject) => {
       let password;
+      const {
+        APP: {biometricLockActive},
+      } = getState();
+
+      if (biometricLockActive) {
+        try {
+          await dispatch(checkBiometricForSending());
+        } catch (error) {
+          return reject(error);
+        }
+      }
       if (key.isPrivKeyEncrypted) {
         try {
           password = await new Promise<string>((_resolve, _reject) => {
@@ -982,3 +1001,30 @@ export const showNoWalletsModal =
       }),
     );
   };
+
+export const checkBiometricForSending =
+  (): Effect<Promise<any>> => async dispatch => {
+    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();
+  };