refactor(typescript): apply pull request feedback

Expensify · Jan 17, 2024 · 2d65ac5 · 2d65ac5
1 parent 51a21e5
commit 2d65ac5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/pages/ValidateLoginPage/index.tsx b/src/pages/ValidateLoginPage/index.tsx
@@ -8,7 +8,7 @@ import type {ValidateLoginPageOnyxNativeProps, ValidateLoginPageProps} from './t
 
 function ValidateLoginPage({
     route: {
-        params: {accountID = '', validateCode = ''},
+        params: {accountID, validateCode},
     },
     session,
 }: ValidateLoginPageProps<ValidateLoginPageOnyxNativeProps>) {

diff --git a/src/pages/ValidateLoginPage/index.website.tsx b/src/pages/ValidateLoginPage/index.website.tsx
@@ -10,11 +10,16 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {ValidateLoginPageOnyxProps, ValidateLoginPageProps} from './types';
 
-function ValidateLoginPage({account, credentials, route, session}: ValidateLoginPageProps<ValidateLoginPageOnyxProps>) {
+function ValidateLoginPage({
+    account,
+    credentials,
+    route: {
+        params: {accountID, validateCode},
+    },
+    session,
+}: ValidateLoginPageProps<ValidateLoginPageOnyxProps>) {
     const login = credentials?.login;
     const autoAuthState = session?.autoAuthState ?? CONST.AUTO_AUTH_STATE.NOT_STARTED;
-    const accountID = Number(route?.params.accountID) ?? -1;
-    const validateCode = route.params.validateCode ?? '';
     const isSignedIn = !!session?.authToken;
     const is2FARequired = !!account?.requiresTwoFactorAuth;
     const cachedAccountID = credentials?.accountID;
@@ -32,7 +37,7 @@ function ValidateLoginPage({account, credentials, route, session}: ValidateLogin
         }
 
         // The user has initiated the sign in process on the same browser, in another tab.
-        Session.signInWithValidateCode(accountID, validateCode);
+        Session.signInWithValidateCode(Number(accountID), validateCode);
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
 
@@ -52,7 +57,7 @@ function ValidateLoginPage({account, credentials, route, session}: ValidateLogin
             {autoAuthState === CONST.AUTO_AUTH_STATE.JUST_SIGNED_IN && isSignedIn && <JustSignedInModal is2FARequired={false} />}
             {autoAuthState === CONST.AUTO_AUTH_STATE.NOT_STARTED && (
                 <ValidateCodeModal
-                    accountID={accountID}
+                    accountID={Number(accountID)}
                     code={validateCode}
                 />
             )}