[Free trial] Implement and show Pre-Trial banner in the App during Pre-Trial #43982

fabioh8010 · 2024-06-19T10:30:33Z

Details

$ #43670
PROPOSAL:

Tests

To access the Subscriptions screen, you can either:

Add this effect to InitialSettingsPage.tsx (all platforms)

useEffect(() => {
    Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION)
}, [])

Access https://dev.new.expensify.com:8082/settings/subscription (web)
Run npx uri-scheme open new-expensify://settings/subscription with --android or --ios (mobile)

Test steps:

Login with a new account.
Create a workspace.
Access the Subscriptions screen.
Assert the pre-trial banner is shown, click the "get started" link.
Assert you were redirected to either the Expensify or Concierge Chat (will depend if your Account ID is odd or even).

Verify that no errors appear in the JS console

Offline tests

Same as above.

QA Steps

Same as above.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-06-19.at.12.13.18.mov

Android: mWeb Chrome

Screen.Recording.2024-06-19.at.12.18.16.mov

iOS: Native

Screen.Recording.2024-06-19.at.17.31.58.mov

iOS: mWeb Safari

Screen.Recording.2024-06-19.at.17.35.00.mov

MacOS: Chrome / Safari

Screen.Recording.2024-06-19.at.17.37.44.mov

Screen.Recording.2024-06-19.at.17.40.25.mov

MacOS: Desktop

Screen.Recording.2024-06-19.at.17.51.57.mov

…re-trial

fabioh8010 · 2024-06-19T17:59:13Z

cc @chiragsalian

melvin-bot · 2024-06-19T17:59:16Z

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

luacmartins

Left a couple of small comments

src/languages/es.ts

src/pages/settings/Subscription/CardSection/CardSection.tsx

rojiphil

@fabioh8010 I have left a comment for your consideration. The changes looks great though. Thanks.

src/pages/settings/Subscription/CardSection/BillingBanner/PreTrialBillingBanner.tsx

rojiphil · 2024-06-20T08:46:56Z

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

MacOS: Chrome / Safari

43982-web-safari-001.mp4

MacOS: Desktop

43982-desktop-001.mp4

Android: Native

43982-android-native-001.mp4

Android: mWeb Chrome

43982-mweb-chrome-001.mp4

iOS: Native

43982-ios-native-001.mp4

iOS: mWeb Safari

43982-mweb-safari-001.mp4

rojiphil · 2024-06-20T09:00:52Z

And it would be great if we could incorporate the feedback from here before it slips out of our radar.

rojiphil

@fabioh8010 I have left few comments again. I think we are very close to getting this done. Will complete the checklist as soon as the comments are resolved.

src/pages/settings/Subscription/CardSection/BillingBanner/PreTrialBillingBanner.tsx

src/pages/settings/Subscription/CardSection/CardSection.tsx

rojiphil

Thanks @fabioh8010.
Code changes LGTM, tests well and completed checklist too.

melvin-bot · 2024-06-20T18:56:53Z

🎯 @rojiphil, thanks for reviewing and testing this PR! 🎉

An E/App issue has been created to issue payment here: #44110.

chiragsalian

LGTM

luacmartins

LGTM

shawnborton · 2024-06-20T19:40:38Z

src/languages/en.ts

+            preTrial: {
+                title: 'Start a free trial',
+                subtitle: 'To get started, ',
+                subtitleLink: 'complete your setup checklist here',


Sorry for the late comment, but just checking to see if we wanted to have a period at the end of this? cc @jamesdeanexpensify

Yes, great catch! After here please!

Yes, great catch! After here please!

Sure. We will integrate this change during implementation of issue here
cc @fabioh8010

OSBotify · 2024-06-20T19:46:11Z

✋ 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 · 2024-06-21T21:44:19Z

🚀 Deployed to staging by https://github.com/chiragsalian in version: 9.0.1-0 🚀

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

OSBotify · 2024-06-25T19:44:56Z

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.0.1-19 🚀

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

fabioh8010 added 5 commits June 19, 2024 11:20

Refactor BillingBanner to be more flexible and generic

5541d19

Implement PreTrialBillingBanner

f69c96f

Remove export

df45942

Minor changes to BillingBanner

a92688b

Merge remote-tracking branch 'origin/main' into feature/free-trials/p…

a053fb3

…re-trial

fabioh8010 marked this pull request as ready for review June 19, 2024 17:58

fabioh8010 requested review from a team as code owners June 19, 2024 17:58

fabioh8010 changed the title ~~[WIP / HOLD on #43668][Free trial] Implement and show Pre-Trial banner in the App during Pre-Trial~~ [Free trial] Implement and show Pre-Trial banner in the App during Pre-Trial Jun 19, 2024

melvin-bot bot requested review from luacmartins and removed request for a team June 19, 2024 17:59

chiragsalian self-requested a review June 19, 2024 18:05

luacmartins requested changes Jun 19, 2024

View reviewed changes

src/languages/es.ts Show resolved Hide resolved

src/pages/settings/Subscription/CardSection/CardSection.tsx Outdated Show resolved Hide resolved

rojiphil reviewed Jun 20, 2024

View reviewed changes

src/pages/settings/Subscription/CardSection/BillingBanner/PreTrialBillingBanner.tsx Show resolved Hide resolved

fabioh8010 added 2 commits June 20, 2024 11:18

Merge branch 'main' into feature/free-trials/pre-trial

0abe98a

Improve isChatUsedForOnboarding() comment

e2edcce

fabioh8010 requested review from rojiphil and luacmartins June 20, 2024 10:23

rojiphil reviewed Jun 20, 2024

View reviewed changes

Address comments

90480b7

fabioh8010 requested a review from rojiphil June 20, 2024 15:22

rojiphil approved these changes Jun 20, 2024

View reviewed changes

melvin-bot bot mentioned this pull request Jun 20, 2024

[HOLD for Payment 2024-07-02] Payment issue for E/App PR#43982 #44110

Closed

chiragsalian approved these changes Jun 20, 2024

View reviewed changes

luacmartins approved these changes Jun 20, 2024

View reviewed changes

chiragsalian merged commit dd5cd33 into Expensify:main Jun 20, 2024
17 of 20 checks passed

shawnborton reviewed Jun 20, 2024

View reviewed changes

github-actions bot mentioned this pull request Jun 21, 2024

Deploy Checklist: New Expensify 2024-06-21 #44186

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Free trial] Implement and show Pre-Trial banner in the App during Pre-Trial #43982

[Free trial] Implement and show Pre-Trial banner in the App during Pre-Trial #43982

fabioh8010 commented Jun 19, 2024 •

edited

Loading

fabioh8010 commented Jun 19, 2024

melvin-bot bot commented Jun 19, 2024

luacmartins left a comment

rojiphil left a comment

rojiphil commented Jun 20, 2024 •

edited

Loading

rojiphil commented Jun 20, 2024

rojiphil left a comment

rojiphil left a comment

melvin-bot bot commented Jun 20, 2024

chiragsalian left a comment

luacmartins left a comment

shawnborton Jun 20, 2024

jamesdeanexpensify Jun 20, 2024

rojiphil Jun 20, 2024

OSBotify commented Jun 20, 2024

OSBotify commented Jun 21, 2024

OSBotify commented Jun 25, 2024

[Free trial] Implement and show Pre-Trial banner in the App during Pre-Trial #43982

[Free trial] Implement and show Pre-Trial banner in the App during Pre-Trial #43982

Conversation

fabioh8010 commented Jun 19, 2024 • edited Loading

Details

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

fabioh8010 commented Jun 19, 2024

melvin-bot bot commented Jun 19, 2024

luacmartins left a comment

Choose a reason for hiding this comment

rojiphil left a comment

Choose a reason for hiding this comment

rojiphil commented Jun 20, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

rojiphil commented Jun 20, 2024

rojiphil left a comment

Choose a reason for hiding this comment

rojiphil left a comment

Choose a reason for hiding this comment

melvin-bot bot commented Jun 20, 2024

chiragsalian left a comment

Choose a reason for hiding this comment

luacmartins left a comment

Choose a reason for hiding this comment

shawnborton Jun 20, 2024

Choose a reason for hiding this comment

jamesdeanexpensify Jun 20, 2024

Choose a reason for hiding this comment

rojiphil Jun 20, 2024

Choose a reason for hiding this comment

OSBotify commented Jun 20, 2024

OSBotify commented Jun 21, 2024

OSBotify commented Jun 25, 2024

fabioh8010 commented Jun 19, 2024 •

edited

Loading

rojiphil commented Jun 20, 2024 •

edited

Loading