From cd87e402c0555f617db111b3021fb2eebabd85e0 Mon Sep 17 00:00:00 2001
From: Carlos Monastyrski <charly.monastyrski@gmail.com>
Date: Wed, 10 Dec 2025 13:04:31 -0300
Subject: [PATCH] Fix decline card modal not closing on the billing page

---
 .../src/layouts/OrganizationLayout/components/NavBar/Navbar.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/layouts/OrganizationLayout/components/NavBar/Navbar.tsx b/frontend/src/layouts/OrganizationLayout/components/NavBar/Navbar.tsx
index 4cef73f46..a51147d75 100644
--- a/frontend/src/layouts/OrganizationLayout/components/NavBar/Navbar.tsx
+++ b/frontend/src/layouts/OrganizationLayout/components/NavBar/Navbar.tsx
@@ -170,7 +170,7 @@ export const Navbar = () => {
   const [isOrgSelectOpen, setIsOrgSelectOpen] = useState(false);
 
   const location = useLocation();
-  const isBillingPage = location.pathname === "/organization/billing";
+  const isBillingPage = /^\/organization[s]?\/[^/]+\/billing$/.test(location.pathname);
 
   const isModalIntrusive = Boolean(!isBillingPage && isCardDeclinedMoreThan30Days);