diff --git a/app/_locales/cs/messages.json b/app/_locales/cs/messages.json index b1f50c457..ee45d41e2 100644 --- a/app/_locales/cs/messages.json +++ b/app/_locales/cs/messages.json @@ -74,7 +74,7 @@ "message": "Připojuji se k Kovan Test Network" }, "connectingToMainnet": { - "message": "Připojuji se k Main Ethereum Network" + "message": "Připojuji se k Ethereum Mainnet" }, "connectingToRopsten": { "message": "Připojuji se k Ropsten Test Network" diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json index cf8596b32..26920266f 100644 --- a/app/_locales/de/messages.json +++ b/app/_locales/de/messages.json @@ -378,7 +378,7 @@ "message": "Fehler bei der ENS-Namensregistrierung" }, "ensNotFoundOnCurrentNetwork": { - "message": "ENS-Name wurde im aktuellen Netzwerk nicht gefunden. Versuchen Sie, zum Main Ethereum Network zu wechseln." + "message": "ENS-Name wurde im aktuellen Netzwerk nicht gefunden. Versuchen Sie, zum Ethereum Mainnet zu wechseln." }, "enterAnAlias": { "message": "Ein Alias eingeben" diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 91320f3e8..38830726c 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -392,7 +392,7 @@ "message": "Connecting to Kovan Test Network" }, "connectingToMainnet": { - "message": "Connecting to Main Ethereum Network" + "message": "Connecting to Ethereum Mainnet" }, "connectingToRopsten": { "message": "Connecting to Ropsten Test Network" @@ -582,7 +582,7 @@ "message": "Error in ENS name registration" }, "ensNotFoundOnCurrentNetwork": { - "message": "ENS name not found on the current network. Try switching to Main Ethereum Network." + "message": "ENS name not found on the current network. Try switching to Ethereum Mainnet." }, "enterAnAlias": { "message": "Enter an alias" @@ -904,7 +904,7 @@ "message": "Lock time is too great" }, "mainnet": { - "message": "Main Ethereum Network" + "message": "Ethereum Mainnet" }, "memorizePhrase": { "message": "Memorize this phrase." @@ -1598,7 +1598,7 @@ "message": "Transaction Time" }, "showTransactionTimeDescription": { - "message": "Select this to display pending transaction time estimates in the activity tab while on the Main Ethereum Network. Note: estimates are approximations based on network conditions." + "message": "Select this to display pending transaction time estimates in the activity tab while on the Ethereum Mainnet. Note: estimates are approximations based on network conditions." }, "transfer": { "message": "Transfer" diff --git a/app/_locales/fil/messages.json b/app/_locales/fil/messages.json index 60ff2e03f..a1c6a9faa 100644 --- a/app/_locales/fil/messages.json +++ b/app/_locales/fil/messages.json @@ -210,7 +210,7 @@ "message": "Kumokonekta sa Kovan Test Network" }, "connectingToMainnet": { - "message": "Kumokonekta sa Main Ethereum Network" + "message": "Kumokonekta sa Ethereum Mainnet" }, "connectingToRopsten": { "message": "Kumokonekta sa Ropsten Test Network" @@ -366,7 +366,7 @@ "message": "May error sa pagrerehistro ng ENS name" }, "ensNotFoundOnCurrentNetwork": { - "message": "Hindi nakita ang ENS name sa kasalukuyang network. Subukang lumipat sa Main Ethereum Network." + "message": "Hindi nakita ang ENS name sa kasalukuyang network. Subukang lumipat sa Ethereum Mainnet." }, "enterAnAlias": { "message": "Maglagay ng alias" diff --git a/app/_locales/sk/messages.json b/app/_locales/sk/messages.json index 285e4375d..5973c82cb 100644 --- a/app/_locales/sk/messages.json +++ b/app/_locales/sk/messages.json @@ -225,7 +225,7 @@ "message": "Připojuji se k Kovan Test Network" }, "connectingToMainnet": { - "message": "Připojuji se k Main Ethereum Network" + "message": "Připojuji se k Ethereum Mainnet" }, "connectingToRopsten": { "message": "Připojuji se k Ropsten Test Network" diff --git a/app/_locales/sv/messages.json b/app/_locales/sv/messages.json index 3cc07877f..2907ab6f6 100644 --- a/app/_locales/sv/messages.json +++ b/app/_locales/sv/messages.json @@ -387,7 +387,7 @@ "message": "Fel i ENS-namnregistrering" }, "ensNotFoundOnCurrentNetwork": { - "message": "ENS-namnet hittades inte i det aktuella nätverket. Prova att byta till Main Ethereum Network." + "message": "ENS-namnet hittades inte i det aktuella nätverket. Prova att byta till Ethereum Mainnet." }, "enterAnAlias": { "message": "Ange ett alias" diff --git a/app/_locales/uk/messages.json b/app/_locales/uk/messages.json index 14ff03db6..3de08a5ac 100644 --- a/app/_locales/uk/messages.json +++ b/app/_locales/uk/messages.json @@ -393,7 +393,7 @@ "message": "Помилка у реєстрації ENS ім'я" }, "ensNotFoundOnCurrentNetwork": { - "message": "Ім'я ENS не знайдено у даній мережі. Спробуйте перейти у Main Ethereum Network." + "message": "Ім'я ENS не знайдено у даній мережі. Спробуйте перейти у Ethereum Mainnet." }, "enterAnAlias": { "message": "Введіть псевдонім" diff --git a/app/scripts/controllers/network/enums.js b/app/scripts/controllers/network/enums.js index b9b2f2224..03658eab3 100644 --- a/app/scripts/controllers/network/enums.js +++ b/app/scripts/controllers/network/enums.js @@ -20,7 +20,7 @@ export const KOVAN_CHAIN_ID = '0x2a' export const ROPSTEN_DISPLAY_NAME = 'Ropsten' export const RINKEBY_DISPLAY_NAME = 'Rinkeby' export const KOVAN_DISPLAY_NAME = 'Kovan' -export const MAINNET_DISPLAY_NAME = 'Main Ethereum Network' +export const MAINNET_DISPLAY_NAME = 'Ethereum Mainnet' export const GOERLI_DISPLAY_NAME = 'Goerli' export const INFURA_PROVIDER_TYPES = [ diff --git a/test/e2e/metamask-ui.spec.js b/test/e2e/metamask-ui.spec.js index 178bf0c73..49d1292ea 100644 --- a/test/e2e/metamask-ui.spec.js +++ b/test/e2e/metamask-ui.spec.js @@ -1283,7 +1283,7 @@ describe('MetaMask', function () { await driver.clickElement(By.css('.network-name')) await driver.delay(regularDelayMs) - await driver.clickElement(By.xpath(`//span[contains(text(), 'Main Ethereum Network')]`)) + await driver.clickElement(By.xpath(`//span[contains(text(), 'Ethereum Mainnet')]`)) await driver.delay(largeDelayMs * 2) }) diff --git a/test/unit/app/controllers/network/network-controller-test.js b/test/unit/app/controllers/network/network-controller-test.js index 882c7ac54..eb480752e 100644 --- a/test/unit/app/controllers/network/network-controller-test.js +++ b/test/unit/app/controllers/network/network-controller-test.js @@ -88,7 +88,7 @@ describe('NetworkController', function () { expected: 'Kovan', }, { input: 'mainnet', - expected: 'Main Ethereum Network', + expected: 'Ethereum Mainnet', }, { input: 'goerli', expected: 'Goerli', diff --git a/ui/app/components/app/dropdowns/tests/network-dropdown.test.js b/ui/app/components/app/dropdowns/tests/network-dropdown.test.js index 5aa458ddb..6d581d09b 100644 --- a/ui/app/components/app/dropdowns/tests/network-dropdown.test.js +++ b/ui/app/components/app/dropdowns/tests/network-dropdown.test.js @@ -70,7 +70,7 @@ describe('Network Dropdown', function () { }) it('checks background color for first NetworkDropdownIcon', function () { - assert.equal(wrapper.find(NetworkDropdownIcon).at(0).prop('backgroundColor'), '#29B6AF') // Main Ethereum Network Teal + assert.equal(wrapper.find(NetworkDropdownIcon).at(0).prop('backgroundColor'), '#29B6AF') // Ethereum Mainnet Teal }) it('checks background color for second NetworkDropdownIcon', function () {