fix-45503: update trial copy issues #45527

allroundexperts · 2024-07-16T21:05:10Z

Details

This PR updates the logic that shows the subscription ended text if there is a card already added.

Fixed Issues

Tests

Create a new account and a new workspace.
Open the subscription settings and execute the following in console.

Onyx.merge('fundList', {
    'fundA': {
        methodID: 1,
        key: 'fundA',
        accountData: {
            cardMonth: 11,
    
            cardNumber: '1234',

            cardYear: 2026,
    
            currency: 'USD',
    
            addressName: 'John Doe',

            additionalData: {
                isBillingCard: true,
            }
        },
        isDefault: true,
    },
});

Onyx.merge('nvp_expensify_billingFundID', 1);

Refresh the page and verify that add a payment card copy does not appear as a subtitle in the subscription settings.
Execute the following code in the console, replacing the day with the current day.

        Onyx.merge('nvp_private_lastDayFreeTrial', '2024-07-17 01:06:39');

Refresh the page, and verify that the x days remaining in the banner do not show up. Instead, it should show the next payment date.

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

Android: mWeb Chrome

Screen.Recording.2024-07-17.at.1.47.10.AM.mov

Screen.Recording.2024-07-17.at.1.37.13.AM.mov

iOS: Native

iOS: mWeb Safari

Screen.Recording.2024-07-17.at.1.47.56.AM.mov

Screen.Recording.2024-07-17.at.1.39.31.AM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-07-17.at.1.24.41.AM.mov

Screen.Recording.2024-07-17.at.1.25.00.AM.mov

MacOS: Desktop

Screen.Recording.2024-07-17.at.1.30.32.AM.mov

melvin-bot · 2024-07-16T21:05:16Z

@aimane-chnaif 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]

aimane-chnaif · 2024-07-16T21:06:36Z

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: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

during a trial

trial ended

MacOS: Desktop

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

chiragsalian

nice thank you. LGTM

OSBotify · 2024-07-17T02:13:52Z

✋ 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-07-18T14:13:30Z

🚀 Deployed to staging by https://github.com/chiragsalian in version: 9.0.9-1 🚀

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

OSBotify · 2024-07-19T11:56:11Z

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.0.9-2 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

OSBotify · 2024-07-19T19:38:22Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.0.9-5 🚀

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

OSBotify · 2024-07-23T08:04:19Z

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

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

update subscription issues

bec38b6

allroundexperts requested a review from a team as a code owner July 16, 2024 21:05

melvin-bot bot requested review from aimane-chnaif and removed request for a team July 16, 2024 21:05

remove unused var

5869792

aimane-chnaif reviewed Jul 16, 2024

View reviewed changes

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

handle comments

9ebd971

aimane-chnaif approved these changes Jul 16, 2024

View reviewed changes

melvin-bot bot requested a review from chiragsalian July 16, 2024 22:01

chiragsalian approved these changes Jul 17, 2024

View reviewed changes

chiragsalian merged commit 92721ef into Expensify:main Jul 17, 2024
15 of 16 checks passed

github-actions bot mentioned this pull request Jul 18, 2024

Deploy Checklist: New Expensify 2024-07-18 #45680

Closed

61 tasks

melvin-bot bot mentioned this pull request Jul 19, 2024

[HOLD for payment 2024-07-26] [Free trial] Update/Remove the Free banner when a payment card is added during a trial or after a trial has ended #45503

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix-45503: update trial copy issues #45527

fix-45503: update trial copy issues #45527

allroundexperts commented Jul 16, 2024 •

edited

Loading

melvin-bot bot commented Jul 16, 2024

aimane-chnaif commented Jul 16, 2024 •

edited

Loading

chiragsalian left a comment

OSBotify commented Jul 17, 2024

OSBotify commented Jul 18, 2024

OSBotify commented Jul 19, 2024

OSBotify commented Jul 19, 2024

OSBotify commented Jul 23, 2024

fix-45503: update trial copy issues #45527

fix-45503: update trial copy issues #45527

Conversation

allroundexperts commented Jul 16, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jul 16, 2024

aimane-chnaif commented Jul 16, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

chiragsalian left a comment

Choose a reason for hiding this comment

OSBotify commented Jul 17, 2024

OSBotify commented Jul 18, 2024

OSBotify commented Jul 19, 2024

OSBotify commented Jul 19, 2024

OSBotify commented Jul 23, 2024

allroundexperts commented Jul 16, 2024 •

edited

Loading

aimane-chnaif commented Jul 16, 2024 •

edited

Loading