diff --git a/.storybook/test-data.js b/.storybook/test-data.js index 48013e303..9150466ac 100644 --- a/.storybook/test-data.js +++ b/.storybook/test-data.js @@ -598,7 +598,7 @@ const state = { nextNonce: 71, connectedStatusPopoverHasBeenShown: true, swapsWelcomeMessageHasBeenShown: true, - defaultHomeActiveTabName: 'Assets', + defaultHomeActiveTabName: 'Tokens', providerConfig: { type: 'goerli', ticker: 'ETH', diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json index fceaa5ed5..15d67d646 100644 --- a/app/_locales/de/messages.json +++ b/app/_locales/de/messages.json @@ -398,9 +398,6 @@ "assetOptions": { "message": "Asset-Optionen" }, - "assets": { - "message": "Vermögenswerte" - }, "attemptSendingAssets": { "message": "Wenn Sie versuchen, Assets direkt von einem Netzwerk in ein anderes zu senden, kann dies zu einem dauerhaften Asset-Verlust führen. Verwenden Sie unbedingt eine Bridge." }, diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json index d17783925..39f1de4cb 100644 --- a/app/_locales/el/messages.json +++ b/app/_locales/el/messages.json @@ -398,9 +398,6 @@ "assetOptions": { "message": "Επιλογές περιουσιακών στοιχείων" }, - "assets": { - "message": "Περιουσιακά στοιχεία" - }, "attemptSendingAssets": { "message": "Εάν επιχειρήσετε να στείλετε περιουσιακά στοιχεία απευθείας από ένα δίκτυο σε ένα άλλο, αυτό ενδέχεται να οδηγήσει σε μόνιμη απώλεια περιουσιακών στοιχείων. Βεβαιωθείτε ότι χρησιμοποιείτε μια διασύνδεση." }, diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index aaea04cff..f42361800 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -441,9 +441,6 @@ "assetOptions": { "message": "Asset options" }, - "assets": { - "message": "Assets" - }, "attemptSendingAssets": { "message": "If you attempt to send assets directly from one network to another, this may result in permanent asset loss. Make sure to use a bridge." }, @@ -4569,6 +4566,9 @@ "tokenSymbol": { "message": "Token symbol" }, + "tokens": { + "message": "Tokens" + }, "tokensFoundTitle": { "message": "$1 new tokens found", "description": "$1 is the number of new tokens detected" diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json index 0661e837a..d295446a9 100644 --- a/app/_locales/es/messages.json +++ b/app/_locales/es/messages.json @@ -398,9 +398,6 @@ "assetOptions": { "message": "Opciones de activos" }, - "assets": { - "message": "Activos" - }, "attemptSendingAssets": { "message": "Si intenta enviar activos directamente de una red a otra, esto puede provocar la pérdida permanente de activos. Asegúrese de utilizar un puente." }, diff --git a/app/_locales/es_419/messages.json b/app/_locales/es_419/messages.json index 98254c6fc..9da6e0eff 100644 --- a/app/_locales/es_419/messages.json +++ b/app/_locales/es_419/messages.json @@ -229,9 +229,6 @@ "assetOptions": { "message": "Opciones de activos" }, - "assets": { - "message": "Activos" - }, "attemptingConnect": { "message": "Intentando una conexión a la cadena de bloques." }, diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json index 920ff11a7..3d13ba29f 100644 --- a/app/_locales/fr/messages.json +++ b/app/_locales/fr/messages.json @@ -398,9 +398,6 @@ "assetOptions": { "message": "Options d’actifs" }, - "assets": { - "message": "Actifs" - }, "attemptSendingAssets": { "message": "Si vous essayez d’envoyer des actifs directement d’un réseau à un autre, une perte permanente des actifs pourrait en résulter. Assurez-vous d’utiliser une passerelle." }, diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json index 7861fd19e..d8296323e 100644 --- a/app/_locales/hi/messages.json +++ b/app/_locales/hi/messages.json @@ -398,9 +398,6 @@ "assetOptions": { "message": "एसेट विकल्प" }, - "assets": { - "message": "परिसंपत्तियां" - }, "attemptSendingAssets": { "message": "यदि आप ऐसेट्स को सीधे एक नेटवर्क से दूसरे नेटवर्क पर भेजने का प्रयास करते हैं, तो इसके परिणामस्वरूप स्थायी ऐसेट्स का नुकसान हो सकता है। ब्रिज का उपयोग करना सुनिश्चित करें।" }, diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json index dd49e11ed..89d95b084 100644 --- a/app/_locales/id/messages.json +++ b/app/_locales/id/messages.json @@ -398,9 +398,6 @@ "assetOptions": { "message": "Opsi aset" }, - "assets": { - "message": "Aset" - }, "attemptSendingAssets": { "message": "Jika Anda mencoba untuk mengirim aset secara langsung dari satu jaringan ke jaringan lain, aset Anda berpotensi hilang secara permanen. Pastikan untuk menggunakan penghubung." }, diff --git a/app/_locales/it/messages.json b/app/_locales/it/messages.json index fc9e9a4d1..99d323da3 100644 --- a/app/_locales/it/messages.json +++ b/app/_locales/it/messages.json @@ -315,9 +315,6 @@ "assetOptions": { "message": "Opzioni asset" }, - "assets": { - "message": "Patrimonio" - }, "attemptSendingAssets": { "message": "Se si tenta di inviare risorse direttamente da una rete all'altra, ciò potrebbe comportare una perdita permanente della risorca coinvolta. Assicurati di usare un bridge." }, diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json index 6121b09dd..c8239d428 100644 --- a/app/_locales/ja/messages.json +++ b/app/_locales/ja/messages.json @@ -398,9 +398,6 @@ "assetOptions": { "message": "アセットのオプション" }, - "assets": { - "message": "アセット" - }, "attemptSendingAssets": { "message": "1 つのネットワークから別のネットワークに直接アセットを送ろうとすると、アセットが永久に失われる可能性があります。必ずブリッジを使用してください。" }, diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json index 61a439b52..a3ba4ac66 100644 --- a/app/_locales/ko/messages.json +++ b/app/_locales/ko/messages.json @@ -398,9 +398,6 @@ "assetOptions": { "message": "자산 옵션" }, - "assets": { - "message": "자산" - }, "attemptSendingAssets": { "message": "한 네트워크에서 다른 네트워크로 자산을 직접 전송하면 자산이 영구적으로 손실될 수 있습니다. 반드시 브릿지를 이용하세요." }, diff --git a/app/_locales/ph/messages.json b/app/_locales/ph/messages.json index ca47dc905..c6e24bd52 100644 --- a/app/_locales/ph/messages.json +++ b/app/_locales/ph/messages.json @@ -140,9 +140,6 @@ "assetOptions": { "message": "Mga opsyon sa asset" }, - "assets": { - "message": "Mga Asset" - }, "attemptingConnect": { "message": "Sinusubukang kumonekta sa blockchain." }, diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json index 93adcfea8..9d8b72031 100644 --- a/app/_locales/pt/messages.json +++ b/app/_locales/pt/messages.json @@ -398,9 +398,6 @@ "assetOptions": { "message": "Opções do ativo" }, - "assets": { - "message": "Ativos" - }, "attemptSendingAssets": { "message": "Se você tentar enviar ativos diretamente de uma rede para outra, isso poderá resultar na perda permanente deles. Certifique-se de usar uma ponte." }, diff --git a/app/_locales/pt_BR/messages.json b/app/_locales/pt_BR/messages.json index 6c949ccfc..d47d2a597 100644 --- a/app/_locales/pt_BR/messages.json +++ b/app/_locales/pt_BR/messages.json @@ -229,9 +229,6 @@ "assetOptions": { "message": "Opções do ativo" }, - "assets": { - "message": "Ativos" - }, "attemptingConnect": { "message": "Tentando conexão com o blockchain." }, diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json index 03d546df9..a10f43afd 100644 --- a/app/_locales/ru/messages.json +++ b/app/_locales/ru/messages.json @@ -398,9 +398,6 @@ "assetOptions": { "message": "Параметры актива" }, - "assets": { - "message": "Активы" - }, "attemptSendingAssets": { "message": "Попытка отправки активов напрямую из одной сети в другую может привести к необратимой потере активов. Следует использовать мост." }, diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json index bb47c161f..b70460686 100644 --- a/app/_locales/tl/messages.json +++ b/app/_locales/tl/messages.json @@ -398,9 +398,6 @@ "assetOptions": { "message": "Mga opsyon ng asset" }, - "assets": { - "message": "Mga Asset" - }, "attemptSendingAssets": { "message": "Kung tatangkain mong magpadala ng mga asset nang direkta mula sa isang network papunta sa isa pa, maaari itong magresulta sa permanenteng pagkawala ng asset. Siguraduhing gumamit ng tulay." }, diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json index ebabab1c7..6fb5b1b72 100644 --- a/app/_locales/tr/messages.json +++ b/app/_locales/tr/messages.json @@ -398,9 +398,6 @@ "assetOptions": { "message": "Varlık seçenekleri" }, - "assets": { - "message": "Varlıklar" - }, "attemptSendingAssets": { "message": "Varlıkları doğrudan bir ağdan diğerine göndermeye çalışırsanız bu durum kalıcı varlık kaybına neden olabilir. Bir köprü kullandığınızdan emin olun." }, diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json index 120efa397..0283a434a 100644 --- a/app/_locales/vi/messages.json +++ b/app/_locales/vi/messages.json @@ -398,9 +398,6 @@ "assetOptions": { "message": "Tùy chọn tài sản" }, - "assets": { - "message": "Tài sản" - }, "attemptSendingAssets": { "message": "Nếu bạn cố gắng gửi tài sản trực tiếp từ mạng này sang mạng khác, bạn có thể bị mất tài sản vĩnh viễn. Hãy nhớ sử dụng cầu nối." }, diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json index ffe567145..348cdbf78 100644 --- a/app/_locales/zh_CN/messages.json +++ b/app/_locales/zh_CN/messages.json @@ -398,9 +398,6 @@ "assetOptions": { "message": "资产选项" }, - "assets": { - "message": "资产" - }, "attemptSendingAssets": { "message": "如果您试图将资产从一个网络直接发送到另一个网络，这可能会导致永久的资产损失。必须使用桥来进行。" }, diff --git a/app/_locales/zh_TW/messages.json b/app/_locales/zh_TW/messages.json index 486ea922d..fedf06a65 100644 --- a/app/_locales/zh_TW/messages.json +++ b/app/_locales/zh_TW/messages.json @@ -139,9 +139,6 @@ "assetOptions": { "message": "資產選項" }, - "assets": { - "message": "資產" - }, "attemptingConnect": { "message": "正在嘗試連結區塊鏈。" }, diff --git a/test/e2e/metamask-ui.spec.js b/test/e2e/metamask-ui.spec.js index 1a03f024b..4182dd6f2 100644 --- a/test/e2e/metamask-ui.spec.js +++ b/test/e2e/metamask-ui.spec.js @@ -430,7 +430,7 @@ describe('MetaMask', function () { it('checks balance', async function () { await driver.clickElement({ - text: 'Assets', + text: 'Tokens', tag: 'button', }); diff --git a/test/e2e/tests/add-hide-token.spec.js b/test/e2e/tests/add-hide-token.spec.js index 688823081..74b66f130 100644 --- a/test/e2e/tests/add-hide-token.spec.js +++ b/test/e2e/tests/add-hide-token.spec.js @@ -57,7 +57,7 @@ describe('Hide token', function () { let assets = await driver.findElements('.asset-list-item'); assert.equal(assets.length, 2); - await driver.clickElement({ text: 'Assets', tag: 'button' }); + await driver.clickElement({ text: 'Tokens', tag: 'button' }); await driver.clickElement({ text: 'TST', tag: 'span' }); diff --git a/test/e2e/tests/custom-token-add-approve.spec.js b/test/e2e/tests/custom-token-add-approve.spec.js index a02a8c856..086651f87 100644 --- a/test/e2e/tests/custom-token-add-approve.spec.js +++ b/test/e2e/tests/custom-token-add-approve.spec.js @@ -44,7 +44,7 @@ describe('Create token, approve token and approve token without gas', function ( // imports custom token from extension await driver.switchToWindow(extension); await driver.clickElement(`[data-testid="home__asset-tab"]`); - await driver.clickElement({ tag: 'button', text: 'Assets' }); + await driver.clickElement({ tag: 'button', text: 'Tokens' }); await driver.clickElement({ text: 'import tokens', tag: 'a' }); await driver.clickElement({ @@ -68,7 +68,7 @@ describe('Create token, approve token and approve token without gas', function ( // renders balance for newly created token await driver.clickElement('.app-header__logo-container'); - await driver.clickElement({ tag: 'button', text: 'Assets' }); + await driver.clickElement({ tag: 'button', text: 'Tokens' }); const asset = await driver.waitForSelector({ css: '.asset-list-item__token-value', text: '10', diff --git a/ui/pages/home/home.component.js b/ui/pages/home/home.component.js index 8b8206020..9c84bbab8 100644 --- a/ui/pages/home/home.component.js +++ b/ui/pages/home/home.component.js @@ -812,8 +812,8 @@ export default class Home extends PureComponent { activeClassName="home__tab--active" className="home__tab" data-testid="home__asset-tab" - name={this.context.t('assets')} - tabKey="assets" + name={this.context.t('tokens')} + tabKey="tokens" > {process.env.MULTICHAIN ? (