feat: implement card section for subscription #42787

pasyukevich · 2024-05-29T19:02:04Z

Details

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)
}, [])

Fixed Issues

$ #38616
PROPOSAL:

Tests

Login into the app
Open 'Subscription' page
Verify that the section is rendered correctly from the desktop and browser, "Add payment card" showed
Verify that the section is rendered correctly from the mobile, reduced functionality message and add payment card showed

Verify that no errors appear in the JS console

Offline tests

QA Steps

Same as Tests section above

Verify that no errors appear in the JS console

PR Author Checklist

I linked the correct issue in the ### Fixed Issues section above
I wrote clear testing steps that cover the changes made in this PR
- I added steps for local testing in the Tests section
- I added steps for the expected offline behavior in the Offline steps section
- I added steps for Staging and/or Production testing in the QA steps section
- I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
I included screenshots or videos for tests on all platforms
I ran the tests on all platforms & verified they passed on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
I followed proper code patterns (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
  - If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
- 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 followed the guidelines as stated in the Review Guidelines
I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
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
I verified that if a function's arguments changed that all usages have also been updated correctly
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.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

rezkiy37

Left comments.

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

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

src/pages/settings/Subscription/CardSection/CardSectionActions/index.native.tsx

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

src/pages/settings/Subscription/CardSection/CardSectionDataEmpty/index.native.tsx

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

src/pages/settings/Subscription/ReducedFunctionalityMessage/index.native.tsx

src/pages/settings/Subscription/ReducedFunctionalityMessage/index.tsx

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

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

melvin-bot · 2024-06-03T13:56:03Z

@s77rt 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/styles/index.ts

shawnborton · 2024-06-03T15:00:30Z

src/styles/index.ts

+        subscriptionCardIcon: {
+            padding: 10,
+            backgroundColor: theme.border,
+            borderRadius: 10,


Where are these values coming from? cc @dannymcclain @dubielzyk-expensify

It maybe looks like these styles are for this little guy?

And I'm assuming that the 10px padding is coming from the fact that the container is 40px and the icon is 20px, though I would probably just set an explicit width and height on the container and let the icon sit in the center (but maybe that's just me).

The border radius should definitely be using one of our variables—and it should be equal to 8px.

Nice, I agree that the border radius should be 8 and that we should just vertically/horizontally center the icon within the space if we can.

src/styles/index.ts

shawnborton · 2024-06-03T15:01:28Z

src/styles/index.ts

@@ -2791,6 +2795,16 @@ const styles = (theme: ThemeColors) =>
            color: theme.textSupporting,
        },

+        sectionListMutedInfo: {


Can you show a screenshot of what these styles do exactly?

removed and updated to existing styles

it was used for the message above "Add card" block

src/styles/index.ts

src/pages/settings/Subscription/ReducedFunctionalityMessage/index.native.tsx

src/pages/settings/Subscription/CardSection/CardSectionDataEmpty/index.native.tsx

s77rt · 2024-06-03T17:13:00Z

On native the card description overflows and wraps making the card icon not well positioned
On web the card description overflows and clips and the three dots button is not aligned

pasyukevich · 2024-06-04T14:55:22Z

fixed

pasyukevich · 2024-06-04T15:16:45Z

@s77rt PR updated

dannymcclain · 2024-06-04T15:22:42Z

These card icons should be using our icon color. Looks like they're using our text color right now.

dannymcclain · 2024-06-04T15:35:29Z

should the "Card ending..." part be in bold text as well?

Ah yes it should. Good catch. That's what we have in Figma as well. 👍

dannymcclain · 2024-06-04T15:39:27Z

Ah snap. I just realized my comment here is incorrect.

Super sorry about that. Here are some labels to help out:

Payment card added

No payment card added (app)

Let me know if you have any questions, with all the different states things can get a bit confusing!

pasyukevich · 2024-06-04T15:46:33Z

@dannymcclain @shawnborton

Icon colour and card title were fixed

shawnborton · 2024-06-04T15:49:10Z

Lovely! Minor nitpick but the gap between top text and bottom text doesn't seem to match what we're doing for the bank account row, in case we want those to be identical. In the bank account row, looks like we're adding 4px of top margin on the smaller gray label text below (2nd line)

s77rt · 2024-06-04T16:45:55Z

The icon background color does not match the design

Also the month is not formatted (not written in letters)

s77rt · 2024-06-04T16:52:07Z

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

+        [translate],
+    );
+
+    const handleIconPress = useCallback(() => {


Function name should explicitly reflect what it does e.g. calculateAndSetThreeDotsMenuPosition

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

pasyukevich · 2024-06-05T09:42:49Z

@s77rt The calculation of the next payment will be added among with API integration and related screens - #38617

s77rt · 2024-06-05T10:12:57Z

@pasyukevich I'm referring to the card icon background color and the month format. Also I just noticed that the spacing is different too (between the header text and the card row)

pasyukevich · 2024-06-05T12:57:59Z

@s77rt Background color, month format and offsets were updated

s77rt · 2024-06-05T13:22:22Z

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

+
+    const defaultCard = useMemo(() => Object.values(fundList ?? {}).find((card) => card.isDefault), [fundList]);
+
+    const cardMonth = useMemo(() => DateUtils.getMonthNames(preferredLocale)[(defaultCard?.accountData?.cardMonth ?? 1) - 1], [defaultCard, preferredLocale]);


Suggested change

const cardMonth = useMemo(() => DateUtils.getMonthNames(preferredLocale)[(defaultCard?.accountData?.cardMonth ?? 1) - 1], [defaultCard, preferredLocale]);

const cardMonth = useMemo(() => DateUtils.getMonthNames(preferredLocale)[(defaultCard?.accountData?.cardMonth ?? 1) - 1], [defaultCard?.accountData?.cardMonth, preferredLocale]);

NAB

s77rt · 2024-06-05T13:23:07Z

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

+
+    const defaultCard = useMemo(() => Object.values(fundList ?? {}).find((card) => card.isDefault), [fundList]);
+
+    const cardMonth = useMemo(() => DateUtils.getMonthNames(preferredLocale)[(defaultCard?.accountData?.cardMonth ?? 1) - 1], [defaultCard, preferredLocale]);


Does accountData.cardMonth start at 1?

I think so

@amyevans Could you confirm this?

cardMonth starts at 1, yes.

I don't understand the data source though (.isDefault, defaultCard?.accountData?). Are these just placeholders or is it supposed to be real data at this point? This is what should be used 😄 -

@amyevans Is that screenshot up to date? According to onyx types fundList is an object, it has isDefault field and the objects shown in your screenshot are nested inside accountData

Talked about this internally, we're not correctly populating the fundList onyx key in the backend. We're working on fixing it. @pasyukevich can you changed this back to what you had before? Then I think we're good to merge.

@blimpich reverted

s77rt · 2024-06-05T13:25:36Z

src/styles/index.ts

+            height: 40,
+            width: 40,


Suggested change

height: 40,

width: 40,

height: variables.iconSizeExtraLarge,

width: variables.iconSizeExtraLarge,

NAB

s77rt · 2024-06-05T13:25:42Z

src/styles/index.ts

+            height: 40,
+            width: 40,


s77rt · 2024-06-05T13:52: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

Networking issue

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

s77rt

Looks good to me. Let's merge after this is confirmed #42787 (comment)

OSBotify · 2024-06-06T16:52:56Z

✋ 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-11T23:33:01Z

🚀 Deployed to production by https://github.com/luacmartins in version: 1.4.81-11 🚀

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

feat: implement card section for subscription

183e74e

pasyukevich force-pushed the feature/card-section branch from 683fbfe to 183e74e Compare May 29, 2024 19:03

rezkiy37 suggested changes May 31, 2024

View reviewed changes

fabioh8010 reviewed Jun 3, 2024

View reviewed changes

fix comments

c1eda1b

pasyukevich force-pushed the feature/card-section branch from 3b1f397 to c1eda1b Compare June 3, 2024 11:10

fabioh8010 approved these changes Jun 3, 2024

View reviewed changes

JKobrynski reviewed Jun 3, 2024

View reviewed changes

pasyukevich added 3 commits June 3, 2024 14:34

update comments

bbb16bc

fix button width

48c09d7

Merge branch 'main' into feature/card-section

a4ef5b4

pasyukevich marked this pull request as ready for review June 3, 2024 13:55

pasyukevich requested review from a team as code owners June 3, 2024 13:55

melvin-bot bot removed the request for review from a team June 3, 2024 13:56

melvin-bot bot requested a review from s77rt June 3, 2024 13:56

shawnborton reviewed Jun 3, 2024

View reviewed changes

src/styles/index.ts Outdated Show resolved Hide resolved

shawnborton reviewed Jun 3, 2024

View reviewed changes

src/styles/index.ts Outdated Show resolved Hide resolved

shawnborton reviewed Jun 3, 2024

View reviewed changes

s77rt suggested changes Jun 3, 2024

View reviewed changes

pasyukevich added 2 commits June 4, 2024 16:49

fix ui

2f10793

Merge branch 'main' into feature/card-section

4b14b2d

fix button size

ca63fa4

pasyukevich force-pushed the feature/card-section branch from 29c8ed9 to ca63fa4 Compare June 4, 2024 15:16

fix text, icon color

39f5947

s77rt suggested changes Jun 4, 2024

View reviewed changes

narefyev91 mentioned this pull request Jun 4, 2024

Add payment card #42771

Merged

50 tasks

pasyukevich added 5 commits June 5, 2024 12:20

rename function, fix ui

477157a

Merge branch 'main' into feature/card-section

1dd9cd8

fix prettier

1f54598

fix card offset

cf233c0

fix month format

23152b5

s77rt reviewed Jun 5, 2024

View reviewed changes

fix comments

15109cd

s77rt approved these changes Jun 5, 2024

View reviewed changes

melvin-bot bot requested a review from blimpich June 5, 2024 13:53

pasyukevich added 2 commits June 5, 2024 16:54

fix billing card

138a897

revert default card

ec88580

blimpich approved these changes Jun 6, 2024

View reviewed changes

blimpich merged commit 05bcf8a into Expensify:main Jun 6, 2024
16 checks passed

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

Deploy Checklist: New Expensify 2024-06-10 #43344

Closed

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

[HOLD for payment 2024-06-20] [HOLD for payment 2024-06-18] [Payment card / Subscription] Implement “Payment card” section (UI) #38616

Closed

trjExpensify mentioned this pull request Jun 20, 2024

[Payment history] Add "View payment history" menu item #44119

Merged

50 tasks


		const defaultCard = useMemo(() => Object.values(fundList ?? {}).find((card) => card.isDefault), [fundList]);

		const cardMonth = useMemo(() => DateUtils.getMonthNames(preferredLocale)[(defaultCard?.accountData?.cardMonth ?? 1) - 1], [defaultCard, preferredLocale]);

feat: implement card section for subscription #42787

feat: implement card section for subscription #42787

Conversation

pasyukevich commented May 29, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

rezkiy37 left a comment

Choose a reason for hiding this comment

melvin-bot bot commented Jun 3, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

s77rt commented Jun 3, 2024 • edited Loading

pasyukevich commented Jun 4, 2024

pasyukevich commented Jun 4, 2024

dannymcclain commented Jun 4, 2024

dannymcclain commented Jun 4, 2024

dannymcclain commented Jun 4, 2024

pasyukevich commented Jun 4, 2024

shawnborton commented Jun 4, 2024

s77rt commented Jun 4, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pasyukevich commented Jun 5, 2024

s77rt commented Jun 5, 2024

pasyukevich commented Jun 5, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

blimpich Jun 5, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

s77rt commented Jun 5, 2024

Reviewer Checklist

Screenshots/Videos

s77rt left a comment

Choose a reason for hiding this comment

OSBotify commented Jun 6, 2024

OSBotify commented Jun 11, 2024

pasyukevich commented May 29, 2024 •

edited

Loading

s77rt commented Jun 3, 2024 •

edited

Loading

pasyukevich commented Jun 5, 2024 •

edited

Loading

blimpich Jun 5, 2024 •

edited

Loading