Refactor: ConfirmModal to useConfirmModal | Batch 2

[mohammadjafarinejad]

Explanation of Change

Refactor ConfirmModal usage to useConfirmModal in the following files:

DelegateNoAccessModalProvider/index.tsx
LocationPermissionModal/index.android.tsx
LocationPermissionModal/index.tsx

Fixed Issues

$ #76696
PROPOSAL:

Tests

1. Delegate "Not Allowed" modal (DelegateNoAccessModalProvider)

Setup:

window.Onyx.merge('account', {delegatedAccess: {delegate: 'your-delegate@email.com', delegates: [{email: 'your-delegate@email.com', role: 'submitter'}]}});

Steps:

1. Try to perform an action that requires admin/owner access (e.g., approve a report or access workspace settings).
2. Verify the "Not Allowed" modal appears with the correct title and message referencing the delegator's email.
3. Tap "Got it" (single confirm button — no cancel button).

---

2. Location Permission modal — Web (index.tsx)

Prerequisite — Reset Chrome location permission & clear the app cache

Scenario A — Permission not yet granted (first-time prompt):

1. Open the app on Chrome/Safari with location permission not yet granted.
2. Start creating an expense → choose Scan receipt.
3. Capture or upload a receipt.
4. Verify the location access modal appears (title: "Allow location access", with "Continue" and "Not now" buttons).
5. Tap "Not now" → verify you proceed to confirmation without location attached.

Scenario B — Permission blocked (already denied):

1. Block location for the site in browser settings.
2. Follow steps 2–4 above.
3. Verify the location error modal appears (title: "Location access denied", with "Got it" and no cancel button on web).
4. Tap "Got it" → verify the modal closes and you proceed to confirmation without location.

Scenario C — Grant permission externally while the modal is open:

1. Open the location modal (Scenario A step 4).
2. While the modal is open, switch to browser settings and grant location permission.
3. Return to the app.
4. Verify the modal auto-closes and onGrant is called exactly once (no duplicate navigation).

---

3. Location Permission modal — Android (LocationPermissionModal/index.android.tsx)

Scenario A — First-time prompt:

1. On Android, create an expense → Scan receipt → capture a photo.
2. Verify the location access modal appears with "Continue" / "Not now".
3. Tap "Continue" → grant system permission → verify proceeds with location.

Scenario B — Permission blocked:

1. Deny location permission multiple times so it becomes permanently blocked.
2. Scan a receipt → verify the error modal appears with "Settings" button.
3. Tap "Settings" → verify the device Settings app opens to the location permissions page.
4. Tap "Not now" → verify you proceed to confirmation without location.

• 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 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_LocationPermission_Test1.mp4

Android_LocationPermission_Test2.mp4

Android: mWeb Chrome

AndroidWeb_LocationPermission_Test1.mp4

iOS: Native

_IOS_LocationPermission_Test1.mp4

iOS: mWeb Safari

IOSWeb_LocationPermission_Test1.mp4

MacOS: Chrome / Safari

WEB_.SupportalPermissionDeniedModalProvider.mp4

WEB_DelegateNoAccessModalProvider.mp4

Web_LocationPermission_Test1.mp4

Web_LocationPermission_Test2.mp4

Web_LocationPermission_Test3.mp4

[codecov]

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 Δ
...components/DelegateNoAccessModalProvider/index.tsx	95.00% <75.00%> (-5.00%)	⬇️
src/hooks/usePolling.ts	87.50% <87.50%> (ø)
...mponents/LocationPermissionModal/index.android.tsx	87.23% <87.17%> (+0.13%)	⬆️
src/components/LocationPermissionModal/index.tsx	84.21% <82.97%> (-9.79%)	⬇️
... and 14 files with indirect coverage changes

[melvin-bot]

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

[chatgpt-codex-connector]

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: ca52d8c10e

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

• Open a pull request for review
• Mark a draft as ready
• Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

[trjExpensify]

PR doesn’t need product input as a refactor PR. Unassigning and unsubscribing myself.

[ZhenjaHorbach]

@mohammadjafarinejad
Sorry for delay
Could you fix conflicts, please?

[ZhenjaHorbach]

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

2026-07-20.12.20.45.mov

2026-07-20.12.22.53.mov

2026-07-20.12.24.02.mov

Android: mWeb Chrome

2026-07-20.12.29.15.mov

2026-07-20.12.29.46.mov

2026-07-20.12.30.34.mov

iOS: HybridApp

2026-07-20.12.20.45.mov

2026-07-20.12.22.53.mov

2026-07-20.12.24.02.mov

iOS: mWeb Safari

2026-07-20.12.29.15.mov

2026-07-20.12.29.46.mov

2026-07-20.12.30.34.mov

MacOS: Chrome / Safari

2026-07-20.12.07.50.mov

2026-07-20.12.09.47.mov

2026-07-20.12.11.25.mov

2026-07-20.12.14.01.mov

[ZhenjaHorbach]

@mohammadjafarinejad Sorry for delay Could you fix conflicts, please?

@mohammadjafarinejad
Friendly bump!

[ZhenjaHorbach]

@mohammadjafarinejad
Friendly bump!

[mohammadjafarinejad]

Sorry for the delay, I'll update PRs tomorrow

[mohammadjafarinejad]

@ZhenjaHorbach PR is Ready for re-review.

[ZhenjaHorbach]

Sorry for the delay
I'm planning to review tomorrow!

[ZhenjaHorbach]

@mohammadjafarinejad
And could you fix conflicts, please?

[ZhenjaHorbach]

@mohammadjafarinejad
Friendly bump

[ZhenjaHorbach]

@mohammadjafarinejad
Friendly bump

[ZhenjaHorbach]

Looks like we have a small mismatch

1. web backdrop now triggers onDeny() (on android — it doesn't) in PermissionFlow

   • On main: onBackdropPress={closeModal} → only resetPermissionFlow(), without onDeny(). So tapping the backdrop = "cancel the flow", but NOT "user denied".
   • On this branch: onBackdropPress is not passed to showConfirmModal at all. By default backdrop → onClose → handleCancel → the promise resolves as CLOSE → action !== CONFIRM → onDeny() is called.
   • Meanwhile in index.android.tsx the backdrop is preserved (onBackdropPress: () => resetPermissionFlow()). So there's a web vs android mismatch — looks like an oversight in the refactor.

2. the loader on the confirm button is gone on both platforms (isConfirmLoading removed) in PermissionFlow

   • On main: you press "Continue" → the button shows a spinner, the modal stays open while requestLocationPermission() resolves, then it closes in finally.
   • On this branch: you press "Continue" → the modal closes immediately (setShowModal(false) + resetPermissionFlow()), and only then is the permission requested. There's no spinner anymore.

@mohammadjafarinejad And could you fix conflicts, please?

@mohammadjafarinejad
Can you check this comment?

And about the second requirement
We already have params for this
So you can reuse it!

[ZhenjaHorbach]

@mohammadjafarinejad
Friendly bump

[ZhenjaHorbach]

A lot of pipeline issues

[mohammadjafarinejad]

@ZhenjaHorbach Yes, I’m working on it. I’ll have two PRs ready for review today and will ping you.

[mohammadjafarinejad]

Hopefully, we can close the issue this week. I also noticed that there are still multiple places in the codebase using the ConfirmModal component. Should we address those in follow-up PRs as well?

[mohammadjafarinejad]

@ZhenjaHorbach PR is ready for re-review.

[ZhenjaHorbach]

Will recheck today

[roryabraham]

Do we need this ref-shadowing? Why not just include the callback in the main useEffect dependency array?

[github-actions]

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

[OSBotify]

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

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #84405.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-9f9d566a2b1-5a5e886-fb162a402e7295b433f76125728cca731a96aeb1/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-9f9d566-5a5e886-0ee458deafa57a5e6566c957d8d749d6dad52c92/index.html

Web 🕸️
https://84405.pr-testing.expensify.com

---

👀 View the workflow run that generated this build 👀

[OSBotify]

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

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

[MelvinBot]

Help site review — no changes required

I reviewed the changes in this PR against the help site articles under docs/articles.

Conclusion: No help site updates are needed.

This PR is a purely internal code refactor — it migrates ConfirmModal usage to the useConfirmModal hook in DelegateNoAccessModalProvider and the web/Android LocationPermissionModal components (plus a new usePolling hook and test updates). There is no change to any user-facing behavior, feature name, modal title, or button label:

• The "Not Allowed" delegate modal, the "Allow location access" / "Location access denied" modals, and their buttons ("Got it", "Continue", "Not now", "Settings") all render exactly as before.
• No new feature, setting, tab, or flow was introduced or removed.

Since the help site documents user-facing product behavior and none of that changed here, there's nothing to update. No draft PR was created.

[OSBotify]

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.4.41-4 🚀

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

Bundle Size Analysis (Sentry):

• Android