Skip to content

Commit 7b1d329

Browse files
weitingsunweitingsun
authored
Merge branch 'main' into wsun/enable-eas-updates-on-rc-builds
2 parents 167b744 + 1d58b0d commit 7b1d329

60 files changed

Lines changed: 1316 additions & 1251 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/component-library/components/BottomSheets/BottomSheetHeader/BottomSheetHeader.tsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import React from 'react';
77
import { useStyles } from '../../../hooks';
88
import HeaderBase from '../../HeaderBase';
99

10-
import ButtonIcon from '../../Buttons/ButtonIcon';
10+
import ButtonIcon, { ButtonIconSizes } from '../../Buttons/ButtonIcon';
1111
import { IconName, IconColor } from '../../Icons/Icon';
1212

1313
// Internal dependencies.
@@ -35,6 +35,7 @@ const BottomSheetHeader: React.FC<BottomSheetHeaderProps> = ({
3535
iconName={IconName.ArrowLeft}
3636
iconColor={IconColor.Default}
3737
onPress={onBack}
38+
size={ButtonIconSizes.Lg}
3839
{...backButtonProps}
3940
/>
4041
);
@@ -44,6 +45,7 @@ const BottomSheetHeader: React.FC<BottomSheetHeaderProps> = ({
4445
iconName={IconName.Close}
4546
iconColor={IconColor.Default}
4647
onPress={onClose}
48+
size={ButtonIconSizes.Lg}
4749
{...closeButtonProps}
4850
/>
4951
);

‎app/components/Snaps/SnapUIRenderer/components/__snapshots__/form.test.ts.snap‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -969,25 +969,25 @@ exports[`SnapUIForm will render with fields 1`] = `
969969
{
970970
"alignItems": "center",
971971
"borderRadius": 8,
972-
"height": 28,
972+
"height": 32,
973973
"justifyContent": "center",
974974
"opacity": 1,
975-
"width": 28,
975+
"width": 32,
976976
}
977977
}
978978
>
979979
<SvgMock
980980
color="#121314"
981981
fill="currentColor"
982-
height={20}
982+
height={24}
983983
name="ArrowLeft"
984984
style={
985985
{
986-
"height": 20,
987-
"width": 20,
986+
"height": 24,
987+
"width": 24,
988988
}
989989
}
990-
width={20}
990+
width={24}
991991
/>
992992
</TouchableOpacity>
993993
</View>
@@ -1700,25 +1700,25 @@ exports[`SnapUIForm will render with fields 1`] = `
17001700
{
17011701
"alignItems": "center",
17021702
"borderRadius": 8,
1703-
"height": 28,
1703+
"height": 32,
17041704
"justifyContent": "center",
17051705
"opacity": 1,
1706-
"width": 28,
1706+
"width": 32,
17071707
}
17081708
}
17091709
>
17101710
<SvgMock
17111711
color="#121314"
17121712
fill="currentColor"
1713-
height={20}
1713+
height={24}
17141714
name="ArrowLeft"
17151715
style={
17161716
{
1717-
"height": 20,
1718-
"width": 20,
1717+
"height": 24,
1718+
"width": 24,
17191719
}
17201720
}
1721-
width={20}
1721+
width={24}
17221722
/>
17231723
</TouchableOpacity>
17241724
</View>

‎app/components/UI/Bridge/components/BridgeNetworkSelectorBase.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { ScrollView } from 'react-native';
44
import BottomSheetHeader from '../../../../component-library/components/BottomSheets/BottomSheetHeader';
55
import BottomSheet from '../../../../component-library/components/BottomSheets/BottomSheet';
66
import { strings } from '../../../../../locales/i18n';
7-
import { ButtonIconSizes } from '../../../../component-library/components/Buttons/ButtonIcon';
7+
88
import { useNavigation } from '@react-navigation/native';
99

1010
interface BridgeNetworkSelectorBaseProps {
@@ -22,7 +22,6 @@ export const BridgeNetworkSelectorBase: React.FC<
2222
onClose={() => navigation.goBack()}
2323
closeButtonProps={{
2424
testID: 'bridge-network-selector-close-button',
25-
size: ButtonIconSizes.Lg,
2625
}}
2726
>
2827
{strings('bridge.select_network')}

‎app/components/UI/Bridge/components/BridgeTokenSelectorBase.tsx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import { FlatList } from 'react-native-gesture-handler';
1919
import BottomSheet, {
2020
BottomSheetRef,
2121
} from '../../../../component-library/components/BottomSheets/BottomSheet';
22-
import { ButtonIconSizes } from '../../../../component-library/components/Buttons/ButtonIcon';
2322

2423
// FlashList on iOS had some issues so we use FlatList for both platforms now
2524
const ListComponent = FlatList;
@@ -223,7 +222,6 @@ export const BridgeTokenSelectorBase: React.FC<
223222
onClose={dismissModal}
224223
closeButtonProps={{
225224
testID: 'bridge-token-selector-close-button',
226-
size: ButtonIconSizes.Lg,
227225
}}
228226
>
229227
{title ?? strings('bridge.select_token')}

‎app/components/UI/Bridge/components/QuoteExpiredModal/__snapshots__/QuoteExpiredModal.test.tsx.snap‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -200,25 +200,25 @@ exports[`QuoteExpiredModal renders correctly 1`] = `
200200
{
201201
"alignItems": "center",
202202
"borderRadius": 8,
203-
"height": 28,
203+
"height": 32,
204204
"justifyContent": "center",
205205
"opacity": 1,
206-
"width": 28,
206+
"width": 32,
207207
}
208208
}
209209
>
210210
<SvgMock
211211
color="#121314"
212212
fill="currentColor"
213-
height={20}
213+
height={24}
214214
name="Close"
215215
style={
216216
{
217-
"height": 20,
218-
"width": 20,
217+
"height": 24,
218+
"width": 24,
219219
}
220220
}
221-
width={20}
221+
width={24}
222222
/>
223223
</TouchableOpacity>
224224
</View>

‎app/components/UI/Bridge/components/SlippageModal/__snapshots__/SlippageModal.test.tsx.snap‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -200,25 +200,25 @@ exports[`SlippageModal renders all UI elements with the proper slippage options
200200
{
201201
"alignItems": "center",
202202
"borderRadius": 8,
203-
"height": 28,
203+
"height": 32,
204204
"justifyContent": "center",
205205
"opacity": 1,
206-
"width": 28,
206+
"width": 32,
207207
}
208208
}
209209
>
210210
<SvgMock
211211
color="#121314"
212212
fill="currentColor"
213-
height={20}
213+
height={24}
214214
name="Close"
215215
style={
216216
{
217-
"height": 20,
218-
"width": 20,
217+
"height": 24,
218+
"width": 24,
219219
}
220220
}
221-
width={20}
221+
width={24}
222222
/>
223223
</TouchableOpacity>
224224
</View>

0 commit comments

Comments
 (0)