Fix "Delete expense" option appears for paid tracked workspace expense #44069

bernhardoj · 2024-06-20T09:46:39Z

Details

The delete expense option still shows for paid tracked workspace expense. This PR fix it.

Fixed Issues

$ #43591
PROPOSAL: #43591 (comment)

Tests

Same as QA Steps

Verify that no errors appear in the JS console

Offline tests

Same as QA Steps

QA Steps

Open workspace chat
Submit 1 expense and track 1 expense
Open the expense report
Pay the expense
Open the track transaction thread
Press the 3-dot button
Verify there is no Delete expense option
Open a self DM
Track an expense
Open the track report
Press the 3-dot button
Verify there is a Delete expense option

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-06-20.at.17.39.37.mov

Android: mWeb Chrome

android.mweb.1.mov

android.mweb.2.mov

iOS: Native

Screen.Recording.2024-06-20.at.17.11.45.1.mov

iOS: mWeb Safari

ios.mweb.1.mov

ios.mweb.2.mov

MacOS: Chrome / Safari

web.1.mov

MacOS: Desktop

Screen.Recording.2024-06-20.at.17.09.40.1.mov

melvin-bot · 2024-06-20T09:46:44Z

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

eh2077 · 2024-06-20T13:31:24Z

A typo in QA step

-12. Verify there is no Delete expense option
+12. Verify there is Delete expense option

eh2077 · 2024-06-20T13:31:30Z

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

0-android.mp4

Android: mWeb Chrome

0-mobile-chrome.mp4

iOS: Native

0-ios.mp4

iOS: mWeb Safari

0-mobile-safari.mp4

MacOS: Chrome / Safari

0-web.mp4

MacOS: Desktop

0-desktop.mp4

eh2077

Looks good and tested well

bernhardoj · 2024-06-21T02:22:27Z

A typo in QA step

Upated, thanks!

NikkiWines · 2024-06-25T03:42:33Z

Will take a look at this first thing tomorrow, sorry for the delay

NikkiWines

One small comment otherwise looks godo

NikkiWines · 2024-06-25T18:31:02Z

src/components/MoneyRequestHeader.tsx

@@ -61,7 +61,8 @@ function MoneyRequestHeader({report, parentReportAction, policy, shouldUseNarrow
    const {translate} = useLocalize();
    const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false);
    const [shouldShowHoldMenu, setShouldShowHoldMenu] = useState(false);
-    const moneyRequestReport = parentReport;
+    const isSelfDMTrack = ReportUtils.isTrackExpenseReport(report) && ReportUtils.isSelfDM(parentReport);


NAB: variable clarity

Suggested change

const isSelfDMTrack = ReportUtils.isTrackExpenseReport(report) && ReportUtils.isSelfDM(parentReport);

const isSelfDMTrackExpenseReport = ReportUtils.isTrackExpenseReport(report) && ReportUtils.isSelfDM(parentReport);

NikkiWines

OSBotify · 2024-06-26T03:54:57Z

✋ 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-07-03T19:39:33Z

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

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

OSBotify · 2024-07-10T10:58:14Z

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

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

fix can delete paid workspace track expense

fd4a115

bernhardoj requested a review from a team as a code owner June 20, 2024 09:46

melvin-bot bot requested review from eh2077 and removed request for a team June 20, 2024 09:46

eh2077 approved these changes Jun 20, 2024

View reviewed changes

melvin-bot bot requested a review from NikkiWines June 20, 2024 13:38

NikkiWines requested changes Jun 25, 2024

View reviewed changes

bernhardoj added 2 commits June 26, 2024 10:57

Merge branch 'main' into fix/43591-can-delete-paid-track-expense

842dbbd

update variable name

a2ad4ad

NikkiWines approved these changes Jun 26, 2024

View reviewed changes

NikkiWines merged commit 4d7c5e9 into Expensify:main Jun 26, 2024
15 checks passed

github-actions bot mentioned this pull request Jun 27, 2024

Deploy Checklist: New Expensify 2024-06-27 #44575

Closed

85 tasks

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

[HOLD for payment 2024-07-10] [$250] Track expense - "Delete expense" option appears for paid tracked expense #43591

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix "Delete expense" option appears for paid tracked workspace expense #44069

Fix "Delete expense" option appears for paid tracked workspace expense #44069

bernhardoj commented Jun 20, 2024 •

edited

Loading

melvin-bot bot commented Jun 20, 2024

eh2077 commented Jun 20, 2024

eh2077 commented Jun 20, 2024 •

edited

Loading

eh2077 left a comment

bernhardoj commented Jun 21, 2024

NikkiWines commented Jun 25, 2024

NikkiWines left a comment

NikkiWines Jun 25, 2024

bernhardoj Jun 26, 2024

NikkiWines left a comment

OSBotify commented Jun 26, 2024

OSBotify commented Jul 3, 2024

OSBotify commented Jul 10, 2024

	const isSelfDMTrack = ReportUtils.isTrackExpenseReport(report) && ReportUtils.isSelfDM(parentReport);
	const isSelfDMTrackExpenseReport = ReportUtils.isTrackExpenseReport(report) && ReportUtils.isSelfDM(parentReport);

Fix "Delete expense" option appears for paid tracked workspace expense #44069

Fix "Delete expense" option appears for paid tracked workspace expense #44069

Conversation

bernhardoj commented Jun 20, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jun 20, 2024

eh2077 commented Jun 20, 2024

eh2077 commented Jun 20, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

eh2077 left a comment

Choose a reason for hiding this comment

bernhardoj commented Jun 21, 2024

NikkiWines commented Jun 25, 2024

NikkiWines left a comment

Choose a reason for hiding this comment

NikkiWines Jun 25, 2024

Choose a reason for hiding this comment

bernhardoj Jun 26, 2024

Choose a reason for hiding this comment

NikkiWines left a comment

Choose a reason for hiding this comment

OSBotify commented Jun 26, 2024

OSBotify commented Jul 3, 2024

OSBotify commented Jul 10, 2024

bernhardoj commented Jun 20, 2024 •

edited

Loading

eh2077 commented Jun 20, 2024 •

edited

Loading