From f25fdf7ea4e80117b0f5f9823e35e2c8f138933d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kevin=20Gr=C3=BCneberg?= <k.grueneberg1994@gmail.com>
Date: Wed, 5 Jul 2023 12:24:33 +0200
Subject: [PATCH] fix active nav state when using anchor

---
 .../Organization/BillingSettingsV2/BillingSettings.tsx          | 2 +-
 studio/components/layouts/OrganizationLayout.tsx                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/studio/components/interfaces/Organization/BillingSettingsV2/BillingSettings.tsx b/studio/components/interfaces/Organization/BillingSettingsV2/BillingSettings.tsx
index 1d0bc29b8ab..5b3dd080f0a 100644
--- a/studio/components/interfaces/Organization/BillingSettingsV2/BillingSettings.tsx
+++ b/studio/components/interfaces/Organization/BillingSettingsV2/BillingSettings.tsx
@@ -11,7 +11,7 @@ import BillingBreakdown from './BillingBreakdown/BillingBreakdown'
 const BillingSettings = () => {
   return (
     <>
-      <ScaffoldContainer>
+      <ScaffoldContainer id='subscription'>
         <Subscription />
       </ScaffoldContainer>
 
diff --git a/studio/components/layouts/OrganizationLayout.tsx b/studio/components/layouts/OrganizationLayout.tsx
index 52f7de2e729..91ec8e0880a 100644
--- a/studio/components/layouts/OrganizationLayout.tsx
+++ b/studio/components/layouts/OrganizationLayout.tsx
@@ -10,7 +10,7 @@ const OrganizationLayout = ({ children }: PropsWithChildren<{}>) => {
   const selectedOrganization = useSelectedOrganization()
   const router = useRouter()
   const { slug } = useParams()
-  const id = router.asPath.split('/').at(-1)?.split('?')[0]
+  const id = router.asPath.split('/').at(-1)?.split('?')[0]?.split('#')[0]
   const showOAuthApps = useFlag('oauthApps')
   const showAuditLogs = useFlag('auditLogs')
   const showIntegrationsV2 = useFlag('integrationsV2')