Display Xero disable 2FA error from backend by neil-marcellini · Pull Request #57202 · Expensify/App

neil-marcellini · 2025-02-20T20:40:34Z

Explanation of Change

When a user has just signed in and they go to disable two factor Auth, the backend will now throw an error if the user is an admin of any policy that has an accounting connection to Xero. We also check this on the frontend, but there's no guarantee all the user's policies will be loaded. The error is displayed using the same modal as for the frontend check.

I also ran into a problem when testing this, which is that the autocomplete event from 1Password was firing multiple "Enter" keypress events, even though I just clicked its autocomplete suggestion once. One of these events would occur after the modal opened and since it handles press of the "Enter" key it would immediately close it. The solution I found was to ignore that event if it's target was for the input and not the button it should be attached to, which I think seems reasonable.

Fixed Issues

$ #52850
PROPOSAL: N/A

Tests

Log in with any account
Go to settings > security > Enable 2FA
Create a workspace if needed
Got to workspace settings, more features, and enable accounting
Got to accounting settings
Connect to Xero following this guide for internal devs
Log out
Log into the same account
Go to settings > security > disable 2FA
Enter your 2FA code
Verify you see a modal explaining it can't be disabled

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

I only tested on web because the changes should be platform independent and the C+ will test all platforms.

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

2025-02-20_14-02-02.mp4

MacOS: Desktop

melvin-bot · 2025-02-27T15:13:41Z

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

allgandalf

NAB's but few comments

src/components/Button/validateSubmitShortcut/index.ts

allgandalf · 2025-02-28T05:00:23Z

src/pages/settings/Security/TwoFactorAuth/DisablePage.tsx


+    const closeModal = useCallback(() => {
+        clearDisableTwoFactorAuthErrors();
+        Navigation.goBack();


Suggested change

Navigation.goBack();

Navigation.dismissModal();

Makes more sense ?

No I specifically want to go back to the previous page. Is that the right way to do it? What would you advise and why?

Let me test both approaches and get back

allgandalf · 2025-03-05T09:05:56Z

@neil-marcellini we have failing typecheck here

neil-marcellini · 2025-03-05T22:15:34Z

@neil-marcellini we have failing typecheck here

I don't see that. Would you please check again?

allgandalf · 2025-03-06T18:05:27Z

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 that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
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-03-09.at.2.49.31.PM.mov

Android: mWeb Chrome

Screen.Recording.2025-03-09.at.2.50.52.PM.mov

iOS: Native

Screen.Recording.2025-03-09.at.2.48.30.PM.mov

iOS: mWeb Safari

Screen.Recording.2025-03-09.at.2.47.16.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2025-03-09.at.2.46.03.PM.mov

MacOS: Desktop

Screen.Recording.2025-03-09.at.2.46.31.PM.mov

melvin-bot · 2025-03-07T15:03:20Z

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

allgandalf

sorry approved this by mistake, i found that it's not working on iOS native:

PR is failing for iOS:

Screen.Recording.2025-03-07.at.8.47.33.PM.mov

allgandalf · 2025-03-07T15:20:16Z

@neil-marcellini it only works after i open the workspace atleast once:

Screen.Recording.2025-03-07.at.8.49.42.PM.mov

neil-marcellini · 2025-03-07T18:14:24Z

sorry approved this by mistake, i found that it's not working on iOS native:

PR is failing for iOS:
only works after i open the workspace atleast once:

Sorry I left out a test step! You need to submit the 2FA code and then the modal will pop up. We're specifically checking that the backend causes the modal to show up after submitting the 2FA code if the modal doesn't show up previously due to the policy not being loaded.

melvin-bot · 2025-03-09T09:21:57Z

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

MarioExpensify · 2025-03-10T17:27:25Z

On it!

MarioExpensify

Nice!! Merging!

OSBotify · 2025-03-10T17:52:17Z

✋ 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-10T21:35:25Z

🚀 Deployed to staging by https://github.com/MarioExpensify in version: 9.1.11-1 🚀

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

github-actions · 2025-03-14T01:06:17Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.1.12-7 🚀

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

neil-marcellini added 3 commits February 20, 2025 10:25

Show 2fa warning modal for backend error

2bdcdfa

Navigate back after closing error confirmation modal

8148a04

Prevent stray auto complete Enter event from closing modal

c2e78da

neil-marcellini self-assigned this Feb 20, 2025

Add errorFields to Account type and use actual field name

561cc94

neil-marcellini changed the title ~~Display Xero disable 2FA error from backend~~ [HOLD Web-E 45576] Display Xero disable 2FA error from backend Feb 20, 2025

Merge main so hopefully tests pass

9402c08

neil-marcellini mentioned this pull request Feb 20, 2025

[Due for payment 2025-03-21] [$250] User is able to disable 2FA when connected to Xero accounting #52850

Closed

8 tasks

neil-marcellini changed the title ~~[HOLD Web-E 45576] Display Xero disable 2FA error from backend~~ Display Xero disable 2FA error from backend Feb 27, 2025

neil-marcellini marked this pull request as ready for review February 27, 2025 15:13

neil-marcellini requested a review from a team as a code owner February 27, 2025 15:13

melvin-bot bot requested a review from allgandalf February 27, 2025 15:13

melvin-bot bot removed the request for review from a team February 27, 2025 15:13

allgandalf reviewed Feb 28, 2025

View reviewed changes

neil-marcellini added 2 commits March 4, 2025 13:23

Merge branch 'main' into neil-xero-2fa-disable

d5855a3

Use constant for node names per feedback

b754a50

neil-marcellini requested a review from allgandalf March 4, 2025 21:28

Explain navigation

60d4e6d

allgandalf approved these changes Mar 7, 2025

View reviewed changes

melvin-bot bot requested a review from MarioExpensify March 7, 2025 15:03

allgandalf suggested changes Mar 7, 2025

View reviewed changes

neil-marcellini requested a review from allgandalf March 7, 2025 18:14

allgandalf approved these changes Mar 9, 2025

View reviewed changes

melvin-bot bot requested a review from marcochavezf March 9, 2025 09:21

neil-marcellini removed the request for review from marcochavezf March 10, 2025 14:57

MarioExpensify approved these changes Mar 10, 2025

View reviewed changes

MarioExpensify merged commit d9bc5a6 into main Mar 10, 2025
18 of 20 checks passed

MarioExpensify deleted the neil-xero-2fa-disable branch March 10, 2025 17:44

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

Deploy Checklist: New Expensify 2025-03-10 #58124

Closed

nkdengineer mentioned this pull request Mar 11, 2025

[Due for payment 2025-04-14] Web - Expense - Nothing happens after hitting Enter on amount input page #58131

Closed

8 tasks

allgandalf mentioned this pull request Mar 11, 2025

[CP Staging] Revert Partial of "Display Xero disable 2FA error from backend", fixes Nothing happens after hitting Enter on amount input page #58171

Merged

50 tasks

neil-marcellini mentioned this pull request Apr 1, 2025

fix: Nothing happens after hitting Enter #58227

Merged

50 tasks

Conversation

neil-marcellini commented Feb 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Feb 27, 2025

Uh oh!

allgandalf left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

allgandalf Feb 28, 2025

Choose a reason for hiding this comment

Uh oh!

neil-marcellini Mar 4, 2025 • 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!

allgandalf Mar 5, 2025

Choose a reason for hiding this comment

Uh oh!

allgandalf commented Mar 5, 2025

Uh oh!

neil-marcellini commented Mar 5, 2025

Uh oh!

allgandalf commented Mar 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Mar 7, 2025

Uh oh!

allgandalf left a comment

Choose a reason for hiding this comment

Uh oh!

allgandalf commented Mar 7, 2025

Uh oh!

neil-marcellini commented Mar 7, 2025

Uh oh!

melvin-bot bot commented Mar 9, 2025

Uh oh!

MarioExpensify commented Mar 10, 2025

Uh oh!

MarioExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Mar 10, 2025

Uh oh!

github-actions bot commented Mar 10, 2025

Uh oh!

github-actions bot commented Mar 14, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

neil-marcellini commented Feb 20, 2025 •

edited

Loading

neil-marcellini Mar 4, 2025 •

edited

Loading

allgandalf commented Mar 6, 2025 •

edited

Loading