Fix empty chat and scroll issue on web

Expensify · Jun 3, 2021 · 37b3591 · 37b3591
1 parent e613d11
commit 37b3591
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/libs/Navigation/AppNavigator/MainDrawerNavigator.js b/src/libs/Navigation/AppNavigator/MainDrawerNavigator.js
@@ -60,6 +60,7 @@ const MainDrawerNavigator = (props) => {
                 drawerType: getNavigationDrawerType(props.isSmallScreenWidth),
                 drawerStyle: getNavigationDrawerStyle(
                     props.windowWidth,
+                    props.windowHeight,
                     props.isSmallScreenWidth,
                 ),
                 swipeEdgeWidth: 500,

diff --git a/src/styles/styles.js b/src/styles/styles.js
@@ -1620,18 +1620,19 @@ function getSafeAreaMargins(insets) {
  * Return navigation menu styles.
  *
  * @param {Number} windowWidth
+ * @param {Number} windowHeight
  * @param {Boolean} isSmallScreenWidth
  * @returns {Object}
  */
-function getNavigationDrawerStyle(windowWidth, isSmallScreenWidth) {
+function getNavigationDrawerStyle(windowWidth, windowHeight, isSmallScreenWidth) {
     return isSmallScreenWidth
         ? {
             width: windowWidth,
-            height: '100%',
+            height: windowHeight,
             borderColor: themeColors.border,
         }
         : {
-            height: '100%',
+            height: windowHeight,
             width: variables.sideBarWidth,
             borderRightColor: themeColors.border,
         };