fix: Delete Receipt button is not displayed in merged transaction by dominictb · Pull Request #55474 · Expensify/App

dominictb · 2025-01-20T11:11:01Z

Explanation of Change

Fixed Issues

$ #53922
PROPOSAL: #53922 (comment)

Tests

Submit a card transaction expense
A Paypal receipt is sent to your email (titled Your PayPal receipt)
Submit a scan expense using the above receipt
Wait for the above expenses (scan & card) to be merged
Open the merged expense report
Open the receipt
Press the 3-dot menu
Verify Delete receipt appears
Press Delete receipt
Verify it reverts to show the card eReceipt (instead of the Paypal receipt photo you updated previously)

Verify that no errors appear in the JS console

Offline tests

NA

QA Steps

Same as Tests

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.2025-01-20.at.19.04.17.mov

MacOS: Desktop

melvin-bot · 2025-01-20T12:06:53Z

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

dukenv0307 · 2025-01-20T16:27:30Z

code looks good, I'm facing the android build issue. I'll complete the checklist soon

dukenv0307 · 2025-01-21T08:44:38Z

-    const transactionID = ReportActionsUtils.isMoneyRequestAction(parentReportAction) ? ReportActionsUtils.getOriginalMessage(parentReportAction)?.IOUTransactionID ?? '-1' : '-1';
+    const parentReportAction = getReportAction(report?.parentReportID, report?.parentReportActionID);
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+    const transactionID = (isMoneyRequestAction(parentReportAction) && getOriginalMessage(parentReportAction)?.IOUTransactionID) || CONST.DEFAULT_NUMBER_ID;


Suggested change

const transactionID = (isMoneyRequestAction(parentReportAction) && getOriginalMessage(parentReportAction)?.IOUTransactionID) || CONST.DEFAULT_NUMBER_ID;

const transactionID = isMoneyRequestAction(parentReportAction) ? getOriginalMessage(parentReportAction)?.IOUTransactionID : undefined;

We had issues using undefined for collection keys in the past. For example #54693 (comment). The solution is to fallback to DEFAULT_NUMBER_ID.

Ah, I see. we should update the docs about default value.

dukenv0307 · 2025-01-21T09:15:15Z

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

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

dukenv0307

LGTM

OSBotify · 2025-01-21T18:36:47Z

✋ 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-01-23T18:29:25Z

🚀 Deployed to staging by https://github.com/AndrewGable in version: 9.0.89-0 🚀

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

github-actions · 2025-01-28T01:52:50Z

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.0.89-8 🚀

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

dominictb added 3 commits January 20, 2025 17:53

fix: Delete Receipt button is not displayed in merged transaction

0913a95

fix inexistent ids lint

45abb77

silent lint

b414ec3

dominictb marked this pull request as ready for review January 20, 2025 12:06

dominictb requested a review from a team as a code owner January 20, 2025 12:06

melvin-bot Bot requested review from dukenv0307 and removed request for a team January 20, 2025 12:06

dukenv0307 reviewed Jan 21, 2025

View reviewed changes

dukenv0307 approved these changes Jan 21, 2025

View reviewed changes

melvin-bot Bot requested a review from AndrewGable January 21, 2025 09:15

AndrewGable approved these changes Jan 21, 2025

View reviewed changes

AndrewGable merged commit e10c3c9 into Expensify:main Jan 21, 2025

github-actions Bot mentioned this pull request Jan 23, 2025

Deploy Checklist: New Expensify 2025-01-23 #55657

Closed

melvin-bot Bot mentioned this pull request Jan 28, 2025

[HOLD for payment 2025-02-04] [$250] Delete Receipt button is not displayed in merged transaction #53922

Closed

7 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix: Delete Receipt button is not displayed in merged transaction#55474

fix: Delete Receipt button is not displayed in merged transaction#55474
AndrewGable merged 3 commits into
Expensify:mainfrom
dominictb:fix/53922

dominictb commented Jan 20, 2025 •

edited

Loading

Uh oh!

melvin-bot Bot commented Jan 20, 2025

Uh oh!

dukenv0307 commented Jan 20, 2025

Uh oh!

dukenv0307 Jan 21, 2025

Uh oh!

dominictb Jan 21, 2025

Uh oh!

dukenv0307 Jan 21, 2025

Uh oh!

dukenv0307 commented Jan 21, 2025

Uh oh!

dukenv0307 left a comment

Uh oh!

OSBotify commented Jan 21, 2025

Uh oh!

github-actions Bot commented Jan 23, 2025

Uh oh!

github-actions Bot commented Jan 28, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

	const transactionID = (isMoneyRequestAction(parentReportAction) && getOriginalMessage(parentReportAction)?.IOUTransactionID) \|\| CONST.DEFAULT_NUMBER_ID;
	const transactionID = isMoneyRequestAction(parentReportAction) ? getOriginalMessage(parentReportAction)?.IOUTransactionID : undefined;

Uh oh!

Conversation

dominictb commented Jan 20, 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 Jan 20, 2025

Uh oh!

dukenv0307 commented Jan 20, 2025

Uh oh!

dukenv0307 Jan 21, 2025

Choose a reason for hiding this comment

Uh oh!

dominictb Jan 21, 2025

Choose a reason for hiding this comment

Uh oh!

dukenv0307 Jan 21, 2025

Choose a reason for hiding this comment

Uh oh!

dukenv0307 commented Jan 21, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

dukenv0307 left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Jan 21, 2025

Uh oh!

github-actions Bot commented Jan 23, 2025

Uh oh!

github-actions Bot commented Jan 28, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

dominictb commented Jan 20, 2025 •

edited

Loading