Fix: Taxes page still shown when disable the taxes from other browser by ryntgh · Pull Request #76611 · Expensify/App

ryntgh · 2025-12-03T13:35:34Z

Explanation of Change

This PR adds isFocused to the dependency array of the useEffect that handles navigation when a feature is disabled, so that the user is navigated to the More features page when the RHP is opened

Fixed Issues

$ #75861
PROPOSAL: #75861 (comment)

Tests

Same as QA Steps

Verify that no errors appear in the JS console

Offline tests

Same as QA Steps

QA Steps

Open any workspace > More features > Enable taxes
Click on Taxes
Click on a tax rate
From the other browser, disable the taxes from the More features page
Back to the first browser observe workspace setting page
Verify that the Taxes page has completely disappeared after disabling taxes in the other browser

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android-Native.mp4

Android: mWeb Chrome

Android-mWeb.mp4

iOS: Native

iOS-Native.mp4

iOS: mWeb Safari

iOS-mWeb.mp4

MacOS: Chrome / Safari

MacOS-Chrome.mp4

codecov · 2025-12-03T13:43:42Z

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 Δ
...ages/workspace/categories/ImportCategoriesPage.tsx	`0.00% <ø> (ø)`
src/pages/workspace/rules/RulesCustomPage.tsx	`0.00% <ø> (ø)`
...orkspace/tags/ImportMultiLevelTagsSettingsPage.tsx	`0.00% <ø> (ø)`
src/pages/workspace/tags/ImportTagsOptionsPage.tsx	`0.00% <ø> (ø)`
src/pages/workspace/tags/ImportTagsPage.tsx	`0.00% <ø> (ø)`
src/pages/workspace/tags/TagGLCodePage.tsx	`0.00% <ø> (ø)`
src/pages/workspace/travel/PolicyTravelPage.tsx	`0.00% <ø> (ø)`
...orkspace/workflows/WorkspaceWorkflowsPayerPage.tsx	`0.00% <ø> (ø)`
src/pages/workspace/perDiem/ImportPerDiemPage.tsx	`0.00% <0.00%> (ø)`
src/pages/workspace/AccessOrNotFoundWrapper.tsx	`74.54% <0.00%> (-1.39%)`	⬇️
... and 2 more
... and 14 files with indirect coverage changes

melvin-bot · 2025-12-04T06:28:36Z

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

joekaufmanexpensify

@ryntgh does this fix address this bug for all features on the more features page?

Krishna2323 · 2025-12-04T19:08:32Z

does this fix address this bug for all features on the more features page?

@joekaufmanexpensify yes, it fixes all features pages.

Krishna2323 · 2025-12-05T11:28:41Z

@ryntgh the tag import page is not closing sometimes — could you please check? Could you also thoroughly test all the other features again? I think I’ve seen the same issue on one more page. Thanks!

Monosnap.screencast.2025-12-05.16-42-27.mp4

Krishna2323 · 2025-12-05T17:36:31Z

@ryntgh the above bug happens probably because we haven't passed featureName prop to AccessOrNotFoundWrapper in ImportTagsPage and similar tag import page.

ryntgh · 2025-12-07T13:40:01Z

@Krishna2323 thanks for pointing this out! I’ll look into this tomorrow

Krishna2323 · 2025-12-09T08:47:58Z

@ryntgh bump

ryntgh · 2025-12-09T15:16:17Z

@Krishna2323 Sorry for the late response, I've updated the PR

I also found the same navigation case in WorkspaceUpgradePage (upgrade-to-control modal) and added a useEffect mirroring AccessOrNotFoundWrapper behavior. Do you think we should handle it there too? If so, do you think this is the right approach?

Krishna2323 · 2025-12-10T15:20:09Z

@ryntgh there are two more components that use AccessOrNotFoundWrapper without the featureName prop: WorkspaceWorkflowsPayerPage and RulesCustomPage. Please update those and remove the changes from WorkspaceUpgradePage — I don’t think we should worry about that since it’s a rare edge case. Keen to hear your view on this, @puneetlath. Thank you!

ryntgh · 2025-12-10T16:55:05Z

@Krishna2323 Thanks for the feedback! I've updated the PR accordingly

Krishna2323 · 2025-12-12T16:06:38Z

@puneetlath the AddNewCardPage is missing the AccessOrNotFoundWrapper. Should we update that in this PR? Let me know your thoughts, and we can make the change here. I’ll complete the checklist in an hour.

This would ensure consistent access control with other company cards pages and fix the bug where the page doesn't navigate away when the feature is disabled from another browser.

Looking at the codebase, most company cards pages are wrapped with AccessOrNotFoundWrapper:

Page	Has `AccessOrNotFoundWrapper`?
`WorkspaceCompanyCardsPage.tsx`	✅ Yes
`WorkspaceCompanyCardFeedSelectorPage.tsx`	✅ Yes
`WorkspaceCompanyCardDetailsPage.tsx`	✅ Yes
`WorkspaceCompanyCardsSettingsPage.tsx`	✅ Yes
`assignCard/CardNameStep.tsx`	✅ Yes
`addNew/AddNewCardPage.tsx`	❌ No

Current Protection in `AddNewCardPage.tsx`

The page only has:

withPolicyAndFullscreenLoading HOC - provides policy data and loading state
DelegateNoAccessWrapper - blocks delegate access
isBlockedToAddNewFeeds redirect - redirects to upgrade page if blocked

What's Missing

Without AccessOrNotFoundWrapper, the page can be accessed directly via URL (/workspaces/:policyID/company-cards/add-card-feed) even if:

The user is not a policy admin
The company cards feature is disabled
The feature gets disabled while user is on this flow

This appears to be an oversight. The AddNewCardPage.tsx should probably be wrapped with:

<AccessOrNotFoundWrapper
    policyID={policyID}
    accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
    featureName={CONST.POLICY.MORE_FEATURES.ARE_COMPANY_CARDS_ENABLED}
>
    {/* current content */}
</AccessOrNotFoundWrapper>

Krishna2323 · 2025-12-12T17:20:41Z

@ryntgh on the iOS app, I briefly see a blank screen. Could you please check that? It can also be seen in your iOS native recording.

ios_native.mp4

ryntgh · 2025-12-14T14:03:04Z

Oh yeah, it looks like iOS native has a blank screen issue when opening any page from the selected feature page. I’ll investigate this tomorrow morning

ryntgh · 2025-12-19T15:38:14Z

@Krishna2323 Sure, I've updated the PR to use setNavigationActionToMicrotaskQueue instead. I've also re-tested the changes on all platforms and can confirm everything works as expected

Krishna2323 · 2025-12-27T03:17:08Z

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
- 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 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_native.mp4

Android: mWeb Chrome

android_chrome.mp4

iOS: HybridApp

ios_native.mp4

iOS: mWeb Safari

ios_safari.mp4

MacOS: Chrome / Safari

web_chrome.mp4

Krishna2323 · 2025-12-27T03:21:37Z

@puneetlath, could you please check this comment and the recordings below? On native platforms, we first go back to the Feature page and then to the More Features page. This is for fixing #76611 (comment).

iOS: HybridApp

ios_native.mp4

iOS: mWeb Safari

ios_safari.mp4

Krishna2323 · 2026-01-05T12:56:29Z

@puneetlath friendly bump!

puneetlath · 2026-01-05T21:43:09Z

Sorry for the delay. It makes sense to me to address that if it's relevant to what we're doing here.

Krishna2323 · 2026-01-07T09:46:30Z

@ryntgh could you please fix AddNewCardPage? #76611 (comment)

On native platforms, we first go back to the Feature page and then to the More Features page.

@puneetlath what about this^—are we fine with it?

iOS: HybridApp

ios_native.mp4

iOS: mWeb Safari

ios_safari.mp4

ryntgh · 2026-01-08T14:53:00Z

could you please fix AddNewCardPage?

Sorry for the delay, I've updated the PR

Krishna2323 · 2026-01-09T13:24:12Z

@ryntgh why did you added AccessOrNotFoundWrapper in PublicDomainErrorPage?

ryntgh · 2026-01-09T14:42:18Z

@Krishna2323 Since the Travel feature is currently available on the More features page, I think we should address this, as users with a public domain can easily access PublicDomainErrorPage. When a user with a public domain attempts to get started with the Travel feature by clicking the "Let's go" button (the only button on the page), the PublicDomainErrorPage is displayed

But I'm not entirely sure if this is necessary, since it's an error page shown during the Travel flow. Should we wrap it, or is this edge case acceptable? What do you think?

Krishna2323

Looks good to me! 🚀

Krishna2323 · 2026-01-10T15:05:37Z

@puneetlath please check this comment before merging. Thanks!

Krishna2323 · 2026-01-14T13:06:38Z

@puneetlath friendly bump!

puneetlath

I'm good with it. Sorry for the delay!

OSBotify · 2026-01-14T22:27:20Z

✋ 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 · 2026-01-15T17:46:12Z

🚀 Deployed to staging by https://github.com/puneetlath in version: 9.3.3-0 🚀

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

OSBotify · 2026-01-16T23:15:32Z

🚀 Deployed to production by https://github.com/francoisl in version: 9.3.3-8 🚀

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

QichenZhu · 2026-03-06T12:31:53Z

src/pages/workspace/rules/RulesCustomPage.tsx

        <AccessOrNotFoundWrapper
            policyID={policyID}
            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_RULES_ENABLED}


The page is not related to the Rules feature. Fixed in #81313.

huult · 2026-03-13T01:09:52Z

src/pages/Travel/PublicDomainErrorPage.tsx

 function PublicDomainErrorPage({route}: PublicDomainErrorPageProps) {
    const styles = useThemeStyles();
    const {translate} = useLocalize();
+    const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID, {canBeMissing: true});


This comes from #82773. We can't activate the policy ID here because the active policy ID is not the policy of the currently opened workspace. We should use the policy ID of the current workspace by passing it as a parameter.

QichenZhu · 2026-03-13T03:20:05Z

src/pages/Travel/PublicDomainErrorPage.tsx

-            testID="PublicDomainErrorPage"
+        <AccessOrNotFoundWrapper
+            policyID={activePolicyID}
+            featureName={CONST.POLICY.MORE_FEATURES.IS_TRAVEL_ENABLED}


We need to show this page no matter whether Travel is enabled (see #82472). Fixed in #83663.

Fix: Taxes page still shown when disable the taxes from other browser

aa3374f

melvin-bot bot assigned ryntgh Dec 3, 2025

Merge branch 'main' into issue-75861

136eac2

ryntgh marked this pull request as ready for review December 4, 2025 06:28

ryntgh requested review from a team as code owners December 4, 2025 06:28

melvin-bot bot requested review from Krishna2323 and joekaufmanexpensify and removed request for a team December 4, 2025 06:28

melvin-bot bot removed the request for review from a team December 4, 2025 06:28

ryntgh mentioned this pull request Dec 4, 2025

[Due for payment 2026-01-23] [$250] Workspace setting-Taxes page still shown when disable the taxes from other browser #75861

Closed

8 tasks

joekaufmanexpensify reviewed Dec 4, 2025

View reviewed changes

ryntgh added 3 commits December 9, 2025 22:42

Merge branch 'main' into issue-75861

51645e1

Add featureName prop to AccessOrNotFoundWrapper

6e57abd

ESLint fix

51dae4c

Add featureName prop to AccessOrNotFoundWrapper

5b08961

This comment was marked as outdated.

Sign in to view

Use setNavigationActionToMicrotaskQueue for navigation timing

8d02abb

ryntgh added 3 commits January 8, 2026 20:37

Merge branch 'main' into issue-75861

f8d34df

Wrap AddNewCardPage with AccessOrNotFoundWrapper

a214059

Add featureName prop to AccessOrNotFoundWrapper

7a5baaa

Krishna2323 approved these changes Jan 10, 2026

View reviewed changes

melvin-bot bot requested a review from puneetlath January 10, 2026 15:04

puneetlath approved these changes Jan 14, 2026

View reviewed changes

puneetlath merged commit d02c688 into Expensify:main Jan 14, 2026
31 checks passed

OSBotify mentioned this pull request Jan 15, 2026

Deploy Checklist: New Expensify 2026-01-15 #79701

Closed

65 tasks

parasharrajat mentioned this pull request Feb 3, 2026

[NoQA] fix: allow travel invoicing beta testing #81084

Merged

53 tasks

huult mentioned this pull request Feb 21, 2026

[$250] [Due for payment 2026-03-19] Travel-Click on "Let's go" in Travel of non default ws, Book travel RHP quickly disappeared #82773

Open

7 tasks

QichenZhu reviewed Mar 6, 2026

View reviewed changes

QichenZhu mentioned this pull request Mar 6, 2026

[$250] Workspace - Unable to open Expense policy RHP as it auto closes #80457

Closed

7 tasks

huult reviewed Mar 13, 2026

View reviewed changes

QichenZhu reviewed Mar 13, 2026

View reviewed changes

QichenZhu mentioned this pull request Mar 13, 2026

[$250] Travel - Opening travel in OD does not opens ND experience, instead "it's not here" page #78875

Open

7 tasks

Conversation

ryntgh commented Dec 3, 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!

codecov bot commented Dec 3, 2025 • edited by github-actions bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

melvin-bot bot commented Dec 4, 2025

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

Krishna2323 commented Dec 4, 2025

Uh oh!

Krishna2323 commented Dec 5, 2025

Uh oh!

Krishna2323 commented Dec 5, 2025

Uh oh!

ryntgh commented Dec 7, 2025

Uh oh!

Krishna2323 commented Dec 9, 2025

Uh oh!

ryntgh commented Dec 9, 2025

Uh oh!

Krishna2323 commented Dec 10, 2025

Uh oh!

ryntgh commented Dec 10, 2025

Uh oh!

Krishna2323 commented Dec 12, 2025

Current Protection in AddNewCardPage.tsx

What's Missing

Uh oh!

This comment was marked as outdated.

Krishna2323 commented Dec 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ryntgh commented Dec 14, 2025

Uh oh!

ryntgh commented Dec 19, 2025

Uh oh!

Krishna2323 commented Dec 27, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

Krishna2323 commented Dec 27, 2025

Uh oh!

Krishna2323 commented Jan 5, 2026

Uh oh!

puneetlath commented Jan 5, 2026

Uh oh!

Krishna2323 commented Jan 7, 2026

Uh oh!

ryntgh commented Jan 8, 2026

Uh oh!

Krishna2323 commented Jan 9, 2026

Uh oh!

ryntgh commented Jan 9, 2026

Uh oh!

Krishna2323 left a comment

Choose a reason for hiding this comment

Uh oh!

Krishna2323 commented Jan 10, 2026

Uh oh!

Krishna2323 commented Jan 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

puneetlath left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Jan 14, 2026

Uh oh!

ryntgh commented Dec 3, 2025 •

edited

Loading

codecov bot commented Dec 3, 2025 •

edited by github-actions bot

Loading

Current Protection in `AddNewCardPage.tsx`

Krishna2323 commented Dec 12, 2025 •

edited

Loading

Krishna2323 commented Jan 14, 2026 •

edited

Loading