Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(11895): remove duplicate networks in incoming transactions settings #12016

Merged
merged 11 commits into from
Oct 30, 2024
Merged

fix(11895): remove duplicate networks in incoming transactions settings #12016

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
69cae3b
fix: removed dup networks in incoming transactions settings
vinnyhoward Oct 24, 2024
4af32bf
fix: update snaps for secur settings
vinnyhoward Oct 24, 2024
6b5b819
fix: more missing snaps
vinnyhoward Oct 24, 2024
67416c5
Merge branch 'main' of github.com:MetaMask/metamask-mobile into fix-d…
vinnyhoward Oct 25, 2024
e36b656
Merge branch 'main' into fix-duplicate-networks-incoming-transactions…
vinnyhoward Oct 29, 2024
d4a11ef
git pull origin main Merge branch 'fix-duplicate-networks-incoming-tr…
vinnyhoward Oct 29, 2024
07c4a7a
fix: incoming transactions settings fixes
vinnyhoward Oct 29, 2024
68d8956
fix: render mainnet first
vinnyhoward Oct 29, 2024
d61d5e3
fix: remove logs
vinnyhoward Oct 29, 2024
f35f0d5
fix: update snaps
vinnyhoward Oct 29, 2024
68bcc0c
fix: snaps
vinnyhoward Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
290 changes: 6 additions & 284 deletions ...onents/Views/OnboardingSuccess/OnboardingAssetsSettings/__snapshots__/index.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,290 +447,6 @@ exports[`OnboardingAssetSettings should render correctly 1`] = `
}
}
>
<TouchableOpacity
avatarProps={
{
"imageSource": {
"uri": "MockImage",
},
"name": "Ethereum Main Network",
"variant": "Network",
}
}
secondaryText="etherscan.io"
style={
{
"backgroundColor": "#ffffff",
"borderColor": "#bbc0c5",
"borderRadius": 4,
"borderWidth": 0,
"padding": 16,
}
}
testID="celldisplay"
title="Ethereum Main Network"
>
<View
style={
{
"flexDirection": "row",
}
}
>
<View
style={
{
"alignItems": "center",
"backgroundColor": "#ffffff",
"borderRadius": 16,
"height": 32,
"justifyContent": "center",
"marginRight": 16,
"overflow": "hidden",
"width": 32,
}
}
testID="cellbase-avatar"
>
<Image
onError={[Function]}
resizeMode="contain"
source={
{
"uri": "MockImage",
}
}
style={
{
"height": 32,
"width": 32,
}
}
testID="network-avatar-image"
/>
</View>
<View
style={
{
"alignItems": "flex-start",
"flex": 1,
}
}
>
<Text
accessibilityRole="text"
numberOfLines={1}
style={
{
"color": "#141618",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 16,
"fontWeight": "400",
"letterSpacing": 0,
"lineHeight": 24,
}
}
testID="cellbase-avatar-title"
>
Ethereum Main Network
</Text>
<Text
accessibilityRole="text"
numberOfLines={1}
style={
{
"color": "#6a737d",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 14,
"fontWeight": "400",
"letterSpacing": 0,
"lineHeight": 22,
}
}
>
etherscan.io
</Text>
</View>
<View
style={
{
"marginLeft": 16,
}
}
>
<RCTSwitch
accessibilityRole="switch"
onChange={[Function]}
onResponderTerminationRequest={[Function]}
onStartShouldSetResponder={[Function]}
onTintColor="#0376c9"
style={
[
{
"height": 31,
"width": 51,
},
[
{
"alignSelf": "flex-start",
},
{
"backgroundColor": "#bbc0c566",
"borderRadius": 16,
},
],
]
}
testID="incoming-mainnet-toggle"
thumbTintColor="#ffffff"
tintColor="#bbc0c566"
value={true}
/>
</View>
</View>
</TouchableOpacity>
<TouchableOpacity
avatarProps={
{
"imageSource": {
"uri": "MockImage",
},
"name": "Linea Main Network",
"variant": "Network",
}
}
secondaryText="lineascan.build"
style={
{
"backgroundColor": "#ffffff",
"borderColor": "#bbc0c5",
"borderRadius": 4,
"borderWidth": 0,
"padding": 16,
}
}
testID="celldisplay"
title="Linea Main Network"
>
<View
style={
{
"flexDirection": "row",
}
}
>
<View
style={
{
"alignItems": "center",
"backgroundColor": "#ffffff",
"borderRadius": 16,
"height": 32,
"justifyContent": "center",
"marginRight": 16,
"overflow": "hidden",
"width": 32,
}
}
testID="cellbase-avatar"
>
<Image
onError={[Function]}
resizeMode="contain"
source={
{
"uri": "MockImage",
}
}
style={
{
"height": 32,
"width": 32,
}
}
testID="network-avatar-image"
/>
</View>
<View
style={
{
"alignItems": "flex-start",
"flex": 1,
}
}
>
<Text
accessibilityRole="text"
numberOfLines={1}
style={
{
"color": "#141618",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 16,
"fontWeight": "400",
"letterSpacing": 0,
"lineHeight": 24,
}
}
testID="cellbase-avatar-title"
>
Linea Main Network
</Text>
<Text
accessibilityRole="text"
numberOfLines={1}
style={
{
"color": "#6a737d",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 14,
"fontWeight": "400",
"letterSpacing": 0,
"lineHeight": 22,
}
}
>
lineascan.build
</Text>
</View>
<View
style={
{
"marginLeft": 16,
}
}
>
<RCTSwitch
accessibilityRole="switch"
onChange={[Function]}
onResponderTerminationRequest={[Function]}
onStartShouldSetResponder={[Function]}
onTintColor="#0376c9"
style={
[
{
"height": 31,
"width": 51,
},
[
{
"alignSelf": "flex-start",
},
{
"backgroundColor": "#bbc0c566",
"borderRadius": 16,
},
],
]
}
testID="incoming-linea-mainnet-toggle"
thumbTintColor="#ffffff"
tintColor="#bbc0c566"
value={true}
/>
</View>
</View>
</TouchableOpacity>
<TouchableOpacity
avatarProps={
{
Expand Down Expand Up @@ -869,6 +585,7 @@ exports[`OnboardingAssetSettings should render correctly 1`] = `
],
]
}
testID="incoming-mainnet-toggle"
thumbTintColor="#ffffff"
tintColor="#bbc0c566"
value={true}
Expand Down Expand Up @@ -1008,6 +725,7 @@ exports[`OnboardingAssetSettings should render correctly 1`] = `
],
]
}
testID=""
thumbTintColor="#ffffff"
tintColor="#bbc0c566"
value={true}
Expand Down Expand Up @@ -1153,6 +871,7 @@ exports[`OnboardingAssetSettings should render correctly 1`] = `
],
]
}
testID=""
thumbTintColor="#ffffff"
tintColor="#bbc0c566"
value={true}
Expand Down Expand Up @@ -1292,6 +1011,7 @@ exports[`OnboardingAssetSettings should render correctly 1`] = `
],
]
}
testID=""
thumbTintColor="#ffffff"
tintColor="#bbc0c566"
value={true}
Expand Down Expand Up @@ -1437,6 +1157,7 @@ exports[`OnboardingAssetSettings should render correctly 1`] = `
],
]
}
testID=""
thumbTintColor="#ffffff"
tintColor="#bbc0c566"
value={true}
Expand Down Expand Up @@ -1582,6 +1303,7 @@ exports[`OnboardingAssetSettings should render correctly 1`] = `
],
]
}
testID="incoming-linea-mainnet-toggle"
thumbTintColor="#ffffff"
tintColor="#bbc0c566"
value={true}
Expand Down
Loading
Loading