Cleanups

Expensify · Mar 23, 2023 · 81986b1 · 81986b1
1 parent 0713192
commit 81986b1
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 19 deletions.
diff --git a/src/components/ScreenWrapper/index.js b/src/components/ScreenWrapper/index.js
@@ -94,6 +94,8 @@ class ScreenWrapper extends React.Component {
     }
 
     render() {
+        const maxHeight = this.props.lockHeight ? null : this.props.windowHeight;
+
         return (
             <SafeAreaConsumer>
                 {({
@@ -109,7 +111,7 @@ class ScreenWrapper extends React.Component {
                     if (this.props.includeSafeAreaPaddingBottom || this.props.network.isOffline) {
                         paddingStyle.paddingBottom = paddingBottom;
                     }
-                    const maxHeight = this.props.lockHeight ? null : this.props.windowHeight;
+
                     return (
                         <View
                             style={[

diff --git a/src/components/ScreenWrapper/propTypes.js b/src/components/ScreenWrapper/propTypes.js
@@ -32,7 +32,7 @@ const propTypes = {
     /** Whether to dismiss keyboard before leaving a screen */
     shouldDismissKeyboardBeforeClose: PropTypes.bool,
 
-    /** Whether to lock the max height with the initial window height */
+    /** Whether to use the maxHeight (false) or use the 100% of the height (true) */
     lockHeight: PropTypes.bool,
 };
 

diff --git a/src/pages/iou/IOUModal.js b/src/pages/iou/IOUModal.js
@@ -421,6 +421,9 @@ class IOUModal extends Component {
     render() {
         const currentStep = this.steps[this.state.currentStepIndex];
         const reportID = lodashGet(this.props, 'route.params.reportID', '');
+
+        // We want to lock the height of the screen when the IOUAmount page is visible
+        // so that the keyboard doesn't cause the screen to resize and move the NumberPad up and down
         const lockHeight = DeviceCapabilities.canUseTouchScreen() && currentStep === Steps.IOUAmount;
 
         return (
@@ -432,23 +435,23 @@ class IOUModal extends Component {
                             {didScreenTransitionEnd && (
                                 <>
                                     {currentStep === Steps.IOUAmount && (
-                                    <AnimatedStep
-                                        direction={this.getDirection()}
-                                        style={[styles.flex1, safeAreaPaddingBottomStyle]}
-                                    >
-                                        {this.renderHeader()}
-                                        <IOUAmountPage
-                                            onStepComplete={(amount) => {
-                                                this.setState({amount});
-                                                this.navigateToNextStep();
-                                            }}
-                                            reportID={reportID}
-                                            hasMultipleParticipants={this.props.hasMultipleParticipants}
-                                            selectedAmount={this.state.amount}
-                                            navigation={this.props.navigation}
-                                            iouType={this.props.iouType}
-                                        />
-                                    </AnimatedStep>
+                                        <AnimatedStep
+                                            direction={this.getDirection()}
+                                            style={[styles.flex1, safeAreaPaddingBottomStyle]}
+                                        >
+                                            {this.renderHeader()}
+                                            <IOUAmountPage
+                                                onStepComplete={(amount) => {
+                                                    this.setState({amount});
+                                                    this.navigateToNextStep();
+                                                }}
+                                                reportID={reportID}
+                                                hasMultipleParticipants={this.props.hasMultipleParticipants}
+                                                selectedAmount={this.state.amount}
+                                                navigation={this.props.navigation}
+                                                iouType={this.props.iouType}
+                                            />
+                                        </AnimatedStep>
                                     )}
                                     {currentStep === Steps.IOUParticipants && (
                                         <AnimatedStep