diff --git a/app/components/UI/Bridge/components/BridgeDestNetworkSelector/__snapshots__/BridgeDestNetworkSelector.test.tsx.snap b/app/components/UI/Bridge/components/BridgeDestNetworkSelector/__snapshots__/BridgeDestNetworkSelector.test.tsx.snap index 0efb066f6177..62e8094525bb 100644 --- a/app/components/UI/Bridge/components/BridgeDestNetworkSelector/__snapshots__/BridgeDestNetworkSelector.test.tsx.snap +++ b/app/components/UI/Bridge/components/BridgeDestNetworkSelector/__snapshots__/BridgeDestNetworkSelector.test.tsx.snap @@ -433,447 +433,416 @@ exports[`BridgeDestNetworkSelector renders with initial state and displays netwo + + + + Select network + + + + - - - - Select network - - - - - - - - + } + width={24} + /> + - + + + - + } + } + > - - + - - - - - - - Optimism - - + } + testID="network-avatar-image" + /> + + Optimism + - - + + + + + - - - - - - Solana - - + } + testID="network-avatar-image" + /> + + Solana + - - + + + + + - - - - - - Bitcoin - - + } + testID="network-avatar-image" + /> + + Bitcoin + - + - - + + - + diff --git a/app/components/UI/Bridge/components/BridgeDestTokenSelector/__snapshots__/BridgeDestTokenSelector.test.tsx.snap b/app/components/UI/Bridge/components/BridgeDestTokenSelector/__snapshots__/BridgeDestTokenSelector.test.tsx.snap index be6828ac6556..b760fbae608e 100644 --- a/app/components/UI/Bridge/components/BridgeDestTokenSelector/__snapshots__/BridgeDestTokenSelector.test.tsx.snap +++ b/app/components/UI/Bridge/components/BridgeDestTokenSelector/__snapshots__/BridgeDestTokenSelector.test.tsx.snap @@ -499,10 +499,10 @@ exports[`BridgeDestTokenSelector renders with initial state and displays tokens { "alignItems": "center", "borderRadius": 8, - "height": 28, + "height": 32, "justifyContent": "center", "opacity": 1, - "width": 28, + "width": 32, } } testID="bridge-token-selector-close-button" @@ -510,15 +510,15 @@ exports[`BridgeDestTokenSelector renders with initial state and displays tokens diff --git a/app/components/UI/Bridge/components/BridgeNetworkSelectorBase.tsx b/app/components/UI/Bridge/components/BridgeNetworkSelectorBase.tsx index 12be0d267779..04a4c02240ee 100644 --- a/app/components/UI/Bridge/components/BridgeNetworkSelectorBase.tsx +++ b/app/components/UI/Bridge/components/BridgeNetworkSelectorBase.tsx @@ -1,41 +1,20 @@ import React from 'react'; -import { StyleSheet, TouchableOpacity, ScrollView } from 'react-native'; -import { Box } from '../../Box/Box'; +import { ScrollView, StyleSheet } from 'react-native'; import Text, { TextVariant, } from '../../../../component-library/components/Texts/Text'; -import { useStyles } from '../../../../component-library/hooks'; -import { Theme } from '../../../../util/theme/models'; import BottomSheetHeader from '../../../../component-library/components/BottomSheets/BottomSheetHeader'; import BottomSheet from '../../../../component-library/components/BottomSheets/BottomSheet'; -import Icon, { - IconName, -} from '../../../../component-library/components/Icons/Icon'; -import { IconSize } from '../../../../component-library/components/Icons/Icon/Icon.types'; import { strings } from '../../../../../locales/i18n'; -import { FlexDirection, AlignItems, JustifyContent } from '../../Box/box.types'; +import { ButtonIconSizes } from '../../../../component-library/components/Buttons/ButtonIcon'; import { useNavigation } from '@react-navigation/native'; -const createStyles = (params: { theme: Theme }) => { - const { theme } = params; - return StyleSheet.create({ - content: { - flex: 1, - backgroundColor: theme.colors.background.default, - }, - headerTitle: { - flex: 1, - textAlign: 'center', - }, - closeButton: { - position: 'absolute', - right: 0, - }, - closeIconBox: { - padding: 8, - }, - }); -}; +const styles = StyleSheet.create({ + headerTitle: { + flex: 1, + textAlign: 'center', + }, +}); interface BridgeNetworkSelectorBaseProps { children: React.ReactNode; @@ -44,42 +23,23 @@ interface BridgeNetworkSelectorBaseProps { export const BridgeNetworkSelectorBase: React.FC< BridgeNetworkSelectorBaseProps > = ({ children }) => { - const { styles, theme } = useStyles(createStyles, {}); const navigation = useNavigation(); return ( - - - - - - {strings('bridge.select_network')} - - - navigation.goBack()} - testID="bridge-network-selector-close-button" - > - - - - - - + navigation.goBack()} + closeButtonProps={{ + testID: 'bridge-network-selector-close-button', + size: ButtonIconSizes.Lg, + }} + > + + {strings('bridge.select_network')} + + - - {children} - - + {children} ); }; diff --git a/app/components/UI/Bridge/components/BridgeSourceNetworkSelector/__snapshots__/BridgeSourceNetworkSelector.test.tsx.snap b/app/components/UI/Bridge/components/BridgeSourceNetworkSelector/__snapshots__/BridgeSourceNetworkSelector.test.tsx.snap index ea34b8146e98..9b92cc927587 100644 --- a/app/components/UI/Bridge/components/BridgeSourceNetworkSelector/__snapshots__/BridgeSourceNetworkSelector.test.tsx.snap +++ b/app/components/UI/Bridge/components/BridgeSourceNetworkSelector/__snapshots__/BridgeSourceNetworkSelector.test.tsx.snap @@ -433,990 +433,959 @@ exports[`BridgeSourceNetworkSelector renders with initial state and displays net + + + + + Select network + + + + + + + + + + + + - - - - Select network - - - - - - - - + Deselect all + + - - - + } + } + > - - - Deselect all - - - - - - - - - + + + + + + - - - - - + + - + Ethereum Mainnet + + + + - - - - - - Ethereum Mainnet - - - - - $22600 - - - + $22600 + - - + + + + + - - + + + + + + - - - - - + + - + Optimism + + + + - - - - - - Optimism - - - - - $12000 - - - + $12000 + - - + + + + + - - + + + + + + - - - - - + + - + Solana + + + + - - - - - - Solana - - - - - $30012.75599 - - - + $30012.75599 + - - + + + + + - - + + + + + + - - - - - + + - + Bitcoin + + + + - - - - - - Bitcoin - - - - - $1500 - - - + $1500 + - + - - - - - - Apply - + + + + Apply + + + - + diff --git a/app/components/UI/Bridge/components/BridgeSourceTokenSelector/__snapshots__/BridgeSourceTokenSelector.test.tsx.snap b/app/components/UI/Bridge/components/BridgeSourceTokenSelector/__snapshots__/BridgeSourceTokenSelector.test.tsx.snap index d8925904637b..5ff5f3b243c0 100644 --- a/app/components/UI/Bridge/components/BridgeSourceTokenSelector/__snapshots__/BridgeSourceTokenSelector.test.tsx.snap +++ b/app/components/UI/Bridge/components/BridgeSourceTokenSelector/__snapshots__/BridgeSourceTokenSelector.test.tsx.snap @@ -499,10 +499,10 @@ exports[`BridgeSourceTokenSelector renders with initial state and displays token { "alignItems": "center", "borderRadius": 8, - "height": 28, + "height": 32, "justifyContent": "center", "opacity": 1, - "width": 28, + "width": 32, } } testID="bridge-token-selector-close-button" @@ -510,15 +510,15 @@ exports[`BridgeSourceTokenSelector renders with initial state and displays token diff --git a/app/components/UI/Bridge/components/BridgeTokenSelectorBase.tsx b/app/components/UI/Bridge/components/BridgeTokenSelectorBase.tsx index 2ad77c0abf1b..29b604cd743a 100644 --- a/app/components/UI/Bridge/components/BridgeTokenSelectorBase.tsx +++ b/app/components/UI/Bridge/components/BridgeTokenSelectorBase.tsx @@ -20,6 +20,7 @@ import { FlatList } from 'react-native-gesture-handler'; import BottomSheet, { BottomSheetRef, } from '../../../../component-library/components/BottomSheets/BottomSheet'; +import { ButtonIconSizes } from '../../../../component-library/components/Buttons/ButtonIcon'; // FlashList on iOS had some issues so we use FlatList for both platforms now const ListComponent = FlatList; @@ -221,7 +222,10 @@ export const BridgeTokenSelectorBase: React.FC< > {title ?? strings('bridge.select_token')} diff --git a/app/components/UI/Bridge/components/TokenInputArea/TokenInputArea.test.tsx b/app/components/UI/Bridge/components/TokenInputArea/TokenInputArea.test.tsx index 59f097b9dc2b..7dd7c5a9066c 100644 --- a/app/components/UI/Bridge/components/TokenInputArea/TokenInputArea.test.tsx +++ b/app/components/UI/Bridge/components/TokenInputArea/TokenInputArea.test.tsx @@ -299,8 +299,8 @@ describe('getDisplayAmount', () => { it('always truncates destination amount to 5 decimals', () => { const amount = '123.456789012345'; - expect(getDisplayAmount(amount, TokenInputAreaType.Destination, false)).toBe( - '123.45678', - ); + expect( + getDisplayAmount(amount, TokenInputAreaType.Destination, false), + ).toBe('123.45678'); }); }); diff --git a/app/core/FontPreloader/FontPreloader.ts b/app/core/FontPreloader/FontPreloader.ts index 14536cab847d..079d01c734ef 100644 --- a/app/core/FontPreloader/FontPreloader.ts +++ b/app/core/FontPreloader/FontPreloader.ts @@ -172,7 +172,10 @@ class FontPreloader { // We create a small delay to ensure font cache is warmed up // Log the font families passed as a parameter (not derived from fontVariants.map()) - Logger.log('FontPreloader: Preloading font families (parameter):', fontFamilies); + Logger.log( + 'FontPreloader: Preloading font families (parameter):', + fontFamilies, + ); // Small delay to ensure fonts are cached by the system setTimeout(