From cd7b2268b5b843c8b6fd71da0041f3794bce118c Mon Sep 17 00:00:00 2001
From: Jorge Capona <jcapona@users.noreply.github.com>
Date: Tue, 13 Aug 2024 14:45:51 -0400
Subject: [PATCH] Don't display AP disconnect dialog on upgrade (#475)

---
 frontend/src/components/onboarding_app/App.tsx              | 6 +++++-
 .../src/components/onboarding_app/__tests__/App.test.tsx    | 1 -
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/onboarding_app/App.tsx b/frontend/src/components/onboarding_app/App.tsx
index d81da901..60f5ad7b 100644
--- a/frontend/src/components/onboarding_app/App.tsx
+++ b/frontend/src/components/onboarding_app/App.tsx
@@ -43,6 +43,10 @@ export default () => {
     }
   };
 
+  const pathDisplaysApDisconnectDialog = (path: string) => {
+    return ![PageRoute.Upgrade.toString(), PageRoute.Restart.toString()].includes(path);
+  };
+
   return (
     <>
       <Switch>
@@ -184,7 +188,7 @@ export default () => {
         <Route component={ErrorPage} />
       </Switch>
       <BuildInformation info={buildInfo} className={styles.buildInfo} />
-      <HotspotDisconnectDialog enabled={useLocation().pathname !== PageRoute.Restart && enableDisconnectedFromApDialog} />
+      <HotspotDisconnectDialog enabled={pathDisplaysApDisconnectDialog(useLocation().pathname) && enableDisconnectedFromApDialog} />
     </>
   );
 };
diff --git a/frontend/src/components/onboarding_app/__tests__/App.test.tsx b/frontend/src/components/onboarding_app/__tests__/App.test.tsx
index bbf9ace6..6a3096d0 100644
--- a/frontend/src/components/onboarding_app/__tests__/App.test.tsx
+++ b/frontend/src/components/onboarding_app/__tests__/App.test.tsx
@@ -354,7 +354,6 @@ describe("App", () => {
 
     // on upgrade page
     await waitForUpgradePage();
-    await checkForDialog();
 
     // mock upgrade and go to registration page
     await upgrade();