[Better Expense Report View] Deleting second to last expense & [Not BERV] concierge message fix + #61680 follow-up #61777

JakubKorytko · 2025-05-09T12:05:48Z

Explanation of Change

The problem is that when we delete expenses with comments from report and there is only one expense left, the application changes the table report view to single transaction report view, but it renders a message for every action in the report, we want to avoid this and filter out deleted expenses from the render. This is what this PR does.

In addition, this fixes Concierge message not disappearing when deleting expense without category and covers follow-up from #61680 (comment)

Note: incorrect reply count is related to BE, mentioned in #61775

Fixed Issues

$ #61775
$ #60999
PROPOSAL: N/A

Tests

Open Expensify App
Open or create any report with 2 expenses without selecting category
Add comments to one of the expenses
Delete an expense with comments
Verify that the concierge message related to the deleted expense is no longer displayed.
Verify that you are in the correct view of the single transaction report and that there is no 'Deleted expense' message.

Offline tests

Same as tests

QA Steps

Same as tests

PR Author Checklist

Screenshots/Videos

Android: Native

Concierge.mp4

Android: mWeb Chrome

iOS: Native

iOS.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

Web.mov

MacOS: Desktop

melvin-bot · 2025-05-09T14:10:45Z

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

…lete

DylanDylann · 2025-05-12T11:16:17Z

please ping me when this is ready

…lete

trjExpensify · 2025-05-14T08:30:42Z

@DylanDylann you good to review today?

DylanDylann · 2025-05-14T08:32:45Z

I will try to complete my review on this PR today (sure 80%) or at least early tomorrow

DylanDylann · 2025-05-14T10:35: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: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- 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 there are no new alerts related to the canBeMissing param for useOnyx
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: HybridApp

Android: mWeb Chrome

Screen.Recording.2025-05-14.at.18.41.34.mov

iOS: HybridApp

Screen.Recording.2025-05-14.at.18.43.17.mov

iOS: mWeb Safari

Screen.Recording.2025-05-14.at.18.38.57.mov

MacOS: Chrome / Safari

Screen.Recording.2025-05-14.at.18.12.12.mov

MacOS: Desktop

Screen.Recording.2025-05-14.at.18.45.33.mov

src/components/ReportActionItem/TransactionPreview/TransactionPreviewContent.tsx

src/libs/actions/IOU.ts

DylanDylann · 2025-05-14T11:49:32Z

I notice a weird behavior while deleting the expense offline. We can discuss this problem later

Screen.Recording.2025-05-14.at.18.45.33.mov

DylanDylann · 2025-05-14T11:53:36Z

The rest looks fine

JakubKorytko · 2025-05-14T12:11:16Z

I notice a weird behavior while deleting the expense offline. We can discuss this problem later

I think this should be handled in a separate PR, I've made a quick test and deleted expense is still in the Onyx report actions when offline so it is not really much related + this PR actually handles 2 issues & follow-up so I suggest to keep it this way, WDYT?

src/libs/actions/IOU.ts

neil-marcellini

Looks good but please add test and QA steps for the concierge issue

src/libs/actions/IOU.ts

…lete

JakubKorytko · 2025-05-14T17:30:49Z

@neil-marcellini done.

mountiny · 2025-05-14T21:07:14Z

src/components/ReportActionItem/TransactionPreview/TransactionPreviewContent.tsx

@@ -60,6 +60,7 @@ function TransactionPreviewContent({
    const ownerAccountID = iouReport?.ownerAccountID ?? reportPreviewAction?.childOwnerAccountID ?? CONST.DEFAULT_NUMBER_ID;
    const isReportAPolicyExpenseChat = isPolicyExpenseChat(chatReport);
    const {amount: requestAmount, comment: requestComment, merchant, tag, category, currency: requestCurrency} = transactionDetails;
+    const reportActions = useMemo(() => (iouReport ? getReportActions(iouReport) ?? {} : {}), [iouReport]);


Wouldnt it be cleaner to user something like
const [reportActions] = useOnyx(ONYXKEYS.COLLECTION.REPORT_ACTIONS, {canBeMissing: false}); with a selector?

dont wanna block on this as the pr brings valuable improvements but I think useOnyx with selector is more App like solution

OSBotify · 2025-05-14T21:18: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.

…62002-and-61777 Correct PR #62002 & (reverted) #61777

…62002-and-61777 Correct PR #62002 & (reverted) #61777 (cherry picked from commit 907ec86) (cherry-picked to staging by arosiclair)

github-actions · 2025-05-20T10:00:02Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.1.46-12 🚀

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

JakubKorytko force-pushed the korytko/fix-berv-single-report-view-after-delete branch from 5f7f497 to 59dda04 Compare May 9, 2025 12:21

JakubKorytko changed the title ~~[WIP] [Better Expense Report View] Fix switching from multi to one expense report view after deleting second to last expense~~ [Better Expense Report View] Fix switching from multi to one expense report view after deleting second to last expense May 9, 2025

Filter out deleted expenses from IOU actions

b513435

JakubKorytko force-pushed the korytko/fix-berv-single-report-view-after-delete branch from 59dda04 to b513435 Compare May 9, 2025 14:03

JakubKorytko marked this pull request as ready for review May 9, 2025 14:10

JakubKorytko requested a review from a team as a code owner May 9, 2025 14:10

melvin-bot bot requested review from DylanDylann and removed request for a team May 9, 2025 14:10

JakubKorytko marked this pull request as draft May 9, 2025 17:40

ikevin127 mentioned this pull request May 9, 2025

[Due for payment 2025-05-27] [$250] expense-Concierge message is shown after deleting the expense #60999

Closed

8 tasks

Merge branch 'main' into korytko/fix-berv-single-report-view-after-de…

a601a8e

…lete

JakubKorytko changed the title ~~[Better Expense Report View] Fix switching from multi to one expense report view after deleting second to last expense~~ [Better Expense Report View] Deleting second to last expense & concierge message fix May 12, 2025

JakubKorytko changed the title ~~[Better Expense Report View] Deleting second to last expense & concierge message fix~~ [Better Expense Report View] Deleting second to last expense & [Not BERV] concierge message fix May 12, 2025

JakubKorytko changed the title ~~[Better Expense Report View] Deleting second to last expense & [Not BERV] concierge message fix~~ [Better Expense Report View] Deleting second to last expense & [Not BERV] concierge message fix + #61680 follow-up May 12, 2025

Add fix suggested by Vit

58df08a

JakubKorytko force-pushed the korytko/fix-berv-single-report-view-after-delete branch from 372aa6b to 58df08a Compare May 12, 2025 11:12

JakubKorytko marked this pull request as ready for review May 12, 2025 11:22

mountiny assigned JakubKorytko May 12, 2025

mountiny self-requested a review May 12, 2025 11:45

Merge branch 'main' into korytko/fix-berv-single-report-view-after-de…

1ec5c40

…lete

DylanDylann reviewed May 14, 2025

View reviewed changes

src/components/ReportActionItem/TransactionPreview/TransactionPreviewContent.tsx Show resolved Hide resolved

src/libs/actions/IOU.ts Outdated Show resolved Hide resolved

Change isDeletedParentAction condition

0d84b7e

JakubKorytko requested a review from DylanDylann May 14, 2025 12:18

DylanDylann approved these changes May 14, 2025

View reviewed changes

src/libs/actions/IOU.ts Outdated Show resolved Hide resolved

melvin-bot bot requested a review from neil-marcellini May 14, 2025 12:28

Remove shouldShowDeletedRequestMessage

d9aec3d

neil-marcellini requested changes May 14, 2025

View reviewed changes

src/libs/actions/IOU.ts Outdated Show resolved Hide resolved

JakubKorytko added 2 commits May 14, 2025 19:17

Merge branch 'main' into korytko/fix-berv-single-report-view-after-de…

72385b7

…lete

Remove comment from actions/IOU.ts

f29bf4a

JakubKorytko requested a review from neil-marcellini May 14, 2025 17:30

neil-marcellini approved these changes May 14, 2025

View reviewed changes

mountiny approved these changes May 14, 2025

View reviewed changes

mountiny merged commit d5c6a83 into Expensify:main May 14, 2025
17 checks passed

francoisl mentioned this pull request May 16, 2025

Deploy Checklist: New Expensify 2025-05-15 #62161

Closed

88 tasks

This was referenced May 16, 2025

[Due for payment 2025-05-27] AU - Chat - Deleted message with a thread disappears from chat #62191

Open

[CP Staging] Correct PR #62002 & (reverted) #61777 #62275

Merged

youssef-lr added a commit that referenced this pull request May 19, 2025

Merge pull request #62275 from software-mansion-labs/korytko/correct-…

907ec86

…62002-and-61777 Correct PR #62002 & (reverted) #61777

OSBotify pushed a commit that referenced this pull request May 19, 2025

Merge pull request #62275 from software-mansion-labs/korytko/correct-…

4818ba3

…62002-and-61777 Correct PR #62002 & (reverted) #61777 (cherry picked from commit 907ec86) (cherry-picked to staging by arosiclair)

bernhardoj mentioned this pull request May 20, 2025

[$250] Expense - App returns to LHN instead of main chat after deleting all expenses in the report #61571

Open

8 tasks

melvin-bot bot mentioned this pull request May 20, 2025

[Due for payment 2025-05-27] [Better Expense Report View] Switching from multi to one expense report view is a little wonky with deleted expenses #61775

Open

2 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Better Expense Report View] Deleting second to last expense & [Not BERV] concierge message fix + #61680 follow-up #61777

[Better Expense Report View] Deleting second to last expense & [Not BERV] concierge message fix + #61680 follow-up #61777

JakubKorytko commented May 9, 2025 •

edited

Loading

melvin-bot bot commented May 9, 2025

DylanDylann commented May 12, 2025

trjExpensify commented May 14, 2025

DylanDylann commented May 14, 2025

DylanDylann commented May 14, 2025 •

edited

Loading

DylanDylann commented May 14, 2025

DylanDylann commented May 14, 2025

JakubKorytko commented May 14, 2025

neil-marcellini left a comment

JakubKorytko commented May 14, 2025

mountiny May 14, 2025

mountiny May 14, 2025

OSBotify commented May 14, 2025

github-actions bot commented May 20, 2025

[Better Expense Report View] Deleting second to last expense & [Not BERV] concierge message fix + #61680 follow-up #61777

[Better Expense Report View] Deleting second to last expense & [Not BERV] concierge message fix + #61680 follow-up #61777

Conversation

JakubKorytko commented May 9, 2025 • edited Loading

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented May 9, 2025

DylanDylann commented May 12, 2025

trjExpensify commented May 14, 2025

DylanDylann commented May 14, 2025

DylanDylann commented May 14, 2025 • edited Loading

Reviewer Checklist

Screenshots/Videos

DylanDylann commented May 14, 2025

DylanDylann commented May 14, 2025

JakubKorytko commented May 14, 2025

neil-marcellini left a comment

Choose a reason for hiding this comment

JakubKorytko commented May 14, 2025

mountiny May 14, 2025

Choose a reason for hiding this comment

mountiny May 14, 2025

Choose a reason for hiding this comment

OSBotify commented May 14, 2025

github-actions bot commented May 20, 2025

JakubKorytko commented May 9, 2025 •

edited

Loading

DylanDylann commented May 14, 2025 •

edited

Loading