[Better Expense Report View] Remove RBR logic from Preview & clean-up invoice, split, and self-DM previews #59811

JakubKorytko · 2025-04-08T11:00:00Z

Explanation of Change

This PR fixes following issues from the Preview Followups:

Clean-up Invoice, split, and selfDM previews
RBR logic to extract specific errors to display

Also fixed blank messages appearing in chats where previews/expenses/system messages should appear after new view changes.

Fixed Issues

$ #59452 (partial)
$ #59979 (skeleton layout)
PROPOSAL: N/A

Tests

[Remove RBR logic from Preview]

Open any chat with a preview that has expense level violations.
Verify that RBR is displayed at expense level, but not at preview level.

[Clean-up self-DM previews]

Open self-dm chat.
Submit an expense.
Verify that the expense has no name and no wrapper.

[Clean-up invoice previews]

Open chat with invoices.
Verify that the invoices are displayed correctly as previews.

[Clean-up split previews]

Open any chat
Add a split expense (and other expenses if you want).
Verify that the split is grouped correctly.

Also verify that there are no empty messages where the expense/preview/system message should be and that trips are working properly.

Offline tests

Same as tests

QA Steps

Same as tests

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

Web.mov

MacOS: Desktop

melvin-bot · 2025-04-08T17:17:39Z

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

shawnborton · 2025-04-08T17:47:37Z

Going to run a test build 🚀

github-actions · 2025-04-08T17:48:12Z

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

shawnborton · 2025-04-08T18:58:36Z

Nice, this worked for me 👍

allgandalf · 2025-04-10T05:07:38Z

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: 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 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.ts 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.
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: Native

Android: mWeb Chrome

x

iOS: Native

ScreenRecording_04-10-2025.17-00-37_1.MP4

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

allgandalf

overall great job!, just few comments and we should be good to go, I don't think so the functionality is changing, so i will go forward with the testing and in the meantime you can work on the changes

src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx

src/components/ReportActionItem/MoneyRequestReportPreview/types.ts

src/components/ReportActionItem/TransactionPreview/types.ts

src/components/TransactionPreviewSkeletonView.tsx

src/languages/es.ts

src/pages/home/report/PureReportActionItem.tsx

allgandalf · 2025-04-10T08:03:20Z

Something is messed up:

Our branch:

Staging:

JakubKorytko · 2025-04-10T09:13:09Z

@allgandalf Okay, the problem is that onPreviewPressed is used as an conditional to render styled PressableWithoutFeedback, so it can't be empty.

App/src/components/ReportActionItem/TransactionPreview/TransactionPreviewContent.tsx

Lines 358 to 390 in 240a027

    
               if (!onPreviewPressed) { 
        
                   return transactionContent; 
        
               } 
        
               return ( 
        
                   <PressableWithoutFeedback 
        
                       onPress={shouldDisableOnPress ? undefined : onPreviewPressed} 
        
                       onPressIn={() => canUseTouchScreen() && ControlSelection.block()} 
        
                       onPressOut={() => ControlSelection.unblock()} 
        
                       onLongPress={showContextMenu} 
        
                       shouldUseHapticsOnLongPress 
        
                       accessibilityLabel={isBillSplit ? translate('iou.split') : showCashOrCard} 
        
                       accessibilityHint={convertToDisplayString(requestAmount, requestCurrency)} 
        
                       style={[ 
        
                           styles.moneyRequestPreviewBox, 
        
                           wrapperStyle, 
        
                           themeStyles, 
        
                           shouldDisableOnPress && styles.cursorDefault, 
        
                           (isIOUSettled || isApproved) && isSettlementOrApprovalPartial && styles.offlineFeedback.pending, 
        
                       ]} 
        
                   > 
        
                       {transactionContent} 
        
                       {isReviewDuplicateTransactionPage && !isIOUSettled && !isApproved && shouldShowKeepButton && ( 
        
                           <Button 
        
                               text={translate('violations.keepThisOne')} 
        
                               success 
        
                               style={[styles.ph4, styles.pb4]} 
        
                               onPress={navigateToReviewFields} 
        
                           /> 
        
                       )} 
        
                   </PressableWithoutFeedback> 
        
               ); 
        
           }

This will be fixed in another PR by @Kicu (not yet created), but it doesn't affect the UI or other logic, so it's NAB.
I've added an empty callbacks in recent commit, should work fine now.

github-actions · 2025-04-10T10:04:09Z

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

github-actions · 2025-04-10T10:46:23Z

🧪🧪 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/59811-hybrid/index.html	https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/59811-hybrid/index.html

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

👀 View the workflow run that generated this build 👀

mountiny · 2025-04-10T11:49:11Z

@allgandalf @JakubKorytko Sorry to clarify, is this what you see on the current branch? #59811 (comment) lets not merge it with regression like this even if its behind beta

allgandalf · 2025-04-10T11:50:46Z

@mountiny we fixed that with this commit :

a36febf

It works as expected now, you can check the image in my checklist

mountiny · 2025-04-10T13:17:23Z

thanks for clarifying, it was not clear to me from the comments

@JakubKorytko What issue are you referring to by this comment? #59811 (comment)

JakubKorytko · 2025-04-10T13:21:00Z

No issue raised for that, it's just the way this component works, if onPreviewPressed is not set then PressableWithoutFeedback (with styles applied) will not render, so we need to pass the empty function as a prop for it to work properly. This will be fixed in another PR by @Kicu

mountiny

Waiting for the translation confirmation

mountiny · 2025-04-10T13:35:53Z

Gonna move this one ahead and we can delve into the invoice report name later

mountiny · 2025-04-10T13:36:02Z

Discussing it here https://expensify.slack.com/archives/C01GTK53T8Q/p1744292126179329?thread_ts=1744269299.461019&cid=C01GTK53T8Q

OSBotify · 2025-04-10T13:44:56Z

✋ 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-11T00:51:58Z

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

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

github-actions · 2025-04-16T22:13:28Z

🚀 Deployed to production by https://github.com/marcaaron in version: 9.1.28-15 🚀

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

hoangzinh · 2025-05-14T21:09:36Z

src/pages/home/report/PureReportActionItem.tsx

+                                isBillSplit={isSplitBillActionReportActionsUtils(action)}
+                                wrapperStyle={shouldUseNarrowLayout ? {...styles.w100, ...styles.mw100} : reportPreviewStyles.transactionPreviewStyle}
+                                onPreviewPressed={() => {}}
+                                isTrackExpense={isTrackExpenseActionReportActionsUtils(action)}


We need to pass shouldDisplayContextMenu here, otherwise it will cause this bug #60808 (comment)

JakubKorytko added 6 commits April 8, 2025 12:16

Remove RBR from Preview header

8805e34

Fix Report Preview in Self-DM & display of single expenses in threads

9146e8d

Fix invoices

53e3e21

Clean-up

8ec8244

Make self-dm expenses not a preview

b535d43

Remove unused function from languages

999bb2a

JakubKorytko changed the title ~~[WIP] [Better Expense Report View] Remove RBR logic from Preview & clean-up invoice, split, and self-DM previews~~ [Better Expense Report View] Remove RBR logic from Preview & clean-up invoice, split, and self-DM previews Apr 8, 2025

JakubKorytko added 2 commits April 8, 2025 15:06

Fix self-DM expense width on narrow layout

8421729

Fix typescript issues, skeleton & test

43a2ffa

JakubKorytko marked this pull request as ready for review April 8, 2025 17:17

JakubKorytko requested review from a team as code owners April 8, 2025 17:17

melvin-bot bot requested review from DylanDylann and removed request for a team April 8, 2025 17:17

This comment has been minimized.

Sign in to view

mountiny assigned JakubKorytko Apr 9, 2025

JakubKorytko mentioned this pull request Apr 9, 2025

[Better Expense Report View] Remove reply count together with expense preview after deleting last expense #59679

Merged

48 tasks

allgandalf suggested changes Apr 10, 2025

View reviewed changes

JakubKorytko added 2 commits April 10, 2025 09:26

Address allgandalf PR comments

240a027

Merge branch 'main' into korytko/fix-invoices-selfdms-trips-and-rbr

040aefa

Add onPreviewPressed to every TransactionPreview for now

a36febf

allgandalf approved these changes Apr 10, 2025

View reviewed changes

melvin-bot bot requested a review from mountiny April 10, 2025 11:38

mountiny approved these changes Apr 10, 2025

View reviewed changes

mountiny merged commit bf6f3d6 into Expensify:main Apr 10, 2025
17 checks passed

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

Deploy Checklist: New Expensify 2025-04-11 #60076

Closed

33 tasks

JakubKorytko mentioned this pull request Apr 11, 2025

[Due for payment 2025-04-23] [Better Expense Report View] Expense preview loads infinitely and skeleton loading is not positioned correctly #59979

Closed

8 tasks

mountiny mentioned this pull request Apr 14, 2025

[Better Expense Report View] Preview follow-ups #59452

Closed

17 tasks

hoangzinh reviewed May 14, 2025

View reviewed changes

[Better Expense Report View] Remove RBR logic from Preview & clean-up invoice, split, and self-DM previews #59811

[Better Expense Report View] Remove RBR logic from Preview & clean-up invoice, split, and self-DM previews #59811

Uh oh!

Conversation

JakubKorytko commented Apr 8, 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!

melvin-bot bot commented Apr 8, 2025

Uh oh!

shawnborton commented Apr 8, 2025

Uh oh!

github-actions bot commented Apr 8, 2025

Uh oh!

This comment has been minimized.

shawnborton commented Apr 8, 2025

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

allgandalf 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!

Uh oh!

Uh oh!

allgandalf commented Apr 10, 2025

Uh oh!

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

Uh oh!

Uh oh!

github-actions bot commented Apr 10, 2025

Uh oh!

github-actions bot commented Apr 10, 2025

Uh oh!

mountiny commented Apr 10, 2025

Uh oh!

allgandalf commented Apr 10, 2025

Uh oh!

mountiny commented Apr 10, 2025

Uh oh!

JakubKorytko commented Apr 10, 2025

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

mountiny commented Apr 10, 2025

Uh oh!

mountiny commented Apr 10, 2025

Uh oh!

Uh oh!

OSBotify commented Apr 10, 2025

Uh oh!

github-actions bot commented Apr 11, 2025

Uh oh!

github-actions bot commented Apr 16, 2025

Uh oh!

hoangzinh May 14, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

JakubKorytko commented Apr 8, 2025 •

edited

Loading

allgandalf commented Apr 10, 2025 •

edited

Loading

JakubKorytko commented Apr 10, 2025 •

edited

Loading