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

chore: cherry pick 12074 #12082

Merged
merged 2 commits into from
Oct 29, 2024
+39 −21
Merged

chore: cherry pick 12074 #12082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9dae0ba
fix: fix naming for linea and mainnet (#12074)
salimtb Oct 29, 2024
ca2980b
Merge branch 'release/7.34.0' into chore/cherry-pick-12074
salimtb 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
12 changes: 6 additions & 6 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 @@ -739,7 +739,7 @@ exports[`OnboardingAssetSettings should render correctly 1`] = `
"uri": "MockImage",
},
},
"name": "Mainnet",
"name": "Ethereum Mainnet",
"variant": "Network",
}
}
Expand All @@ -754,7 +754,7 @@ exports[`OnboardingAssetSettings should render correctly 1`] = `
}
}
testID="celldisplay"
title="Mainnet"
title="Ethereum Mainnet"
>
<View
style={
Expand Down Expand Up @@ -820,7 +820,7 @@ exports[`OnboardingAssetSettings should render correctly 1`] = `
}
testID="cellbase-avatar-title"
>
Mainnet
Ethereum Mainnet
</Text>
<Text
accessibilityRole="text"
Expand Down Expand Up @@ -1452,7 +1452,7 @@ exports[`OnboardingAssetSettings should render correctly 1`] = `
"uri": "MockImage",
},
},
"name": "Linea Mainnet",
"name": "Linea",
"variant": "Network",
}
}
Expand All @@ -1467,7 +1467,7 @@ exports[`OnboardingAssetSettings should render correctly 1`] = `
}
}
testID="celldisplay"
title="Linea Mainnet"
title="Linea"
>
<View
style={
Expand Down Expand Up @@ -1533,7 +1533,7 @@ exports[`OnboardingAssetSettings should render correctly 1`] = `
}
testID="cellbase-avatar-title"
>
Linea Mainnet
Linea
</Text>
<Text
accessibilityRole="text"
Expand Down
12 changes: 6 additions & 6 deletions app/components/Views/Settings/IncomingTransactionsSettings/__snapshots__/index.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ exports[`IncomingTransactionsSettings should render correctly 1`] = `
"uri": "MockImage",
},
},
"name": "Mainnet",
"name": "Ethereum Mainnet",
"variant": "Network",
}
}
Expand All @@ -356,7 +356,7 @@ exports[`IncomingTransactionsSettings should render correctly 1`] = `
}
}
testID="celldisplay"
title="Mainnet"
title="Ethereum Mainnet"
>
<View
style={
Expand Down Expand Up @@ -422,7 +422,7 @@ exports[`IncomingTransactionsSettings should render correctly 1`] = `
}
testID="cellbase-avatar-title"
>
Mainnet
Ethereum Mainnet
</Text>
<Text
accessibilityRole="text"
Expand Down Expand Up @@ -1054,7 +1054,7 @@ exports[`IncomingTransactionsSettings should render correctly 1`] = `
"uri": "MockImage",
},
},
"name": "Linea Mainnet",
"name": "Linea",
"variant": "Network",
}
}
Expand All @@ -1069,7 +1069,7 @@ exports[`IncomingTransactionsSettings should render correctly 1`] = `
}
}
testID="celldisplay"
title="Linea Mainnet"
title="Linea"
>
<View
style={
Expand Down Expand Up @@ -1135,7 +1135,7 @@ exports[`IncomingTransactionsSettings should render correctly 1`] = `
}
testID="cellbase-avatar-title"
>
Linea Mainnet
Linea
</Text>
<Text
accessibilityRole="text"
Expand Down
12 changes: 6 additions & 6 deletions app/components/Views/Settings/SecuritySettings/__snapshots__/SecuritySettings.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1844,7 +1844,7 @@ exports[`SecuritySettings should render correctly 1`] = `
"uri": "MockImage",
},
},
"name": "Mainnet",
"name": "Ethereum Mainnet",
"variant": "Network",
}
}
Expand All @@ -1859,7 +1859,7 @@ exports[`SecuritySettings should render correctly 1`] = `
}
}
testID="celldisplay"
title="Mainnet"
title="Ethereum Mainnet"
>
<View
style={
Expand Down Expand Up @@ -1925,7 +1925,7 @@ exports[`SecuritySettings should render correctly 1`] = `
}
testID="cellbase-avatar-title"
>
Mainnet
Ethereum Mainnet
</Text>
<Text
accessibilityRole="text"
Expand Down Expand Up @@ -2557,7 +2557,7 @@ exports[`SecuritySettings should render correctly 1`] = `
"uri": "MockImage",
},
},
"name": "Linea Mainnet",
"name": "Linea",
"variant": "Network",
}
}
Expand All @@ -2572,7 +2572,7 @@ exports[`SecuritySettings should render correctly 1`] = `
}
}
testID="celldisplay"
title="Linea Mainnet"
title="Linea"
>
<View
style={
Expand Down Expand Up @@ -2638,7 +2638,7 @@ exports[`SecuritySettings should render correctly 1`] = `
}
testID="cellbase-avatar-title"
>
Linea Mainnet
Linea
</Text>
<Text
accessibilityRole="text"
Expand Down
2 changes: 1 addition & 1 deletion app/components/Views/Wallet/__snapshots__/index.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ exports[`Wallet should render correctly 1`] = `
}
testID="open-networks-text"
>
Mainnet
Ethereum Mainnet
</Text>
<SvgMock
color="#141618"
Expand Down
4 changes: 2 additions & 2 deletions app/util/test/initial-background-state.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"blockExplorerUrls": [],
"chainId": "0x1",
"defaultRpcEndpointIndex": 0,
"name": "Mainnet",
"name": "Ethereum Mainnet",
"nativeCurrency": "ETH",
"rpcEndpoints": [
{
Expand Down Expand Up @@ -134,7 +134,7 @@
"blockExplorerUrls": [],
"chainId": "0xe708",
"defaultRpcEndpointIndex": 0,
"name": "Linea Mainnet",
"name": "Linea",
"nativeCurrency": "ETH",
"rpcEndpoints": [
{
Expand Down
18 changes: 18 additions & 0 deletions patches/@metamask+controller-utils+11.3.0.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
diff --git a/node_modules/@metamask/controller-utils/dist/types.cjs b/node_modules/@metamask/controller-utils/dist/types.cjs
index b8c00f2..6268fb0 100644
--- a/node_modules/@metamask/controller-utils/dist/types.cjs
+++ b/node_modules/@metamask/controller-utils/dist/types.cjs
@@ -97,11 +97,11 @@ exports.BlockExplorerUrl = {
[BuiltInNetworkName.LineaMainnet]: 'https://lineascan.build',
};
exports.NetworkNickname = {
- [BuiltInNetworkName.Mainnet]: 'Mainnet',
+ [BuiltInNetworkName.Mainnet]: 'Ethereum Mainnet',
[BuiltInNetworkName.Goerli]: 'Goerli',
[BuiltInNetworkName.Sepolia]: 'Sepolia',
[BuiltInNetworkName.LineaGoerli]: 'Linea Goerli',
[BuiltInNetworkName.LineaSepolia]: 'Linea Sepolia',
- [BuiltInNetworkName.LineaMainnet]: 'Linea Mainnet',
+ [BuiltInNetworkName.LineaMainnet]: 'Linea',
};
//# sourceMappingURL=types.cjs.map
Loading