Early discount countdown banner #54901

parasharrajat · 2025-01-07T19:20:12Z

Explanation of Change

Fixed Issues

$ #54817
PROPOSAL: #54817 (comment)

Tests

Claiming the first discount

Sign up as a new user
Create a workspace
Go to your onboarding chat or concierge
Verify you can see a countdown timer starting from 24h.
Verify the banner is not dismissable.
Verify click on “Claim offer” takes you to the subscription page.
Verify the subscription page shows the same timer.
Verify that after you add a card, a promoCode of 50% has been applied to your account. Verify

Claiming the second discount

Sign up as a new user
Create a workspace
Modify the NVP firstDayFreeTrial such that it's earlier than 24h. Run this in the console: Onyx.merge("nvp_private_firstDayFreeTrial", "2024-12-21 23:36:00");
Go to your onboarding chat or concierge
Verify you can see a countdown showing days, hours, minutes, and seconds of the time remaining, which should be max 7 days when it starts.
Verify the banner is dismissable.
Verify click on “Claim offer” takes you to the subscription page.
Verify the subscription page shows the same timer.

Period past 8 days

Sign up as a new user
Create a workspace
Modify the NVP firstDayFreeTrial such that it's later than 8 days. Run this in the console: Onyx.merge("nvp_private_firstDayFreeTrial", "2024-12-21 23:36:00");
Verify no banner is shown in the onboarding chat.
Verify no banner is shown in the subscription page.
Verify that in the subscription, we’re showing the usual free trial banner instead.

Verify that no errors appear in the JS console

Offline tests

Same as QA steps.

QA Steps

Prerequisites:

Sign up as a new user
Create a workspace.
Create an Expense on the workspace to begin a new trial.

Claiming the first discount

Go to your onboarding chat or concierge.
Verify you can see a countdown timer starting from 24h.
Verify the banner is not dismissable.
Verify that clicking on “Claim offer” takes you to the subscription page.
Verify the subscription page shows the same timer.
[Depends if backend has implemented the changes] Verify that after you add a card, a promoCode of 50% has been applied to your account.

Claiming the second discount

Login with the same account 24 hours from the trial's start.
Go to your onboarding chat or concierge.
Verify you can see a countdown showing days, hours, minutes, and seconds of the time remaining, which should be max 7 days when it starts.
Verify the banner is dismissible.
Verify that clicking on “Claim offer” takes you to the subscription page.
Verify the subscription page shows the same timer.

Period past 8 days

Login with the same account 8 days from the trial's start.
Verify no banner is shown in the onboarding chat.
Verify no banner is shown on the subscription page.
Verify that in the subscription, we’re showing the usual free trial banner instead.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

17.01.2025_15.26.54_REC.mp4

Android: mWeb Chrome

17.01.2025_15.29.45_REC.mp4

iOS: Native

17.01.2025_15.51.53_REC.mp4

iOS: mWeb Safari

17.01.2025_15.52.46_REC.mp4

MacOS: Chrome / Safari

17.01.2025_15.27.39_REC.mp4

MacOS: Desktop

17.01.2025_15.34.37_REC.mp4

…rly-discount

melvin-bot · 2025-01-15T22:36:45Z

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

…rly-discount

shawnborton · 2025-01-16T09:08:07Z

Let us know when this is ready for design review!

youssef-lr · 2025-01-16T18:05:48Z

Can we get some screenshots for the design team please?

github-actions · 2025-01-16T18:07:08Z

🚧 @youssef-lr has triggered a test build. You can view the workflow run here.

parasharrajat · 2025-01-16T18:11:16Z

Added web. Adding more in sometime.

github-actions · 2025-01-16T18:32:18Z

🧪🧪 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/54901/index.html	https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/54901/index.html

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

👀 View the workflow run that generated this build 👀

dannymcclain · 2025-01-16T18:34:13Z

A couple things from the screenshots/videos so far:

The banner in the chat view should use our row-hover color for the background
I believe the first 50% off offer that's available for 24 hours is not supposed to be dismissible
I thought we said the follow-up offer (25% off for 7 days) would be dismissible

Would love clarification about the offers and which should be dismissible, but the banner color in the chat needs to be updated regardless.

youssef-lr · 2025-01-16T18:44:44Z

I believe the first 50% off offer that's available for 24 hours is not supposed to be dismissible

That's correct, I believe I had it coded this way. @parasharrajat can you check?

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

eVoloshchak · 2025-01-22T09:32:24Z

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

Screen.Recording.2025-01-22.at.13.08.44.mov

Android: mWeb Chrome

Screen.Recording.2025-01-22.at.12.29.37.mov

iOS: Native

Screen.Recording.2025-01-22.at.12.23.09.mov

iOS: mWeb Safari

Screen.Recording.2025-01-22.at.12.25.01.mov

MacOS: Chrome / Safari

Screen.Recording.2025-01-22.at.11.25.23.mov

Screen.Recording.2025-01-22.at.11.35.06.mov

MacOS: Desktop

Screen.Recording.2025-01-22.at.12.06.59.mov

eVoloshchak

LGTM!

parasharrajat · 2025-01-22T18:13:38Z

All yours @youssef-lr

youssef-lr

LGTM! Not merging yet until we deploy some backend code that updates the length of the trial to 30 days.

parasharrajat · 2025-01-22T18:26:01Z

@youssef-lr I did notice that when we cancel the banner on the onboarding chat, it pops again on reopening that chat.

Do we want to cancel that permanently?

youssef-lr · 2025-01-24T02:29:58Z

@youssef-lr I did notice that when we cancel the banner on the onboarding chat, it pops again on reopening that chat.

It's intentional.

github-actions · 2025-01-28T02:15:58Z

🚀 Deployed to staging by https://github.com/youssef-lr in version: 9.0.90-0 🚀

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

kavimuru · 2025-01-28T14:54:02Z

@youssef-lr @parasharrajat How can we set the NVP? Could this be verified internally?

parasharrajat · 2025-01-28T15:09:51Z

Please use QA steps for testing. You can Do the 24-hour testing and skip the 8-day one. What do you think @youssef-lr?

youssef-lr · 2025-01-28T15:20:43Z

@kavimuru it's working well, feel free to skip that part, I tested it myself.

Screen.Recording.2025-01-28.at.16.19.59.mov

youssef-lr · 2025-01-28T15:21:34Z

If you're asking about the promo code NVP, can you give me the email you used for testing? I can check if it has the NVP.

kavimuru · 2025-01-28T17:36:54Z

@youssef-lr QA steps are updated now. Should we wait 24 hours to verify the following?

Claiming the second discount

github-actions · 2025-01-29T06:23:46Z

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.0.90-6 🚀

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

shubham1206agra · 2025-05-12T14:10:52Z

This PR introduced a style bug, detailed here #58974

parasharrajat · 2025-05-12T14:29:19Z

@shubham1206agra How when we didn't even have that button on this PR?

shubham1206agra · 2025-05-12T14:38:16Z

@parasharrajat This PR kind of started the bad layout, which caused the bug. Though, I will replace the offending PR to #57092.

parasharrajat · 2025-05-12T14:40:48Z

I don't understand what you mean by bad layout. It was tested and was working great for the UI at that time. The PR which added the button should change the layout as they want.

youssef-lr added 5 commits December 22, 2024 02:13

Create discount component

ad94f68

Add banner to subscription page

f997719

Merge branch 'main' into youssef_early_discount

72cb79b

Make 25% discount banner dismissable

70ffbfa

Merge branch 'main' into youssef_early_discount

47440ab

parasharrajat force-pushed the parasharrajat/early-discount branch from 30b7483 to e857669 Compare January 7, 2025 19:23

Merge branch 'main' of github.com:Expensify/App into parasharrajat/ea…

498fc03

…rly-discount

parasharrajat force-pushed the parasharrajat/early-discount branch from e857669 to 498fc03 Compare January 13, 2025 11:33

parasharrajat added 4 commits January 13, 2025 18:43

Code cleanup

6163322

add tests for utils

f6468dd

Formatting and translations

8ba3ed9

translations and fixes

9538707

parasharrajat marked this pull request as ready for review January 15, 2025 22:36

parasharrajat requested review from a team as code owners January 15, 2025 22:36

melvin-bot bot requested a review from eVoloshchak January 15, 2025 22:36

melvin-bot bot removed the request for review from a team January 15, 2025 22:36

parasharrajat added 2 commits January 16, 2025 04:17

Merge branch 'main' of github.com:Expensify/App into parasharrajat/ea…

466fdbe

…rly-discount

Fix lint issues

812184c

youssef-lr added the Ready To Build label Jan 16, 2025

Add claim param to API

b2a4b01

youssef-lr reviewed Jan 16, 2025

View reviewed changes

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

parasharrajat requested a review from eVoloshchak January 22, 2025 09:02

eVoloshchak approved these changes Jan 22, 2025

View reviewed changes

youssef-lr approved these changes Jan 22, 2025

View reviewed changes

youssef-lr changed the title ~~Early discount countdown banner~~ [HOLD] Early discount countdown banner Jan 22, 2025

youssef-lr changed the title ~~[HOLD] Early discount countdown banner~~ Early discount countdown banner Jan 22, 2025

youssef-lr changed the title ~~Early discount countdown banner~~ [HOLD Web-E #45151] Early discount countdown banner Jan 22, 2025

youssef-lr changed the title ~~[HOLD Web-E #45151] Early discount countdown banner~~ Early discount countdown banner Jan 24, 2025

youssef-lr merged commit 4b8278b into Expensify:main Jan 24, 2025
21 checks passed

hungvu193 mentioned this pull request Jan 28, 2025

[HOLD for payment 2025-02-06] [HOLD for payment 2025-02-05] Onboarding-"Claim Offer" in #admins remains after deleting workspace,which opens not here page #55838

Closed

8 tasks

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

[HOLD for payment 2025-02-05] [Early Adoption Discount] - Implement the early discount countdown banner #54817

Closed

nkdengineer mentioned this pull request Jan 29, 2025

[$250] Onboarding - Empty space next to "Schedule demo" button #55836

Closed

8 tasks

shubham1206agra mentioned this pull request May 12, 2025

[Due for payment 2025-05-13] [$250] Admin - "Schedule demo" text is misaligned when language set as Spanish. #58974

Closed

8 tasks

Early discount countdown banner #54901

Early discount countdown banner #54901

Uh oh!

Conversation

parasharrajat commented Jan 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Claiming the first discount

Claiming the second discount

Period past 8 days

Offline tests

QA Steps

Prerequisites:

Claiming the first discount

Claiming the second discount

Period past 8 days

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Jan 15, 2025

Uh oh!

shawnborton commented Jan 16, 2025

Uh oh!

youssef-lr commented Jan 16, 2025

Uh oh!

github-actions bot commented Jan 16, 2025

Uh oh!

parasharrajat commented Jan 16, 2025

Uh oh!

github-actions bot commented Jan 16, 2025

Uh oh!

dannymcclain commented Jan 16, 2025

Uh oh!

youssef-lr commented Jan 16, 2025

Uh oh!

Uh oh!

eVoloshchak commented Jan 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

eVoloshchak left a comment

Choose a reason for hiding this comment

Uh oh!

parasharrajat commented Jan 22, 2025

Uh oh!

youssef-lr left a comment

Choose a reason for hiding this comment

Uh oh!

parasharrajat commented Jan 22, 2025

Uh oh!

youssef-lr commented Jan 24, 2025

Uh oh!

Uh oh!

github-actions bot commented Jan 28, 2025

Uh oh!

kavimuru commented Jan 28, 2025

Uh oh!

parasharrajat commented Jan 28, 2025

Uh oh!

youssef-lr commented Jan 28, 2025

Uh oh!

youssef-lr commented Jan 28, 2025

Uh oh!

kavimuru commented Jan 28, 2025

Uh oh!

github-actions bot commented Jan 29, 2025

Uh oh!

shubham1206agra commented May 12, 2025

Uh oh!

parasharrajat commented May 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

shubham1206agra commented May 12, 2025

Uh oh!

parasharrajat commented May 12, 2025

Uh oh!

Uh oh!

parasharrajat commented Jan 7, 2025 •

edited

Loading

eVoloshchak commented Jan 22, 2025 •

edited

Loading

parasharrajat commented May 12, 2025 •

edited

Loading