Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix User is not navigated to the concierge chat after login on Web #22623

Merged
merged 4 commits into from
Jul 17, 2023

Conversation

hoangzinh
Copy link
Contributor

@hoangzinh hoangzinh commented Jul 11, 2023

Details

Fixed Issues

$ #20885
PROPOSAL: #20885 (comment)

Tests

Test case 1: Navigate to the concierge chat after login

  1. Log out of Expensify
  2. Go to https://staging.new.expensify.com/concierge
  3. Verify that you are taken to the login screen
  4. Log in to any Expensify account
  5. Verify you're navigated to the concierge chat after login

Test case 2: Navigate to the normal report after login

  1. Go to any chat report => Copy the report URL
  2. Go to any other report (to update latest visit report)
  3. Log out of Expensify
  4. Go the report URL that we copied in step 1
  5. Verify that you are taken to the login screen
  6. Log in to any Expensify account
  7. Verify you're navigated to the chat report that we copied in step 1
  • Verify that no errors appear in the JS console

Offline tests

Can't test when network is offline

QA Steps

Same as Tests

  • 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 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
Screen.Recording.2023-07-11.at.17.11.45.-.web.mp4
Mobile Web - Chrome
Screen.Recording.2023-07-11.at.18.01.10.-.android.chrome.mp4
Mobile Web - Safari
Screen.Recording.2023-07-11.at.17.52.44.-.ios.safari.mp4
Desktop

We can't open deeplink on Desktop, there is a bug report here #19581

Screen.Recording.2023-07-11.at.17.30.44.-.desktop.mp4
iOS
Screen.Recording.2023-07-11.at.17.55.21.-.ios.mp4
Android
Screen.Recording.2023-07-11.at.17.59.03.-.android.mp4

@hoangzinh hoangzinh marked this pull request as ready for review July 11, 2023 11:06
@hoangzinh hoangzinh requested a review from a team as a code owner July 11, 2023 11:06
@melvin-bot melvin-bot bot requested review from parasharrajat and removed request for a team July 11, 2023 11:06
@melvin-bot
Copy link

melvin-bot bot commented Jul 11, 2023

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

@hoangzinh
Copy link
Contributor Author

@parasharrajat bump for code review

@@ -509,7 +510,11 @@ function navigateToAndOpenReport(userLogins) {

// We want to pass newChat here because if anything is passed in that param (even an existing chat), we will try to create a chat on the server
openReport(reportID, userLogins, newChat);
Navigation.dismissModal(reportID);
if (shouldDismissModal) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Another method will be check if the lastRoute(navigating from) is present AND of type

case NAVIGATORS.RIGHT_MODAL_NAVIGATOR:
        case NAVIGATORS.FULL_SCREEN_NAVIGATOR:
        case SCREENS.REPORT_ATTACHMENTS:

then call DismissModal, otherwise normal navigation.

we can create a function in Navigation to get the lastRoute and use these conditions to check if navigating from Modal. We can name it like isNavigatingFromModal. Then use it here in the if condition instead of manually passing the param.

What do you say?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's a interesting idea but It might not be a great idea.

  • The more logic we bring, the more effort to maintain and keep it up to date
  • What if somewhere we would like to keep modal but navigate to a report?

So I think we're still fine with an additional flag to give us flexible in all cases, either to dismiss modal before navigate or just navigate to a report.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What if somewhere we would like to keep a modal but navigate to a report?

Why?

@mountiny What do you think?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What if somewhere we would like to keep modal but navigate to a report?

I think this is valid usecase, we would like to navigate to some page under the modal

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok. Thanks.

@parasharrajat
Copy link
Member

Found a bug related to Deeplink but that is also present on main so I will report that to Slack.

Bug: Android: Deeplink does not correctly navigate to the report screen.

Steps:

  1. Open any DM chat.
  2. Click profile on the header.
  3. Now hit a deep link /concierge.
  4. Notice that concierge chat is opened.
  5. Now press the Arrow back on the header.
  6. Notice that user details page shown is shown again.

Expected: That details modal is closed and then the user navigated to concierge chat on deeplink.

@mountiny
Copy link
Contributor

@parasharrajat I dont understand that bug report :D

@parasharrajat
Copy link
Member

parasharrajat commented Jul 13, 2023

@mountiny Does this help?

Screen.Recording.2023-07-14.at.3.53.31.AM.mov

@parasharrajat
Copy link
Member

Bug: iOS: Android: Clicking message concierge pushes a new chat screen over the existing concierge chat.

  1. Open the Chat with Concierge.
  2. Click report header which says Concierge.
  3. Click message Concierge.
  4. Now press back arrow on the Concierge chat screen.
  5. Notice there is another Concierge present.

@mountiny
Copy link
Contributor

@parasharrajat I dont think that is a bug though, that deeplink will not remove the stack and the up button goes to previous page, its like deeplinking to a thread from chat, you should be an option to go back to the chat you came from

@mountiny
Copy link
Contributor

@parasharrajat that one is also not related to this PR is it?

@parasharrajat
Copy link
Member

Second bug is not reproducible on main but this PR.

@hoangzinh
Copy link
Contributor Author

Bug: iOS: Android: Clicking message concierge pushes a new chat screen over the existing concierge chat.

  1. Open the Chat with Concierge.
  2. Click report header which says Concierge.
  3. Click message Concierge.
  4. Now press back arrow on the Concierge chat screen.
  5. Notice there is another Concierge present.

@parasharrajat Thanks for testing everything carefully. I tried to reproduce this bug but I couldn't in IOS. Could you checkout my recording and correct my steps?

Screen.Recording.2023-07-14.at.06.59.15.mp4

@parasharrajat
Copy link
Member

Try this on Android

@hoangzinh
Copy link
Contributor Author

Not reproducible on Android as well

Screen.Recording.2023-07-14.at.08.34.24.mp4

@mountiny
Copy link
Contributor

@parasharrajat bump

@parasharrajat
Copy link
Member

Yes. Will be checking it back in few minutes.

@parasharrajat
Copy link
Member

Retesting now. Sorry for the delay, couldn't do it last Friday.

@parasharrajat
Copy link
Member

It's getting impossible for me to test the Android build. It's very laggy due to some reasons.

@parasharrajat
Copy link
Member

parasharrajat commented Jul 17, 2023

Yes, I tested and it works fine. My bad. I think it might be just cache or something.

@parasharrajat
Copy link
Member

Screenshots

🔲 iOS / native

Screen.Recording.2023-07-17.at.10.24.03.PM.mov

🔲 iOS / Safari

Screen.Recording.2023-07-14.at.2.40.53.AM.mov

🔲 MacOS / Desktop

Screen.Recording.2023-07-14.at.2.43.49.AM.mov

🔲 MacOS / Chrome

Screen.Recording.2023-07-14.at.2.42.25.AM.mov

🔲 Android / Chrome

Screen.Recording.2023-07-17.at.10.25.37.PM.mov

🔲 Android / native

Screen.Recording.2023-07-17.at.9.57.56.PM.mov

Copy link
Member

@parasharrajat parasharrajat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 / Chrome
    • iOS / native
    • iOS / 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 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.

🎀 👀 🎀 C+ reviewed

Copy link
Contributor

@mountiny mountiny left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks everyone!

@mountiny mountiny merged commit f4ab245 into Expensify:main Jul 17, 2023
13 of 19 checks passed
@OSBotify
Copy link
Contributor

✋ 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
Copy link
Contributor

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

platform result
🤖 android 🤖 cancelled 🔪
🖥 desktop 🖥 cancelled 🔪
🍎 iOS 🍎 cancelled 🔪
🕸 web 🕸 cancelled 🔪

@mvtglobally
Copy link

@hoangzinh @parasharrajat @mountiny we are seeing last chat for a sec before concierge is loaded even on incognito. Is it expected? https://github.com/Expensify/App/assets/43995119/8dcc75d9-dc15-4e89-b45f-c97682759b3e

@mountiny
Copy link
Contributor

@mvtglobally I believe that should not be a blocker

@mvtglobally
Copy link

@vitHoracek No need to log as an issue, right?

@mountiny
Copy link
Contributor

Yeah I think this is fine, not sure if we can prevent it, the other option is to show some loader I assume

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/jasperhuangg in version: 1.3.42-26 🚀

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants