From 2cd1a41049b98f883b1e2abb7de86dfae8a5962d Mon Sep 17 00:00:00 2001
From: Antonella Sgarlatta <antsgar@gmail.com>
Date: Wed, 17 Feb 2021 18:16:56 -0300
Subject: [PATCH] fix: show preferred keyboard type

---
 src/screens/Authenticate/Authenticate.tsx     | 8 +++-----
 src/screens/InputModal/PasscodeInputModal.tsx | 6 +++---
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/screens/Authenticate/Authenticate.tsx b/src/screens/Authenticate/Authenticate.tsx
index bd966b94..4955854e 100644
--- a/src/screens/Authenticate/Authenticate.tsx
+++ b/src/screens/Authenticate/Authenticate.tsx
@@ -497,11 +497,9 @@ export const Authenticate = ({
     };
     setBiometricsAsync();
     const setInitialKeyboardType = async () => {
-      if (challenge.reason === ChallengeReason.ApplicationUnlock) {
-        const initialKeyboardType = await checkPasscodeKeyboardType();
-        if (mounted) {
-          setKeyboardType(initialKeyboardType);
-        }
+      const initialKeyboardType = await checkPasscodeKeyboardType();
+      if (mounted) {
+        setKeyboardType(initialKeyboardType);
       }
     };
     setInitialKeyboardType();
diff --git a/src/screens/InputModal/PasscodeInputModal.tsx b/src/screens/InputModal/PasscodeInputModal.tsx
index 58461f52..592973fa 100644
--- a/src/screens/InputModal/PasscodeInputModal.tsx
+++ b/src/screens/InputModal/PasscodeInputModal.tsx
@@ -52,6 +52,9 @@ export const PasscodeInputModal = (props: Props) => {
       setSettingPassocode(false);
     } else {
       await application?.setPasscode(text);
+      await application
+        ?.getAppState()
+        .setPasscodeKeyboardType(keyboardType as PasscodeKeyboardType);
       await application?.getAppState().setPasscodeTiming(UnlockTiming.OnQuit);
       await application?.getAppState().setScreenshotPrivacy();
       setSettingPassocode(false);
@@ -77,9 +80,6 @@ export const PasscodeInputModal = (props: Props) => {
 
   const onKeyboardTypeSelect = (option: Option) => {
     setKeyboardType(option.key as KeyboardType);
-    application
-      ?.getAppState()
-      .setPasscodeKeyboardType(option.key as PasscodeKeyboardType);
   };
 
   return (