Skip to content

fix: refactor ConfirmModal usage to useConfirmModal in workspace tags pages#77913

Merged
roryabraham merged 16 commits intoExpensify:mainfrom
daledah:fix/76690-1
Feb 13, 2026
Merged

fix: refactor ConfirmModal usage to useConfirmModal in workspace tags pages#77913
roryabraham merged 16 commits intoExpensify:mainfrom
daledah:fix/76690-1

Conversation

@daledah
Copy link
Contributor

@daledah daledah commented Dec 17, 2025

Explanation of Change

Refactor ConfirmModal usage to useConfirmModal in the following files:

WorkspaceTagsPage.tsx
ImportTagsOptionsPage.tsx
WorkspaceViewTagsPage.tsx
TagSettingsPage.tsx

Fixed Issues

$ #76690
PROPOSAL:

Tests

  • WorkspaceTagsPage.tsx
  1. Create a new workspace
  2. Enabled Tag
  3. Create a new tag
  4. Choose this tag then choose delete tag option
  5. Verify that: Delete tag warning modal is displayed
  6. Click the confirm button
  7. Verify that: Tag is deleted
  • ImportTagsOptionsPage.tsx
  1. Create a new workspace
  2. Enabled Tag
  3. Create a new tag
  4. Click More button -> choose Import spreadsheet
  5. Choose single level of tags << HERE
  6. Verify that: Switch Tag Levels is displayed
  7. Click the confirm button
  8. Verify that: Tag is deleted and navigate to Import spreadsheet tag
  • TagSettingsPage.tsx
  1. Create a new workspace
  2. Enabled Tag
  3. Create a new tag
  4. Click to this tag
  5. Choose delete option
  6. Verify that: Delete tag warning modal is displayed
  7. Click the confirm button
  8. Verify that: Tag is deleted
  • WorkspaceViewTagsPage.tsx
  1. Create a new workspace
  2. Enabled Tag
  3. Go to import tag page -> Import Multi-level tags
  4. Click to the tag
  5. Disabled all tags except one
  6. Choose this tag
  7. Then click the dropback button -> disabled this tag
  8. Verify that: Cannot delete or disable all tags is displayed
  • Verify that no errors appear in the JS console

Offline tests

Same as tests

QA Steps

Same as tests

  • 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
android-resize.mp4
android.mov
Android: mWeb Chrome
android-mweb-resize.mp4
android-mweb.mov
iOS: Native
ios-resize.mp4
ios.mov
iOS: mWeb Safari
ios-mweb-resize.mp4
ios-mwbe.mov
MacOS: Chrome / Safari
result.mp4
web.mov

@codecov
Copy link

codecov bot commented Dec 17, 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/pages/workspace/tags/WorkspaceViewTagsPage.tsx 0.00% <0.00%> (ø)
src/pages/workspace/tags/TagSettingsPage.tsx 0.00% <0.00%> (ø)
src/pages/workspace/tags/WorkspaceTagsPage.tsx 47.14% <13.33%> (-0.23%) ⬇️
src/pages/workspace/tags/ImportTagsOptionsPage.tsx 0.00% <0.00%> (ø)
... and 73 files with indirect coverage changes

@daledah daledah marked this pull request as ready for review December 17, 2025 16:58
@daledah daledah requested review from a team as code owners December 17, 2025 16:58
@melvin-bot melvin-bot bot requested review from JmillsExpensify and ZhenjaHorbach and removed request for a team December 17, 2025 16:58
@melvin-bot
Copy link

melvin-bot bot commented Dec 17, 2025

@ZhenjaHorbach 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 17, 2025 16:58
Copy link
Contributor

@JmillsExpensify JmillsExpensify left a comment

Choose a reason for hiding this comment

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

Good polish. Product review isn't strictly required.

@waterim
Copy link
Contributor

waterim commented Dec 19, 2025

Code looks good to me, just one thing, lets try not create new useCallback/useMemo.
We are still waiting on one fix PR to be merged before we will be able to merge it, me and @ZhenjaHorbach will keep you with updates

@ZhenjaHorbach
Copy link
Contributor

ZhenjaHorbach commented Dec 19, 2025

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
  • 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
2026-02-06.13.45.31.mov
2026-02-06.13.46.29.mov
2026-02-06.13.47.09.mov
2026-02-06.13.50.41.mov
iOS: HybridApp
iOS: mWeb Safari
2026-02-06.13.45.31.mov
2026-02-06.13.46.29.mov
2026-02-06.13.47.09.mov
2026-02-06.13.50.41.mov
MacOS: Chrome / Safari
2026-02-02.16.04.00.mov
2026-02-02.16.06.41.mov
2026-02-02.16.07.33.mov
2026-02-02.16.08.08.mov

@ZhenjaHorbach
Copy link
Contributor

Interesting
After enabling tags I have a crash

Снимок экрана 2025-12-19 в 14 40 29

@daledah
Copy link
Contributor Author

daledah commented Dec 22, 2025

Screen.Recording.2025-12-23.at.01.04.51.mov

@ZhenjaHorbach I can't reproduce this bug. Could you please add more detailed steps?

@ZhenjaHorbach
Copy link
Contributor

Screen.Recording.2025-12-23.at.01.04.51.mov
@ZhenjaHorbach I can't reproduce this bug. Could you please add more detailed steps?

Maybe it came from main
@daledah
But could you fix conlifcts, please?

@daledah
Copy link
Contributor Author

daledah commented Jan 8, 2026

@ZhenjaHorbach i fixed

@ZhenjaHorbach
Copy link
Contributor

Eslint and TS issues

@daledah
Copy link
Contributor Author

daledah commented Jan 28, 2026

We don't navigate to Import spreadsheet screen after confirming on Switch Tag Levels modal

modal.1.mov

@ZhenjaHorbach i fixed

And could you please record videos for all modals?

I added in MacOS: Chrome / Safari

@ZhenjaHorbach
Copy link
Contributor

ZhenjaHorbach commented Jan 28, 2026

We don't navigate to Import spreadsheet screen after confirming on Switch Tag Levels modal

modal.1.mov
@ZhenjaHorbach i fixed

And could you please record videos for all modals?

I added in MacOS: Chrome / Safari

But where is it for other platforms?😅

};

const deleteTags = () => {
const deleteTags = useCallback(() => {
Copy link
Contributor

@ZhenjaHorbach ZhenjaHorbach Feb 2, 2026

Choose a reason for hiding this comment

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

Did you really check React compiler ?
We don't need useCallback here
And make sure that we will not have React compiler warnings

#77913 (comment)

@ZhenjaHorbach
Copy link
Contributor

ZhenjaHorbach commented Feb 2, 2026

@daledah
And please, test your changes and record videos for all platforms
Since I found another obvious issue

2026-02-02.16.33.03.mov

@daledah
Copy link
Contributor Author

daledah commented Feb 2, 2026

Thanks @ZhenjaHorbach for the review. I can't see your video. Can you add the video here again?

Then i'll record videos for all platforms

@ZhenjaHorbach
Copy link
Contributor

ZhenjaHorbach commented Feb 2, 2026

2026-02-02.16.33.03.mov

On iOS native, when I try to delete a tag and then press the confirm button
The modal is closed, but the tag is still selected

@daledah
Copy link
Contributor Author

daledah commented Feb 3, 2026

Screen.Recording.2026-02-04.at.02.38.08.mov

@ZhenjaHorbach i can't reproduce this bug on my end

@daledah
Copy link
Contributor Author

daledah commented Feb 3, 2026

@ZhenjaHorbach i added all records, please check again

@ZhenjaHorbach
Copy link
Contributor

Screen.Recording.2026-02-04.at.02.38.08.mov
@ZhenjaHorbach i can't reproduce this bug on my end

Hmm
Weird
But good then
I will recheck!

@ZhenjaHorbach
Copy link
Contributor

LGTM!

@melvin-bot melvin-bot bot requested a review from roryabraham February 6, 2026 13:20
@ZhenjaHorbach
Copy link
Contributor

ZhenjaHorbach commented Feb 6, 2026

@daledah
But the only thing
In test steps, I suppose we need to update single level of tags to Multi-level tags for ImportTagsOptionsPage.tsx in 5 step

1. Create a new workspace
2. Enabled Tag
3. Create a new tag
4. Click More button -> choose Import spreadsheet
5. Choose single level of tags << HERE
6. Verify that: Switch Tag Levels is displayed
7. Clock the confirm button
8. Verify that: Tag is deleted and navigate to Import spreadsheet tag

@daledah
Copy link
Contributor Author

daledah commented Feb 7, 2026

In test steps, I suppose we need to update single level of tags to Multi-level tags for ImportTagsOptionsPage.tsx in 5 step

i added

@ZhenjaHorbach
Copy link
Contributor

In test steps, I suppose we need to update single level of tags to Multi-level tags for ImportTagsOptionsPage.tsx in 5 step

i added

I mean, update your test case(Not add a new one)

@daledah
Copy link
Contributor Author

daledah commented Feb 10, 2026

@roryabraham this PR is ready to merge

@roryabraham roryabraham merged commit 4e0897a into Expensify:main Feb 13, 2026
33 checks passed
@github-actions
Copy link
Contributor

🚧 @roryabraham has triggered a test Expensify/App build. You can view the workflow run here.

@OSBotify
Copy link
Contributor

✋ 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
Copy link
Contributor

🚀 Deployed to staging by https://github.com/roryabraham in version: 9.3.19-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/mountiny in version: 9.3.19-5 🚀

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

daledah added a commit to daledah/App that referenced this pull request Feb 19, 2026
…n workspace tags pages""

This reverts commit cf374fa, re-applying the original changes from PR Expensify#77913.

Co-authored-by: Cursor <cursoragent@cursor.com>
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.

6 participants