Feature: Hold expense in one transaction view v2 by tienifr · Pull Request #43618 · Expensify/App

tienifr · 2024-06-12T22:27:58Z

Details

Second attempt to implement hold expense in one transaction view feature after the revert.

Fixed Issues

$ #39989
PROPOSAL: #39989 (comment)

Tests

Submit an expense (make sure it's the only expense in the expense report)
Press the report preview to open one transaction view
Put the expense on hold
Verify the hold education interstitial appears
Verify the hold message and reason appear in the expense report
Verify Hold banner appears in report header
Unhold the expense
Verify the unhold message appears
Verify Hold banner disappears in report header
Verify Submit button appears in both report preview and report header

Verify that no errors appear in the JS console

Offline tests

NA

QA Steps

Submit an expense (make sure it's the only expense in the expense report)
Press the report preview to open one transaction view
Put the expense on hold
Verify the hold education interstitial appears
Verify the hold message and reason appear in the expense report
Verify Hold banner appears in report header
Unhold the expense
Verify the unhold message appears
Verify Hold banner disappears in report header
Verify Submit button appears in both report preview and report header

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2024-06-20.at.19.40.11-compressed.mov

MacOS: Desktop

Screen.Recording.2024-05-21.at.14.07.39-compressed.mov

…ld-one-transaction-view-v2

trjExpensify · 2024-06-18T11:46:10Z

What's going on here? Is it ready to be reviewed?

tienifr · 2024-06-18T11:52:29Z

It'll be in several hours. I'm working on the solution for #43203 which is the last blocker we have here.

…ld-one-transaction-view-v2

melvin-bot · 2024-06-19T09:14:28Z

@shawnborton @dukenv0307 One of you needs to 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]

tienifr · 2024-06-19T09:18:23Z

@dukenv0307 I asked some questions here for clarifications before your review.

…ld-one-transaction-view-v2

tienifr · 2024-06-20T12:33:08Z

@dukenv0307 Latest expectation: #39989 (comment). Ready for review!

luacmartins

LGTM

dukenv0307 · 2024-06-21T02:51:17Z

code looks good, start to test...

dukenv0307 · 2024-06-21T03:39:17Z

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

web-resize.mp4

Android: mWeb Chrome

Screen.Recording.2024-06-21.at.10.31.11.mov

iOS: Native

web-resize.mp4

iOS: mWeb Safari

Screen.Recording.2024-06-21.at.10.29.54.mov

MacOS: Chrome / Safari

web-resize.mp4

MacOS: Desktop

web-resize.mp4

shawnborton · 2024-06-21T05:59:53Z

Videos above look good to me.

luacmartins

@tienifr we have conflicts

…ld-one-transaction-view-v2

trjExpensify · 2024-06-24T16:41:22Z

Conflicts are fixed, is this ready for re-review?

luacmartins

LGTM! @dukenv0307 @NikkiWines all yours

NikkiWines

Looks good as long as it's expected that the user can submit the report while the expense is on hold (which seems odd to me) 👍

luacmartins · 2024-06-25T14:59:21Z

@tienifr conflicts

…ld-one-transaction-view-v2

OSBotify · 2024-06-25T16:27:18Z

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

OSBotify · 2024-06-25T20:08:55Z

🚀 Deployed to staging by https://github.com/luacmartins in version: 9.0.2-0 🚀

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

OSBotify · 2024-07-03T19:37:51Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.0.3-7 🚀

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

carlosmiceli · 2024-07-03T20:29:21Z

I think I need to link here to a discussion in this PR about why it had to be reverted ("The offending PR has been commented on, pointing out the bug it caused and why, so the author and reviewers can learn from the mistake."). What should I link to?

luacmartins · 2024-07-03T22:00:31Z

@carlosmiceli usually you'd add a link to the regression issue it caused

carlosmiceli · 2024-07-04T03:04:44Z

Right, that's already added (first list item), it says that there should also be a link to the comments on the problem it caused discussed here. Maybe it's not mandatory to add such a link if there was no such conversation?

luacmartins · 2024-07-04T14:31:39Z

I think what you're looking for is a comment on this PR saying something like:

FYI this PR caused this issue, because ...

carlosmiceli · 2024-07-04T15:22:17Z

Correct! If there's not one, what's the procedure?

carlosmiceli · 2024-07-04T20:42:44Z

This PR caused this regression because it wasn't checking if the report is an invoice report before adding the Hold banner. Commenting for BugZero checklist: #44450 (comment)

OSBotify · 2024-07-10T10:55:56Z

🚀 Deployed to production by https://github.com/Julesssss in version: 9.0.5-13 🚀

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

jayeshmangwani · 2025-08-01T12:36:16Z

+
+    const getStatusBarProps: () => MoneyRequestHeaderStatusBarProps | undefined = () => {
+        if (hasOnlyHeldExpenses) {
+            return {title: translate('violations.hold'), description: translate('iou.expensesOnHold'), danger: true};


Coming from this issue #65725 , here for description, We could have made a minor improvement here by checking if the transaction length is greater than 1. If so, we should use the plural IOU hold message; otherwise, we use the singular message.

tienifr added 2 commits June 13, 2024 05:25

feature: hold transaction in one transaction view

19429e9

Merge branch 'main' of https://github.com/tienifr/App into feature/ho…

3f5ae3c

…ld-one-transaction-view-v2

luacmartins self-requested a review June 13, 2024 15:00

tienifr added 3 commits June 14, 2024 18:09

Merge branch 'main' of https://github.com/tienifr/App into feature/ho…

53420be

…ld-one-transaction-view-v2

Merge branch 'main' into feature/hold-one-transaction-view-v2

ca38a41

Merge branch 'main' of https://github.com/tienifr/App into feature/ho…

7b46569

…ld-one-transaction-view-v2

NikkiWines self-requested a review June 18, 2024 16:43

tienifr added 2 commits June 19, 2024 14:31

Merge branch 'main' of https://github.com/tienifr/App into feature/ho…

ce60d95

…ld-one-transaction-view-v2

hide submit and settle button when all expenses on hold

a89359e

tienifr marked this pull request as ready for review June 19, 2024 09:14

tienifr requested a review from a team as a code owner June 19, 2024 09:14

melvin-bot Bot removed the request for review from a team June 19, 2024 09:14

melvin-bot Bot requested review from dukenv0307 and shawnborton June 19, 2024 09:14

luacmartins requested changes Jun 19, 2024

View reviewed changes

Comment thread src/components/MoneyReportHeader.tsx Outdated

Comment thread src/components/ReportActionItem/ReportPreview.tsx Outdated

tienifr added 2 commits June 20, 2024 19:04

Merge branch 'main' of https://github.com/tienifr/App into feature/ho…

db88916

…ld-one-transaction-view-v2

show submit and settlement button

ee0fe93

luacmartins previously approved these changes Jun 20, 2024

View reviewed changes

luacmartins self-requested a review June 21, 2024 18:52

luacmartins reviewed Jun 21, 2024

View reviewed changes

Merge branch 'main' of https://github.com/tienifr/App into feature/ho…

3a9c3d5

…ld-one-transaction-view-v2

tienifr dismissed luacmartins’s stale review via 3a9c3d5 June 24, 2024 07:48

luacmartins approved these changes Jun 24, 2024

View reviewed changes

dukenv0307 approved these changes Jun 25, 2024

View reviewed changes

melvin-bot Bot requested a review from luacmartins June 25, 2024 03:11

NikkiWines previously approved these changes Jun 25, 2024

View reviewed changes

luacmartins previously approved these changes Jun 25, 2024

View reviewed changes

Merge branch 'main' of https://github.com/tienifr/App into feature/ho…

60ff784

…ld-one-transaction-view-v2

tienifr dismissed stale reviews from luacmartins and NikkiWines via 60ff784 June 25, 2024 16:04

luacmartins approved these changes Jun 25, 2024

View reviewed changes

luacmartins merged commit 13b22fc into Expensify:main Jun 25, 2024

github-actions Bot mentioned this pull request Jun 25, 2024

Deploy Checklist: New Expensify 2024-06-25 #44406

Closed

92 tasks

m-natarajan mentioned this pull request Jun 26, 2024

[HOLD for payment 2024-07-24] [HOLD for payment 2024-07-10] iOS - Hold - Back button on transaction thread returns to Hold - Reason page after holding it #44423

Closed

6 tasks

etCoderDysto mentioned this pull request Jun 26, 2024

[$250] [HOLD for payment 2024-07-22] Expense - Blank area below report header in the expense report #44434

Closed

6 tasks

yuwenmemon mentioned this pull request Jun 26, 2024

[HOLD for payment 2024-07-24] [HOLD for payment 2024-07-10] Send invoice - Hold option appears for invoice and error shows up when attempting to hold it #44450

Closed

6 tasks

NikkiWines mentioned this pull request Jun 28, 2024

[HOLD for payment 2024-07-17] Track expense - "Hold" option should not appear for tracked expense in combined report #44617

Closed

6 tasks

melvin-bot Bot mentioned this pull request Jul 3, 2024

[HOLD for payment 2024-07-22] [HOLD for payment 2024-07-17] [HOLD for payment 2024-07-10] [$250] [One expense reports] Update the UI for Held transactions in Single Transaction Report Preview / MoneyRequestAction #39989

Closed

jayeshmangwani reviewed Aug 1, 2025

View reviewed changes

jayeshmangwani mentioned this pull request Aug 1, 2025

[Due for payment 2025-08-01] [$250] Expense - Hold expense header displays "all expenses were put on hold" #65725

Closed

8 tasks

Uh oh!

Conversation

tienifr commented Jun 12, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

trjExpensify commented Jun 18, 2024

Uh oh!

tienifr commented Jun 18, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

melvin-bot Bot commented Jun 19, 2024

Uh oh!

tienifr commented Jun 19, 2024

Uh oh!

Uh oh!

Uh oh!

tienifr commented Jun 20, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

luacmartins left a comment

Choose a reason for hiding this comment

Uh oh!

dukenv0307 commented Jun 21, 2024

Uh oh!

dukenv0307 commented Jun 21, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

shawnborton commented Jun 21, 2024

Uh oh!

luacmartins left a comment

Choose a reason for hiding this comment

Uh oh!

trjExpensify commented Jun 24, 2024

Uh oh!

luacmartins left a comment • 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!

NikkiWines left a comment

Choose a reason for hiding this comment

Uh oh!

luacmartins commented Jun 25, 2024

Uh oh!

OSBotify commented Jun 25, 2024

Uh oh!

OSBotify commented Jun 25, 2024

Uh oh!

OSBotify commented Jul 3, 2024

Uh oh!

carlosmiceli commented Jul 3, 2024

Uh oh!

luacmartins commented Jul 3, 2024

Uh oh!

carlosmiceli commented Jul 4, 2024

Uh oh!

luacmartins commented Jul 4, 2024

Uh oh!

carlosmiceli commented Jul 4, 2024

Uh oh!

carlosmiceli commented Jul 4, 2024

Uh oh!

OSBotify commented Jul 10, 2024

Uh oh!

jayeshmangwani Aug 1, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

tienifr commented Jun 12, 2024 •

edited

Loading

tienifr commented Jun 18, 2024 •

edited

Loading

tienifr commented Jun 20, 2024 •

edited

Loading

dukenv0307 commented Jun 21, 2024 •

edited

Loading

luacmartins left a comment •

edited

Loading