feat: handleBiometricAuth returns result

cardano-foundation · May 8, 2024 · 9986555 · 9986555
1 parent d1d707c
commit 9986555
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/src/ui/components/AppWrapper/hooks/useActivityTimer.tsx b/src/ui/components/AppWrapper/hooks/useActivityTimer.tsx
@@ -2,9 +2,8 @@ import { useEffect, useRef, useState } from "react";
 import { App } from "@capacitor/app";
 import { useAppDispatch } from "../../../../store/hooks";
 import { logout } from "../../../../store/reducers/stateCache";
-import { useBiometricAuth } from "../../../hooks/useBiometrics";
 
-const timeout = process.env.NODE_ENV === "development" ? 6000 : 60000; //3600000 1h/1min
+const timeout = process.env.NODE_ENV === "development" ? 3600000 : 60000; //3600000 1h/1min
 const pauseTimeout = timeout / 2;
 const useActivityTimer = () => {
   const dispatch = useAppDispatch();
@@ -59,13 +58,13 @@ const useActivityTimer = () => {
       "keydown",
       "scroll",
     ];
-    events.forEach((event) => {
-      window.addEventListener(event, handleActivity);
+    events.forEach(async (event) => {
+      await window.addEventListener(event, handleActivity);
     });
 
     return () => {
-      events.forEach((event) => {
-        window.removeEventListener(event, handleActivity);
+      events.forEach(async (event) => {
+        await window.removeEventListener(event, handleActivity);
       });
       clearTimer();
     };

diff --git a/src/ui/hooks/useBiometrics.ts b/src/ui/hooks/useBiometrics.ts
@@ -27,7 +27,9 @@ const useBiometricAuth = () => {
     //checkBiometry();
   }, []);
 
-  const handleBiometricAuth = async () => {
+  const handleBiometricAuth = async (): Promise<
+    boolean | BiometryError | undefined
+  > => {
     const biometricResult = await checkBiometry();
     if (!biometricResult?.isAvailable) {
       if (biometricResult?.strongReason?.includes("NSFaceIDUsageDescription")) {
@@ -49,7 +51,7 @@ const useBiometricAuth = () => {
         androidConfirmationRequired: false,
       });
       setPauseTimestamp(new Date().getTime());
-      dispatch(login());
+      return true;
     } catch (error) {
       if (
         error instanceof BiometryError &&

diff --git a/src/ui/pages/LockPage/LockPage.tsx b/src/ui/pages/LockPage/LockPage.tsx
@@ -93,7 +93,10 @@ const LockPage = () => {
   };
 
   const handleBiometrics = async () => {
-    handleBiometricAuth();
+    const isAuthenticated = await handleBiometricAuth();
+    if (isAuthenticated === true) {
+      dispatch(login());
+    }
   };
   const resetPasscode = () => {
     SecureStorage.delete(KeyStoreKeys.APP_PASSCODE).then(() => {