[CP Staging] Show Wallet Card in Wallet Page if User has Available Balance, Fix Wallet Page BG #30066

grgia · 2023-10-20T10:16:00Z

Details

Now that all users have a wallet, let's show the wallet card in the Wallet Page. This means no users should see the empty state, but I am leaving it in for now to cover edge any cases with missing wallet data during money2020. We will clean this up in a follow up.

Fixed Issues

$ #30067

Tests

Verify that no errors appear in the JS console

Has No Card or Bank Data (NULL)

Onyx.merge("bankAccountList", null);
Onyx.merge("cardList", null);
Onyx.merge("fundList", null);

Has Bank and Card Data

Onyx.merge("bankAccountList", null);
Onyx.merge("cardList", null);
Onyx.merge("fundList", null);
let banks = [
    'generic'
];

let key = 1;

banks.forEach((bankName) => {
    let bankData = {
        [key]:  {
    "title": `${bankName} Checking`,
    "description": "Account ending in 5087",
    "methodID": key,
    "key": `bankAccount-${key}`,
    "accountType": "bankAccount",
    "accountData": {
        "accountNumber": "XXXXX5087",
        "additionalData": {
            "bankName": `${bankName}`,
        },
        "state": "OPEN",
        "type": "BUSINESS"
    },
    "isDefault": false
}
    };

    Onyx.merge("bankAccountList", bankData);

    key += 1;
});

banks.unshift('Expensify Card');

banks.forEach((bankName) => {
    let cardData = {
        [key]:  {
            "availableSpend": 0,
            "bank": `${bankName}`,
            "cardID": key,
            "cardName": `${bankName} Card - 1234`,
            "domainName": "beets.com",
            "fraud": "none",
            "isVirtual": false,
            "lastFourPAN": "",
            "state": 3,
        }
    };

    Onyx.merge("cardList", cardData);

    key += 1;
});

Has only Bank Data

Onyx.merge("bankAccountList", null);
Onyx.merge("cardList", null);
Onyx.merge("fundList", null);

let banks = [
    'generic'
];

let key = 1;

banks.forEach((bankName) => {
    let bankData = {
        [key]:  {
    "title": `${bankName} Checking`,
    "description": "Account ending in 5087",
    "methodID": key,
    "key": `bankAccount-${key}`,
    "accountType": "bankAccount",
    "accountData": {
        "accountNumber": "XXXXX5087",
        "additionalData": {
            "bankName": `${bankName}`,
        },
        "state": "OPEN",
        "type": "BUSINESS"
    },
    "isDefault": false
}
    };

    Onyx.merge("bankAccountList", bankData);

    key += 1;
});

Has only Card Data

Onyx.merge("bankAccountList", null);
Onyx.merge("cardList", null);
Onyx.merge("fundList", null);
let banks = [
    'generic'
];

let key = 1;

banks.unshift('Expensify Card');

banks.forEach((bankName) => {
    let cardData = {
        [key]:  {
            "availableSpend": 0,
            "bank": `${bankName}`,
            "cardID": key,
            "cardName": `${bankName} Card - 1234`,
            "domainName": "beets.com",
            "fraud": "none",
            "isVirtual": false,
            "lastFourPAN": "",
            "state": 3,
        }
    };

    Onyx.merge("cardList", cardData);

    key += 1;
});

Offline tests

QA Steps

Verify that no errors appear in the JS console
Log into a new account. Navigate to settings > wallet. Verify Wallet card is shown and add bank account card is shown.
Add an expensify card, verify that assigned cards card is shown with expensify card.
Add a bank account, verify that bank account is listed.

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

cloudflare-workers-and-pages · 2023-10-20T10:18:07Z

Deploying with Cloudflare Pages

Latest commit:	`8e0425a`
Status:	✅ Deploy successful!
Preview URL:	https://7ce2214e.helpdot.pages.dev
Branch Preview URL:	https://georgia-cardsettings-showwal.helpdot.pages.dev

View logs

grgia · 2023-10-21T18:26:07Z

src/pages/settings/Wallet/WalletEmptyState.js

+            backgroundColor={themeColors.PAGE_BACKGROUND_COLORS[SCREENS.SETTINGS.WALLET]}
            illustration={LottieAnimations.FastMoney}


note no need to QA this as users will no longer see this screen since no user will have an empty wallet. We will remove this page in a follow up after the conference

melvin-bot · 2023-10-21T18:37:39Z

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

allroundexperts · 2023-10-21T19:15:42Z

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

allroundexperts

Looks good!

melvin-bot · 2023-10-21T23:03:02Z

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

OSBotify · 2023-10-21T23:10:27Z

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

(cherry picked from commit dcb698f)

OSBotify · 2023-10-22T21:36:44Z

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 1.3.88-7 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

kevinksullivan · 2023-10-22T22:23:51Z

QA looks good!

OSBotify · 2023-10-23T04:48:39Z

🚀 Deployed to production by https://github.com/chiragsalian in version: 1.3.88-11 🚀

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

grgia added 2 commits October 20, 2023 11:04

Update to check if the userWallet is empty

dbb3f97

Show wallet if user hasa linkedAccountID OR if user has available funds

8e0425a

grgia self-assigned this Oct 20, 2023

grgia changed the title ~~Show Wallet Card in Wallet Page if User has Available Balance.~~ Show Wallet Card in Wallet Page if User has Available Balance, Fix Wallet Page BG Oct 20, 2023

grgia added 2 commits October 21, 2023 19:09

Show wallet for all users, fix background color

3c096d9

lint

48432f9

grgia commented Oct 21, 2023

View reviewed changes

Add accidentally removed import

19aabfa

grgia marked this pull request as ready for review October 21, 2023 18:37

grgia requested a review from a team as a code owner October 21, 2023 18:37

melvin-bot bot removed the request for review from a team October 21, 2023 18:37

melvin-bot bot requested a review from narefyev91 October 21, 2023 18:37

fix IOS status bar

fbd3642

kevinksullivan requested review from allroundexperts and removed request for narefyev91 October 21, 2023 19:15

allroundexperts approved these changes Oct 21, 2023

View reviewed changes

melvin-bot bot requested a review from tylerkaraszewski October 21, 2023 23:03

thienlnam approved these changes Oct 21, 2023

View reviewed changes

thienlnam merged commit dcb698f into main Oct 21, 2023
13 checks passed

thienlnam deleted the georgia-cardSettings-ShowWallet branch October 21, 2023 23:03

mountiny changed the title ~~Show Wallet Card in Wallet Page if User has Available Balance, Fix Wallet Page BG~~ [CP Staging] Show Wallet Card in Wallet Page if User has Available Balance, Fix Wallet Page BG Oct 22, 2023

OSBotify pushed a commit that referenced this pull request Oct 22, 2023

Merge pull request #30066 from Expensify/georgia-cardSettings-ShowWallet

6dcd526

(cherry picked from commit dcb698f)

OSBotify mentioned this pull request Oct 22, 2023

Deploy Checklist: New Expensify 2023-10-20 #30108

Closed

melvin-bot bot mentioned this pull request Oct 23, 2023

[HOLD for payment 2023-10-31] [HOLD for payment 2023-10-30] [ECard Settings] Card Settings Follow Up #30067

Closed

Pujan92 mentioned this pull request Dec 2, 2023

[$500] Wallet - No feature list is displayed in Wallet page #32385

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CP Staging] Show Wallet Card in Wallet Page if User has Available Balance, Fix Wallet Page BG #30066

[CP Staging] Show Wallet Card in Wallet Page if User has Available Balance, Fix Wallet Page BG #30066

grgia commented Oct 20, 2023 •

edited by kevinksullivan

Loading

cloudflare-workers-and-pages bot commented Oct 20, 2023

grgia Oct 21, 2023

melvin-bot bot commented Oct 21, 2023

allroundexperts commented Oct 21, 2023 •

edited

Loading

allroundexperts left a comment

melvin-bot bot commented Oct 21, 2023

OSBotify commented Oct 21, 2023

OSBotify commented Oct 22, 2023

kevinksullivan commented Oct 22, 2023

OSBotify commented Oct 23, 2023

		backgroundColor={themeColors.PAGE_BACKGROUND_COLORS[SCREENS.SETTINGS.WALLET]}
		illustration={LottieAnimations.FastMoney}

[CP Staging] Show Wallet Card in Wallet Page if User has Available Balance, Fix Wallet Page BG #30066

[CP Staging] Show Wallet Card in Wallet Page if User has Available Balance, Fix Wallet Page BG #30066

Conversation

grgia commented Oct 20, 2023 • edited by kevinksullivan Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

cloudflare-workers-and-pages bot commented Oct 20, 2023

Deploying with Cloudflare Pages

grgia Oct 21, 2023

Choose a reason for hiding this comment

melvin-bot bot commented Oct 21, 2023

allroundexperts commented Oct 21, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

allroundexperts left a comment

Choose a reason for hiding this comment

melvin-bot bot commented Oct 21, 2023

OSBotify commented Oct 21, 2023

OSBotify commented Oct 22, 2023

kevinksullivan commented Oct 22, 2023

OSBotify commented Oct 23, 2023

grgia commented Oct 20, 2023 •

edited by kevinksullivan

Loading

allroundexperts commented Oct 21, 2023 •

edited

Loading