Add payment card #42771

narefyev91 · 2024-05-29T15:30:34Z

Details

Implement “Add payment card” screen (UI)
Generally build new component for rendering any kind of Adding payment card form.
Replaced form for Wallet debit card, Owner workspace debit card and Add payment card for subscription

Fixed Issues

$ #38634
PROPOSAL:

Tests

Go to settings/subscription/add-payment-card
Verify that user can see add debit card
Click Add payment card
Verify that user will see errors with required fields
Fill all required fields
Verify that no errors are shown

Verify that no errors appear in the JS console

Offline tests

Go to settings/subscription/add-payment-card
Verify that user can see add debit card
Click Add payment card
Verify that user will see errors with required fields
Fill all required fields
Verify that no errors are shown
Verify that save button is disabled

QA Steps

Go to settings/subscription/add-payment-card
Verify that user can see add debit card
Click Add payment card
Verify that user will see errors with required fields
Fill all required fields
Verify that no errors are shown

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-05-31T09:06:37Z

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

shawnborton · 2024-05-31T09:08:48Z

Looks like we have a small unneeded margin at the bottom of the view:

narefyev91 · 2024-05-31T09:09:50Z

@shawnborton hey! can i get a review for add payment card screen, please? It maybe some not correct margin between elements - without dev mode hard to check(picked the same as we had for other add debit card screen - 20px). I requested 10 times for dev mode in figma - lol

shawnborton · 2024-05-31T09:10:02Z

src/components/Section/IconSection.tsx

 };

-function IconSection({icon, iconContainerStyles}: IconSectionProps) {
+function IconSection({icon, iconContainerStyles, width = variables.iconSection, height = variables.iconSection}: IconSectionProps) {


Rather than using 68x68 here, should we use 48x48 like we do for most other simple illustrations in product? cc @dannymcclain @dubielzyk-expensify for thoughts there. This way we don't need to create a new icon size variable either.

Yeah probably this is example where 68 is using. Just let me know if we need to swap to 48x48 by default

Yeah, we typically use 48x48 everywhere in the product these days for this type of illustration, so we might want to be consistent here as well. Let's see what the design team thinks.

Yeah I'm aligned using 48x48 here

Okay cool, @narefyev91 can we try the icon using our standard 48x48 size please? Thanks!

yeah - will update

narefyev91 · 2024-05-31T09:11:03Z

Looks like we have a small unneeded margin at the bottom of the view:

well it's show because we move out from screen - and scroll appears

shawnborton · 2024-05-31T09:11:56Z

yes, but the scroll should be flush with the bottom of the view.

shawnborton · 2024-05-31T09:12:17Z

The padding/spacing looks pretty good to me, but looping in @Expensify/design for some eyes too.

narefyev91 · 2024-05-31T09:12:24Z

Looks like we have a small unneeded margin at the bottom of the view:

well it's show because we move out from screen - and scroll appears

@shawnborton like here

Screen.Recording.2024-05-31.at.12.11.31.mov

narefyev91 · 2024-05-31T09:14:43Z

yes, but the scroll should be flush with the bottom of the view.

ohhh got what you are saying!
@shawnborton should be like this one?

Screen.Recording.2024-05-31.at.12.15.29.mov

shawnborton · 2024-05-31T09:18:53Z

Exactly!

narefyev91 · 2024-05-31T09:19:52Z

Exactly!

yeah! cool fixed!

Screen.Recording.2024-05-31.at.12.19.14.mov

shawnborton · 2024-05-31T09:21:06Z

Much better, thanks!

trjExpensify · 2024-05-31T12:06:56Z

@rushatgabhane is going to review!

dubielzyk-expensify · 2024-06-02T22:09:15Z

Is there some padding or something weird going on at the bottom here on the main screen with the fields?

It looks like there's some empty space there when scrolling

narefyev91 · 2024-06-03T03:18:08Z

Is there some padding or something weird going on at the bottom here on the main screen with the fields?

It looks like there's some empty space there when scrolling

Yeah - it was fixed here
#42771 (comment)

rushatgabhane · 2024-06-03T09:27:19Z

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

Screen.Recording.2024-06-04.at.22.18.29.mov

MacOS: Desktop

rushatgabhane

@narefyev91 im unable to click "I accept" checkbox

Screen.Recording.2024-06-03.at.12.45.48.mov

narefyev91 · 2024-06-03T09:56:50Z

@narefyev91 im unable to click "I accept" checkbox

Screen.Recording.2024-06-03.at.12.45.48.mov

Yeah I faced the same issue when open dev menu in the bottom. Let me check - probably something from currency select is overlapping

github-actions · 2024-06-03T12:00:38Z

CLA Assistant Lite bot All contributors have signed the CLA ✍️ ✅

narefyev91 · 2024-06-03T12:02:44Z

I have read the CLA Document and I hereby sign the CLA

narefyev91 · 2024-06-03T13:03:36Z

recheck

…nent

This reverts commit 09724ef2fd252eb2b3a6891b12f7c45b01c184e5.

amyevans · 2024-06-05T14:03:27Z

src/pages/workspace/members/WorkspaceOwnerPaymentCardForm.tsx

+            shouldShowPaymentCardForm={shouldShowPaymentCardForm}
+            addPaymentCard={addPaymentCard}
+            showCurrencyField
+            isDebitCard


Suggested change

isDebitCard

The form on this page should be the payment card, not debit card/wallet

@amyevans are you sure?
Based on how was implemented WorkspaceOwnerPaymentCardForm - i see that it used debit card translation

Brought the question to Slack

@amyevans updated

amyevans

Looks great!

OSBotify · 2024-06-05T18:38:24Z

✋ 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:32:55Z

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

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

blimpich · 2024-06-19T23:01:33Z

Created follow up polish issue related to this: #44051

jayeshmangwani · 2024-07-17T19:43:20Z

src/pages/workspace/members/WorkspaceOwnerChangeWrapperPage.tsx

@@ -67,7 +67,7 @@ function WorkspaceOwnerChangeWrapperPage({route, policy}: WorkspaceOwnerChangeWr
                        Navigation.navigate(ROUTES.WORKSPACE_MEMBER_DETAILS.getRoute(policyID, accountID));
                    }}
                />
-                <View style={[styles.containerWithSpaceBetween, styles.ph5, error === CONST.POLICY.OWNERSHIP_ERRORS.NO_BILLING_CARD ? styles.pb0 : styles.pb5]}>
+                <View style={[styles.containerWithSpaceBetween, error !== CONST.POLICY.OWNERSHIP_ERRORS.NO_BILLING_CARD ? styles.ph5 : styles.ph0, styles.pb0]}>


Removing styles.pb5 caused the issue #44825 where the Transfer Owner's 'Continue' button was missing a bottom margin.

narefyev91 changed the base branch from feature-payment-card-subscription to main May 29, 2024 15:44

narefyev91 marked this pull request as ready for review May 31, 2024 09:06

narefyev91 requested review from a team as code owners May 31, 2024 09:06

melvin-bot bot requested review from dukenv0307 and removed request for a team May 31, 2024 09:06

shawnborton reviewed May 31, 2024

View reviewed changes

trjExpensify requested review from rushatgabhane and removed request for dukenv0307 May 31, 2024 12:06

rushatgabhane suggested changes Jun 3, 2024

View reviewed changes

narefyev91 requested a review from rushatgabhane June 3, 2024 12:01

narefyev91 and others added 14 commits June 5, 2024 11:13

Migrate debit card page for wallet to use one standard add card compo…

75964e2

…nent

nit

8bde82a

add navigation

f7271b5

changes after design review

32b73b5

update owner wrapper

de7b7e3

updates after design and c+ review

32bf15f

Revert "updates after design and c+ review"

76dbab1

This reverts commit 09724ef2fd252eb2b3a6891b12f7c45b01c184e5.

updates after design and c+ review

486f058

lint

8ddbed9

merge conflicts

788db62

update border radius

8088eb3

fix currency modal

6f33179

fix ts

d659ef3

add suggested changes

0652324

narefyev91 force-pushed the add-payment-card branch from e038f25 to 0652324 Compare June 5, 2024 08:18

narefyev91 requested a review from amyevans June 5, 2024 08:24

amyevans requested changes Jun 5, 2024

View reviewed changes

narefyev91 requested a review from amyevans June 5, 2024 16:15

remove isdebit

dcd4dfd

amyevans approved these changes Jun 5, 2024

View reviewed changes

amyevans merged commit 70ecf7d into Expensify:main Jun 5, 2024
16 checks passed

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

Deploy Checklist: New Expensify 2024-06-06 #43168

Closed

kbecciv mentioned this pull request Jun 6, 2024

[HOLD for payment 2024-06-28] [Payment card / Subscription] [$250] Subscription - Keyboard opens when neither of the fields are in focus after selecting currency #43181

Closed

6 tasks

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

[HOLD for payment 2024-06-20][Payment card / Subscription] Implement “Add payment card” screen (UI) #38634

Closed

blimpich mentioned this pull request Jun 18, 2024

[Payment card / Subscription] refactor ADD_DEBIT_CARD_FORM Onyx key to be agnostic of debit vs credit in subscription context #43963

Closed

jayeshmangwani reviewed Jul 17, 2024

View reviewed changes

jayeshmangwani mentioned this pull request Jul 17, 2024

[HOLD for payment 2024-07-24] [$125] Transfer owner - "Continue" button is missing bottom margin #44825

Closed

6 tasks

Add payment card #42771

Add payment card #42771

Conversation

narefyev91 commented May 29, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented May 31, 2024

shawnborton commented May 31, 2024

narefyev91 commented May 31, 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

narefyev91 commented May 31, 2024

shawnborton commented May 31, 2024

shawnborton commented May 31, 2024

narefyev91 commented May 31, 2024

narefyev91 commented May 31, 2024 • edited Loading

shawnborton commented May 31, 2024

narefyev91 commented May 31, 2024

shawnborton commented May 31, 2024

trjExpensify commented May 31, 2024

dubielzyk-expensify commented Jun 2, 2024

narefyev91 commented Jun 3, 2024

rushatgabhane commented Jun 3, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

rushatgabhane left a comment • edited Loading

Choose a reason for hiding this comment

narefyev91 commented Jun 3, 2024

github-actions bot commented Jun 3, 2024 • edited Loading

narefyev91 commented Jun 3, 2024

narefyev91 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

amyevans left a comment

Choose a reason for hiding this comment

OSBotify commented Jun 5, 2024

OSBotify commented Jun 11, 2024

blimpich commented Jun 19, 2024

Choose a reason for hiding this comment

narefyev91 commented May 29, 2024 •

edited

Loading

narefyev91 commented May 31, 2024 •

edited

Loading

narefyev91 commented May 31, 2024 •

edited

Loading

rushatgabhane commented Jun 3, 2024 •

edited

Loading

rushatgabhane left a comment •

edited

Loading

github-actions bot commented Jun 3, 2024 •

edited

Loading