[Wave 8- Ecard Transactions] MoneyRequestPreview - add ECard Transactions description #29176

grgia · 2023-10-10T12:20:52Z

Details

Fixed Issues

$ #28832
PROPOSAL:

Tests

Verify that no errors appear in the JS console
We don't currently have card transactions in app, so I tested with mock data.
Create a normal IOU request. Open the transaction thread view for that request. Get the transactionID (I did this by logging it)
Use the following mock data to test cases (in my case 3439799194391522645 was my ID):

*PENDING

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

Onyx.merge('transactions_3439799194391522645', {amount: 1000, currency: 'USD', cardID: "4",  modifiedMerchant: null, merchant: "United Airlines", mccGroup: "Goods", created: "2023-07-24 13:46:20", status:"Pending", transactionID: "3439799194391522645", originalAmount: 1000, originalCurrency: "GBP" });

POSTED

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

Onyx.merge('transactions_3439799194391522645', {amount: 1000, currency: 'USD', cardID: "4",  modifiedMerchant: null, merchant: "United Airlines", mccGroup: "Goods", created: "2023-07-24 13:46:20", status:"Posted", transactionID: "3439799194391522645", originalAmount: 0, originalCurrency: '' });

POSTED, hard coded isSettled to true

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

Onyx.merge('transactions_3439799194391522645', {amount: 1000, currency: 'USD', cardID: "4",  modifiedMerchant: null, merchant: "United Airlines", mccGroup: "Goods", created: "2023-07-24 13:46:20", status:"Posted", transactionID: "3439799194391522645", originalAmount: 0, originalCurrency: '' });

**Alternate way to QA: **

create src/stories/MoneyRequestPreview.stories.js

import React from 'react';
import MoneyRequestPreview from '../components/ReportActionItem/MoneyRequestPreview';

/**
 * We use the Component Story Format for writing stories. Follow the docs here:
 *
 * https://storybook.js.org/docs/react/writing-stories/introduction#component-story-format
 */
const story = {
    title: 'Components/MonetRequestPreview',
    component: MoneyRequestPreview,
};

function Template(args) {
    // eslint-disable-next-line react/jsx-props-no-spreading
    return <MoneyRequestPreview {...args} />;
}

// Arguments can be passed to the component by binding
// See: https://storybook.js.org/docs/react/writing-stories/introduction#using-args
const Default = Template.bind({});
Default.args = {
    iouReportID: '1',
    chatReportID: '1',
    iouReport: {reportID: '1'},
    isBillSplit: false,
    transaction: {transactionID: '1', amount: 1000, currency: 'USD', cardID: '4', merchant: 'United Airlines', mccGroup: 'Goods', created: '2023-07-24 13:46:20', status: 'Posted'},
};

const Pending = Template.bind({});
Pending.args = {
    iouReportID: '1',
    chatReportID: '1',
    iouReport: {reportID: '1'},
    isBillSplit: false,
    transaction: {transactionID: '1', amount: 1000, currency: 'USD', cardID: '4', merchant: 'United Airlines', mccGroup: 'Goods', created: '2023-07-24 13:46:20', status: 'Pending'},
};


export default story;
export {Default, Pending};

For Done test, still hardcode isSettled to true.

Offline tests

QA Steps

Verify that no errors appear in the JS console

NO QA - We have not started sending card transactions data to FE

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

…sactions

cloudflare-workers-and-pages · 2023-10-10T12:21:14Z

Deploying with Cloudflare Pages

Latest commit:	`2e88f25`
Status:	✅ Deploy successful!
Preview URL:	https://ce97ae61.helpdot.pages.dev
Branch Preview URL:	https://georgia-cardtransactions-mon-6x3m.helpdot.pages.dev

View logs

melvin-bot · 2023-10-10T18:56:04Z

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

fedirjh · 2023-10-11T01:48:54Z

For settled requests, both Pending and Doneis displayed
For distance requests, the label Card is displayed instead of Distance, is that expected ?

Pending	Done

fedirjh · 2023-10-11T02:13:08Z

src/components/ReportActionItem/MoneyRequestPreview.js

@@ -187,6 +191,16 @@ function MoneyRequestPreview(props) {
    };

    const getPreviewHeaderText = () => {
+        if (isExpensifyCardTransaction) {


I think these updates should be done in this line and this line

let message = isExpensifyCardTransaction ? props.translate('iou.card') : props.translate('iou.cash'); } else if (props.iouReport.isWaitingOnBankAccount || (isExpensifyCardTransaction && TransactionUtils.isPending(props.transaction) && && !ReportUtils.isSettled(props.iouReport))) { message += ` • ${props.translate('iou.pending')}`; }

@fedirjh I moved the logic down below distance to fix the distance requests, I think it's better to keep each type of request separate since that's the pattern so far.

grgia · 2023-10-11T08:28:36Z

Technically, a report cannot be settled if there are pending transactions. But I think it's better to show the pending if the transaction is pending for this case.

src/components/ReportActionItem/MoneyRequestPreview.js

fedirjh · 2023-10-11T10:54:31Z

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 / Chrome
- iOS / native
- iOS / 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

fedirjh

Looks good to me.

melvin-bot · 2023-10-11T12:01:15Z

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

melvin-bot · 2023-10-11T12:01:20Z

🎯 @fedirjh, thanks for reviewing and testing this PR! 🎉

An E/App issue has been created to issue payment here: #29286.

marcochavezf

The code LGTM

OSBotify · 2023-10-13T21:56:23Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 1.3.83-11 🚀

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

OSBotify · 2023-10-13T22:08:26Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 1.3.83-11 🚀

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

OSBotify · 2023-10-13T22:24:40Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 1.3.83-11 🚀

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

OSBotify · 2023-10-13T23:00:04Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 1.3.83-11 🚀

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

grgia added 2 commits October 10, 2023 13:14

Update MoneyRequestPreview description to support Expensify Card Tran…

ac301a5

…sactions

prettier

3b74f53

grgia self-assigned this Oct 10, 2023

grgia changed the title ~~[Wave 8- Ecard Transactions] money request preview UI~~ [Wave 8- Ecard Transactions] MoneyRequestPreview - add ECard Transactions description Oct 10, 2023

grgia marked this pull request as ready for review October 10, 2023 18:55

grgia requested a review from a team as a code owner October 10, 2023 18:55

melvin-bot bot requested review from Gonals and removed request for a team October 10, 2023 18:56

Merge branch 'main' into georgia-cardTransactions-MoneyRequestPreview

7198cf3

grgia requested a review from fedirjh October 10, 2023 19:17

move into getSettled function

bbce9fa

fedirjh reviewed Oct 11, 2023

View reviewed changes

Move isExpensifyCardTransaction under distance

3e8f41d

grgia requested a review from fedirjh October 11, 2023 08:31

fedirjh reviewed Oct 11, 2023

View reviewed changes

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

Update for distance and move settled message

ffb2e5d

grgia requested a review from fedirjh October 11, 2023 10:05

Merge branch 'main' into georgia-cardTransactions-MoneyRequestPreview

2e88f25

fedirjh approved these changes Oct 11, 2023

View reviewed changes

melvin-bot bot requested a review from marcochavezf October 11, 2023 12:01

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

[HOLD for payment 2023-10-17] Payment issue for E/App PR#29176 #29286

Closed

marcochavezf approved these changes Oct 11, 2023

View reviewed changes

marcochavezf merged commit 227d61c into main Oct 11, 2023
15 checks passed

marcochavezf deleted the georgia-cardTransactions-MoneyRequestPreview branch October 11, 2023 19:05

mountiny mentioned this pull request Oct 12, 2023

Deploy Checklist: New Expensify 2023-10-12 #29417

Closed

97 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Wave 8- Ecard Transactions] MoneyRequestPreview - add ECard Transactions description #29176

[Wave 8- Ecard Transactions] MoneyRequestPreview - add ECard Transactions description #29176

grgia commented Oct 10, 2023 •

edited

Loading

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

edited

Loading

melvin-bot bot commented Oct 10, 2023

fedirjh commented Oct 11, 2023

fedirjh Oct 11, 2023

grgia Oct 11, 2023

grgia commented Oct 11, 2023

fedirjh commented Oct 11, 2023 •

edited

Loading

fedirjh left a comment

melvin-bot bot commented Oct 11, 2023

melvin-bot bot commented Oct 11, 2023

marcochavezf left a comment

OSBotify commented Oct 13, 2023

OSBotify commented Oct 13, 2023

OSBotify commented Oct 13, 2023

OSBotify commented Oct 13, 2023

[Wave 8- Ecard Transactions] MoneyRequestPreview - add ECard Transactions description #29176

[Wave 8- Ecard Transactions] MoneyRequestPreview - add ECard Transactions description #29176

Conversation

grgia commented Oct 10, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

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

Deploying with Cloudflare Pages

melvin-bot bot commented Oct 10, 2023

fedirjh commented Oct 11, 2023

fedirjh Oct 11, 2023

Choose a reason for hiding this comment

grgia Oct 11, 2023

Choose a reason for hiding this comment

grgia commented Oct 11, 2023

fedirjh commented Oct 11, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

fedirjh left a comment

Choose a reason for hiding this comment

melvin-bot bot commented Oct 11, 2023

melvin-bot bot commented Oct 11, 2023

marcochavezf left a comment

Choose a reason for hiding this comment

OSBotify commented Oct 13, 2023

OSBotify commented Oct 13, 2023

OSBotify commented Oct 13, 2023

OSBotify commented Oct 13, 2023

grgia commented Oct 10, 2023 •

edited

Loading

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

edited

Loading

fedirjh commented Oct 11, 2023 •

edited

Loading