Implement upgrade to control when booking travel
Explanation of Change
Fixed Issues
$ https://github.com/Expensify/App/issues/48305
Tests
- [ ] 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]."
- [ ] Verify that no errors appear in the JS console
PR Author Checklist
- [ ] I linked the correct issue in the
### Fixed Issuessection above - [ ] I wrote clear testing steps that cover the changes made in this PR
- [ ] I added steps for local testing in the
Testssection - [ ] I added steps for the expected offline behavior in the
Offline stepssection - [ ] I added steps for Staging and/or Production testing in the
QA stepssection - [ ] 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 added steps for local testing in the
- [ ] 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.
toggleReportand notonIconClick) - [ ] 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
- [ ] 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.
- [ ] 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 usingAvatarare 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
Avataris modified, I verified thatAvataris 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
Designlabel and/or tagged@Expensify/designso the design team can review the changes.
- [ ] If a new page is added, I verified it's using the
ScrollViewcomponent 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
mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.
Screenshots/Videos
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop
https://github.com/user-attachments/assets/95e3ee20-2a97-4523-bfd5-33ae0c553659
@Expensify/design Is this flow correct? cc @cristipaval @joekaufmanexpensify
@ryanschaffer @stitesExpensify is this correct? I don't think Travel is only available on Control, but rather, it just requires at least a workspace. So if anything, that modal should say "Only available on Collect and Control"
That's my understanding too. It should be a prompt to create a workspace for those with none. Rather than a prompt to upgrade a collect workspace to control.
@shawnborton What should be the button text? Create a workspace?
Rather than use this upgrade screen, what if we use the workspace confirmation step that we just merged?
Maybe we can update the text to include something about travel? cc @jamesdeanexpensify we current say this:
Create a workspace to track receipts, reimburse expenses, send invoices, and more — all at the speed of chat.
Maybe we could say this:
Create a workspace to track receipts, reimburse expenses, manage travel, send invoices, and more — all at the speed of chat.
I like that too.
Rather than use this upgrade screen, what if we use the workspace confirmation step that we just merged?
I thought we had decided to use the upgrade modal similar to categories in this situation? It's not an upgrade from Collect to Control, but it's still an upgrade from no workspace to a Collect workspace. Right? Or am I missing something?
Yeah, that is what we'd landed on. I think Shawn just meant that we also now have this new page for confirming to create a workspace that might apply too. Not sure of the context of the new page though or the pattern of where we use one vs the other.
What about for the copy (it felt a bit too long as suggested, so removing the reference to invoices for now):
Create a workspace to track receipts, reimburse expenses, manage travel, and more — all at the speed of chat.
Ah yeah that's a good point Danny. So here are my thoughts then:
- Using the upgrade pattern you linked makes total sense to me, as it is consistent with categories. Let's just use the correct copy from this one and not the copy for Control.
- I think after you hit Upgrade in that flow, we should take you to the workspace confirmation screen since we should be showing that confirmation before all new workspaces are created
Does that sound like a plan?
Yeah that sounds good!
I don't think Travel is only available on Control, but rather, it just requires at least a workspace. So if anything, that modal should say "Only available on Collect and Control"
That is correct. I think we settled on something like "Only available on paid workspaces"
Aren't all workspaces paid? Or they will be soon with Ryan's project. Workspace creation will kick off the free trial.
I haven't looked at that project yet, but the idea was that we need to prevent users who only have a personal policy on OldDot
Ah, got it. Thank you!
@shawnborton Can you please let me know the correct text here?
cc @jamesdeanexpensify for thoughts but maybe we can do:
You've successfully upgraded to a workspace on the Collect plan. Now you can start booking and managing travel!
Quick clarifying question - have they (1) upgraded their existing workspace to the Collect plan or (2) upgraded to a (new) workspace on the Collect plan? That might determine my copy feedback (and then maybe we should revisit the categories copy based on this, too).
I think we show this because the user didn't have any workspace period, so we ask them to at least make a workspace first (much like we do when someone tries to categorize something without a workspace). I think we just start them off on a Collect workspace.
Ok, cool! Would you be down with:
You've successfully upgraded to a workspace on the Collect plan. Now you can book and manage travel!
Love it, let's do it
@shubham1206agra Is this ready for review?
Hold on https://github.com/Expensify/App/pull/53845 as we require workspace confirmation screen.
@shubham1206agra, the PR is merged and it's been in staging for more than 1 day. I hope it will survive and won't get reverted and will end up in production. I think you can continue on this one, given that the deadline for travel is at the end of next week when we want this deployed.
I am available for review as soon as it's ready 🙇
@mananjadhav Can you start testing this?
https://github.com/user-attachments/assets/553a493f-fa07-4b22-a21b-d1e4a998c4e9
@Expensify/design Updated flow. Please verify the flow.
cc @cristipaval @joekaufmanexpensify
I think that looks right to me. What happens when you click the Got it, thanks button on the upgrade confirmation screen?
There's a slide-over animation from Travel -> Upgrade, but not from Upgrade -> New Workspace. Kinda feels like we should have one, no?
Looking good so far but I agree with Jon's comment above about staying consistent with the slide transitions across the various RHP pages here. And also curious about Danny's question too!