From 0a7f70120befee504835bb445e29f466a3aa6f14 Mon Sep 17 00:00:00 2001
From: Chandler Prall <chandler.prall@gmail.com>
Date: Wed, 17 Apr 2024 13:40:13 -0400
Subject: [PATCH] =?UTF-8?q?=F0=9F=AA=9F=C2=A0=F0=9F=90=9B=20trigger=20nav?=
 =?UTF-8?q?=20only=20if=20we=20have=20state=20to=20remove=20(#12158)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SimplifiedConnectionCreation/InputContainer.tsx          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/airbyte-webapp/src/components/connection/CreateConnectionForm/SimplifiedConnectionCreation/InputContainer.tsx b/airbyte-webapp/src/components/connection/CreateConnectionForm/SimplifiedConnectionCreation/InputContainer.tsx
index 75898a5f468..43f3f0fb387 100644
--- a/airbyte-webapp/src/components/connection/CreateConnectionForm/SimplifiedConnectionCreation/InputContainer.tsx
+++ b/airbyte-webapp/src/components/connection/CreateConnectionForm/SimplifiedConnectionCreation/InputContainer.tsx
@@ -21,13 +21,14 @@ export const InputContainer: React.FC<React.PropsWithChildren<{ highlightAfterRe
     let highlightTimeout: number;
 
     if (highlightAfterRedirect && locationState?.action === "scheduleType") {
+      // remove the redirection info from the location state
+      navigate(pathname, { replace: true });
+
       setHighlighted(true);
       highlightTimeout = window.setTimeout(() => {
         setHighlighted(false);
       }, 1500);
     }
-    // remove the redirection info from the location state
-    navigate(pathname, { replace: true });
 
     return () => {
       window.clearTimeout(highlightTimeout);