fix: Show editable Amount by default in report view by x-dev90 · Pull Request #94929 · Expensify/App

x-dev90 · 2026-06-30T04:03:55Z

Explanation of Change

Updates the expense report table defaults so the editable Amount column is shown by default instead of the read-only Total column. This also keeps the existing multi-currency behavior by showing Total only when a conversion exists, and updates custom-column handling so Comments stay positioned before the active money column.

Fixed Issues

$ #93014
PROPOSAL: #93014 (comment)

Tests

Open an expense report with same-currency expenses.
Verify the Amount column is visible by default.
Verify the Total column is not visible by default.
Open an expense report with a converted/multi-currency expense.
Verify both Amount and Total are visible.
Open report column settings.
Verify Amount is selected as the default required money column.
Enable Comments and verify it appears immediately before the Amount column.

Verify that no errors appear in the JS console

Offline tests

Same as Tests.

QA Steps

Same as Tests.

// TODO: These must be filled out, or the issue title must include "[No QA]."

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Not applicable

Android: mWeb Chrome

Not applicable

iOS: Native

Not applicable

iOS: mWeb Safari

Not applicable

MacOS: Chrome / Safari

Screen.Recording.2026-06-30.at.12.06.23.PM.mov

melvin-bot · 2026-06-30T08:58:43Z

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

trjExpensify

I still think we should keep the orientation we had before whereby the Total column is after the Amount column so the totals on the report line up better:

What do you think @iwiznia @shawnborton?

shawnborton · 2026-07-01T01:14:29Z

Yup, makes sense to me 👍

codecov · 2026-07-01T11:36:51Z

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines	Coverage Δ
src/libs/SearchUIUtils.ts	`62.87% <100.00%> (ø)`
...pages/settings/Report/ReportDetailsColumnsPage.tsx	`0.00% <0.00%> (ø)`
... and 34 files with indirect coverage changes

x-dev90 · 2026-07-01T12:10:29Z

@trjExpensify Thanks for confirming. Updated the ordering so when both are visible it stays Amount | Total, while Amount remains the default editable column.

Could you please check this ?

x-dev90 · 2026-07-01T12:11:25Z

@gijoe0295 The PR is ready for review. Could you please take a look ?

trjExpensify · 2026-07-01T13:52:10Z

@trjExpensify Thanks for confirming. Updated the ordering so when both are visible it stays Amount | Total, while Amount remains the default editable column.

Could you please check this ?

Yep! 👍

x-dev90 · 2026-07-03T09:46:39Z

@gijoe0295, Gentle bump. thanks.

gijoe0295 · 2026-07-03T10:06:08Z

              [CONST.SEARCH.TABLE_COLUMNS.COMMENTS]: shouldShowCommentsColumn,
-              [CONST.SEARCH.TABLE_COLUMNS.TOTAL]: true,
+              [CONST.SEARCH.TABLE_COLUMNS.TOTAL]: false,
+              [CONST.SEARCH.TABLE_COLUMNS.TOTAL_AMOUNT]: true,


Why did you reorder the columns here?

I reordered it to keep Comments immediately before the money columns, consistent with the behavior from #90301.

Without this change, same-currency reports render as Amount | Comments, while multi-currency reports render as Amount | Comments | Total. Moving COMMENTS before TOTAL_AMOUNT keeps the layout consistent:

same currency: Comments | Amount

multi-currency: Comments | Amount | Total

This also preserves the latest design feedback that Total should remain after Amount when both are visible.

Please let me know if you think we should handle this differently.

This also preserves the latest design feedback that Total should remain after Amount when both are visible.

Without the reordering, Amount was already to the left of Total.

multi-currency reports render as Amount | Comments | Total

The Comments column reordering is already done manually:

App/src/libs/SearchUIUtils.ts

Lines 5927 to 5934 in c8d6035

if (shouldShowCommentsColumn && !addedColumns.has(CONST.SEARCH.TABLE_COLUMNS.COMMENTS)) {

const totalIndex = result.indexOf(CONST.SEARCH.TABLE_COLUMNS.TOTAL);

if (totalIndex === -1) {

result.push(CONST.SEARCH.TABLE_COLUMNS.COMMENTS);

} else {

result.splice(totalIndex, 0, CONST.SEARCH.TABLE_COLUMNS.COMMENTS);

}

}

The Comments column reordering is already done manually

The manual Comments insertion handles the custom-columns path, but it does not run for the default path when visibleColumns is empty. In the default path, the order comes from Object.keys(columns).

So if we keep the previous order, default reports with comments render as Amount | Comments / Amount | Comments | Total.

Since the expected layout is Comments | Amount and Comments | Amount | Total, I think we still need to move COMMENTS before TOTAL_AMOUNT in the default map as well.

gijoe0295 · 2026-07-03T10:10:34Z

            if (shouldShowCommentsColumn && !addedColumns.has(CONST.SEARCH.TABLE_COLUMNS.COMMENTS)) {
-                const totalIndex = result.indexOf(CONST.SEARCH.TABLE_COLUMNS.TOTAL);
-                if (totalIndex === -1) {
+                const moneyColumnIndexes = [result.indexOf(CONST.SEARCH.TABLE_COLUMNS.TOTAL_AMOUNT), result.indexOf(CONST.SEARCH.TABLE_COLUMNS.TOTAL)].filter((index) => index !== -1);


I think we only need to change TOTAL to TOTAL_AMOUNT here.

When there're both TOTAL and TOTAL_AMOUNT, TOTAL_AMOUNT is always before TOTAL. Wdyt?

That makes sense. Since TOTAL_AMOUNT is now the default money column and should always come before TOTAL, anchoring COMMENTS directly before TOTAL_AMOUNT is enough. I simplified the logic. Thanks

gijoe0295 · 2026-07-03T10:27:20Z

+            // Expense report view: TOTAL_AMOUNT (transaction amount) is shown by default. TOTAL
+            // (workspace currency) is added when a conversion exists. ORIGINAL_AMOUNT never
+            // renders by default in report view because it must be explicitly selected.
+            // Search page: ORIGINAL_AMOUNT stays data-driven (shown whenever a conversion exists).


Search page: ORIGINAL_AMOUNT stays data-driven (shown whenever a conversion exists).

Where does this come from? Does not seem right.

On Search page, we always show TOTAL_AMOUNT alone. We don't show the converted amount.

Also ORIGINAL_AMOUNT is not the converted amount.

Update: This is a stale logic that was removed in #93146. Please merge main and remove it.

gijoe0295 · 2026-07-03T10:29:02Z


    if (customResult) {
-        return customResult;
+        return customResult.filter((col) => col !== CONST.SEARCH.TABLE_COLUMNS.TOTAL || columns[CONST.SEARCH.TABLE_COLUMNS.TOTAL]);


I traced the PR that removes the nonDataColumns predicate. They intentionally want to always show the selected columns even when they have no data. See #92692 (comment).

So let's remove this change, returning customResult is correct here.

x-dev90 · 2026-07-03T13:09:33Z

@gijoe0295 I’ve addressed the feedback comments. Could you please take another look when you get a chance?

gijoe0295 · 2026-07-06T04:23:09Z

+            // Expense report view: TOTAL_AMOUNT (transaction amount) is shown by default.
+            // TOTAL (workspace currency) is added when a conversion exists.


Suggested change

// Expense report view: TOTAL_AMOUNT (transaction amount) is shown by default.

// TOTAL (workspace currency) is added when a conversion exists.

Not needed. Code is self-explanatory.

gijoe0295 · 2026-07-06T04:25:06Z

@x-dev90 Please update this test step:

Enable Comments and verify it appears immediately before the visible money column.

to:

Enable Comments and verify it appears immediately before the Amount column.

gijoe0295 · 2026-07-06T04:25:52Z

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 that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
I verified tests pass on all platforms & I tested again on:
- Android: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- iOS: mWeb Safari
- MacOS: Chrome / Safari
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 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 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)
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)
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.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
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: HybridApp

Android: mWeb Chrome

iOS: HybridApp

Simulator Screenshot - iPhone 17 - 2026-07-10 at 19 46 48

iOS: mWeb Safari

Simulator Screenshot - iPhone 17 - 2026-07-10 at 19 48 48

MacOS: Chrome / Safari

gijoe0295 · 2026-07-06T04:39:34Z

@trjExpensify One question.

Previously Total visibility is data-driven - only shows when:

currency conversion occurs; or
report has multiple currencies.

Even if user explicitly selected it in columns settings, it wouldn't show.

But you decided to remove that "dynamic" column settings here (i.e., columns will show when user selects it, regardless of data existence). That'd cause Amount and Total to be duplicates:

Would you mind confirming if you want to keep Total "dynamic" (data-driven)?

x-dev90 · 2026-07-08T05:31:17Z

@trjExpensify, could you please take a look at this comment, when you get a chance. thanks.

trjExpensify · 2026-07-08T12:44:54Z

I think it depends on what you mean by "dynamic". The behaviour we discovered over there was confusing whereby someone selected a column and it wouldn't show. What I think we should do here is:

If an expense on the report is in a foreign currency, show the Total column. Users coming from Classic are expecting this to show up when applicable, so this keeps the consistency.
If the Total column is shown and the user explicitly deselects it, hide the column.
If the Total column isn't being shown and the user selects it, show the column.

@shawnborton what do you think?

shawnborton · 2026-07-08T13:45:16Z

That sounds good to me, let's do it.

x-dev90 · 2026-07-10T10:33:37Z

@gijoe0295 I think the expected behavior is clarified now. Could you please take a look at this comment and confirm whether the PR looks good from your side? thanks

gijoe0295

LGTM

github-actions · 2026-07-10T14:16:41Z

🚧 cristipaval has triggered a test Expensify/App build. You can view the workflow run here.

OSBotify · 2026-07-10T14:22:52Z

✋ 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 · 2026-07-10T14:23:21Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #94929.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-38b39720b92-a91d37b-d1037fdea11b950ecb45d665228520fb31485efd/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-38b3972-a91d37b-9fbe00e040aa4584f6afdd5aa486be085aed8183/index.html

Web 🕸️
https://94929.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

fix: default report view to editable amount column

5f8b434

melvin-bot Bot assigned x-dev90 Jun 30, 2026

x-dev90 marked this pull request as ready for review June 30, 2026 08:58

x-dev90 requested review from a team as code owners June 30, 2026 08:58

melvin-bot Bot requested review from gijoe0295 and trjExpensify June 30, 2026 08:58

melvin-bot Bot removed request for a team June 30, 2026 08:58

Merge branch 'main' into fix/93014-default-report-amount-column

47d4efe

trjExpensify reviewed Jun 30, 2026

View reviewed changes

Merge branch 'main' into fix/93014-default-report-amount-column

afaa60a

fix: adjust column order for total and total amount

ef1bf95

gijoe0295 suggested changes Jul 3, 2026

View reviewed changes

x-dev90 added 3 commits July 3, 2026 15:47

Merge branch 'main' into fix/93014-default-report-amount-column

22ac0f6

fix: simplify comments placement and preserve custom report columns

fb77db8

fix: update column visibility logic to include TOTAL in custom report

d6c3ebe

Merge branch 'main' into fix/93014-default-report-amount-column

cf1eff0

gijoe0295 suggested changes Jul 6, 2026

View reviewed changes

x-dev90 added 2 commits July 6, 2026 09:29

fix: remove redundant comments

8d45c37

Merge branch 'main' into fix/93014-default-report-amount-column

6e367f0

x-dev90 added 2 commits July 9, 2026 08:41

Merge branch 'main' into fix/93014-default-report-amount-column

14883b7

Merge branch 'main' into fix/93014-default-report-amount-column

a19cf78

gijoe0295 approved these changes Jul 10, 2026

View reviewed changes

melvin-bot Bot requested a review from cristipaval July 10, 2026 12:56

cristipaval approved these changes Jul 10, 2026

View reviewed changes

cristipaval merged commit 38b3972 into Expensify:main Jul 10, 2026
35 checks passed

	if (shouldShowCommentsColumn && !addedColumns.has(CONST.SEARCH.TABLE_COLUMNS.COMMENTS)) {
	const totalIndex = result.indexOf(CONST.SEARCH.TABLE_COLUMNS.TOTAL);
	if (totalIndex === -1) {
	result.push(CONST.SEARCH.TABLE_COLUMNS.COMMENTS);
	} else {
	result.splice(totalIndex, 0, CONST.SEARCH.TABLE_COLUMNS.COMMENTS);
	}
	}

		// Expense report view: TOTAL_AMOUNT (transaction amount) is shown by default.
		// TOTAL (workspace currency) is added when a conversion exists.

Uh oh!

Conversation

x-dev90 commented Jun 30, 2026 • 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!

melvin-bot Bot commented Jun 30, 2026

Uh oh!

trjExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

shawnborton commented Jul 1, 2026

Uh oh!

codecov Bot commented Jul 1, 2026 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

x-dev90 commented Jul 1, 2026

Uh oh!

x-dev90 commented Jul 1, 2026

Uh oh!

trjExpensify commented Jul 1, 2026

Uh oh!

x-dev90 commented Jul 3, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

gijoe0295 Jul 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

x-dev90 commented Jul 3, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

gijoe0295 commented Jul 6, 2026

Uh oh!

gijoe0295 commented Jul 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

gijoe0295 commented Jul 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

x-dev90 commented Jul 8, 2026

Uh oh!

trjExpensify commented Jul 8, 2026

Uh oh!

shawnborton commented Jul 8, 2026

Uh oh!

x-dev90 commented Jul 10, 2026

Uh oh!

gijoe0295 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions Bot commented Jul 10, 2026

Uh oh!

OSBotify commented Jul 10, 2026

Uh oh!

github-actions Bot commented Jul 10, 2026

x-dev90 commented Jun 30, 2026 •

edited

Loading

codecov Bot commented Jul 1, 2026 •

edited by github-actions Bot

Loading

gijoe0295 Jul 3, 2026 •

edited

Loading

gijoe0295 commented Jul 6, 2026 •

edited

Loading

gijoe0295 commented Jul 6, 2026 •

edited

Loading