Check cardID exists in cardList #32097

grgia · 2023-11-28T10:34:22Z

Details

Background: We are sending cardIDs for manual request transactions. We will filter those out in https://github.com/Expensify/Expensify/issues/339776. For now, let's ensure that any expensify/company cards exist in the cardList when checking if a transaction is a card transaction.

Works for card transactions and manual requests:

Fixed Issues

$ #32077
$ #32086
PROPOSAL:

Tests

Verify that no errors appear in the JS console
Create a MANUAL REQUEST and a CARD TRANSACTION on an account with an Expensify Card or Corporate Card

You may need to manually add the data via the console:

Onyx.merge('cardList',
{
  2: {
    "availableSpend": 10000000,
    "bank": "Expensify Card",
    "cardID": 2,
    "cardName": "485932XXXXXX0255",
    "domainName": "expensify.com",
    "fraud": "none",
    "isVirtual": false,
    "lastFourPAN": "0255",
    "state": 3
  },
);

Onyx.merge('transactions_<NUMBER>', {cardID: "2"});

Navigate to the Transaction Thread for the Manual Request
Verify Card Row is NOT ❌ present ✅
Verify Amount Row is editable ✅
Navigate to the Transaction Thread for the Card Transaction
Verify Card Row is present and card name is displayed ✅
Verify Amount Row is NOT ❌ editable ✅

Offline tests

QA Steps

Verify that no errors appear in the JS console

Same as Tests

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

grgia · 2023-11-28T10:35:42Z

cc @luacmartins @marcaaron

melvin-bot · 2023-11-28T10:55:37Z

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

grgia · 2023-11-28T11:02:16Z

cc @alitoshmatov
Maybe @Santhosh-Sellavel you should take C+ for this one as you're assigned to the alternative fix for the same blocker and we should only do one reviewer checklist depending on the solution we go with. WDYT?

MonilBhavsar

Thanks! Looks good and works fine

src/libs/CardUtils.ts

grgia · 2023-11-28T12:59:23Z

@MonilBhavsar pushed changes

src/libs/CardUtils.ts

Santhosh-Sellavel · 2023-11-28T16:44:44Z

cc @alitoshmatov Maybe @Santhosh-Sellavel you should take C+ for this one as you're assigned to the alternative fix for the same blocker and we should only do one reviewer checklist depending on the solution we go with. WDYT?

Yeah One C+ Plus should be fine here what's the PR we are going with here?

grgia · 2023-11-28T17:12:16Z

@luacmartins shall we go with this PR instead? cc @Santhosh-Sellavel

luacmartins

LGTM!

luacmartins · 2023-11-28T17:32:24Z

@alitoshmatov @Santhosh-Sellavel are either of you able to review within the next hour?

Santhosh-Sellavel · 2023-11-28T17:34:38Z

I'm unavailable today

alitoshmatov · 2023-11-28T17:38:02Z

I can review it

alitoshmatov · 2023-11-28T17:38:15Z

Working on it now

alitoshmatov · 2023-11-28T18:02:24Z

@grgia @luacmartins Can you provide some instructions on how to create card transaction?

grgia · 2023-11-28T18:15:47Z

@alitoshmatov
create a manual request and get the transactionID then merge ONYX via console


Onyx.merge('cardList',
{
  2: {
    "availableSpend": 10000000,
    "bank": "Expensify Card",
    "cardID": 2,
    "cardName": "485932XXXXXX0255",
    "domainName": "expensify.com",
    "fraud": "none",
    "isVirtual": false,
    "lastFourPAN": "0255",
    "state": 3
  },
);

Onyx.merge('transactions_<NUMBER>', {cardID: "2"});

alitoshmatov · 2023-11-28T19:11:38Z

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

Android: Native

Screen.Recording.2023-11-29.at.00.12.26.mov

Android: mWeb Chrome

card-android.mov

iOS: Native

card-ios.mp4

iOS: mWeb Safari

card-safari.mp4

MacOS: Chrome / Safari

card-web.mov

MacOS: Desktop

card-desktop.mov

alitoshmatov

LGTM!

Sorry it took more than an hour

cc: @luacmartins @grgia

melvin-bot · 2023-11-28T19:15:19Z

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

Check cardID exists in cardList (cherry picked from commit 99cef39)

OSBotify · 2023-11-28T19:20:42Z

✋ 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-11-28T19:42:40Z

🚀 Cherry-picked to staging by https://github.com/AndrewGable in version: 1.4.4-3 🚀

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

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

mvtglobally · 2023-11-28T22:53:09Z

@pecanoro you pls QA internally?

AndrewGable · 2023-11-28T22:58:32Z

@luacmartins tested this, checking it off.

luacmartins · 2023-11-28T23:00:14Z

Ah lol I just checked off the deploy blocker issue, forgot about the PR itself. Thanks for checking that off!

OSBotify · 2023-11-29T11:46:37Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.4.4-3 🚀

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

alitoshmatov · 2023-11-30T17:55:40Z

Can someone assign me to corresponding issue to process payments after regression period

luacmartins · 2023-11-30T18:11:52Z

assigned

Check for cardID in cardList

e348b4a

grgia self-assigned this Nov 28, 2023

grgia mentioned this pull request Nov 28, 2023

[HOLD for payment 2023-12-07] [HOLD for payment 2023-12-06] IOU - Clicking on card and amount does not cause any action #32077

Closed

6 tasks

rename function

55a1b87

grgia requested review from marcaaron and luacmartins November 28, 2023 10:43

grgia marked this pull request as ready for review November 28, 2023 10:55

grgia requested a review from a team as a code owner November 28, 2023 10:55

melvin-bot bot requested review from alitoshmatov and removed request for a team November 28, 2023 10:55

grgia mentioned this pull request Nov 28, 2023

[HOLD for payment 2023-12-07] [HOLD for payment 2023-12-06] Request money - Unable to edit money request from IOU #32086

Closed

6 tasks

grgia requested a review from MonilBhavsar November 28, 2023 11:45

MonilBhavsar reviewed Nov 28, 2023

View reviewed changes

src/libs/CardUtils.ts Outdated Show resolved Hide resolved

src/libs/CardUtils.ts Show resolved Hide resolved

rename function and simplify

030cfe1

grgia requested a review from MonilBhavsar November 28, 2023 12:59

MonilBhavsar reviewed Nov 28, 2023

View reviewed changes

src/libs/CardUtils.ts Show resolved Hide resolved

MonilBhavsar approved these changes Nov 28, 2023

View reviewed changes

luacmartins approved these changes Nov 28, 2023

View reviewed changes

alitoshmatov approved these changes Nov 28, 2023

View reviewed changes

melvin-bot bot requested a review from MariaHCD November 28, 2023 19:15

luacmartins merged commit 99cef39 into main Nov 28, 2023

luacmartins deleted the georgia-noCashCards branch November 28, 2023 19:16

OSBotify pushed a commit that referenced this pull request Nov 28, 2023

Merge pull request #32097 from Expensify/georgia-noCashCards

9f0ab42

Check cardID exists in cardList (cherry picked from commit 99cef39)

github-actions bot mentioned this pull request Nov 28, 2023

Deploy Checklist: New Expensify 2023-11-27 #32066

Closed

53 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Check cardID exists in cardList #32097

Check cardID exists in cardList #32097

grgia commented Nov 28, 2023 •

edited

Loading

grgia commented Nov 28, 2023

melvin-bot bot commented Nov 28, 2023

grgia commented Nov 28, 2023

MonilBhavsar left a comment

grgia commented Nov 28, 2023

Santhosh-Sellavel commented Nov 28, 2023

grgia commented Nov 28, 2023

luacmartins left a comment

luacmartins commented Nov 28, 2023

Santhosh-Sellavel commented Nov 28, 2023

alitoshmatov commented Nov 28, 2023

alitoshmatov commented Nov 28, 2023

alitoshmatov commented Nov 28, 2023

grgia commented Nov 28, 2023

alitoshmatov commented Nov 28, 2023 •

edited

Loading

alitoshmatov left a comment •

edited

Loading

melvin-bot bot commented Nov 28, 2023

OSBotify commented Nov 28, 2023

OSBotify commented Nov 28, 2023

mvtglobally commented Nov 28, 2023

AndrewGable commented Nov 28, 2023

luacmartins commented Nov 28, 2023

OSBotify commented Nov 29, 2023

alitoshmatov commented Nov 30, 2023

luacmartins commented Nov 30, 2023

Check cardID exists in cardList #32097

Check cardID exists in cardList #32097

Conversation

grgia commented Nov 28, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

grgia commented Nov 28, 2023

melvin-bot bot commented Nov 28, 2023

grgia commented Nov 28, 2023

MonilBhavsar left a comment

Choose a reason for hiding this comment

grgia commented Nov 28, 2023

Santhosh-Sellavel commented Nov 28, 2023

grgia commented Nov 28, 2023

luacmartins left a comment

Choose a reason for hiding this comment

luacmartins commented Nov 28, 2023

Santhosh-Sellavel commented Nov 28, 2023

alitoshmatov commented Nov 28, 2023

alitoshmatov commented Nov 28, 2023

alitoshmatov commented Nov 28, 2023

grgia commented Nov 28, 2023

alitoshmatov commented Nov 28, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

alitoshmatov left a comment • edited Loading

Choose a reason for hiding this comment

melvin-bot bot commented Nov 28, 2023

OSBotify commented Nov 28, 2023

OSBotify commented Nov 28, 2023

mvtglobally commented Nov 28, 2023

AndrewGable commented Nov 28, 2023

luacmartins commented Nov 28, 2023

OSBotify commented Nov 29, 2023

alitoshmatov commented Nov 30, 2023

luacmartins commented Nov 30, 2023

grgia commented Nov 28, 2023 •

edited

Loading

alitoshmatov commented Nov 28, 2023 •

edited

Loading

alitoshmatov left a comment •

edited

Loading