[Better Expense Report View] Keep the Report fields at the top of the table report view by borys3kk · Pull Request #59724 · Expensify/App

borys3kk · 2025-04-07T10:48:53Z

Explanation of Change

Added ReportFields in desired view.
Created component responsible for displaying report fields.

Fixed Issues

$#59061
PROPOSAL:

Prerequisite for tests is that you have to have report fields enabled in workspace settings (added manually or imported from workspace).

Tests

Go to reports -> expense reports -> choose a report from workspace with report fields enabled
Report fields should be visible on top of view

Verify that no errors appear in the JS console

Offline tests

When in view described above after disconnecting from internet and changing one of the fields it should become greyed out.

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android-native.mov

Android: mWeb Chrome

android-web.mov

iOS: Native

ios-native.mov

iOS: mWeb Safari

ios-web.mov

MacOS: Chrome / Safari

macos-web.mov

MacOS: Desktop

macos-desktop.mov

src/components/MoneyRequestReportView/MoneyRequestReportActionsList.tsx

src/components/MoneyRequestReportView/MoneyRequestViewReportfields.tsx

SzymczakJ

LGTM

…port-fields-top-of-table

…ds.tsx

melvin-bot · 2025-04-11T13:16:32Z

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

github-actions · 2025-04-14T10:16:18Z

🚧 @mountiny has triggered a test app build. You can view the workflow run here.

github-actions · 2025-04-14T10:57:51Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪

Android 🤖	iOS 🍎
Android 🤖🔄	iOS 🍎🔄
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/59724-hybrid/index.html	https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/59724-hybrid/index.html

Desktop 💻	Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/59724/NewExpensify.dmg	https://59724.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

src/components/MoneyRequestReportView/MoneyRequestReportActionsList.tsx

src/components/MoneyRequestReportView/MoneyRequestViewReportFields.tsx

…-top-of-table' of github.com:software-mansion-labs/expensify-app-fork into @borys3kk-better-exponse-report-view-keep-report-fields-top-of-table

DylanDylann · 2025-04-17T14:38:20Z

@borys3kk I noticed a weird lint error

src/components/MoneyRequestReportView/MoneyRequestViewReportFields.tsx

DylanDylann · 2025-04-17T14:42:28Z

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 either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- 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(theme.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 the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
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.2025-04-17.at.21.46.29.mov

Android: mWeb Chrome

Screen.Recording.2025-04-17.at.21.46.00.mov

iOS: Native

Screen.Recording.2025-04-17.at.21.47.19.mov

iOS: mWeb Safari

Screen.Recording.2025-04-17.at.21.46.48.mov

MacOS: Chrome / Safari

Screen.Recording.2025-04-17.at.21.44.34.mov

MacOS: Desktop

Screen.Recording.2025-04-17.at.21.44.55.mov

borys3kk · 2025-04-18T07:44:49Z

@borys3kk I noticed a weird lint error

yeah its weird that eslint thinks its an error since in contributing guidelines it appears as an correct example
additionaly that code wasn't written in this pr and i haven't changed any of MoneyRequestReportActionsList.tsx other than inserting my component there and adding policy as parameter

DylanDylann · 2025-04-18T08:01:18Z

@borys3kk @mountiny The code change looks fine. But we have some Eslint error that isn't related to our PR, and I think we should still fix it here. Anyways, if this is urgent, I am fine to merge right away

mountiny

Yeah lets fix the eslint failures, I think we can leave that null coalesce empty in there as the reportId is string

…port-fields-top-of-table

borys3kk · 2025-04-22T10:09:22Z

Hi, I've fixed all eslint errors

mountiny

Small comments, nice work!

src/components/MoneyRequestReportView/MoneyRequestViewReportFields.tsx

DylanDylann · 2025-04-23T05:17:36Z

@borys3kk Please ping me when the PR ready again

borys3kk · 2025-04-23T07:42:50Z

@DylanDylann pr ready

mountiny

LGTM thanks!

mountiny · 2025-04-23T08:41:30Z

src/components/MoneyRequestReportView/MoneyRequestViewReportFields.tsx

+            />
+        </OfflineWithFeedback>
+    );
+}


Suggested change

}

}

mountiny · 2025-04-23T08:43:34Z

src/components/MoneyRequestReportView/MoneyRequestViewReportFields.tsx

+    const isPaidGroupPolicyExpenseReport = isPaidGroupPolicyExpenseReportUtils(report);
+    const isInvoiceReport = isInvoiceReportUtils(report);
+
+    const shouldDisplayReportFields = (isPaidGroupPolicyExpenseReport || isInvoiceReport) && policy?.areReportFieldsEnabled && (!isOnlyTitleFieldEnabled || !isCombinedReport);


I wonder if in general it would be cleaner to refactor this method to do early returns so we can stop the execution immediately we know the report fields should not be displayed, for example if policy?.areReportFieldsEnabled is false

OSBotify · 2025-04-23T08:56:13Z

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

github-actions · 2025-04-23T18:44:12Z

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

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

github-actions · 2025-04-28T19:51:05Z

🚀 Deployed to production by https://github.com/thienlnam in version: 9.1.32-8 🚀

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

DylanDylann · 2025-06-03T03:55:45Z

src/components/MoneyRequestReportView/MoneyRequestViewReportFields.tsx

+                shouldShowRightIcon
+                disabled={reportField.isFieldDisabled}


caused this minor bug: #62035

borys3kk added 2 commits April 7, 2025 12:46

reportFields added

2463522

extracted new component, refactor

d60056d

SzymczakJ reviewed Apr 7, 2025

View reviewed changes

borys3kk changed the title ~~[NO QA] [Better Expense Report View] Keep the Report fields at the top of the table report view~~ [Better Expense Report View] Keep the Report fields at the top of the table report view Apr 10, 2025

borys3kk added 2 commits April 10, 2025 10:40

add policy to props

86d8bd5

move GetReportFieldView out of MoneyRequestViewReportFields

35cf242

SzymczakJ approved these changes Apr 10, 2025

View reviewed changes

borys3kk and others added 6 commits April 10, 2025 13:25

rename getReportFieldView -> ReportFieldView

bfa7128

fix warning in console

dfef4ff

add report fields - another place

3719d45

Merge branch 'main' into @borys3kk-better-exponse-report-view-keep-re…

6cb2e5b

…port-fields-top-of-table

add MoneyRequestViewReportFields in correct places, test

73f2d42

Rename MoneyRequestViewReportfields.tsx to MoneyRequestViewReportFiel…

4a13222

…ds.tsx

borys3kk marked this pull request as ready for review April 11, 2025 13:16

borys3kk requested a review from a team as a code owner April 11, 2025 13:16

melvin-bot bot requested review from DylanDylann and removed request for a team April 11, 2025 13:16

mountiny assigned borys3kk Apr 14, 2025

mountiny self-requested a review April 14, 2025 10:15

DylanDylann reviewed Apr 15, 2025

View reviewed changes

src/components/MoneyRequestReportView/MoneyRequestReportActionsList.tsx Show resolved Hide resolved

DylanDylann reviewed Apr 16, 2025

View reviewed changes

borys3kk added 4 commits April 16, 2025 14:13

fix review comments

e6f3fc5

Merge branch '@borys3kk-better-exponse-report-view-keep-report-fields…

a69d44f

…-top-of-table' of github.com:software-mansion-labs/expensify-app-fork into @borys3kk-better-exponse-report-view-keep-report-fields-top-of-table

merge main

3923245

npm prettier, lint changed

e467075

DylanDylann reviewed Apr 17, 2025

View reviewed changes

src/components/MoneyRequestReportView/MoneyRequestViewReportFields.tsx Outdated Show resolved Hide resolved

use const

e664797

DylanDylann approved these changes Apr 18, 2025

View reviewed changes

mountiny reviewed Apr 19, 2025

View reviewed changes

borys3kk added 4 commits April 22, 2025 07:59

Merge branch 'main' into @borys3kk-better-exponse-report-view-keep-re…

94cc706

…port-fields-top-of-table

fix eslint default ids

63ba48b

null coalescent update v2

1ee23a3

fix eslint canBeMissing

0ea989b

mountiny reviewed Apr 22, 2025

View reviewed changes

src/components/MoneyRequestReportView/MoneyRequestViewReportFields.tsx Show resolved Hide resolved

src/components/MoneyRequestReportView/MoneyRequestViewReportFields.tsx Outdated Show resolved Hide resolved

borys3kk added 2 commits April 23, 2025 09:15

fix comments

29f44fb

merge main

addbef0

DylanDylann approved these changes Apr 23, 2025

View reviewed changes

melvin-bot bot requested a review from mountiny April 23, 2025 07:46

mountiny approved these changes Apr 23, 2025

View reviewed changes

mountiny merged commit 2ad3322 into Expensify:main Apr 23, 2025
18 checks passed

github-actions bot mentioned this pull request Apr 23, 2025

Deploy Checklist: New Expensify 2025-04-23 #60729

Closed

91 tasks

DylanDylann reviewed Jun 3, 2025

View reviewed changes

DylanDylann mentioned this pull request Jun 3, 2025

[Due for payment 2025-06-05] [$250] Non-editable report field shows right arrow and disabled mouse pointer #62035

Closed

16 tasks

Conversation

borys3kk commented Apr 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

SzymczakJ left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Apr 11, 2025

Uh oh!

github-actions bot commented Apr 14, 2025

Uh oh!

github-actions bot commented Apr 14, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

DylanDylann commented Apr 17, 2025

Uh oh!

Uh oh!

DylanDylann commented Apr 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

borys3kk commented Apr 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

DylanDylann commented Apr 18, 2025

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

borys3kk commented Apr 22, 2025

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

DylanDylann commented Apr 23, 2025

Uh oh!

borys3kk commented Apr 23, 2025

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

mountiny Apr 23, 2025

Choose a reason for hiding this comment

Uh oh!

mountiny Apr 23, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Apr 23, 2025

Uh oh!

github-actions bot commented Apr 23, 2025

Uh oh!

github-actions bot commented Apr 28, 2025

Uh oh!

DylanDylann Jun 3, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

borys3kk commented Apr 7, 2025 •

edited

Loading

DylanDylann commented Apr 17, 2025 •

edited

Loading

borys3kk commented Apr 18, 2025 •

edited

Loading