Refactor: the redirection from biometrics

UNICEFECAR · May 21, 2024 · ecb0b7c · ecb0b7c
1 parent 6e4100f
commit ecb0b7c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/blocks/RegisterAnonymous/RegisterAnonymous.jsx b/src/blocks/RegisterAnonymous/RegisterAnonymous.jsx
@@ -124,7 +124,9 @@ export const RegisterAnonymous = ({ navigation }) => {
         tokenExpiresInPromise,
         refreshTokenPromise,
       ]);
-      setToken(token);
+      setTimeout(() => {
+        setToken(token);
+      }, 1);
     },
     onError: (error) => {
       const { message: errorMessage } = useError(error);

diff --git a/src/navigation/Navigation.jsx b/src/navigation/Navigation.jsx
@@ -82,6 +82,7 @@ export function Navigation({
     isTmpUser,
     userPin,
     hasCheckedTmpUser,
+    initialRouteName,
   } = useContext(Context);
 
   const getClientDataEnabled = !!(
@@ -276,7 +277,9 @@ export function Navigation({
           />
         ) : token && hasCheckedTmpUser ? (
           <>
-            <RedirectToBiometrics />
+            <RedirectToBiometrics
+              checkForDeclined={initialRouteName !== "RegisterAboutYou"}
+            />
             <AppNavigation />
           </>
         ) : (
@@ -288,20 +291,20 @@ export function Navigation({
   );
 }
 
-const RedirectToBiometrics = () => {
+const RedirectToBiometrics = ({ checkForDeclined }) => {
   const navigation = useNavigation();
   useEffect(() => {
     const checkHasDeclined = async () => {
       const hasDeclined = await localStorage.getItem("has-declined-biometrics");
       const userPin = await localStorage.getItem("pin-code");
       const hasBiometrics = await localStorage.getItem("biometrics-enabled");
 
-      if (!hasDeclined && !userPin && !hasBiometrics) {
+      if (!hasDeclined && !userPin && !hasBiometrics && checkForDeclined) {
         navigation.navigate("SetUpBiometrics", { goBackOnSkip: true });
       }
     };
     checkHasDeclined();
-  }, []);
+  }, [checkForDeclined]);
   return <></>;
 };