Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine

package-lock.json

@@ -8777,16 +8777,16 @@
       "integrity": "sha1-x7kULEtZUJsziiBLYyiupA3Txk4="
     },
     "ethjs": {
-      "version": "0.3.6",
+      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/ethjs/-/ethjs-0.3.6.tgz",
+      "resolved": "https://registry.npmjs.org/ethjs/-/ethjs-0.4.0.tgz",
-      "integrity": "sha512-9ojnSkV5XXSM5vo0pKgZpE+SNBPxqSUN0dZmMP5dBZVFOYctRd9tfaZ80Jnde3M4JrfUhhkbG5QFvewitaAY7Q==",
+      "integrity": "sha512-UnQeRMpQ+JETN2FviexEskUwByid+eO8rybjPnk2DNUzjUn0VKNrUbiCAud7Es6otDFwjUeOS58vMZwkZxIIog==",
       "requires": {
         "bn.js": "4.11.6",
         "ethjs-abi": "0.2.1",
-        "ethjs-contract": "0.1.9",
+        "ethjs-contract": "0.2.3",
-        "ethjs-filter": "0.1.5",
+        "ethjs-filter": "0.1.8",
         "ethjs-provider-http": "0.1.6",
-        "ethjs-query": "0.3.4",
+        "ethjs-query": "0.3.8",
         "ethjs-unit": "0.1.6",
         "ethjs-util": "0.1.3",
         "js-sha3": "0.5.5",
@@ -8809,12 +8809,13 @@
           }
         },
         "ethjs-contract": {
-          "version": "0.1.9",
+          "version": "0.2.3",
-          "resolved": "https://registry.npmjs.org/ethjs-contract/-/ethjs-contract-0.1.9.tgz",
+          "resolved": "https://registry.npmjs.org/ethjs-contract/-/ethjs-contract-0.2.3.tgz",
-          "integrity": "sha1-HCdmiWpW1H7B1tZhgpxJzDilUgo=",
+          "integrity": "sha512-fKsHm57wxwHrZhVlD8AHU2lC2G3c1fmvoEz15BpqIkuGWiTbjuvrQo2Avc+3EQpSsTFWNdyxC0h1WKRcn5kkyQ==",
           "requires": {
+            "babel-runtime": "6.26.0",
             "ethjs-abi": "0.2.0",
-            "ethjs-filter": "0.1.5",
+            "ethjs-filter": "0.1.8",
             "ethjs-util": "0.1.3",
             "js-sha3": "0.5.5"
           },
@@ -8831,6 +8832,30 @@
             }
           }
         },
+        "ethjs-filter": {
+          "version": "0.1.8",
+          "resolved": "https://registry.npmjs.org/ethjs-filter/-/ethjs-filter-0.1.8.tgz",
+          "integrity": "sha512-qTDPskDL2UadHwjvM8A+WG9HwM4/FoSY3p3rMJORkHltYcAuiQZd2otzOYKcL5w2Q3sbAkW/E3yt/FPFL/AVXA=="
+        },
+        "ethjs-query": {
+          "version": "0.3.8",
+          "resolved": "https://registry.npmjs.org/ethjs-query/-/ethjs-query-0.3.8.tgz",
+          "integrity": "sha512-/J5JydqrOzU8O7VBOwZKUWXxHDGr46VqNjBCJgBVNNda+tv7Xc8Y2uJc6aMHHVbeN3YOQ7YRElgIc0q1CI02lQ==",
+          "requires": {
+            "babel-runtime": "6.26.0",
+            "ethjs-format": "0.2.7",
+            "ethjs-rpc": "0.2.0",
+            "promise-to-callback": "1.0.0"
+          }
+        },
+        "ethjs-rpc": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/ethjs-rpc/-/ethjs-rpc-0.2.0.tgz",
+          "integrity": "sha512-RINulkNZTKnj4R/cjYYtYMnFFaBcVALzbtEJEONrrka8IeoarNB9Jbzn+2rT00Cv8y/CxAI+GgY1d0/i2iQeOg==",
+          "requires": {
+            "promise-to-callback": "1.0.0"
+          }
+        },
         "ethjs-util": {
           "version": "0.1.3",
           "resolved": "https://registry.npmjs.org/ethjs-util/-/ethjs-util-0.1.3.tgz",

package.json

@@ -14,7 +14,9 @@
     "test:integration": "npm run test:integration:build && npm run test:flat && npm run test:mascara",
     "test:integration:build": "gulp build:scss",
     "test:e2e:chrome": "shell-parallel -s 'npm run ganache:start' -x 'sleep 3 && npm run test:e2e:run:chrome'",
+    "test:e2e:chrome:beta": "SELENIUM_BROWSER=chrome test/e2e/beta/run-all.sh",
     "test:e2e:firefox": "shell-parallel -s 'npm run ganache:start' -x 'sleep 3 && npm run test:e2e:run:firefox'",
+    "test:e2e:firefox:beta": "SELENIUM_BROWSER=firefox test/e2e/beta/run-all.sh",
     "test:e2e:run:chrome": "SELENIUM_BROWSER=chrome mocha test/e2e/metamask.spec --bail --recursive",
     "test:e2e:run:firefox": "SELENIUM_BROWSER=firefox mocha test/e2e/metamask.spec --bail --recursive",
     "test:screens": "shell-parallel -s 'npm run ganache:start' -x 'sleep 3 && npm run test:screens:run'",
@@ -108,7 +110,7 @@
     "ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9",
     "ethereumjs-wallet": "^0.6.0",
     "etherscan-link": "^1.0.2",
-    "ethjs": "^0.3.4",
+    "ethjs": "^0.4.0",
     "ethjs-contract": "^0.2.0",
     "ethjs-ens": "^2.0.0",
     "ethjs-query": "^0.3.4",

test/e2e/beta/from-import-beta-ui.spec.js

@@ -0,0 +1,406 @@
+const path = require('path')
+const assert = require('assert')
+const webdriver = require('selenium-webdriver')
+const { By, Key } = webdriver
+const {
+  delay,
+  buildChromeWebDriver,
+  buildFirefoxWebdriver,
+  installWebExt,
+  getExtensionIdChrome,
+  getExtensionIdFirefox,
+} = require('../func')
+const {
+  checkBrowserForConsoleErrors,
+  loadExtension,
+  verboseReportOnFailure,
+} = require('./helpers')
+
+describe('Using MetaMask with an existing account', function () {
+  let extensionId
+  let driver
+  let tokenAddress
+
+  const testSeedPhrase = 'phrase upgrade clock rough situate wedding elder clever doctor stamp excess tent'
+  const testAddress = '0xE18035BF8712672935FDB4e5e431b1a0183d2DFC'
+  const regularDelayMs = 1000
+  const largeDelayMs = regularDelayMs * 2
+  const waitingNewPageDelayMs = regularDelayMs * 10
+
+  this.timeout(0)
+  this.bail(true)
+
+  before(async function () {
+    switch (process.env.SELENIUM_BROWSER) {
+      case 'chrome': {
+        const extensionPath = path.resolve('dist/chrome')
+        driver = buildChromeWebDriver(extensionPath)
+        extensionId = await getExtensionIdChrome(driver)
+        await driver.get(`chrome-extension://${extensionId}/popup.html`)
+        await delay(regularDelayMs)
+        break
+      }
+      case 'firefox': {
+        const extensionPath = path.resolve('dist/firefox')
+        driver = buildFirefoxWebdriver()
+        await installWebExt(driver, extensionPath)
+        await delay(regularDelayMs)
+        extensionId = await getExtensionIdFirefox(driver)
+        await driver.get(`moz-extension://${extensionId}/popup.html`)
+        await delay(regularDelayMs)
+        break
+      }
+    }
+  })
+
+  afterEach(async function () {
+    if (process.env.SELENIUM_BROWSER === 'chrome') {
+      const errors = await checkBrowserForConsoleErrors(driver)
+      if (errors.length) {
+        const errorReports = errors.map(err => err.message)
+        const errorMessage = `Errors found in browser console:\n${errorReports.join('\n')}`
+        console.error(new Error(errorMessage))
+      }
+    }
+    if (this.currentTest.state === 'failed') {
+      await verboseReportOnFailure(driver, this.currentTest)
+    }
+  })
+
+  after(async function () {
+    await driver.quit()
+  })
+
+  describe('New UI setup', async function () {
+    it('switches to first tab', async function () {
+      const [firstTab] = await driver.getAllWindowHandles()
+      await driver.switchTo().window(firstTab)
+      await delay(regularDelayMs)
+    })
+
+    it('use the local network', async function () {
+      const [networkSelector] = await driver.findElements(By.css('#network_component'))
+      await networkSelector.click()
+      await delay(regularDelayMs)
+
+      const [localhost] = await driver.findElements(By.xpath(`//li[contains(text(), 'Localhost')]`))
+      await localhost.click()
+      await delay(regularDelayMs)
+    })
+
+    it('selects the new UI option', async () => {
+      const button = await driver.findElement(By.xpath("//p[contains(text(), 'Try Beta Version')]"))
+      await button.click()
+      await delay(regularDelayMs)
+
+      // Close all other tabs
+      const [oldUi, infoPage, newUi] = await driver.getAllWindowHandles()
+      await driver.switchTo().window(oldUi)
+      await driver.close()
+      await driver.switchTo().window(infoPage)
+      await driver.close()
+      await driver.switchTo().window(newUi)
+      await delay(regularDelayMs)
+
+      const [continueBtn] = await driver.findElements(By.css('.welcome-screen__button'))
+      await continueBtn.click()
+      await delay(regularDelayMs)
+    })
+  })
+
+  describe('First time flow starting from an existing seed phrase', () => {
+    it('imports a seed phrase', async () => {
+      const [seedPhrase] = await driver.findElements(By.xpath(`//a[contains(text(), 'Import with seed phrase')]`))
+      await seedPhrase.click()
+      await delay(regularDelayMs)
+
+      const [seedTextArea] = await driver.findElements(By.css('textarea.import-account__secret-phrase'))
+      await seedTextArea.sendKeys(testSeedPhrase)
+      await delay(regularDelayMs)
+
+      const [password] = await driver.findElements(By.id('password'))
+      await password.sendKeys('correct horse battery staple')
+      const [confirmPassword] = await driver.findElements(By.id('confirm-password'))
+      confirmPassword.sendKeys('correct horse battery staple')
+
+      const [importButton] = await driver.findElements(By.xpath(`//button[contains(text(), 'Import')]`))
+      await importButton.click()
+      await delay(regularDelayMs)
+    })
+
+    it('clicks through the privacy notice', async () => {
+      const [nextScreen] = await driver.findElements(By.css('.tou button'))
+      await nextScreen.click()
+      await delay(regularDelayMs)
+
+      const canClickThrough = await driver.findElement(By.css('.tou button')).isEnabled()
+      assert.equal(canClickThrough, false, 'disabled continue button')
+      const element = await driver.findElement(By.linkText('Attributions'))
+      await driver.executeScript('arguments[0].scrollIntoView(true)', element)
+      await delay(regularDelayMs)
+
+      const [acceptTos] = await driver.findElements(By.css('.tou button'))
+      await acceptTos.click()
+      await delay(regularDelayMs)
+    })
+  })
+
+  describe('Show account information', () => {
+    it('shows the correct account address', async () => {
+      await driver.findElement(By.css('.wallet-view__details-button')).click()
+      await driver.findElement(By.css('.qr-wrapper')).isDisplayed()
+      await delay(regularDelayMs)
+
+      const [address] = await driver.findElements(By.css('input.qr-ellip-address'))
+      assert.equal(await address.getAttribute('value'), testAddress)
+
+      await driver.executeScript("document.querySelector('.account-modal-close').click()")
+      await delay(largeDelayMs)
+    })
+
+    it('shows a QR code for the account', async () => {
+      await driver.findElement(By.css('.wallet-view__details-button')).click()
+      await driver.findElement(By.css('.qr-wrapper')).isDisplayed()
+      await delay(regularDelayMs)
+
+      await driver.executeScript("document.querySelector('.account-modal-close').click()")
+      await delay(regularDelayMs)
+    })
+  })
+
+  describe('Log out and log back in', () => {
+    it('logs out of the account', async () => {
+      await driver.findElement(By.css('.account-menu__icon')).click()
+      await delay(regularDelayMs)
+
+      const [logoutButton] = await driver.findElements(By.css('.account-menu__logout-button'))
+      assert.equal(await logoutButton.getText(), 'Log out')
+      await logoutButton.click()
+      await delay(regularDelayMs)
+    })
+
+    it('accepts the account password after lock', async () => {
+      await driver.findElement(By.id('password')).sendKeys('correct horse battery staple')
+      await driver.findElement(By.id('password')).sendKeys(Key.ENTER)
+      await delay(largeDelayMs)
+    })
+  })
+
+  describe('Add an account', () => {
+    it('choose Create Account from the account menu', async () => {
+      await driver.findElement(By.css('.account-menu__icon')).click()
+      await delay(regularDelayMs)
+
+      const [createAccount] = await driver.findElements(By.xpath(`//div[contains(text(), 'Create Account')]`))
+      await createAccount.click()
+      await delay(regularDelayMs)
+    })
+
+    it('set account name', async () => {
+      const [accountName] = await driver.findElements(By.css('.new-account-create-form input'))
+      await accountName.sendKeys('2nd account')
+      await delay(regularDelayMs)
+
+      const [createButton] = await driver.findElements(By.xpath(`//button[contains(text(), 'Create')]`))
+      await createButton.click()
+      await delay(regularDelayMs)
+    })
+
+    it('should show the correct account name', async () => {
+      const [accountName] = await driver.findElements(By.css('.account-name'))
+      assert.equal(await accountName.getText(), '2nd account')
+      await delay(regularDelayMs)
+    })
+  })
+
+  describe('Switch back to original account', () => {
+    it('chooses the original account from the account menu', async () => {
+      await driver.findElement(By.css('.account-menu__icon')).click()
+      await delay(regularDelayMs)
+
+      const [originalAccountMenuItem] = await driver.findElements(By.css('.account-menu__name'))
+      await originalAccountMenuItem.click()
+      await delay(regularDelayMs)
+    })
+  })
+
+  describe('Send ETH from inside MetaMask', () => {
+    it('starts to send a transaction', async function () {
+      const [sendButton] = await driver.findElements(By.xpath(`//button[contains(text(), 'Send')]`))
+      await sendButton.click()
+      await delay(regularDelayMs)
+
+      const [inputAddress] = await driver.findElements(By.css('input[placeholder="Recipient Address"]'))
+      const [inputAmount] = await driver.findElements(By.css('.currency-display__input'))
+      await inputAddress.sendKeys('0x2f318C334780961FB129D2a6c30D0763d9a5C970')
+      await inputAmount.sendKeys('1')
+
+      // Set the gas limit
+      const [configureGas] = await driver.findElements(By.css('.send-v2__gas-fee-display button'))
+      await configureGas.click()
+      await delay(regularDelayMs)
+
+      const [save] = await driver.findElements(By.xpath(`//button[contains(text(), 'Save')]`))
+      await save.click()
+      await delay(regularDelayMs)
+
+      // Continue to next screen
+      const [nextScreen] = await driver.findElements(By.xpath(`//button[contains(text(), 'Next')]`))
+      await nextScreen.click()
+      await delay(regularDelayMs)
+    })
+
+    it('confirms the transaction', async function () {
+      const [confirmButton] = await driver.findElements(By.xpath(`//button[contains(text(), 'Confirm')]`))
+      await confirmButton.click()
+      await delay(regularDelayMs)
+    })
+
+    it('finds the transaction in the transactions list', async function () {
+      const transactions = await driver.findElements(By.css('.tx-list-item'))
+      assert.equal(transactions.length, 1)
+
+      const txValues = await driver.findElements(By.css('.tx-list-value'))
+      assert.equal(txValues.length, 1)
+      assert.equal(await txValues[0].getText(), '1 ETH')
+    })
+  })
+
+  describe('Send ETH from Faucet', () => {
+    it('starts a send transaction inside Faucet', async () => {
+      await driver.executeScript('window.open("https://faucet.metamask.io")')
+      await delay(waitingNewPageDelayMs)
+
+      const [extension, faucet] = await driver.getAllWindowHandles()
+      await driver.switchTo().window(faucet)
+      await delay(regularDelayMs)
+
+      const [send1eth] = await driver.findElements(By.xpath(`//button[contains(text(), '10 ether')]`))
+      await send1eth.click()
+      await delay(regularDelayMs)
+
+      await driver.switchTo().window(extension)
+      await loadExtension(driver, extensionId)
+      await delay(regularDelayMs)
+
+      const [confirmButton] = await driver.findElements(By.xpath(`//button[contains(text(),'Confirm')]`))
+      await confirmButton.click()
+      await delay(regularDelayMs)
+
+      await driver.switchTo().window(faucet)
+      await delay(regularDelayMs)
+      await driver.close()
+      await delay(regularDelayMs)
+      await driver.switchTo().window(extension)
+      await delay(regularDelayMs)
+      await loadExtension(driver, extensionId)
+      await delay(regularDelayMs)
+    })
+  })
+
+  describe('Add existing token using search', () => {
+    it('clicks on the Add Token button', async () => {
+      const [addToken] = await driver.findElements(By.xpath(`//button[contains(text(), 'Add Token')]`))
+      await addToken.click()
+      await delay(regularDelayMs)
+    })
+
+    it('picks an existing token', async () => {
+      const [tokenSearch] = await driver.findElements(By.css('input.add-token__input'))
+      await tokenSearch.sendKeys('BAT')
+      await delay(regularDelayMs)
+
+      const [token] = await driver.findElements(By.xpath("//div[contains(text(), 'BAT')]"))
+      await token.click()
+      await delay(regularDelayMs)
+
+      const [nextScreen] = await driver.findElements(By.xpath(`//button[contains(text(), 'Next')]`))
+      await nextScreen.click()
+      await delay(regularDelayMs)
+
+      const [addTokens] = await driver.findElements(By.xpath(`//button[contains(text(), 'Add Tokens')]`))
+      await addTokens.click()
+      await delay(largeDelayMs)
+    })
+
+    it('renders the balance for the new token', async () => {
+      const balance = await driver.findElement(By.css('.tx-view .balance-display .token-amount'))
+      const tokenAmount = await balance.getText()
+      assert.equal(tokenAmount, '0BAT')
+      await delay(regularDelayMs)
+    })
+  })
+
+  describe('Add a custom token from TokenFactory', () => {
+    it('creates a new token', async () => {
+      await driver.executeScript('window.open("https://tokenfactory.surge.sh/#/factory")')
+      await delay(waitingNewPageDelayMs)
+
+      const [extension, tokenFactory] = await driver.getAllWindowHandles()
+      await driver.switchTo().window(tokenFactory)
+      const [
+        totalSupply,
+        tokenName,
+        tokenDecimal,
+        tokenSymbol,
+      ] = await driver.findElements(By.css('input'))
+
+      await totalSupply.sendKeys('100')
+      await tokenName.sendKeys('Test')
+      await tokenDecimal.sendKeys('0')
+      await tokenSymbol.sendKeys('TST')
+
+      const [createToken] = await driver.findElements(By.xpath(`//button[contains(text(), 'Create Token')]`))
+      await createToken.click()
+      await delay(regularDelayMs)
+
+      await driver.switchTo().window(extension)
+      await loadExtension(driver, extensionId)
+      await delay(regularDelayMs)
+
+      const [confirmButton] = await driver.findElements(By.xpath(`//button[contains(text(),'Confirm')]`))
+      await confirmButton.click()
+      await delay(regularDelayMs)
+
+      await driver.switchTo().window(tokenFactory)
+      await delay(regularDelayMs)
+      const tokenContactAddress = await driver.findElement(By.css('div > div > div:nth-child(2) > span:nth-child(3)'))
+      tokenAddress = await tokenContactAddress.getText()
+      await driver.close()
+      await driver.switchTo().window(extension)
+      await loadExtension(driver, extensionId)
+      await delay(regularDelayMs)
+    })
+
+    it('clicks on the Add Token button', async () => {
+      const [addToken] = await driver.findElements(By.xpath(`//button[contains(text(), 'Add Token')]`))
+      await addToken.click()
+      await delay(regularDelayMs)
+    })
+
+    it('picks the new Test token', async () => {
+      const [addCustomToken] = await driver.findElements(By.xpath("//div[contains(text(), 'Custom Token')]"))
+      await addCustomToken.click()
+      await delay(regularDelayMs)
+
+      const [newTokenAddress] = await driver.findElements(By.css('.add-token__add-custom-form input'))
+      await newTokenAddress.sendKeys(tokenAddress)
+      await delay(regularDelayMs)
+
+      const [nextScreen] = await driver.findElements(By.xpath(`//button[contains(text(), 'Next')]`))
+      await nextScreen.click()
+      await delay(regularDelayMs)
+
+      const [addTokens] = await driver.findElements(By.xpath(`//button[contains(text(), 'Add Tokens')]`))
+      await addTokens.click()
+      await delay(regularDelayMs)
+    })
+
+    it('renders the balance for the new token', async () => {
+      const [balance] = await driver.findElements(By.css('.tx-view .balance-display .token-amount'))
+      const tokenAmount = await balance.getText()
+      assert.equal(tokenAmount, '100TST')
+      await delay(regularDelayMs)
+    })
+  })
+})

test/e2e/beta/helpers.js

@@ -0,0 +1,55 @@
+const fs = require('fs')
+const mkdirp = require('mkdirp')
+const pify = require('pify')
+
+module.exports = {
+  checkBrowserForConsoleErrors,
+  loadExtension,
+  verboseReportOnFailure,
+}
+
+async function loadExtension (driver, extensionId) {
+  switch (process.env.SELENIUM_BROWSER) {
+    case 'chrome': {
+      await driver.get(`chrome-extension://${extensionId}/home.html`)
+      break
+    }
+    case 'firefox': {
+      await driver.get(`moz-extension://${extensionId}/home.html`)
+      break
+    }
+  }
+}
+
+async function checkBrowserForConsoleErrors (driver) {
+  const ignoredLogTypes = ['WARNING']
+  const ignoredErrorMessages = [
+    // React throws error warnings on "dataset", but still sets the data-* properties correctly
+    'Warning: Unknown prop `dataset` on ',
+    // Third-party Favicon 404s show up as errors
+    'favicon.ico - Failed to load resource: the server responded with a status of 404 (Not Found)',
+    // React Development build - known issue blocked by test build sys
+    'Warning: It looks like you\'re using a minified copy of the development build of React.',
+    // Redux Development build - known issue blocked by test build sys
+    'This means that you are running a slower development build of Redux.',
+  ]
+  const browserLogs = await driver.manage().logs().get('browser')
+  const errorEntries = browserLogs.filter(entry => !ignoredLogTypes.includes(entry.level.toString()))
+  const errorObjects = errorEntries.map(entry => entry.toJSON())
+  return errorObjects.filter(entry => !ignoredErrorMessages.some(message => entry.message.includes(message)))
+}
+
+async function verboseReportOnFailure (driver, test) {
+  let artifactDir
+  if (process.env.SELENIUM_BROWSER === 'chrome') {
+    artifactDir = `./test-artifacts/chrome/${test.title}`
+  } else if (process.env.SELENIUM_BROWSER === 'firefox') {
+    artifactDir = `./test-artifacts/firefox/${test.title}`
+  }
+  const filepathBase = `${artifactDir}/test-failure`
+  await pify(mkdirp)(artifactDir)
+  const screenshot = await driver.takeScreenshot()
+  await pify(fs.writeFile)(`${filepathBase}-screenshot.png`, screenshot, { encoding: 'base64' })
+  const htmlSource = await driver.getPageSource()
+  await pify(fs.writeFile)(`${filepathBase}-dom.html`, htmlSource)
+}

test/e2e/beta/metamask-beta-ui.spec.js

@@ -0,0 +1,491 @@
+const path = require('path')
+const assert = require('assert')
+const webdriver = require('selenium-webdriver')
+const { By, Key } = webdriver
+const {
+  delay,
+  buildChromeWebDriver,
+  buildFirefoxWebdriver,
+  installWebExt,
+  getExtensionIdChrome,
+  getExtensionIdFirefox,
+} = require('../func')
+const {
+  checkBrowserForConsoleErrors,
+  loadExtension,
+  verboseReportOnFailure,
+} = require('./helpers')
+
+describe('MetaMask', function () {
+  let extensionId
+  let driver
+  let tokenAddress
+
+  const testSeedPhrase = 'phrase upgrade clock rough situate wedding elder clever doctor stamp excess tent'
+  const tinyDelayMs = 500
+  const regularDelayMs = tinyDelayMs * 2
+  const largeDelayMs = regularDelayMs * 2
+  const waitingNewPageDelayMs = regularDelayMs * 10
+
+  this.timeout(0)
+  this.bail(true)
+
+  before(async function () {
+    switch (process.env.SELENIUM_BROWSER) {
+      case 'chrome': {
+        const extPath = path.resolve('dist/chrome')
+        driver = buildChromeWebDriver(extPath)
+        extensionId = await getExtensionIdChrome(driver)
+        await driver.get(`chrome-extension://${extensionId}/popup.html`)
+        break
+      }
+      case 'firefox': {
+        const extPath = path.resolve('dist/firefox')
+        driver = buildFirefoxWebdriver()
+        await installWebExt(driver, extPath)
+        await delay(700)
+        extensionId = await getExtensionIdFirefox(driver)
+        await driver.get(`moz-extension://${extensionId}/popup.html`)
+      }
+    }
+  })
+
+  afterEach(async function () {
+    if (process.env.SELENIUM_BROWSER === 'chrome') {
+      const errors = await checkBrowserForConsoleErrors(driver)
+      if (errors.length) {
+        const errorReports = errors.map(err => err.message)
+        const errorMessage = `Errors found in browser console:\n${errorReports.join('\n')}`
+        console.error(new Error(errorMessage))
+      }
+    }
+    if (this.currentTest.state === 'failed') {
+      await verboseReportOnFailure(this.currentTest)
+    }
+  })
+
+  after(async function () {
+    await driver.quit()
+  })
+
+  describe('New UI setup', async function () {
+    it('switches to first tab', async function () {
+      const [firstTab] = await driver.getAllWindowHandles()
+      await driver.switchTo().window(firstTab)
+      await delay(regularDelayMs)
+    })
+
+    it('use the local network', async function () {
+      const [networkSelector] = await driver.findElements(By.css('#network_component'))
+      await networkSelector.click()
+      await delay(regularDelayMs)
+
+      const [localhost] = await driver.findElements(By.xpath(`//li[contains(text(), 'Localhost')]`))
+      await localhost.click()
+      await delay(regularDelayMs)
+    })
+
+    it('selects the new UI option', async () => {
+      const button = await driver.findElement(By.xpath("//p[contains(text(), 'Try Beta Version')]"))
+      await button.click()
+      await delay(regularDelayMs)
+
+      // Close all other tabs
+      const [oldUi, infoPage, newUi] = await driver.getAllWindowHandles()
+      await driver.switchTo().window(oldUi)
+      await driver.close()
+      await driver.switchTo().window(infoPage)
+      await driver.close()
+      await driver.switchTo().window(newUi)
+      await delay(regularDelayMs)
+
+      const [continueBtn] = await driver.findElements(By.css('.welcome-screen__button'))
+      await continueBtn.click()
+      await delay(regularDelayMs)
+    })
+  })
+
+  describe('Going through the first time flow', () => {
+    it('accepts a secure password', async () => {
+      const [passwordBox] = await driver.findElements(By.css('.create-password #create-password'))
+      const [passwordBoxConfirm] = await driver.findElements(By.css('.create-password #confirm-password'))
+      const [button] = await driver.findElements(By.css('.create-password button'))
+
+      await passwordBox.sendKeys('correct horse battery staple')
+      await passwordBoxConfirm.sendKeys('correct horse battery staple')
+      await button.click()
+      await delay(regularDelayMs)
+    })
+
+    it('clicks through the unique image screen', async () => {
+      const [nextScreen] = await driver.findElements(By.css('.unique-image button'))
+      await nextScreen.click()
+      await delay(regularDelayMs)
+    })
+
+    it('clicks through the privacy notice', async () => {
+      const [nextScreen] = await driver.findElements(By.css('.tou button'))
+      await nextScreen.click()
+      await delay(regularDelayMs)
+
+      const canClickThrough = await driver.findElement(By.css('.tou button')).isEnabled()
+      assert.equal(canClickThrough, false, 'disabled continue button')
+      const [bottomOfTos] = await driver.findElements(By.linkText('Attributions'))
+      await driver.executeScript('arguments[0].scrollIntoView(true)', bottomOfTos)
+      await delay(regularDelayMs)
+
+      const [acceptTos] = await driver.findElements(By.css('.tou button'))
+      await acceptTos.click()
+      await delay(regularDelayMs)
+    })
+
+    let seedPhrase
+
+    it('reveals the seed phrase', async () => {
+      const [revealSeedPhrase] = await driver.findElements(By.css('.backup-phrase__secret-blocker'))
+      await revealSeedPhrase.click()
+      await delay(regularDelayMs)
+
+      seedPhrase = await driver.findElement(By.css('.backup-phrase__secret-words')).getText()
+      assert.equal(seedPhrase.split(' ').length, 12)
+      await delay(regularDelayMs)
+
+      const [nextScreen] = await driver.findElements(By.css('.backup-phrase button'))
+      await nextScreen.click()
+      await delay(regularDelayMs)
+    })
+
+    it('can retype the seed phrase', async () => {
+      const words = seedPhrase.split(' ')
+
+      const [word0] = await driver.findElements(By.xpath(`//button[contains(text(), '${words[0]}')]`))
+      await word0.click()
+      await delay(tinyDelayMs)
+
+      const [word1] = await driver.findElements(By.xpath(`//button[contains(text(), '${words[1]}')]`))
+      await word1.click()
+      await delay(tinyDelayMs)
+
+      const [word2] = await driver.findElements(By.xpath(`//button[contains(text(), '${words[2]}')]`))
+      await word2.click()
+      await delay(tinyDelayMs)
+
+      const [word3] = await driver.findElements(By.xpath(`//button[contains(text(), '${words[3]}')]`))
+      await word3.click()
+      await delay(tinyDelayMs)
+
+      const [word4] = await driver.findElements(By.xpath(`//button[contains(text(), '${words[4]}')]`))
+      await word4.click()
+      await delay(tinyDelayMs)
+
+      const [word5] = await driver.findElements(By.xpath(`//button[contains(text(), '${words[5]}')]`))
+      await word5.click()
+      await delay(tinyDelayMs)
+
+      const [word6] = await driver.findElements(By.xpath(`//button[contains(text(), '${words[6]}')]`))
+      await word6.click()
+      await delay(tinyDelayMs)
+
+      const [word7] = await driver.findElements(By.xpath(`//button[contains(text(), '${words[7]}')]`))
+      await word7.click()
+      await delay(tinyDelayMs)
+
+      const [word8] = await driver.findElements(By.xpath(`//button[contains(text(), '${words[8]}')]`))
+      await word8.click()
+      await delay(tinyDelayMs)
+
+      const [word9] = await driver.findElements(By.xpath(`//button[contains(text(), '${words[9]}')]`))
+      await word9.click()
+      await delay(tinyDelayMs)
+
+      const [word10] = await driver.findElements(By.xpath(`//button[contains(text(), '${words[10]}')]`))
+      await word10.click()
+      await delay(tinyDelayMs)
+
+      const [word11] = await driver.findElements(By.xpath(`//button[contains(text(), '${words[11]}')]`))
+      await word11.click()
+      await delay(tinyDelayMs)
+
+      const [confirm] = await driver.findElements(By.xpath(`//button[contains(text(), 'Confirm')]`))
+      await confirm.click()
+      await delay(regularDelayMs)
+    })
+
+    it('clicks through the deposit modal', async () => {
+      const [closeModal] = await driver.findElements(By.css('.page-container__header-close'))
+      await closeModal.click()
+      await delay(regularDelayMs)
+    })
+  })
+
+  describe('Show account information', () => {
+    it('shows the QR code for the account', async () => {
+      await driver.findElement(By.css('.wallet-view__details-button')).click()
+      await driver.findElement(By.css('.qr-wrapper')).isDisplayed()
+      await delay(regularDelayMs)
+
+      await driver.executeScript("document.querySelector('.account-modal-close').click()")
+      await delay(regularDelayMs * 4)
+    })
+  })
+
+  describe('Log out an log back in', () => {
+    it('logs out of the account', async () => {
+      await driver.findElement(By.css('.account-menu__icon')).click()
+      await delay(regularDelayMs)
+
+      const [logoutButton] = await driver.findElements(By.css('.account-menu__logout-button'))
+      assert.equal(await logoutButton.getText(), 'Log out')
+      await logoutButton.click()
+      await delay(regularDelayMs)
+    })
+
+    it('accepts the account password after lock', async () => {
+      await driver.findElement(By.id('password')).sendKeys('correct horse battery staple')
+      await driver.findElement(By.id('password')).sendKeys(Key.ENTER)
+      await delay(regularDelayMs * 4)
+    })
+  })
+
+  describe('Add account', () => {
+    it('choose Create Account from the account menu', async () => {
+      await driver.findElement(By.css('.account-menu__icon')).click()
+      await delay(regularDelayMs)
+
+      const [createAccount] = await driver.findElements(By.xpath(`//div[contains(text(), 'Create Account')]`))
+      await createAccount.click()
+      await delay(regularDelayMs)
+    })
+
+    it('set account name', async () => {
+      const [accountName] = await driver.findElements(By.css('.new-account-create-form input'))
+      await accountName.sendKeys('2nd account')
+      await delay(regularDelayMs)
+
+      const [create] = await driver.findElements(By.xpath(`//button[contains(text(), 'Create')]`))
+      await create.click()
+      await delay(regularDelayMs)
+    })
+
+    it('should correct account name', async () => {
+      const [accountName] = await driver.findElements(By.css('.account-name'))
+      assert.equal(await accountName.getText(), '2nd account')
+      await delay(regularDelayMs)
+    })
+  })
+
+  describe('Import seed phrase', () => {
+    it('logs out of the vault', async () => {
+      await driver.findElement(By.css('.account-menu__icon')).click()
+      await delay(regularDelayMs)
+
+      const [logoutButton] = await driver.findElements(By.css('.account-menu__logout-button'))
+      assert.equal(await logoutButton.getText(), 'Log out')
+      await logoutButton.click()
+      await delay(regularDelayMs)
+    })
+
+    it('imports seed phrase', async () => {
+      const [restoreSeedLink] = await driver.findElements(By.css('.unlock-page__link--import'))
+      assert.equal(await restoreSeedLink.getText(), 'Import using account seed phrase')
+      await restoreSeedLink.click()
+      await delay(regularDelayMs)
+
+      const [seedTextArea] = await driver.findElements(By.css('textarea'))
+      await seedTextArea.sendKeys(testSeedPhrase)
+      await delay(regularDelayMs)
+
+      await driver.findElement(By.id('password-box')).sendKeys('correct horse battery staple')
+      await driver.findElement(By.id('password-box-confirm')).sendKeys('correct horse battery staple')
+      await driver.findElement(By.css('button:nth-child(2)')).click()
+      await delay(regularDelayMs)
+    })
+
+    it('balance renders', async () => {
+      const balance = await driver.findElement(By.css('.balance-display .token-amount'))
+      const tokenAmount = await balance.getText()
+      assert.equal(tokenAmount, '100.000 ETH')
+      await delay(regularDelayMs)
+    })
+  })
+
+  describe('Send ETH from inside MetaMask', () => {
+    it('starts to send a transaction', async function () {
+      const [sendButton] = await driver.findElements(By.xpath(`//button[contains(text(), 'Send')]`))
+      await sendButton.click()
+      await delay(regularDelayMs)
+
+      const [inputAddress] = await driver.findElements(By.css('input[placeholder="Recipient Address"]'))
+      const [inputAmount] = await driver.findElements(By.css('.currency-display__input'))
+      await inputAddress.sendKeys('0x2f318C334780961FB129D2a6c30D0763d9a5C970')
+      await inputAmount.sendKeys('1')
+
+      // Set the gas limit
+      const [configureGas] = await driver.findElements(By.css('.send-v2__gas-fee-display button'))
+      await configureGas.click()
+      await delay(regularDelayMs)
+
+      const [save] = await driver.findElements(By.xpath(`//button[contains(text(), 'Save')]`))
+      await save.click()
+      await delay(regularDelayMs)
+
+      // Continue to next screen
+      const [nextScreen] = await driver.findElements(By.xpath(`//button[contains(text(), 'Next')]`))
+      await nextScreen.click()
+      await delay(regularDelayMs)
+    })
+
+    it('confirms the transaction', async function () {
+      const [confirmButton] = await driver.findElements(By.xpath(`//button[contains(text(), 'Confirm')]`))
+      await confirmButton.click()
+      await delay(regularDelayMs)
+    })
+
+    it('finds the transaction in the transactions list', async function () {
+      const transactions = await driver.findElements(By.css('.tx-list-item'))
+      assert.equal(transactions.length, 1)
+
+      const txValues = await driver.findElements(By.css('.tx-list-value'))
+      assert.equal(txValues.length, 1)
+      assert.equal(await txValues[0].getText(), '1 ETH')
+    })
+  })
+
+  describe('Send ETH from Faucet', () => {
+    it('starts a send transaction inside Faucet', async () => {
+      await driver.executeScript('window.open("https://faucet.metamask.io")')
+      await delay(waitingNewPageDelayMs)
+
+      const [extension, faucet] = await driver.getAllWindowHandles()
+      await driver.switchTo().window(faucet)
+      await delay(regularDelayMs)
+
+      const [send1eth] = await driver.findElements(By.xpath(`//button[contains(text(), '10 ether')]`))
+      await send1eth.click()
+      await delay(regularDelayMs)
+
+      await driver.switchTo().window(extension)
+      await loadExtension(driver, extensionId)
+      await delay(regularDelayMs)
+
+      const [confirmButton] = await driver.findElements(By.xpath(`//button[contains(text(), 'Confirm')]`))
+      await confirmButton.click()
+      await delay(regularDelayMs)
+
+      await driver.switchTo().window(faucet)
+      await delay(regularDelayMs)
+      await driver.close()
+      await delay(regularDelayMs)
+      await driver.switchTo().window(extension)
+      await delay(regularDelayMs)
+      await loadExtension(driver, extensionId)
+      await delay(regularDelayMs)
+    })
+  })
+
+  describe('Add existing token using search', () => {
+    it('clicks on the Add Token button', async () => {
+      const [addToken] = await driver.findElements(By.xpath(`//button[contains(text(), 'Add Token')]`))
+      await addToken.click()
+      await delay(regularDelayMs)
+    })
+
+    it('can pick a token from the existing options', async () => {
+      const [tokenSearch] = await driver.findElements(By.css('input.add-token__input'))
+      await tokenSearch.sendKeys('BAT')
+      await delay(regularDelayMs)
+
+      const [token] = await driver.findElements(By.xpath("//div[contains(text(), 'BAT')]"))
+      await token.click()
+      await delay(regularDelayMs)
+
+      const [nextScreen] = await driver.findElements(By.xpath(`//button[contains(text(), 'Next')]`))
+      await nextScreen.click()
+      await delay(regularDelayMs)
+
+      const [addTokens] = await driver.findElements(By.xpath(`//button[contains(text(), 'Add Tokens')]`))
+      await addTokens.click()
+      await delay(largeDelayMs)
+    })
+
+    it('renders the balance for the chosen token', async () => {
+      const balance = await driver.findElement(By.css('.tx-view .balance-display .token-amount'))
+      const tokenAmount = await balance.getText()
+      assert.equal(tokenAmount, '0BAT')
+      await delay(regularDelayMs)
+    })
+  })
+
+  describe('Add a custom token from TokenFactory', () => {
+    it('creates a new token', async () => {
+      await driver.executeScript('window.open("https://tokenfactory.surge.sh/#/factory")')
+      await delay(waitingNewPageDelayMs)
+
+      const [extension, tokenFactory] = await driver.getAllWindowHandles()
+      await driver.switchTo().window(tokenFactory)
+      const [
+        totalSupply,
+        tokenName,
+        tokenDecimal,
+        tokenSymbol,
+      ] = await driver.findElements(By.css('input'))
+
+      await totalSupply.sendKeys('100')
+      await tokenName.sendKeys('Test')
+      await tokenDecimal.sendKeys('0')
+      await tokenSymbol.sendKeys('TST')
+
+      const [createToken] = await driver.findElements(By.xpath(`//button[contains(text(), 'Create Token')]`))
+      await createToken.click()
+      await delay(regularDelayMs)
+
+      await driver.switchTo().window(extension)
+      await loadExtension(driver, extensionId)
+      await delay(regularDelayMs)
+
+      const [confirmButton] = await driver.findElements(By.xpath(`//button[contains(text(), 'Confirm')]`))
+      await confirmButton.click()
+      await delay(regularDelayMs)
+
+      await driver.switchTo().window(tokenFactory)
+      await delay(regularDelayMs)
+      const tokenContactAddress = await driver.findElement(By.css('div > div > div:nth-child(2) > span:nth-child(3)'))
+      tokenAddress = await tokenContactAddress.getText()
+      await driver.close()
+      await driver.switchTo().window(extension)
+      await loadExtension(driver, extensionId)
+      await delay(regularDelayMs)
+    })
+
+    it('clicks on the Add Token button', async () => {
+      const [addToken] = await driver.findElements(By.xpath(`//button[contains(text(), 'Add Token')]`))
+      await addToken.click()
+      await delay(regularDelayMs)
+    })
+
+    it('picks the newly created Test token', async () => {
+      const [addCustomToken] = await driver.findElements(By.xpath("//div[contains(text(), 'Custom Token')]"))
+      await addCustomToken.click()
+      await delay(regularDelayMs)
+
+      const [newTokenAddress] = await driver.findElements(By.css('.add-token__add-custom-form input'))
+      await newTokenAddress.sendKeys(tokenAddress)
+      await delay(regularDelayMs)
+
+      const [nextScreen] = await driver.findElements(By.xpath(`//button[contains(text(), 'Next')]`))
+      await nextScreen.click()
+      await delay(regularDelayMs)
+
+      const [addTokens] = await driver.findElements(By.xpath(`//button[contains(text(), 'Add Tokens')]`))
+      await addTokens.click()
+      await delay(regularDelayMs)
+    })
+
+    it('renders the balance for the new token', async () => {
+      const [balance] = await driver.findElements(By.css('.tx-view .balance-display .token-amount'))
+      const tokenAmount = await balance.getText()
+      assert.equal(tokenAmount, '100TST')
+      await delay(regularDelayMs)
+    })
+  })
+})

test/e2e/beta/run-all.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+set -e
+set -u
+set -o pipefail
+
+export PATH="$PATH:./node_modules/.bin"
+
+shell-parallel -s 'npm run ganache:start' -x 'sleep 5 && mocha test/e2e/beta/metamask-beta-ui.spec'
+shell-parallel -s 'npm run ganache:start' -x 'sleep 5 && mocha test/e2e/beta/from-import-beta-ui.spec'

test/e2e/func.js

@@ -1,5 +1,7 @@
 require('chromedriver')
 require('geckodriver')
+const fs = require('fs')
+const os = require('os')
 const path = require('path')
 const webdriver = require('selenium-webdriver')
 const Command = require('selenium-webdriver/lib/command').Command
@@ -19,10 +21,15 @@ function delay (time) {
 }
 
 function buildChromeWebDriver (extPath) {
+  const tmpProfile = path.join(os.tmpdir(), fs.mkdtempSync('mm-chrome-profile'));
   return new webdriver.Builder()
     .withCapabilities({
       chromeOptions: {
-        args: [`load-extension=${extPath}`],
+        args: [
+          `load-extension=${extPath}`,
+          `user-data-dir=${tmpProfile}`,
+        ],
+        binary: process.env.SELENIUM_CHROME_BINARY,
       },
     })
     .build()

ui/app/css/itcss/generic/index.scss

@@ -191,11 +191,13 @@ input.large-input {
   }
 
   &--full-width {
-    width: initial;
+    width: 100% !important;
   }
 
   &--full-height {
-    height: 100%;
+    height: 100% !important;
+    max-height: initial !important;
+    min-height: initial !important;
   }
 
   &__content {