Mark the tour task as complete on redirecting to Concierge after finishing the Navattic tour #54824

c3024 · 2025-01-06T17:37:50Z

Explanation of Change

We mark the tour task as complete when a user returns to Concierge after completing the Navattic tour.

Fixed Issues

$ #54815
PROPOSAL: https://expensify.slack.com/archives/C049HHMV9SM/p1736181461150769?thread_ts=1733762276.555629&cid=C049HHMV9SM

Tests

Login with a new account.
Choose any onboarding intent except "Something else".
Go to Concierge or #admins room and click on the "Take a 2 minute tour" task.
Click on the tour link in the tour description.
Complete the Navattic tour.
Verify that the tour task is marked as complete on redirect to Concierge after completing the tour.

Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

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: 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 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 used JaimeGPT to get English > Spanish translation. I then posted it 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.ts 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.
I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
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: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2025-01-06.at.11.04.45.PM.mov

MacOS: Desktop

melvin-bot · 2025-01-06T17:37:55Z

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

github-actions · 2025-01-06T20:49:06Z

🚧 @mountiny has triggered a test build. You can view the workflow run here.

github-actions · 2025-01-06T21:13:39Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/54824/index.html	https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/54824/index.html

Desktop 💻	Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/54824/NewExpensify.dmg	https://54824.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

rushatgabhane · 2025-01-07T14:34:32Z

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 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.ts 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.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
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

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

Screen.Recording.2025-01-07.at.23.13.52.mov

MacOS: Chrome / Safari

Screen.Recording.2025-01-07.at.22.52.55.mov

MacOS: Desktop

rushatgabhane · 2025-01-07T17:36:19Z

src/pages/ConciergePage.tsx

+
+                    // Mark the viewTourTask as complete if we are redirected to Concierge after finishing the Navattic tour
+                    const {navattic} = route.params as {navattic?: string};
+                    if (navattic === 'completed') {


NAB: put this in CONST

rushatgabhane

@mountiny just noting that we'll have to add the param in navattic's redirect url

mountiny

The url should already include the query param, do you not get it?

mountiny · 2025-01-07T20:25:02Z

src/pages/ConciergePage.tsx

+
+                    // Mark the viewTourTask as complete if we are redirected to Concierge after finishing the Navattic tour
+                    const {navattic} = route.params as {navattic?: string};
+                    if (navattic === 'completed') {


c3024 · 2025-01-08T16:08:43Z

Pushed the changes.

mountiny

Great, thank you!

OSBotify · 2025-01-08T18:57:04Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

github-actions · 2025-01-10T03:58:13Z

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

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

izarutskaya · 2025-01-10T10:43:13Z

@c3024 Failing with original KI #54815

https://platform.applause.com/services/links/v1/external/52fbeb6783a8891e081668e23f6e02c5ace662471ab575e251e88a69253c88ce

github-actions · 2025-01-11T03:25:59Z

🚀 Deployed to production by https://github.com/thienlnam in version: 9.0.83-5 🚀

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

github-actions · 2025-01-13T13:59:20Z

🚀 Deployed to production by https://github.com/thienlnam in version: 9.0.83-5 🚀

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

parasharrajat · 2025-01-19T11:12:39Z

src/pages/ConciergePage.tsx

@@ -32,12 +39,22 @@ function ConciergePage() {
                    if (isUnmounted.current || isLoadingReportData === undefined || !!isLoadingReportData) {
                        return;
                    }
+
+                    // Mark the viewTourTask as complete if we are redirected to Concierge after finishing the Navattic tour
+                    const {navattic} = route.params as {navattic?: string};


This caused a regression #55054

complete tour task on redirect from navattic tour

a9f5358

c3024 requested a review from a team as a code owner January 6, 2025 17:37

melvin-bot bot requested review from rushatgabhane and removed request for a team January 6, 2025 17:37

lint

0ae7f08

mountiny assigned c3024 Jan 6, 2025

mountiny added the Ready To Build label Jan 6, 2025

mountiny self-requested a review January 6, 2025 21:04

rushatgabhane reviewed Jan 7, 2025

View reviewed changes

rushatgabhane approved these changes Jan 7, 2025

View reviewed changes

mountiny reviewed Jan 7, 2025

View reviewed changes

move completed to CONST

ffc68dc

mountiny approved these changes Jan 8, 2025

View reviewed changes

mountiny merged commit e4e9af3 into Expensify:main Jan 8, 2025
16 checks passed

github-actions bot mentioned this pull request Jan 10, 2025

Deploy Checklist: New Expensify 2025-01-10 #55051

Closed

54 tasks

izarutskaya mentioned this pull request Jan 10, 2025

[HOLD for payment 2025-01-21] Infinite loading with skeleton page appear when navigating back from Navattic #55054

Closed

8 tasks

melvin-bot bot mentioned this pull request Jan 11, 2025

[Due for payment 2025-01-18] [$250] Mark the self tour as completed when user returns from Navattic #54815

Closed

8 tasks

parasharrajat reviewed Jan 19, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Mark the tour task as complete on redirecting to Concierge after finishing the Navattic tour #54824

Mark the tour task as complete on redirecting to Concierge after finishing the Navattic tour #54824

c3024 commented Jan 6, 2025

melvin-bot bot commented Jan 6, 2025

github-actions bot commented Jan 6, 2025

github-actions bot commented Jan 6, 2025

rushatgabhane commented Jan 7, 2025 •

edited

Loading

rushatgabhane Jan 7, 2025 •

edited

Loading

mountiny Jan 7, 2025

rushatgabhane left a comment

mountiny left a comment

mountiny Jan 7, 2025

c3024 commented Jan 8, 2025

mountiny left a comment

OSBotify commented Jan 8, 2025

github-actions bot commented Jan 10, 2025

izarutskaya commented Jan 10, 2025

github-actions bot commented Jan 11, 2025

github-actions bot commented Jan 13, 2025

parasharrajat Jan 19, 2025

Mark the tour task as complete on redirecting to Concierge after finishing the Navattic tour #54824

Mark the tour task as complete on redirecting to Concierge after finishing the Navattic tour #54824

Conversation

c3024 commented Jan 6, 2025

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jan 6, 2025

github-actions bot commented Jan 6, 2025

github-actions bot commented Jan 6, 2025

rushatgabhane commented Jan 7, 2025 • edited Loading

Reviewer Checklist

Screenshots/Videos

rushatgabhane Jan 7, 2025 • edited Loading

Choose a reason for hiding this comment

mountiny Jan 7, 2025

Choose a reason for hiding this comment

rushatgabhane left a comment

Choose a reason for hiding this comment

mountiny left a comment

Choose a reason for hiding this comment

mountiny Jan 7, 2025

Choose a reason for hiding this comment

c3024 commented Jan 8, 2025

mountiny left a comment

Choose a reason for hiding this comment

OSBotify commented Jan 8, 2025

github-actions bot commented Jan 10, 2025

izarutskaya commented Jan 10, 2025

github-actions bot commented Jan 11, 2025

github-actions bot commented Jan 13, 2025

parasharrajat Jan 19, 2025

Choose a reason for hiding this comment

rushatgabhane commented Jan 7, 2025 •

edited

Loading

rushatgabhane Jan 7, 2025 •

edited

Loading