Remove all usage/reference of the User model and ONYXKEYS.USER #61228

inimaga · 2025-05-01T09:10:33Z

Explanation of Change

Context: We have two models in the App that essentially represent the same thing: User and Account and this leads to a risk of duplicated information. We are thus in the process of deprecating User.ts and merge it into Account.ts to standardise and prevent duplicate information from being added to both models.

Change: This change is step D of the entire process listed here. i.e: Remove all usage/reference of the User model and ONYXKEYS.USER in the frontend (App).

In this change, we have:

Removed the useAccountValidation hook introduced in this change - create hook to check validated user #59983, and
Deleted the definition/type/reference, for the User model (ONYXKEYS.USER)

Fixed Issues

Part of #59277

Tests

Test to ensure that removal of the hook didn't regress the following bug/issue at #58682

Steps:

Launch Hybrid app
Log in with new account
Go to Settings >> Security >> 2FA
Enter the magic code to validate account to use 2FA feature
Go through the 2FA process
Once the 2FA is enabled, log out of the account
Log in with same account >> enter magic account >> enter 2FA code
Go to Settings >> Security >> 2FA
Disable 2FA
Enter 2FA code from authenticator app
Verify that the user does not need to validate account again when logging in.

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as above

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

melvin-bot · 2025-05-01T10:32:41Z

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

inimaga · 2025-05-01T10:52:29Z

@c3024 Similarly to #60851, can you please help review and test this. Thanks.

c3024 · 2025-05-01T10:54:23Z

@inimaga , thanks. I am on it.

c3024 · 2025-05-01T11:01:36Z

src/components/BookTravelButton.tsx

@@ -51,7 +50,7 @@ function BookTravelButton({text, shouldRenderErrorMessageBelowButton = false}: B
    const StyleUtils = useStyleUtils();
    const {translate} = useLocalize();
    const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID, {canBeMissing: false});
-    const isUserValidated = useAccountValidation();
+    const [isUserValidated] = useOnyx(ONYXKEYS.ACCOUNT, {selector: (account) => account?.validated, canBeMissing: true});


We have already subscribed to ACCOUNT Onyx key for primaryLogin. I think it is better to have only one useOnyx connection for each key.

Good catch. I agree. Adding the changes now.

c3024 · 2025-05-01T11:06:22Z

src/pages/settings/Wallet/WalletPage/WalletPage.tsx

+    const [isLoadingPaymentMethods] = useOnyx(ONYXKEYS.IS_LOADING_PAYMENT_METHODS, {initialValue: true, canBeMissing: true});
+    const [userWallet] = useOnyx(ONYXKEYS.USER_WALLET, {canBeMissing: true});
+    const [walletTerms] = useOnyx(ONYXKEYS.WALLET_TERMS, {initialValue: {}, canBeMissing: true});
+    const [isUserValidated] = useOnyx(ONYXKEYS.ACCOUNT, {selector: (account) => account?.validated, canBeMissing: true});


Here too we can use only one useOnyx for ACCOUNT for the page.

Resolved. Also fixed it retrospectively for ProfilePage.tsx

c3024 · 2025-05-01T14:09:22Z

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: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- 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: HybridApp

accountAndroid.mov

Android: mWeb Chrome

accountAndroidmWeb.mov

iOS: HybridApp

iOS: mWeb Safari

accountiOSmWeb.mov

MacOS: Chrome / Safari

accountChrome.mp4

MacOS: Desktop

accountDesktop.mp4

c3024

LGTM!

melvin-bot · 2025-05-01T15:37:05Z

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

melvin-bot · 2025-05-01T15:37:09Z

🎯 @c3024, thanks for reviewing and testing this PR! 🎉

An E/App issue has been created to issue payment here: #61252.

OSBotify · 2025-05-01T16:02:45Z

✋ 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-05-01T20:08:13Z

🚀 Deployed to staging by https://github.com/MariaHCD in version: 9.1.39-0 🚀

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

chiragsalian · 2025-05-02T00:27:16Z

Just a heads up, that the changes here caused a small bug - #61275
We're planning to implement a fix.

github-actions · 2025-05-06T01:06:09Z

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.1.39-8 🚀

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

inimaga added 2 commits May 1, 2025 09:58

Removal of the useAccountValidation hook

d2dde06

Removal of the User model and ONYXKEYS.USER

4e47c30

inimaga mentioned this pull request May 1, 2025

Deprecate User model and merge into Account model #59277

Closed

Resolve linting issues

e7f9e64

inimaga self-assigned this May 1, 2025

inimaga requested a review from MariaHCD May 1, 2025 10:01

inimaga marked this pull request as ready for review May 1, 2025 10:32

inimaga requested a review from a team as a code owner May 1, 2025 10:32

melvin-bot bot removed the request for review from a team May 1, 2025 10:32

inimaga requested a review from c3024 May 1, 2025 10:52

c3024 suggested changes May 1, 2025

View reviewed changes

Remove duplicate subscription on same component for ONYXKEYS.ACCOUNT

47315da

inimaga requested a review from c3024 May 1, 2025 12:11

inimaga added 2 commits May 1, 2025 13:20

Resolve linting issues

40463a6

Merge branch 'main' into issa-cleanup-onyxkeys_user

4a667a3

c3024 approved these changes May 1, 2025

View reviewed changes

melvin-bot bot requested a review from lakchote May 1, 2025 15:37

melvin-bot bot mentioned this pull request May 1, 2025

Payment issue for E/App PR#61228 #61252

Closed

MariaHCD approved these changes May 1, 2025

View reviewed changes

MariaHCD merged commit e889227 into main May 1, 2025
19 checks passed

MariaHCD deleted the issa-cleanup-onyxkeys_user branch May 1, 2025 15:54

github-actions bot mentioned this pull request May 1, 2025

Deploy Checklist: New Expensify 2025-05-01 #61263

Closed

61 tasks

ChavdaSachin mentioned this pull request May 2, 2025

[Due for payment 2025-05-14] [Due for payment 2025-05-13] [$250] Login - Email field is auto unfocused #61275

Closed

8 tasks

chiragsalian mentioned this pull request May 2, 2025

Revert "Remove all usage/reference of the User model and ONYXKEYS.USER" #61282

Closed

inimaga mentioned this pull request May 12, 2025

[NO QA] Remove comment regarding deprecation of User model #61842

Merged

51 tasks

Remove all usage/reference of the User model and ONYXKEYS.USER #61228

Remove all usage/reference of the User model and ONYXKEYS.USER #61228

Uh oh!

Conversation

inimaga commented May 1, 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 May 1, 2025

Uh oh!

inimaga commented May 1, 2025

Uh oh!

c3024 commented May 1, 2025

Uh oh!

c3024 May 1, 2025

Choose a reason for hiding this comment

Uh oh!

inimaga May 1, 2025

Choose a reason for hiding this comment

Uh oh!

c3024 May 1, 2025

Choose a reason for hiding this comment

Uh oh!

inimaga May 1, 2025

Choose a reason for hiding this comment

Uh oh!

c3024 commented May 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

c3024 left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented May 1, 2025

Uh oh!

melvin-bot bot commented May 1, 2025

Uh oh!

Uh oh!

OSBotify commented May 1, 2025

Uh oh!

github-actions bot commented May 1, 2025

Uh oh!

chiragsalian commented May 2, 2025

Uh oh!

github-actions bot commented May 6, 2025

Uh oh!

Uh oh!

inimaga commented May 1, 2025 •

edited

Loading

c3024 commented May 1, 2025 •

edited

Loading