[CP Staging] - Only show Pending Banner for ECard Transactions #29659

grgia · 2023-10-16T08:24:30Z

Details

It seems like some non ECard transactions are getting the transaction.status key set to "Pending". For now, let's ensure that only ECard transactions will show the Pending UI.

Fixed Issues

$ #29625
$ #29626

Tests / QA Steps

Verify that no errors appear in the JS console

Test Scan Receipt Flow

Create a money request -> upload receipt -> click on Money Request Preview
Verify "Scanning" Banner is shown

Screen.Recording.2023-10-16.at.9.22.02.AM.mov

Test Split Scan Receipt Flow

Create a SPLIT money request with 2+ recipients -> upload receipt -> click on Money Request Preview
Verify "Scanning" Banner is shown in Details.

Test ECard Transaction Pending Shows

Create a money request -> Get the Transaction ID of said request
In the console, merge the following data to mimic a card transaction:

Onyx.merge('cardList',
{
  4: {
    "bank": "Expensify Card",
    "lastFourPan": "3458",
  }
});


Onyx.merge("transactions_<transactionID>", { status:"Pending", cardID: 4});

Verify "Pending" Banner is shown

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 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 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 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
- If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
- 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 author 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

MacOS: Desktop

…e props

cloudflare-workers-and-pages · 2023-10-16T08:25:27Z

Deploying with Cloudflare Pages

Latest commit:	`1d34ee5`
Status:	✅ Deploy successful!
Preview URL:	https://56bf5c5a.helpdot.pages.dev
Branch Preview URL:	https://georgia-fixsmartscanbanner.helpdot.pages.dev

View logs

melvin-bot · 2023-10-16T08:42:31Z

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

rushatgabhane · 2023-10-16T08:48:06Z

does this need my review?

grgia · 2023-10-16T09:28:58Z

@rushatgabhane yes, if you could review that would be great. I'm working on screenshots but need to rebuild VM

rushatgabhane · 2023-10-16T09:46:34Z

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

number of receipts	preview
1
2
3
more than 3

Scanning banner

Expensify card

Mobile Web - Chrome

Mobile Web - Safari

Desktop

Skipping this one

iOS

Android

src/components/ReportActionItem/ReportPreview.js

src/pages/iou/SplitBillDetailsPage.js

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

@rushatgabhane I merged main since one bug was already fixed

rushatgabhane · 2023-10-16T10:29:20Z

@grgia we have lint error and 1 change request here

grgia · 2023-10-16T10:47:07Z

@rushatgabhane I pushed a solution, thanks!

rushatgabhane · 2023-10-16T10:49:06Z

testing!

grgia · 2023-10-16T11:13:38Z

src/components/MoneyRequestHeader.js

@@ -82,7 +82,7 @@ function MoneyRequestHeader({session, parentReport, report, parentReportAction,
    }, [parentReportAction, setIsDeleteModalVisible]);

    const isScanning = TransactionUtils.hasReceipt(transaction) && TransactionUtils.isReceiptBeingScanned(transaction);
-    const isPending = TransactionUtils.isPending(transaction);
+    const isPending = TransactionUtils.isExpensifyCardTransaction(transaction) && TransactionUtils.isPending(transaction);


It looks like your transactionID was incorrect, I don't see the amount set in this example

oh good catch, thank you! 🙇

rushatgabhane

@mountiny LGTM!

melvin-bot · 2023-10-16T11:27:48Z

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

mountiny

Thanks for a quick resolution ❤️

OSBotify · 2023-10-16T11:42:02Z

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

[CP Staging] - Only show Pending Banner for ECard Transactions (cherry picked from commit 5a5b890)

OSBotify · 2023-10-16T12:24:22Z

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 1.3.84-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.

OSBotify · 2023-10-16T21:10:08Z

🚀 Deployed to production by https://github.com/francoisl in version: 1.3.84-10 🚀

platform	result
🤖 android 🤖	skipped 🚫
🖥 desktop 🖥	skipped 🚫
🍎 iOS 🍎	skipped 🚫
🕸 web 🕸	skipped 🚫

OSBotify · 2023-10-16T21:46:28Z

🚀 Deployed to production by https://github.com/francoisl in version: 1.3.84-10 🚀

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

OSBotify · 2023-10-17T23:59:39Z

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

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

grgia · 2023-10-18T19:22:37Z

@JmillsExpensify
Payment summary:
C+ Review ($500) @rushatgabhane

JmillsExpensify · 2023-10-18T19:47:19Z

$500 payment approved for @rushatgabhane based on summary above.

OSBotify · 2023-10-18T23:57:09Z

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

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

Only show pending for ECard transactions, fix split bill scanning pag…

5010694

…e props

grgia self-assigned this Oct 16, 2023

Fix reportPreview size and add useLocalize to Scan Receipt Details

98d7e9c

grgia marked this pull request as ready for review October 16, 2023 08:42

grgia requested a review from a team as a code owner October 16, 2023 08:42

melvin-bot bot requested review from rushatgabhane and removed request for a team October 16, 2023 08:42

grgia requested a review from mountiny October 16, 2023 08:54

mountiny changed the title ~~[Deploy Blocker Fix] - Only show Pending Banner for ECard Transactions~~ [CP Staging] - Only show Pending Banner for ECard Transactions Oct 16, 2023

rushatgabhane reviewed Oct 16, 2023

View reviewed changes

src/components/ReportActionItem/ReportPreview.js Show resolved Hide resolved

grgia added 2 commits October 16, 2023 10:59

Merge branch 'main' into georgia-fixSmartScanBanner

073736d

remove dupe import from merge

d7786f8

rushatgabhane reviewed Oct 16, 2023

View reviewed changes

src/pages/iou/SplitBillDetailsPage.js Outdated Show resolved Hide resolved

use hook instead of HOC

9fed95f

grgia requested a review from rushatgabhane October 16, 2023 10:05

lint

74e5fdc

grgia added 2 commits October 16, 2023 11:29

one more lint...

6723913

Report Preview fix

1d34ee5

rushatgabhane reviewed Oct 16, 2023

View reviewed changes

rushatgabhane approved these changes Oct 16, 2023

View reviewed changes

melvin-bot bot requested a review from puneetlath October 16, 2023 11:27

mountiny approved these changes Oct 16, 2023

View reviewed changes

mountiny merged commit 5a5b890 into main Oct 16, 2023
15 of 21 checks passed

mountiny deleted the georgia-fixSmartScanBanner branch October 16, 2023 11:36

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

Merge pull request #29659 from Expensify/georgia-fixSmartScanBanner

ad68cc1

[CP Staging] - Only show Pending Banner for ECard Transactions (cherry picked from commit 5a5b890)

OSBotify mentioned this pull request Oct 16, 2023

Deploy Checklist: New Expensify 2023-10-13 #29585

Closed

97 tasks

mountiny mentioned this pull request Oct 16, 2023

[CP Staging] Redefine useLocalize in SplitDetailsPage #29682

Merged

59 tasks

OSBotify mentioned this pull request Oct 17, 2023

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

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CP Staging] - Only show Pending Banner for ECard Transactions #29659

[CP Staging] - Only show Pending Banner for ECard Transactions #29659

grgia commented Oct 16, 2023 •

edited

Loading

cloudflare-workers-and-pages bot commented Oct 16, 2023 •

edited

Loading

melvin-bot bot commented Oct 16, 2023

rushatgabhane commented Oct 16, 2023

grgia commented Oct 16, 2023

rushatgabhane commented Oct 16, 2023 •

edited

Loading

Scanning banner

Expensify card

grgia commented Oct 16, 2023

rushatgabhane commented Oct 16, 2023

grgia commented Oct 16, 2023

rushatgabhane commented Oct 16, 2023 •

edited

Loading

This comment was marked as resolved.

grgia Oct 16, 2023

rushatgabhane Oct 16, 2023

rushatgabhane left a comment •

edited

Loading

melvin-bot bot commented Oct 16, 2023

mountiny left a comment

OSBotify commented Oct 16, 2023

OSBotify commented Oct 16, 2023

OSBotify commented Oct 16, 2023

OSBotify commented Oct 16, 2023

OSBotify commented Oct 17, 2023

grgia commented Oct 18, 2023

JmillsExpensify commented Oct 18, 2023

OSBotify commented Oct 18, 2023

[CP Staging] - Only show Pending Banner for ECard Transactions #29659

[CP Staging] - Only show Pending Banner for ECard Transactions #29659

Conversation

grgia commented Oct 16, 2023 • edited Loading

Details

Fixed Issues

Tests / QA Steps

PR Author Checklist

Screenshots/Videos

cloudflare-workers-and-pages bot commented Oct 16, 2023 • edited Loading

Deploying with Cloudflare Pages

melvin-bot bot commented Oct 16, 2023

rushatgabhane commented Oct 16, 2023

grgia commented Oct 16, 2023

rushatgabhane commented Oct 16, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

Scanning banner

Expensify card

grgia commented Oct 16, 2023

rushatgabhane commented Oct 16, 2023

grgia commented Oct 16, 2023

rushatgabhane commented Oct 16, 2023 • edited Loading

This comment was marked as resolved.

grgia Oct 16, 2023

Choose a reason for hiding this comment

rushatgabhane Oct 16, 2023

Choose a reason for hiding this comment

rushatgabhane left a comment • edited Loading

Choose a reason for hiding this comment

melvin-bot bot commented Oct 16, 2023

mountiny left a comment

Choose a reason for hiding this comment

OSBotify commented Oct 16, 2023

OSBotify commented Oct 16, 2023

OSBotify commented Oct 16, 2023

OSBotify commented Oct 16, 2023

OSBotify commented Oct 17, 2023

grgia commented Oct 18, 2023

JmillsExpensify commented Oct 18, 2023

OSBotify commented Oct 18, 2023

grgia commented Oct 16, 2023 •

edited

Loading

cloudflare-workers-and-pages bot commented Oct 16, 2023 •

edited

Loading

rushatgabhane commented Oct 16, 2023 •

edited

Loading

rushatgabhane commented Oct 16, 2023 •

edited

Loading

rushatgabhane left a comment •

edited

Loading