From 7a4913713ee098e3d29988ebc897da46458ae306 Mon Sep 17 00:00:00 2001
From: "sentry[bot]" <39604003+sentry[bot]@users.noreply.github.com>
Date: Mon, 3 Aug 2026 10:40:56 +0000
Subject: [PATCH 1/2] fix(settings): Correct FormSearch route for new feature
 flag provider

---
 .../settings/featureFlags/changeTracking/newProviderForm.tsx    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/app/views/settings/featureFlags/changeTracking/newProviderForm.tsx b/static/app/views/settings/featureFlags/changeTracking/newProviderForm.tsx
index af9f213913b6..888b3bc05c59 100644
--- a/static/app/views/settings/featureFlags/changeTracking/newProviderForm.tsx
+++ b/static/app/views/settings/featureFlags/changeTracking/newProviderForm.tsx
@@ -126,7 +126,7 @@ export function NewProviderForm({
   });
 
   return (
-    <FormSearch route="/settings/feature-flags/change-tracking/new-provider/">
+    <FormSearch route="/settings/:orgId/feature-flags/change-tracking/new-provider/">
       <form.AppForm form={form}>
         <form.AppField name="provider">
           {field => (

From ca9f721026a0814583bf2f8b6bc98da45a92b696 Mon Sep 17 00:00:00 2001
From: "sentry[bot]" <39604003+sentry[bot]@users.noreply.github.com>
Date: Mon, 3 Aug 2026 11:43:07 +0000
Subject: [PATCH 2/2] fix(forms): Include :orgId in new provider form route for
 search

---
 static/app/components/core/form/generatedFieldRegistry.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/static/app/components/core/form/generatedFieldRegistry.ts b/static/app/components/core/form/generatedFieldRegistry.ts
index 7f62966738e4..8614c81a0f0a 100644
--- a/static/app/components/core/form/generatedFieldRegistry.ts
+++ b/static/app/components/core/form/generatedFieldRegistry.ts
@@ -716,7 +716,7 @@ export const FORM_FIELD_REGISTRY: Record<string, FormFieldDefinition> = {
   'new-provider-form.provider': {
     name: 'provider',
     formId: 'new-provider-form',
-    route: '/settings/feature-flags/change-tracking/new-provider/',
+    route: '/settings/:orgId/feature-flags/change-tracking/new-provider/',
     label: t('Provider'),
     hintText: t(
       'If you have already linked this provider, pasting a new secret will override the existing secret.'
@@ -725,7 +725,7 @@ export const FORM_FIELD_REGISTRY: Record<string, FormFieldDefinition> = {
   'new-provider-form.secret': {
     name: 'secret',
     formId: 'new-provider-form',
-    route: '/settings/feature-flags/change-tracking/new-provider/',
+    route: '/settings/:orgId/feature-flags/change-tracking/new-provider/',
     label: t('Secret'),
     hintText: t(
       'Paste the signing secret given by your provider when creating the webhook.'