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 App does not navigate to last opened public room in small screen devices after Sign in from a public room link #20654

Merged
merged 3 commits into from
Jun 13, 2023

Conversation

hoangzinh
Copy link
Contributor

@hoangzinh hoangzinh commented Jun 13, 2023

Details

Fixed Issues

$ #20586
PROPOSAL: #20586 (comment)

Tests

Go to any Expensify account -> Setup a public room -> Copy the url of public room.

  1. Sign out Expensify or use Incognito
  2. Navigated to a public room using the URL above
  3. Clicked sign up button -> Sign up/in with new user account
  4. Verify that App navigate to the public room after Sign up/in.
  5. Verify that user can see public room in the LHN.
  • Verify that no errors appear in the JS console

Offline tests

Could not test when 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
    • 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-06-13.at.16.05.13.-.web.mp4
Mobile Web - Chrome
Screen.Recording.2023-06-13.at.16.01.46.-.android.chrome.mov
Mobile Web - Safari
Screen.Recording.2023-06-13.at.17.33.14.-.ios.-.safari.mov
Desktop
Screen.Recording.2023-06-13.at.18.01.18.-.desktop.mp4
iOS

In order to open public room in IOS native app, you need to close app completely
https://github.com/Expensify/App/assets/9639873/c30594cb-576b-414b-b175-d9f2d0571934

Android

In order to open public room in Android native app, you need to close app completely
https://github.com/Expensify/App/assets/9639873/7c943e68-4426-4639-bb36-5f33c569e67a

@hoangzinh hoangzinh changed the title Fix App does not navigate to last opened public room in small screen devices after Sign in Fix App does not navigate to last opened public room in small screen devices after Sign in from a public room link Jun 13, 2023
@mountiny
Copy link
Contributor

tagging @WoLewicki and @adamgrzybowski for a review.

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.

Code looks fine @hoangzinh does it test well?

*
* @param {String} lastOpenedPublicRoomID
*/
function navigateToLastOpenedPublicRoom(lastOpenedPublicRoomID) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe we could name it this way since it lives in the Report actions file.

Suggested change
function navigateToLastOpenedPublicRoom(lastOpenedPublicRoomID) {
function openLastOpenedPublicRoom(lastOpenedPublicRoomID) {

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for suggestion @mountiny . I updated the PR according to suggestion above.

Copy link
Contributor

@WoLewicki WoLewicki left a comment

Choose a reason for hiding this comment

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

The main difference is that ReportScreenWrapper is mounted for each report, so my question is why was this logic in that component in the first place? Should those check be run each time the user opens a report? I would also strongly recommend testing it on both wide and small screens. Another thing to test would be starting on small screen and then making it wide and the other way round (easiest to do on web).

@hoangzinh
Copy link
Contributor Author

@mountiny I'm recording the video for all platforms. So far so good, except desktop, I couldn't open public room in Desktop app when not signed in.

@mountiny
Copy link
Contributor

I couldn't open public room in Desktop app when not signed in.

I believe this is fine

@hoangzinh
Copy link
Contributor Author

The main difference is that ReportScreenWrapper is mounted for each report, so my question is why was this logic in that component in the first place? Should those check be run each time the user opens a report?

@WoLewicki good question btw. I'm not really too. But when it's mounted in the 1st time, if there is a lastOpenedPublicRoomID in Onyx, we will clear that key before open that report. So it's one-time trigger, not relevant to how many times the ReportScreenWrapper mounted, if we opened the lastOpenedPublicRoom, it would runs only once.

@hoangzinh
Copy link
Contributor Author

I would also strongly recommend testing it on both wide and small screens

Pretty sure, the PR checklist need to recording/screenshot for all platforms including Web/mWeb/native app so it will cover wide and small screens cases

@mountiny
Copy link
Contributor

Ok confirmed both of these PRs mentioned Desktop in dev does not work yet so its all good

#19866
#18293

@aptgrzybowski
Copy link

Hey, @hoangzinh This looks quite good!

Have you tried to switch between a wide and narrow layout? I am wondering if the way how we handle resizing could break something here

@mountiny mountiny requested a review from allroundexperts June 13, 2023 10:36
@mountiny
Copy link
Contributor

@allroundexperts would you be bale to jump in on testing and checklist of this one sooner than later? thanks!

@allroundexperts
Copy link
Contributor

@allroundexperts would you be bale to jump in on testing and checklist of this one sooner than later? thanks!

Sure @mountiny!

@hoangzinh
Copy link
Contributor Author

Have you tried to switch between a wide and narrow layout? I am wondering if the way how we handle resizing could break something here

@aptgrzybowski I'm appreciated if you can give me test steps with above scenarios so we're in same page. Otherwise, do you agree with test steps below?

  1. In web, sign out Expensify.
  2. Open a public room via URL
  3. Click in Sign in button
  4. Try to resize to small screen
  5. Sign in with your account
  6. Verify it can open public room after sign in (also user can see that public room in LHN)

@allroundexperts
Copy link
Contributor

allroundexperts commented Jun 13, 2023

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.

Screenshots/Videos

Web
screen-recording-2023-06-13-at-41023-pm_93WNpOwo.mp4
Mobile Web - Chrome
screen-recording-2023-06-13-at-41813-pm_pRZ9gVDs.mp4
Mobile Web - Safari
screen-recording-2023-06-13-at-41556-pm_hfGzA5FK.mp4
Desktop
screen-recording-2023-06-13-at-41249-pm_mCeH4wnf.1.mp4
iOS
screen-recording-2023-06-13-at-43129-pm_Bf7eFhjT.mp4
Android

*/
function openLastOpenedPublicRoom(lastOpenedPublicRoomID) {
Navigation.isNavigationReady().then(() => {
setLastOpenedPublicRoom('');
Copy link
Contributor

Choose a reason for hiding this comment

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

Why is this needed? Shouldn't the value remain the same?

Copy link
Contributor Author

@hoangzinh hoangzinh Jun 13, 2023

Choose a reason for hiding this comment

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

I copied from the old logic. But I think it makes sense if we want it trigger only 1 time. That means if we already visit the public room after sign in, then we refresh the page, it won't trigger again.

@adamgrzybowski
Copy link
Contributor

adamgrzybowski commented Jun 13, 2023

@hoangzinh
I would add resizing at the end of the test steps.

My main concern was the fact that componentDidMount in AuthScreens is triggered after changing the layout. But if this.props.lastOpenedPublicRoomID is cleared after Report.openLastOpenedPublicRoom(this.props.lastOpenedPublicRoomID) then it should work.

EDIT: And I guess that's the part responsible for clearing this prop setLastOpenedPublicRoom('');. But I am not sure how this is exactly working 😄 so please correct me if I understand that wrong

@allroundexperts
Copy link
Contributor

allroundexperts commented Jun 13, 2023

g the video for all platforms. So far so good, except desktop, I couldn't open public room in Desktop app when not signed in.

@hoangzinh Just open the console (CMD+I) and run a window.location.href = 'http://localhost:8080/r/public_room_id'

@hoangzinh
Copy link
Contributor Author

@adamgrzybowski here is the recording for you

Screen.Recording.2023-06-13.at.17.54.07.mp4

@hoangzinh hoangzinh marked this pull request as ready for review June 13, 2023 11:03
@hoangzinh hoangzinh requested a review from a team as a code owner June 13, 2023 11:03
@melvin-bot melvin-bot bot requested review from allroundexperts and marcochavezf and removed request for a team June 13, 2023 11:03
@melvin-bot
Copy link

melvin-bot bot commented Jun 13, 2023

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

@mountiny
Copy link
Contributor

@hoangzinh thanks for checking that scenario as well!

@allroundexperts

This comment was marked as resolved.

@allroundexperts
Copy link
Contributor

^ same experience, what I did is I close native app completely then open App via deep link

This does work for iOS but on Android, I did not have any luck.

Copy link
Contributor

@allroundexperts allroundexperts left a comment

Choose a reason for hiding this comment

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

This tests well. @mountiny I think we can merge it without the Android native screen recording because its very difficult to open the public room via deep link in Android. Probably we should also create a ticket to investigate why deep links aren't working the way they should on native platforms for public rooms.

@mountiny
Copy link
Contributor

@marcochavezf can you handle this one please?

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 @marcochavezf I think we should look into the problem with the native deeplink

@hoangzinh
Copy link
Contributor Author

fyi, Native deeplink can be fixed in this GH issue #20412
But for the warning. I'm not sure if it can be fixed to by above issue. I think we need to find another fix.

@hoangzinh
Copy link
Contributor Author

there are other 2 console.log errors when visit public room link (reproduce in all platforms) as reported by @allroundexperts here #20654 (comment)

Although it's reported but it's closed too #20388.


So to summary, as far as I know, current we have 4 issues related to open public room link when user is not signed in:

@github-actions
Copy link
Contributor

⚠️ ⚠️ Heads up! This pull request has the CP Staging label ⚠️ ⚠️
If you applied the CP Staging label before the PR was merged, the PR will be be immediately deployed to staging even if the open StagingDeployCash deploy checklist is locked.
However if you applied the CP Staging after the PR was merged it's possible it won't be CP'ed automatically. If you need it to be CP'ed to staging, tag a member of @Expensify/mobile-deployers to CP it manually, otherwise you can wait for it to go out with the next deploy.

@marcochavezf
Copy link
Contributor

Hi guys, catching up here.

Regarding all the logic related to lastOpenedPublicRoomID, that will be removed eventually in an upcoming backend change that we're currently working on.

And I agree that the deep link problem would be fixed in the other GH issue. I will check off the Android testing so the GH actions can pass.

@marcochavezf
Copy link
Contributor

Applying CP Staging here as this must be in production by EOW

@marcochavezf marcochavezf merged commit 2950c92 into Expensify:main Jun 13, 2023
@marcochavezf
Copy link
Contributor

Btw, related to the personalDetailsList, I think I've seen that error once, but I found it hard to reproduce it, and I believe it's a backend error that's inserting that value in a bad format via Onyx. @allroundexperts can you reproduce that error consistently? If so, what are the specific steps to reproduce it?

OSBotify pushed a commit that referenced this pull request Jun 13, 2023
Fix App does not navigate to last opened public room in small screen devices after Sign in from a public room link

(cherry picked from commit 2950c92)
OSBotify added a commit that referenced this pull request Jun 13, 2023
@OSBotify
Copy link
Contributor

🚀 Cherry-picked to staging by https://github.com/marcochavezf in version: 1.3.27-6 🚀

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

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

@allroundexperts
Copy link
Contributor

allroundexperts commented Jun 13, 2023

Btw, related to the personalDetailsList, I think I've seen that error once, but I found it hard to reproduce it, and I believe it's a backend error that's inserting that value in a bad format via Onyx. @allroundexperts can you reproduce that error consistently? If so, what are the specific steps to reproduce it?

@marcochavezf It's very easy to reproduce actually. Here are the steps.

  1. Run the app on iOS simulator and logout of any account you're logged into.
  2. Close the app by clearing it out of the memory.
  3. Open Safari and enter a URL of any public room (eg https://staging.new.expensify.com/r/8813851443373010)
  4. Once opened, at the top of the page, you'll see an option to open it in Expensify App.
  5. Click that button and once the public room opens, you'll see both the warnings appear in about 5 seconds.
Screen.Recording.2023-06-14.at.4.48.53.AM.mov

@mvtglobally
Copy link

@hoangzinh @mountiny @allroundexperts We are facing few issues with this PR
Unable get page with sign in on Desktop App. It login with user which was on Web.
https://github.com/Expensify/App/assets/43995119/5bc68917-5250-459d-8ed4-3fc6c7603582

When we use deeplink on Native apps It does not work as expected. We don’t see the room on LHN

RPReplay_Final1686709378.mp4

@mountiny
Copy link
Contributor

asked in slack

@marcochavezf
Copy link
Contributor

@hoangzinh @mountiny @allroundexperts We are facing few issues with this PR Unable get page with sign in on Desktop App. It login with user which was on Web. https://github.com/Expensify/App/assets/43995119/5bc68917-5250-459d-8ed4-3fc6c7603582

When we use deeplink on Native apps It does not work as expected. We don’t see the room on LHN

RPReplay_Final1686709378.mp4

A fix for this is being worked here. We should re-test when that PR is done.

@marcochavezf
Copy link
Contributor

@mvtglobally coming from this convo, this shouldn't be a deploy blocker, since the deeplink issue will be fixed in the PR linked in my comment above. Also, the anonymous user can't sign-in on desktop (I will create an issue for that).

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/AndrewGable in version: 1.3.27-7 🚀

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

@OSBotify
Copy link
Contributor

🚀 Cherry-picked to staging by https://github.com/AndrewGable in version: 1.3.28-2 🚀

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

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/AndrewGable in version: 1.3.28-5 🚀

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

1 similar comment
@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/AndrewGable in version: 1.3.28-5 🚀

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.

9 participants