From 93b3d219a24f9328b5692ad9eccd0ff18d28423c Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Thu, 21 Apr 2022 08:23:10 -0400
Subject: [PATCH] Hide navbar behind ready check to prevent flicker of navbar
 on login (#47968) (#48050)

(cherry picked from commit b727c324b8ccb349dc9794b36246efbeaf6e4333)

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
---
 public/app/AppWrapper.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/AppWrapper.tsx b/public/app/AppWrapper.tsx
index 47c00a004b7..b93f9f811b2 100644
--- a/public/app/AppWrapper.tsx
+++ b/public/app/AppWrapper.tsx
@@ -95,7 +95,7 @@ export class AppWrapper extends React.Component<AppWrapperProps, AppWrapperState
                   <GlobalStyles />
                   <div className="grafana-app">
                     <Router history={locationService.getHistory()}>
-                      {newNavigationEnabled ? <NavBarNext /> : <NavBar />}
+                      {ready && <>{newNavigationEnabled ? <NavBarNext /> : <NavBar />}</>}
                       <main className="main-view">
                         {pageBanners.map((Banner, index) => (
                           <Banner key={index.toString()} />