Fix unverified contact method is displayed #53864

mkzie2 · 2024-12-10T15:08:39Z

Explanation of Change

Fix unverified contact method is displayed

Fixed Issues

$ #53819
PROPOSAL:

Tests

Open Settings > Profile > Contact method > New contact method
Enter an email
Enter incorrect magic code
Remove the error
Go back to the contact method list
Verify that the unverified contact method isn't displayed

Verify that no errors appear in the JS console

Offline tests

None

QA Steps

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

Open Settings > Profile > Contact method > New contact method
Enter an email
Enter incorrect magic code
Remove the error
Go back to the contact method list
Verify that the unverified contact method isn't displayed

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-12-10.at.22.01.45.mov

Android: mWeb Chrome

Screen.Recording.2024-12-10.at.21.59.12.mov

iOS: Native

Screen.Recording.2024-12-10.at.22.03.20.mov

iOS: mWeb Safari

Screen.Recording.2024-12-10.at.21.59.57.mov

MacOS: Chrome / Safari

Screen.Recording.2024-12-10.at.21.56.34.mov

MacOS: Desktop

Screen.Recording.2024-12-10.at.22.05.14.mov

melvin-bot · 2024-12-10T15:16:31Z

@hoangzinh @MonilBhavsar 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]

brunovjk · 2024-12-10T15:26:46Z

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

53864_android_native.mov

Android: mWeb Chrome

53864_android_web.mov

iOS: Native

53864_ios_native.mov

iOS: mWeb Safari

53864_ios_web.mov

MacOS: Chrome / Safari

53864_web_chrome.mov

MacOS: Desktop

53864_web_desktop.mov

brunovjk · 2024-12-10T16:55:52Z

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

-                        if (!isEmptyObject(loginData?.errorFields) && pendingContactAction?.contactMethod) {
+                        if (pendingContactAction?.contactMethod) {


Is it safe to not check loginData?.errorFields here @mkzie2? I tested it and it does solve our problem, but I was thinking about Shahidullah-Muffakir's proposal, do you think it makes sense? I find it strange that I can reproduce the issue only if I close the error manually, otherwise everything happens normally.

@brunovjk It's safe because we've updated contactMethod to null in successData when adding a new contact method successfully. In the past, the bug doesn't happen because if (loginData?.errorFields && pendingContactAction?.contactMethod) { this condition is always matched when we close the validate code modal.

I see, that makes sense, thanks for clarifying. Finishing the checklist.

luacmartins · 2024-12-10T17:02:34Z

@mkzie2 are you able to address the comments since this PR is fixing a blocker?

brunovjk

LGTM

luacmartins

LGTM

Fix unverified contact method is displayed (cherry picked from commit 03f19c1) (CP triggered by luacmartins)

OSBotify · 2024-12-10T18:43:08Z

✋ 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-12-10T19:16:49Z

🚀 Cherry-picked to staging by https://github.com/luacmartins in version: 9.0.73-8 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

github-actions · 2024-12-10T22:48:55Z

🚀 Deployed to production by https://github.com/luacmartins in version: 9.0.73-8 🚀

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

fix unverified contact method is displayed

5a853e4

mkzie2 mentioned this pull request Dec 10, 2024

[HOLD for payment 2024-12-19] [HOLD for payment 2024-12-17] Profile - Invalid second contact method is added and displayed as ready to verify. #53819

Closed

8 tasks

fix lint

3099f08

MonilBhavsar requested a review from brunovjk December 10, 2024 15:13

mkzie2 marked this pull request as ready for review December 10, 2024 15:16

mkzie2 requested a review from a team as a code owner December 10, 2024 15:16

melvin-bot bot requested review from hoangzinh and MonilBhavsar and removed request for a team December 10, 2024 15:16

brunovjk reviewed Dec 10, 2024

View reviewed changes

brunovjk approved these changes Dec 10, 2024

View reviewed changes

luacmartins approved these changes Dec 10, 2024

View reviewed changes

luacmartins merged commit 03f19c1 into Expensify:main Dec 10, 2024
17 of 20 checks passed

OSBotify pushed a commit that referenced this pull request Dec 10, 2024

Merge pull request #53864 from mkzie2/mkzie2-issue/53819

d35414e

Fix unverified contact method is displayed (cherry picked from commit 03f19c1) (CP triggered by luacmartins)

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

github-actions bot mentioned this pull request Dec 10, 2024

Deploy Checklist: New Expensify 2024-12-09 #53762

Closed

70 tasks

brunovjk mentioned this pull request Dec 16, 2024

[HOLD for payment 2024-12-17] [$250] iOS/Android - Contact method - Contact method not displayed until re-login or cleaning cache #53481

Closed

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix unverified contact method is displayed #53864

Fix unverified contact method is displayed #53864

mkzie2 commented Dec 10, 2024

melvin-bot bot commented Dec 10, 2024

brunovjk commented Dec 10, 2024 •

edited

Loading

brunovjk Dec 10, 2024

mkzie2 Dec 10, 2024

brunovjk Dec 10, 2024

luacmartins commented Dec 10, 2024

brunovjk left a comment

luacmartins left a comment

OSBotify commented Dec 10, 2024

github-actions bot commented Dec 10, 2024

github-actions bot commented Dec 10, 2024

		if (!isEmptyObject(loginData?.errorFields) && pendingContactAction?.contactMethod) {
		if (pendingContactAction?.contactMethod) {

Fix unverified contact method is displayed #53864

Fix unverified contact method is displayed #53864

Conversation

mkzie2 commented Dec 10, 2024

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Dec 10, 2024

brunovjk commented Dec 10, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

brunovjk Dec 10, 2024

Choose a reason for hiding this comment

mkzie2 Dec 10, 2024

Choose a reason for hiding this comment

brunovjk Dec 10, 2024

Choose a reason for hiding this comment

luacmartins commented Dec 10, 2024

brunovjk left a comment

Choose a reason for hiding this comment

luacmartins left a comment

Choose a reason for hiding this comment

OSBotify commented Dec 10, 2024

github-actions bot commented Dec 10, 2024

github-actions bot commented Dec 10, 2024

brunovjk commented Dec 10, 2024 •

edited

Loading