Feature/add assigned card tile and display expensify cards #26862

pac-guerreiro · 2023-09-06T10:59:27Z

Details

This PR adds assigned card tile with expensify card list to the wallet page.

Docs: https://docs.google.com/document/d/1rFxJ78vz5On6zSWzYa51B9v-tyLdC5pUsBeLOLig0t4/edit#bookmark=id.39u16xejrb8c

⚠️ This can only be merged after this PR - #26406

Fixed Issues

$ #22872
PROPOSAL:

Tests

Update the getComponent for SCREENS.SETTINGS.WALLET, in SettingsModalStackNavigator to import the component from ../../../pages/settings/Wallet/WalletPage/WalletPage
(OPTIONAL) Initialise cardList with mock data:

useEffect(() => {
   window.Onyx.merge(`cardList`, {
        'virtual': {
            key: 'virtual-1',
            cardID: 234523452345,
            state: 3,
            bank: 'Expensify',
            availableSpend:10000,
            domainName: 'Expensify',
            lastFourPAN: '2345',
            isVirtual: true,
            fraud: 'none',
        }, 
        'physical': {
            key: 'physical-1',
            cardID: 364782634872,
            state: 3,
            bank: '1000',
            availableSpend:10000,
            domainName: 'Expensify',
            lastFourPAN: '4872',
            isVirtual: false,
            fraud: 'none',
        },
    });
}, [cardList]);

If you don't have any bank accounts or a positive wallet balance, you'll see the empty state screen
If you add a payment method, you'll be shown the wallet page with that payment method in the bank accounts section
If you have a wallet and it's balance is positive, you'll be shown the wallet page with the wallet section, where you can check your current balance and transfer funds.
If you have assigned cards, you'll be shown the wallet page with the assigned cards section.

Verify that no errors appear in the JS console

Offline tests

NA

QA Steps

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

pac-guerreiro · 2023-09-06T10:59:51Z

cc @grgia

melvin-bot · 2023-09-06T12:03:55Z

@ 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/Wallet/WalletEmptyState.js

src/pages/settings/Wallet/PaymentMethodList.js

src/languages/en.ts

src/pages/settings/Wallet/PaymentMethodList.js

thiagobrez · 2023-09-19T08:16:29Z

src/pages/settings/Wallet/WalletSection.js

+import React from 'react';
+import PropTypes from 'prop-types';
+import Section from '../../../components/Section';
+
+const propTypes = {
+    icon: PropTypes.func.isRequired,
+    children: PropTypes.node.isRequired,
+    subtitle: PropTypes.string.isRequired,
+    title: PropTypes.string.isRequired,
+};
+
+function WalletSection({icon, children, subtitle, title}) {
+    return (
+        <Section
+            icon={icon}
+            subtitle={subtitle}
+            title={title}
+        >
+            {children}
+        </Section>
+    );
+}
+
+WalletSection.displayName = 'WalletSection';
+WalletSection.propTypes = propTypes;
+
+export default WalletSection;


This component seems redundant, do we really need it?

Not sure, it was Pedro's decision to add it, maybe let's wait until tomorrow, so he can share his opinion on that, wdyt?

@thiagobrez
It was requested on the technical document

Where is this being used in this PR?

@grgia I was using it in the new WalletPage from the first PR, but now it's removed 😄

pac-guerreiro · 2023-09-20T15:05:26Z

@grgia Is there anything else missing in this PR?

grgia · 2023-09-27T04:41:37Z

I think we should expand on the tests section for this PR. I can help you write tests but we should cover all cases in the doc

pac-guerreiro · 2023-09-27T17:35:39Z

I think we should expand on the tests section for this PR. I can help you write tests but we should cover all cases in the doc

Ok, could you provide those test scenarios then? 😄 I'm not aware of the whole context

grgia · 2023-09-28T08:29:35Z

@pac-guerreiro please complete author checklist

grgia · 2023-09-28T08:31:21Z

@pac-guerreiro it looks like a unrelated unit test is failing, could you also merge main again and fix lint errors?

grgia · 2023-09-29T11:23:44Z

Assigning @thesahindia for C+ review from issue

grgia · 2023-09-29T11:23:58Z

Looks like some docs were renamed here too @pac-guerreiro

grgia · 2023-10-02T09:12:15Z

@pac-guerreiro let's merge main and fix the lint errors please! Let's get this PR ready for C+ review 😁🚀

cc @thesahindia

allroundexperts · 2023-10-02T10:25:41Z

Taking the review over from @thesahindia!

rushatgabhane · 2023-10-13T19:07:10Z

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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- 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(themeColors.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 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

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

rushatgabhane · 2023-10-13T19:11:36Z

src/CONST.ts

@@ -1243,6 +1243,7 @@ const CONST = {
            CLOSED: 6,
            STATE_SUSPENDED: 7,
        },
+        ACTIVE_STATES: [2, 3, 4, 7],


STATE: { OPEN: 3, NOT_ACTIVATED: 4, STATE_DEACTIVATED: 5, CLOSED: 6, STATE_SUSPENDED: 7, },

What is state 2 in Active_States? it's not in the State object.

Ah it's the Card Not Issued state. I think this is a typo from the design doc. Let's Remove 2 @pac-guerreiro.
But also I'd consider this as NAB for now considering the priority of this PR

rushatgabhane · 2023-10-13T20:42:42Z

Edit: it's also present on main, so it's not related

@pac-guerreiro bug: console error on native.

Steps:

Go to the wallet page

rushatgabhane

@grgia LGTM

allroundexperts · 2023-10-13T20:48:57Z

@rushatgabhane I had completed the checklist already 😄

grgia · 2023-10-13T20:49:57Z

I've created an issue for the State here -
#29586

allroundexperts · 2023-10-13T20:50:07Z

Also, there is another console error as well that needs confirmation from @pac-guerreiro!

grgia · 2023-10-13T20:50:48Z

@allroundexperts I confirmed that was due to incorrect onyx merge data

allroundexperts · 2023-10-13T20:51:10Z

@allroundexperts I confirmed that was due to incorrect onyx merge data

Gotcha. Then this is good to merge!

grgia · 2023-10-13T20:51:39Z

@allroundexperts I just wanted to get more eyes on this because we need to merge this to unblock some issues

grgia · 2023-10-13T20:52:06Z

@allroundexperts @rushatgabhane @pac-guerreiro Great work on this everyone! Thank you all so much for your help

melvin-bot · 2023-10-13T20:52:15Z

Congrats, that’s your 5th PR merged! 🎉 Do you know about the ContributorPlus role? It’s an opportunity to earn more in the Expensify Open Source community. Keep up the great work - thanks!

OSBotify · 2023-10-13T20:58:37Z

✋ 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 · 2023-10-16T21:49:30Z

🚀 Deployed to staging by https://github.com/grgia in version: 1.3.85-0 🚀

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

OSBotify · 2023-10-17T23:14:15Z

🚀 Deployed to production by https://github.com/francoisl in version: 1.3.85-4 🚀

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

OSBotify · 2023-10-18T00:00:45Z

🚀 Deployed to staging by https://github.com/grgia in version: 1.3.86-0 🚀

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

OSBotify · 2023-10-18T23:58:15Z

🚀 Deployed to production by https://github.com/francoisl in version: 1.3.86-5 🚀

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

hoangzinh · 2024-05-01T23:57:52Z

src/pages/settings/Wallet/PaymentMethodList.js

@@ -252,12 +286,13 @@ function PaymentMethodList({
                    iconWidth={item.iconSize}
                    badgeText={shouldShowDefaultBadge(filteredPaymentMethods, item.isDefault) ? translate('paymentMethodList.defaultPaymentMethod') : null}
                    wrapperStyle={styles.paymentMethod}
+                    shouldShowRightIcon={shouldShowAssignedCards}


Coming from #38643, this PaymentMethodList is also used in Transfer account screen, in that screen, we don't show the right icon by original design

pac-guerreiro changed the title ~~Feature/add assigned card tile and display expensify cards~~ [HOLD] Feature/add assigned card tile and display expensify cards Sep 6, 2023

grgia self-requested a review September 6, 2023 11:16

pac-guerreiro force-pushed the feature/add-assigned-card-tile-and-display-expensify-cards branch 2 times, most recently from 2dd6819 to b621364 Compare September 6, 2023 12:02

pac-guerreiro marked this pull request as ready for review September 6, 2023 12:03

pac-guerreiro requested a review from a team as a code owner September 6, 2023 12:03

melvin-bot bot removed the request for review from a team September 6, 2023 12:03

BeeMargarida reviewed Sep 7, 2023

View reviewed changes

gedu reviewed Sep 8, 2023

View reviewed changes

src/languages/en.ts Show resolved Hide resolved

gedu reviewed Sep 8, 2023

View reviewed changes

src/pages/settings/Wallet/PaymentMethodList.js Outdated Show resolved Hide resolved

pac-guerreiro force-pushed the feature/add-assigned-card-tile-and-display-expensify-cards branch 2 times, most recently from fb341ca to 8b305e9 Compare September 11, 2023 10:42

thiagobrez reviewed Sep 19, 2023

View reviewed changes

JKobrynski force-pushed the feature/add-assigned-card-tile-and-display-expensify-cards branch from 1d1c173 to 6364c79 Compare September 19, 2023 08:36

pac-guerreiro changed the title ~~[HOLD] Feature/add assigned card tile and display expensify cards~~ Feature/add assigned card tile and display expensify cards Sep 21, 2023

pac-guerreiro force-pushed the feature/add-assigned-card-tile-and-display-expensify-cards branch 2 times, most recently from 22050b2 to f7525a9 Compare September 26, 2023 15:51

grgia requested a review from thesahindia September 29, 2023 11:23

pasyukevich mentioned this pull request Oct 2, 2023

[HOLD for payment 2023-11-01] [ECARD] CRITICAL: Settings - Update UI to show fraud states #22881

Closed

pac-guerreiro force-pushed the feature/add-assigned-card-tile-and-display-expensify-cards branch from c02f513 to 7c7fda0 Compare October 13, 2023 15:16

fix(wallet): missing key on assigned card objects

59aae97

pac-guerreiro force-pushed the feature/add-assigned-card-tile-and-display-expensify-cards branch from 7c7fda0 to 59aae97 Compare October 13, 2023 15:17

grgia requested a review from rushatgabhane October 13, 2023 19:12

rushatgabhane suggested changes Oct 13, 2023

View reviewed changes

rushatgabhane approved these changes Oct 13, 2023

View reviewed changes

grgia mentioned this pull request Oct 13, 2023

[HOLD for payment 2023-10-30] [ECard Settings] - CLEAN UP - Remove 2 from Card State Array #29586

Closed

grgia approved these changes Oct 13, 2023

View reviewed changes

allroundexperts approved these changes Oct 13, 2023

View reviewed changes

melvin-bot bot requested a review from grgia October 13, 2023 20:51

grgia merged commit 1db4115 into Expensify:main Oct 13, 2023
18 checks passed

OSBotify mentioned this pull request Oct 16, 2023

Deploy Checklist: New Expensify 2023-10-16 #29717

Closed

OSBotify mentioned this pull request Oct 17, 2023

Deploy Checklist: New Expensify 2023-10-17 #29837

Closed

hoangzinh reviewed May 1, 2024

View reviewed changes

hoangzinh mentioned this pull request May 1, 2024

[HOLD for payment 2024-05-02] [$500] Incorrect styles in transfer balance> choose account page #38643

Closed

6 tasks

Feature/add assigned card tile and display expensify cards #26862

Feature/add assigned card tile and display expensify cards #26862

Conversation

pac-guerreiro commented Sep 6, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

pac-guerreiro commented Sep 6, 2023

melvin-bot bot commented Sep 6, 2023

thiagobrez Sep 19, 2023

Choose a reason for hiding this comment

JKobrynski Sep 19, 2023

Choose a reason for hiding this comment

pac-guerreiro Sep 20, 2023

Choose a reason for hiding this comment

grgia Sep 27, 2023

Choose a reason for hiding this comment

pac-guerreiro Sep 27, 2023

Choose a reason for hiding this comment

pac-guerreiro commented Sep 20, 2023

grgia commented Sep 27, 2023

pac-guerreiro commented Sep 27, 2023

grgia commented Sep 28, 2023

grgia commented Sep 28, 2023

grgia commented Sep 29, 2023

grgia commented Sep 29, 2023

grgia commented Oct 2, 2023

allroundexperts commented Oct 2, 2023

rushatgabhane commented Oct 13, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

rushatgabhane Oct 13, 2023 • edited Loading

Choose a reason for hiding this comment

grgia Oct 13, 2023 • edited Loading

Choose a reason for hiding this comment

rushatgabhane commented Oct 13, 2023 • edited Loading

rushatgabhane left a comment

Choose a reason for hiding this comment

allroundexperts commented Oct 13, 2023

grgia commented Oct 13, 2023

allroundexperts commented Oct 13, 2023

grgia commented Oct 13, 2023

allroundexperts commented Oct 13, 2023

grgia commented Oct 13, 2023

grgia commented Oct 13, 2023

melvin-bot bot commented Oct 13, 2023

OSBotify commented Oct 13, 2023

OSBotify commented Oct 16, 2023

OSBotify commented Oct 17, 2023

OSBotify commented Oct 18, 2023

OSBotify commented Oct 18, 2023

hoangzinh May 1, 2024

Choose a reason for hiding this comment

pac-guerreiro commented Sep 6, 2023 •

edited

Loading

rushatgabhane commented Oct 13, 2023 •

edited

Loading

rushatgabhane Oct 13, 2023 •

edited

Loading

grgia Oct 13, 2023 •

edited

Loading

rushatgabhane commented Oct 13, 2023 •

edited

Loading