From 0fd8862c5e942778763e170a36aeb7604472c5cd Mon Sep 17 00:00:00 2001 From: Whymarrh Whitby Date: Fri, 27 Jul 2018 20:05:26 -0230 Subject: [PATCH] Don't show an additional beta UI notification When a user has opted-in to the new UI from the announcement, we don't need an additional notification letting the user know that they've switched. --- old-ui/app/components/app-bar.js | 2 +- old-ui/app/new-ui-annoucement.js | 2 -- test/e2e/beta/from-import-beta-ui.spec.js | 6 +----- test/e2e/beta/metamask-beta-ui.spec.js | 4 ---- 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/old-ui/app/components/app-bar.js b/old-ui/app/components/app-bar.js index e65f942ae..4253c5f28 100644 --- a/old-ui/app/components/app-bar.js +++ b/old-ui/app/components/app-bar.js @@ -82,7 +82,7 @@ module.exports = class AppBar extends Component { AppBar.renderSpace(), h('span.banner__link', { async onClick () { - await dispatch(actions.setFeatureFlag('betaUI', true, 'BETA_UI_NOTIFICATION_MODAL')) + await dispatch(actions.setFeatureFlag('betaUI', true)) }, }, [ 'Now', diff --git a/old-ui/app/new-ui-annoucement.js b/old-ui/app/new-ui-annoucement.js index 504016b61..a20dae2f8 100644 --- a/old-ui/app/new-ui-annoucement.js +++ b/old-ui/app/new-ui-annoucement.js @@ -15,11 +15,9 @@ module.exports = class NewUiAnnouncement extends PureComponent { switchToNewUi = async () => { const flag = 'betaUI' const enabled = true - const notificationType = 'BETA_UI_NOTIFICATION_MODAL' await this.props.dispatch(actions.setFeatureFlag( flag, enabled, - notificationType, )) await this.close() } diff --git a/test/e2e/beta/from-import-beta-ui.spec.js b/test/e2e/beta/from-import-beta-ui.spec.js index 92e5be715..06e669e5b 100644 --- a/test/e2e/beta/from-import-beta-ui.spec.js +++ b/test/e2e/beta/from-import-beta-ui.spec.js @@ -121,10 +121,6 @@ describe('Using MetaMask with an existing account', function () { await driver.switchTo().window(appTab) await delay(tinyDelayMs) - const okayBtn = await findElement(driver, By.xpath("//button[contains(text(), 'Ok')]")) - await okayBtn.click() - await delay(regularDelayMs) - await loadExtension(driver, extensionId) await delay(regularDelayMs) @@ -238,7 +234,7 @@ describe('Using MetaMask with an existing account', function () { await localhost.click() await delay(largeDelayMs * 2) }) - + it('choose Create Account from the account menu', async () => { await driver.findElement(By.css('.account-menu__icon')).click() await delay(regularDelayMs) diff --git a/test/e2e/beta/metamask-beta-ui.spec.js b/test/e2e/beta/metamask-beta-ui.spec.js index 6a169de76..98132e68c 100644 --- a/test/e2e/beta/metamask-beta-ui.spec.js +++ b/test/e2e/beta/metamask-beta-ui.spec.js @@ -120,10 +120,6 @@ describe('MetaMask', function () { await driver.switchTo().window(appTab) await delay(tinyDelayMs) - const okayBtn = await findElement(driver, By.xpath("//button[contains(text(), 'Ok')]")) - await okayBtn.click() - await delay(regularDelayMs) - await loadExtension(driver, extensionId) await delay(regularDelayMs)