Disable locale picker while signing in #35794

tienifr · 2024-02-05T07:14:59Z

Details

This PR disables locale picker while signing in.

Fixed Issues

$ #34645
PROPOSAL: #34645 (comment)

Tests

Sign in App
Right after entering magic code and pressing Continue, try to change locale located in footer
Verify that the picker is disabled

Verify that no errors appear in the JS console

Offline tests

NA

QA Steps

Sign in App
Right after entering magic code and pressing Continue, try to change locale located in footer
Verify that the picker is disabled

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-02-05.at.14.23.47-compressed.mov

Android: mWeb Chrome

Screen.Recording.2024-02-05.at.14.25.09-compressed.mov

iOS: Native

Screen.Recording.2024-02-05.at.14.20.25-compressed.mov

iOS: mWeb Safari

Screen.Recording.2024-02-05.at.14.19.02-compressed.mov

MacOS: Chrome / Safari

Screen.Recording.2024-02-05.at.14.16.08-compressed.mov

MacOS: Desktop

Screen.Recording.2024-02-05.at.14.16.08-compressed.mov

melvin-bot · 2024-02-05T07:15:04Z

Hey! I see that you made changes to our Form component. Make sure to update the docs in FORMS.md accordingly. Cheers!

melvin-bot · 2024-02-05T07:21:17Z

@hoangzinh Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

hoangzinh · 2024-02-06T16:00:37Z

src/components/LocalePicker.tsx

@@ -31,6 +34,7 @@ function LocalePicker({preferredLocale = CONST.LOCALES.DEFAULT, size = 'normal'}
        keyForList: language,
        isSelected: preferredLocale === language,
    }));
+    const shouldDisablePicker = account?.isLoading && account.loadingForm === (account.requiresTwoFactorAuth ? CONST.FORMS.VALIDATE_TFA_CODE_FORM : CONST.FORMS.VALIDATE_CODE_FORM);


I think we should move this into a util function so it can be used here as well

App/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js

Lines 108 to 109 in ebc2b7d

const isValidateCodeFormSubmitting =

props.account.isLoading && props.account.loadingForm === (props.account.requiresTwoFactorAuth ? CONST.FORMS.VALIDATE_TFA_CODE_FORM : CONST.FORMS.VALIDATE_CODE_FORM);

hoangzinh · 2024-02-06T16:05:26Z

src/styles/index.ts

@@ -695,7 +695,7 @@ const styles = (theme: ThemeColors) =>
            width: '100%',
        },

-        pickerSmall: (backgroundColor = theme.highlightBG) =>
+        pickerSmall: (disabled = false, backgroundColor = theme.highlightBG) =>


do we need this change?

Without this the cursor would still show pointer though the picker was disabled.

hoangzinh · 2024-02-06T23:24:02Z

src/libs/FormUtils.ts

+import CONST from '@src/CONST';
+import type {Account} from '@src/types/onyx';
+
+const isValidateCodeFormSubmitting = (account: Account) =>


I think it's more proper if we can put in AccountUtils

cc @tienifr just in case you missed this comment

But that means we need to create a new util file.

hoangzinh · 2024-02-15T00:56:12Z

@tienifr It looks like the perf-tests failed related to our change. Could you check it?

tienifr · 2024-02-15T04:27:54Z

@hoangzinh A little tweak proved that subscribing to a new Onyx key (account) caused perf-test failure. Let me investigate further. Do you have any suggestions?

hoangzinh · 2024-02-15T11:11:41Z

I think it might be because it re-renders the LocalePicker which also re-renders RNPickerSelect after click Sign In button

tienifr · 2024-02-24T09:52:47Z

@hoangzinh this is ready for review again.

tienifr · 2024-02-26T11:00:09Z

@hoangzinh TS check failure is resolved after merging main.

hoangzinh · 2024-02-26T14:27:40Z

Hi @tienifr thanks for the update. Although it fixed perf-tests, I don't really like passing prop down to many components like this.
I would like to check whether we can update the result of perf-tests first https://expensify.slack.com/archives/C01GTK53T8Q/p1708957504036329?thread_ts=1707967238.543229&cid=C01GTK53T8Q

tienifr · 2024-02-29T09:29:00Z

Still following the Slack thread.

tienifr · 2024-03-04T08:46:20Z

@hoangzinh Perf-test was resolved finally!!

hoangzinh

Overall looks good, just a small feedback

hoangzinh · 2024-03-04T15:57:55Z

src/libs/AccountUtils.ts

+import CONST from '@src/CONST';
+import type {Account} from '@src/types/onyx';
+
+const isValidateCodeFormSubmitting = (account: Account) =>


Can we replace the line here by this util function?

App/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.tsx

Lines 79 to 80 in 0b447c3

const isValidateCodeFormSubmitting =

account?.isLoading && account?.loadingForm === (account?.requiresTwoFactorAuth ? CONST.FORMS.VALIDATE_TFA_CODE_FORM : CONST.FORMS.VALIDATE_CODE_FORM);

hoangzinh · 2024-03-05T10:47:47Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

Screen.Recording.2024-03-05.at.22.14.40.android.mov

Android: mWeb Chrome

Screen.Recording.2024-03-05.at.22.15.49.android.chrome.mov

iOS: Native

Screen.Recording.2024-03-05.at.23.08.44.ios.mov

iOS: mWeb Safari

Screen.Recording.2024-03-05.at.23.09.58.ios.safari.mov

MacOS: Chrome / Safari

Screen.Recording.2024-03-05.at.22.07.49.web.mov

MacOS: Desktop

Screen.Recording.2024-03-05.at.22.12.35.desktop.mov

hoangzinh

LGTM

tgolen · 2024-03-05T16:25:55Z

src/components/LocalePicker.tsx

@@ -31,6 +35,7 @@ function LocalePicker({preferredLocale = CONST.LOCALES.DEFAULT, size = 'normal'}
        keyForList: language,
        isSelected: preferredLocale === language,
    }));
+    const shouldDisablePicker = AccountUtils.isValidateCodeFormSubmitting(account ?? {});


I think it's more appropriate to use defaults in the prop destructuring.

If we assigned default value in prop destructuring, we still need to use nullish coalescing there because account is still of OnyxEntry type (nullable).

I don't fully understand that (warning: I am not very understanding of TS currently). Is TS not able to see that an undefined account would default to an empty object in the prop destructuring? If not, how about updating isValidateCodeFormSubmitting to accept an OnyxEntry?

how about updating isValidateCodeFormSubmitting to accept an OnyxEntry

I think we can. Then inside isValidateCodeFormSubmitting, we can early return if it's an empty object.

tgolen · 2024-03-05T16:27:38Z

src/components/LocalePicker.tsx

+            shouldAllowDisabledStyle={false}
+            shouldShowOnlyTextWhenDisabled={false}


I'm not quite understanding why these two props are necessary. Can they just be derived from the isDisabled prop?

Without shouldShowOnlyTextWhenDisabled, the locales would only show their key name (en or es). This is for use in pages like CompanyStep.

We don't want to show dark background for locale picker only, so we need shouldAllowDisabledStyle.

hoangzinh · 2024-03-07T11:50:02Z

src/libs/AccountUtils.ts

+import type {Account} from '@src/types/onyx';
+
+const isValidateCodeFormSubmitting = (account: OnyxEntry<Account>) =>
+    account?.isLoading && account.loadingForm === (account.requiresTwoFactorAuth ? CONST.FORMS.VALIDATE_TFA_CODE_FORM : CONST.FORMS.VALIDATE_CODE_FORM);


Suggested change

account?.isLoading && account.loadingForm === (account.requiresTwoFactorAuth ? CONST.FORMS.VALIDATE_TFA_CODE_FORM : CONST.FORMS.VALIDATE_CODE_FORM);

!!account?.isLoading && account.loadingForm === (account.requiresTwoFactorAuth ? CONST.FORMS.VALIDATE_TFA_CODE_FORM : CONST.FORMS.VALIDATE_CODE_FORM);

To ensure it always return a boolean, not undefined

Thanks! Updated.

Thanks @tienifr

tgolen

Nice change. Thank you!

hoangzinh · 2024-03-08T14:11:04Z

@tgolen looks like you forgot to merge this PR :hehe:

OSBotify · 2024-03-12T18:37:36Z

🚀 Deployed to production by https://github.com/luacmartins in version: 1.4.50-5 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

tienifr added 2 commits February 5, 2024 14:11

disable locale picker while signing in

51af936

set isDisabled

d31d5dc

tienifr marked this pull request as ready for review February 5, 2024 07:21

tienifr requested a review from a team as a code owner February 5, 2024 07:21

melvin-bot bot removed the request for review from a team February 5, 2024 07:21

melvin-bot bot requested a review from hoangzinh February 5, 2024 07:21

tienifr mentioned this pull request Feb 5, 2024

[HOLD for payment 2024-03-19] [$500] Web - App displays empty sign in page for sometime on language change in sign in modal #34645

Closed

6 tasks

hoangzinh reviewed Feb 6, 2024

View reviewed changes

tienifr added 2 commits February 6, 2024 23:15

Merge branch 'main' of https://github.com/tienifr/App into fix/34645

2a6819a

create util function

76a2811

hoangzinh reviewed Feb 6, 2024

View reviewed changes

tienifr added 3 commits February 14, 2024 22:09

Merge branch 'main' into fix/34645

d1427e0

Move to AccountUtils

b0ff3ca

fix lint

27f4dd0

Merge branch 'main' of https://github.com/tienifr/App into fix/34645

601e20f

tienifr added 4 commits February 24, 2024 15:07

Merge branch 'main' into fix/34645

9eee9aa

fix perf-test

36b43f1

fix lint

511832b

fix typecheck

a64a4da

Merge branch 'main' of https://github.com/tienifr/App into fix/34645

7ebc725

Merge branch 'main' of https://github.com/tienifr/App into fix/34645

f239bce

tienifr added 3 commits March 4, 2024 15:24

revert: fix perf-test

ee7f4d9

fix perf-test by modifying test

4953774

fix typecheck

796288f

hoangzinh reviewed Mar 4, 2024

View reviewed changes

use util function

f126673

hoangzinh approved these changes Mar 5, 2024

View reviewed changes

melvin-bot bot requested a review from tgolen March 5, 2024 16:11

tgolen requested changes Mar 5, 2024

View reviewed changes

tienifr added 2 commits March 6, 2024 16:11

Merge branch 'main' of https://github.com/tienifr/App into fix/34645

4c0f478

use OnyxEntry type

2fe5e7a

hoangzinh reviewed Mar 7, 2024

View reviewed changes

conver undefined to boolean

886123a

tgolen approved these changes Mar 7, 2024

View reviewed changes

tgolen merged commit 0b67666 into Expensify:main Mar 8, 2024
17 checks passed

github-actions bot mentioned this pull request Mar 11, 2024

Deploy Checklist: New Expensify 2024-03-11 #38037

Closed

49 tasks

	const isValidateCodeFormSubmitting =
	props.account.isLoading && props.account.loadingForm === (props.account.requiresTwoFactorAuth ? CONST.FORMS.VALIDATE_TFA_CODE_FORM : CONST.FORMS.VALIDATE_CODE_FORM);

	const isValidateCodeFormSubmitting =
	account?.isLoading && account?.loadingForm === (account?.requiresTwoFactorAuth ? CONST.FORMS.VALIDATE_TFA_CODE_FORM : CONST.FORMS.VALIDATE_CODE_FORM);

		shouldAllowDisabledStyle={false}
		shouldShowOnlyTextWhenDisabled={false}

	account?.isLoading && account.loadingForm === (account.requiresTwoFactorAuth ? CONST.FORMS.VALIDATE_TFA_CODE_FORM : CONST.FORMS.VALIDATE_CODE_FORM);
	!!account?.isLoading && account.loadingForm === (account.requiresTwoFactorAuth ? CONST.FORMS.VALIDATE_TFA_CODE_FORM : CONST.FORMS.VALIDATE_CODE_FORM);

Disable locale picker while signing in #35794

Disable locale picker while signing in #35794

Conversation

tienifr commented Feb 5, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Feb 5, 2024

melvin-bot bot commented Feb 5, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tienifr Feb 6, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hoangzinh commented Feb 15, 2024

tienifr commented Feb 15, 2024

hoangzinh commented Feb 15, 2024

tienifr commented Feb 24, 2024

tienifr commented Feb 26, 2024 • edited Loading

hoangzinh commented Feb 26, 2024

tienifr commented Feb 29, 2024

tienifr commented Mar 4, 2024

hoangzinh left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hoangzinh commented Mar 5, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

hoangzinh left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tgolen left a comment

Choose a reason for hiding this comment

hoangzinh commented Mar 8, 2024

OSBotify commented Mar 12, 2024

tienifr commented Feb 5, 2024 •

edited

Loading

tienifr Feb 6, 2024 •

edited

Loading

tienifr commented Feb 26, 2024 •

edited

Loading

hoangzinh commented Mar 5, 2024 •

edited

Loading