Fix telemetry banner

GoogleForCreators · Nov 18, 2022 · 560a65c · 560a65c
1 parent fe3d5df
commit 560a65c
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/packages/wp-dashboard/src/components/telemetryBanner/index.js b/packages/wp-dashboard/src/components/telemetryBanner/index.js
@@ -222,22 +222,29 @@ export function TelemetryBannerContainer(props) {
 }
 
 export default function TelemetryBanner() {
-  const { currentPath } = useRouteHistory(({ state }) => ({
+  const { currentPath, hasAvailableRoutes } = useRouteHistory(({ state }) => ({
     currentPath: state.currentPath,
+    hasAvailableRoutes: state.availableRoutes.length > 0,
   }));
   const headerEl = useRef(null);
   const [, forceUpdate] = useState(false);
 
   useEffect(() => {
+    if (!hasAvailableRoutes) {
+      return;
+    }
+
     if (
       [APP_ROUTES.DASHBOARD, APP_ROUTES.TEMPLATES_GALLERY].includes(currentPath)
     ) {
       headerEl.current = document.getElementById('body-view-options-header');
       forceUpdate((value) => !value);
     }
-  }, [currentPath, forceUpdate]);
+  }, [currentPath, hasAvailableRoutes]);
+
+  if (!headerEl.current) {
+    return null;
+  }
 
-  return headerEl.current
-    ? createPortal(<TelemetryBannerContainer />, headerEl.current)
-    : null;
+  return createPortal(<TelemetryBannerContainer />, headerEl.current);
 }