From 31c972a7e7dfecf603acb95e57f2f9e9bf0a2cec Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Tue, 7 Apr 2026 01:07:03 +0530
Subject: [PATCH 1/2] Navigate back to taxes list when tax not found in RHN

---
 src/pages/workspace/taxes/WorkspaceEditTaxPage.tsx | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/pages/workspace/taxes/WorkspaceEditTaxPage.tsx b/src/pages/workspace/taxes/WorkspaceEditTaxPage.tsx
index 40e54ffcb228..90a50d2ab780 100644
--- a/src/pages/workspace/taxes/WorkspaceEditTaxPage.tsx
+++ b/src/pages/workspace/taxes/WorkspaceEditTaxPage.tsx
@@ -58,6 +58,13 @@ function WorkspaceEditTaxPage({
         Navigation.setParams({taxID: currentTaxID});
     }, [taxID, currentTaxID]);
 
+    useEffect(() => {
+        if (currentTaxRate || !policy?.taxRates?.taxes) {
+            return;
+        }
+        Navigation.goBack(ROUTES.WORKSPACE_TAXES.getRoute(policyID));
+    }, [currentTaxRate, policy?.taxRates?.taxes, policyID]);
+
     const deleteTaxRate = () => {
         if (!policyID) {
             return;

From 356c7da51452181a0907188a19d93c12560e7eb0 Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Tue, 14 Apr 2026 17:18:47 +0530
Subject: [PATCH 2/2] Return null instead of NotFoundPage when tax is missing
 but taxes are loaded

---
 src/pages/workspace/taxes/WorkspaceEditTaxPage.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/pages/workspace/taxes/WorkspaceEditTaxPage.tsx b/src/pages/workspace/taxes/WorkspaceEditTaxPage.tsx
index 90a50d2ab780..9070572b6062 100644
--- a/src/pages/workspace/taxes/WorkspaceEditTaxPage.tsx
+++ b/src/pages/workspace/taxes/WorkspaceEditTaxPage.tsx
@@ -74,6 +74,9 @@ function WorkspaceEditTaxPage({
     };
 
     if (!currentTaxRate) {
+        if (policy?.taxRates?.taxes) {
+            return null;
+        }
         return <NotFoundPage />;
     }
     const taxCodeToShow = isControlPolicy(policy) ? taxID : '';