integrate payment card section with API by pasyukevich · Pull Request #43473 · Expensify/App

pasyukevich · 2024-06-11T13:00:01Z

Details

Prepare account for testing:

Sign up for an account on staging.expensify.com, go to Settings > Workspaces > New Workspace. Create a Collect workspace.

To access this newly created component, paste the following link into the browser

https://dev.new.expensify.com:8082/settings/subscription

or add this effect to InitialSettingsPage.tsx

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

Add card data to CardSection.tsx :

import Onyx from 'react-native-onyx';

useEffect(() => {
       Onyx.merge(ONYXKEYS.FUND_LIST, [{
           accountData: {
               cardMonth: 11,
       
               cardNumber: '1234',

               cardYear: 2026,
       
               currency: 'USD',
       
               addressName: 'John Doe',
           },
           isDefault: true,
       }]) 
   }, [fundList]);

Fixed Issues

$ #38618 #38617
PROPOSAL:

Tests

Login into the app with prepared account from the Detailed part
Open 'Subscription' page
Verify that the section is rendered correctly from the desktop and browser, "Add payment card" showed
Press "Add payment card"
Fill the form and submit
Verify that we now have next billing date info and card data
Press on three dots, click "Change payment card"
Varify that "Add payment card modal showed"

Verify that no errors appear in the JS console

Offline tests

QA Steps

Login into the app with prepared account from the Detailed part
Open 'Subscription' page
Verify that the section is rendered correctly from the desktop and browser, "Add payment card" showed
Press "Add payment card"
Fill the form and submit
Verify that we now have next billing date info and card data
Press on three dots, click "Change payment card"
Varify that "Add payment card modal showed"

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

MacOS: Desktop

melvin-bot · 2024-06-11T19:08:43Z

@rushatgabhane 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/pages/settings/Subscription/CardSection/CardSection.tsx

mananjadhav · 2024-06-11T20:39:04Z

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

+ * @returns - The next billing date in 'yyyy-MM-dd' format.
+ */
+function getNextBillingDate(initialDate: string): string {
+    const start = new Date(initialDate);


Should we add some validations for dates here? My experience with date-fns is that if the date is invalid, it'll throw an error.

cc - @amyevans

Yes to validation as a best practice if it's not too challenging, although the data from the BE should be pretty uniform so it'd have to be something very weird happening.

Also I mentioned this in another PR and @MrMuzyk said he might create a util, but due to timezone differences I think at least for now we should pass T00:00:00 so that the date is properly calculated (e.g. for me if my start date is 6/1/24 the next bill date should be 7/1/24, but it's currently showing 6/30/24)

Updated with validation and proper billing day

mananjadhav · 2024-06-11T20:41:28Z

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

+ * @param initialDate - The initial billing date in 'yyyy-MM-dd' format.
+ * @returns - The next billing date in 'yyyy-MM-dd' format.
+ */
+function getNextBillingDate(initialDate: string): string {


what do you think of this to get rid of while loop.

function getNextBillingDate(initialDate: string): string { const start = new Date(initialDate); const today = new Date(); // Calculate the number of months difference and add one if start date is before today const monthsDiff = differenceInMonths(today, start); const nextBillingDate = addMonths(start, monthsDiff + 1); return format(nextBillingDate, CONST.DATE.MONTH_DAY_YEAR_FORMAT); }

cc - @amyevans

Yeah if we can eliminate a loop that would be great!

mananjadhav · 2024-06-11T20:44:03Z

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

@@ -0,0 +1,21 @@
+import {addMonths, format, isBefore} from 'date-fns';


@amyevans Does it makes sense to add tests for this utils?

Yes I think that'd be good!

tests added

mananjadhav · 2024-06-11T20:59:41Z

I see some flicker from default text to next billing date. I am not sure if it's because of the default card useEffect.

flicker-card-number.mov

pasyukevich · 2024-06-12T13:42:27Z

@mananjadhav Yes, flickering happening because of test data

pasyukevich · 2024-06-12T15:31:07Z

@mananjadhav @amyevans PR is ready for rereview

mananjadhav · 2024-06-12T15:45:03Z

I’ll be able to review this in an hour.

mananjadhav · 2024-06-12T19:40:14Z

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

+        start = new Date();
+    }
+
+    const current = new Date(start);


a little lost here, isn't current === start ? Then what's the thought of adding differenceInMonths ?

My code I had used const today = new Date().

This is what I see now. The next payment date is in the past.

Problem fixed
I also found one more edge case and fixed it

I raised one more comment.

I haven't reviewed the function logic closely but just glancing at the expected next billing dates in the test, I wanted to clarify expected behavior... the next billing date should always be the first of the next month (internal ref)

I don't have the access to the link, but does that mean we don't even need the initialDate. We should always:

startOfMonth(addMonths(today, 1))

?

Yes we can simplify to that, apologies for not catching it sooner!

No worries. Better we caught this now.

@pasyukevich Can you take care of this change?

mananjadhav · 2024-06-12T19:41:35Z

I did the review again and except for the getNextBillingDate revised method, rest looks good to me.

mananjadhav · 2024-06-13T14:03:17Z

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

+    let nextBillingDate = addDays(addMonths(start, monthsDiff), 1);
+
+    if (nextBillingDate.toUTCString() < today.toUTCString()) {
+        nextBillingDate = addMonths(nextBillingDate, 1);


Is this fix to always ensure that the nextBillingDate is in the future? In this case should this be

Suggested change

nextBillingDate = addMonths(nextBillingDate, 1);

nextBillingDate = addMonths(today, 1);

?

yes, but this update is not doing same as now

In this case, we will have today's as a billing date

pasyukevich · 2024-06-14T11:36:10Z

@amyevans @mananjadhav

PR updated

amyevans

LGTM, @mananjadhav can you do a final review/complete the checklist?

amyevans · 2024-06-14T14:49:38Z

tests/unit/CardsSectionUtilsTest.ts

+describe('getNextBillingDate', () => {
+    beforeAll(() => {
+        jest.useFakeTimers();
+        jest.setSystemTime(new Date(2024, 6, 5));


NAB, maybe we can add a comment that month is zero-indexed? It tripped me up for a sec 😄

Done!

CC: @blimpich

Where is the comment? I think what Amy meant was something like this

Suggested change

jest.setSystemTime(new Date(2024, 6, 5));

// Month is zero indexed, so this is July 5th 2024

jest.setSystemTime(new Date(2024, 6, 5));

amyevans · 2024-06-14T21:40:10Z

Requesting final review from @blimpich as well since I'm headed out on extended leave after today

pasyukevich · 2024-06-14T21:54:51Z

For the next two weeks, I will be OOO

@JKobrynski will take to work on this issue

mananjadhav · 2024-06-19T06:38:50Z

Code changes are fine now. Working on the checklist.

mananjadhav · 2024-06-19T08:33:16Z

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

MacOS: Desktop

mananjadhav · 2024-06-19T18:44:02Z

@blimpich All yours.

blimpich

Code looks good to me, but I'm not able to successfully follow the QA steps. I get a bunch of errors when I try to follow the setup part of the QA to modify src/pages/settings/Subscription/CardSection/CardSection.tsx. And when I don't follow that it doesn't work.

Can we modify the QA steps to show exactly what diff should be applied to CardSection.tsx?

blimpich · 2024-06-19T21:59:49Z

tests/unit/CardsSectionUtilsTest.ts

+describe('getNextBillingDate', () => {
+    beforeAll(() => {
+        jest.useFakeTimers();
+        jest.setSystemTime(new Date(2024, 6, 5));


Where is the comment? I think what Amy meant was something like this

Suggested change

jest.setSystemTime(new Date(2024, 6, 5));

// Month is zero indexed, so this is July 5th 2024

jest.setSystemTime(new Date(2024, 6, 5));

JKobrynski · 2024-06-20T07:17:24Z

@blimpich forgot to push 🤦 now it should be fine

blimpich · 2024-06-20T18:58:06Z

I'm still not able to QA this, shouldn't a card being showing up in the drop down?

Screen.Recording.2024-06-20.at.11.55.52.AM.mov

Can we modify the QA steps to show exactly what diff should be applied to CardSection.tsx?

Still curious about this. How exactly is CardSection.tsx suppose to be updated in order to QA this?

blimpich

Finally got it to QA successfully, sorry it took me so long. I think I had a typo the first time I tried to QA and it really threw me off. Looks good, lets get the conflicts fixed and merge this 👍

JKobrynski · 2024-06-21T11:39:29Z

@blimpich conflicts resolved!

OSBotify · 2024-06-21T16:21:19Z

✋ 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:43:25Z

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

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

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

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

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

integrate payment card section with API

1601259

pasyukevich force-pushed the feature/card-billing-banner-api-integration branch from 920840f to 1601259 Compare June 11, 2024 13:00

fix translations

049a75c

pasyukevich marked this pull request as ready for review June 11, 2024 19:08

pasyukevich requested a review from a team as a code owner June 11, 2024 19:08

melvin-bot bot requested review from rushatgabhane and removed request for a team June 11, 2024 19:08

amyevans requested review from mananjadhav and removed request for rushatgabhane June 11, 2024 20:05

mananjadhav reviewed Jun 11, 2024

View reviewed changes

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

mananjadhav reviewed Jun 11, 2024

View reviewed changes

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

mananjadhav reviewed Jun 11, 2024

View reviewed changes

add tests, update utils , address comments

b6fe126

mananjadhav reviewed Jun 12, 2024

View reviewed changes

fix billing date calculation issue

abe1923

mananjadhav reviewed Jun 13, 2024

View reviewed changes

fix billing date

08e6547

amyevans previously approved these changes Jun 14, 2024

View reviewed changes

amyevans requested a review from blimpich June 14, 2024 21:40

blimpich requested a review from mananjadhav June 17, 2024 18:13

add comment to CardsSectionUtilsTest

2d624ca

mananjadhav approved these changes Jun 19, 2024

View reviewed changes

narefyev91 mentioned this pull request Jun 19, 2024

Add billing currency #43572

Merged

50 tasks

blimpich requested changes Jun 19, 2024

View reviewed changes

update comment in CardsSectionUtilsTest

59b2bf5

JKobrynski dismissed amyevans’s stale review via 59b2bf5 June 20, 2024 07:16

Merge branch 'main' into feature/card-billing-banner-api-integration

e1b6425

blimpich previously approved these changes Jun 20, 2024

View reviewed changes

Merge branch 'main' into feature/card-billing-banner-api-integration

134e433

JKobrynski dismissed blimpich’s stale review via 134e433 June 21, 2024 11:39

blimpich approved these changes Jun 21, 2024

View reviewed changes

blimpich merged commit 9817d3c into Expensify:main Jun 21, 2024

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

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

Closed

This was referenced Jun 24, 2024

Android - Add payment card - Button "add payment card" is not present #44265

Closed

Add payment card - Unable to add payment card to account #44267

Closed

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

[HOLD for payment 2024-07-10] [HOLD for payment 2024-07-02] [Payment card / Subscription] Implement “Edit payment card” action #38618

Closed

		@@ -0,0 +1,21 @@
		import {addMonths, format, isBefore} from 'date-fns';

	nextBillingDate = addMonths(nextBillingDate, 1);
	nextBillingDate = addMonths(today, 1);

	jest.setSystemTime(new Date(2024, 6, 5));
	// Month is zero indexed, so this is July 5th 2024
	jest.setSystemTime(new Date(2024, 6, 5));

Conversation

pasyukevich commented Jun 11, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Jun 11, 2024

Uh oh!

Uh oh!

Uh oh!

mananjadhav Jun 11, 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!

mananjadhav Jun 11, 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!

Choose a reason for hiding this comment

Uh oh!

mananjadhav commented Jun 11, 2024

Uh oh!

pasyukevich commented Jun 12, 2024

Uh oh!

pasyukevich commented Jun 12, 2024

Uh oh!

mananjadhav commented Jun 12, 2024

Uh oh!

mananjadhav Jun 12, 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!

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!

mananjadhav commented Jun 12, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

pasyukevich Jun 13, 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!

pasyukevich commented Jun 14, 2024

Uh oh!

amyevans left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

pasyukevich commented Jun 11, 2024 •

edited

Loading

mananjadhav Jun 11, 2024 •

edited

Loading

mananjadhav Jun 11, 2024 •

edited

Loading

mananjadhav Jun 12, 2024 •

edited

Loading

pasyukevich Jun 13, 2024 •

edited

Loading

JKobrynski Jun 18, 2024 •

edited

Loading

blimpich Jun 19, 2024 •

edited

Loading

mananjadhav commented Jun 19, 2024 •

edited

Loading

blimpich Jun 19, 2024 •

edited

Loading

blimpich left a comment •

edited

Loading