Skip to content

Deprecated canDelete field#76504

Merged
luacmartins merged 19 commits intoExpensify:mainfrom
DylanDylann:refactor-isAwaitingFirstLevelApproval
Dec 9, 2025
Merged

Deprecated canDelete field#76504
luacmartins merged 19 commits intoExpensify:mainfrom
DylanDylann:refactor-isAwaitingFirstLevelApproval

Conversation

@DylanDylann
Copy link
Contributor

@DylanDylann DylanDylann commented Dec 2, 2025

Explanation of Change

Fixed Issues

$ #75453
PROPOSAL:

Tests

  • Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

Scenario 1: Expense Reports with BASIC Approval Mode

  1. Create a workspace with BASIC approval mode (Submit and Approve)
  2. As submitter, create an expense on the workspace
  3. As submitter, try to delete the transaction
  4. Verify that the expense is deleted
  5. As submitter, create another expense
  6. As submitter, submit the expense
  7. As submitter, try to delete the transaction
  8. Verify that the expense is deleted
  9. As submitter, create another expense and submit it
  10. As approver, approve the expense
  11. As submitter, try to delete the transaction
  12. Verify that you cannot delete the transaction

Scenario 2: Expense Reports with ADVANCED Approval Mode

  1. Create a control policy and invite a submitter and approver
  2. Navigate to Workspace > Workflows and update the submitter's approver to the approver account and the 2nd approver as the admin
  3. As submitter, create and submit an expense
  4. As submitter, try to delete the expense
  5. Verify that the transaction is deleted
  6. As submitter, create and submit another expense
  7. As approver, approve the expense
  8. As submitter, try to delete the expense
  9. Verify that you cannot delete the expense anymore

Scenario 3: Transaction Selection and Delete

  1. Go to Search page and filter by expenses
  2. Select a transaction that hasn't been submitted yet
  3. Verify Delete action is available in bulk actions
  4. Select a transaction that is submitted and approved
  5. Verify Delete action is NOT available
  6. Select multiple transactions (mix of deletable and non-deletable)
  7. Verify Delete action is NOT available
  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I verified there are no new alerts related to the canBeMissing param for useOnyx
  • I followed proper code patterns (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
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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 followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • 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
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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 new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • 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.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user 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.

Screenshots/Videos

Android: Native
Screen.Recording.2025-12-03.at.18.31.03.mov
Android: mWeb Chrome
Screen.Recording.2025-12-03.at.18.30.19.mov
iOS: Native
Screen.Recording.2025-12-03.at.18.28.59.mov
iOS: mWeb Safari
Screen.Recording.2025-12-03.at.18.29.51.mov
MacOS: Chrome / Safari
Screen.Recording.2025-12-03.at.17.50.48.mov

@DylanDylann DylanDylann force-pushed the refactor-isAwaitingFirstLevelApproval branch from 3239332 to 94b4452 Compare December 2, 2025 09:47
@codecov
Copy link

codecov bot commented Dec 2, 2025

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines Coverage Δ
src/components/Search/index.tsx 34.00% <ø> (ø)
src/hooks/useSelectedTransactionsActions.ts 4.21% <ø> (ø)
src/libs/ReportSecondaryActionUtils.ts 92.16% <ø> (ø)
src/libs/SearchUIUtils.ts 72.93% <ø> (-0.22%) ⬇️
src/pages/ReportDetailsPage.tsx 58.64% <100.00%> (ø)
src/libs/ReportUtils.ts 58.72% <8.33%> (-14.72%) ⬇️
... and 134 files with indirect coverage changes

@DylanDylann DylanDylann changed the title Refactor isAwaitingFirstLevelApproval Deprecated canDelete field Dec 3, 2025
@DylanDylann DylanDylann marked this pull request as ready for review December 3, 2025 10:28
@DylanDylann DylanDylann requested review from a team as code owners December 3, 2025 10:28
@melvin-bot melvin-bot bot requested review from eh2077 and joekaufmanexpensify and removed request for a team December 3, 2025 10:29
@melvin-bot
Copy link

melvin-bot bot commented Dec 3, 2025

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

@melvin-bot melvin-bot bot removed the request for review from a team December 3, 2025 10:29
@DylanDylann
Copy link
Contributor Author

The failed eslint and typecheck came from main

Copy link
Contributor

@joekaufmanexpensify joekaufmanexpensify left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whatsnext project 👍

@luacmartins
Copy link
Contributor

Bump @DylanDylann

@DylanDylann
Copy link
Contributor Author

Minor note: isAwaitingFirstLevelApprovalNew is still not a pure function since it calls helpers to map between account IDs and emails. I’ll handle this in the next PR to keep the current one from becoming too complicated.

@DylanDylann
Copy link
Contributor Author

@luacmartins @eh2077 Both failed gh actions are not related to our changes

@luacmartins
Copy link
Contributor

@DylanDylann can you merge main please?

@luacmartins
Copy link
Contributor

TS failures are coming from #75719. ESLint check is failing on getReportName which is also unrelated to this PR.

The failing Jest test seems flaky. No changes for the past 10mo.

I'm gonna go ahead and merge this. @DylanDylann let's look out for any potential failures on main.

@luacmartins luacmartins merged commit 20a9551 into Expensify:main Dec 9, 2025
36 of 68 checks passed
@melvin-bot melvin-bot bot added the Emergency label Dec 9, 2025
@melvin-bot
Copy link

melvin-bot bot commented Dec 9, 2025

@luacmartins looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

@nlemma
Copy link

nlemma commented Dec 9, 2025

@DylanDylann this PR (scenario 2) is failing because of issue #77148.

@OSBotify
Copy link
Contributor

OSBotify commented Dec 9, 2025

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

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

@lanitochka17
Copy link

This PR is failing because of issue ##77167

The issue is reproducible in: All

Bug7025186_1765303416421.12.mp4

@DylanDylann DylanDylann mentioned this pull request Dec 10, 2025
53 tasks
@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.2.74-12 🚀

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

1 similar comment
@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.2.74-12 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.2.74-12 🚀

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants