fix: show RBR on Subscription row with exprired free trial #52742

daledah · 2024-11-19T07:34:41Z

Explanation of Change

Fixed Issues

$ #52598
PROPOSAL: #52598 (comment)

Tests

Open an account with free trial expired
Go to settings > Subscription
Verify that: RBR is displayed on LHN

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]."

Open an account with free trial expired
Go to settings > Subscription
Verify that: RBR is displayed on LHN

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-11-19.at.16.12.22.mov

Android: mWeb Chrome

Screen.Recording.2024-11-19.at.17.22.15.mov

iOS: Native

Screen.Recording.2024-11-19.at.17.22.58.mov

iOS: mWeb Safari

Screen.Recording.2024-11-19.at.17.23.18.mov

MacOS: Chrome / Safari

Screen.Recording.2024-11-19.at.14.45.59.mov

MacOS: Desktop

Screen.Recording.2024-11-19.at.17.35.43.mov

melvin-bot · 2024-11-19T10:38:08Z

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

hungvu193 · 2024-11-20T07:02:01Z

src/libs/SubscriptionUtils.ts

            // 2. Policy owner with amount owed, overdue (past grace period)
            if (hasGracePeriodOverdue()) {
                return {
+                    isError: true,


Can you also check if there's another status that isError should be true as well?

I'll take a look. Will update back soon.

Little bump

I'm thinking of syncing isError value between getBillingStatus and getSubscriptionStatus for consistency, but we should confirm if this should be expected with Internal before making changes.

Yes, they should be the same.
We also have this function:

function hasSubscriptionGreenDotInfo(): boolean { return getSubscriptionStatus()?.isError === false; }

So I think we just need to make sure, if isError isn't equal true, leave it undefined.

little bump, let's update it.

Thanks. Please update the tests as well

hungvu193 · 2024-11-26T02:05:26Z

src/libs/SubscriptionUtils.ts

            // 2. Policy owner with amount owed, overdue (past grace period)
            if (hasGracePeriodOverdue()) {
                return {
+                    isError: true,


Thanks. Please update the tests as well

daledah · 2024-11-26T19:29:01Z

@hungvu193 I updated the tests.

hungvu193 · 2024-11-27T02:17:47Z

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

Android: Native

Android.sub.mov

Android: mWeb Chrome

mChrome.Sub.mov

iOS: Native

IOSSub.mov

iOS: mWeb Safari

mSafarisub.mov

MacOS: Chrome / Safari

Chrome.sub.mov

MacOS: Desktop

DeskSub.mov

OSBotify · 2024-11-27T10:21:49Z

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

github-actions · 2024-11-28T14:47:39Z

🚀 Deployed to staging by https://github.com/cristipaval in version: 9.0.68-0 🚀

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

github-actions · 2024-11-30T13:52:14Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.0.68-7 🚀

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

daledah added 2 commits November 18, 2024 17:17

fix: show RBR on Subscription row with exprired free trial

83681f8

fix: unit test

e95786c

daledah marked this pull request as ready for review November 19, 2024 10:38

daledah requested a review from a team as a code owner November 19, 2024 10:38

melvin-bot bot requested review from hungvu193 and removed request for a team November 19, 2024 10:38

daledah mentioned this pull request Nov 19, 2024

[HOLD for payment 2024-12-07] [$250] No RBR on Subscription row in the LHN in settings if the free trial has expired #52598

Closed

8 tasks

This comment was marked as resolved.

Sign in to view

hungvu193 reviewed Nov 20, 2024

View reviewed changes

fix: sync getSubscriptionStatus and getBillingStatus

b63ef4e

hungvu193 suggested changes Nov 26, 2024

View reviewed changes

test: update SubscriptionUtilsTest

2bae4b2

hungvu193 approved these changes Nov 27, 2024

View reviewed changes

melvin-bot bot requested a review from cristipaval November 27, 2024 02:18

cristipaval approved these changes Nov 27, 2024

View reviewed changes

cristipaval merged commit f20aea3 into Expensify:main Nov 27, 2024

github-actions bot mentioned this pull request Nov 28, 2024

Deploy Checklist: New Expensify 2024-11-28 #53245

Closed

72 tasks

fix: show RBR on Subscription row with exprired free trial #52742

fix: show RBR on Subscription row with exprired free trial #52742

Uh oh!

Conversation

daledah commented Nov 19, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Nov 19, 2024

Uh oh!

This comment was marked as resolved.

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

hungvu193 Nov 22, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

daledah commented Nov 26, 2024

Uh oh!

hungvu193 commented Nov 27, 2024

Reviewer Checklist

Screenshots/Videos

Uh oh!

OSBotify commented Nov 27, 2024

Uh oh!

github-actions bot commented Nov 28, 2024

Uh oh!

github-actions bot commented Nov 30, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

daledah commented Nov 19, 2024 •

edited

Loading

hungvu193 Nov 22, 2024 •

edited

Loading