prettier style

Expensify · Sep 29, 2023 · 4308871 · 4308871
1 parent 4b08ced
commit 4308871
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 27 deletions.
diff --git a/src/CONST.ts b/src/CONST.ts
@@ -240,7 +240,7 @@ const CONST = {
         CUSTOM_STATUS: 'customStatus',
         NEW_DOT_CATEGORIES: 'newDotCategories',
         NEW_DOT_TAGS: 'newDotTags',
-        NEW_DOT_SAML: 'newDotSAML'
+        NEW_DOT_SAML: 'newDotSAML',
     },
     BUTTON_STATES: {
         DEFAULT: 'default',

diff --git a/src/SCREENS.ts b/src/SCREENS.ts
@@ -24,5 +24,5 @@ export default {
     SIGN_IN_WITH_APPLE_DESKTOP: 'AppleSignInDesktop',
     SIGN_IN_WITH_GOOGLE_DESKTOP: 'GoogleSignInDesktop',
     DESKTOP_SIGN_IN_REDIRECT: 'DesktopSignInRedirect',
-    SAML_SIGN_IN: 'SAMLSignIN'
+    SAML_SIGN_IN: 'SAMLSignIN',
 } as const;
diff --git a/src/languages/en.ts b/src/languages/en.ts
@@ -368,7 +368,7 @@ export default {
         useSingleSignOn: 'Use single sign-on',
         useMagicCode: 'Use magic code',
         launching: 'Launching...',
-        oneMoment: 'One moment while we redirect you to your company\'s single sign-on portal.',
+        oneMoment: "One moment while we redirect you to your company's single sign-on portal.",
     },
     reportActionCompose: {
         addAction: 'Actions',

diff --git a/src/pages/signin/SAMLEnabledForm.js b/src/pages/signin/SAMLEnabledForm.js
@@ -49,7 +49,7 @@ const defaultProps = {
     account: {},
 };
 
-function SAMLEnabledForm (props) {
+function SAMLEnabledForm(props) {
     return (
         <>
             <View>

diff --git a/src/pages/signin/SAMLSignInPage/index.js b/src/pages/signin/SAMLSignInPage/index.js
@@ -20,15 +20,14 @@ const propTypes = {
         login: PropTypes.string,
     }),
     ...withLocalizePropTypes,
-}
+};
 const defaultProps = {
     credentials: {},
 };
 
 function SAMLSignInPage(props) {
     useEffect(() => {
-        window.open(`${CONFIG.EXPENSIFY.SAML_URL}?email=${props.credentials.login}&referer=${CONFIG.EXPENSIFY.EXPENSIFY_CASH_REFERER}`, '_self')
-
+        window.open(`${CONFIG.EXPENSIFY.SAML_URL}?email=${props.credentials.login}&referer=${CONFIG.EXPENSIFY.EXPENSIFY_CASH_REFERER}`, '_self');
     }, [props.credentials.login]);
 
     return (
@@ -61,7 +60,7 @@ function SAMLSignInPage(props) {
 SAMLSignInPage.propTypes = propTypes;
 SAMLSignInPage.defaultProps = defaultProps;
 
-export default compose (
+export default compose(
     withLocalize,
     withOnyx({
         credentials: {key: ONYXKEYS.CREDENTIALS},

diff --git a/src/pages/signin/SignInPage.js b/src/pages/signin/SignInPage.js
@@ -129,19 +129,26 @@ function SignInPage({credentials, account, isInModal}) {
         App.setLocale(Localize.getDevicePreferredLocale());
     }, []);
 
-    const {shouldShowLoginForm, shouldShowEmailDeliveryFailurePage, shouldShowUnlinkLoginForm, shouldShowValidateCodeForm, shouldShowSAMLEnabledForm, shouldInitiateSAMLLogin, shouldShowWelcomeHeader, shouldShowWelcomeText} = getRenderOptions(
-        {
-            hasLogin: Boolean(credentials.login),
-            hasValidateCode: Boolean(credentials.validateCode),
-            hasAccount: !_.isEmpty(account),
-            isPrimaryLogin: !account.primaryLogin || account.primaryLogin === credentials.login,
-            isAccountValidated: Boolean(account.validated),
-            isSAMLEnabled: Boolean(account.isSAMLEnabled),
-            isSAMLRequired: Boolean(account.isSAMLRequired),
-            isUsingSAMLLogin,
-            hasEmailDeliveryFailure: Boolean(account.hasEmailDeliveryFailure),
-        },
-    );
+    const {
+        shouldShowLoginForm,
+        shouldShowEmailDeliveryFailurePage,
+        shouldShowUnlinkLoginForm,
+        shouldShowValidateCodeForm,
+        shouldShowSAMLEnabledForm,
+        shouldInitiateSAMLLogin,
+        shouldShowWelcomeHeader,
+        shouldShowWelcomeText,
+    } = getRenderOptions({
+        hasLogin: Boolean(credentials.login),
+        hasValidateCode: Boolean(credentials.validateCode),
+        hasAccount: !_.isEmpty(account),
+        isPrimaryLogin: !account.primaryLogin || account.primaryLogin === credentials.login,
+        isAccountValidated: Boolean(account.validated),
+        isSAMLEnabled: Boolean(account.isSAMLEnabled),
+        isSAMLRequired: Boolean(account.isSAMLRequired),
+        isUsingSAMLLogin,
+        hasEmailDeliveryFailure: Boolean(account.hasEmailDeliveryFailure),
+    });
 
     // If the user has SAML required and we're not already loading their account
     // bypass the rest of the sign in logic and open up their SSO provider login page
@@ -215,11 +222,7 @@ function SignInPage({credentials, account, isInModal}) {
                     />
                 )}
                 {shouldShowUnlinkLoginForm && <UnlinkLoginForm />}
-                {shouldShowSAMLEnabledForm && (
-                    <SAMLEnabledForm
-                        setIsUsingSAMLLogin={setIsUsingSAMLLogin}
-                    />
-                )}
+                {shouldShowSAMLEnabledForm && <SAMLEnabledForm setIsUsingSAMLLogin={setIsUsingSAMLLogin} />}
                 {shouldShowEmailDeliveryFailurePage && <EmailDeliveryFailurePage />}
             </SignInPageLayout>
         </View>

diff --git a/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js b/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js
@@ -206,7 +206,7 @@ function BaseValidateCodeForm(props) {
      */
     const clearSignInData = () => {
         // Reset the user's preference for signing in with SAML
-        props.setIsUsingSAMLLogin(props.account.isSAMLEnabled || props.account.isSAMLRequired)
+        props.setIsUsingSAMLLogin(props.account.isSAMLEnabled || props.account.isSAMLRequired);
         clearLocalSignInData();
         Session.clearSignInData();
     };