[CP Staging] add validate code modal by hungvu193 · Pull Request #48628 · Expensify/App

hungvu193 · 2024-09-05T09:42:37Z

We recently need a reusable component to verify the magic code, this PR introduces ValidateCodeActionModal which is a modal that includes a magic code input that can be reused between flows.

Details

Fixed Issues

$ #48541
PROPOSAL: N/A

Tests

For Card reveal details:
Prerequisite: Your account has an Expensify physical card setup

Go to Profile => Wallet => Click on the Reveal details button.
Enter the magic code input.
Verify that you can see your card details if you entered correct magic code.

For adding new contact method:

Go to Profile.
Go to Contact methods.
Click “Add new contact method”.
Enter a new email or phone number and press Enter.
Verify that you are navigated to magic code verification page
Once the magic code is inserted, click Submit
Verify that the contact is added and you're navigated to contact list page

Verify that no errors appear in the JS console

Offline tests

QA Steps

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

marcaaron · 2024-09-05T23:50:18Z

Thanks. Gonna pull this branch and test a few things locally.

src/components/ValidateCodeActionModal/index.tsx

melvin-bot · 2024-09-06T03:03:22Z

@marcaaron One of you needs to 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]

hungvu193 · 2024-09-06T03:15:16Z

@getusha I also replaced ValidateContactActionPage with ValidateCodeActionModal in this PR, so please test adding new contact method flow carefully and let me know if you have any issue.
If everything is ok, we can use ValidateContactActionPage everywhere instead of duplicating BaseValidateCodeForm everytime.

mountiny

Looking to test this also on the adhoc build

src/components/ValidateCodeActionModal/type.ts

src/libs/actions/User.ts

github-actions · 2024-09-06T11:23:59Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/48628/index.html	https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/48628/index.html

Desktop 💻	Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/48628/NewExpensify.dmg	https://48628.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

mountiny · 2024-09-06T16:48:53Z

@marcaaron @hungvu193 I have tested this, and it works 🎉 not add recording because, duh, but the validation seems to pass for any validation code now. Is that expected for now? @marcaaron

hungvu193 · 2024-09-06T16:54:49Z

It's the same for Adding new contact method 🤔 we will always navigate back to contact method list after entering magic code, but not sure we should also do it here.

marcaaron · 2024-09-06T21:16:30Z

Yep, to clarify, that's expected. We will switch it on in https://github.com/Expensify/Web-Secure/pull/2740 and be able to QA this properly before shipping the change. Then we can force users to upgrade to the next version around the same time as deploying Web-Secure.

Since @getusha hasn't reviewed yet I'll go ahead and do the checklist on this one.

marcaaron · 2024-09-06T21:17:44Z

I think we still need copy to be confirmed as well? Mentioned it here. I'll add a label to get some help with that.

marcaaron · 2024-09-06T21:35:00Z

And also the copy changes requested here.

Co-authored-by: Vit Horacek <36083550+mountiny@users.noreply.github.com>

…93/App into feat/validate-code-modal

hungvu193 · 2024-09-07T06:18:35Z

Sure. I've just addressed all the comments.

hungvu193 · 2024-09-07T06:23:55Z

Requested a translation on slack:
https://expensify.slack.com/archives/C01GTK53T8Q/p1725690186932629

marcaaron · 2024-09-08T16:55:59Z

Let's CP this one?

OSBotify · 2024-09-08T17:05:43Z

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

add validate code modal (cherry picked from commit aaa60b9) (CP triggered by mountiny)

ntdiary · 2024-09-18T13:37:05Z

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

+                validatePendingAction={pendingContactAction?.pendingFields?.actionVerified}
+                validateError={validateLoginError}
+                handleSubmitForm={addNewContactMethod}
+                clearError={() => User.clearContactMethodErrors(contactMethod, 'validateLogin')}


Hi, @hungvu193, If I register with a phone number, when I add a new contact method, this clearContactMethodErrors will add a new record into the loginList. Is this behavior intentional? (because the value of account.primaryLogin is the phone number at that point.)

@ntdiary it came from this PR:

#48320

I think Yes because right now on the new Adding Contact Method flow we will need to verify magic code first so we need to save the temporary contact method to submit it later. Is there any issue with it?

Oh wait. I think I misunderstood the question. I'll need my laptop to take a look 🥲

Eh, What I'm confused about is: the new contact I actually wanted to add is 2471314+21@gmail.com, but it seems that clearContactMethodErrors unexpectedly added a record with +13393011884 to the loginList. 😂

Yeap that's pretty weird. I think it shouldn't add a new contact method into loginList but let me grab my laptop and see what I find.

I'm trying to signup with phone number but I can't receive the magic code :( . Can you check the verbose to see where does that contact method come from? (Probably Pusher event).

test.mp4

App/src/components/ValidateCodeActionModal/ValidateCodeForm/BaseValidateCodeForm.tsx

Lines 131 to 137 in b7c0055

useEffect(() => {

if (!validateError) {

return;

}

clearError();

// eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps

}, [clearError, validateError]);

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

Lines 150 to 152 in b7c0055

validateError={validateLoginError}

handleSubmitForm={addNewContactMethod}

clearError={() => User.clearContactMethodErrors(contactMethod, 'validateLogin')}

validateLoginError is empty object, so when BaseValidateCodeForm is mounted, clearError (i.e., clearContactMethodErrors) is automatically called. And because the value of contactMethod (i.e., account.primaryLogin) is +13393011884, clearContactMethodErrors adds that phone number to the loginList instead of using the existing +13393011884@expensify.sms key.

BTW, I don't have a phone number either, just generated some randomly with this url, and no magic code is required when signing up with a new phone number. 😂

I see. So I think we should check _isEmpty(validateError) instead of using !validateError. We will fix it in this PR

I'm afraid that's not enough, clearError is also called when the modal is closed.

App/src/libs/actions/User.ts

Lines 285 to 288 in 8d645bf

/**

* Clears any possible stored errors for a specific field on a contact method

*/

function clearContactMethodErrors(contactMethod: string, fieldName: string) {

Perhaps we need to ensure that the contactMethod string contains the SMS domain.
account.primaryLogin is just a phone number +13393011884, while the correct key in loginList is +13393011884@expensify.sms.
We have a function addSMSDomainIfPhoneNumber that might help, which can add the SMS domain to the phone number. :)

Thanks for your advice 💯 . I'll keep that in mind.

sobitneupane · 2024-12-05T12:26:15Z

This issue was missed while implementing the feature.

Issue: Copilot - Clicking outside magic code RHP does not dismiss the RHP entirely

Steps to reprodue:

Go to Settings > Security > Add copilot
Select a user > Next.
Select an access level > Next.
Click Add copilot.
Click outside the RHP to dismiss it.

allgandalf · 2024-12-24T06:51:42Z

src/components/ValidateCodeActionModal/index.tsx

+                    onBackButtonPress={hide}
+                />
+
+                <View style={[themeStyles.ph5, themeStyles.mt3, themeStyles.mb7]}>


themeStyles.mb7 was applied to the ValidateCodeForm container which has 28px of margin, this caused inconsistency in padding between the validate code and issue expensify cards flow, which caused #53583

dominictb · 2025-02-03T07:26:39Z

src/components/ValidateCodeActionModal/ValidateCodeForm/BaseValidateCodeForm.tsx

+    /**
+     * Check that all the form fields are valid, then trigger the submit callback
+     */
+    const validateAndSubmitForm = useCallback(() => {


Coming from #54009, we should show the error when validateAndSubmitForm is triggered.

parasharrajat · 2025-02-05T11:17:37Z

src/components/ValidateCodeActionModal/ValidateCodeForm/BaseValidateCodeForm.tsx

+
+            if (validateError) {
+                clearError();
+                User.clearValidateCodeActionError('actionVerified');


We should have also cleared this when user has actionVerified error as improvement. #55490

ishpaul777 · 2025-03-06T21:39:16Z

src/components/ValidateCodeActionModal/index.tsx

+                    onBackButtonPress={hide}
+                />
+
+                <View style={[themeStyles.ph5, themeStyles.mt3, themeStyles.mb7]}>


The page should have been wrapped in , This cause a regression here #56818

ishpaul777 · 2025-11-15T22:00:51Z

src/components/ValidateCodeActionModal/ValidateCodeForm/BaseValidateCodeForm.tsx

+        if (!hasMagicCodeBeenSent) {
+            return;
+        }
+        inputValidateCodeRef.current?.clear();


{BZ CHECKLIST} inputValidateCodeRef.current?.clear() was set too early, during the RHP animation. which caused this minor transition flickering issue #73030

hungvu193 added 4 commits September 5, 2024 16:42

add validate code modal

f9a20e3

replace ValidateContactActionPage

778c68b

remove console.log

4582516

add ValidateCodeModal into ExpensifyCardPage

541f282

hungvu193 mentioned this pull request Sep 5, 2024

[HOLD for payment 2024-09-18] Update the Magic code form to be easier to reuse in other flows and add it to Reveal card details flow #48541

Closed

4 tasks

lint

ae40d6a

marcaaron assigned hungvu193 Sep 5, 2024

marcaaron self-requested a review September 5, 2024 23:49

hungvu193 added 3 commits September 6, 2024 09:54

update translation

2cc3b95

update contact method translations for NewContactMethodPage

5022fa8

update docs

35d064c

hungvu193 commented Sep 6, 2024

View reviewed changes

src/components/ValidateCodeActionModal/index.tsx Outdated Show resolved Hide resolved

hungvu193 marked this pull request as ready for review September 6, 2024 03:03

hungvu193 requested a review from a team as a code owner September 6, 2024 03:03

melvin-bot bot requested review from getusha and mountiny September 6, 2024 03:03

melvin-bot bot removed the request for review from a team September 6, 2024 03:03

merge main

7578c92

mountiny added Ready To Build InternalQA This pull request required internal QA labels Sep 6, 2024

mountiny reviewed Sep 6, 2024

View reviewed changes

marcaaron removed the request for review from getusha September 6, 2024 21:16

hungvu193 and others added 5 commits September 7, 2024 13:04

Update src/components/ValidateCodeActionModal/type.ts

cdcd287

Co-authored-by: Vit Horacek <36083550+mountiny@users.noreply.github.com>

Update src/components/ValidateCodeActionModal/type.ts

3915b4b

Co-authored-by: Vit Horacek <36083550+mountiny@users.noreply.github.com>

update js docs and remove FullScreenLoadingIndicator

e1d133b

Merge branch 'feat/validate-code-modal' of https://github.com/hungvu1…

d88b0c3

…93/App into feat/validate-code-modal

Merge remote-tracking branch 'origin/main' into feat/validate-code-modal

5296333

marcaaron approved these changes Sep 8, 2024

View reviewed changes

marcaaron merged commit aaa60b9 into Expensify:main Sep 8, 2024

marcaaron changed the title ~~add validate code modal~~ [CP Staging] add validate code modal Sep 8, 2024

OSBotify pushed a commit that referenced this pull request Sep 9, 2024

Merge pull request #48628 from hungvu193/feat/validate-code-modal

86cdee7

add validate code modal (cherry picked from commit aaa60b9) (CP triggered by mountiny)

github-actions bot added the CP Staging marks PRs that have been CP'd to staging label Sep 9, 2024

mountiny mentioned this pull request Sep 9, 2024

Deploy Checklist: New Expensify 2024-09-05 #48664

Closed

69 tasks

jjcoffee mentioned this pull request Sep 12, 2024

[PAID] [$250] Wallet empty state has disabled "Add bank account" button for new, unvalidated accounts #48041

Closed

6 tasks

ntdiary reviewed Sep 18, 2024

View reviewed changes

ntdiary mentioned this pull request Sep 18, 2024

fix: Remove GBR from the account settings on initial signup. #49004

Merged

50 tasks

daledah mentioned this pull request Sep 18, 2024

fix: requires validate when opening bank account #49230

Merged

50 tasks

This was referenced Sep 19, 2024

Refactor: reuse ValidateCodeActionModal #49445

Merged

[$325] Android - Profile - Add contact method flow resumes at magic code page after killing app #48498

Closed

getusha mentioned this pull request Oct 6, 2024

[HOLD for payment 2024-10-03] [$250] Wallet - Verify button does not show loading indicator after entering magic code #49073

Closed

6 tasks

sobitneupane mentioned this pull request Dec 5, 2024

[HOLD for payment 2024-11-29] [$125] Copilot - Clicking outside magic code RHP does not dismiss the RHP entirely #51272

Closed

8 tasks

allgandalf reviewed Dec 24, 2024

View reviewed changes

dominictb reviewed Feb 3, 2025

View reviewed changes

parasharrajat reviewed Feb 5, 2025

View reviewed changes

ishpaul777 reviewed Mar 6, 2025

View reviewed changes

ishpaul777 reviewed Nov 15, 2025

View reviewed changes

	useEffect(() => {
	if (!validateError) {
	return;
	}
	clearError();
	// eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
	}, [clearError, validateError]);

	validateError={validateLoginError}
	handleSubmitForm={addNewContactMethod}
	clearError={() => User.clearContactMethodErrors(contactMethod, 'validateLogin')}

	/**
	* Clears any possible stored errors for a specific field on a contact method
	*/
	function clearContactMethodErrors(contactMethod: string, fieldName: string) {

Conversation

hungvu193 commented Sep 5, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

marcaaron commented Sep 5, 2024

Uh oh!

Uh oh!

melvin-bot bot commented Sep 6, 2024 • edited by marcaaron Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hungvu193 commented Sep 6, 2024

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Sep 6, 2024

Uh oh!

mountiny commented Sep 6, 2024

Uh oh!

hungvu193 commented Sep 6, 2024

Uh oh!

marcaaron commented Sep 6, 2024

Uh oh!

marcaaron commented Sep 6, 2024

Uh oh!

marcaaron commented Sep 6, 2024

Uh oh!

hungvu193 commented Sep 7, 2024

Uh oh!

hungvu193 commented Sep 7, 2024

Uh oh!

marcaaron commented Sep 8, 2024

Uh oh!

OSBotify commented Sep 8, 2024

Uh oh!

ntdiary Sep 18, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ntdiary Sep 19, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sobitneupane commented Dec 5, 2024

Uh oh!

allgandalf Dec 24, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

parasharrajat Feb 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

hungvu193 commented Sep 5, 2024 •

edited

Loading

melvin-bot bot commented Sep 6, 2024 •

edited by marcaaron

Loading

ntdiary Sep 18, 2024 •

edited

Loading

ntdiary Sep 19, 2024 •

edited

Loading

allgandalf Dec 24, 2024 •

edited

Loading

parasharrajat Feb 5, 2025 •

edited

Loading