From d40b9470c25d4fa0f389ae547c8edc1fde15fe3d Mon Sep 17 00:00:00 2001
From: Oliver Wilks <ollywilks@googlemail.com>
Date: Tue, 8 Nov 2022 18:13:23 +0000
Subject: [PATCH] Only freeze after sidebar is loaded

---
 src/pages/home/sidebar/SidebarLinks.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/pages/home/sidebar/SidebarLinks.js b/src/pages/home/sidebar/SidebarLinks.js
index eec8c56f0dcd..b7fc3ab58c83 100644
--- a/src/pages/home/sidebar/SidebarLinks.js
+++ b/src/pages/home/sidebar/SidebarLinks.js
@@ -137,7 +137,7 @@ class SidebarLinks extends React.Component {
                         />
                     </TouchableOpacity>
                 </View>
-                <Freeze freeze={this.props.isSmallScreenWidth && !this.props.isDrawerOpen}>
+                <Freeze freeze={this.props.isSmallScreenWidth && !this.props.isDrawerOpen && this.isSidebarLoaded}>
                     <LHNOptionsList
                         contentContainerStyles={[
                             styles.sidebarListContainer,
@@ -153,7 +153,10 @@ class SidebarLinks extends React.Component {
                         }}
                         shouldDisableFocusOptions={this.props.isSmallScreenWidth}
                         optionMode={this.props.priorityMode === CONST.PRIORITY_MODE.GSD ? 'compact' : 'default'}
-                        onLayout={App.setSidebarLoaded}
+                        onLayout={() => {
+                            App.setSidebarLoaded();
+                            this.isSidebarLoaded = true;
+                        }}
                     />
                 </Freeze>
             </View>