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

Redirect user to concierge when onboarding completed #42087

Merged
merged 14 commits into from
May 30, 2024

Conversation

skyweb331
Copy link
Contributor

@skyweb331 skyweb331 commented May 13, 2024

Details

Redirect where user was when they try to deeplink to the onboarding flow after completion

Fixed Issues

$ #40876
PROPOSAL: #40876 (comment)

Tests

  1. Complete the onboarding steps for current login.
  2. Try to visit onboarding url, https://dev.new.expensify.com:8082/onboarding, via deeplink or directly
  3. Should be redirected to concierge page.
  • Verify that no errors appear in the JS console

Offline tests

If user already completed onboarding steps, https://staging.new.expensify.com/onboarding should be redirected to concierge page.
If not, this will not work, because onboarding completion status comes from Backend.

QA Steps

  1. Complete the onboarding steps for current login.
  2. Try to visit onboarding url, https://staging.new.expensify.com/onboarding, via deeplink or directly
  3. Should be redirected to concierge page.
  • 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
android-mweb.mov
iOS: Native
IOS.mov
iOS: mWeb Safari
ios-mweb.mov
MacOS: Chrome / Safari
mac-chrome.mov
MacOS: Desktop
electron.mov

@skyweb331 skyweb331 requested a review from a team as a code owner May 13, 2024 16:17
@melvin-bot melvin-bot bot requested review from c3024 and removed request for a team May 13, 2024 16:17
Copy link

melvin-bot bot commented May 13, 2024

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

Copy link
Contributor

github-actions bot commented May 13, 2024

CLA Assistant Lite bot All contributors have signed the CLA ✍️ ✅

@skyweb331
Copy link
Contributor Author

I have read the CLA Document and I hereby sign the CLA

@c3024
Copy link
Contributor

c3024 commented May 14, 2024

The modal appears and after loading is complete it disappears.

onboardindModalAppearsBriefly.mp4

Can we change this to not show the modal at all for already onboarded users?

@skyweb331
Copy link
Contributor Author

@c3024 I will look into this. BTW, this behavior depends on nvp_onboarding.hasCompletedGuidedSetupFlow so if current user session still in receiving this state, modal will be visible...

To solve this,

  1. Set nvp_onboarding.hasCompletedGuidedSetupFlow as true optimistically ( as most current users are already completed onboarding), so every users will be redirected to concierge by default.
  2. For non-completed users, once BE sends false for this value, I will redirect the user to onboarding page.

Let me know your thoughts on this.

@c3024
Copy link
Contributor

c3024 commented May 14, 2024

I agree.

We are showing the modal only after this promise is resolved here as well so it should be fine.

isOnboardingFlowStatusKnownPromise.then(() => {

@skyweb331
Copy link
Contributor Author

@c3024 I set onboarding status completed as initial.

@@ -45,4 +61,9 @@ function OnboardingModalNavigator() {

OnboardingModalNavigator.displayName = 'OnboardingModalNavigator';

export default OnboardingModalNavigator;
export default withOnyx<OnboardingModalNavigatorProps, OnboardingModalNavigatorProps>({
Copy link
Contributor

Choose a reason for hiding this comment

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

useOnyx is preferred to withOnyx HOC. Could you change it?

Comment on lines 33 to 34
// eslint-disable-next-line react/jsx-no-useless-fragment
return <></>;
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
// eslint-disable-next-line react/jsx-no-useless-fragment
return <></>;
return null;

Copy link
Contributor Author

Choose a reason for hiding this comment

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

For me, when I test it on IOS and android, return null throws some errors. That's why I put Fragment. Need to test again though.

@@ -108,6 +109,7 @@ export type {
MapboxAccessToken,
Modal,
Network,
Onboarding,
Copy link
Contributor

Choose a reason for hiding this comment

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

What is this for? I don't see this export from this file being used anywhere.

const styles = useThemeStyles();
const {shouldUseNarrowLayout} = useOnboardingLayout();

if (hasCompletedGuidedSetupFlow) {
Navigation.goBack();
Report.navigateToConciergeChat();
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
Report.navigateToConciergeChat();

I think just going back without redirecting to Concierge is better. Let me know if there are any edge cases in which redirecting to Concierge is useful.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suppose you are in a report and clicked https://dev.new.expensify.com:8082/onboarding link in a message. In this case, if there's only goBack, it will redirect user to onboarding first and then will go back to the current report. So need to redirect user to Concierge again.

What if there's only one Concierge redirect? If so, user will be redirect to concierge on deep link click, but if he clicks go back in the browser, it will redirect user to onbarding and then onboarding will redirect user back to concierge, so user can not go back... so these two actions are required and it will remove onboarding from route history...

Comment on lines 26 to 31
if (hasCompletedGuidedSetupFlow) {
Navigation.goBack();
Report.navigateToConciergeChat();
// eslint-disable-next-line react/jsx-no-useless-fragment
return null;
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
if (hasCompletedGuidedSetupFlow) {
Navigation.goBack();
Report.navigateToConciergeChat();
// eslint-disable-next-line react/jsx-no-useless-fragment
return null;
}
useEffect(() => {
if (hasCompletedGuidedSetupFlow) {
Navigation.goBack();
Report.navigateToConciergeChat();
}
}, [hasCompletedGuidedSetupFlow]);
if (hasCompletedGuidedSetupFlow) {
return null;
}

Is this the error you found in native apps?

ERROR Warning: Cannot update a component (ForwardRef(BaseNavigationContainer)) while rendering a different component (OnboardingModalNavigator). To locate the bad setState() call inside OnboardingModalNavigator, follow the stack trace as described in https://react.dev/link/setstate-in-render

I think this is due to using navigation while rendering. So we need to move it to a useEffect.

@skyweb331
Copy link
Contributor Author

@c3024 Thanks for your professional review. Just pushed the fixes as you guided.

Comment on lines 33 to 34
Navigation.goBack();
Report.navigateToConciergeChat();
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
Navigation.goBack();
Report.navigateToConciergeChat();
Navigation.isNavigationReady().then(() => {
Navigation.goBack();
Report.navigateToConciergeChat();
}
navigatorNotReady.mp4

I see the navigator is not ready when navigating to these routes. So, it goes back to onboarding again as seen in the video.

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 thought, this component is defined in Route, so navigation should be ready already...Pushed fix as you mentioned

@c3024
Copy link
Contributor

c3024 commented May 17, 2024

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
onboardingRedirectAndroid.mp4
Android: mWeb Chrome
onboardingRedirectAndroidChrome.mp4
iOS: Native
onboardingRedirectiOS.mp4
iOS: mWeb Safari
onboardingRedirectiOSSafari.mp4
MacOS: Chrome / Safari
onboardingRedirectChrome-compressed.mp4
MacOS: Desktop
onboardingRedirectDesktop.mp4

Copy link
Contributor

@c3024 c3024 left a comment

Choose a reason for hiding this comment

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

LGTM

@melvin-bot melvin-bot bot requested a review from mountiny May 17, 2024 09:30
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.

This works for me, but we need to make sure all the other places in the Ap pare updated to work with removing the [] empty array style

src/ONYXKEYS.ts Outdated
@@ -578,7 +578,7 @@ type OnyxValuesMapping = {
[ONYXKEYS.ACCOUNT]: OnyxTypes.Account;
[ONYXKEYS.ACCOUNT_MANAGER_REPORT_ID]: string;
[ONYXKEYS.NVP_IS_FIRST_TIME_NEW_EXPENSIFY_USER]: boolean;
[ONYXKEYS.NVP_ONBOARDING]: Onboarding | [];
[ONYXKEYS.NVP_ONBOARDING]: Onboarding;
Copy link
Contributor

Choose a reason for hiding this comment

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

Why did we change the type? for old accounts the nvp is an empty array so I think we need to keep this

@skyweb331
Copy link
Contributor Author

@mountiny Done.

@c3024
Copy link
Contributor

c3024 commented May 28, 2024

@skyweb331

Please move this

    if (hasCompletedGuidedSetupFlow) {
        return null;
    }

in OnboardingModalNavigator below the newly added hooks.

Hooks should not be added below null return.

Lint is failing.

There is a prettier difference as well.

Please run npm run prettier and npm run lint and fix errors (if any) every time before committing.

mountiny
mountiny previously approved these changes May 28, 2024
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!

@mountiny
Copy link
Contributor

@skyweb331 please address the feedback whenever you can, thanks!

@skyweb331
Copy link
Contributor Author

@c3024 Sorry for wrong merging. I will run npm run prettier && npm run lint every time.

@@ -40,10 +40,6 @@ function OnboardingModalNavigator() {
});
}, [hasCompletedGuidedSetupFlow]);

if (hasCompletedGuidedSetupFlow) {
Copy link
Contributor

Choose a reason for hiding this comment

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

This should not be removed. Otherwise there is a flash of the onboarding modal like this.

onboardModalFlash.mp4

This should just be moved below the useKeyboardShortcut hook.

@skyweb331
Copy link
Contributor Author

@c3024 Done.

mountiny
mountiny previously approved these changes May 28, 2024
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

@mountiny
Copy link
Contributor

@c3024 can you please approve if all looks good for you. I think the comments were addressed but nowhere to rush

Comment on lines 51 to 52
if (!hasCompletedGuidedSetupFlow) {
return;
Copy link
Contributor

@c3024 c3024 May 29, 2024

Choose a reason for hiding this comment

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

Suggested change
if (!hasCompletedGuidedSetupFlow) {
return;
if (hasCompletedGuidedSetupFlow) {
return null;

@skyweb331

Why did you change to negation here for hasCompletedGuidedSetupFlow?

Why is null omitted here? Returning undefined is not allowed for React components. You should explicitly return null.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@c3024 Done. Thanks for your great point out.

Copy link
Contributor

@c3024 c3024 left a comment

Choose a reason for hiding this comment

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

Tests well. LGTM!

onboardingChrome.mp4

@melvin-bot melvin-bot bot requested a review from mountiny May 29, 2024 10:07
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

@mountiny mountiny merged commit a628b89 into Expensify:main May 30, 2024
18 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

OSBotify commented Jun 6, 2024

🚀 Deployed to production by https://github.com/Julesssss in version: 1.4.79-11 🚀

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

@skyweb331 skyweb331 deleted the onboarding branch June 21, 2024 14:21
@@ -20,6 +24,21 @@ const Stack = createStackNavigator<OnboardingModalNavigatorParamList>();
function OnboardingModalNavigator() {
const styles = useThemeStyles();
const {shouldUseNarrowLayout} = useOnboardingLayout();
const [hasCompletedGuidedSetupFlow] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {
selector: (onboarding) => !Array.isArray(onboarding) && (onboarding?.hasCompletedGuidedSetupFlow ?? true),
Copy link
Contributor

Choose a reason for hiding this comment

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

This line caused this issue: #43561
More detail in this comment

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You mean, empty array means onboarding completed?

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah, thats a mistake. When the hasCompleted property is not defined it means the onboarding was completed given its old user and we do not want to show them the flow in that case

Copy link
Contributor Author

Choose a reason for hiding this comment

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

As far as I remember, nvp_onbarding was empty array for new users in NewDot, which means, array indicates onboarding is not completed...
Is there any backend changes for this?

Copy link
Contributor

Choose a reason for hiding this comment

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

Hmm, it should not be an empty array for new users. That is the case only for users that had account in OldDot before

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.

5 participants