feat: integrate retry billing with backend #44268

MrMuzyk · 2024-06-24T15:01:31Z

Details

Added Retry payment button and logic that retries the payment

Fixed Issues

$ #42434
PROPOSAL:

Tests

Go directly to subscription page - https://dev.new.expensify.com:8082/settings/subscription

have a failed payment that can be retried
retry payment
Verify that no errors appear in the JS console

Testing this might be tricky and may require some code changes in order to display both cases.

One way of testing is to have some cards added and modify util method in order to return
early object we want to check

For example: Edit src/pages/settings/Subscription/CardSection/utils.ts to return status early in getBillingStatus

    return {
        title: translate('subscription.billingBanner.policyOwnerAmountOwed.title'),
        subtitle: translate('subscription.billingBanner.policyOwnerAmountOwed.subtitle', {date: endDateFormatted}),
        isError: true,
        isRetryAvailable: true,
    };

Offline tests

QA Steps

Go directly to subscription page - https://dev.new.expensify.com:8082/settings/subscription

have a failed payment that can be retried
retry payment
Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2024-07-02.at.12.11.08.mov

MacOS: Desktop

…//github.com/pasyukevich/Expensify-app into feat/integrate-retry-billing-with-be

…egrate-retry-billing-with-be

…//github.com/JKobrynski/Expensify into feat/integrate-retry-billing-with-be

…egrate-retry-billing-with-be

melvin-bot · 2024-07-02T12:15:20Z

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

src/libs/DateUtils.ts

src/libs/SubscriptionUtils.ts

src/pages/settings/Subscription/CardSection/utils.ts

src/pages/settings/Subscription/utils.ts

src/libs/DateUtils.ts

MrMuzyk · 2024-07-03T11:31:15Z

This seems to me like unnatural state - if you there is nothing to retry you normally wouldnt see the button. How did you achieve this state?

mananjadhav · 2024-07-03T11:36:31Z

Agreed this is an unlikely stage but API could fail because of any error. This one I accidentally made the purchase on my real card.

MrMuzyk · 2024-07-03T11:45:04Z

Well, this scenario is not handled, but then again, this particular error shouldn't happen in real scenario. In order to display the button we have to first show it to the user.

There is one thing that is worth checking. There is a check that I believe should've handled it but for some reason didn't 🤔

        case SubscriptionUtils.PAYMENT_STATUS.RETRY_BILLING_ERROR:
            return {
                title: translate('subscription.billingBanner.retryBillingError.title'),
                subtitle: translate('subscription.billingBanner.retryBillingError.subtitle'),
                isError: true,
                isRetryAvailable: false,
            };

Could you check what is the subscriptionStatus returned inside getBillingStatus util at that time? I wonder why it didnt trigger this case

mananjadhav · 2024-07-03T11:47:15Z

That's because the ideal billing status for me is Trial period for the account I am using. I recently got my trial also extended. I had added a real card for testing and which I used to transact to retry the payment.

mananjadhav · 2024-07-03T11:49:19Z

I am getting a warning when trying retry several times on slow network. I think best to wrap with with useCallback?

MrMuzyk · 2024-07-03T11:50:15Z

That's because the ideal billing status for me is Trial period for the account I am using. I recently got my trial also extended. I had added a real card for testing and which I used to transact to retry the payment.

Seems like super edge case :D Can you check the subscriptionStatus that was returned in this case, Im curious what it was.

mananjadhav · 2024-07-03T11:51:20Z

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-retry-payment.mov

Android: mWeb Chrome

mweb-chrome-retry-button.mov

iOS: Native

ios-retry-payment.mov

iOS: mWeb Safari

mweb-safari-retry-payment.mov

MacOS: Chrome / Safari

web-retry-payment.mov

MacOS: Desktop

desktop-retry-payment.mov

mananjadhav · 2024-07-03T11:55:36Z

That's because the ideal billing status for me is Trial period for the account I am using. I recently got my trial also extended. I had added a real card for testing and which I used to transact to retry the payment.

Seems like super edge case :D Can you check the subscriptionStatus that was returned in this case, Im curious what it was.

Yeah I said we don't need to worry about my case. But what happens if the API fails in general?

MrMuzyk · 2024-07-03T11:58:09Z

In theory it should fall into this case:

    case SubscriptionUtils.PAYMENT_STATUS.RETRY_BILLING_ERROR:
        return {
            title: translate('subscription.billingBanner.retryBillingError.title'),
            subtitle: translate('subscription.billingBanner.retryBillingError.subtitle'),
            isError: true,
            isRetryAvailable: false,
        };

and we should display banner on top

MrMuzyk · 2024-07-03T11:59:37Z

I am getting a warning when trying retry several times on slow network. I think best to wrap with with useCallback?

Im on web but I couldnt reproduce that. Button is disabled for the time of request so it shouldn't be a problem

slow-3g.mp4

MrMuzyk · 2024-07-03T12:03:39Z

I believe that testing this is super tricky in general on our end because we do need to temper with code and its not a natural flow. Im aware that it might need some followup fixes if some edge cases popup.

mananjadhav · 2024-07-03T12:15:36Z

Can you try on Android? Because for me on the Android emulator it is completely unusable. It shows a warning and loader also takes a lot of time?

MrMuzyk · 2024-07-03T12:20:24Z

Yeah, checking

MrMuzyk · 2024-07-03T13:28:57Z

Sorry it took so long, android things 😓 Had to wipe the whole thing and rebuild from scratch. Anyway, here is video without any network throttling. On poor LTE it also worked fine. Not sure how well this feature works on android but when Ive swapped network type to poor GSM it loaded for like 2 min so I didnt record retrying that :D

android-retry.mp4

mananjadhav · 2024-07-03T16:45:09Z

Weird I can't reproduce the issue anymore.

blimpich

Yeah testing this is quite tricky. I think we're good to move forward though. @mananjadhav I checked off the android portion of your reviewer checklist since @MrMuzyk showed the android version working correctly.

There will probably be follow up as we start testing this with more end-to-end flows, and that is okay 👍

OSBotify · 2024-07-03T18:29:22Z

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

mananjadhav · 2024-07-03T19:16:35Z

Thanks @blimpich. Yeah I couldn't reproduce the issue at my end, and I was able to test it successfully. I uploaded the Android video.

OSBotify · 2024-07-03T20:01:15Z

🚀 Deployed to staging by https://github.com/blimpich in version: 9.0.4-0 🚀

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

OSBotify · 2024-07-04T22:13:42Z

🚀 Cherry-picked to staging by https://github.com/tgolen in version: 9.0.4-5 🚀

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-10T10:59:53Z

🚀 Deployed to production by https://github.com/Julesssss in version: 9.0.5-13 🚀

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

OSBotify · 2024-07-15T20:20:12Z

🚀 Deployed to production by https://github.com/thienlnam in version: 9.0.6-8 🚀

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

c3024 · 2024-08-15T01:01:17Z

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

+                        isDisabled={isOffline || !billingStatus?.isRetryAvailable}
+                        isLoading={subscriptionRetryBillingStatusPending}
+                        onPress={handleRetryPayment}
+                        style={[styles.w100, styles.mt5]}


There is a case where when the first menu item is Request early cancellation, there is no space between Add payment card and Request early cancellation.

@c3024 can you provide a screenshot and repro steps? Then I will make a issue and cc you on it

Sorry, it was already fixed here #46690. I mentioned this as part of the BZ checklist. I forgot to link the issue here. #46180

MrMuzyk added 21 commits June 21, 2024 07:23

feat: integrate retry billing button

c42fcf5

Merge branch 'feature/billing-banner-logic-api-integration' of https:…

cb8ff38

…//github.com/pasyukevich/Expensify-app into feat/integrate-retry-billing-with-be

before rebase

68fcbcd

Merge branch 'main' of https://github.com/Expensify/App into feat/int…

a17098b

…egrate-retry-billing-with-be

Merge branch 'main' of https://github.com/Expensify/App into feat/int…

3088fc7

…egrate-retry-billing-with-be

Merge branch 'feature/billing-banner-logic-api-integration' of https:…

0244145

…//github.com/JKobrynski/Expensify into feat/integrate-retry-billing-with-be

feat: rebased with dependant pr

0a926e2

fix: corrections

24683fb

fix: linter

cf58319

Merge branch 'feature/billing-banner-logic-api-integration' of https:…

a012abd

…//github.com/JKobrynski/Expensify into feat/integrate-retry-billing-with-be

feat: after rebase

ede1df8

Merge branch 'feature/billing-banner-logic-api-integration' of https:…

8d64503

…//github.com/JKobrynski/Expensify into feat/integrate-retry-billing-with-be

Merge branch 'feature/billing-banner-logic-api-integration' of https:…

1b29ec4

…//github.com/JKobrynski/Expensify into feat/integrate-retry-billing-with-be

feat: small refactor

083cc5f

Merge branch 'feature/billing-banner-logic-api-integration' of https:…

b526306

…//github.com/JKobrynski/Expensify into feat/integrate-retry-billing-with-be

fix: checks fix

0ba0a60

fix: move retry payment button

025af1c

Merge branch 'main' of https://github.com/Expensify/App into feat/int…

0ac4188

…egrate-retry-billing-with-be

fix: small corrections

962f925

fix: unit test

ee8aeba

feat: handle new card when card expired scenario

0ee9313

MrMuzyk marked this pull request as ready for review July 2, 2024 12:15

MrMuzyk requested a review from a team as a code owner July 2, 2024 12:15

melvin-bot bot requested review from allroundexperts and removed request for a team July 2, 2024 12:15

trjExpensify requested review from mananjadhav and removed request for allroundexperts July 2, 2024 12:25

mananjadhav reviewed Jul 2, 2024

View reviewed changes

fix: cr fixes

56974f4

mananjadhav approved these changes Jul 3, 2024

View reviewed changes

melvin-bot bot requested a review from blimpich July 3, 2024 16:46

blimpich approved these changes Jul 3, 2024

View reviewed changes

blimpich merged commit 208eb02 into Expensify:main Jul 3, 2024
14 of 16 checks passed

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

Deploy Checklist: New Expensify 2024-07-03 #44782

Closed

izarutskaya mentioned this pull request Jul 5, 2024

[Payment card / Subscription] There is no Retry payment button but payment failed #44917

Closed

6 tasks

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

[HOLD for payment 2024-07-22] [HOLD for payment 2024-07-17] [$250] [Payment card / Subscription] Integrate Retry billing button with backend data #42434

Closed

c3024 reviewed Aug 15, 2024

View reviewed changes

c3024 mentioned this pull request Aug 15, 2024

[HOLD for payment 2024-08-14] [$125][Payment card / Subscription] - No spacing between "Add payment card" and "Request early cancellation" button #46180

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: integrate retry billing with backend #44268

feat: integrate retry billing with backend #44268

MrMuzyk commented Jun 24, 2024 •

edited

Loading

melvin-bot bot commented Jul 2, 2024

MrMuzyk commented Jul 3, 2024

mananjadhav commented Jul 3, 2024

MrMuzyk commented Jul 3, 2024

mananjadhav commented Jul 3, 2024

mananjadhav commented Jul 3, 2024

MrMuzyk commented Jul 3, 2024

mananjadhav commented Jul 3, 2024 •

edited by blimpich

Loading

mananjadhav commented Jul 3, 2024

MrMuzyk commented Jul 3, 2024

MrMuzyk commented Jul 3, 2024

MrMuzyk commented Jul 3, 2024

mananjadhav commented Jul 3, 2024

MrMuzyk commented Jul 3, 2024

MrMuzyk commented Jul 3, 2024

mananjadhav commented Jul 3, 2024

blimpich left a comment

OSBotify commented Jul 3, 2024

mananjadhav commented Jul 3, 2024 •

edited

Loading

OSBotify commented Jul 3, 2024

OSBotify commented Jul 4, 2024

OSBotify commented Jul 10, 2024

OSBotify commented Jul 15, 2024

c3024 Aug 15, 2024

blimpich Aug 15, 2024

c3024 Aug 15, 2024 •

edited

Loading

feat: integrate retry billing with backend #44268

feat: integrate retry billing with backend #44268

Conversation

MrMuzyk commented Jun 24, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jul 2, 2024

MrMuzyk commented Jul 3, 2024

mananjadhav commented Jul 3, 2024

MrMuzyk commented Jul 3, 2024

mananjadhav commented Jul 3, 2024

mananjadhav commented Jul 3, 2024

MrMuzyk commented Jul 3, 2024

mananjadhav commented Jul 3, 2024 • edited by blimpich Loading

Reviewer Checklist

Screenshots/Videos

mananjadhav commented Jul 3, 2024

MrMuzyk commented Jul 3, 2024

MrMuzyk commented Jul 3, 2024

MrMuzyk commented Jul 3, 2024

mananjadhav commented Jul 3, 2024

MrMuzyk commented Jul 3, 2024

MrMuzyk commented Jul 3, 2024

mananjadhav commented Jul 3, 2024

blimpich left a comment

Choose a reason for hiding this comment

OSBotify commented Jul 3, 2024

mananjadhav commented Jul 3, 2024 • edited Loading

OSBotify commented Jul 3, 2024

OSBotify commented Jul 4, 2024

OSBotify commented Jul 10, 2024

OSBotify commented Jul 15, 2024

c3024 Aug 15, 2024

Choose a reason for hiding this comment

blimpich Aug 15, 2024

Choose a reason for hiding this comment

c3024 Aug 15, 2024 • edited Loading

Choose a reason for hiding this comment

MrMuzyk commented Jun 24, 2024 •

edited

Loading

mananjadhav commented Jul 3, 2024 •

edited by blimpich

Loading

mananjadhav commented Jul 3, 2024 •

edited

Loading

c3024 Aug 15, 2024 •

edited

Loading