Update Expense Report View / Headers #22484

grgia · 2023-07-08T17:22:55Z

Details

Changes NOT in this PR will be addressed in follow-ups:

Adding the three dots - Move Pin Action Into Context Menu and Remove Pin Button #22635
Restyling Settlement Button - [HOLD for payment 2023-09-04] [$1000] Update Dropdown Button UI #22540

Fixed Issues

$ #22332
PROPOSAL:

Tests / QA Steps

Verify that no errors appear in the JS console

IOU Report

Create and open an IOU Report in a DM by sending a few IOUs from account A to account B
On Account A, ensure the header follows the new style and the total is displayed
On Account B, ensure that the settlement button appears inline with the avatar in the header.
on small screens, ensure the settlement button appears underneath the avatar in the header

Expense Report

Create and open an Expense Report in a Workspace Chat by sending a few requests from account A to workspace B
On Account A, ensure the header follows the new style and the total is displayed
On an Admin of Workspace B, ensure that the settlement button appears in line with the avatar in the header.
on small screens, ensure the settlement button appears underneath the avatar in the header

Offline tests

PR Author Checklist

Screenshots/Videos

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

melvin-bot · 2023-07-11T12:08:52Z

@fedirjh 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

Left few comment. When I open old reports, I have got this console error , and the report stuck in loading state :

src/components/ReportActionItem/MoneyReportView.js

src/components/MoneyReportHeader.js

fedirjh · 2023-07-12T08:12:35Z

src/pages/home/report/ReportActionsList.js

    const isSingleTransactionView = ReportActionsUtils.isTransactionThread(parentReportAction);
-    const showMoneyRequestDetails = ReportUtils.isMoneyRequestReport(props.report) || isSingleTransactionView;
+    const showMoneyRequestDetails = isSingleTransactionView;


This looks redundant we can just use isSingleTransactionView directly.

This will be removed entirely by whichever header PR is merged second

fedirjh · 2023-07-13T17:30:20Z

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 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.

🎀 👀 🎀 C+ reviewed

melvin-bot · 2023-07-13T17:32:30Z

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

srikarparsi · 2023-07-14T00:12:57Z

Hey @grgia! It looks like there's conflicts with the the languages files but still looking through the PR :)

grgia · 2023-07-14T08:07:29Z

@fedirjh @srikarparsi fixed simple language merge conflict!

srikarparsi

looks good to me as well :)

OSBotify · 2023-07-14T19:09:01Z

✋ 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-07-17T19:38:44Z

🚀 Deployed to staging by https://github.com/srikarparsi in version: 1.3.42-0 🚀

platform	result
🤖 android 🤖	cancelled 🔪
🖥 desktop 🖥	cancelled 🔪
🍎 iOS 🍎	cancelled 🔪
🕸 web 🕸	cancelled 🔪

OSBotify · 2023-07-19T18:00:29Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 1.3.42-26 🚀

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

0xmiroslav · 2023-08-10T21:58:38Z

src/components/MenuItem.js

        styles.textLabelSupporting,
        props.icon && !_.isArray(props.icon) ? styles.ml3 : undefined,
-        styles.lineHeightNormal,
+        styles.lhNormal,


This was overlooked.
There was no lineHeightNormal property in styles.
Making this valid caused minor regression - Test Assignee is cut of from the bottom

sobitneupane · 2023-10-30T09:21:56Z

src/components/MoneyReportHeader.js

+    policies: PropTypes.shape({
+        /** Name of the policy */
+        name: PropTypes.string,
+    }).isRequired,


policy is marked as required here but for some cases like deleted workspaces, it's value is undefined.

Issue: #26991

c3024 · 2024-02-18T11:50:09Z

src/languages/en.js

        settledPaypalMe: 'Paid using Paypal.me',
-        settleExpensify: 'Pay with Expensify',
+        settleExpensify: ({formattedAmount}) => `Pay ${formattedAmount} with Expensify`,
        payElsewhere: 'Pay elsewhere',


Here, the formattedAmount was not added to payElsewhere which was fixed in #34620

parasharrajat · 2024-04-02T13:00:48Z

src/components/MoneyReportHeader.js

+                            addBankAccountRoute={bankAccountRoute}
+                            shouldShowPaymentOptions
+                            style={[styles.pv2]}
+                            formattedAmount={formattedAmount}
+                        />
+                    </View>
+                )}
+            </HeaderWithBackButton>
+            {shouldShowSettlementButton && props.isSmallScreenWidth && (
+                <View style={[styles.ph5, styles.pb2, props.isSmallScreenWidth && styles.borderBottom]}>
+                    <SettlementButton
+                        currency={props.report.currency}
+                        policyID={props.report.policyID}
+                        shouldShowPaypal={shouldShowPaypal}
+                        chatReportID={props.report.chatReportID}
+                        iouReport={props.report}
+                        onPress={(paymentType) => IOU.payMoneyRequest(paymentType, props.chatReport, props.report)}
+                        enablePaymentsRoute={ROUTES.BANK_ACCOUNT_NEW}
+                        addBankAccountRoute={bankAccountRoute}


We missed to pass addDebitCardRoute={ROUTES.IOU_SEND_ADD_DEBIT_CARD} which caused #38641

grgia added 9 commits July 8, 2023 09:36

Add total amount to expense report view (in line with ReportActions)

fac11e2

Add MoneyReportView.js

607408f

Remove to {payer} and total amount from money request header

374e046

Separate Report and Request Header Logic

ffbf3d1

Add src/components/MoneyReportHeader.js

fc4a0dc

Button Spacing in Report Header

b1a6aaa

remove unused

f94993c

Add total amount to settlement button

e209520

Add back button and three dots to match mock up

433c33d

grgia self-assigned this Jul 8, 2023

add background image to report view

1547842

grgia mentioned this pull request Jul 10, 2023

Feature: LHN, avatar and header updates to reports, workspace chats and chat rooms tied to workspaces. #20486

Closed

4 tasks

Add constant to CONST

9eb7210

aimane-chnaif mentioned this pull request Jul 11, 2023

Money request header scrollable #21918

Merged

57 tasks

grgia added 5 commits July 11, 2023 12:15

Merge branch 'main' into georgia-expenseReportView

5a407ce

Clean up

b225de5

prettier

ccbeb0f

Fix lint

4940131

lint

2b71f1e

grgia marked this pull request as ready for review July 11, 2023 12:08

grgia requested a review from a team as a code owner July 11, 2023 12:08

melvin-bot bot requested review from fedirjh and removed request for a team July 11, 2023 12:08

fedirjh suggested changes Jul 12, 2023

View reviewed changes

This was referenced Jul 12, 2023

[$1000] Chat - Part to in IOU preview money request can be moved #22756

Closed

[HOLD for payment 2023-08-10] [$2000] 'Date' section is not grayed out and the cursor does not change on the IOU report #22742

Closed

grgia added 3 commits July 13, 2023 11:36

useLocalize hook, clean up

1ab77cd

Merge branch 'main' into georgia-expenseReportView

0dec3ff

remove withLocalize from MoneyReportHeader

b7e9f55

fedirjh approved these changes Jul 13, 2023

View reviewed changes

melvin-bot bot requested a review from srikarparsi July 13, 2023 17:32

Merge branch 'main' into georgia-expenseReportView

e117a32

grgia requested a review from fedirjh July 14, 2023 08:07

grgia mentioned this pull request Jul 14, 2023

[WAITING ON PR MERGE] Desktop - Margin above Request Money chat report header #21503

Closed

6 tasks

srikarparsi approved these changes Jul 14, 2023

View reviewed changes

srikarparsi merged commit 0b00e1c into main Jul 14, 2023

srikarparsi deleted the georgia-expenseReportView branch July 14, 2023 19:04

thienlnam mentioned this pull request Jul 17, 2023

[HOLD #22332] Web - In-consistent right margin after avatar on the request money chat #21528

Closed

6 tasks

OSBotify mentioned this pull request Jul 17, 2023

Deploy Checklist: New Expensify 2023-07-17 #23033

Closed

tranvantoan-qn mentioned this pull request Jul 18, 2023

[$1000] Web - Owed information is wrong when sending money request between accounts #22197

Closed

6 tasks

lanitochka17 mentioned this pull request Jul 18, 2023

[HOLD for payment 2023-07-28] [HOLD for payment 2023-07-26] [$1000] IOU - No settlement button in the IOU report header #23083

Closed

6 tasks

kbecciv mentioned this pull request Jul 18, 2023

[HOLD for 0xmiroslav] [$1000] Web - Test 'Assignee` is cut of from the bottom #23115

Closed

6 tasks

mountiny mentioned this pull request Jul 18, 2023

[CP Staging] Fix missing settlement button #23129

Merged

58 tasks

0xmiroslav reviewed Aug 10, 2023

View reviewed changes

sobitneupane reviewed Oct 30, 2023

View reviewed changes

sobitneupane mentioned this pull request Oct 30, 2023

[HOLD for payment 2023-10-16] [$500] propTypes warning - policy is marked as required in MoneyRequestHeader #26991

Closed

c3024 reviewed Feb 18, 2024

View reviewed changes

c3024 mentioned this pull request Feb 18, 2024

[HOLD for payment 2024-02-20] [$500] [ECARD TRANSACTIONS] Pay elsewhere button is missing the reimbursable total #34620

Closed

parasharrajat reviewed Apr 2, 2024

View reviewed changes

parasharrajat mentioned this pull request Apr 2, 2024

[HOLD for payment 2024-04-09] [$500] Clicking on debit card option on the pay with Expensify button does nothing #38641

Closed

6 tasks

Update Expense Report View / Headers #22484

Update Expense Report View / Headers #22484

Uh oh!

Conversation

grgia commented Jul 8, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests / QA Steps

Offline tests

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Jul 11, 2023

Uh oh!

fedirjh left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

fedirjh Jul 12, 2023

Choose a reason for hiding this comment

Uh oh!

grgia Jul 13, 2023

Choose a reason for hiding this comment

Uh oh!

fedirjh commented Jul 13, 2023

Reviewer Checklist

Screenshots/Videos

Uh oh!

fedirjh left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Jul 13, 2023

Uh oh!

srikarparsi commented Jul 14, 2023

Uh oh!

grgia commented Jul 14, 2023

Uh oh!

srikarparsi left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Jul 14, 2023

Uh oh!

OSBotify commented Jul 17, 2023

Uh oh!

OSBotify commented Jul 19, 2023

Uh oh!

0xmiroslav Aug 10, 2023

Choose a reason for hiding this comment

Uh oh!

sobitneupane Oct 30, 2023

Choose a reason for hiding this comment

Uh oh!

c3024 Feb 18, 2024

Choose a reason for hiding this comment

Uh oh!

parasharrajat Apr 2, 2024

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

grgia commented Jul 8, 2023 •

edited

Loading