From 4ac4790cfa801ec5e560fad15fd255c5ba850e82 Mon Sep 17 00:00:00 2001 From: Mark Stacey Date: Thu, 11 Jun 2020 17:14:07 -0300 Subject: [PATCH] Rename 'History' tab to 'Activity' (#8785) 'Activity' is a better name for this tab because it contains more than just transactions. Signature requests are also included, and more non- transaction activity may be included in the future. --- app/_locales/en/messages.json | 3 +++ test/e2e/address-book.spec.js | 2 +- test/e2e/from-import-ui.spec.js | 2 +- test/e2e/metamask-responsive-ui.spec.js | 2 +- test/e2e/metamask-ui.spec.js | 2 +- test/e2e/send-edit.spec.js | 2 +- test/e2e/tests/simple-send.spec.js | 2 +- ui/app/pages/home/home.component.js | 4 ++-- 8 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index b5a61c18e..c9710f688 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -148,6 +148,9 @@ "accountSelectionRequired": { "message": "You need to select an account!" }, + "activity": { + "message": "Activity" + }, "activityLog": { "message": "activity log" }, diff --git a/test/e2e/address-book.spec.js b/test/e2e/address-book.spec.js index 6d21eed6f..04ea4a14c 100644 --- a/test/e2e/address-book.spec.js +++ b/test/e2e/address-book.spec.js @@ -195,7 +195,7 @@ describe('MetaMask', function () { }) it('finds the transaction in the transactions list', async function () { - await driver.clickElement(By.css('[data-testid="home__history-tab"]')) + await driver.clickElement(By.css('[data-testid="home__activity-tab"]')) await driver.wait(async () => { const confirmedTxes = await driver.findElements(By.css('.transaction-list__completed-transactions .transaction-list-item')) return confirmedTxes.length === 1 diff --git a/test/e2e/from-import-ui.spec.js b/test/e2e/from-import-ui.spec.js index fde21cec2..cb8da4a45 100644 --- a/test/e2e/from-import-ui.spec.js +++ b/test/e2e/from-import-ui.spec.js @@ -215,7 +215,7 @@ describe('Using MetaMask with an existing account', function () { }) it('finds the transaction in the transactions list', async function () { - await driver.clickElement(By.css('[data-testid="home__history-tab"]')) + await driver.clickElement(By.css('[data-testid="home__activity-tab"]')) await driver.wait(async () => { const confirmedTxes = await driver.findElements(By.css('.transaction-list__completed-transactions .transaction-list-item')) return confirmedTxes.length === 1 diff --git a/test/e2e/metamask-responsive-ui.spec.js b/test/e2e/metamask-responsive-ui.spec.js index edd10758e..0969af53f 100644 --- a/test/e2e/metamask-responsive-ui.spec.js +++ b/test/e2e/metamask-responsive-ui.spec.js @@ -211,7 +211,7 @@ describe('MetaMask', function () { }) it('finds the transaction in the transactions list', async function () { - await driver.clickElement(By.css('[data-testid="home__history-tab"]')) + await driver.clickElement(By.css('[data-testid="home__activity-tab"]')) await driver.wait(async () => { const confirmedTxes = await driver.findElements(By.css('.transaction-list__completed-transactions .transaction-list-item')) return confirmedTxes.length === 1 diff --git a/test/e2e/metamask-ui.spec.js b/test/e2e/metamask-ui.spec.js index 3a2677405..7f1517362 100644 --- a/test/e2e/metamask-ui.spec.js +++ b/test/e2e/metamask-ui.spec.js @@ -266,7 +266,7 @@ describe('MetaMask', function () { }) it('finds the transaction in the transactions list', async function () { - await driver.clickElement(By.css('[data-testid="home__history-tab"]')) + await driver.clickElement(By.css('[data-testid="home__activity-tab"]')) await driver.wait(async () => { const confirmedTxes = await driver.findElements(By.css('.transaction-list__completed-transactions .transaction-list-item')) return confirmedTxes.length === 1 diff --git a/test/e2e/send-edit.spec.js b/test/e2e/send-edit.spec.js index 891dcc3b8..48ee97cb0 100644 --- a/test/e2e/send-edit.spec.js +++ b/test/e2e/send-edit.spec.js @@ -197,7 +197,7 @@ describe('Using MetaMask with an existing account', function () { }) it('finds the transaction in the transactions list', async function () { - await driver.clickElement(By.css('[data-testid="home__history-tab"]')) + await driver.clickElement(By.css('[data-testid="home__activity-tab"]')) await driver.wait(async () => { const confirmedTxes = await driver.findElements(By.css('.transaction-list__completed-transactions .transaction-list-item')) return confirmedTxes.length === 1 diff --git a/test/e2e/tests/simple-send.spec.js b/test/e2e/tests/simple-send.spec.js index d40ee8e8d..0b48916a7 100644 --- a/test/e2e/tests/simple-send.spec.js +++ b/test/e2e/tests/simple-send.spec.js @@ -22,7 +22,7 @@ describe('MetaMask Browser Extension', function () { await amountField.sendKeys('1') await driver.clickElement(By.css('[data-testid="page-container-footer-next"]')) await driver.clickElement(By.css('[data-testid="page-container-footer-next"]')) - await driver.clickElement(By.css('[data-testid="home__history-tab"]')) + await driver.clickElement(By.css('[data-testid="home__activity-tab"]')) await driver.findElement(By.css('.transaction-list-item')) }) }) diff --git a/ui/app/pages/home/home.component.js b/ui/app/pages/home/home.component.js index 81e583985..4f470ebab 100644 --- a/ui/app/pages/home/home.component.js +++ b/ui/app/pages/home/home.component.js @@ -247,8 +247,8 @@ export default class Home extends PureComponent {