feat: add timer on validate code action modal #51663

getusha · 2024-10-29T14:01:36Z

Details

Implement a timer to prevent the user from requesting multiple magic code emails within a short period.
Fix an issue where no API call is made due to a condition added earlier, which prevents the API call if a magic code was recently sent, even when the function is called from a resend action.

Had to change the way we pass sendValidateCode removing the condition, which in result help us avoid writing repetitive code. cc @youssef-lr

Fixed Issues

$ #49270
PROPOSAL:

Tests

Open the app
Navigate to Settings > Profile > Contact methods
Press on unverified contact method
Verify that there is a timer to request a new magic code
Wait for the 30 seconds and press on Didn't receive a magic code?
Verify that the 30 seconds timer starts again

Verify that no errors appear in the JS console

Offline tests

N/a

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-10-30.at.12.02.23.in.the.afternoon.mov

Android: mWeb Chrome

Screen.Recording.2024-10-29.at.2.13.31.in.the.afternoon.mov

iOS: Native

Screen.Recording.2024-10-30.at.11.47.28.in.the.morning.mov

iOS: mWeb Safari

Screen.Recording.2024-10-29.at.2.16.42.in.the.afternoon.mov

MacOS: Chrome / Safari

Screen.Recording.2024-10-29.at.1.13.33.in.the.afternoon.mov

MacOS: Desktop

Screen.Recording.2024-10-30.at.12.04.39.in.the.afternoon.mov

…r-magic-code-resend

melvin-bot · 2024-10-29T19:10:05Z

@hungvu193 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]

getusha · 2024-10-29T19:12:20Z

Having difficulties to build on native @hungvu193, will update it once i get it working. you can start the review

src/components/ValidateCodeActionModal/ValidateCodeForm/BaseValidateCodeForm.tsx

…lidateCodeForm.tsx Co-authored-by: Youssef Lourayad <youssef@expensify.com>

hungvu193 · 2024-10-30T07:14:03Z

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 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.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 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.
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-10-30.at.14.20.16.mov

Android: mWeb Chrome

Screen.Recording.2024-10-30.at.14.16.13.mov

iOS: Native

Screen.Recording.2024-10-30.at.13.45.49.mov

iOS: mWeb Safari

Screen.Recording.2024-10-30.at.13.47.32.mov

MacOS: Chrome / Safari

Screen.Recording.2024-10-30.at.11.14.36.mov

MacOS: Desktop

Screen.Recording.2024-10-30.at.11.25.55.mov

mountiny

Thanks! changes look good to me

OSBotify · 2024-10-30T15:03:55Z

✋ 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 · 2024-10-31T11:42:30Z

🚀 Deployed to staging by https://github.com/mountiny in version: 9.0.56-0 🚀

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

github-actions · 2024-11-04T14:15:14Z

🚀 Deployed to production by https://github.com/Julesssss in version: 9.0.56-9 🚀

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

fedirjh · 2024-12-22T21:30:24Z

src/pages/settings/Security/AddDelegate/DelegateMagicCodeModal.tsx

    return (
        <ValidateCodeActionModal
            clearError={clearError}
            onClose={onBackButtonPress}
            validateError={validateLoginError}
            isVisible={isValidateCodeActionModalVisible}
            title={translate('delegate.makeSureItIsYou')}
-            sendValidateCode={sendValidateCode}
+            sendValidateCode={() => User.requestValidateCodeAction()}
+            hasMagicCodeBeenSent={!!currentDelegate?.validateCodeSent}


Coming from #53177 , currentDelegate don’t think have validateCodeSent hence the timer will not be displayed in this case. we should have used validateCodeAction?.validateCodeSent instead.

getusha added 6 commits October 29, 2024 13:40

feat: add timer on validate code action modal

7fc50ba

fix: the forgotten doc

948b600

fix: prevent multiple api requests

3efc054

Merge remote-tracking branch 'exfy/main' into feat-add-countdown-afte…

1c16f06

…r-magic-code-resend

Merge remote-tracking branch 'exfy/main' into feat-add-countdown-afte…

7fe210d

…r-magic-code-resend

fix: lint

0954b4d

getusha marked this pull request as ready for review October 29, 2024 19:10

getusha requested a review from a team as a code owner October 29, 2024 19:10

melvin-bot bot requested review from hungvu193 and removed request for a team October 29, 2024 19:10

getusha mentioned this pull request Oct 29, 2024

[HOLD for payment 2024-11-11] [HOLD for payment 2024-10-30] [$250] Use new ValidateCodeActionModal component in as many places as possible #49270

Closed

youssef-lr reviewed Oct 29, 2024

View reviewed changes

src/components/ValidateCodeActionModal/ValidateCodeForm/BaseValidateCodeForm.tsx Outdated Show resolved Hide resolved

getusha and others added 2 commits October 30, 2024 10:07

Update src/components/ValidateCodeActionModal/ValidateCodeForm/BaseVa…

6cb4ebf

…lidateCodeForm.tsx Co-authored-by: Youssef Lourayad <youssef@expensify.com>

refactor: rename variable name to more descriptive name

3c7ae6d

hungvu193 approved these changes Oct 30, 2024

View reviewed changes

melvin-bot bot requested a review from mountiny October 30, 2024 07:21

mountiny assigned getusha Oct 30, 2024

mountiny approved these changes Oct 30, 2024

View reviewed changes

mountiny merged commit 6b85457 into Expensify:main Oct 30, 2024
17 of 18 checks passed

github-actions bot mentioned this pull request Oct 31, 2024

Deploy Checklist: New Expensify 2024-10-31 #51778

Closed

lanitochka17 mentioned this pull request Oct 31, 2024

[HOLD for payment 2024-11-13] [HOLD for payment 2024-11-11] Validate account - Need to click "Didn't receive a magic code?" twice to restart timer #51797

Closed

8 tasks

dominictb mentioned this pull request Nov 15, 2024

Feat: Add a step to to Request Physical Card form that collects a magic code #51135

Merged

50 tasks

fedirjh reviewed Dec 22, 2024

View reviewed changes

fedirjh mentioned this pull request Dec 22, 2024

[HOLD for payment 2024-12-19] [$250] Missing validate code sent when adding copilot #53177

Open

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: add timer on validate code action modal #51663

feat: add timer on validate code action modal #51663

getusha commented Oct 29, 2024 •

edited

Loading

melvin-bot bot commented Oct 29, 2024

getusha commented Oct 29, 2024

hungvu193 commented Oct 30, 2024 •

edited

Loading

mountiny left a comment

OSBotify commented Oct 30, 2024

github-actions bot commented Oct 31, 2024

github-actions bot commented Nov 4, 2024

fedirjh Dec 22, 2024

feat: add timer on validate code action modal #51663

feat: add timer on validate code action modal #51663

Conversation

getusha commented Oct 29, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Oct 29, 2024

getusha commented Oct 29, 2024

hungvu193 commented Oct 30, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

mountiny left a comment

Choose a reason for hiding this comment

OSBotify commented Oct 30, 2024

github-actions bot commented Oct 31, 2024

github-actions bot commented Nov 4, 2024

fedirjh Dec 22, 2024

Choose a reason for hiding this comment

getusha commented Oct 29, 2024 •

edited

Loading

hungvu193 commented Oct 30, 2024 •

edited

Loading