Merge pull request #1771 from Expensify/jules-fixIOUModalNavigation

Expensify · Mar 15, 2021 · a7179a6 · a7179a6
2 parents 815d13d + 3f89023
commit a7179a6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/src/pages/iou/IOUBillPage.js b/src/pages/iou/IOUBillPage.js
@@ -1,7 +1,12 @@
 import React from 'react';
 import IOUModal from './IOUModal';
+import ScreenWrapper from '../../components/ScreenWrapper';
 
 export default props => (
-    // eslint-disable-next-line react/jsx-props-no-spreading
-    <IOUModal {...props} hasMultipleParticipants />
+    <ScreenWrapper>
+        {() => (
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            <IOUModal {...props} hasMultipleParticipants />
+        )}
+    </ScreenWrapper>
 );
diff --git a/src/pages/iou/IOUModal.js b/src/pages/iou/IOUModal.js
@@ -108,7 +108,7 @@ class IOUModal extends Component {
                         <Header title={this.getTitleForStep()} />
                         <View style={[styles.reportOptions, styles.flexRow]}>
                             <TouchableOpacity
-                                onCloseButtonPress={Navigation.dismissModal}
+                                onPress={Navigation.dismissModal}
                                 style={[styles.touchableButtonImage]}
                             >
                                 <Icon src={Close} />

diff --git a/src/pages/iou/IOURequestPage.js b/src/pages/iou/IOURequestPage.js
@@ -1,7 +1,12 @@
 import React from 'react';
 import IOUModal from './IOUModal';
+import ScreenWrapper from '../../components/ScreenWrapper';
 
 export default props => (
-    // eslint-disable-next-line react/jsx-props-no-spreading
-    <IOUModal {...props} />
+    <ScreenWrapper>
+        {() => (
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            <IOUModal {...props} />
+        )}
+    </ScreenWrapper>
 );