Fix user is navigated to previous deeplink when re-login #47829

bernhardoj · 2024-08-22T01:37:43Z

Details

When we do a deeplink, we connect to the onboarding onyx. When we relogin, the onyx callback is triggered which trigger the deeplink again. This PR fix it.

Fixed Issues

$ #47428
PROPOSAL: #47428 (comment)

Tests

Same as QA Steps

Verify that no errors appear in the JS console

Offline tests

Same as QA Steps

QA Steps

Log out
Deeplink or open staging.new.expensify.com/settings
Login
Verify you are navigated to the settings page
Log out
Login again
Verify you stay at LHN/Home

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: mWeb Chrome
- iOS: Native
- iOS: mWeb 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 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 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 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.
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.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

ios.mp4

iOS: mWeb Safari

ios.mweb.mp4

MacOS: Chrome / Safari

web.mp4

MacOS: Desktop

desktop.mp4

bernhardoj · 2024-08-22T01:39:28Z

Got this issue when trying to record for android mWeb

DylanDylann · 2024-08-22T08:55:45Z

src/libs/actions/Report.ts

@@ -2713,6 +2713,7 @@ function openReportFromDeepLink(url: string) {
                            return;
                        }

+                        Onyx.disconnect(connectionID);


@bernhardoj I think we should disconnect after the navigate function. Is there any problem with that?

It shouldn't matter whether we call it before or after. Disconnecting it won't cancel the navigation. In fact, I was thinking whether we should disconnect it earlier or not. For example, if the user is anonymous and trying to access deep link, we return early and redirect them to the sign-in modal and the connection is still there, so when the onboarding onyx data changes, the deep link logic is triggered again. I think this applies to every early return inside the logic, but I haven't tested it yet though.

App/src/libs/actions/Report.ts

Lines 2677 to 2684 in 156f0a2

Onyx.connect({

key: ONYXKEYS.NVP_ONBOARDING,

callback: (onboarding) => {

Navigation.waitForProtectedRoutes().then(() => {

if (route && Session.isAnonymousUser() && !Session.canAnonymousUserAccessRoute(route)) {

Session.signOutAndRedirectToSignIn(true);

return;

}

if (onboarding) { Onyx.disconnect(...); }

Yeah, let's move this to the top of the callback please and add a comment explaining why it's important to disconnect.

DylanDylann · 2024-08-22T09:11:42Z

BUG: Infinity loading in the second login

Screen.Recording.2024-08-22.at.16.09.21.mov

…login

bernhardoj · 2024-08-23T05:38:02Z

@DylanDylann I just tested and it happens on main too simply by doing the 2nd login without any deep link.

Looks like it happens after #45372. We call findLastAccessedReport if the report screen doesn't have a reportID yet, but when we sign in, the onboarding data isn't ready yet, so !Array.isArray(onboarding) && !onboarding?.hasCompletedGuidedSetupFlow is always true.

App/src/libs/ReportUtils.ts

Lines 1287 to 1289 in 156f0a2

    
           if (!getIsSmallScreenWidth() && !Array.isArray(onboarding) && !onboarding?.hasCompletedGuidedSetupFlow) { 
        
               return reportsValues.find(isChatUsedForOnboarding); 
        
           }

We call findLastAccessedReport inside this effect which depends on activeWorkspaceID, canUseDefaultRooms, navigation, route, finishedLoadingApp and in this case, even though the app has finished loading, the onboarding data isn't updated yet.

App/src/pages/home/ReportScreen.tsx

Lines 149 to 159 in 156f0a2

    
               const lastAccessedReportID = ReportUtils.findLastAccessedReport(!canUseDefaultRooms, !!route.params.openOnAdminRoom, activeWorkspaceID)?.reportID; 
        
               // It's possible that reports aren't fully loaded yet 
        
               // in that case the reportID is undefined 
        
               if (!lastAccessedReportID) { 
        
                   return; 
        
               } 
        
               Log.info(`[ReportScreen] no reportID found in params, setting it to lastAccessedReportID: ${lastAccessedReportID}`); 
        
               navigation.setParams({reportID: lastAccessedReportID}); 
        
           }, [activeWorkspaceID, canUseDefaultRooms, navigation, route, finishedLoadingApp]);

DylanDylann · 2024-08-26T08:40:04Z

Ahh see, Just bring this to the original issue

DylanDylann · 2024-08-26T08:41:53Z

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 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.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(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.
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.2024-08-26.at.15.53.51.mov

Android: mWeb Chrome

Screen.Recording.2024-08-26.at.15.47.21.mov

iOS: Native

Screen.Recording.2024-08-26.at.15.55.00.mov

iOS: mWeb Safari

Screen.Recording.2024-08-26.at.15.45.46.mov

MacOS: Chrome / Safari

Screen.Recording.2024-08-26.at.15.43.51.mov

MacOS: Desktop

Screen.Recording.2024-08-26.at.15.50.00.mp4

neil-marcellini

Looks good, let's do one little tweak that you mentioned.

neil-marcellini · 2024-08-26T19:46:10Z

src/libs/actions/Report.ts

@@ -2713,6 +2713,7 @@ function openReportFromDeepLink(url: string) {
                            return;
                        }

+                        Onyx.disconnect(connectionID);


Yeah, let's move this to the top of the callback please and add a comment explaining why it's important to disconnect.

…login

OSBotify · 2024-08-27T18:06:48Z

✋ 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 · 2024-08-28T21:45:13Z

🚀 Deployed to staging by https://github.com/neil-marcellini in version: 9.0.26-1 🚀

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

OSBotify · 2024-08-30T18:33:40Z

🚀 Deployed to production by https://github.com/puneetlath in version: 9.0.26-6 🚀

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

allroundexperts · 2024-10-20T22:14:15Z

src/libs/actions/Report.ts

+                    if (onboarding) {
+                        // Once the onboarding data is available, we want to disconnect the connection
+                        // so it won't trigger the deeplink again every time the data is changed, for example, when relogin.
+                        Onyx.disconnect(connection);
+                    }


We're disconnecting onyx before the onboarding is complete. This caused #48475.

disconnect from onboarding onyx once navigated to the deep link

6aa1dcf

bernhardoj requested a review from a team as a code owner August 22, 2024 01:37

DylanDylann reviewed Aug 22, 2024

View reviewed changes

Merge branch 'main' into fix/47428-user-navigated-to-deeplink-when-re…

06fba40

…login

DylanDylann approved these changes Aug 26, 2024

View reviewed changes

melvin-bot bot requested a review from neil-marcellini August 26, 2024 09:11

neil-marcellini requested changes Aug 26, 2024

View reviewed changes

bernhardoj added 2 commits August 27, 2024 12:19

Merge branch 'main' into fix/47428-user-navigated-to-deeplink-when-re…

138bbc6

…login

disconnect it earlier

a32c06b

DylanDylann approved these changes Aug 27, 2024

View reviewed changes

melvin-bot bot requested a review from neil-marcellini August 27, 2024 04:42

neil-marcellini approved these changes Aug 27, 2024

View reviewed changes

neil-marcellini merged commit 1d72155 into Expensify:main Aug 27, 2024
17 checks passed

github-actions bot mentioned this pull request Aug 28, 2024

Deploy Checklist: New Expensify 2024-08-28 #48221

Closed

93 tasks

CyberAndrii mentioned this pull request Sep 8, 2024

[HOLD for payment 2024-10-16] [$250] Sign in – Concierge chat does not open via deeplink when logging in with a new account #48475

Closed

6 tasks

allroundexperts reviewed Oct 20, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix user is navigated to previous deeplink when re-login #47829

Fix user is navigated to previous deeplink when re-login #47829

bernhardoj commented Aug 22, 2024

bernhardoj commented Aug 22, 2024

DylanDylann Aug 22, 2024

bernhardoj Aug 23, 2024

neil-marcellini Aug 26, 2024

bernhardoj Aug 27, 2024

DylanDylann commented Aug 22, 2024

bernhardoj commented Aug 23, 2024

DylanDylann commented Aug 26, 2024

DylanDylann commented Aug 26, 2024 •

edited

Loading

neil-marcellini left a comment

neil-marcellini Aug 26, 2024

OSBotify commented Aug 27, 2024

OSBotify commented Aug 28, 2024

OSBotify commented Aug 30, 2024

allroundexperts Oct 20, 2024

	Onyx.connect({
	key: ONYXKEYS.NVP_ONBOARDING,
	callback: (onboarding) => {
	Navigation.waitForProtectedRoutes().then(() => {
	if (route && Session.isAnonymousUser() && !Session.canAnonymousUserAccessRoute(route)) {
	Session.signOutAndRedirectToSignIn(true);
	return;
	}

Fix user is navigated to previous deeplink when re-login #47829

Fix user is navigated to previous deeplink when re-login #47829

Conversation

bernhardoj commented Aug 22, 2024

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

bernhardoj commented Aug 22, 2024

DylanDylann Aug 22, 2024

Choose a reason for hiding this comment

bernhardoj Aug 23, 2024

Choose a reason for hiding this comment

neil-marcellini Aug 26, 2024

Choose a reason for hiding this comment

bernhardoj Aug 27, 2024

Choose a reason for hiding this comment

DylanDylann commented Aug 22, 2024

bernhardoj commented Aug 23, 2024

DylanDylann commented Aug 26, 2024

DylanDylann commented Aug 26, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

neil-marcellini left a comment

Choose a reason for hiding this comment

neil-marcellini Aug 26, 2024

Choose a reason for hiding this comment

OSBotify commented Aug 27, 2024

OSBotify commented Aug 28, 2024

OSBotify commented Aug 30, 2024

allroundexperts Oct 20, 2024

Choose a reason for hiding this comment

DylanDylann commented Aug 26, 2024 •

edited

Loading