diff --git a/src/components/Attachments/AttachmentView/AttachmentViewVideo/index.tsx b/src/components/Attachments/AttachmentView/AttachmentViewVideo/index.tsx index 4db93266fe0a..e42c1e3e2fb8 100644 --- a/src/components/Attachments/AttachmentView/AttachmentViewVideo/index.tsx +++ b/src/components/Attachments/AttachmentView/AttachmentViewVideo/index.tsx @@ -21,7 +21,7 @@ function AttachmentViewVideo({source, isHovered = false, shouldUseSharedVideoEle shouldUseSharedVideoElement={shouldUseSharedVideoElement && !shouldUseNarrowLayout} isVideoHovered={isHovered} videoDuration={duration} - style={[styles.w100, styles.h100]} + style={[styles.w100, styles.h100, styles.pb5]} /> ); } diff --git a/src/components/SafeAreaConsumer/index.android.tsx b/src/components/SafeAreaConsumer/index.android.tsx deleted file mode 100644 index 7cecfb5d5107..000000000000 --- a/src/components/SafeAreaConsumer/index.android.tsx +++ /dev/null @@ -1,43 +0,0 @@ -import React from 'react'; -// eslint-disable-next-line no-restricted-imports -import {SafeAreaInsetsContext} from 'react-native-safe-area-context'; -import useStyleUtils from '@hooks/useStyleUtils'; -import StatusBar from '@libs/StatusBar'; -import type SafeAreaConsumerProps from './types'; - -const defaultInsets = {top: 0, bottom: 0, left: 0, right: 0}; - -/** - * This component is a light wrapper around the SafeAreaInsetsContext.Consumer. There are several places where we - * may need not just the insets, but the computed styles so we save a few lines of code with this. - */ -function SafeAreaConsumer({children}: SafeAreaConsumerProps) { - const StyleUtils = useStyleUtils(); - - return ( - - {(insets) => { - const safeInsets = insets ?? defaultInsets; - - const androidInsets = { - ...safeInsets, - // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing - top: StatusBar.currentHeight || safeInsets.top, - }; - - const {paddingTop, paddingBottom} = StyleUtils.getSafeAreaPadding(androidInsets); - - return children({ - paddingTop, - paddingBottom, - insets: androidInsets, - safeAreaPaddingBottomStyle: {paddingBottom}, - }); - }} - - ); -} - -SafeAreaConsumer.displayName = 'SafeAreaConsumer'; - -export default SafeAreaConsumer; diff --git a/src/components/SafeAreaConsumer/index.tsx b/src/components/SafeAreaConsumer/index.tsx index 926ff91258f9..88770e1f0639 100644 --- a/src/components/SafeAreaConsumer/index.tsx +++ b/src/components/SafeAreaConsumer/index.tsx @@ -13,12 +13,14 @@ function SafeAreaConsumer({children}: SafeAreaConsumerProps) { return ( - {(insets) => { - const {paddingTop, paddingBottom} = StyleUtils.getSafeAreaPadding(insets ?? undefined); + {(safeAreaInsets) => { + const insets = StyleUtils.getSafeAreaInsets(safeAreaInsets); + const {paddingTop, paddingBottom} = StyleUtils.getSafeAreaPadding(insets); + return children({ paddingTop, paddingBottom, - insets: insets ?? undefined, + insets, safeAreaPaddingBottomStyle: {paddingBottom}, }); }} diff --git a/src/components/SelectionList/BaseSelectionList.tsx b/src/components/SelectionList/BaseSelectionList.tsx index 0e12e993cc79..100a04edbb25 100644 --- a/src/components/SelectionList/BaseSelectionList.tsx +++ b/src/components/SelectionList/BaseSelectionList.tsx @@ -87,6 +87,7 @@ function BaseSelectionList( alternateTextNumberOfLines = 2, textInputRef, headerMessageStyle, + confirmButtonStyles, shouldHideListOnInitialRender = true, textInputIconLeft, sectionTitleStyles, @@ -834,7 +835,7 @@ function BaseSelectionList(