status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat: Change optimism network short name (#14766)

This commit is contained in:
Cuteivist 2024-05-16 18:37:54 +02:00 committed by GitHub
parent 9d7d3b245e
commit b771ac6aed
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
15 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/default-networks.json
View File

@ -36,7 +36,7 @@
"blockExplorerUrl": "https://optimistic.etherscan.io", "blockExplorerUrl": "https://optimistic.etherscan.io",
"iconUrl": "network/Network=Optimism", "iconUrl": "network/Network=Optimism",
"chainColor": "#E90101", "chainColor": "#E90101",
"shortName": "opt", "shortName": "oeth",
"nativeCurrencyName": "Ether", "nativeCurrencyName": "Ether",
"nativeCurrencySymbol": "ETH", "nativeCurrencySymbol": "ETH",
"nativeCurrencyDecimals": 18, "nativeCurrencyDecimals": 18,
@ -66,7 +66,7 @@
"blockExplorerUrl": "https://arbiscan.io/", "blockExplorerUrl": "https://arbiscan.io/",
"iconUrl": "network/Network=Arbitrum", "iconUrl": "network/Network=Arbitrum",
"chainColor": "#51D0F0", "chainColor": "#51D0F0",
"shortName": "arb", "shortName": "arb1",
"nativeCurrencyName": "Ether", "nativeCurrencyName": "Ether",
"nativeCurrencySymbol": "ETH", "nativeCurrencySymbol": "ETH",
"nativeCurrencyDecimals": 18, "nativeCurrencyDecimals": 18,

12
src/app_service/common/network_constants.nim
View File

@ -44,7 +44,7 @@ var NETWORKS* = %* [
"blockExplorerUrl": "https://optimistic.etherscan.io", "blockExplorerUrl": "https://optimistic.etherscan.io",
"iconUrl": "network/Network=Optimism", "iconUrl": "network/Network=Optimism",
"chainColor": "#E90101", "chainColor": "#E90101",
"shortName": "opt", "shortName": "oeth",
"nativeCurrencyName": "Ether", "nativeCurrencyName": "Ether",
"nativeCurrencySymbol": "ETH", "nativeCurrencySymbol": "ETH",
"nativeCurrencyDecimals": 18, "nativeCurrencyDecimals": 18,
@ -61,7 +61,7 @@ var NETWORKS* = %* [
"blockExplorerUrl": "https://goerli-optimism.etherscan.io/", "blockExplorerUrl": "https://goerli-optimism.etherscan.io/",
"iconUrl": "network/Network=Optimism", "iconUrl": "network/Network=Optimism",
"chainColor": "#E90101", "chainColor": "#E90101",
"shortName": "opt", "shortName": "oeth",
"nativeCurrencyName": "Ether", "nativeCurrencyName": "Ether",
"nativeCurrencySymbol": "ETH", "nativeCurrencySymbol": "ETH",
"nativeCurrencyDecimals": 18, "nativeCurrencyDecimals": 18,
@ -78,7 +78,7 @@ var NETWORKS* = %* [
"blockExplorerUrl": "https://arbiscan.io/", "blockExplorerUrl": "https://arbiscan.io/",
"iconUrl": "network/Network=Arbitrum", "iconUrl": "network/Network=Arbitrum",
"chainColor": "#51D0F0", "chainColor": "#51D0F0",
"shortName": "arb", "shortName": "arb1",
"nativeCurrencyName": "Ether", "nativeCurrencyName": "Ether",
"nativeCurrencySymbol": "ETH", "nativeCurrencySymbol": "ETH",
"nativeCurrencyDecimals": 18, "nativeCurrencyDecimals": 18,
@ -95,7 +95,7 @@ var NETWORKS* = %* [
"blockExplorerUrl": "https://goerli.arbiscan.io/", "blockExplorerUrl": "https://goerli.arbiscan.io/",
"iconUrl": "network/Network=Arbitrum", "iconUrl": "network/Network=Arbitrum",
"chainColor": "#51D0F0", "chainColor": "#51D0F0",
"shortName": "arb", "shortName": "arb1",
"nativeCurrencyName": "Ether", "nativeCurrencyName": "Ether",
"nativeCurrencySymbol": "ETH", "nativeCurrencySymbol": "ETH",
"nativeCurrencyDecimals": 18, "nativeCurrencyDecimals": 18,
@ -129,7 +129,7 @@ var NETWORKS* = %* [
"blockExplorerUrl": "https://sepolia-optimism.etherscan.io/", "blockExplorerUrl": "https://sepolia-optimism.etherscan.io/",
"iconUrl": "network/Network=Optimism", "iconUrl": "network/Network=Optimism",
"chainColor": "#E90101", "chainColor": "#E90101",
"shortName": "opt", "shortName": "oeth",
"nativeCurrencyName": "Ether", "nativeCurrencyName": "Ether",
"nativeCurrencySymbol": "ETH", "nativeCurrencySymbol": "ETH",
"nativeCurrencyDecimals": 18, "nativeCurrencyDecimals": 18,
@ -146,7 +146,7 @@ var NETWORKS* = %* [
"blockExplorerUrl": "https://sepolia-explorer.arbitrum.io/", "blockExplorerUrl": "https://sepolia-explorer.arbitrum.io/",
"iconUrl": "network/Network=Arbitrum", "iconUrl": "network/Network=Arbitrum",
"chainColor": "#51D0F0", "chainColor": "#51D0F0",
"shortName": "arb", "shortName": "arb1",
"nativeCurrencyName": "Ether", "nativeCurrencyName": "Ether",
"nativeCurrencySymbol": "ETH", "nativeCurrencySymbol": "ETH",
"nativeCurrencyDecimals": 18, "nativeCurrencyDecimals": 18,

2
storybook/pages/AccountViewPage.qml
View File

@ -59,7 +59,7 @@ SplitView {
} }
function getNetworkShortNames() { function getNetworkShortNames() {
return "eth:opt:arb:" return "eth:oeth:arb1:"
} }
function getAllNetworksChainIds() { function getAllNetworksChainIds() {

4
storybook/pages/ProfileAccountsPage.qml
View File

@ -23,8 +23,8 @@ SplitView {
function getAllNetworksSupportedString(hovered) { function getAllNetworksSupportedString(hovered) {
return hovered ? "<font color=\"" + "#627EEA" + "\">" + "eth:" + "</font>" + return hovered ? "<font color=\"" + "#627EEA" + "\">" + "eth:" + "</font>" +
"<font color=\"" + "#E90101" + "\">" + "opt:" + "</font>" + "<font color=\"" + "#E90101" + "\">" + "oeth:" + "</font>" +
"<font color=\"" + "#27A0EF" + "\">" + "arb:" + "</font>" : "eth:opt:arb:" "<font color=\"" + "#27A0EF" + "\">" + "arb1:" + "</font>" : "eth:oeth:arb1:"
} }
} }
} }

8
storybook/pages/ReceiveModalPage.qml
View File

@ -59,7 +59,7 @@ SplitView {
return chainNameString return chainNameString
} }
property string networksNames: "opt:arb:eth:" property string networksNames: "oeth:arb1:eth:"
store: QtObject { store: QtObject {
property var filteredFlatModel: SortFilterProxyModel { property var filteredFlatModel: SortFilterProxyModel {
@ -118,14 +118,14 @@ SplitView {
RadioButton { RadioButton {
text: "Medium length address" text: "Medium length address"
onCheckedChanged: { onCheckedChanged: {
dialog.networksNames = "opt:arb:eth:arb:solana:status:other:" dialog.networksNames = "oeth:arb1:eth:arb1:solana:status:other:"
} }
} }
RadioButton { RadioButton {
text: "Super long address" text: "Super long address"
onCheckedChanged: { onCheckedChanged: {
dialog.networksNames = "opt:arb:eth:arb:solana:status:other:something:hey:whatsapp:tele:viber:do:it:now:blackjack:some:black:number:check:it:out:heyeey:dosay:what:are:you:going:to:do:with:me:forever:young:michael:jackson:super:long:string:crasy:daisy:this:is:amazing:whatever:you:do:whenever:you:go:" dialog.networksNames = "oeth:arb1:eth:arb1:solana:status:other:something:hey:whatsapp:tele:viber:do:it:now:blackjack:some:black:number:check:it:out:heyeey:dosay:what:are:you:going:to:do:with:me:forever:young:michael:jackson:super:long:string:crasy:daisy:this:is:amazing:whatever:you:do:whenever:you:go:"
} }
} }
@ -133,7 +133,7 @@ SplitView {
checked: true checked: true
text: "Short address" text: "Short address"
onCheckedChanged: { onCheckedChanged: {
dialog.networksNames = "opt:arb:eth:" dialog.networksNames = "oeth:arb1:eth:"
} }
} }
} }

2
storybook/pages/TransactionAddressPage.qml
View File

@ -79,7 +79,7 @@ SplitView {
QtObject { QtObject {
id: d id: d
property string addressPrefixString: "eth:opt:arb:" property string addressPrefixString: "eth:oeth:arb1:"
property string addressName: "Ariana Pearlona" property string addressName: "Ariana Pearlona"
property bool isContact: true property bool isContact: true
property bool isWallet: false property bool isWallet: false

8
storybook/pages/TransactionAddressTilePage.qml
View File

@ -134,12 +134,12 @@ SplitView {
contactsStore: contactsStoreMockup contactsStore: contactsStoreMockup
addresses: [ addresses: [
"0x29D7d1dd5B6f9C864d9db560D72a247c178aE86C", "0x29D7d1dd5B6f9C864d9db560D72a247c178aE86C",
"eth:arb:opt:0x4de3f6278C0DdFd3F29df9DcD979038F5c7bbc35", "eth:arb1:oeth:0x4de3f6278C0DdFd3F29df9DcD979038F5c7bbc35",
"0x4de3f6278C0DdFd3F29df9DcD979038F5c7bbc35", "0x4de3f6278C0DdFd3F29df9DcD979038F5c7bbc35",
"eth:opt:arb:0x4de3f6278C0DdFd3F29df9DcD979038F5c7bbc35", "eth:oeth:arb1:0x4de3f6278C0DdFd3F29df9DcD979038F5c7bbc35",
"eth:opt:arb:0x29D7d1dd5B6f9C864d9db560D72a247c178aE86B", "eth:oeth:arb1:0x29D7d1dd5B6f9C864d9db560D72a247c178aE86B",
"0x29D7d1dd5B6f9C864d9db560D72a247c178aE86B", "0x29D7d1dd5B6f9C864d9db560D72a247c178aE86B",
"eth:opt:arb:0x4de3f6278C0DdFd3F29df9DcD979038F5c7bbc36" "eth:oeth:arb1:0x4de3f6278C0DdFd3F29df9DcD979038F5c7bbc36"
] ]
} }
} }

2
storybook/pages/TransactionDetailViewPage.qml
View File

@ -138,7 +138,7 @@ SplitView {
property int timestamp: Date.now() / 1000 property int timestamp: Date.now() / 1000
property int txStatus: 0 property int txStatus: 0
property string type: "eth" property string type: "eth"
property string from: "eth:arb:opt:0xb38e8c17e38363af6ebdcb3dae12e0243582891d" property string from: "eth:arb1:oeth:0xb38e8c17e38363af6ebdcb3dae12e0243582891d"
property string to: "0xBE0eB53F46cd790Cd13851d5EFf43D12404d33E8" property string to: "0xBE0eB53F46cd790Cd13851d5EFf43D12404d33E8"
property bool isNFT: false property bool isNFT: false
property string tokenID: "4981676894159712808201908443964193325271219637660871887967796332739046670337" property string tokenID: "4981676894159712808201908443964193325271219637660871887967796332739046670337"

4
storybook/pages/WalletHeaderPage.qml
View File

@ -89,8 +89,8 @@ SplitView {
function getAllNetworksSupportedString(hovered) { function getAllNetworksSupportedString(hovered) {
return hovered ? "<font color=\"" + "#627EEA" + "\">" + "eth:" + "</font>" + return hovered ? "<font color=\"" + "#627EEA" + "\">" + "eth:" + "</font>" +
"<font color=\"" + "#E90101" + "\">" + "opt:" + "</font>" + "<font color=\"" + "#E90101" + "\">" + "oeth:" + "</font>" +
"<font color=\"" + "#27A0EF" + "\">" + "arb:" + "</font>" : "eth:opt:arb:" "<font color=\"" + "#27A0EF" + "\">" + "arb1:" + "</font>" : "eth:oeth:arb1:"
} }
} }
} }

8
storybook/src/Models/NetworksModel.qml
View File

@ -17,10 +17,10 @@ QtObject {
return "eth" return "eth"
if(chainId === root.optimismNet) if(chainId === root.optimismNet)
return "opt" return "oeth"
if(chainId === root.arbitrumNet) if(chainId === root.arbitrumNet)
return "arb" return "arb1"
if(chainId === root.hermezNet) if(chainId === root.hermezNet)
return "her" return "her"
@ -95,7 +95,7 @@ QtObject {
blockExplorerUrl: "https://optimistic.etherscan.io", blockExplorerUrl: "https://optimistic.etherscan.io",
iconUrl: "network/Network=Optimism", iconUrl: "network/Network=Optimism",
chainColor: "#E90101", chainColor: "#E90101",
shortName: "opt", shortName: "oeth",
nativeCurrencyName: "Ether", nativeCurrencyName: "Ether",
nativeCurrencySymbol: "ETH", nativeCurrencySymbol: "ETH",
nativeCurrencyDecimals: 18, nativeCurrencyDecimals: 18,
@ -123,7 +123,7 @@ QtObject {
blockExplorerUrl: "https://arbiscan.io/", blockExplorerUrl: "https://arbiscan.io/",
iconUrl: "network/Network=Arbitrum", iconUrl: "network/Network=Arbitrum",
chainColor: "#51D0F0", chainColor: "#51D0F0",
shortName: "arb", shortName: "arb1",
nativeCurrencyName: "Ether", nativeCurrencyName: "Ether",
nativeCurrencySymbol: "ETH", nativeCurrencySymbol: "ETH",
nativeCurrencyDecimals: 18, nativeCurrencyDecimals: 18,

2
storybook/src/Models/RecipientModel.qml
View File

@ -9,7 +9,7 @@ QtObject {
address: "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2" address: "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2"
ens: "" ens: ""
favourite: true favourite: true
chainShortNames: "eth:arb:opt" chainShortNames: "eth:arb1:oeth"
isTest: false isTest: false
checked: true checked: true
allChecked: true allChecked: true

2
storybook/stubs/shared/stores/send/TransactionStore.qml
View File

@ -51,7 +51,7 @@ QtObject {
name: "some saved addr name " + i, name: "some saved addr name " + i,
ens: [], ens: [],
address: "0x2B748A02e06B159C7C3E98F5064577B96E55A7b4", address: "0x2B748A02e06B159C7C3E98F5064577B96E55A7b4",
chainShortNames: "eth:arb" chainShortNames: "eth:arb1"
}) })
} }
} }

2
test/ui-test/testSuites/suite_wallet/tst_wallet_savedAddresses/verificationPoints/can_see_collectibles_for_an_account/when_the_user_accepts_the_signing_phrase_YugaLabs_0xA858DDc0445d8131daC4d1DE01f834ffcbA52Ef1
View File

@ -7844,7 +7844,7 @@
<string>false</string> <string>false</string>
</property> </property>
<property name="text"> <property name="text">
<string>arb</string> <string>arb1</string>
</property> </property>
</properties> </properties>
<identifyingProperties> <identifyingProperties>

2
ui/imports/shared/controls/TransactionAddressTile.qml
View File

@ -22,7 +22,7 @@ import StatusQ.Core.Theme 0.1
width: parent.width width: parent.width
rootStore: WalletStores.RootStore rootStore: WalletStores.RootStore
addresses: [ addresses: [
"eth:arb:opt:0x4de3f6278C0DdFd3F29df9DcD979038F5c7bbc35", "eth:arb1:oeth:0x4de3f6278C0DdFd3F29df9DcD979038F5c7bbc35",
"0x4de3f6278C0DdFd3F29df9DcD979038F5c7bbc35", "0x4de3f6278C0DdFd3F29df9DcD979038F5c7bbc35",
] ]
} }

4
ui/imports/utils/Constants.qml
View File

@ -896,8 +896,8 @@ QtObject {
readonly property QtObject networkShortChainNames: QtObject { readonly property QtObject networkShortChainNames: QtObject {
readonly property string mainnet: "eth" readonly property string mainnet: "eth"
readonly property string arbitrum: "arb" readonly property string arbitrum: "arb1"
readonly property string optimism: "opt" readonly property string optimism: "oeth"
} }
readonly property QtObject networkExplorerLinks: QtObject { readonly property QtObject networkExplorerLinks: QtObject {