diff --git a/src/components/amount/Amount.tsx b/src/components/amount/Amount.tsx index c9fe7705b8..e037bb32df 100644 --- a/src/components/amount/Amount.tsx +++ b/src/components/amount/Amount.tsx @@ -18,7 +18,8 @@ import {useAppDispatch} from '../../utils/hooks'; import useAppSelector from '../../utils/hooks/useAppSelector'; import KeyEvent from 'react-native-keyevent'; import ArchaxFooter from '../archax/archax-footer'; -import {SafeAreaView, StyleSheet, View} from 'react-native'; +import {StyleSheet, View} from 'react-native'; +import {ALL_EDGES, SafeAreaView} from '../safe-area/SafeAreaView'; import {createSelector} from 'reselect'; import {RootState} from '../../store'; import {logReactProfiler} from '../../utils/reactPerformanceProfiler'; @@ -513,7 +514,7 @@ const Amount: React.FC = ({ ); return ( - + & { + /** + * iOS only. Edges that get the safe area inset. Defaults to top, left and + * right. Screens with a fixed bottom CTA that is not inside + * CtaContainerAbsolute pass ALL_EDGES so the CTA stays above the home + * indicator. + */ + edges?: ReadonlyArray; +}; + +const DEFAULT_EDGES: ReadonlyArray = ['top', 'left', 'right']; +export const ALL_EDGES: ReadonlyArray = [ + 'top', + 'left', + 'right', + 'bottom', +]; + +// Style keys that place the view inside its parent. They go on the outer +// wrapper so the extra view does not change the layout of the screen. +const OUTER_STYLE_KEYS: ReadonlyArray = [ + 'display', + 'position', + 'top', + 'bottom', + 'left', + 'right', + 'start', + 'end', + 'zIndex', + 'flex', + 'flexGrow', + 'flexShrink', + 'flexBasis', + 'alignSelf', + 'aspectRatio', + 'width', + 'height', + 'minWidth', + 'maxWidth', + 'minHeight', + 'maxHeight', + 'margin', + 'marginTop', + 'marginBottom', + 'marginLeft', + 'marginRight', + 'marginStart', + 'marginEnd', + 'marginHorizontal', + 'marginVertical', +]; + +const splitStyle = (style: Props['style']) => { + const flat = (StyleSheet.flatten(style) || {}) as ViewStyle; + // `flex: undefined` overrides the default `flex: 1` of SafeAreaListener. + const outer: ViewStyle = {flex: undefined}; + const inner: ViewStyle = {}; + (Object.keys(flat) as Array).forEach(key => { + const target = OUTER_STYLE_KEYS.includes(key) ? outer : inner; + (target as any)[key] = flat[key]; + }); + return {outer, inner}; +}; + +const noop = () => {}; + +/** + * Drop-in replacement for the react-native core SafeAreaView. + * + * On iOS the core component pads all four edges, including the bottom one. + * That clips scrollable content above the home indicator and leaves a blank + * strip at the bottom of the screen. Here the bottom inset is excluded; fixed + * bottom CTAs add their own inset (see CtaContainerAbsolute). + * + * The react-native-safe-area-context SafeAreaView applies the insets of its + * nearest native provider, not the insets at its own position. Under a stack + * header that adds the status bar height a second time. SafeAreaListener + * renders a native provider right here, so the insets are measured where the + * view is (0 at the top under a header, like the core component), without + * changing the insets that useSafeAreaInsets() returns to the children. + */ +export const SafeAreaView = React.forwardRef< + React.ComponentRef, + Props +>(({style, edges = DEFAULT_EDGES, ...props}, ref) => { + if (Platform.OS !== 'ios') { + return ; + } + const {outer, inner} = splitStyle(style); + return ( + + + + ); +}); +SafeAreaView.displayName = 'SafeAreaView'; + +const styles = StyleSheet.create({ + fill: {flexGrow: 1, flexShrink: 1}, +}); + +export default SafeAreaView; diff --git a/src/components/styled/Containers.tsx b/src/components/styled/Containers.tsx index 42ee6b5e9f..9c97e5f868 100644 --- a/src/components/styled/Containers.tsx +++ b/src/components/styled/Containers.tsx @@ -3,7 +3,6 @@ import { Dimensions, Text, Platform, - SafeAreaView, ScrollView, StyleSheet, View, @@ -11,6 +10,7 @@ import { TouchableOpacity as RNTouchableOpacity, ViewStyle, } from 'react-native'; +import {SafeAreaView} from '../safe-area/SafeAreaView'; import {useSafeAreaInsets} from 'react-native-safe-area-context'; import {useTheme} from '../../contexts'; import { diff --git a/src/navigation/auth/screens/CreateAccount.tsx b/src/navigation/auth/screens/CreateAccount.tsx index e92648521c..bcaf0c6291 100644 --- a/src/navigation/auth/screens/CreateAccount.tsx +++ b/src/navigation/auth/screens/CreateAccount.tsx @@ -3,7 +3,8 @@ import {NativeStackScreenProps} from '@react-navigation/native-stack'; import React, {useEffect, useRef, useState} from 'react'; import {Controller, useForm} from 'react-hook-form'; import {Trans, useTranslation} from 'react-i18next'; -import {Keyboard, SafeAreaView, TextInput} from 'react-native'; +import {Keyboard, TextInput} from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import A from '../../../components/anchor/Anchor'; import Button from '../../../components/button/Button'; import Checkbox from '../../../components/checkbox/Checkbox'; diff --git a/src/navigation/auth/screens/ForgotPassword.tsx b/src/navigation/auth/screens/ForgotPassword.tsx index 59f7fb0fcb..31827b37fd 100644 --- a/src/navigation/auth/screens/ForgotPassword.tsx +++ b/src/navigation/auth/screens/ForgotPassword.tsx @@ -3,7 +3,8 @@ import {NativeStackScreenProps} from '@react-navigation/native-stack'; import React, {useEffect, useState} from 'react'; import {Controller, useForm} from 'react-hook-form'; import {useTranslation} from 'react-i18next'; -import {Keyboard, SafeAreaView} from 'react-native'; +import {Keyboard} from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import Button from '../../../components/button/Button'; import BoxInput from '../../../components/form/BoxInput'; import haptic from '../../../components/haptic-feedback/haptic'; diff --git a/src/navigation/auth/screens/SecureAccount.tsx b/src/navigation/auth/screens/SecureAccount.tsx index 21dc1f1ab7..08b1274028 100644 --- a/src/navigation/auth/screens/SecureAccount.tsx +++ b/src/navigation/auth/screens/SecureAccount.tsx @@ -1,7 +1,6 @@ import React, {useLayoutEffect, useRef} from 'react'; import {useTranslation} from 'react-i18next'; import { - SafeAreaView, ScrollView as RNScrollView, View, ViewProps, @@ -10,6 +9,7 @@ import { TextProps, StyleSheet, } from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import { HeaderRightContainer, ScreenGutter, diff --git a/src/navigation/auth/screens/TwoFactor.Auth.tsx b/src/navigation/auth/screens/TwoFactor.Auth.tsx index 4832a98cb1..aeaac6625b 100644 --- a/src/navigation/auth/screens/TwoFactor.Auth.tsx +++ b/src/navigation/auth/screens/TwoFactor.Auth.tsx @@ -3,7 +3,8 @@ import {NativeStackScreenProps} from '@react-navigation/native-stack'; import React, {useEffect} from 'react'; import {Controller, useForm} from 'react-hook-form'; import {useTranslation} from 'react-i18next'; -import {Keyboard, SafeAreaView, StyleSheet} from 'react-native'; +import {Keyboard, StyleSheet} from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import {useDispatch, useSelector} from 'react-redux'; import Button from '../../../components/button/Button'; import BoxInput from '../../../components/form/BoxInput'; diff --git a/src/navigation/auth/screens/TwoFactor.Pair.tsx b/src/navigation/auth/screens/TwoFactor.Pair.tsx index d3fe6918e9..5a83c18c45 100644 --- a/src/navigation/auth/screens/TwoFactor.Pair.tsx +++ b/src/navigation/auth/screens/TwoFactor.Pair.tsx @@ -3,7 +3,8 @@ import {NativeStackScreenProps} from '@react-navigation/native-stack'; import React, {useEffect} from 'react'; import {Controller, useForm} from 'react-hook-form'; import {useTranslation} from 'react-i18next'; -import {Keyboard, SafeAreaView, StyleSheet} from 'react-native'; +import {Keyboard, StyleSheet} from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import {useDispatch, useSelector} from 'react-redux'; import Button from '../../../components/button/Button'; import BoxInput from '../../../components/form/BoxInput'; diff --git a/src/navigation/auth/screens/VerifyEmail.tsx b/src/navigation/auth/screens/VerifyEmail.tsx index a4a4f45d79..c26b0a00fe 100644 --- a/src/navigation/auth/screens/VerifyEmail.tsx +++ b/src/navigation/auth/screens/VerifyEmail.tsx @@ -19,13 +19,13 @@ import AuthFormContainer, { } from '../components/AuthFormContainer'; import { BackHandler, - SafeAreaView, View, ViewProps, Text, TextProps, StyleSheet, } from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import {RootStacks} from '../../../Root'; import {TabsScreens} from '../../tabs/TabsStack'; import {BitpayIdScreens} from '../../bitpay-id/BitpayIdGroup'; diff --git a/src/navigation/bitpay-id/components/BasePairing.tsx b/src/navigation/bitpay-id/components/BasePairing.tsx index 5da199ac8e..b66bd9921f 100644 --- a/src/navigation/bitpay-id/components/BasePairing.tsx +++ b/src/navigation/bitpay-id/components/BasePairing.tsx @@ -1,7 +1,8 @@ import React, {useEffect, useRef} from 'react'; import {useTranslation} from 'react-i18next'; import {useDispatch, useSelector} from 'react-redux'; -import {SafeAreaView, View, ViewProps, StyleSheet} from 'react-native'; +import {View, ViewProps, StyleSheet} from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import Spinner from '../../../components/spinner/Spinner'; import {ScreenGutter} from '../../../components/styled/Containers'; import {RootState} from '../../../store'; diff --git a/src/navigation/bitpay-id/screens/EnableTwoFactor.tsx b/src/navigation/bitpay-id/screens/EnableTwoFactor.tsx index 6a801c78b4..496d64b605 100644 --- a/src/navigation/bitpay-id/screens/EnableTwoFactor.tsx +++ b/src/navigation/bitpay-id/screens/EnableTwoFactor.tsx @@ -13,12 +13,12 @@ import { ViewProps, ScrollView, ScrollViewProps, - SafeAreaView, Text, TextProps, Keyboard, StyleSheet, } from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import {TouchableOpacity} from '@components/base/TouchableOpacity'; import yup from '../../../lib/yup'; import {yupResolver} from '@hookform/resolvers/yup'; diff --git a/src/navigation/bitpay-id/screens/ProfileSettings.tsx b/src/navigation/bitpay-id/screens/ProfileSettings.tsx index c3503b9192..4eb50cc094 100644 --- a/src/navigation/bitpay-id/screens/ProfileSettings.tsx +++ b/src/navigation/bitpay-id/screens/ProfileSettings.tsx @@ -3,7 +3,6 @@ import React, {useEffect} from 'react'; import {useTranslation} from 'react-i18next'; import {useTheme} from '../../../contexts'; import { - SafeAreaView, ScrollView as RNScrollView, ScrollViewProps, View, @@ -12,6 +11,7 @@ import { TextProps, StyleSheet, } from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import Avatar from '../../../components/avatar/BitPayIdAvatar'; import { ActiveOpacity, diff --git a/src/navigation/bitpay-id/screens/ReceiveSettings.tsx b/src/navigation/bitpay-id/screens/ReceiveSettings.tsx index 81a1363b07..35a7c3f99d 100644 --- a/src/navigation/bitpay-id/screens/ReceiveSettings.tsx +++ b/src/navigation/bitpay-id/screens/ReceiveSettings.tsx @@ -2,7 +2,6 @@ import React, {useEffect, useMemo, useState} from 'react'; import {useTranslation} from 'react-i18next'; import {uniqBy} from '../../../utils/array'; import { - SafeAreaView, ScrollView as RNScrollView, ScrollViewProps, View, @@ -11,6 +10,7 @@ import { TextProps, StyleSheet, } from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import {useNavigation, useTheme} from '@react-navigation/native'; import {NativeStackScreenProps} from '@react-navigation/native-stack'; import {TouchableOpacity} from '@components/base/TouchableOpacity'; diff --git a/src/navigation/bitpay-id/screens/TwoFactorEnabled.tsx b/src/navigation/bitpay-id/screens/TwoFactorEnabled.tsx index d8a8a47f75..95d644739e 100644 --- a/src/navigation/bitpay-id/screens/TwoFactorEnabled.tsx +++ b/src/navigation/bitpay-id/screens/TwoFactorEnabled.tsx @@ -1,5 +1,6 @@ import React, {useRef} from 'react'; -import {SafeAreaView, View, ViewProps, StyleSheet} from 'react-native'; +import {View, ViewProps, StyleSheet} from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import Button from '../../../components/button/Button'; import {ScreenGutter} from '../../../components/styled/Containers'; import SuccessSvg from '../../../../assets/img/success.svg'; diff --git a/src/navigation/onboarding/screens/TermsOfUse.tsx b/src/navigation/onboarding/screens/TermsOfUse.tsx index 7db7fc7927..30e0399715 100644 --- a/src/navigation/onboarding/screens/TermsOfUse.tsx +++ b/src/navigation/onboarding/screens/TermsOfUse.tsx @@ -2,13 +2,8 @@ import {CommonActions, useTheme} from '@react-navigation/native'; import {NativeStackScreenProps} from '@react-navigation/native-stack'; import React, {ReactElement, useLayoutEffect, useState} from 'react'; import {useTranslation} from 'react-i18next'; -import { - DeviceEventEmitter, - ScrollView, - SafeAreaView, - View, - StyleSheet, -} from 'react-native'; +import {DeviceEventEmitter, ScrollView, View, StyleSheet} from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import {useAndroidBackHandler} from 'react-navigation-backhandler'; import Button from '../../../components/button/Button'; import {CtaContainerAbsolute} from '../../../components/styled/Containers'; diff --git a/src/navigation/scan/screens/Scan.tsx b/src/navigation/scan/screens/Scan.tsx index ecdb09085e..e65e172a66 100644 --- a/src/navigation/scan/screens/Scan.tsx +++ b/src/navigation/scan/screens/Scan.tsx @@ -19,10 +19,10 @@ import { ActivityIndicator, Alert, Linking, - SafeAreaView, StyleSheet, View, } from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import {BaseText, Link} from '../../../components/styled/Text'; const styles = StyleSheet.create({ diff --git a/src/navigation/services/screens/BuyAndSellRoot.tsx b/src/navigation/services/screens/BuyAndSellRoot.tsx index 4c17ea3fdb..69b1bc3a86 100644 --- a/src/navigation/services/screens/BuyAndSellRoot.tsx +++ b/src/navigation/services/screens/BuyAndSellRoot.tsx @@ -240,12 +240,12 @@ import {useTheme} from '../../../contexts'; import Modal from 'react-native-modal'; import { ActivityIndicator, - SafeAreaView, StyleSheet, TextProps, View, ViewProps, } from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import {useSafeAreaInsets} from 'react-native-safe-area-context'; import WebView, { WebViewMessageEvent, diff --git a/src/navigation/services/screens/MoonpayBuyEmbeddedCheckout.tsx b/src/navigation/services/screens/MoonpayBuyEmbeddedCheckout.tsx index ab2cd59f94..dc3fc2342e 100644 --- a/src/navigation/services/screens/MoonpayBuyEmbeddedCheckout.tsx +++ b/src/navigation/services/screens/MoonpayBuyEmbeddedCheckout.tsx @@ -9,10 +9,10 @@ import { View, StyleSheet, Text, - SafeAreaView, ViewProps, TextProps, } from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import Modal from 'react-native-modal'; import { useTheme, diff --git a/src/navigation/services/screens/MoonpayBuyEmbeddedOnboarding.tsx b/src/navigation/services/screens/MoonpayBuyEmbeddedOnboarding.tsx index 5b060bfc59..565213250e 100644 --- a/src/navigation/services/screens/MoonpayBuyEmbeddedOnboarding.tsx +++ b/src/navigation/services/screens/MoonpayBuyEmbeddedOnboarding.tsx @@ -6,8 +6,11 @@ import { ViewProps, TextProps, ScrollView, - SafeAreaView, } from 'react-native'; +import { + ALL_EDGES, + SafeAreaView, +} from '../../../components/safe-area/SafeAreaView'; import {useNavigation} from '@react-navigation/native'; import Button, {ButtonState} from '../../../components/button/Button'; import {BaseText} from '../../../components/styled/Text'; @@ -137,7 +140,7 @@ const styles = StyleSheet.create({ }); const Container: React.FC = ({style, ...rest}) => ( - + ); const HeaderContainer: React.FC = ({style, ...rest}) => ( diff --git a/src/navigation/services/sell-crypto/screens/MoonpaySellCheckout.tsx b/src/navigation/services/sell-crypto/screens/MoonpaySellCheckout.tsx index 7780d3e5b2..75d2cb492b 100644 --- a/src/navigation/services/sell-crypto/screens/MoonpaySellCheckout.tsx +++ b/src/navigation/services/sell-crypto/screens/MoonpaySellCheckout.tsx @@ -1,5 +1,9 @@ import React, {useEffect, useRef, useState} from 'react'; -import {ScrollView, SafeAreaView, StyleSheet, ViewProps} from 'react-native'; +import {ScrollView, StyleSheet, ViewProps} from 'react-native'; +import { + ALL_EDGES, + SafeAreaView, +} from '../../../../components/safe-area/SafeAreaView'; import {TouchableOpacity} from '@components/base/TouchableOpacity'; import { useTheme, @@ -122,7 +126,13 @@ const styles = StyleSheet.create({ export const SellCheckoutContainer: React.FC = ({ style, ...rest -}) => ; +}) => ( + +); export interface MoonpaySellCheckoutProps { sellCryptoExternalId: string; diff --git a/src/navigation/services/sell-crypto/screens/RampSellCheckout.tsx b/src/navigation/services/sell-crypto/screens/RampSellCheckout.tsx index 374de8a7cc..e41cfa1834 100644 --- a/src/navigation/services/sell-crypto/screens/RampSellCheckout.tsx +++ b/src/navigation/services/sell-crypto/screens/RampSellCheckout.tsx @@ -1,5 +1,9 @@ import React, {useEffect, useRef, useState} from 'react'; -import {ScrollView, SafeAreaView, StyleSheet, ViewProps} from 'react-native'; +import {ScrollView, StyleSheet, ViewProps} from 'react-native'; +import { + ALL_EDGES, + SafeAreaView, +} from '../../../../components/safe-area/SafeAreaView'; import {TouchableOpacity} from '@components/base/TouchableOpacity'; import { useTheme, @@ -122,7 +126,13 @@ const styles = StyleSheet.create({ export const SellCheckoutContainer: React.FC = ({ style, ...rest -}) => ; +}) => ( + +); export interface RampSellCheckoutProps { rampQuoteOffer: SellCryptoOffer; diff --git a/src/navigation/services/sell-crypto/screens/SimplexSellCheckout.tsx b/src/navigation/services/sell-crypto/screens/SimplexSellCheckout.tsx index 9c6c5a3c85..68423ffef3 100644 --- a/src/navigation/services/sell-crypto/screens/SimplexSellCheckout.tsx +++ b/src/navigation/services/sell-crypto/screens/SimplexSellCheckout.tsx @@ -1,11 +1,9 @@ import React, {useEffect, useRef, useState} from 'react'; +import {ScrollView, StyleSheet, View, ViewProps} from 'react-native'; import { - ScrollView, + ALL_EDGES, SafeAreaView, - StyleSheet, - View, - ViewProps, -} from 'react-native'; +} from '../../../../components/safe-area/SafeAreaView'; import {TouchableOpacity} from '@components/base/TouchableOpacity'; import InfoSvg from '../../../../../assets/img/info.svg'; import { @@ -139,7 +137,13 @@ const styles = StyleSheet.create({ export const SellCheckoutContainer: React.FC = ({ style, ...rest -}) => ; +}) => ( + +); const InputContainer: React.FC = ({ style, diff --git a/src/navigation/services/swap-crypto/components/BottomAmount.tsx b/src/navigation/services/swap-crypto/components/BottomAmount.tsx index 2b7f96a95f..648cd1b454 100644 --- a/src/navigation/services/swap-crypto/components/BottomAmount.tsx +++ b/src/navigation/services/swap-crypto/components/BottomAmount.tsx @@ -1,6 +1,7 @@ import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react'; import {useTranslation} from 'react-i18next'; -import {SafeAreaView, StyleSheet, Text, View, ViewProps} from 'react-native'; +import {StyleSheet, Text, View, ViewProps} from 'react-native'; +import {SafeAreaView} from '../../../../components/safe-area/SafeAreaView'; import {useTheme} from '../../../../contexts'; import {ButtonState} from '../../../../components/button/Button'; import haptic from '../../../../components/haptic-feedback/haptic'; diff --git a/src/navigation/services/swap-crypto/components/BottomAmountModal.tsx b/src/navigation/services/swap-crypto/components/BottomAmountModal.tsx index a3be607b33..a5ad79d2c3 100644 --- a/src/navigation/services/swap-crypto/components/BottomAmountModal.tsx +++ b/src/navigation/services/swap-crypto/components/BottomAmountModal.tsx @@ -3,7 +3,11 @@ import {gestureHandlerRootHOC} from 'react-native-gesture-handler'; import {useTheme} from '../../../../contexts'; import {Black, White} from '../../../../styles/colors'; import BottomAmount, {BottomAmountProps, LimitsOpts} from './BottomAmount'; -import {Platform, SafeAreaView, StyleSheet, ViewProps} from 'react-native'; +import {Platform, StyleSheet, ViewProps} from 'react-native'; +import { + ALL_EDGES, + SafeAreaView, +} from '../../../../components/safe-area/SafeAreaView'; import SheetModal from '../../../../components/modal/base/sheet/SheetModal'; import {BottomAmountPillsProps} from './BottomAmountPills'; @@ -18,6 +22,7 @@ const StyledAmountModalContainer: React.FC = ({style, ...rest}) => { const theme = useTheme(); return ( = ({ style, ...rest -}) => ; +}) => ( + +); const ViewContainer: React.FC = ({style, ...rest}) => ( diff --git a/src/navigation/services/swap-crypto/screens/SwapCryptoRoot.tsx b/src/navigation/services/swap-crypto/screens/SwapCryptoRoot.tsx index b1e7f77352..f2dbd53b25 100644 --- a/src/navigation/services/swap-crypto/screens/SwapCryptoRoot.tsx +++ b/src/navigation/services/swap-crypto/screens/SwapCryptoRoot.tsx @@ -3,10 +3,13 @@ import { ActivityIndicator, ScrollView, View, - SafeAreaView, StyleSheet, ViewProps, } from 'react-native'; +import { + ALL_EDGES, + SafeAreaView, +} from '../../../../components/safe-area/SafeAreaView'; import {findTokenByCoinAndChain} from '../../utils/token-lookup'; import {useTheme, useNavigation, useRoute} from '@react-navigation/native'; import {useTheme as useStyledTheme} from '../../../../contexts'; @@ -322,7 +325,11 @@ const styles = StyleSheet.create({ }); const SwapCryptoContainer: React.FC = ({style, ...rest}) => ( - + ); const GlobalSelectContainer: React.FC = ({style, ...rest}) => { diff --git a/src/navigation/tabs/contacts/screens/ContactsAdd.tsx b/src/navigation/tabs/contacts/screens/ContactsAdd.tsx index ae53de4fe9..715bfb7503 100644 --- a/src/navigation/tabs/contacts/screens/ContactsAdd.tsx +++ b/src/navigation/tabs/contacts/screens/ContactsAdd.tsx @@ -1,7 +1,8 @@ import React, {useState, useLayoutEffect, useEffect, useCallback} from 'react'; import {yupResolver} from '@hookform/resolvers/yup'; import yup from '../../../../lib/yup'; -import {SafeAreaView, ScrollView, StyleSheet, View} from 'react-native'; +import {ScrollView, StyleSheet, View} from 'react-native'; +import {SafeAreaView} from '../../../../components/safe-area/SafeAreaView'; import {Controller, useForm} from 'react-hook-form'; import Button from '../../../../components/button/Button'; import BoxInput from '../../../../components/form/BoxInput'; diff --git a/src/navigation/tabs/contacts/screens/ContactsDetails.tsx b/src/navigation/tabs/contacts/screens/ContactsDetails.tsx index 6657bbb73f..835a0894fb 100644 --- a/src/navigation/tabs/contacts/screens/ContactsDetails.tsx +++ b/src/navigation/tabs/contacts/screens/ContactsDetails.tsx @@ -1,5 +1,6 @@ import React, {useEffect, useLayoutEffect, useState, ReactElement} from 'react'; -import {SafeAreaView, ScrollView, StyleSheet, View} from 'react-native'; +import {ScrollView, StyleSheet, View} from 'react-native'; +import {SafeAreaView} from '../../../../components/safe-area/SafeAreaView'; import {useAppSelector} from '../../../../utils/hooks'; import {useTheme} from '../../../../contexts'; import {useNavigation} from '@react-navigation/core'; diff --git a/src/navigation/tabs/contacts/screens/ContactsRoot.tsx b/src/navigation/tabs/contacts/screens/ContactsRoot.tsx index 9b4dc703b9..4a445642e2 100644 --- a/src/navigation/tabs/contacts/screens/ContactsRoot.tsx +++ b/src/navigation/tabs/contacts/screens/ContactsRoot.tsx @@ -3,7 +3,8 @@ import {useTranslation} from 'react-i18next'; import {debounce} from '../../../../utils/debounce'; import {useSafeAreaInsets} from 'react-native-safe-area-context'; import {useTheme} from '../../../../contexts'; -import {FlatList, SafeAreaView, StyleSheet, View} from 'react-native'; +import {FlatList, StyleSheet, View} from 'react-native'; +import {SafeAreaView} from '../../../../components/safe-area/SafeAreaView'; import {TouchableOpacity} from '@components/base/TouchableOpacity'; import {useSelector} from 'react-redux'; import {useForm, Controller} from 'react-hook-form'; diff --git a/src/navigation/tabs/home/screens/AllAssets.tsx b/src/navigation/tabs/home/screens/AllAssets.tsx index 7fcdbb011f..594b4f3829 100644 --- a/src/navigation/tabs/home/screens/AllAssets.tsx +++ b/src/navigation/tabs/home/screens/AllAssets.tsx @@ -5,7 +5,8 @@ import React, { useMemo, useState, } from 'react'; -import {SafeAreaView, StyleSheet, TextInput, View} from 'react-native'; +import {StyleSheet, TextInput, View} from 'react-native'; +import {SafeAreaView} from '../../../../components/safe-area/SafeAreaView'; import {FlashList, ListRenderItemInfo} from '@shopify/flash-list'; import {useTheme} from '../../../../contexts'; import {NativeStackScreenProps} from '@react-navigation/native-stack'; diff --git a/src/navigation/tabs/home/screens/Allocation.tsx b/src/navigation/tabs/home/screens/Allocation.tsx index d24bb2b528..8ce3c16101 100644 --- a/src/navigation/tabs/home/screens/Allocation.tsx +++ b/src/navigation/tabs/home/screens/Allocation.tsx @@ -1,5 +1,6 @@ import React, {useCallback, useLayoutEffect, useMemo} from 'react'; -import {ImageRequireSource, SafeAreaView, StyleSheet, View} from 'react-native'; +import {ImageRequireSource, StyleSheet, View} from 'react-native'; +import {SafeAreaView} from '../../../../components/safe-area/SafeAreaView'; import {FlashList, ListRenderItemInfo} from '@shopify/flash-list'; import {useTheme} from '../../../../contexts'; import {NativeStackScreenProps} from '@react-navigation/native-stack'; diff --git a/src/navigation/tabs/settings/NetworkFeePolicy/screens/NewtorkFeePolicy.tsx b/src/navigation/tabs/settings/NetworkFeePolicy/screens/NewtorkFeePolicy.tsx index 34b1f10e12..270742ca34 100644 --- a/src/navigation/tabs/settings/NetworkFeePolicy/screens/NewtorkFeePolicy.tsx +++ b/src/navigation/tabs/settings/NetworkFeePolicy/screens/NewtorkFeePolicy.tsx @@ -24,12 +24,8 @@ import { FeeLevelStepsHeader, FeeLevelStepsHeaderSubTitle, } from '../../../../wallet/screens/send/TransactionLevel'; -import { - SafeAreaView, - ScrollView as RNScrollView, - StyleSheet, - View, -} from 'react-native'; +import {ScrollView as RNScrollView, StyleSheet, View} from 'react-native'; +import {SafeAreaView} from '../../../../../components/safe-area/SafeAreaView'; import {CurrencyImage} from '../../../../../components/currency-image/CurrencyImage'; import {CurrencyListIcons} from '../../../../../constants/SupportedCurrencyOptions'; import NetworkPolicyPlaceholder from '../../components/NetworkPolicyPlaceholder'; diff --git a/src/navigation/tabs/settings/SettingsRoot.tsx b/src/navigation/tabs/settings/SettingsRoot.tsx index 94018f9a8a..8efc0a1fed 100644 --- a/src/navigation/tabs/settings/SettingsRoot.tsx +++ b/src/navigation/tabs/settings/SettingsRoot.tsx @@ -1,7 +1,8 @@ import {NativeStackScreenProps} from '@react-navigation/native-stack'; import React, {useMemo, useRef} from 'react'; import {useTranslation} from 'react-i18next'; -import {SafeAreaView, ScrollView, StyleSheet, Text, View} from 'react-native'; +import {ScrollView, StyleSheet, Text, View} from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import {useTheme} from '../../../contexts'; import AngleRight from '../../../../assets/img/angle-right.svg'; import Avatar from '../../../components/avatar/BitPayIdAvatar'; diff --git a/src/navigation/tabs/settings/about/components/DebugUI.tsx b/src/navigation/tabs/settings/about/components/DebugUI.tsx index e2a519fa63..1b49d3d312 100644 --- a/src/navigation/tabs/settings/about/components/DebugUI.tsx +++ b/src/navigation/tabs/settings/about/components/DebugUI.tsx @@ -1,5 +1,6 @@ import React from 'react'; -import {Pressable, SafeAreaView, StyleSheet, Text, View} from 'react-native'; +import {Pressable, StyleSheet, Text, View} from 'react-native'; +import {SafeAreaView} from '../../../../../components/safe-area/SafeAreaView'; import {useTheme} from '../../../../../contexts'; import type { SnapshotIndexV2, diff --git a/src/navigation/tabs/settings/about/screens/SendFeedback.tsx b/src/navigation/tabs/settings/about/screens/SendFeedback.tsx index 04fb234100..105d6a9530 100644 --- a/src/navigation/tabs/settings/about/screens/SendFeedback.tsx +++ b/src/navigation/tabs/settings/about/screens/SendFeedback.tsx @@ -1,5 +1,6 @@ import React, {useState} from 'react'; -import {SafeAreaView, ScrollView, StyleSheet, View} from 'react-native'; +import {ScrollView, StyleSheet, View} from 'react-native'; +import {SafeAreaView} from '../../../../../components/safe-area/SafeAreaView'; import {useTheme} from '../../../../../contexts'; import { ScreenGutter, diff --git a/src/navigation/tabs/settings/about/screens/SessionLog.tsx b/src/navigation/tabs/settings/about/screens/SessionLog.tsx index 23fc13d1a8..1d388a9efb 100644 --- a/src/navigation/tabs/settings/about/screens/SessionLog.tsx +++ b/src/navigation/tabs/settings/about/screens/SessionLog.tsx @@ -12,14 +12,8 @@ import {useNavigation} from '@react-navigation/native'; import {NativeStackScreenProps} from '@react-navigation/native-stack'; import {FlashList} from '@shopify/flash-list'; import {useTranslation} from 'react-i18next'; -import { - Alert, - Platform, - SafeAreaView, - StyleSheet, - Text, - View, -} from 'react-native'; +import {Alert, Platform, StyleSheet, Text, View} from 'react-native'; +import {SafeAreaView} from '../../../../../components/safe-area/SafeAreaView'; import Mailer from 'react-native-mail'; import {useTheme} from '../../../../../contexts'; import { diff --git a/src/navigation/tabs/settings/components/About.tsx b/src/navigation/tabs/settings/components/About.tsx index ab2ebae16d..d47413fb76 100644 --- a/src/navigation/tabs/settings/components/About.tsx +++ b/src/navigation/tabs/settings/components/About.tsx @@ -141,7 +141,7 @@ const About = () => { }, ]; return ( - + {t('Version')} @@ -224,11 +224,15 @@ const About = () => { - diff --git a/src/navigation/tabs/settings/components/Contacts.tsx b/src/navigation/tabs/settings/components/Contacts.tsx index 9e0d2f20ac..321fa17e37 100644 --- a/src/navigation/tabs/settings/components/Contacts.tsx +++ b/src/navigation/tabs/settings/components/Contacts.tsx @@ -12,7 +12,8 @@ import { ScreenGutter, Setting, } from '../../../../components/styled/Containers'; -import {SafeAreaView, StyleSheet, View} from 'react-native'; +import {StyleSheet, View} from 'react-native'; +import {SafeAreaView} from '../../../../components/safe-area/SafeAreaView'; import {useTranslation} from 'react-i18next'; import ContactRow from '../../../../components/list/ContactRow'; import {SettingsDetailsParamList} from '../SettingsDetails'; diff --git a/src/navigation/tabs/settings/general/screens/AltCurrencySettings.tsx b/src/navigation/tabs/settings/general/screens/AltCurrencySettings.tsx index ccfc148be7..ec28789646 100644 --- a/src/navigation/tabs/settings/general/screens/AltCurrencySettings.tsx +++ b/src/navigation/tabs/settings/general/screens/AltCurrencySettings.tsx @@ -18,11 +18,11 @@ import { FlatList, ActivityIndicator, Keyboard, - SafeAreaView, SectionList, StyleSheet, View, } from 'react-native'; +import {SafeAreaView} from '../../../../../components/safe-area/SafeAreaView'; import {BaseText} from '../../../../../components/styled/Text'; import {setDefaultAltCurrency} from '../../../../../store/app/app.actions'; import {useAppDispatch, useAppSelector} from '../../../../../utils/hooks'; diff --git a/src/navigation/tabs/settings/general/screens/Theme.tsx b/src/navigation/tabs/settings/general/screens/Theme.tsx index 09323b2b06..3db8208608 100644 --- a/src/navigation/tabs/settings/general/screens/Theme.tsx +++ b/src/navigation/tabs/settings/general/screens/Theme.tsx @@ -1,6 +1,7 @@ import React, {useLayoutEffect, useRef, useState} from 'react'; import {useTranslation} from 'react-i18next'; -import {Pressable, ScrollView, SafeAreaView} from 'react-native'; +import {Pressable, ScrollView} from 'react-native'; +import {SafeAreaView} from '../../../../../components/safe-area/SafeAreaView'; import type {AppColorScheme} from '../../../../../store/app/app.models'; import {TEST_MODE_NETWORK} from '@env'; import Checkbox from '../../../../../components/checkbox/Checkbox'; diff --git a/src/navigation/tabs/settings/general/screens/customize-home/Shared.tsx b/src/navigation/tabs/settings/general/screens/customize-home/Shared.tsx index e614f8a51c..b52688557e 100644 --- a/src/navigation/tabs/settings/general/screens/customize-home/Shared.tsx +++ b/src/navigation/tabs/settings/general/screens/customize-home/Shared.tsx @@ -2,7 +2,8 @@ import {Rect, Svg} from 'react-native-svg'; import {Theme} from '@react-navigation/native'; import {LightBlack, SlateDark, White} from '../../../../../../styles/colors'; import React from 'react'; -import {SafeAreaView, StyleSheet, View, ViewProps} from 'react-native'; +import {StyleSheet, View, ViewProps} from 'react-native'; +import {SafeAreaView} from '../../../../../../components/safe-area/SafeAreaView'; import {useTheme} from '../../../../../../contexts'; import {H7} from '../../../../../../components/styled/Text'; import {TouchableOpacity} from '@components/base/TouchableOpacity'; diff --git a/src/navigation/tabs/settings/notifications/screens/EmailNotifications.tsx b/src/navigation/tabs/settings/notifications/screens/EmailNotifications.tsx index c90fd29d94..c7651aa535 100644 --- a/src/navigation/tabs/settings/notifications/screens/EmailNotifications.tsx +++ b/src/navigation/tabs/settings/notifications/screens/EmailNotifications.tsx @@ -1,5 +1,6 @@ import React, {useCallback} from 'react'; -import {SafeAreaView, ScrollView, StyleSheet, View} from 'react-native'; +import {ScrollView, StyleSheet, View} from 'react-native'; +import {SafeAreaView} from '../../../../../components/safe-area/SafeAreaView'; import {useTranslation} from 'react-i18next'; import {useAppDispatch, useAppSelector} from '../../../../../utils/hooks'; import {setEmailNotifications} from '../../../../../store/app/app.effects'; diff --git a/src/navigation/tabs/shop/components/styled/ShopTabComponents.tsx b/src/navigation/tabs/shop/components/styled/ShopTabComponents.tsx index d324f50369..23ba8dda18 100644 --- a/src/navigation/tabs/shop/components/styled/ShopTabComponents.tsx +++ b/src/navigation/tabs/shop/components/styled/ShopTabComponents.tsx @@ -1,13 +1,13 @@ import {Theme} from '@react-navigation/native'; import React from 'react'; import { - SafeAreaView, StyleSheet, TouchableHighlight, TouchableHighlightProps, View, ViewProps, } from 'react-native'; +import {SafeAreaView} from '../../../../../components/safe-area/SafeAreaView'; import {useTheme} from '../../../../../contexts'; import BoxInput from '../../../../../components/form/BoxInput'; import {HEIGHT, WIDTH} from '../../../../../components/styled/Containers'; diff --git a/src/navigation/tabs/shop/gift-card/screens/BuyGiftCard.tsx b/src/navigation/tabs/shop/gift-card/screens/BuyGiftCard.tsx index 347087e5b8..060506105f 100644 --- a/src/navigation/tabs/shop/gift-card/screens/BuyGiftCard.tsx +++ b/src/navigation/tabs/shop/gift-card/screens/BuyGiftCard.tsx @@ -1,11 +1,6 @@ import React, {useEffect, useLayoutEffect, useState} from 'react'; -import { - Platform, - SafeAreaView, - ScrollView, - StyleSheet, - View, -} from 'react-native'; +import {Platform, ScrollView, StyleSheet, View} from 'react-native'; +import {SafeAreaView} from '../../../../../components/safe-area/SafeAreaView'; import {TouchableOpacity} from '@components/base/TouchableOpacity'; import {NativeStackScreenProps} from '@react-navigation/native-stack'; import {useSafeAreaInsets} from 'react-native-safe-area-context'; diff --git a/src/navigation/tabs/shop/gift-card/screens/GiftCardDetails.tsx b/src/navigation/tabs/shop/gift-card/screens/GiftCardDetails.tsx index 6e45a77b3c..09b66d85e0 100644 --- a/src/navigation/tabs/shop/gift-card/screens/GiftCardDetails.tsx +++ b/src/navigation/tabs/shop/gift-card/screens/GiftCardDetails.tsx @@ -12,7 +12,8 @@ import RNPrint from 'react-native-print'; import RenderHtml from 'react-native-render-html'; import TimeAgo from 'react-native-timeago'; import {NativeStackScreenProps} from '@react-navigation/native-stack'; -import {SafeAreaView, StyleSheet, View} from 'react-native'; +import {StyleSheet, View} from 'react-native'; +import {SafeAreaView} from '../../../../../components/safe-area/SafeAreaView'; import {useTheme} from '../../../../../contexts'; import Button from '../../../../../components/button/Button'; import { diff --git a/src/navigation/tabs/shop/merchant/screens/MerchantCategory.tsx b/src/navigation/tabs/shop/merchant/screens/MerchantCategory.tsx index 831a101f18..95ecb623c4 100644 --- a/src/navigation/tabs/shop/merchant/screens/MerchantCategory.tsx +++ b/src/navigation/tabs/shop/merchant/screens/MerchantCategory.tsx @@ -1,5 +1,6 @@ import React, {useLayoutEffect} from 'react'; -import {SafeAreaView, ScrollView, StyleSheet, View} from 'react-native'; +import {ScrollView, StyleSheet, View} from 'react-native'; +import {SafeAreaView} from '../../../../../components/safe-area/SafeAreaView'; import {TouchableOpacity} from '@components/base/TouchableOpacity'; import {NativeStackScreenProps} from '@react-navigation/native-stack'; import {MerchantScreens, MerchantGroupParamList} from '../MerchantGroup'; diff --git a/src/navigation/tabs/shop/merchant/screens/MerchantDetails.tsx b/src/navigation/tabs/shop/merchant/screens/MerchantDetails.tsx index c379391bc1..15b558f4f5 100644 --- a/src/navigation/tabs/shop/merchant/screens/MerchantDetails.tsx +++ b/src/navigation/tabs/shop/merchant/screens/MerchantDetails.tsx @@ -1,6 +1,7 @@ import React, {useLayoutEffect} from 'react'; import {useTranslation} from 'react-i18next'; -import {ScrollView, SafeAreaView, StyleSheet} from 'react-native'; +import {ScrollView, StyleSheet} from 'react-native'; +import {SafeAreaView} from '../../../../../components/safe-area/SafeAreaView'; import {NativeStackScreenProps} from '@react-navigation/native-stack'; import {useTheme} from '../../../../../contexts'; import LinearGradient from 'react-native-linear-gradient'; diff --git a/src/navigation/wallet-connect/screens/WalletConnectConfirm.tsx b/src/navigation/wallet-connect/screens/WalletConnectConfirm.tsx index e9ed942518..51ac7fa144 100644 --- a/src/navigation/wallet-connect/screens/WalletConnectConfirm.tsx +++ b/src/navigation/wallet-connect/screens/WalletConnectConfirm.tsx @@ -37,6 +37,7 @@ import { SendingTo, SharedDetailRow, } from '../../wallet/screens/send/confirm/Shared'; +import {ALL_EDGES} from '../../../components/safe-area/SafeAreaView'; import {GetFeeOptions} from '../../../store/wallet/effects/fee/fee'; import {Trans, useTranslation} from 'react-i18next'; import Banner from '../../../components/banner/Banner'; @@ -467,7 +468,7 @@ const WalletConnectConfirm = () => { }, [requestDismissed, navigation]); return ( - +
{t('Summary')}
{wallet && isTSSWallet(wallet) && ( diff --git a/src/navigation/wallet-connect/screens/WalletConnectConnections.tsx b/src/navigation/wallet-connect/screens/WalletConnectConnections.tsx index c6bff1d413..e38b381d42 100644 --- a/src/navigation/wallet-connect/screens/WalletConnectConnections.tsx +++ b/src/navigation/wallet-connect/screens/WalletConnectConnections.tsx @@ -21,7 +21,8 @@ import { ItemNoteContainer, ItemTitleContainer, } from '../styled/WalletConnectContainers'; -import {ScrollView, View, SafeAreaView, StyleSheet} from 'react-native'; +import {ScrollView, View, StyleSheet} from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import {useTranslation} from 'react-i18next'; import FastImage from 'react-native-fast-image'; import haptic from '../../../components/haptic-feedback/haptic'; diff --git a/src/navigation/wallet-connect/styled/WalletConnectContainers.tsx b/src/navigation/wallet-connect/styled/WalletConnectContainers.tsx index 31f8c5d2b6..ffbfd4199f 100644 --- a/src/navigation/wallet-connect/styled/WalletConnectContainers.tsx +++ b/src/navigation/wallet-connect/styled/WalletConnectContainers.tsx @@ -1,13 +1,13 @@ import React from 'react'; import { Platform, - SafeAreaView, ScrollView as RNScrollView, ScrollViewProps, StyleSheet, View, ViewProps, } from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import {TouchableOpacity} from '@components/base/TouchableOpacity'; const styles = StyleSheet.create({ diff --git a/src/navigation/wallet/components/BalanceDetailsModal.tsx b/src/navigation/wallet/components/BalanceDetailsModal.tsx index 0e005accfb..ff1342af65 100644 --- a/src/navigation/wallet/components/BalanceDetailsModal.tsx +++ b/src/navigation/wallet/components/BalanceDetailsModal.tsx @@ -5,7 +5,11 @@ import {BaseText} from '../../../components/styled/Text'; import SheetModal from '../../../components/modal/base/sheet/SheetModal'; import {SheetContainer} from '../../../components/styled/Containers'; import {Black, White, Success, Caution, Warning} from '../../../styles/colors'; -import {ScrollView, SafeAreaView, Text} from 'react-native'; +import {ScrollView, Text} from 'react-native'; +import { + ALL_EDGES, + SafeAreaView, +} from '../../../components/safe-area/SafeAreaView'; import Button from '../../../components/button/Button'; import {WalletRowProps} from '../../../components/list/WalletRow'; import LockSvg from '../../../../assets/img/wallet/balance/lock.svg'; @@ -158,7 +162,7 @@ const BalanceDetailsModal = ({isVisible, closeModal, wallet}: Props) => { styles.balanceDetailsContainer, {backgroundColor: theme.dark ? Black : White}, ]}> - + {t('Spendable balance')} diff --git a/src/navigation/wallet/screens/AccountDetails.tsx b/src/navigation/wallet/screens/AccountDetails.tsx index 37c596c34d..8c78e7a20f 100644 --- a/src/navigation/wallet/screens/AccountDetails.tsx +++ b/src/navigation/wallet/screens/AccountDetails.tsx @@ -38,7 +38,6 @@ import { import { DeviceEventEmitter, RefreshControl, - SafeAreaView, SectionList, StyleProp, StyleSheet, @@ -46,6 +45,7 @@ import { ViewStyle, useWindowDimensions, } from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import { TouchableOpacity, TouchableOpacityProps, diff --git a/src/navigation/wallet/screens/AccountSettings.tsx b/src/navigation/wallet/screens/AccountSettings.tsx index 101f00b5db..c78f50dfd0 100644 --- a/src/navigation/wallet/screens/AccountSettings.tsx +++ b/src/navigation/wallet/screens/AccountSettings.tsx @@ -3,7 +3,8 @@ import {BaseText, HeaderTitle} from '../../../components/styled/Text'; import {useNavigation, useRoute} from '@react-navigation/native'; import {RouteProp} from '@react-navigation/core'; import {WalletGroupParamList, WalletScreens} from '../WalletGroup'; -import {SafeAreaView, ScrollView, StyleSheet, View} from 'react-native'; +import {ScrollView, StyleSheet, View} from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import {useTheme} from '../../../contexts'; import { ActiveOpacity, diff --git a/src/navigation/wallet/screens/AddCustomToken.tsx b/src/navigation/wallet/screens/AddCustomToken.tsx index 98a045e197..eb17324f1a 100644 --- a/src/navigation/wallet/screens/AddCustomToken.tsx +++ b/src/navigation/wallet/screens/AddCustomToken.tsx @@ -48,7 +48,8 @@ import { SupportedSvmCurrencyOptions, } from '../../../constants/SupportedCurrencyOptions'; import SheetModal from '../../../components/modal/base/sheet/SheetModal'; -import {FlatList, Keyboard, SafeAreaView, StyleSheet, View} from 'react-native'; +import {FlatList, Keyboard, StyleSheet, View} from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import { formatCryptoAddress, getAccount, diff --git a/src/navigation/wallet/screens/AddWallet.tsx b/src/navigation/wallet/screens/AddWallet.tsx index a13f299a51..365eb36361 100644 --- a/src/navigation/wallet/screens/AddWallet.tsx +++ b/src/navigation/wallet/screens/AddWallet.tsx @@ -33,7 +33,8 @@ import {Controller, useForm, useWatch} from 'react-hook-form'; import {yupResolver} from '@hookform/resolvers/yup'; import yup from '../../../lib/yup'; import {NeutralSlate, SlateDark, White} from '../../../styles/colors'; -import {SafeAreaView, StyleSheet, View} from 'react-native'; +import {StyleSheet, View} from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import { TouchableOpacity, TouchableOpacityProps, diff --git a/src/navigation/wallet/screens/AmountScreen.tsx b/src/navigation/wallet/screens/AmountScreen.tsx index d8dcd0800b..60d1848dbe 100644 --- a/src/navigation/wallet/screens/AmountScreen.tsx +++ b/src/navigation/wallet/screens/AmountScreen.tsx @@ -7,7 +7,8 @@ import React, { useState, } from 'react'; import {useTranslation} from 'react-i18next'; -import {SafeAreaView, StyleSheet} from 'react-native'; +import {StyleSheet} from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import Amount from '../../../components/amount/Amount'; import Button, {ButtonState} from '../../../components/button/Button'; import {HeaderRightContainer} from '../../../components/styled/Containers'; diff --git a/src/navigation/wallet/screens/Backup.tsx b/src/navigation/wallet/screens/Backup.tsx index 7d94a2c51f..697200832f 100644 --- a/src/navigation/wallet/screens/Backup.tsx +++ b/src/navigation/wallet/screens/Backup.tsx @@ -1,5 +1,6 @@ import React, {useLayoutEffect} from 'react'; -import {SafeAreaView, ScrollView, StyleSheet} from 'react-native'; +import {ScrollView, StyleSheet} from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import {H3, Paragraph, TextAlign} from '../../../components/styled/Text'; import { CtaContainer, diff --git a/src/navigation/wallet/screens/BackupSharedKey.tsx b/src/navigation/wallet/screens/BackupSharedKey.tsx index 5df5efb4c3..0733e83657 100644 --- a/src/navigation/wallet/screens/BackupSharedKey.tsx +++ b/src/navigation/wallet/screens/BackupSharedKey.tsx @@ -1,5 +1,6 @@ import React, {useLayoutEffect} from 'react'; -import {SafeAreaView, ScrollView, StyleSheet, View} from 'react-native'; +import {ScrollView, StyleSheet, View} from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import {H3, Paragraph, TextAlign} from '../../../components/styled/Text'; import { CtaContainer as _CtaContainer, diff --git a/src/navigation/wallet/screens/ClearEncryptPassword.tsx b/src/navigation/wallet/screens/ClearEncryptPassword.tsx index ebc0b94769..4099865ea8 100644 --- a/src/navigation/wallet/screens/ClearEncryptPassword.tsx +++ b/src/navigation/wallet/screens/ClearEncryptPassword.tsx @@ -1,5 +1,6 @@ import React from 'react'; -import {Pressable, SafeAreaView, ScrollView, StyleSheet} from 'react-native'; +import {Pressable, ScrollView, StyleSheet} from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import {useTheme} from '../../../contexts'; import { ActionContainer, diff --git a/src/navigation/wallet/screens/Copayers.tsx b/src/navigation/wallet/screens/Copayers.tsx index 7f8f28b911..7da6a83bb5 100644 --- a/src/navigation/wallet/screens/Copayers.tsx +++ b/src/navigation/wallet/screens/Copayers.tsx @@ -8,10 +8,13 @@ import { Image, ScrollView, RefreshControl, - SafeAreaView, StyleSheet, View, } from 'react-native'; +import { + ALL_EDGES, + SafeAreaView, +} from '../../../components/safe-area/SafeAreaView'; import {TouchableOpacity} from '@components/base/TouchableOpacity'; import { Paragraph, @@ -76,7 +79,13 @@ const styles = StyleSheet.create({ const ViewContainer: React.FC> = ({ style, ...rest -}) => ; +}) => ( + +); const JoinCopayersContainer: React.FC> = ({ style, diff --git a/src/navigation/wallet/screens/CreateEncryptionPassword.tsx b/src/navigation/wallet/screens/CreateEncryptionPassword.tsx index d0304ff5c5..bf4dbe1743 100644 --- a/src/navigation/wallet/screens/CreateEncryptionPassword.tsx +++ b/src/navigation/wallet/screens/CreateEncryptionPassword.tsx @@ -3,7 +3,8 @@ import {BaseText, HeaderTitle} from '../../../components/styled/Text'; import {useNavigation, useRoute} from '@react-navigation/native'; import {RouteProp} from '@react-navigation/core'; import {WalletGroupParamList} from '../WalletGroup'; -import {SafeAreaView, StyleSheet, View} from 'react-native'; +import {StyleSheet, View} from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import {useTheme} from '../../../contexts'; import {ScreenGutter} from '../../../components/styled/Containers'; import {Caution, SlateDark, White} from '../../../styles/colors'; diff --git a/src/navigation/wallet/screens/CreateMultisig.tsx b/src/navigation/wallet/screens/CreateMultisig.tsx index b52140e062..567aae927d 100644 --- a/src/navigation/wallet/screens/CreateMultisig.tsx +++ b/src/navigation/wallet/screens/CreateMultisig.tsx @@ -1,5 +1,9 @@ import React, {useEffect, useState} from 'react'; -import {SafeAreaView, ScrollView, StyleSheet, View} from 'react-native'; +import {ScrollView, StyleSheet, View} from 'react-native'; +import { + ALL_EDGES, + SafeAreaView, +} from '../../../components/safe-area/SafeAreaView'; import {TouchableOpacity} from '@components/base/TouchableOpacity'; import {useTheme} from '../../../contexts'; import { @@ -216,7 +220,11 @@ const styles = StyleSheet.create({ export const MultisigContainer: React.FC< React.ComponentProps > = ({style, ...rest}) => ( - + ); const ScrollViewContainer: React.FC< diff --git a/src/navigation/wallet/screens/CurrencySelection.tsx b/src/navigation/wallet/screens/CurrencySelection.tsx index 7c08d33d5d..d1081a8031 100644 --- a/src/navigation/wallet/screens/CurrencySelection.tsx +++ b/src/navigation/wallet/screens/CurrencySelection.tsx @@ -16,13 +16,11 @@ import CurrencySelectionRow, { CurrencySelectionRowProps, } from '../../../components/list/CurrencySelectionRow'; import Button from '../../../components/button/Button'; +import {FlatList, ListRenderItem, StyleSheet, View} from 'react-native'; import { - FlatList, - ListRenderItem, + ALL_EDGES, SafeAreaView, - StyleSheet, - View, -} from 'react-native'; +} from '../../../components/safe-area/SafeAreaView'; import {useTheme} from '../../../contexts'; import {useNavigation} from '@react-navigation/native'; import {BaseText, HeaderTitle} from '../../../components/styled/Text'; @@ -112,7 +110,11 @@ const styles = StyleSheet.create({ export const CurrencySelectionContainer: React.FC< React.ComponentProps > = ({style, ...rest}) => ( - + ); const ListContainer: React.FC> = ({ diff --git a/src/navigation/wallet/screens/DeleteKey.tsx b/src/navigation/wallet/screens/DeleteKey.tsx index e8d68c95c8..b30f41c73d 100644 --- a/src/navigation/wallet/screens/DeleteKey.tsx +++ b/src/navigation/wallet/screens/DeleteKey.tsx @@ -3,7 +3,8 @@ import {HeaderTitle, H5, Paragraph} from '../../../components/styled/Text'; import {useNavigation, useRoute} from '@react-navigation/native'; import {CommonActions, RouteProp} from '@react-navigation/core'; import {WalletGroupParamList} from '../WalletGroup'; -import {SafeAreaView, StyleSheet} from 'react-native'; +import {StyleSheet} from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import {useAndroidBackHandler} from 'react-navigation-backhandler'; import {KeyboardAwareScrollView} from 'react-native-keyboard-aware-scroll-view'; import {ScreenGutter} from '../../../components/styled/Containers'; diff --git a/src/navigation/wallet/screens/ExportKey.tsx b/src/navigation/wallet/screens/ExportKey.tsx index dfae684b93..2977836126 100644 --- a/src/navigation/wallet/screens/ExportKey.tsx +++ b/src/navigation/wallet/screens/ExportKey.tsx @@ -1,5 +1,6 @@ import React, {useLayoutEffect} from 'react'; -import {SafeAreaView, ScrollView, StyleSheet, View} from 'react-native'; +import {ScrollView, StyleSheet, View} from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import {Paragraph, HeaderTitle, H6, H5} from '../../../components/styled/Text'; import {useNavigation, useRoute} from '@react-navigation/native'; import {useTheme} from '../../../contexts'; diff --git a/src/navigation/wallet/screens/ExtendedPrivateKey.tsx b/src/navigation/wallet/screens/ExtendedPrivateKey.tsx index 9735591e49..38c4377fe6 100644 --- a/src/navigation/wallet/screens/ExtendedPrivateKey.tsx +++ b/src/navigation/wallet/screens/ExtendedPrivateKey.tsx @@ -1,6 +1,7 @@ import {useNavigation, useRoute} from '@react-navigation/native'; import React, {useLayoutEffect, useState} from 'react'; -import {SafeAreaView, ScrollView, StyleSheet} from 'react-native'; +import {ScrollView, StyleSheet} from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import {HeaderTitle, Paragraph, H5} from '../../../components/styled/Text'; import {ScreenGutter} from '../../../components/styled/Containers'; import Button from '../../../components/button/Button'; diff --git a/src/navigation/wallet/screens/GlobalSelect.tsx b/src/navigation/wallet/screens/GlobalSelect.tsx index 002bbb4e80..4940d3e6df 100644 --- a/src/navigation/wallet/screens/GlobalSelect.tsx +++ b/src/navigation/wallet/screens/GlobalSelect.tsx @@ -26,13 +26,8 @@ import { getCurrencyAbbreviation, sleep, } from '../../../utils/helper-methods'; -import { - Platform, - SafeAreaView, - ScrollView, - StyleSheet, - View, -} from 'react-native'; +import {Platform, ScrollView, StyleSheet, View} from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import {TouchableOpacity} from '@components/base/TouchableOpacity'; import GlobalSelectRow from '../../../components/list/GlobalSelectRow'; import SheetModal from '../../../components/modal/base/sheet/SheetModal'; diff --git a/src/navigation/wallet/screens/Import.tsx b/src/navigation/wallet/screens/Import.tsx index ed6e68f016..4bba883c06 100644 --- a/src/navigation/wallet/screens/Import.tsx +++ b/src/navigation/wallet/screens/Import.tsx @@ -1,5 +1,6 @@ import React, {useLayoutEffect} from 'react'; -import {SafeAreaView, StyleSheet} from 'react-native'; +import {StyleSheet} from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import {createMaterialTopTabNavigator} from '@react-navigation/material-top-tabs'; import RecoveryPhrase from '../components/RecoveryPhrase'; import FileOrText from '../components/FileOrText'; diff --git a/src/navigation/wallet/screens/InviteCosigners.tsx b/src/navigation/wallet/screens/InviteCosigners.tsx index c71c39346b..bd435cb5b1 100644 --- a/src/navigation/wallet/screens/InviteCosigners.tsx +++ b/src/navigation/wallet/screens/InviteCosigners.tsx @@ -5,9 +5,12 @@ import { useWindowDimensions, StyleSheet, View, - SafeAreaView, TouchableOpacity as RNTouchableOpacity, } from 'react-native'; +import { + ALL_EDGES, + SafeAreaView, +} from '../../../components/safe-area/SafeAreaView'; import {shareNative} from '../../../utils/share'; import {NativeStackScreenProps} from '@react-navigation/native-stack'; import {useTranslation} from 'react-i18next'; @@ -1210,7 +1213,7 @@ const InviteCosigners: React.FC = ({route}) => { } return ( - + diff --git a/src/navigation/wallet/screens/JoinMultisig.tsx b/src/navigation/wallet/screens/JoinMultisig.tsx index 47c9c0c7b6..aa5ee033a9 100644 --- a/src/navigation/wallet/screens/JoinMultisig.tsx +++ b/src/navigation/wallet/screens/JoinMultisig.tsx @@ -1,5 +1,6 @@ import React, {useCallback} from 'react'; -import {SafeAreaView, ScrollView, StyleSheet} from 'react-native'; +import {ScrollView, StyleSheet} from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import {ImportTitle} from '../../../components/styled/Text'; import Button from '../../../components/button/Button'; import { diff --git a/src/navigation/wallet/screens/JoinTSSWallet.tsx b/src/navigation/wallet/screens/JoinTSSWallet.tsx index 7bc1c39b59..36fa6ac09e 100644 --- a/src/navigation/wallet/screens/JoinTSSWallet.tsx +++ b/src/navigation/wallet/screens/JoinTSSWallet.tsx @@ -1,12 +1,15 @@ import React, {useState, useEffect, useLayoutEffect, useRef} from 'react'; import { Alert, - SafeAreaView, ScrollView, StyleSheet, TouchableOpacity as RNTouchableOpacity, View, } from 'react-native'; +import { + ALL_EDGES, + SafeAreaView, +} from '../../../components/safe-area/SafeAreaView'; import {shareNative} from '../../../utils/share'; import {NativeStackScreenProps} from '@react-navigation/native-stack'; import {useTranslation} from 'react-i18next'; @@ -938,7 +941,7 @@ const JoinTSSWallet: React.FC = ({navigation, route}) => { }; return ( - + {!showSession ? renderStartForm() : renderTopSection()} {showSession ? renderStepSection() : null} diff --git a/src/navigation/wallet/screens/KeyExplanation.tsx b/src/navigation/wallet/screens/KeyExplanation.tsx index 251bc3bf02..db0ce0fcc5 100644 --- a/src/navigation/wallet/screens/KeyExplanation.tsx +++ b/src/navigation/wallet/screens/KeyExplanation.tsx @@ -1,7 +1,8 @@ import {useNavigation} from '@react-navigation/native'; import {NativeStackScreenProps} from '@react-navigation/native-stack'; import React, {useMemo, useRef, useState} from 'react'; -import {SafeAreaView, StyleSheet, View} from 'react-native'; +import {StyleSheet, View} from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import {Carousel, CarouselRef} from 'react-native-reanimated-carousel'; import Button from '../../../components/button/Button'; import { diff --git a/src/navigation/wallet/screens/KeyGlobalSelect.tsx b/src/navigation/wallet/screens/KeyGlobalSelect.tsx index 847d2b9e41..1aabb6a59e 100644 --- a/src/navigation/wallet/screens/KeyGlobalSelect.tsx +++ b/src/navigation/wallet/screens/KeyGlobalSelect.tsx @@ -1,5 +1,6 @@ import React, {useCallback} from 'react'; -import {FlatList, SafeAreaView, StyleSheet, View} from 'react-native'; +import {FlatList, StyleSheet, View} from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import {useAppSelector} from '../../../utils/hooks'; import {Key} from '../../../store/wallet/wallet.models'; import KeyGlobalSelectRow from '../../../components/list/KeyGlobalSelectRow'; diff --git a/src/navigation/wallet/screens/KeyInformation.tsx b/src/navigation/wallet/screens/KeyInformation.tsx index 5211ce60ec..914bb8a6f9 100644 --- a/src/navigation/wallet/screens/KeyInformation.tsx +++ b/src/navigation/wallet/screens/KeyInformation.tsx @@ -10,7 +10,8 @@ import ChevronUpSvg from '../../../../assets/img/chevron-up.svg'; import {TouchableOpacity} from '../../../components/base/TouchableOpacity'; import {LightBlack, Slate30} from '../../../styles/colors'; import ErrorIcon from '../../../../assets/img/error.svg'; -import {SafeAreaView, StyleSheet, View} from 'react-native'; +import {StyleSheet, View} from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import Banner from '../../../components/banner/Banner'; const gutter = parseInt(ScreenGutter, 10); diff --git a/src/navigation/wallet/screens/KeyOverview.tsx b/src/navigation/wallet/screens/KeyOverview.tsx index 4e1794eb5f..15757c8fcf 100644 --- a/src/navigation/wallet/screens/KeyOverview.tsx +++ b/src/navigation/wallet/screens/KeyOverview.tsx @@ -22,12 +22,12 @@ import { NativeScrollEvent, NativeSyntheticEvent, RefreshControl, - SafeAreaView, ScrollView, StyleSheet, View, useWindowDimensions, } from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import SkeletonPlaceholder from 'react-native-skeleton-placeholder'; import {TouchableOpacity} from 'react-native-gesture-handler'; import haptic from '../../../components/haptic-feedback/haptic'; @@ -252,7 +252,7 @@ const styles = StyleSheet.create({ walletListFooterContainer: { paddingTop: 10, paddingRight: 10, - paddingBottom: 100, + paddingBottom: 20, paddingLeft: 10, marginTop: 15, gap: 12, diff --git a/src/navigation/wallet/screens/KeySettings.tsx b/src/navigation/wallet/screens/KeySettings.tsx index 415dcea8ef..950de4a9b2 100644 --- a/src/navigation/wallet/screens/KeySettings.tsx +++ b/src/navigation/wallet/screens/KeySettings.tsx @@ -17,13 +17,8 @@ import { import {useNavigation, useRoute} from '@react-navigation/native'; import {RouteProp} from '@react-navigation/core'; import {WalletGroupParamList, WalletScreens} from '../WalletGroup'; -import { - View, - ScrollView, - FlatList, - SafeAreaView, - StyleSheet, -} from 'react-native'; +import {View, ScrollView, FlatList, StyleSheet} from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import {TouchableOpacity} from '@components/base/TouchableOpacity'; import { ActiveOpacity, diff --git a/src/navigation/wallet/screens/PaperWallet.tsx b/src/navigation/wallet/screens/PaperWallet.tsx index 2b20d32aa6..2bdc92360e 100644 --- a/src/navigation/wallet/screens/PaperWallet.tsx +++ b/src/navigation/wallet/screens/PaperWallet.tsx @@ -1,6 +1,7 @@ import React, {useCallback, useEffect, useState} from 'react'; import {useTranslation} from 'react-i18next'; -import {SafeAreaView, ScrollView, StyleSheet, Text, View} from 'react-native'; +import {ScrollView, StyleSheet, Text, View} from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import Button, {ButtonState} from '../../../components/button/Button'; import {ScreenGutter} from '../../../components/styled/Containers'; import {useAppDispatch, useAppSelector, useLogger} from '../../../utils/hooks'; diff --git a/src/navigation/wallet/screens/SelectInputs.tsx b/src/navigation/wallet/screens/SelectInputs.tsx index d1fbc69b60..048ca029f0 100644 --- a/src/navigation/wallet/screens/SelectInputs.tsx +++ b/src/navigation/wallet/screens/SelectInputs.tsx @@ -8,7 +8,11 @@ import React, { import {useNavigation, useRoute} from '@react-navigation/native'; import {RouteProp} from '@react-navigation/core'; import {FlashList} from '@shopify/flash-list'; -import {SafeAreaView, StyleSheet, View} from 'react-native'; +import {StyleSheet, View} from 'react-native'; +import { + ALL_EDGES, + SafeAreaView, +} from '../../../components/safe-area/SafeAreaView'; import { Recipient, TransactionOptionsContext, @@ -139,7 +143,11 @@ const ItemRowContainer: React.FC> = ({ const SelectInputsContainer: React.FC< React.ComponentProps > = ({style, ...rest}) => ( - + ); const AvailableInputsTitle: React.FC> = ({ diff --git a/src/navigation/wallet/screens/SendToOptions.tsx b/src/navigation/wallet/screens/SendToOptions.tsx index 8135d03893..a99cda3450 100644 --- a/src/navigation/wallet/screens/SendToOptions.tsx +++ b/src/navigation/wallet/screens/SendToOptions.tsx @@ -1,5 +1,6 @@ import React, {useCallback, useLayoutEffect, useMemo, useState} from 'react'; -import {Keyboard, SafeAreaView, StyleSheet, View} from 'react-native'; +import {Keyboard, StyleSheet, View} from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import {createMaterialTopTabNavigator} from '@react-navigation/material-top-tabs'; import {H5, H7, HeaderTitle} from '../../../components/styled/Text'; import {RouteProp, useNavigation, useRoute} from '@react-navigation/native'; diff --git a/src/navigation/wallet/screens/TransactionDetails.tsx b/src/navigation/wallet/screens/TransactionDetails.tsx index 72d281a5a3..0708f49d0d 100644 --- a/src/navigation/wallet/screens/TransactionDetails.tsx +++ b/src/navigation/wallet/screens/TransactionDetails.tsx @@ -10,13 +10,13 @@ import { import React, {useEffect, useLayoutEffect, useState} from 'react'; import { DeviceEventEmitter, - SafeAreaView, StyleSheet, Text, TextProps, View, ViewProps, } from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import {useNavigation, useRoute} from '@react-navigation/native'; import {RouteProp} from '@react-navigation/core'; import {WalletGroupParamList} from '../WalletGroup'; diff --git a/src/navigation/wallet/screens/TransactionProposalDetails.tsx b/src/navigation/wallet/screens/TransactionProposalDetails.tsx index 299b9130cb..3f87f61ce7 100644 --- a/src/navigation/wallet/screens/TransactionProposalDetails.tsx +++ b/src/navigation/wallet/screens/TransactionProposalDetails.tsx @@ -7,14 +7,11 @@ import { H4, } from '../../../components/styled/Text'; import React, {useCallback, useEffect, useLayoutEffect, useState} from 'react'; +import {StyleSheet, Text, TextProps, View, ViewProps} from 'react-native'; import { + ALL_EDGES, SafeAreaView, - StyleSheet, - Text, - TextProps, - View, - ViewProps, -} from 'react-native'; +} from '../../../components/safe-area/SafeAreaView'; import {useNavigation, useRoute} from '@react-navigation/native'; import {RouteProp} from '@react-navigation/core'; import {WalletGroupParamList} from '../WalletGroup'; @@ -166,7 +163,11 @@ const TxpDetailsContainer = ({ style, ...rest }: React.ComponentProps) => ( - + ); const ScrollView = ({ diff --git a/src/navigation/wallet/screens/TransactionProposalNotifications.tsx b/src/navigation/wallet/screens/TransactionProposalNotifications.tsx index 06ae283b73..ce6d2ec227 100644 --- a/src/navigation/wallet/screens/TransactionProposalNotifications.tsx +++ b/src/navigation/wallet/screens/TransactionProposalNotifications.tsx @@ -39,13 +39,8 @@ import { TSSSigningStatus, TSSSigningProgress, } from '../../../store/wallet/wallet.models'; -import { - RefreshControl, - SafeAreaView, - SectionList, - StyleSheet, - View, -} from 'react-native'; +import {RefreshControl, SectionList, StyleSheet, View} from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import TransactionProposalRow from '../../../components/list/TransactionProposalRow'; import {Air, LightBlack, SlateDark, White} from '../../../styles/colors'; import {formatCurrencyAbbreviation, sleep} from '../../../utils/helper-methods'; diff --git a/src/navigation/wallet/screens/UpdateKeyOrWalletName.tsx b/src/navigation/wallet/screens/UpdateKeyOrWalletName.tsx index 42bf4f49be..e265ffa40e 100644 --- a/src/navigation/wallet/screens/UpdateKeyOrWalletName.tsx +++ b/src/navigation/wallet/screens/UpdateKeyOrWalletName.tsx @@ -1,7 +1,8 @@ import React, {useLayoutEffect} from 'react'; import {HeaderTitle} from '../../../components/styled/Text'; import {useNavigation} from '@react-navigation/native'; -import {SafeAreaView, ScrollView, StyleSheet, View} from 'react-native'; +import {ScrollView, StyleSheet, View} from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import {NativeStackScreenProps} from '@react-navigation/native-stack'; import {WalletGroupParamList} from '../WalletGroup'; import BoxInput from '../../../components/form/BoxInput'; diff --git a/src/navigation/wallet/screens/WalletDetails.tsx b/src/navigation/wallet/screens/WalletDetails.tsx index 49219c5de1..d8fe39574a 100644 --- a/src/navigation/wallet/screens/WalletDetails.tsx +++ b/src/navigation/wallet/screens/WalletDetails.tsx @@ -20,12 +20,12 @@ import {useTranslation} from 'react-i18next'; import { DeviceEventEmitter, RefreshControl, - SafeAreaView, StyleSheet, Text, View, useWindowDimensions, } from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import {useTheme as useStyledTheme} from '../../../contexts'; import {shareNative} from '../../../utils/share'; import {useStore} from 'react-redux'; diff --git a/src/navigation/wallet/screens/WalletSettings.tsx b/src/navigation/wallet/screens/WalletSettings.tsx index 5adbc7afc5..87f8b66cd6 100644 --- a/src/navigation/wallet/screens/WalletSettings.tsx +++ b/src/navigation/wallet/screens/WalletSettings.tsx @@ -3,7 +3,8 @@ import {BaseText, HeaderTitle} from '../../../components/styled/Text'; import {useNavigation, useRoute} from '@react-navigation/native'; import {RouteProp} from '@react-navigation/core'; import {WalletGroupParamList} from '../WalletGroup'; -import {SafeAreaView, ScrollView, StyleSheet, View} from 'react-native'; +import {ScrollView, StyleSheet, View} from 'react-native'; +import {SafeAreaView} from '../../../components/safe-area/SafeAreaView'; import {useTheme} from '../../../contexts'; import { ActiveOpacity, diff --git a/src/navigation/wallet/screens/exchange-rate/ExchangeRateScreenLayout.tsx b/src/navigation/wallet/screens/exchange-rate/ExchangeRateScreenLayout.tsx index 237970007e..4d27f427a7 100644 --- a/src/navigation/wallet/screens/exchange-rate/ExchangeRateScreenLayout.tsx +++ b/src/navigation/wallet/screens/exchange-rate/ExchangeRateScreenLayout.tsx @@ -1,13 +1,8 @@ import {type NavigationProp, useNavigation} from '@react-navigation/native'; import React, {useEffect, useState} from 'react'; import {useTranslation} from 'react-i18next'; -import { - RefreshControl, - SafeAreaView, - ScrollView, - StyleSheet, - View, -} from 'react-native'; +import {RefreshControl, ScrollView, StyleSheet, View} from 'react-native'; +import {SafeAreaView} from '../../../../components/safe-area/SafeAreaView'; import {Path, Svg} from 'react-native-svg'; import {useTheme} from '../../../../contexts'; import {TouchableOpacity} from '@components/base/TouchableOpacity'; diff --git a/src/navigation/wallet/screens/request-specific-amount/RequestSpecificAmountQR.tsx b/src/navigation/wallet/screens/request-specific-amount/RequestSpecificAmountQR.tsx index 0baa34138f..e49752bc59 100644 --- a/src/navigation/wallet/screens/request-specific-amount/RequestSpecificAmountQR.tsx +++ b/src/navigation/wallet/screens/request-specific-amount/RequestSpecificAmountQR.tsx @@ -9,7 +9,8 @@ import React, {useEffect, useLayoutEffect, useState} from 'react'; import {useNavigation, useRoute} from '@react-navigation/native'; import {RouteProp} from '@react-navigation/core'; import {WalletGroupParamList} from '../../WalletGroup'; -import {SafeAreaView, ScrollView, StyleSheet, View} from 'react-native'; +import {ScrollView, StyleSheet, View} from 'react-native'; +import {SafeAreaView} from '../../../../components/safe-area/SafeAreaView'; import {useTheme} from '../../../../contexts'; import {ScreenGutter} from '../../../../components/styled/Containers'; import CopySvg from '../../../../../assets/img/copy.svg'; diff --git a/src/navigation/wallet/screens/send/EnterBuyerProvidedEmail.tsx b/src/navigation/wallet/screens/send/EnterBuyerProvidedEmail.tsx index e3853b3612..896ab5390c 100644 --- a/src/navigation/wallet/screens/send/EnterBuyerProvidedEmail.tsx +++ b/src/navigation/wallet/screens/send/EnterBuyerProvidedEmail.tsx @@ -1,7 +1,8 @@ import React, {useState} from 'react'; import {useTranslation} from 'react-i18next'; import {useAppDispatch} from '../../../../utils/hooks/useAppDispatch'; -import {Keyboard, SafeAreaView} from 'react-native'; +import {Keyboard} from 'react-native'; +import {SafeAreaView} from '../../../../components/safe-area/SafeAreaView'; import AuthFormContainer, { AuthActionRow, AuthActionsContainer, diff --git a/src/navigation/wallet/screens/send/GlobalSendTo.tsx b/src/navigation/wallet/screens/send/GlobalSendTo.tsx index 40ad56ac3d..39d7fb8680 100644 --- a/src/navigation/wallet/screens/send/GlobalSendTo.tsx +++ b/src/navigation/wallet/screens/send/GlobalSendTo.tsx @@ -1,5 +1,6 @@ import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react'; -import {SafeAreaView, ScrollView, StyleSheet, View} from 'react-native'; +import {ScrollView, StyleSheet, View} from 'react-native'; +import {SafeAreaView} from '../../../../components/safe-area/SafeAreaView'; import { RouteProp, useNavigation, diff --git a/src/navigation/wallet/screens/send/SendTo.tsx b/src/navigation/wallet/screens/send/SendTo.tsx index ea02dcedbc..3f653d45a9 100644 --- a/src/navigation/wallet/screens/send/SendTo.tsx +++ b/src/navigation/wallet/screens/send/SendTo.tsx @@ -46,7 +46,8 @@ import { ValidateCoinAddress, ValidateURI, } from '../../../../store/wallet/utils/validations'; -import {SafeAreaView, ScrollView, StyleSheet, View} from 'react-native'; +import {ScrollView, StyleSheet, View} from 'react-native'; +import {SafeAreaView} from '../../../../components/safe-area/SafeAreaView'; import {TouchableOpacity} from '@components/base/TouchableOpacity'; import haptic from '../../../../components/haptic-feedback/haptic'; import {GetPayProUrl} from '../../../../store/wallet/utils/decode-uri'; diff --git a/src/navigation/wallet/screens/send/confirm/Confirm.tsx b/src/navigation/wallet/screens/send/confirm/Confirm.tsx index 77c98c03c7..b3e5edd372 100644 --- a/src/navigation/wallet/screens/send/confirm/Confirm.tsx +++ b/src/navigation/wallet/screens/send/confirm/Confirm.tsx @@ -39,6 +39,7 @@ import { SendingTo, SharedDetailRow, } from './Shared'; +import {ALL_EDGES} from '../../../../../components/safe-area/SafeAreaView'; import {BottomNotificationConfig} from '../../../../../components/modal/bottom-notification/BottomNotification'; import { CustomErrorMessage, @@ -544,7 +545,7 @@ const Confirm = () => { return ( <> - + { }, [resetSwipeButton]); return ( - +