Merge pull request #30887 from sarious/fix/30840

fix an issue with min height of screen when Offline Indicator is shown (cherry picked from commit bd2d15c)
Expensify · Nov 6, 2023 · 782281e · 782281e
1 parent a1ffce2
commit 782281e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/src/components/ScreenWrapper/index.js b/src/components/ScreenWrapper/index.js
@@ -118,7 +118,7 @@ function ScreenWrapper({
 
                 return (
                     <View
-                        style={styles.flex1}
+                        style={[styles.flex1, {minHeight}]}
                         // eslint-disable-next-line react/jsx-props-no-spreading
                         {...(isDevelopment ? panResponder.panHandlers : {})}
                         testID={testID}
@@ -129,7 +129,7 @@ function ScreenWrapper({
                             {...keyboardDissmissPanResponder.panHandlers}
                         >
                             <KeyboardAvoidingView
-                                style={[styles.w100, styles.h100, {maxHeight, minHeight}]}
+                                style={[styles.w100, styles.h100, {maxHeight}]}
                                 behavior={keyboardAvoidingViewBehavior}
                                 enabled={shouldEnableKeyboardAvoidingView}
                             >

diff --git a/src/hooks/useInitialWindowDimensions/index.js b/src/hooks/useInitialWindowDimensions/index.js
@@ -1,7 +1,6 @@
 // eslint-disable-next-line no-restricted-imports
 import {useEffect, useState} from 'react';
 import {Dimensions} from 'react-native';
-import {initialWindowMetrics} from 'react-native-safe-area-context';
 
 /**
  * A convenience hook that provides initial size (width and height).
@@ -50,10 +49,8 @@ export default function () {
         };
     }, []);
 
-    const bottomInset = initialWindowMetrics && initialWindowMetrics.insets && initialWindowMetrics.insets.bottom ? initialWindowMetrics.insets.bottom : 0;
-
     return {
         initialWidth: dimensions.initialWidth,
-        initialHeight: dimensions.initialHeight - bottomInset,
+        initialHeight: dimensions.initialHeight,
     };
 }
diff --git a/src/pages/EditRequestAmountPage.js b/src/pages/EditRequestAmountPage.js
@@ -43,7 +43,7 @@ function EditRequestAmountPage({defaultAmount, defaultCurrency, onNavigateToCurr
     return (
         <ScreenWrapper
             includeSafeAreaPaddingBottom={false}
-            shouldEnableMaxHeight
+            shouldEnableKeyboardAvoidingView={false}
             shouldEnableMinHeight={DeviceCapabilities.canUseTouchScreen()}
             testID={EditRequestAmountPage.displayName}
         >