Merge pull request #43706 from bernhardoj/fix/43657-modal-screen-narrow

[CP Staging] fix modal views are not fully shown (cherry picked from commit 393971c)
Expensify · Jun 13, 2024 · d048973 · d048973
1 parent 6ebfae1
commit d048973
Showing 1 changed file with 10 additions and 12 deletions.
diff --git a/src/components/Modal/BaseModal.tsx b/src/components/Modal/BaseModal.tsx
@@ -252,18 +252,16 @@ function BaseModal(
                     avoidKeyboard={avoidKeyboard}
                     customBackdrop={shouldUseCustomBackdrop ? <Overlay onPress={handleBackdropPress} /> : undefined}
                 >
-                    <FocusTrapForModal active={isVisible}>
-                        <View>
-                            <ModalContent onDismiss={handleDismissModal}>
-                                <View
-                                    style={[styles.defaultModalContainer, modalPaddingStyles, modalContainerStyle, !isVisible && styles.pointerEventsNone]}
-                                    ref={ref}
-                                >
-                                    <ColorSchemeWrapper>{children}</ColorSchemeWrapper>
-                                </View>
-                            </ModalContent>
-                        </View>
-                    </FocusTrapForModal>
+                    <ModalContent onDismiss={handleDismissModal}>
+                        <FocusTrapForModal active={isVisible}>
+                            <View
+                                style={[styles.defaultModalContainer, modalPaddingStyles, modalContainerStyle, !isVisible && styles.pointerEventsNone]}
+                                ref={ref}
+                            >
+                                <ColorSchemeWrapper>{children}</ColorSchemeWrapper>
+                            </View>
+                        </FocusTrapForModal>
+                    </ModalContent>
                 </ReactNativeModal>
             </View>
         </ModalContext.Provider>