Skip to content

Enable switching from Old Dot to New Dot on web when copiloted in #59323

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

Merged
merged 17 commits into from
Apr 4, 2025

Conversation

ZhenjaHorbach
Copy link
Contributor

@ZhenjaHorbach ZhenjaHorbach commented Mar 30, 2025

Explanation of Change

Enable switching from Old Dot to New Dot on web when copiloted in

Fixed Issues

$ #59306
PROPOSAL:

Tests

Precondition:

  • Add a copilot to the current account.

Test Steps:

Test case 1

  1. Open the OldDot application
  2. Select a copilot as the active account
  3. Switch to NewDot using one of the following methods:
    Support → Concierge
    Try New Expensify button
    Reports → Random report → Take me there button
  4. Verify that NewDot opens with the copilot as the active account in the correct location

Test case 2

  1. Open the NewDot application
  2. Select a copilot as the active account
  3. Switch to OldDot
  4. Verify that OldDot opens with the copilot as the active account
  • Verify that no errors appear in the JS console

Offline tests

Precondition:

  • Add a copilot to the current account.

Test Steps:

Test case 1

  1. Open the OldDot application
  2. Select a copilot as the active account
  3. Switch to NewDot using one of the following methods:
    Support → Concierge
    Try New Expensify button
    Reports → Random report → Take me there button
  4. Verify that NewDot opens with the copilot as the active account in the correct location

Test case 2

  1. Open the NewDot application
  2. Select a copilot as the active account
  3. Switch to OldDot
  4. Verify that OldDot opens with the copilot as the active account

QA Steps

Note: Please ping @dangrous if this doesn't seem to be working, we may have to add additional test emails to the beta; I added the applause.expensifail.com domain. Also, this is specifically for desktop web; this should already work on hybrid app.

Precondition:

  • Add a copilot to the current account.

Test Steps:

Test case 1

  1. Open the OldDot application
  2. Select a copilot as the active account
  3. Switch to NewDot using one of the following methods:
    Support → Concierge
    Try New Expensify button
    Reports → Random report → Take me there button
  4. Verify that NewDot opens with the copilot as the active account in the correct location

Test case 2

  1. Open the NewDot application
  2. Select a copilot as the active account
  3. Switch to OldDot
  4. Verify that OldDot opens with the copilot as the active account
  • 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

NA

Android: mWeb Chrome
2025-03-31.13.43.39.mov
iOS: Native

NA

iOS: mWeb Safari
2025-03-31.13.35.28.mov
MacOS: Chrome / Safari
2025-03-30.19.11.18.mov
MacOS: Desktop

NA

@dangrous dangrous self-requested a review March 31, 2025 14:29
@dangrous
Copy link
Contributor

This is looking great! The loading screen is a little long, but I think that's way better than seeing all the work behind the scenes. I think it's ready to go into review, we can grab another C+ to do some additional testing.

Only things to note:

  • The updated Old Dot behavior is now live on staging, so all New Dot links should open in a new tab
  • Can you add a testing step to confirm that going from New Dot to Old Dot works? (It seems to, just need to add it for QA)
  • I noticed a separate bug - when you go from Old Dot to New Dot normally (i.e. no copilot) and you're already logged into ND with that account, it won't actually load a chat until you click somewhere else and back. But, it happens on main too so it's not our concern here.

Thank you for tackling this!

@ZhenjaHorbach ZhenjaHorbach marked this pull request as ready for review March 31, 2025 18:00
@ZhenjaHorbach ZhenjaHorbach requested a review from a team as a code owner March 31, 2025 18:00
@melvin-bot melvin-bot bot requested review from suneox and removed request for a team March 31, 2025 18:00
Copy link

melvin-bot bot commented Mar 31, 2025

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

@dangrous
Copy link
Contributor

@suneox let me know some test emails you'll want to use and I can add them to the beta!

@suneox
Copy link
Contributor

suneox commented Apr 1, 2025

@suneox let me know some test emails you'll want to use and I can add them to the beta!

Could you please add the emails[email protected] and [email protected]? Thanks!

@dangrous
Copy link
Contributor

dangrous commented Apr 1, 2025

@suneox those are added; it may take up to an hour but it should be ready to go after that

@suneox
Copy link
Contributor

suneox commented Apr 1, 2025

@suneox those are added; it may take up to an hour but it should be ready to go after that

Got it! I will review the code changes and complete the checklist after an hour

@dangrous
Copy link
Contributor

dangrous commented Apr 2, 2025

bump on review @suneox thanks!

@suneox
Copy link
Contributor

suneox commented Apr 2, 2025

bump on review @suneox thanks!

I'm still testing, but when switching from oldDot to newDot both emails I've provided don't have the delegatorEmail parameter in the /transition route from oldDot. Should I manually add this parameter?

Screen.Recording.2025-04-02.at.21.52.08.mp4

@suneox
Copy link
Contributor

suneox commented Apr 2, 2025

I'm still testing, but when switching from oldDot to newDot both emails I've provided don't have the delegatorEmail parameter in the /transition route from oldDot. Should I manually add this parameter?

It looks like oldDot doesn't yet support switching Copilot accounts, so I'll continue the checklist by manually adding the delegatorEmail parameter.

@dangrous
Copy link
Contributor

dangrous commented Apr 2, 2025

Hrm so it should work with the emails that you shared with me before - the changes to send delegatorEmail were the same ones that added the Try New Expensify button to the copilot view in Old Dot. @ZhenjaHorbach can you share any steps that you did that might help set this up for testing?

From what I understand, I think you'll need to:

  • Click on a link (like the Concierge link) in Old Dot.
  • Immediately stop the link from loading
  • change staging.new.expensify.com to dev.new.expensify.com:8082 in that URL
  • Allow the page to load

@suneox
Copy link
Contributor

suneox commented Apr 2, 2025

Hrm so it should work with the emails that you shared with me before - the changes to send delegatorEmail were the same ones that added the Try New Expensify button to the copilot view in Old Dot
From what I understand, I think you'll need to:

I also used the emails I shared with you earlier and followed the same steps, but the delegatorEmail parameter wasn’t included in the transition route. When I manually added delegatorEmail it will be navigate to sign-in page

Screen.Recording.2025-04-02.at.23.45.28.mp4

* @param setIsDelegatorFromOldDotIsReady - An optional callback function that is called
* when the delegator is authenticated (used in case of switching from OldDot to NewDot).
*/
function connect(email: string, setIsDelegatorFromOldDotIsReady?: (isReady: boolean) => void) {
Copy link
Contributor

Choose a reason for hiding this comment

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

NAB: What do you think about making this function return a promise at API.makeRequestWithSideEffects? This way, we can handle the business logic for setIsDelegatorFromOldDotIsReady in AuthScreens, allowing us to separate it from the action logic.

// or returning from background. If so, we'll assume they have some app data already and we can call reconnectApp() instead of openApp() and connect() for delegator from OldDot.
if (SessionUtils.didUserLogInDuringSession() || delegatorEmail) {
if (delegatorEmail) {
connect(delegatorEmail, setIsDelegatorFromOldDotIsReady);
Copy link
Contributor

Choose a reason for hiding this comment

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

NAB: if we want to return the connect function as a promise func

        connect(delegatorEmail).then(() => {
            setIsDelegatorFromOldDotIsReady(true);
        })

Copy link
Contributor Author

@ZhenjaHorbach ZhenjaHorbach Apr 2, 2025

Choose a reason for hiding this comment

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

Hmmm
Actually good idea
I will check tomorrow

@ZhenjaHorbach
Copy link
Contributor Author

Hrm so it should work with the emails that you shared with me before - the changes to send delegatorEmail were the same ones that added the Try New Expensify button to the copilot view in Old Dot. @ZhenjaHorbach can you share any steps that you did that might help set this up for testing?

From what I understand, I think you'll need to:

  • Click on a link (like the Concierge link) in Old Dot.
  • Immediately stop the link from loading
  • change staging.new.expensify.com to dev.new.expensify.com:8082 in that URL
  • Allow the page to load

Strange 🧐
Surprisingly I had no problems with testing at all
And delegatorEmail was always passed 😅

@ZhenjaHorbach
Copy link
Contributor Author

ZhenjaHorbach commented Apr 2, 2025

But wait
@suneox
Try to use prod OD instead of staging OD

@dangrous
Copy link
Contributor

dangrous commented Apr 3, 2025

Hm it shoudl work either way? But as long as it works on production I guess that's fine (all related code is on prod now)

@ZhenjaHorbach
Copy link
Contributor Author

Hm it shoudl work either way? But as long as it works on production I guess that's fine (all related code is on prod now)

Yeah

In theory, the functionality should work on all environments
but I have always used the prod

@suneox
Copy link
Contributor

suneox commented Apr 3, 2025

But wait @suneox Try to use prod OD instead of staging OD

I still can't get delegatorEmail on production using the email [email protected]

Screen.Recording.2025-04-03.at.21.47.37.mp4

@suneox
Copy link
Contributor

suneox commented Apr 3, 2025

But on the video you redirected to the main account on OD And then from main account on OD to ND

Yes on my account is always switching to the main account when chose Take me there or Try New Expensify

@ZhenjaHorbach
Copy link
Contributor Author

ZhenjaHorbach commented Apr 3, 2025

But on the video you redirected to the main account on OD And then from main account on OD to ND

Yes on my account is always switching to the main account when chose Take me there or Try New Expensify

Yeah
I deleted the comment 😅
In that case I don't have ideas why it doesn't work 😔
Maybe we should try to add another account to beta ?

@ZhenjaHorbach ZhenjaHorbach force-pushed the allow-old-dot-copilot branch from 1b3abed to 63b404a Compare April 3, 2025 16:58
@dangrous
Copy link
Contributor

dangrous commented Apr 3, 2025

@suneox are you able to allow popups from expensify in your Safari (alternately try Chrome or another browser)? I'm wondering if it's some timing issue with the api commands that it's doing on the back end (for example, it should stay copiloted in in Old Dot now.

I just tried on my computer with Chrome and Safari on staging. Chrome works fine, Safari does NOT work until after you allow pop ups, but once it opens the link automatically it includes delegatorEmail

@ZhenjaHorbach
Copy link
Contributor Author

@suneox are you able to allow popups from expensify in your Safari (alternately try Chrome or another browser)? I'm wondering if it's some timing issue with the api commands that it's doing on the back end (for example, it should stay copiloted in in Old Dot now.

I just tried on my computer with Chrome and Safari on staging. Chrome works fine, Safari does NOT work until after you allow pop ups, but once it opens the link automatically it includes delegatorEmail

Oh
Good point !
I always tested with chrome

@suneox
Copy link
Contributor

suneox commented Apr 3, 2025

@suneox are you able to allow popups from expensify in your Safari (alternately try Chrome or another browser)? I'm wondering if it's some timing issue with the api commands that it's doing on the back end (for example, it should stay copiloted in in Old Dot now.

I just tried on my computer with Chrome and Safari on staging. Chrome works fine, Safari does NOT work until after you allow pop ups, but once it opens the link automatically it includes delegatorEmail

I was using the default Safari settings and wasn't aware of the popup permission. Now it works for me after allow the pop-up.

Comment on lines 174 to 177
.catch((error) => {
Log.alert('[Delegate] Error connecting as delegate', {error});
Onyx.update(failureData);
});
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we need to revert this change to keep updating failureData we can return false after update failureData to handle update on AuthScreen

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh
Yeah
I was a bit hasty with the changes and didn't notice that I deleted this 😅
I'll fix it now

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@suneox
Done !

@suneox
Copy link
Contributor

suneox commented Apr 4, 2025

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 that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • 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: mWeb Chrome

Test case 1:

Screen.Recording.2025-04-04.at.22.46.47.mp4

Test case 2:

Screen.Recording.2025-04-04.at.22.49.15.mp4
iOS: mWeb Safari

Test case 1:

Screen.Recording.2025-04-04.at.20.21.32.mp4

Test case 2:

Screen.Recording.2025-04-04.at.22.42.12.mp4
MacOS: Chrome / Safari

Test case 1:

Copilot account

Screen.Recording.2025-04-02.at.22.43.50.mp4

Original account

Screen.Recording.2025-04-04.at.23.00.29.mp4

Test case 2:

Screen.Recording.2025-04-04.at.20.11.26.mp4
Android: Native
Screen.Recording.2025-04-04.at.23.28.52.mp4
iOS: Native
Screen.Recording.2025-04-04.at.23.09.08.mp4
MacOS: Desktop
Screen.Recording.2025-04-04.at.23.16.02.mp4

Copy link
Contributor

@suneox suneox left a comment

Choose a reason for hiding this comment

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

Works as expected

Copy link
Contributor

@dangrous dangrous left a comment

Choose a reason for hiding this comment

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

Thank you both!

@dangrous dangrous merged commit 7ade8d5 into Expensify:main Apr 4, 2025
17 of 18 checks passed
@OSBotify
Copy link
Contributor

OSBotify commented Apr 4, 2025

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

Copy link
Contributor

github-actions bot commented Apr 7, 2025

🚀 Deployed to staging by https://github.com/dangrous in version: 9.1.24-2 🚀

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

Copy link
Contributor

github-actions bot commented Apr 9, 2025

🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.1.24-10 🚀

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

Copy link
Contributor

github-actions bot commented Apr 9, 2025

🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.1.24-10 🚀

platform result
🖥 desktop 🖥 success ✅
🕸 web 🕸 success ✅
🤖 android 🤖 failure ❌
🍎 iOS 🍎 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.

4 participants