[CP Staging] Fix Total column not aligned to right edge when no merchant column is visible#89859
Conversation
… visible Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Krishna2323
changed the title
|
@codex review |
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 087ebec650
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
…ible Signed-off-by: krishna2323 <belivethatkg@gmail.com>
|
@codex review |
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
|
Codex Review: Didn't find any major issues. Nice work! ℹ️ About Codex in GitHubCodex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
If Codex has suggestions, it will comment; otherwise it will react with 👍. When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback". |
…xists Signed-off-by: krishna2323 <belivethatkg@gmail.com>
melvin-bot
Bot
requested review from
flaviadefaria and
situchan
and removed request for
a team
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: cfffd6fd08
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
Codecov Report❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.
|
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
|
cc @JS00001 |
Reviewer Checklist
Screenshots/VideosAndroid: HybridAppAndroid: mWeb ChromeiOS: HybridAppiOS: mWeb SafariMacOS: Chrome / Safariweb.mov |
|
@situchan lmk when this one is ready please |
Regression AnalysisOne potential regression found — when the COMMENTS column is visible, the Total column reverts to Root Cause
When any transaction has threaded comments, COMMENTS becomes the last column. Since COMMENTS is not in Scenario: Open a report where expenses have both a merchant AND threaded comments → the Total column will be wider than expected, sharing flex space with the merchant column. Suggested FixRemove the function hasFlexColumn(columns?: SearchColumnType[]): boolean {
if (!columns?.length) {
return false;
}
return columns.some((col) => FLEX_COLUMNS.has(col));
}Or, if the intent is specifically about the last column needing flex when no flex column exists, the check should be whether any total column is present (not just the last one): function hasFlexColumn(columns?: SearchColumnType[]): boolean {
if (!columns?.length) {
return false;
}
return columns.some((col) => TOTAL_COLUMNS.has(col)) && columns.some((col) => FLEX_COLUMNS.has(col));
}Other scenarios checked (no issues found)
|
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 638332bda6
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
| const FLEX_COLUMNS = new Set<string>([ | ||
| CONST.SEARCH.TABLE_COLUMNS.MERCHANT, | ||
| CONST.SEARCH.TABLE_COLUMNS.DESCRIPTION, | ||
| CONST.SEARCH.TABLE_COLUMNS.CATEGORY, | ||
| CONST.SEARCH.TABLE_COLUMNS.TAG, | ||
| CONST.SEARCH.TABLE_COLUMNS.TAX_RATE, |
There was a problem hiding this comment.
hasFlexColumn
hasFlexColumn() only treats MERCHANT, DESCRIPTION, CATEGORY, TAG, and TAX_RATE as flexible columns, but getReportTableColumnStyles() also renders other report-detail columns (for example CARD, WITHDRAWAL_ID, and EXCHANGE_RATE) with styles.flex1. In money request report views where one of those columns is the only flexible column and TOTAL is last, this helper returns false and keeps the total column flexible even though another flex column already exists, which regresses the intended width/alignment behavior this change is trying to normalize.
Useful? React with 👍 / 👎.
|
Please check above comments. |
|
@Krishna2323 can you address bot reviews above? Either 👍 or 👎 |
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
|
@situchan Addressed both bot comments:
|
|
Please merge main. Then I'll retest and good to go |
|
@situchan done |
JS00001
changed the title
|
🚧 @JS00001 has triggered a test Expensify/App build. You can view the workflow run here. |
[CP Staging] Fix Total column not aligned to right edge when no merchant column is visible (cherry picked from commit ef9ee8b) (cherry-picked to staging by francoisl)
|
🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
|
|
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
|
🚀 Cherry-picked to staging by https://github.com/francoisl in version: 9.3.68-3 🚀
Bundle Size Analysis (Sentry): |
|
No help site changes are required for this PR. This is a UI layout fix that corrects the alignment of the Total column in the transaction list when no merchant column is visible. It introduces a |
|
🚀 Deployed to production by https://github.com/francoisl in version: 9.3.68-3 🚀
|
|
🚀 Cherry-picked to staging by https://github.com/francoisl in version: 9.3.69-0 🚀
Bundle Size Analysis (Sentry): |
|
|
6 participants
Explanation of Change
Fixed Issues
$ #89838
PROPOSAL:
Tests
Offline tests
QA Steps
Same as tests
Verify that no errors appear in the JS console
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectioncanBeMissingparam foruseOnyxtoggleReportand notonIconClick)src/languages/*files and using the translation methodSTYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))npm run compress-svg)Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
Monosnap.screencast.2026-05-07.09-06-28.mp4