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

[HOLD #53845]Implement upgrade to control when booking travel #53753

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

shubham1206agra
Copy link
Contributor

Explanation of Change

Fixed 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 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
MacOS: Desktop

Comment on lines +4323 to +4328
travel: {
title: 'Viajes',
description:
'Expensify Travel es una nueva plataforma corporativa de reserva y gestión de viajes que permite a los miembros reservar alojamientos, vuelos, transporte y mucho más.',
onlyAvailableOnPlan: 'Travel solo está disponible en el plan Controlar, a partir de ',
},
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@cristipaval Can you please get the translation confirmation?

Copy link
Contributor

Choose a reason for hiding this comment

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

I'll confirm this comment first.

@shubham1206agra
Copy link
Contributor Author

Screen.Recording.2024-12-09.at.6.50.15.PM.mov

@Expensify/design Is this flow correct?
cc @cristipaval @joekaufmanexpensify

@shawnborton
Copy link
Contributor

@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"

@joekaufmanexpensify
Copy link
Contributor

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.

@shubham1206agra
Copy link
Contributor Author

@shawnborton What should be the button text? Create a workspace?

@shawnborton
Copy link
Contributor

Rather than use this upgrade screen, what if we use the workspace confirmation step that we just merged?

CleanShot 2024-12-09 at 08 51 39@2x

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.

@joekaufmanexpensify
Copy link
Contributor

I like that too.

@dannymcclain
Copy link
Contributor

dannymcclain commented Dec 9, 2024

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?

@joekaufmanexpensify
Copy link
Contributor

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.

@jamesdeanexpensify
Copy link
Contributor

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.

@shawnborton
Copy link
Contributor

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?

@dannymcclain
Copy link
Contributor

Yeah that sounds good!

@stitesExpensify
Copy link
Contributor

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"

@jamesdeanexpensify
Copy link
Contributor

Aren't all workspaces paid? Or they will be soon with Ryan's project. Workspace creation will kick off the free trial.

@stitesExpensify
Copy link
Contributor

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

@jamesdeanexpensify
Copy link
Contributor

Ah, got it. Thank you!

@shubham1206agra
Copy link
Contributor Author

Screenshot 2024-12-11 at 12 22 14 PM

@shawnborton Can you please let me know the correct text here?

@shawnborton
Copy link
Contributor

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!

@jamesdeanexpensify
Copy link
Contributor

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).

@shawnborton
Copy link
Contributor

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.

@jamesdeanexpensify
Copy link
Contributor

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!

@shawnborton
Copy link
Contributor

Love it, let's do it

@mananjadhav
Copy link
Collaborator

@shubham1206agra Is this ready for review?

@shubham1206agra shubham1206agra changed the title Implement upgrade to control when booking travel [HOLD #53845]Implement upgrade to control when booking travel Dec 19, 2024
@shubham1206agra
Copy link
Contributor Author

Hold on #53845 as we require workspace confirmation screen.

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.

8 participants