check currentUser with accountID #29090

c3024 · 2023-10-09T13:51:06Z

Details

Fixed Issues

$ #28591
PROPOSAL: #28591 (comment)

Tests

Login to New Dot with email 'X'
Go to Settings > Share Code > Copy URL to clipboard
Log out
Login with same email 'X' with deeplink with this URL copied in Step 2
Verify that "message X" option is not shown in right hand panel

Verify that no errors appear in the JS console

Offline tests

NA

QA Steps

Login to New Dot with email 'X'
Go to Settings > Share Code > Copy URL to clipboard
Log out
Login with same email 'X' with deeplink with this URL copied in Step 2
Verify that "message X" option is not shown in right hand panel

Verify that no errors appear in the JS console

PR Author Checklist

I linked the correct issue in the ### Fixed Issues section above
I wrote clear testing steps that cover the changes made in this PR
- I added steps for local testing in the Tests section
- I added steps for the expected offline behavior in the Offline steps section
- I added steps for Staging and/or Production testing in the QA steps section
- I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
I included screenshots or videos for tests on all platforms
I ran the tests on all platforms & verified they passed on:
- Android / native
- Android / Chrome
- iOS / native
- iOS / Safari
- MacOS / Chrome / Safari
- MacOS / Desktop
I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
I followed proper code patterns (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
  - If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
- 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- 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 followed the guidelines as stated in the Review Guidelines
I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
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
I verified that if a function's arguments changed that all usages have also been updated correctly
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
- If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
- 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(themeColors.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 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web

web9.mov

Mobile Web - Chrome

mWeb9.mp4

Mobile Web - Safari

safari9.mov

Desktop

desktop9.mov

iOS

iOS9.mov

Android

androidNative.mov

melvin-bot · 2023-10-09T13:51:12Z

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

s77rt · 2023-10-09T14:19:57Z

src/pages/ProfilePage.js

@@ -121,7 +121,7 @@ function ProfilePage(props) {
    const phoneNumber = getPhoneNumber(details);
    const phoneOrEmail = isSMSLogin ? getPhoneNumber(details) : login;

-    const isCurrentUser = _.keys(props.loginList).includes(login);


If loginList is not used anywhere remove it from onyx subscription

Thanks. Done.

s77rt · 2023-10-09T14:37:06Z

src/pages/ProfilePage.js

        isLoadingReportData: {
            key: ONYXKEYS.IS_LOADING_REPORT_DATA,
        },
+        session: {


Add session to props

Thank you. Done. Apologies for missing basic things in haste.

s77rt · 2023-10-09T14:39:40Z

src/pages/ProfilePage.js

@@ -121,7 +114,7 @@ function ProfilePage(props) {
    const phoneNumber = getPhoneNumber(details);
    const phoneOrEmail = isSMSLogin ? getPhoneNumber(details) : login;

-    const isCurrentUser = _.keys(props.loginList).includes(login);
+    const isCurrentUser = props.session.accountID === accountID;


Use this same fix for <DetailsPage />

Done but the route param is email so the comparison is done with session.email.

s77rt · 2023-10-09T18:17:39Z

src/pages/DetailsPage.js

@@ -123,7 +122,7 @@ function DetailsPage(props) {
    const phoneNumber = getPhoneNumber(details);
    const phoneOrEmail = isSMSLogin ? getPhoneNumber(details) : details.login;

-    const isCurrentUser = _.keys(props.loginList).includes(details.login);
+    const isCurrentUser = props.session.email === login.toLowerCase();


We should use the account id.

But we can get accountID here only by checking corresponding login in personal details. Here we get only login from URL.

When we login with deeplink, personal details are not loaded immediately so account id is undefined and the check returns false even for same current user and the message button appears briefly.

Not related to this discussion but I made a mistake with the commit name for details Page.

Hmm in that case please revert. We can't compare with session.email because one account can have multiple emails.

Got it. I missed that.

Or wait, currently we are comparing details.login from onyx and not login from route params. So if we just use details.accountID then we won't be introducing a new change (in terms of deep link behavior)

Yea but that does not help in fixing this bug either.
If we get directly from URL then we can get the current user check instantly. But like you said, the primary login may be different so session.email === email from url does not work.
Changing to accountID also has no use in this case. Loginlist and personaldetails are loaded more or less at the same time.

I understand that the change to DetailsPage will fix nothing. but also will break nothing right? I'm suggesting this just for consistency i.e. to have the isCurrentUser always related to the account id

Got it. I will make that change.

s77rt · 2023-10-09T20:34:35Z

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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- 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(themeColors.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 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

Web

web.mov

Mobile Web - Chrome

mweb-chrome.mov

Mobile Web - Safari

mweb-safari.mov

Desktop

desktop.mov

iOS

Android

pecanoro · 2023-10-10T08:46:41Z

Hmm, we got some conflicts 😢

s77rt · 2023-10-10T15:03:00Z

@c3024 Still more conflicts 😅

c3024 · 2023-10-10T15:19:08Z

No more merge conflicts!!

s77rt · 2023-10-10T20:04:57Z

Retested. Still working as expected

OSBotify · 2023-10-11T11:59: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.

OSBotify · 2023-10-13T21:58:02Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 1.3.83-11 🚀

platform	result
🤖 android 🤖	skipped 🚫
🖥 desktop 🖥	skipped 🚫
🍎 iOS 🍎	skipped 🚫
🕸 web 🕸	skipped 🚫

OSBotify · 2023-10-13T22:10:05Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 1.3.83-11 🚀

platform	result
🤖 android 🤖	skipped 🚫
🖥 desktop 🖥	skipped 🚫
🍎 iOS 🍎	skipped 🚫
🕸 web 🕸	skipped 🚫

OSBotify · 2023-10-13T22:26:19Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 1.3.83-11 🚀

platform	result
🤖 android 🤖	skipped 🚫
🖥 desktop 🖥	skipped 🚫
🍎 iOS 🍎	skipped 🚫
🕸 web 🕸	skipped 🚫

OSBotify · 2023-10-13T23:01:43Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 1.3.83-11 🚀

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

check currentUser with accountID

fe2d0e1

c3024 requested a review from a team as a code owner October 9, 2023 13:51

melvin-bot bot requested review from s77rt and removed request for a team October 9, 2023 13:51

s77rt suggested changes Oct 9, 2023

View reviewed changes

remove loginList

fa2f65a

s77rt suggested changes Oct 9, 2023

View reviewed changes

c3024 added 2 commits October 9, 2023 21:10

add session to default props and propTypes

d5506c9

check current user with accountID in DetailsPage

402548b

s77rt suggested changes Oct 9, 2023

View reviewed changes

check currentUser with accountID in DetailsPage

c01b4be

s77rt approved these changes Oct 9, 2023

View reviewed changes

melvin-bot bot requested a review from pecanoro October 9, 2023 20:35

pecanoro previously approved these changes Oct 10, 2023

View reviewed changes

c3024 dismissed pecanoro’s stale review via f2304f9 October 10, 2023 12:29

c3024 force-pushed the 28591-check-currentUser-with-accountID branch from f2304f9 to c01b4be Compare October 10, 2023 12:38

pecanoro previously approved these changes Oct 10, 2023

View reviewed changes

c3024 added 2 commits October 10, 2023 20:37

fix merge conflicts

e36290b

fix merge conflicts

525c50e

c3024 dismissed pecanoro’s stale review via 525c50e October 10, 2023 15:08

pecanoro approved these changes Oct 11, 2023

View reviewed changes

pecanoro merged commit 5f12eee into Expensify:main Oct 11, 2023
14 checks passed

mountiny mentioned this pull request Oct 12, 2023

Deploy Checklist: New Expensify 2023-10-12 #29417

Closed

97 tasks

melvin-bot bot mentioned this pull request Oct 13, 2023

[HOLD for payment 2023-10-23] [$500] Share code - App displays message menu on self profile #28591

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

check currentUser with accountID #29090

check currentUser with accountID #29090

c3024 commented Oct 9, 2023 •

edited

Loading

melvin-bot bot commented Oct 9, 2023

s77rt Oct 9, 2023

c3024 Oct 9, 2023

s77rt Oct 9, 2023

c3024 Oct 9, 2023

s77rt Oct 9, 2023

c3024 Oct 9, 2023

s77rt Oct 9, 2023

c3024 Oct 9, 2023 •

edited

Loading

s77rt Oct 9, 2023

c3024 Oct 9, 2023

s77rt Oct 9, 2023

c3024 Oct 9, 2023

s77rt Oct 9, 2023

c3024 Oct 9, 2023

c3024 Oct 9, 2023

s77rt commented Oct 9, 2023

pecanoro commented Oct 10, 2023

s77rt commented Oct 10, 2023

c3024 commented Oct 10, 2023

s77rt commented Oct 10, 2023

OSBotify commented Oct 11, 2023

OSBotify commented Oct 13, 2023

OSBotify commented Oct 13, 2023

OSBotify commented Oct 13, 2023

OSBotify commented Oct 13, 2023

check currentUser with accountID #29090

check currentUser with accountID #29090

Conversation

c3024 commented Oct 9, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Oct 9, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

c3024 Oct 9, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

s77rt commented Oct 9, 2023

Reviewer Checklist

Screenshots/Videos

pecanoro commented Oct 10, 2023

s77rt commented Oct 10, 2023

c3024 commented Oct 10, 2023

s77rt commented Oct 10, 2023

OSBotify commented Oct 11, 2023

OSBotify commented Oct 13, 2023

OSBotify commented Oct 13, 2023

OSBotify commented Oct 13, 2023

OSBotify commented Oct 13, 2023

c3024 commented Oct 9, 2023 •

edited

Loading

c3024 Oct 9, 2023 •

edited

Loading