fix:blank page appears in validate code form page #55588

jacobkim9881 · 2025-01-22T03:22:58Z

Explanation of Change

This PR replaces <ValidateCodeActionModal> with <ValidateCodeActionForm> in ContactMethodDetailsPage as it creates <ValidateCodeActionForm> component. This component doesn't have HeaderWithBackButton or Modal so it can be used in any page that needs validate code form but it can uses props for <ValidateCodeActionModal>.

Fixed Issues

$ #53884
PROPOSAL:$ #53884 (comment)

Tests

Verify that no errors appear in the JS console

Preparation

Go to "Settings" bottom tab -> Profile -> ContactMethod.
Click "New contact method" at bottom in RHP.
Put Email address and click "Add".
Put numbers to validate the email.

Test

Click one of contact methods from Preparation 4.
Verify that it shows a page to enter the code.

Offline tests

Preparation

Go to "Settings" bottom tab -> Profile -> ContactMethod.
Click "New contact method" at bottom in RHP.
Put Email address and click "Add".
Put numbers to validate the email.

Test

Click one of contact methods from Preparation 4.
Verify that it shows a page to enter the code.

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

Verify that no errors appear in the JS console

Preparation

Go to "Settings" bottom tab -> Profile -> ContactMethod.
Click "New contact method" at bottom in RHP.
Put Email address and click "Add".
Put numbers to validate the email.

Test

Click one of contact methods from Preparation 4.
Verify that it shows a page to enter the code.

PR Author Checklist

Screenshots/Videos

Android: Native

expensify-test15-2025-01-29_05.23.39.mp4

Android: mWeb Chrome

expensify-test16-2025-01-29_05.28.07.mp4

iOS: Native

2025-01-29.5.18.03.mov

iOS: mWeb Safari

2025-01-29.5.19.48.mov

MacOS: Chrome / Safari

expensify-test14-2025-01-29_05.12.06.mp4

MacOS: Desktop

2025-01-29.5.30.16.mov

This reverts commit c4e944f.

This reverts commit 6a12518.

jacobkim9881 · 2025-01-28T06:30:49Z

App/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.tsx

Lines 171 to 173 in 433778f

    
           useEffect(() => { 
        
               resetContactMethodValidateCodeSentState(contactMethod); 
        
           }, [contactMethod]);

This line makes this issue

cc: @nkdengineer

melvin-bot · 2025-01-28T20:36:50Z

@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 · 2025-01-29T14:38:00Z

@jacobkim9881 is it reproducible if we click on "unverified" contact method in the 1st step?

jacobkim9881 · 2025-01-29T21:01:16Z

@hoangzinh It isn't reproducible if clicking 1st time so it isn't unrelated with the PR. Thanks for clarifying!

hoangzinh · 2025-01-30T01:11:31Z

src/components/ValidateCodeActionWithoutModal.tsx

+
+type ValidateCodeActionProps = ValidateCodeActionModalProps & ValidateCodeActionWithoutModalProps;
+
+function ValidateCodeActionWithoutModal({


Do you have any other names for this component? It seems is not a good name.

I have updated it to ValidateCodeActionForm.

Since it shares ValidateCodeActionModalProps, I think ValidateCodeAction should be included. It has the form element and has props to run actions. I think ValidateCodeActionForm can be properly used. Please to tell me if you have any idea though.

hoangzinh · 2025-01-30T01:14:13Z

src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.tsx

-            <ScrollView keyboardShouldPersistTaps="handled">
+            <ScrollView
+                keyboardShouldPersistTaps="handled"
+                contentContainerStyle={themeStyles.flex1}


can you elaborate why do we need this style?

This style makes put "Verify" button to bottom. W/o the style the button will be placed beneath validate code form.

ping @jacobkim9881 again ^

The elements can fit the necessary space. The explain, form and button elements are placed in its position with this style.

hoangzinh · 2025-01-30T01:18:46Z

src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.tsx

+                {!loginData?.validatedDate && (
+                    <ValidateCodeActionWithoutModal
+                        hasMagicCodeBeenSent={hasMagicCodeBeenSent}
+                        isVisible={isValidateCodeActionModalVisible && !loginData.validatedDate && !!loginData}


I think we should control the visibility of this component in line 323 instead of a prop. What do you think?

Before it is controled with isVisible in <ValidateCodeActionModal>. I think it should be controlled in <ValidateCodeActionWithoutModal>.

Maybe like this?

Before it is controled with isVisible in

App/src/components/ValidateCodeActionModal/index.tsx

Line 61 in 83aae80

isVisible={isVisible}

hoangzinh · 2025-01-30T01:19:27Z

src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.tsx


-                {!isValidateCodeActionModalVisible && getMenuItems()}
+                {!isValidateCodeActionModalVisible && !!loginData?.validatedDate && getMenuItems()}


Can you elaborate why do we need add an extra condition here?

W/o it, trash can will show when navigating out on Android mWeb.

expensify-test19-2025-02-02_12.45.08.mp4

hoangzinh · 2025-01-30T01:22:07Z

src/components/ValidateCodeActionWithoutModal.tsx

+    useEffect(
+        () => () => {
+            firstRenderRef.current = true;
+        },
+        [],
+    );
+
+    useEffect(() => {
+        if (!firstRenderRef.current || !isVisible || hasMagicCodeBeenSent) {
+            return () => {
+                clearError();
+            };
+        }
+        firstRenderRef.current = false;
+        sendValidateCode();
+    }, [isVisible, sendValidateCode, hasMagicCodeBeenSent, clearError]);


If it's not a modal. Do we need firstRenderRef or isVisible anymore?

W/o it, it will send validate code in validated contact method or default method. It only sends validate code in validate code page only.

…code input screen with small screen devices" This reverts commit 7bfcb5d.

…ut screen with small screen devices

hoangzinh · 2025-02-21T15:26:18Z

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 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 either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- 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.ts 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 UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design 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.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
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.2025-02-22.at.22.10.17.android.mov

Android: mWeb Chrome

Screen.Recording.2025-02-22.at.00.28.51.android.chrome.mov

iOS: Native

Screen.Recording.2025-02-22.at.22.34.50.mov

iOS: mWeb Safari

Screen.Recording.2025-02-22.at.00.25.32.ios.safari.mov

MacOS: Chrome / Safari

Screen.Recording.2025-02-21.at.22.37.57.web.mov

MacOS: Desktop

Screen.Recording.2025-02-22.at.00.21.23.desktop.mov

hoangzinh · 2025-02-21T17:31:59Z

Check there is blank modal briefly.

@jacobkim9881 can you check again testing steps? I think it should be "Verify that it shows a page to enter the code."

jacobkim9881 · 2025-02-21T21:15:08Z

@hoangzinh Thanks. I have updated the testing step.

hoangzinh

LGTM

dangrous · 2025-02-24T23:36:23Z

Hi! I'm starting to look into this now. Should be ready today or tomorrow

dangrous · 2025-02-24T23:38:41Z

Followup - I know this one's been going on for a long time and had a lot of changes to it. Are there any specific highlights/discussions that I should review while looking at the code?

Thanks!

jacobkim9881 · 2025-02-25T00:58:03Z

@dangrous Hi! Let me brief shortly.

#55588 (comment)
sendValidateCode() is needed to run only once on mount. So dependancies(line 36) are empty because it shouldn't run sendValidateCode() in useEffect. On the other hand, clearError() runs only on unmount.

#55588 (comment)
Focustrap should run on all platform without mSafari.

https://github.com/Expensify/App/pull/55588/files#diff-83480a4b6a9a39b384509ec17b9f35136ce1a49805f968fd60cc1e8c5460a170R314-R316
It is added from #57042.

#55588 (comment)
This style makes put "Verify" button to bottom. W/o the style the button will be placed beneath validate code form.

#55588 (comment)
W/o it, trash can will show when navigating out on Android mWeb.

jacobkim9881 · 2025-02-25T00:59:08Z

@hoangzinh Please to add if there above is something I missed.

hoangzinh · 2025-02-25T10:21:03Z

Look good. I think you can review this PR normally @dangrous. @jacobkim9881 and I just tried to refine the code. The one thing you can check it out is focus trap

dangrous

This looks good! Just a few minor comments but I think the decisions made throughout make sense to me, and it seems to test well.

dangrous · 2025-02-26T16:54:13Z

src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.tsx

+                focusTrapOptions: isMobileSafari()
+                    ? undefined


Yeah it looks like there are a number of issues with focus traps and mWeb Safari across the app (just search for isMobileSafari haha. I think this should be okay for now.

dangrous · 2025-02-26T18:04:54Z

src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.tsx

+                              return new Promise((resolve) => {
+                                  const interval = setInterval(() => {
+                                      const trapContainer = trapContainers.at(0);
+                                      if (!trapContainer || (trapContainer && getComputedStyle(trapContainer).visibility !== 'hidden')) {


Suggested change

if (!trapContainer || (trapContainer && getComputedStyle(trapContainer).visibility !== 'hidden')) {

if (!trapContainer || getComputedStyle(trapContainer).visibility !== 'hidden') {

trapContainer has to exist in the second half of this

dangrous · 2025-02-26T18:05:51Z

src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.tsx

+                focusTrapOptions: isMobileSafari()
+                    ? undefined
+                    : {
+                          // It is added because input form's focusing bothers transition animation:


Suggested change

// It is added because input form's focusing bothers transition animation:

// We need to check this because focusing the input form interferes with the transition animation:

dangrous · 2025-02-26T18:07:21Z

src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.tsx

@@ -291,33 +327,21 @@ function ContactMethodDetailsPage({route}: ContactMethodDetailsPageProps) {
                        canDismissError
                    />
                )}
+                {isValidateCodeFormVisible && !loginData.validatedDate && !!loginData && (


Should !!loginData come before !loginData.validatedDate?

Yeah, loginData should exist before loginData.validatedDate.

dangrous

Great!! @hoangzinh do you want to take one last look/test or do you think we're ready to go?

dangrous · 2025-03-03T16:07:12Z

bump @hoangzinh if you have a chance for a last test after the latest changes - thank you!

hoangzinh

LGTM, tested again on Web/IOS safari/IOS/Android.

hoangzinh · 2025-03-03T16:20:10Z

@dangrous sorry, I missed your message last week.

dangrous · 2025-03-03T18:05:15Z

all good! let's do this.

OSBotify · 2025-03-03T18:14:35Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

github-actions · 2025-03-04T22:08:28Z

🚀 Deployed to staging by https://github.com/dangrous in version: 9.1.9-0 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	failure ❌
🍎🔄 iOS HybridApp 🍎🔄	success ✅

github-actions · 2025-03-04T22:51:35Z

🚀 Deployed to staging by https://github.com/dangrous in version: 9.1.9-0 🚀

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

jacobkim9881 added 15 commits January 22, 2025 12:22

fix:blank page appears in validate code form page

6373c37

lint: fixed ! assertion error

172c7b0

pulled original/main

c4e944f

lint assertion err fixed

6232476

lint disabled prop spreading

d216e60

Revert "pulled original/main"

217ac60

This reverts commit c4e944f.

comment type for ref

622df4f

should resolve() if container is undefined

9f1f207

comment about focus trap for animation

5493c6b

fix: clicking header back err occurs

dd436e9

clear error only after closing the modal

a404826

Merge branch 'main' of https://github.com/Expensify/App into m53884

6640264

lint fixed

6a12518

Revert "lint fixed"

3f12bb5

This reverts commit 6a12518.

lint fixed

433778f

This comment was marked as off-topic.

Sign in to view

Merge branch 'main' of https://github.com/Expensify/App into m53884

c001758

jacobkim9881 marked this pull request as ready for review January 28, 2025 20:36

jacobkim9881 requested a review from a team as a code owner January 28, 2025 20:36

melvin-bot bot requested review from hoangzinh and removed request for a team January 28, 2025 20:36

Merge branch 'main' of https://github.com/Expensify/App into m53884

72e88b7

hoangzinh reviewed Jan 30, 2025

View reviewed changes

jacobkim9881 added 3 commits January 30, 2025 11:55

moved isVisible in the validate code form

0afd14a

Merge branch 'main' of https://github.com/Expensify/App into m53884

9b7b20d

hide menu items while sliding out of validate page

c19c2af

jacobkim9881 added 2 commits February 21, 2025 23:58

Revert "merged Expensify#57042: fix: Error text overlap on the magic …

521653b

…code input screen with small screen devices" This reverts commit 7bfcb5d.

merged Expensify#57042: fix: Error text overlap on the magic code inp…

5dec1b7

…ut screen with small screen devices

Merge branch 'main' of https://github.com/Expensify/App into m53884

c9e11ad

hoangzinh approved these changes Feb 23, 2025

View reviewed changes

melvin-bot bot requested a review from dangrous February 23, 2025 02:41

Merge branch 'main' of https://github.com/Expensify/App into m53884

04a1970

Merge branch 'main' of https://github.com/Expensify/App into m53884

6833658

dangrous requested changes Feb 26, 2025

View reviewed changes

jacobkim9881 added 2 commits February 27, 2025 11:05

trapContainer has to exist in the second half of this

e9d0ca3

loginData should exist before loginData.validatedDate

c9f9ef1

dangrous approved these changes Feb 27, 2025

View reviewed changes

Merge branch 'main' of https://github.com/Expensify/App into m53884

5a33b5a

hoangzinh approved these changes Mar 3, 2025

View reviewed changes

melvin-bot bot requested a review from dangrous March 3, 2025 16:19

dangrous merged commit 67f43dd into Expensify:main Mar 3, 2025
16 checks passed

github-actions bot mentioned this pull request Mar 4, 2025

Deploy Checklist: New Expensify 2025-03-04 #57792

Open

77 tasks


		type ValidateCodeActionProps = ValidateCodeActionModalProps & ValidateCodeActionWithoutModalProps;

		function ValidateCodeActionWithoutModal({


		{!isValidateCodeActionModalVisible && getMenuItems()}
		{!isValidateCodeActionModalVisible && !!loginData?.validatedDate && getMenuItems()}

	if (!trapContainer \|\| (trapContainer && getComputedStyle(trapContainer).visibility !== 'hidden')) {
	if (!trapContainer \|\| getComputedStyle(trapContainer).visibility !== 'hidden') {

	// It is added because input form's focusing bothers transition animation:
	// We need to check this because focusing the input form interferes with the transition animation:

fix:blank page appears in validate code form page #55588

fix:blank page appears in validate code form page #55588

Conversation

jacobkim9881 commented Jan 22, 2025 • edited Loading

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

This comment was marked as off-topic.

jacobkim9881 commented Jan 28, 2025 • edited Loading

melvin-bot bot commented Jan 28, 2025

hoangzinh commented Jan 29, 2025

jacobkim9881 commented Jan 29, 2025 • 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

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

hoangzinh commented Feb 21, 2025 • edited Loading

Reviewer Checklist

Screenshots/Videos

hoangzinh commented Feb 21, 2025 • edited Loading

jacobkim9881 commented Feb 21, 2025

hoangzinh left a comment

Choose a reason for hiding this comment

dangrous commented Feb 24, 2025

dangrous commented Feb 24, 2025

jacobkim9881 commented Feb 25, 2025

jacobkim9881 commented Feb 25, 2025 • edited Loading

hoangzinh commented Feb 25, 2025

dangrous 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

dangrous left a comment

Choose a reason for hiding this comment

dangrous commented Mar 3, 2025

hoangzinh left a comment

Choose a reason for hiding this comment

hoangzinh commented Mar 3, 2025

dangrous commented Mar 3, 2025

OSBotify commented Mar 3, 2025

github-actions bot commented Mar 4, 2025

github-actions bot commented Mar 4, 2025

jacobkim9881 commented Jan 22, 2025 •

edited

Loading

jacobkim9881 commented Jan 28, 2025 •

edited

Loading

jacobkim9881 commented Jan 29, 2025 •

edited

Loading

hoangzinh commented Feb 21, 2025 •

edited

Loading

hoangzinh commented Feb 21, 2025 •

edited

Loading

jacobkim9881 commented Feb 25, 2025 •

edited

Loading