Merge branch 'develop' into network-remove-provider-engine

Override package-lock and fix merge conflicts
2024-12-23 09:52:26 +01:00 · 2018-08-14 10:44:42 -07:00 · 2018-08-14 10:44:42 -07:00 · 96d789d2cf
commit 96d789d2cf
parent 7918240833 742aa8bb11
67 changed files with 1460 additions and 427 deletions
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@ -0,0 +1,34 @@
+---
+name: Bug Report
+about: Using MetaMask, but it's not working as you expect?
+
+---
+
+<!--
+BEFORE SUBMITTING: PLEASE SEARCH TO MAKE SURE THIS ISSUE HAS NOT BEEN SUBMITTED
+-->
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Browser details (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - MetaMask Version [e.g. 4.9.0]
+ - Old UI or New / Beta UI?
+
+**Additional context**
+Add any other context about the problem here.
--- a/.github/ISSUE_TEMPLATE/feature-request.md
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@ -0,0 +1,14 @@
+---
+name: Feature Request
+about: Looking for a feature that doesn't exist? Let us know!
+
+---
+
+**What problem are you trying to solve?**
+A short description of what you're trying to do. E.g., "My users need to wrap ETH, but they're intimidated by the confirm screen..." or "I'm trying to debug my application, and XYZ..."
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen. Try to also include any alternative solutions you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
--- a/.github/ISSUE_TEMPLATE/support-request-or-question.md
+++ b/.github/ISSUE_TEMPLATE/support-request-or-question.md
@ -0,0 +1,9 @@
+---
+name: Support Request or Question
+about: Have a question about how to use MetaMask?
+
+---
+
+FOR USER QUESTIONS, PLEASE DO NOT OPEN A GITHUB ISSUE - IT WILL NOT BE HANDLED HERE.
+
+INSTEAD, PLEASE EMAIL SUPPORT@METAMASK.IO WITH A DESCRIPTION OF YOUR PROBLEM.
--- a/.npmrc
+++ b/.npmrc
@ -1 +0,0 @@
-engine-strict=true
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,13 +1,28 @@
 # Changelog

-## Current Master
+## Current Develop Branch

- Add new tokens auto detection
- Remove rejected transactions from transaction history
- Add Trezor Support
- Allow to remove accounts (Imported and Hardware Wallets)
+## 4.9.1 Mon Aug 09 2018
+
+- [#4884](https://github.com/MetaMask/metamask-extension/pull/4884): Allow to have tokens per account and network.
+- [#4989](https://github.com/MetaMask/metamask-extension/pull/4989): Continue to use original signedTypedData.
+- [#5010](https://github.com/MetaMask/metamask-extension/pull/5010): Fix ENS resolution issues.
+- [#5000](https://github.com/MetaMask/metamask-extension/pull/5000): Show error while allowing confirmation of tx where simulation fails.
+- [#4995](https://github.com/MetaMask/metamask-extension/pull/4995): Shows retry button on dApp initialized transactions.
+
+## 4.9.0 Mon Aug 07 2018
+
+- [#4926](https://github.com/MetaMask/metamask-extension/pull/4926): Show retry button on the latest tx of the earliest nonce.
+- [#4888](https://github.com/MetaMask/metamask-extension/pull/4888): Suggest using the new user interface.
+- [#4947](https://github.com/MetaMask/metamask-extension/pull/4947): Prevent sending multiple transasctions on multiple confirm clicks.
+- [#4844](https://github.com/MetaMask/metamask-extension/pull/4844): Add new tokens auto detection.
+- [#4667](https://github.com/MetaMask/metamask-extension/pull/4667): Remove rejected transactions from transaction history.
+- [#4625](https://github.com/MetaMask/metamask-extension/pull/4625): Add Trezor Support.
+- [#4625](https://github.com/MetaMask/metamask-extension/pull/4625/commits/523cf9ad33d88719520ae5e7293329d133b64d4d): Allow to remove accounts (Imported and Hardware Wallets)
+- [#4814](https://github.com/MetaMask/metamask-extension/pull/4814): Add hex data input to send screen.
+- [#4691](https://github.com/MetaMask/metamask-extension/pull/4691): Redesign of the Confirm Transaction Screen.
 - [#4840](https://github.com/MetaMask/metamask-extension/pull/4840): Now shows notifications when transactions are completed.
- [#4855](https://github.com/MetaMask/metamask-extension/pull/4855): network.js: convert rpc protocol to lower case.
+- [#4855](https://github.com/MetaMask/metamask-extension/pull/4855): Allow the use of HTTP prefix for custom rpc urls.

 ## 4.8.0 Thur Jun 14 2018

--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@ -84,7 +84,7 @@
    "message": "Auf Coinbase kaufen"
  },
  "buyCoinbaseExplainer": {
-    "message": "Coinbase ist die weltweit bekannteste Art und Weise um bitcoin, ethereum und litecoin zu kaufen und verkaufen."
+    "message": "Coinbase ist die weltweit bekannteste Art und Weise um Bitcoin, Ethereum und Litecoin zu kaufen und verkaufen."
  },
    "ok": {
    "message": "Ok"
@ -828,7 +828,7 @@
    "message": "Willkommen zur neuen Oberfläche (Beta)"
  },
  "uiWelcomeMessage": {
-    "message": "Du verwendest  nun die neue Metamask Oberfläche. Schau dich um, teste die neuen Features wie z.B. das Senden von Token und lass es uns wissen falls du irgendwelche Probleme hast."
+    "message": "Du verwendest  nun die neue MetaMask Oberfläche. Schau dich um, teste die neuen Features wie z.B. das Senden von Token und lass es uns wissen falls du irgendwelche Probleme hast."
  },
  "unapproved": {
    "message": "Nicht genehmigt"
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@ -2,6 +2,9 @@
  "accept": {
    "message": "Accept"
  },
+  "accessingYourCamera": {
+    "message": "Accesing your camera..."
+  },
  "account": {
    "message": "Account"
  },
@ -96,7 +99,7 @@
    "message": "Buy on Coinbase"
  },
  "buyCoinbaseExplainer": {
-    "message": "Coinbase is the world’s most popular way to buy and sell bitcoin, ethereum, and litecoin."
+    "message": "Coinbase is the world’s most popular way to buy and sell Bitcoin, Ethereum, and Litecoin."
  },
  "bytes": {
    "message": "Bytes"
@ -117,7 +120,7 @@
    "message": "Close"
  },
  "chromeRequiredForTrezor":{
-    "message": "You need to use Metamask on Google Chrome in order to connect to your TREZOR device."
+    "message": "You need to use MetaMask on Google Chrome in order to connect to your TREZOR device."
  },
  "confirm": {
    "message": "Confirm"
@ -147,7 +150,7 @@
    "message": "Connect to Trezor"
  },
  "connectToTrezorHelp": {
-    "message": "Metamask is able to access your TREZOR ethereum accounts. First make sure your device is connected and unlocked."
+    "message": "MetaMask is able to access your TREZOR Ethereum accounts. First make sure your device is connected and unlocked."
  },
  "connectToTrezorTrouble": {
    "message": "If you are having trouble, please make sure you are using the latest version of the TREZOR firmware."
@ -656,6 +659,12 @@
  "notStarted": {
    "message": "Not Started"
  },
+  "noWebcamFoundTitle": {
+    "message": "Webcam not found"
+  },
+  "noWebcamFound": {
+    "message": "Your computer's webcam was not found. Please try again."
+  },
  "oldUI": {
    "message": "Old UI"
  },
@ -940,6 +949,12 @@
  "info": {
  "message": "Info"
  },
+  "scanInstructions": {
+    "message": "Place the QR code in front of your camera"
+  },
+  "scanQrCode": {
+    "message": "Scan QR Code"
+  },
  "shapeshiftBuy": {
    "message": "Buy with Shapeshift"
  },
@ -1059,6 +1074,9 @@
    "message": "We had trouble loading your token balances. You can view them ",
    "description": "Followed by a link (here) to view token balances"
  },
+  "tryAgain": {
+    "message": "Try again"
+  },
  "twelveWords": {
    "message": "These 12 words are the only way to restore your MetaMask accounts.\nSave them somewhere safe and secret."
  },
@ -1069,7 +1087,7 @@
    "message": "Welcome to the New UI (Beta)"
  },
  "uiWelcomeMessage": {
-    "message": "You are now using the new Metamask UI."
+    "message": "You are now using the new MetaMask UI."
  },
  "unapproved": {
    "message": "Unapproved"
@ -1089,6 +1107,15 @@
  "unknownNetworkId": {
    "message": "Unknown network ID"
  },
+  "unknownQrCode": {
+    "message": "Error: We couldn't identify that QR code"
+  },
+  "unknownCameraErrorTitle": {
+    "message": "Ooops! Something went wrong...."
+  },
+  "unknownCameraError": {
+    "message": "There was an error while trying to access you camera. Please try again..."
+  },
  "unlock": {
    "message": "Unlock"
  },
@ -1135,6 +1162,9 @@
  "whatsThis": {
    "message": "What's this?"
  },
+  "youNeedToAllowCameraAccess": {
+    "message": "You need to allow camera access to use this feature."
+  },
  "yourSigRequested": {
    "message": "Your signature is being requested"
  },
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@ -75,7 +75,7 @@
    "message": "Pedir prestado con Dharma (Beta)"
  },
  "builtInCalifornia": {
-    "message": "Metamask fue diseñado y construido en California"
+    "message": "MetaMask fue diseñado y construido en California"
  },
  "buy": {
    "message": "Comprar"
@ -874,7 +874,7 @@
    "message": "Advertencia"
  },
  "welcomeBeta": {
-    "message": "Bienvenido a Metamask Beta"
+    "message": "Bienvenido a MetaMask Beta"
  },
  "whatsThis": {
    "message": "¿Qué es esto?"
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@ -63,7 +63,7 @@
    "message": "Acheter sur Coinbase"
  },
  "buyCoinbaseExplainer": {
-    "message": "Coinbase est le moyen le plus populaire au monde d'acheter et de vendre du bitcoin, de l'ethereum et du litecoin."
+    "message": "Coinbase est le moyen le plus populaire au monde d'acheter et de vendre du Bitcoin, de l'Ethereum et du Litecoin."
  },
  "cancel": {
    "message": "Annuler"
@ -570,7 +570,7 @@
    "message": "Bienvenue dans la nouvelle interface utilisateur (Beta)"
  },
  "uiWelcomeMessage": {
-    "message": "Vous utilisez maintenant la nouvelle interface utilisateur Metamask. Jetez un coup d'oeil, essayez de nouvelles fonctionnalités comme l'envoi de jetons, et faites-nous savoir si vous avez des problèmes."
+    "message": "Vous utilisez maintenant la nouvelle interface utilisateur MetaMask. Jetez un coup d'oeil, essayez de nouvelles fonctionnalités comme l'envoi de jetons, et faites-nous savoir si vous avez des problèmes."
  },
  "unavailable": {
    "message": "Indisponible"
--- a/app/_locales/it/messages.json
+++ b/app/_locales/it/messages.json
@ -81,7 +81,7 @@
    "message": "Compra su Coinbase"
  },
  "buyCoinbaseExplainer": {
-    "message": "Coinbase è il servizio più popolare al mondo per comprare e vendere bitcoin, ethereum e litecoin."
+    "message": "Coinbase è il servizio più popolare al mondo per comprare e vendere Bitcoin, Ethereum e Litecoin."
  },
  "cancel": {
    "message": "Cancella"
@ -178,7 +178,7 @@
    "message": "La rete predefinita per transazioni in Ether è la Rete Ethereum Principale."
  },
  "denExplainer": {
-    "message": "Il DEN è il tuo archivio crittato con password dentro Metamask."
+    "message": "Il DEN è il tuo archivio crittato con password dentro MetaMask."
  },
  "deposit": {
    "message": "Deposita"
@ -816,4 +816,4 @@
  "youSign": {
    "message": "Ti stai connettendo"
  }
-}
+}
--- a/app/_locales/nl/messages.json
+++ b/app/_locales/nl/messages.json
@ -81,7 +81,7 @@
    "message": "Koop op Coinbase"
  },
  "buyCoinbaseExplainer": {
-    "message": "Coinbase is 's werelds populairste manier om bitcoin, ethereum en litecoin te kopen en verkopen."
+    "message": "Coinbase is 's werelds populairste manier om Bitcoin, Ethereum en Litecoin te kopen en verkopen."
  },
  "cancel": {
    "message": "Annuleer"
@ -435,7 +435,7 @@
    "message": "back-up woorden hebben alleen kleine letters"
  },
  "mainnet": {
-    "message": "belangrijkste ethereum-netwerk"
+    "message": "belangrijkste Ethereum-netwerk"
  },
  "message": {
    "message": "Bericht"
@ -762,7 +762,7 @@
    "message": "Welkom bij de nieuwe gebruikersinterface (bèta)"
  },
  "uiWelcomeMessage": {
-    "message": "U gebruikt nu de nieuwe gebruikersinterface van Metamask. Kijk rond, probeer nieuwe functies uit zoals het verzenden van tokens en laat ons weten of u problemen ondervindt."
+    "message": "U gebruikt nu de nieuwe gebruikersinterface van MetaMask. Kijk rond, probeer nieuwe functies uit zoals het verzenden van tokens en laat ons weten of u problemen ondervindt."
  },
  "unavailable": {
    "message": "Niet beschikbaar"
--- a/app/_locales/ph/messages.json
+++ b/app/_locales/ph/messages.json
@ -63,7 +63,7 @@
    "message": "Bumili sa Coinbase"
  },
  "buyCoinbaseExplainer": {
-    "message": "Ang Coinbase ang pinakasikat na paraan upang bumili at magbenta ng bitcoin, ethereum, at litecoin sa buong mundo."
+    "message": "Ang Coinbase ang pinakasikat na paraan upang bumili at magbenta ng Bitcoin, Ethereum, at Litecoin sa buong mundo."
  },
  "cancel": {
    "message": "Kanselahin"
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@ -81,7 +81,7 @@
    "message": "Comprar no Coinbase"
  },
  "buyCoinbaseExplainer": {
-    "message": "Coinbase é a forma mais conhecida para comprar e vender bitcoin, ethereum, e litecoin."
+    "message": "Coinbase é a forma mais conhecida para comprar e vender Bitcoin, Ethereum, e Litecoin."
  },
  "cancel": {
    "message": "Cancelar"
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@ -84,7 +84,7 @@
    "message": "Купить на Coinbase"
  },
  "buyCoinbaseExplainer": {
-    "message": "Биржа Coinbase – это наиболее популярный способ купить или продать bitcoin, ethereum и litecoin."
+    "message": "Биржа Coinbase – это наиболее популярный способ купить или продать Bitcoin, Ethereum и Litecoin."
  },
  "ok": {
    "message": "ОК"
--- a/app/_locales/th/messages.json
+++ b/app/_locales/th/messages.json
@ -762,7 +762,7 @@
    "message": "ยินดีต้อนรับสู่หน้าตาใหม่ (เบต้า)"
  },
  "uiWelcomeMessage": {
-    "message": "ขณะนี้คุณใช้งาน Metamask หน้าตาใหม่แล้ว ลองใช้ความสามรถใหม่ ๆ เช่นการส่งโทเค็นและหากพบปัญหากรุณาแจ้งให้เราทราบ"
+    "message": "ขณะนี้คุณใช้งาน MetaMask หน้าตาใหม่แล้ว ลองใช้ความสามรถใหม่ ๆ เช่นการส่งโทเค็นและหากพบปัญหากรุณาแจ้งให้เราทราบ"
  },
  "unavailable": {
    "message": "ใช้งานไม่ได้"
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@ -84,7 +84,7 @@
      "message": "Coinbase'de satın al"
    },
    "buyCoinbaseExplainer": {
-      "message": "Coinbase bitcoin, ethereum, and litecoin alıp satmanın dünyadaki en popüler yolu"
+      "message": "Coinbase Bitcoin, Ethereum, and Litecoin alıp satmanın dünyadaki en popüler yolu"
    },
    "ok": {
      "message": "Tamam"
@ -852,7 +852,7 @@
      "message": "Yeni UI (Beta)'ya hoşgeldiniz"
    },
    "uiWelcomeMessage": {
-      "message": "Şu anda yeni Metamask UI kullanmaktasınız. Gözatın, jeton gönderme gibi yeni özellikleri deneyin ve herhangi bir sorunlar karşılaşırsanız bize haber verin"
+      "message": "Şu anda yeni MetaMask UI kullanmaktasınız. Gözatın, jeton gönderme gibi yeni özellikleri deneyin ve herhangi bir sorunlar karşılaşırsanız bize haber verin"
    },
    "unapproved": {
      "message": "Onaylanmadı"
@ -909,4 +909,4 @@
    "youSign": {
      "message": "İmzalıyorsunuz"
    }
-}
+}
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@ -570,7 +570,7 @@
    "message": "Chào mừng bạn đến với giao diện mới (Beta)"
  },
  "uiWelcomeMessage": {
-    "message": "Bạn đang sử dụng giao diện mới của Metamask. Chúng tôi khuyến khích bạn thử nghiệm và khám phá các tính năng mới như gửi token, và nếu bạn có gặp phải vấn đề gì khó khăn, xin hãy liên hệ ngay để chúng tôi có thể giúp đỡ bạn."
+    "message": "Bạn đang sử dụng giao diện mới của MetaMask. Chúng tôi khuyến khích bạn thử nghiệm và khám phá các tính năng mới như gửi token, và nếu bạn có gặp phải vấn đề gì khó khăn, xin hãy liên hệ ngay để chúng tôi có thể giúp đỡ bạn."
  },
  "unavailable": {
    "message": "Không có sẵn"
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@ -879,7 +879,7 @@
    "message": "欢迎使用新版界面 （Beta）"
  },
  "uiWelcomeMessage": {
-      "message": "你现在正在使用新的 Metamask 界面。 尝试发送代币等新功能，有任何问题请告知我们。"
+      "message": "你现在正在使用新的 MetaMask 界面。 尝试发送代币等新功能，有任何问题请告知我们。"
  },
  "unapproved": {
    "message": "未批准"
--- a/app/_locales/zh_TW/messages.json
+++ b/app/_locales/zh_TW/messages.json
@ -362,7 +362,7 @@
    "message": "你想怎麼存入 Ether？"
  },
  "holdEther": {
-    "message": "Metamask 讓您能保存 ether 和代幣, 並成為您接觸分散式應用程式的途徑."
+    "message": "MetaMask 讓您能保存 ether 和代幣, 並成為您接觸分散式應用程式的途徑."
  },
  "import": {
    "message": "導入",
--- a/app/images/webcam.svg
+++ b/app/images/webcam.svg
@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="53px" height="53px" viewBox="0 0 53 53" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 50.2 (55047) - http://www.bohemiancoding.com/sketch -->
+    <title>webcam</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="QR-Code-Scan" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Group-4-Copy" transform="translate(-482.000000, -218.000000)">
+            <g id="webcam" transform="translate(482.000000, 218.000000)">
+                <circle id="Oval" fill="#D5ECFA" cx="26.5" cy="26.5" r="26.5"></circle>
+                <g id="Group" transform="translate(14.000000, 19.000000)" fill="#259DE5">
+                    <rect id="Rectangle" x="0" y="0" width="18" height="16"></rect>
+                    <polygon id="Triangle" points="19 6.57142857 26 3 26 13 19 9.42857143"></polygon>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
--- a/app/manifest.json
+++ b/app/manifest.json
@ -1,7 +1,7 @@
 {
  "name": "__MSG_appName__",
  "short_name": "__MSG_appName__",
-  "version": "4.8.0",
+  "version": "4.9.1",
  "manifest_version": 2,
  "author": "https://metamask.io",
  "description": "__MSG_appDescription__",
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@ -47,8 +47,8 @@ const notificationManager = new NotificationManager()
 global.METAMASK_NOTIFIER = notificationManager

 // setup sentry error reporting
-const releaseVersion = platform.getVersion()
-const raven = setupRaven({ releaseVersion })
+const release = platform.getVersion()
+const raven = setupRaven({ release })

 // browser check if it is Edge - https://stackoverflow.com/questions/9847580/how-to-detect-safari-chrome-ie-firefox-and-opera-browser
 // Internet Explorer 6-11
--- a/app/scripts/contentscript.js
+++ b/app/scripts/contentscript.js
@ -198,6 +198,6 @@ function blacklistedDomainCheck () {
 */
 function redirectToPhishingWarning () {
  console.log('MetaMask - routing to Phishing Warning component')
-  let extensionURL = extension.runtime.getURL('phishing.html')
+  const extensionURL = extension.runtime.getURL('phishing.html')
  window.location.href = extensionURL
 }
--- a/app/scripts/controllers/detect-tokens.js
+++ b/app/scripts/controllers/detect-tokens.js
@ -85,7 +85,7 @@ class DetectTokensController {
  set preferences (preferences) {
    if (!preferences) { return }
    this._preferences = preferences
-    preferences.store.subscribe(({ tokens }) => { this.tokenAddresses = tokens.map((obj) => { return obj.address }) })
+    preferences.store.subscribe(({ tokens = [] }) => { this.tokenAddresses = tokens.map((obj) => { return obj.address }) })
    preferences.store.subscribe(({ selectedAddress }) => {
      if (this.selectedAddress !== selectedAddress) {
        this.selectedAddress = selectedAddress
--- a/app/scripts/controllers/preferences.js
+++ b/app/scripts/controllers/preferences.js
@ -13,6 +13,7 @@ class PreferencesController {
 	 * @property {array} store.frequentRpcList A list of custom rpcs to provide the user
   * @property {string} store.currentAccountTab Indicates the selected tab in the ui
   * @property {array} store.tokens The tokens the user wants display in their token lists
+   * @property {object} store.accountTokens The tokens stored per account and then per network type
   * @property {boolean} store.useBlockie The users preference for blockie identicons within the UI
   * @property {object} store.featureFlags A key-boolean map, where keys refer to features and booleans to whether the
   * user wishes to see that feature
@ -24,6 +25,7 @@ class PreferencesController {
    const initState = extend({
      frequentRpcList: [],
      currentAccountTab: 'history',
+      accountTokens: {},
      tokens: [],
      useBlockie: false,
      featureFlags: {},
@ -33,8 +35,9 @@ class PreferencesController {
    }, opts.initState)

    this.diagnostics = opts.diagnostics
-
+    this.network = opts.network
    this.store = new ObservableStore(initState)
+    this._subscribeProviderType()
  }
 // PUBLIC METHODS

@ -77,12 +80,19 @@ class PreferencesController {
   */
  setAddresses (addresses) {
    const oldIdentities = this.store.getState().identities
+    const oldAccountTokens = this.store.getState().accountTokens
+
    const identities = addresses.reduce((ids, address, index) => {
      const oldId = oldIdentities[address] || {}
      ids[address] = {name: `Account ${index + 1}`, address, ...oldId}
      return ids
    }, {})
-    this.store.updateState({ identities })
+    const accountTokens = addresses.reduce((tokens, address) => {
+      const oldTokens = oldAccountTokens[address] || {}
+      tokens[address] = oldTokens
+      return tokens
+    }, {})
+    this.store.updateState({ identities, accountTokens })
  }

  /**
@ -93,11 +103,13 @@ class PreferencesController {
   */
  removeAddress (address) {
    const identities = this.store.getState().identities
+    const accountTokens = this.store.getState().accountTokens
    if (!identities[address]) {
      throw new Error(`${address} can't be deleted cause it was not found`)
    }
    delete identities[address]
-    this.store.updateState({ identities })
+    delete accountTokens[address]
+    this.store.updateState({ identities, accountTokens })

    // If the selected account is no longer valid,
    // select an arbitrary other account:
@ -117,14 +129,17 @@ class PreferencesController {
   */
  addAddresses (addresses) {
    const identities = this.store.getState().identities
+    const accountTokens = this.store.getState().accountTokens
    addresses.forEach((address) => {
      // skip if already exists
      if (identities[address]) return
      // add missing identity
      const identityCount = Object.keys(identities).length
+
+      accountTokens[address] = {}
      identities[address] = { name: `Account ${identityCount + 1}`, address }
    })
-    this.store.updateState({ identities })
+    this.store.updateState({ identities, accountTokens })
  }

  /*
@ -175,15 +190,15 @@ class PreferencesController {
   * Setter for the `selectedAddress` property
   *
   * @param {string} _address A new hex address for an account
-   * @returns {Promise<void>} Promise resolves with undefined
+   * @returns {Promise<void>} Promise resolves with tokens
   *
   */
  setSelectedAddress (_address) {
-    return new Promise((resolve, reject) => {
-      const address = normalizeAddress(_address)
-      this.store.updateState({ selectedAddress: address })
-      resolve()
-    })
+    const address = normalizeAddress(_address)
+    this._updateTokens(address)
+    this.store.updateState({ selectedAddress: address })
+    const tokens = this.store.getState().tokens
+    return Promise.resolve(tokens)
  }

  /**
@ -232,9 +247,7 @@ class PreferencesController {
    } else {
      tokens.push(newEntry)
    }
-
-    this.store.updateState({ tokens })
-
+    this._updateAccountTokens(tokens)
    return Promise.resolve(tokens)
  }

@ -247,10 +260,8 @@ class PreferencesController {
   */
  removeToken (rawAddress) {
    const tokens = this.store.getState().tokens
-
    const updatedTokens = tokens.filter(token => token.address !== rawAddress)
-
-    this.store.updateState({ tokens: updatedTokens })
+    this._updateAccountTokens(updatedTokens)
    return Promise.resolve(updatedTokens)
  }

@ -376,6 +387,57 @@ class PreferencesController {
  //
  // PRIVATE METHODS
  //
+  /**
+   * Subscription to network provider type.
+   *
+   *
+   */
+  _subscribeProviderType () {
+    this.network.providerStore.subscribe(() => {
+      const { tokens } = this._getTokenRelatedStates()
+      this.store.updateState({ tokens })
+    })
+  }
+
+  /**
+   * Updates `accountTokens` and `tokens` of current account and network according to it.
+   *
+   * @param {array} tokens Array of tokens to be updated.
+   *
+   */
+  _updateAccountTokens (tokens) {
+    const { accountTokens, providerType, selectedAddress } = this._getTokenRelatedStates()
+    accountTokens[selectedAddress][providerType] = tokens
+    this.store.updateState({ accountTokens, tokens })
+  }
+
+  /**
+   * Updates `tokens` of current account and network.
+   *
+   * @param {string} selectedAddress Account address to be updated with.
+   *
+   */
+  _updateTokens (selectedAddress) {
+    const { tokens } = this._getTokenRelatedStates(selectedAddress)
+    this.store.updateState({ tokens })
+  }
+
+  /**
+   * A getter for `tokens` and `accountTokens` related states.
+   *
+   * @param {string} selectedAddress A new hex address for an account
+   * @returns {Object.<array, object, string, string>} States to interact with tokens in `accountTokens`
+   *
+   */
+  _getTokenRelatedStates (selectedAddress) {
+    const accountTokens = this.store.getState().accountTokens
+    if (!selectedAddress) selectedAddress = this.store.getState().selectedAddress
+    const providerType = this.network.providerStore.getState().type
+    if (!(selectedAddress in accountTokens)) accountTokens[selectedAddress] = {}
+    if (!(providerType in accountTokens[selectedAddress])) accountTokens[selectedAddress][providerType] = []
+    const tokens = accountTokens[selectedAddress][providerType]
+    return { tokens, accountTokens, providerType, selectedAddress }
+  }
 }

 module.exports = PreferencesController
--- a/app/scripts/lib/enums.js
+++ b/app/scripts/lib/enums.js
@ -2,8 +2,19 @@ const ENVIRONMENT_TYPE_POPUP = 'popup'
 const ENVIRONMENT_TYPE_NOTIFICATION = 'notification'
 const ENVIRONMENT_TYPE_FULLSCREEN = 'fullscreen'

+const PLATFORM_BRAVE = 'Brave'
+const PLATFORM_CHROME = 'Chrome'
+const PLATFORM_EDGE = 'Edge'
+const PLATFORM_FIREFOX = 'Firefox'
+const PLATFORM_OPERA = 'Opera'
+
 module.exports = {
  ENVIRONMENT_TYPE_POPUP,
  ENVIRONMENT_TYPE_NOTIFICATION,
  ENVIRONMENT_TYPE_FULLSCREEN,
+  PLATFORM_BRAVE,
+  PLATFORM_CHROME,
+  PLATFORM_EDGE,
+  PLATFORM_FIREFOX,
+  PLATFORM_OPERA,
 }
--- a/app/scripts/lib/ipfsContent.js
+++ b/app/scripts/lib/ipfsContent.js
@ -5,7 +5,7 @@ module.exports = function (provider) {
    function ipfsContent (details) {
      const name = details.url.substring(7, details.url.length - 1)
      let clearTime = null
-      extension.tabs.getSelected(null, tab => {
+      extension.tabs.query({active: true}, tab => {
          extension.tabs.update(tab.id, { url: 'loading.html' })

          clearTime = setTimeout(() => {
@ -34,11 +34,11 @@ module.exports = function (provider) {
      return { cancel: true }
    }

-    extension.webRequest.onBeforeRequest.addListener(ipfsContent, {urls: ['*://*.eth/', '*://*.test/']})
+    extension.webRequest.onErrorOccurred.addListener(ipfsContent, {urls: ['*://*.eth/', '*://*.test/']})

    return {
      remove () {
-        extension.webRequest.onBeforeRequest.removeListener(ipfsContent)
+        extension.webRequest.onErrorOccurred.removeListener(ipfsContent)
      },
    }
 }
--- a/app/scripts/lib/setupRaven.js
+++ b/app/scripts/lib/setupRaven.js
@ -8,7 +8,7 @@ module.exports = setupRaven

 // Setup raven / sentry remote error reporting
 function setupRaven (opts) {
-  const { releaseVersion } = opts
+  const { release } = opts
  let ravenTarget
  // detect brave
  const isBrave = Boolean(window.chrome.ipcRenderer)
@ -22,7 +22,7 @@ function setupRaven (opts) {
  }

  const client = Raven.config(ravenTarget, {
-    releaseVersion,
+    release,
    transport: function (opts) {
      opts.data.extra.isBrave = isBrave
      const report = opts.data
--- a/app/scripts/lib/util.js
+++ b/app/scripts/lib/util.js
@ -5,6 +5,11 @@ const {
  ENVIRONMENT_TYPE_POPUP,
  ENVIRONMENT_TYPE_NOTIFICATION,
  ENVIRONMENT_TYPE_FULLSCREEN,
+  PLATFORM_FIREFOX,
+  PLATFORM_OPERA,
+  PLATFORM_CHROME,
+  PLATFORM_EDGE,
+  PLATFORM_BRAVE,
 } = require('./enums')

 /**
@ -37,6 +42,29 @@ const getEnvironmentType = (url = window.location.href) => {
  }
 }

+/**
+ * Returns the platform (browser) where the extension is running.
+ *
+ * @returns {string} the platform ENUM
+ *
+ */
+const getPlatform = _ => {
+  const ua = navigator.userAgent
+  if (ua.search('Firefox') !== -1) {
+    return PLATFORM_FIREFOX
+  } else {
+    if (window && window.chrome && window.chrome.ipcRenderer) {
+      return PLATFORM_BRAVE
+    } else if (ua.search('Edge') !== -1) {
+      return PLATFORM_EDGE
+    } else if (ua.search('OPR') !== -1) {
+      return PLATFORM_OPERA
+    } else {
+      return PLATFORM_CHROME
+    }
+  }
+}
+
 /**
 * Checks whether a given balance of ETH, represented as a hex string, is sufficient to pay a value plus a gas fee
 *
@ -114,6 +142,7 @@ function removeListeners (listeners, emitter) {
 module.exports = {
  removeListeners,
  applyListeners,
+  getPlatform,
  getStack,
  getEnvironmentType,
  sufficientBalance,
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@ -86,6 +86,7 @@ module.exports = class MetamaskController extends EventEmitter {
    this.preferencesController = new PreferencesController({
      initState: initState.PreferencesController,
      initLangCode: opts.initLangCode,
+      network: this.networkController,
    })

    // currency controller
@ -1405,7 +1406,7 @@ module.exports = class MetamaskController extends EventEmitter {
  }

  /**
-   * A method for activating the retrieval of price data and auto detect tokens,
+   * A method for activating the retrieval of price data,
   * which should only be fetched when the UI is visible.
   * @private
   * @param {boolean} active - True if price data should be getting fetched.
--- a/app/scripts/migrations/028.js
+++ b/app/scripts/migrations/028.js
@ -0,0 +1,40 @@
+// next version number
+const version = 28
+
+/*
+
+normalizes txParams on unconfirmed txs
+
+*/
+const clone = require('clone')
+
+module.exports = {
+  version,
+
+  migrate: async function (originalVersionedData) {
+    const versionedData = clone(originalVersionedData)
+    versionedData.meta.version = version
+    const state = versionedData.data
+    const newState = transformState(state)
+    versionedData.data = newState
+    return versionedData
+  },
+}
+
+function transformState (state) {
+  const newState = state
+
+  if (newState.PreferencesController) {
+    if (newState.PreferencesController.tokens && newState.PreferencesController.identities) {
+      const identities = newState.PreferencesController.identities
+      const tokens = newState.PreferencesController.tokens
+      newState.PreferencesController.accountTokens = {}
+      for (const identity in identities) {
+        newState.PreferencesController.accountTokens[identity] = {'mainnet': tokens}
+      }
+      newState.PreferencesController.tokens = []
+    }
+  }
+
+  return newState
+}
--- a/app/scripts/migrations/index.js
+++ b/app/scripts/migrations/index.js
@ -38,4 +38,5 @@ module.exports = [
  require('./025'),
  require('./026'),
  require('./027'),
+  require('./028'),
 ]
--- a/app/scripts/platforms/extension.js
+++ b/app/scripts/platforms/extension.js
@ -24,8 +24,13 @@ class ExtensionPlatform {
    return extension.runtime.getManifest().version
  }

-  openExtensionInBrowser (route = null) {
+  openExtensionInBrowser (route = null, queryString = null) {
    let extensionURL = extension.runtime.getURL('home.html')
+
+    if (queryString) {
+      extensionURL += `?${queryString}`
+    }
+
    if (route) {
      extensionURL += `#${route}`
    }
--- a/mascara/src/app/first-time/index.css
+++ b/mascara/src/app/first-time/index.css
@ -340,6 +340,19 @@
  min-width: 0;
 }

+.backup-phrase__tips-text--link {
+  color: #2f9ae0;
+  cursor: pointer;
+}
+
+.backup-phrase__tips-text--link:hover {
+  color: #2f9ae0;
+}
+
+.backup-phrase__tips-text--strong {
+  font-weight: bold;
+}
+
@media only screen and (max-width: 768px) {
  .backup-phrase__content-wrapper {
    flex-direction: column;
--- a/mascara/src/app/first-time/seed-screen.js
+++ b/mascara/src/app/first-time/seed-screen.js
@ -5,6 +5,7 @@ import classnames from 'classnames'
 import { withRouter } from 'react-router-dom'
 import { compose } from 'recompose'
 import Identicon from '../../../../ui/app/components/identicon'
+import {exportAsFile} from '../../../../ui/app/util'
 import Breadcrumbs from './breadcrumbs'
 import LoadingScreen from './loading-screen'
 import { DEFAULT_ROUTE, INITIALIZE_CONFIRM_SEED_ROUTE } from '../../../../ui/app/routes'
@ -65,6 +66,12 @@ class BackupPhraseScreen extends Component {
    }
  }

+  exportSeedWords = () => {
+    const { seedWords } = this.props
+
+    exportAsFile('MetaMask Secret Backup Phrase', seedWords, 'text/plain')
+  }
+
  renderSecretWordsContainer () {
    const { isShowingSecret } = this.state

@ -111,7 +118,7 @@ class BackupPhraseScreen extends Component {
        <div className="backup-phrase__tips">
          <div className="backup-phrase__tips-text">Tips:</div>
          <div className="backup-phrase__tips-text">
-            Store this phrase in a password manager like 1password.
+            Store this phrase in a password manager like 1Password.
          </div>
          <div className="backup-phrase__tips-text">
            Write this phrase on a piece of paper and store in a secure location. If you want even more security, write it down on multiple pieces of paper and store each in 2 - 3 different locations.
@ -119,6 +126,13 @@ class BackupPhraseScreen extends Component {
          <div className="backup-phrase__tips-text">
            Memorize this phrase.
          </div>
+          <div className="backup-phrase__tips-text">
+            <strong>
+              <a className="backup-phrase__tips-text--link backup-phrase__tips-text--strong" onClick={this.exportSeedWords}>
+                Download this Secret Backup Phrase
+              </a>
+            </strong> and keep it stored safely on an external encrypted hard drive or storage medium.
+          </div>
        </div>
        <div className="backup-phrase__next-button">
          <button
--- a/old-ui/app/components/transaction-list-item.js
+++ b/old-ui/app/components/transaction-list-item.js
@ -40,7 +40,7 @@ TransactionListItem.prototype.showRetryButton = function () {
  const currentNonce = txParams.nonce
  const currentNonceTxs = transactions.filter(tx => tx.txParams.nonce === currentNonce)
  const currentNonceSubmittedTxs = currentNonceTxs.filter(tx => tx.status === 'submitted')
-  const currentSubmittedTxs = transactions.filter(tx => tx.status === 'submitted')  
+  const currentSubmittedTxs = transactions.filter(tx => tx.status === 'submitted')
  const lastSubmittedTxWithCurrentNonce = currentNonceSubmittedTxs[0]
  const currentTxIsLatestWithNonce = lastSubmittedTxWithCurrentNonce &&
    lastSubmittedTxWithCurrentNonce.id === transaction.id
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -74,7 +74,8 @@
    ]
  },
  "dependencies": {
-    "@material-ui/core": "^1.0.0",
+    "@material-ui/core": "1.0.0",
+    "@zxing/library": "^0.7.0",
    "abi-decoder": "^1.0.9",
    "asmcrypto.js": "0.22.0",
    "async": "^2.5.0",
@ -97,6 +98,7 @@
    "debounce-stream": "^2.0.0",
    "deep-extend": "^0.5.1",
    "detect-node": "^2.0.3",
+    "detectrtc": "^1.3.6",
    "disc": "^1.3.2",
    "dnode": "^1.2.2",
    "end-of-stream": "^1.1.0",
@ -105,11 +107,11 @@
    "eth-bin-to-ops": "^1.0.1",
    "eth-block-tracker": "^4.0.1",
    "eth-contract-metadata": "github:MetaMask/eth-contract-metadata#master",
-    "eth-json-rpc-filters": "^2.1.1",
    "eth-json-rpc-middleware": "^2.4.0",
    "eth-keyring-controller": "^3.1.4",
    "eth-ens-namehash": "^2.0.8",
-    "eth-hd-keyring": "^2.0.0",
+    "eth-hd-keyring": "^1.2.2",
+    "eth-json-rpc-filters": "^1.2.6",
    "eth-json-rpc-infura": "^3.0.0",
    "eth-method-registry": "^1.0.0",
    "eth-phishing-detect": "^1.1.4",
@ -209,6 +211,7 @@
    "vreme": "^3.0.2",
    "web3": "^0.20.1",
    "web3-stream-provider": "^3.0.1",
+    "webrtc-adapter": "^6.3.0",
    "xtend": "^4.0.1"
  },
  "devDependencies": {
@ -247,7 +250,7 @@
    "eslint-plugin-mocha": "^5.0.0",
    "eslint-plugin-react": "^7.4.0",
    "eth-json-rpc-middleware": "^1.6.0",
-    "eth-keyring-controller": "^4.0.0",
+    "eth-keyring-controller": "^3.3.1",
    "file-loader": "^1.1.11",
    "fs-extra": "^6.0.1",
    "fs-promise": "^2.0.3",
--- a/test/integration/lib/tx-list-items.js
+++ b/test/integration/lib/tx-list-items.js
@ -14,6 +14,11 @@ QUnit.test('renders list items successfully', (assert) => {
  })
 })

+global.ethQuery = global.ethQuery || {}
+global.ethQuery.getTransactionCount = (_, cb) => {
+  cb(null, '0x3')
+}
+
 async function runTxListItemsTest (assert, done) {
  console.log('*** start runTxListItemsTest')
  const selectState = await queryAsync($, 'select')
--- a/test/unit/app/controllers/detect-tokens-test.js
+++ b/test/unit/app/controllers/detect-tokens-test.js
@ -1,16 +1,14 @@
 const assert = require('assert')
-const sinon = require('sinon')
 const nock = require('nock')
+const sinon = require('sinon')
 const ObservableStore = require('obs-store')
 const DetectTokensController = require('../../../../app/scripts/controllers/detect-tokens')
 const NetworkController = require('../../../../app/scripts/controllers/network/network')
 const PreferencesController = require('../../../../app/scripts/controllers/preferences')

 describe('DetectTokensController', () => {
-
-  let clock, network, preferences, controller, keyringMemStore
-
  const sandbox = sinon.createSandbox()
+  let clock, keyringMemStore, network, preferences, controller

  const noop = () => {}

@ -20,13 +18,14 @@ describe('DetectTokensController', () => {

  beforeEach(async () => {

+
    nock('https://api.infura.io')
      .get(/.*/)
      .reply(200)

    keyringMemStore = new ObservableStore({ isUnlocked: false})
    network = new NetworkController()
-    preferences = new PreferencesController()
+    preferences = new PreferencesController({ network })
    controller = new DetectTokensController({ preferences: preferences, network: network, keyringMemStore: keyringMemStore })

    network.initializeProvider(networkControllerProviderConfig)
@ -34,8 +33,8 @@ describe('DetectTokensController', () => {
  })

  after(() => {
-      sandbox.restore()
-      nock.cleanAll()
+    sandbox.restore()
+    nock.cleanAll()
  })

  it('should poll on correct interval', async () => {
@ -50,7 +49,7 @@ describe('DetectTokensController', () => {
    const network = new NetworkController()
    network.initializeProvider(networkControllerProviderConfig)
    network.setProviderType('mainnet')
-    const preferences = new PreferencesController()
+    const preferences = new PreferencesController({ network })
    const controller = new DetectTokensController({ preferences: preferences, network: network, keyringMemStore: keyringMemStore })
    controller.isOpen = true
    controller.isUnlocked = true
@ -68,7 +67,8 @@ describe('DetectTokensController', () => {
  })

  it('should not check tokens while in test network', async () => {
-    network.setProviderType('rinkeby')
+    // network.setProviderType('rinkeby')
+    // const controller = new DetectTokensController({ preferences: preferences, network: network, keyringMemStore: keyringMemStore })
    controller.isOpen = true
    controller.isUnlocked = true

@ -81,7 +81,8 @@ describe('DetectTokensController', () => {
  })

  it('should only check and add tokens while in main network', async () => {
-    network.setProviderType('mainnet')
+    // network.setProviderType('mainnet')
+    const controller = new DetectTokensController({ preferences: preferences, network: network, keyringMemStore: keyringMemStore })
    controller.isOpen = true
    controller.isUnlocked = true

@ -97,7 +98,8 @@ describe('DetectTokensController', () => {
  })

  it('should not detect same token while in main network', async () => {
-    network.setProviderType('mainnet')
+    // network.setProviderType('mainnet')
+    preferences.addToken('0x0d262e5dc4a06a0f1c90ce79c7a60c09dfc884e4', 'J8T', 8)
    const controller = new DetectTokensController({ preferences: preferences, network: network, keyringMemStore: keyringMemStore })
    controller.isOpen = true
    controller.isUnlocked = true
@ -114,7 +116,8 @@ describe('DetectTokensController', () => {
  })

  it('should trigger detect new tokens when change address', async () => {
-    network.setProviderType('mainnet')
+    // network.setProviderType('mainnet')
+    // const controller = new DetectTokensController({ preferences: preferences, network: network, keyringMemStore: keyringMemStore })
    controller.isOpen = true
    controller.isUnlocked = true
    var stub = sandbox.stub(controller, 'detectNewTokens')
@ -123,7 +126,8 @@ describe('DetectTokensController', () => {
  })

  it('should trigger detect new tokens when submit password', async () => {
-    network.setProviderType('mainnet')
+    // network.setProviderType('mainnet')
+    // const controller = new DetectTokensController({ preferences: preferences, network: network, keyringMemStore: keyringMemStore })
    controller.isOpen = true
    controller.selectedAddress = '0x0'
    var stub = sandbox.stub(controller, 'detectNewTokens')
@ -132,7 +136,8 @@ describe('DetectTokensController', () => {
  })

  it('should not trigger detect new tokens when not open or not unlocked', async () => {
-    network.setProviderType('mainnet')
+    // network.setProviderType('mainnet')
+    // const controller = new DetectTokensController({ preferences: preferences, network: network, keyringMemStore: keyringMemStore })
    controller.isOpen = true
    controller.isUnlocked = false
    var stub = sandbox.stub(controller, 'detectTokenBalance')
@ -143,4 +148,4 @@ describe('DetectTokensController', () => {
    clock.tick(180000)
    sandbox.assert.notCalled(stub)
  })
-})
+})
--- a/test/unit/app/controllers/preferences-controller-test.js
+++ b/test/unit/app/controllers/preferences-controller-test.js
@ -1,11 +1,14 @@
 const assert = require('assert')
+const ObservableStore = require('obs-store')
 const PreferencesController = require('../../../../app/scripts/controllers/preferences')

 describe('preferences controller', function () {
  let preferencesController
+  let network

  beforeEach(() => {
-    preferencesController = new PreferencesController()
+    network = {providerStore: new ObservableStore({ type: 'mainnet' })}
+    preferencesController = new PreferencesController({ network })
  })

  describe('setAddresses', function () {
@ -28,6 +31,20 @@ describe('preferences controller', function () {
      })
    })

+    it('should create account tokens for each account in the store', function () {
+      preferencesController.setAddresses([
+        '0xda22le',
+        '0x7e57e2',
+      ])
+
+      const accountTokens = preferencesController.store.getState().accountTokens
+
+      assert.deepEqual(accountTokens, {
+        '0xda22le': {},
+        '0x7e57e2': {},
+      })
+    })
+
    it('should replace its list of addresses', function () {
      preferencesController.setAddresses([
        '0xda22le',
@ -64,6 +81,17 @@ describe('preferences controller', function () {
      assert.equal(preferencesController.store.getState().identities['0xda22le'], undefined)
    })

+    it('should remove an address from state and respective tokens', function () {
+      preferencesController.setAddresses([
+        '0xda22le',
+        '0x7e57e2',
+      ])
+
+      preferencesController.removeAddress('0xda22le')
+
+      assert.equal(preferencesController.store.getState().accountTokens['0xda22le'], undefined)
+    })
+
    it('should switch accounts if the selected address is removed', function () {
      preferencesController.setAddresses([
        '0xda22le',
@ -158,6 +186,42 @@ describe('preferences controller', function () {
      await preferencesController.addToken(address, symbol, decimals)
      assert.equal(preferencesController.getTokens().length, 1, 'one token added for 2nd address')
    })
+
+    it('should add token per account', async function () {
+      const addressFirst = '0xabcdef1234567'
+      const addressSecond = '0xabcdef1234568'
+      const symbolFirst = 'ABBR'
+      const symbolSecond = 'ABBB'
+      const decimals = 5
+
+      await preferencesController.setSelectedAddress('0x7e57e2')
+      await preferencesController.addToken(addressFirst, symbolFirst, decimals)
+      const tokensFirstAddress = preferencesController.getTokens()
+
+      await preferencesController.setSelectedAddress('0xda22le')
+      await preferencesController.addToken(addressSecond, symbolSecond, decimals)
+      const tokensSeconAddress = preferencesController.getTokens()
+
+      assert.notEqual(tokensFirstAddress, tokensSeconAddress, 'add different tokens for two account and tokens are equal')
+    })
+
+    it('should add token per network', async function () {
+      const addressFirst = '0xabcdef1234567'
+      const addressSecond = '0xabcdef1234568'
+      const symbolFirst = 'ABBR'
+      const symbolSecond = 'ABBB'
+      const decimals = 5
+
+      network.providerStore.updateState({ type: 'mainnet' })
+      await preferencesController.addToken(addressFirst, symbolFirst, decimals)
+      const tokensFirstAddress = preferencesController.getTokens()
+
+      network.providerStore.updateState({ type: 'rinkeby' })
+      await preferencesController.addToken(addressSecond, symbolSecond, decimals)
+      const tokensSeconAddress = preferencesController.getTokens()
+
+      assert.notEqual(tokensFirstAddress, tokensSeconAddress, 'add different tokens for two networks and tokens are equal')
+    })
  })

  describe('removeToken', function () {
@ -182,6 +246,98 @@ describe('preferences controller', function () {
      const [token1] = tokens
      assert.deepEqual(token1, {address: '0xb', symbol: 'B', decimals: 5})
    })
+
+    it('should remove a token from its state on corresponding address', async function () {
+      await preferencesController.setSelectedAddress('0x7e57e2')
+      await preferencesController.addToken('0xa', 'A', 4)
+      await preferencesController.addToken('0xb', 'B', 5)
+      await preferencesController.setSelectedAddress('0x7e57e3')
+      await preferencesController.addToken('0xa', 'A', 4)
+      await preferencesController.addToken('0xb', 'B', 5)
+      const initialTokensSecond = preferencesController.getTokens()
+      await preferencesController.setSelectedAddress('0x7e57e2')
+      await preferencesController.removeToken('0xa')
+
+      const tokensFirst = preferencesController.getTokens()
+      assert.equal(tokensFirst.length, 1, 'one token removed in account')
+
+      const [token1] = tokensFirst
+      assert.deepEqual(token1, {address: '0xb', symbol: 'B', decimals: 5})
+
+      await preferencesController.setSelectedAddress('0x7e57e3')
+      const tokensSecond = preferencesController.getTokens()
+      assert.deepEqual(tokensSecond, initialTokensSecond, 'token deleted for account')
+    })
+
+    it('should remove a token from its state on corresponding network', async function () {
+      network.providerStore.updateState({ type: 'mainnet' })
+      await preferencesController.addToken('0xa', 'A', 4)
+      await preferencesController.addToken('0xb', 'B', 5)
+      network.providerStore.updateState({ type: 'rinkeby' })
+      await preferencesController.addToken('0xa', 'A', 4)
+      await preferencesController.addToken('0xb', 'B', 5)
+      const initialTokensSecond = preferencesController.getTokens()
+      network.providerStore.updateState({ type: 'mainnet' })
+      await preferencesController.removeToken('0xa')
+
+      const tokensFirst = preferencesController.getTokens()
+      assert.equal(tokensFirst.length, 1, 'one token removed in network')
+
+      const [token1] = tokensFirst
+      assert.deepEqual(token1, {address: '0xb', symbol: 'B', decimals: 5})
+
+      network.providerStore.updateState({ type: 'rinkeby' })
+      const tokensSecond = preferencesController.getTokens()
+      assert.deepEqual(tokensSecond, initialTokensSecond, 'token deleted for network')
+    })
+  })
+
+  describe('on setSelectedAddress', function () {
+    it('should update tokens from its state on corresponding address', async function () {
+      await preferencesController.setSelectedAddress('0x7e57e2')
+      await preferencesController.addToken('0xa', 'A', 4)
+      await preferencesController.addToken('0xb', 'B', 5)
+      await preferencesController.setSelectedAddress('0x7e57e3')
+      await preferencesController.addToken('0xa', 'C', 4)
+      await preferencesController.addToken('0xb', 'D', 5)
+
+      await preferencesController.setSelectedAddress('0x7e57e2')
+      const initialTokensFirst = preferencesController.getTokens()
+      await preferencesController.setSelectedAddress('0x7e57e3')
+      const initialTokensSecond = preferencesController.getTokens()
+
+      assert.notDeepEqual(initialTokensFirst, initialTokensSecond, 'tokens not equal for different accounts and tokens')
+
+      await preferencesController.setSelectedAddress('0x7e57e2')
+      const tokensFirst = preferencesController.getTokens()
+      await preferencesController.setSelectedAddress('0x7e57e3')
+      const tokensSecond = preferencesController.getTokens()
+
+      assert.deepEqual(tokensFirst, initialTokensFirst, 'tokens equal for same account')
+      assert.deepEqual(tokensSecond, initialTokensSecond, 'tokens equal for same account')
+    })
+  })
+
+  describe('on updateStateNetworkType', function () {
+    it('should remove a token from its state on corresponding network', async function () {
+      network.providerStore.updateState({ type: 'mainnet' })
+      await preferencesController.addToken('0xa', 'A', 4)
+      await preferencesController.addToken('0xb', 'B', 5)
+      const initialTokensFirst = preferencesController.getTokens()
+      network.providerStore.updateState({ type: 'rinkeby' })
+      await preferencesController.addToken('0xa', 'C', 4)
+      await preferencesController.addToken('0xb', 'D', 5)
+      const initialTokensSecond = preferencesController.getTokens()
+
+      assert.notDeepEqual(initialTokensFirst, initialTokensSecond, 'tokens not equal for different networks and tokens')
+
+      network.providerStore.updateState({ type: 'mainnet' })
+      const tokensFirst = preferencesController.getTokens()
+      network.providerStore.updateState({ type: 'rinkeby' })
+      const tokensSecond = preferencesController.getTokens()
+      assert.deepEqual(tokensFirst, initialTokensFirst, 'tokens equal for same network')
+      assert.deepEqual(tokensSecond, initialTokensSecond, 'tokens equal for same network')
+    })
  })
 })

--- a/test/unit/migrations/028-test.js
+++ b/test/unit/migrations/028-test.js
@ -0,0 +1,46 @@
+const assert = require('assert')
+const migration28 = require('../../../app/scripts/migrations/028')
+
+const oldStorage = {
+  'meta': {},
+  'data': {
+    'PreferencesController': {
+      'tokens': [{address: '0xa', symbol: 'A', decimals: 4}, {address: '0xb', symbol: 'B', decimals: 4}],
+      'identities': {
+        '0x6d14': {},
+        '0x3695': {},
+      },
+    },
+  },
+}
+
+describe('migration #28', () => {
+  it('should add corresponding tokens to accountTokens', (done) => {
+    migration28.migrate(oldStorage)
+      .then((newStorage) => {
+        const newTokens = newStorage.data.PreferencesController.tokens
+        const newAccountTokens = newStorage.data.PreferencesController.accountTokens
+
+        const testTokens = [{address: '0xa', symbol: 'A', decimals: 4}, {address: '0xb', symbol: 'B', decimals: 4}]
+        assert.equal(newTokens.length, 0, 'tokens is expected to have the length of 0')
+        assert.equal(newAccountTokens['0x6d14']['mainnet'].length, 2, 'tokens for address is expected to have the length of 2')
+        assert.equal(newAccountTokens['0x3695']['mainnet'].length, 2, 'tokens for address is expected to have the length of 2')
+        assert.equal(Object.keys(newAccountTokens).length, 2, 'account tokens should be created for all identities')
+        assert.deepEqual(newAccountTokens['0x6d14']['mainnet'], testTokens, 'tokens for address should be the same than before')
+        assert.deepEqual(newAccountTokens['0x3695']['mainnet'], testTokens, 'tokens for address should be the same than before')
+        done()
+      })
+      .catch(done)
+  })
+
+  it('should successfully migrate first time state', (done) => {
+    migration28.migrate({
+      meta: {},
+      data: require('../../../app/scripts/first-time-state'),
+    })
+      .then((migratedData) => {
+        assert.equal(migratedData.meta.version, migration28.version)
+        done()
+      }).catch(done)
+  })
+})
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@ -12,6 +12,7 @@ const { fetchLocale } = require('../i18n-helper')
 const log = require('loglevel')
 const { ENVIRONMENT_TYPE_NOTIFICATION } = require('../../app/scripts/lib/enums')
 const { hasUnconfirmedTransactions } = require('./helpers/confirm-transaction/util')
+const WebcamUtils = require('../lib/webcam-utils')

 var actions = {
  _setBackgroundConnection: _setBackgroundConnection,
@ -33,6 +34,8 @@ var actions = {
  ALERT_CLOSE: 'UI_ALERT_CLOSE',
  showAlert: showAlert,
  hideAlert: hideAlert,
+  QR_CODE_DETECTED: 'UI_QR_CODE_DETECTED',
+  qrCodeDetected,
  // network dropdown open
  NETWORK_DROPDOWN_OPEN: 'UI_NETWORK_DROPDOWN_OPEN',
  NETWORK_DROPDOWN_CLOSE: 'UI_NETWORK_DROPDOWN_CLOSE',
@ -125,7 +128,8 @@ var actions = {
  SHOW_CONF_TX_PAGE: 'SHOW_CONF_TX_PAGE',
  SHOW_CONF_MSG_PAGE: 'SHOW_CONF_MSG_PAGE',
  SET_CURRENT_FIAT: 'SET_CURRENT_FIAT',
-  setCurrentCurrency: setCurrentCurrency,
+  showQrScanner,
+  setCurrentCurrency,
  setCurrentAccountTab,
  // account detail screen
  SHOW_SEND_PAGE: 'SHOW_SEND_PAGE',
@ -143,6 +147,8 @@ var actions = {
  exportAccountComplete,
  SET_ACCOUNT_LABEL: 'SET_ACCOUNT_LABEL',
  setAccountLabel,
+  updateNetworkNonce,
+  SET_NETWORK_NONCE: 'SET_NETWORK_NONCE',
  // tx conf screen
  COMPLETED_TX: 'COMPLETED_TX',
  TRANSACTION_ERROR: 'TRANSACTION_ERROR',
@ -721,6 +727,28 @@ function showInfoPage () {
  }
 }

+function showQrScanner (ROUTE) {
+  return (dispatch, getState) => {
+    return WebcamUtils.checkStatus()
+    .then(status => {
+      if (!status.environmentReady) {
+         // We need to switch to fullscreen mode to ask for permission
+         global.platform.openExtensionInBrowser(`${ROUTE}`, `scan=true`)
+      } else {
+        dispatch(actions.showModal({
+          name: 'QR_SCANNER',
+        }))
+      }
+    }).catch(e => {
+      dispatch(actions.showModal({
+        name: 'QR_SCANNER',
+        error: true,
+        errorType: e.type,
+      }))
+    })
+  }
+}
+
 function setCurrentCurrency (currencyCode) {
  return (dispatch) => {
    dispatch(actions.showLoadingIndication())
@ -1483,11 +1511,12 @@ function showAccountDetail (address) {
  return (dispatch) => {
    dispatch(actions.showLoadingIndication())
    log.debug(`background.setSelectedAddress`)
-    background.setSelectedAddress(address, (err) => {
+    background.setSelectedAddress(address, (err, tokens) => {
      dispatch(actions.hideLoadingIndication())
      if (err) {
        return dispatch(actions.displayWarning(err.message))
      }
+      dispatch(updateTokens(tokens))
      dispatch({
        type: actions.SHOW_ACCOUNT_DETAIL,
        value: address,
@ -1806,6 +1835,17 @@ function hideAlert () {
  }
 }

+/**
+ * This action will receive two types of values via qrCodeData
+ * an object with the following structure {type, values}
+ * or null (used to clear the previous value)
+ */
+function qrCodeDetected (qrCodeData) {
+  return {
+    type: actions.QR_CODE_DETECTED,
+    value: qrCodeData,
+  }
+}

 function showLoadingIndication (message) {
  return {
@ -2115,6 +2155,24 @@ function updateFeatureFlags (updatedFeatureFlags) {
  }
 }

+function setNetworkNonce (networkNonce) {
+  return {
+    type: actions.SET_NETWORK_NONCE,
+    value: networkNonce,
+  }
+}
+
+function updateNetworkNonce (address) {
+  return (dispatch) => {
+    return new Promise((resolve, reject) => {
+      global.ethQuery.getTransactionCount(address, (err, data) => {
+        dispatch(setNetworkNonce(data))
+        resolve(data)
+      })
+    })
+  }
+}
+
 function setMouseUserState (isMouseUser) {
  return {
    type: actions.SET_MOUSE_USER_STATE,
--- a/ui/app/components/ens-input.js
+++ b/ui/app/components/ens-input.js
@ -27,6 +27,7 @@ function EnsInput () {
 }

 EnsInput.prototype.onChange = function (recipient) {
+
  const network = this.props.network
  const networkHasEnsSupport = getNetworkEnsSupport(network)

@ -54,6 +55,7 @@ EnsInput.prototype.render = function () {
  const opts = extend(props, {
    list: 'addresses',
    onChange: this.onChange.bind(this),
+    qrScanner: true,
  })
  return h('div', {
    style: { width: '100%', position: 'relative' },
--- a/ui/app/components/modals/index.scss
+++ b/ui/app/components/modals/index.scss
@ -1,5 +1,7 @@
@import './customize-gas/index';

+@import './qr-scanner/index';
+
 .modal-container {
  width: 100%;
  height: 100%;
--- a/ui/app/components/modals/modal.js
+++ b/ui/app/components/modals/modal.js
@ -21,6 +21,7 @@ const CustomizeGasModal = require('../customize-gas-modal')
 const NotifcationModal = require('./notification-modal')
 const ConfirmResetAccount = require('./confirm-reset-account')
 const ConfirmRemoveAccount = require('./confirm-remove-account')
+const QRScanner = require('./qr-scanner')
 const TransactionConfirmed = require('./transaction-confirmed')
 const WelcomeBeta = require('./welcome-beta')
 const Notification = require('./notification')
@ -346,6 +347,18 @@ const MODALS = {
      borderRadius: '8px',
    },
  },
+  QR_SCANNER: {
+    contents: h(QRScanner),
+    mobileModalStyle: {
+      ...modalContainerMobileStyle,
+    },
+    laptopModalStyle: {
+      ...modalContainerLaptopStyle,
+    },
+    contentStyle: {
+      borderRadius: '8px',
+    },
+  },

  DEFAULT: {
    contents: [],
--- a/ui/app/components/modals/qr-scanner/index.js
+++ b/ui/app/components/modals/qr-scanner/index.js
@ -0,0 +1,2 @@
+import QrScanner from './qr-scanner.container'
+module.exports = QrScanner
--- a/ui/app/components/modals/qr-scanner/index.scss
+++ b/ui/app/components/modals/qr-scanner/index.scss
@ -0,0 +1,83 @@
+.qr-scanner {
+  width: 100%;
+  height: 100%;
+  background-color: #fff;
+  display: flex;
+  flex-flow: column;
+  border-radius: 8px;
+
+  &__title {
+    font-size: 1.5rem;
+    font-weight: 500;
+    padding: 16px 0;
+    text-align: center;
+  }
+
+  &__content {
+    padding-left: 20px;
+    padding-right: 20px;
+
+    &__video-wrapper {
+      overflow: hidden;
+      width: 100%;
+      height: 275px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+
+      video {
+        transform: scaleX(-1);
+        width: auto;
+        height: 275px;
+      }
+    }
+  }
+
+  &__status {
+    text-align: center;
+    font-size: 14px;
+    padding: 15px;
+  }
+
+  &__image {
+    font-size: 1.5rem;
+    font-weight: 500;
+    padding: 16px 0 0;
+    text-align: center;
+  }
+
+  &__error {
+    text-align: center;
+    font-size: 16px;
+    padding: 15px;
+  }
+
+  &__footer {
+    padding: 20px;
+    flex-direction: row;
+    display: flex;
+
+    button {
+      margin-right: 15px;
+    }
+
+    button:last-of-type {
+      margin-right: 0;
+      background-color: #009eec;
+      border: none;
+      color: #fff;
+    }
+  }
+
+  &__close::after {
+    content: '\00D7';
+    font-size: 35px;
+    color: #9b9b9b;
+    position: absolute;
+    top: 4px;
+    right: 20px;
+    cursor: pointer;
+    font-weight: 300;
+  }
+}
+
--- a/ui/app/components/modals/qr-scanner/qr-scanner.component.js
+++ b/ui/app/components/modals/qr-scanner/qr-scanner.component.js
@ -0,0 +1,216 @@
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
+import { BrowserQRCodeReader } from '@zxing/library'
+import adapter from 'webrtc-adapter' // eslint-disable-line import/no-nodejs-modules, no-unused-vars
+import Spinner from '../../spinner'
+import WebcamUtils from '../../../../lib/webcam-utils'
+import PageContainerFooter from '../../page-container/page-container-footer/page-container-footer.component'
+
+export default class QrScanner extends Component {
+  static propTypes = {
+    hideModal: PropTypes.func.isRequired,
+    qrCodeDetected: PropTypes.func,
+    scanQrCode: PropTypes.func,
+    error: PropTypes.bool,
+    errorType: PropTypes.string,
+  }
+
+  static contextTypes = {
+    t: PropTypes.func,
+  }
+
+  constructor (props, context) {
+    super(props)
+
+    this.state = {
+      ready: false,
+      msg: context.t('accessingYourCamera'),
+    }
+    this.codeReader = null
+    this.permissionChecker = null
+    this.needsToReinit = false
+
+    // Clear pre-existing qr code data before scanning
+    this.props.qrCodeDetected(null)
+  }
+
+  componentDidMount () {
+    this.initCamera()
+  }
+
+  async checkPermisisions () {
+    const { permissions } = await WebcamUtils.checkStatus()
+    if (permissions) {
+      clearTimeout(this.permissionChecker)
+      // Let the video stream load first...
+      setTimeout(_ => {
+        this.setState({
+          ready: true,
+          msg: this.context.t('scanInstructions'),
+        })
+        if (this.needsToReinit) {
+          this.initCamera()
+          this.needsToReinit = false
+        }
+      }, 2000)
+    } else {
+      // Keep checking for permissions
+      this.permissionChecker = setTimeout(_ => {
+        this.checkPermisisions()
+      }, 1000)
+    }
+  }
+
+  componentWillUnmount () {
+    clearTimeout(this.permissionChecker)
+    if (this.codeReader) {
+      this.codeReader.reset()
+    }
+  }
+
+  initCamera () {
+    this.codeReader = new BrowserQRCodeReader()
+    this.codeReader.getVideoInputDevices()
+      .then(videoInputDevices => {
+        clearTimeout(this.permissionChecker)
+        this.checkPermisisions()
+        this.codeReader.decodeFromInputVideoDevice(undefined, 'video')
+        .then(content => {
+          const result = this.parseContent(content.text)
+          if (result.type !== 'unknown') {
+            this.props.qrCodeDetected(result)
+            this.stopAndClose()
+          } else {
+            this.setState({msg: this.context.t('unknownQrCode')})
+          }
+        })
+        .catch(err => {
+          if (err && err.name === 'NotAllowedError') {
+            this.setState({msg: this.context.t('youNeedToAllowCameraAccess')})
+            clearTimeout(this.permissionChecker)
+            this.needsToReinit = true
+            this.checkPermisisions()
+          }
+        })
+      }).catch(err => {
+        console.error('[QR-SCANNER]: getVideoInputDevices threw an exception: ', err)
+      })
+  }
+
+  parseContent (content) {
+    let type = 'unknown'
+    let values = {}
+
+    // Here we could add more cases
+    // To parse other type of links
+    // For ex. EIP-681 (https://eips.ethereum.org/EIPS/eip-681)
+
+
+    // Ethereum address links - fox ex. ethereum:0x.....1111
+    if (content.split('ethereum:').length > 1) {
+
+      type = 'address'
+      values = {'address': content.split('ethereum:')[1] }
+
+    // Regular ethereum addresses - fox ex. 0x.....1111
+    } else if (content.substring(0, 2).toLowerCase() === '0x') {
+
+      type = 'address'
+      values = {'address': content }
+
+    }
+    return {type, values}
+  }
+
+
+  stopAndClose = () => {
+    if (this.codeReader) {
+      this.codeReader.reset()
+    }
+    this.setState({ ready: false })
+    this.props.hideModal()
+  }
+
+  tryAgain = () => {
+    // close the modal
+    this.stopAndClose()
+    // wait for the animation and try again
+    setTimeout(_ => {
+      this.props.scanQrCode()
+    }, 1000)
+  }
+
+  renderVideo () {
+    return (
+      <div className={'qr-scanner__content__video-wrapper'}>
+        <video
+          id="video"
+          style={{
+            display: this.state.ready ? 'block' : 'none',
+          }}
+        />
+        { !this.state.ready ? <Spinner color={'#F7C06C'} /> : null}
+      </div>
+    )
+  }
+
+  renderErrorModal () {
+    let title, msg
+
+    if (this.props.error) {
+      if (this.props.errorType === 'NO_WEBCAM_FOUND') {
+        title = this.context.t('noWebcamFoundTitle')
+        msg = this.context.t('noWebcamFound')
+      } else {
+        title = this.context.t('unknownCameraErrorTitle')
+        msg = this.context.t('unknownCameraError')
+      }
+    }
+
+    return (
+      <div className="qr-scanner">
+        <div className="qr-scanner__close" onClick={this.stopAndClose}></div>
+
+        <div className="qr-scanner__image">
+          <img src={'images/webcam.svg'} width={70} height={70} />
+        </div>
+        <div className="qr-scanner__title">
+          { title }
+        </div>
+        <div className={'qr-scanner__error'}>
+          {msg}
+        </div>
+        <PageContainerFooter
+          onCancel={this.stopAndClose}
+          onSubmit={this.tryAgain}
+          cancelText={this.context.t('cancel')}
+          submitText={this.context.t('tryAgain')}
+          submitButtonType="confirm"
+        />
+      </div>
+    )
+  }
+
+  render () {
+    const { t } = this.context
+
+    if (this.props.error) {
+      return this.renderErrorModal()
+    }
+
+    return (
+      <div className="qr-scanner">
+        <div className="qr-scanner__close" onClick={this.stopAndClose}></div>
+        <div className="qr-scanner__title">
+          { `${t('scanQrCode')}` }
+        </div>
+        <div className="qr-scanner__content">
+          { this.renderVideo() }
+        </div>
+        <div className={'qr-scanner__status'}>
+          {this.state.msg}
+        </div>
+      </div>
+    )
+  }
+}
--- a/ui/app/components/modals/qr-scanner/qr-scanner.container.js
+++ b/ui/app/components/modals/qr-scanner/qr-scanner.container.js
@ -0,0 +1,24 @@
+import { connect } from 'react-redux'
+import QrScanner from './qr-scanner.component'
+
+const { hideModal, qrCodeDetected, showQrScanner } = require('../../../actions')
+import {
+  SEND_ROUTE,
+} from '../../../routes'
+
+const mapStateToProps = state => {
+  return {
+    error: state.appState.modal.modalState.props.error,
+    errorType: state.appState.modal.modalState.props.errorType,
+  }
+}
+
+const mapDispatchToProps = dispatch => {
+  return {
+    hideModal: () => dispatch(hideModal()),
+    qrCodeDetected: (data) => dispatch(qrCodeDetected(data)),
+    scanQrCode: () => dispatch(showQrScanner(SEND_ROUTE)),
+  }
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(QrScanner)
--- a/ui/app/components/pages/confirm-transaction-base/confirm-transaction-base.component.js
+++ b/ui/app/components/pages/confirm-transaction-base/confirm-transaction-base.component.js
@ -124,7 +124,7 @@ export default class ConfirmTransactionBase extends Component {

    if (simulationFails) {
      return {
-        valid: false,
+        valid: true,
        errorKey: TRANSACTION_ERROR_KEY,
      }
    }
--- a/ui/app/components/send/send-content/send-content.component.js
+++ b/ui/app/components/send/send-content/send-content.component.js
@ -11,6 +11,7 @@ export default class SendContent extends Component {

  static propTypes = {
    updateGas: PropTypes.func,
+    scanQrCode: PropTypes.func,
  };

  render () {
@ -18,7 +19,10 @@ export default class SendContent extends Component {
      <PageContainerContent>
        <div className="send-v2__form">
          <SendFromRow />
-          <SendToRow updateGas={(updateData) => this.props.updateGas(updateData)} />
+          <SendToRow
+            updateGas={(updateData) => this.props.updateGas(updateData)}
+            scanQrCode={ _ => this.props.scanQrCode()}
+          />
          <SendAmountRow updateGas={(updateData) => this.props.updateGas(updateData)} />
          <SendGasRow />
          <SendHexDataRow />
--- a/ui/app/components/send/send-content/send-to-row/send-to-row.component.js
+++ b/ui/app/components/send/send-content/send-to-row/send-to-row.component.js
@ -17,6 +17,7 @@ export default class SendToRow extends Component {
    updateGas: PropTypes.func,
    updateSendTo: PropTypes.func,
    updateSendToError: PropTypes.func,
+    scanQrCode: PropTypes.func,
  };

  static contextTypes = {
@ -51,6 +52,7 @@ export default class SendToRow extends Component {
        showError={inError}
      >
        <EnsInput
+          scanQrCode={_ => this.props.scanQrCode()}
          accounts={toAccounts}
          closeDropdown={() => closeToDropdown()}
          dropdownOpen={toDropdownOpen}
--- a/ui/app/components/send/send.component.js
+++ b/ui/app/components/send/send.component.js
@ -38,12 +38,30 @@ export default class SendTransactionScreen extends PersistentForm {
    updateAndSetGasTotal: PropTypes.func,
    updateSendErrors: PropTypes.func,
    updateSendTokenBalance: PropTypes.func,
+    scanQrCode: PropTypes.func,
+    qrCodeDetected: PropTypes.func,
+    qrCodeData: PropTypes.object,
  };

  static contextTypes = {
    t: PropTypes.func,
  };

+  componentWillReceiveProps (nextProps) {
+    if (nextProps.qrCodeData) {
+      if (nextProps.qrCodeData.type === 'address') {
+        const scannedAddress = nextProps.qrCodeData.values.address.toLowerCase()
+        const currentAddress = this.props.to && this.props.to.toLowerCase()
+        if (currentAddress !== scannedAddress) {
+          this.props.updateSendTo(scannedAddress)
+          this.updateGas({ to: scannedAddress })
+          // Clean up QR code data after handling
+          this.props.qrCodeDetected(null)
+        }
+      }
+    }
+  }
+
  updateGas ({ to: updatedToAddress, amount: value } = {}) {
    const {
      amount,
@ -158,6 +176,16 @@ export default class SendTransactionScreen extends PersistentForm {
      address,
    })
    this.updateGas()
+
+    // Show QR Scanner modal  if ?scan=true
+    if (window.location.search === '?scan=true') {
+      this.props.scanQrCode()
+
+      // Clear the queryString param after showing the modal
+      const cleanUrl = location.href.split('?')[0]
+      history.pushState({}, null, `${cleanUrl}`)
+      window.location.hash = '#send'
+    }
  }

  componentWillUnmount () {
@ -170,7 +198,10 @@ export default class SendTransactionScreen extends PersistentForm {
    return (
      <div className="page-container">
        <SendHeader history={history}/>
-        <SendContent updateGas={(updateData) => this.updateGas(updateData)}/>
+        <SendContent
+          updateGas={(updateData) => this.updateGas(updateData)}
+          scanQrCode={_ => this.props.scanQrCode()}
+        />
        <SendFooter history={history}/>
      </div>
    )
--- a/ui/app/components/send/send.container.js
+++ b/ui/app/components/send/send.container.js
@ -21,11 +21,15 @@ import {
  getSendFromObject,
  getSendTo,
  getTokenBalance,
+  getQrCodeData,
 } from './send.selectors'
 import {
+  updateSendTo,
  updateSendTokenBalance,
  updateGasData,
  setGasTotal,
+  showQrScanner,
+  qrCodeDetected,
 } from '../../actions'
 import {
  resetSendState,
@ -35,6 +39,10 @@ import {
  calcGasTotal,
 } from './send.utils.js'

+import {
+  SEND_ROUTE,
+} from '../../routes'
+
 module.exports = compose(
  withRouter,
  connect(mapStateToProps, mapDispatchToProps)
@ -60,6 +68,7 @@ function mapStateToProps (state) {
    tokenBalance: getTokenBalance(state),
    tokenContract: getSelectedTokenContract(state),
    tokenToFiatRate: getSelectedTokenToFiatRate(state),
+    qrCodeData: getQrCodeData(state),
  }
 }

@ -89,5 +98,8 @@ function mapDispatchToProps (dispatch) {
    },
    updateSendErrors: newError => dispatch(updateSendErrors(newError)),
    resetSendState: () => dispatch(resetSendState()),
+    scanQrCode: () => dispatch(showQrScanner(SEND_ROUTE)),
+    qrCodeDetected: (data) => dispatch(qrCodeDetected(data)),
+    updateSendTo: (to, nickname) => dispatch(updateSendTo(to, nickname)),
  }
 }
--- a/ui/app/components/send/send.selectors.js
+++ b/ui/app/components/send/send.selectors.js
@ -46,6 +46,7 @@ const selectors = {
  getTokenExchangeRate,
  getUnapprovedTxs,
  transactionsSelector,
+  getQrCodeData,
 }

 module.exports = selectors
@ -282,3 +283,7 @@ function transactionsSelector (state) {
    : txsToRender
      .sort((a, b) => b.time - a.time)
 }
+
+function getQrCodeData (state) {
+  return state.appState.qrCodeData
+}
--- a/ui/app/components/send/tests/send-container.test.js
+++ b/ui/app/components/send/tests/send-container.test.js
@ -44,6 +44,7 @@ proxyquire('../send.container.js', {
    getSendEditingTransactionId: (s) => `mockEditingTransactionId:${s}`,
    getSendFromObject: (s) => `mockFrom:${s}`,
    getTokenBalance: (s) => `mockTokenBalance:${s}`,
+    getQrCodeData: (s) => `mockQrCodeData:${s}`,
  },
  '../../actions': actionSpies,
  '../../ducks/send.duck': duckActionSpies,
@ -76,6 +77,7 @@ describe('send container', () => {
        tokenBalance: 'mockTokenBalance:mockState',
        tokenContract: 'mockTokenContract:mockState',
        tokenToFiatRate: 'mockTokenToFiatRate:mockState',
+        qrCodeData: 'mockQrCodeData:mockState',
      })
    })

--- a/ui/app/components/send/to-autocomplete/to-autocomplete.js
+++ b/ui/app/components/send/to-autocomplete/to-autocomplete.js
@ -4,6 +4,7 @@ const h = require('react-hyperscript')
 const inherits = require('util').inherits
 const AccountListItem = require('../account-list-item/account-list-item.component').default
 const connect = require('react-redux').connect
+const Tooltip = require('../../tooltip')

 ToAutoComplete.contextTypes = {
  t: PropTypes.func,
@ -94,11 +95,12 @@ ToAutoComplete.prototype.render = function () {
    dropdownOpen,
    onChange,
    inError,
+    qrScanner,
  } = this.props

  return h('div.send-v2__to-autocomplete', {}, [

-    h('input.send-v2__to-autocomplete__input', {
+    h(`input.send-v2__to-autocomplete__input${qrScanner ? '.with-qr' : ''}`, {
      placeholder: this.context.t('recipientAddress'),
      className: inError ? `send-v2__error-border` : '',
      value: to,
@ -108,7 +110,13 @@ ToAutoComplete.prototype.render = function () {
        borderColor: inError ? 'red' : null,
      },
    }),
-
+    qrScanner && h(Tooltip, {
+      title: this.context.t('scanQrCode'),
+      position: 'bottom',
+    }, h(`i.fa.fa-qrcode.fa-lg.send-v2__to-autocomplete__qr-code`, {
+      style: { color: '#33333' },
+      onClick: () => this.props.scanQrCode(),
+    })),
    !to && h(`i.fa.fa-caret-down.fa-lg.send-v2__to-autocomplete__down-caret`, {
      style: { color: '#dedede' },
      onClick: () => this.handleInputEvent(),
--- a/ui/app/components/tx-list-item.js
+++ b/ui/app/components/tx-list-item.js
@ -35,6 +35,7 @@ function mapStateToProps (state) {
    currentCurrency: getCurrentCurrency(state),
    contractExchangeRates: state.metamask.contractExchangeRates,
    selectedAddressTxList: state.metamask.selectedAddressTxList,
+    networkNonce: state.appState.networkNonce,
  }
 }

@ -209,6 +210,7 @@ TxListItem.prototype.showRetryButton = function () {
    selectedAddressTxList,
    transactionId,
    txParams,
+    networkNonce,
  } = this.props
  if (!txParams) {
    return false
@ -222,11 +224,7 @@ TxListItem.prototype.showRetryButton = function () {
  const currentTxIsLatestWithNonce = lastSubmittedTxWithCurrentNonce &&
    lastSubmittedTxWithCurrentNonce.id === transactionId
  if (currentSubmittedTxs.length > 0) {
-    const earliestSubmitted = currentSubmittedTxs.reduce((tx1, tx2) => {
-      if (tx1.submittedTime < tx2.submittedTime) return tx1
-      return tx2
-    })
-    currentTxSharesEarliestNonce = currentNonce === earliestSubmitted.txParams.nonce
+    currentTxSharesEarliestNonce = currentNonce === networkNonce
  }

  return currentTxSharesEarliestNonce && currentTxIsLatestWithNonce && Date.now() - transactionSubmittedTime > 30000
--- a/ui/app/components/tx-list.js
+++ b/ui/app/components/tx-list.js
@ -8,7 +8,7 @@ const selectors = require('../selectors')
 const TxListItem = require('./tx-list-item')
 const ShiftListItem = require('./shift-list-item')
 const { formatDate } = require('../util')
-const { showConfTxPage } = require('../actions')
+const { showConfTxPage, updateNetworkNonce } = require('../actions')
 const classnames = require('classnames')
 const { tokenInfoGetter } = require('../token-util')
 const { withRouter } = require('react-router-dom')
@ -28,12 +28,14 @@ function mapStateToProps (state) {
  return {
    txsToRender: selectors.transactionsSelector(state),
    conversionRate: selectors.conversionRateSelector(state),
+    selectedAddress: selectors.getSelectedAddress(state),
  }
 }

 function mapDispatchToProps (dispatch) {
  return {
    showConfTxPage: ({ id }) => dispatch(showConfTxPage({ id })),
+    updateNetworkNonce: (address) => dispatch(updateNetworkNonce(address)),
  }
 }

@ -44,6 +46,20 @@ function TxList () {

 TxList.prototype.componentWillMount = function () {
  this.tokenInfoGetter = tokenInfoGetter()
+  this.props.updateNetworkNonce(this.props.selectedAddress)
+}
+
+TxList.prototype.componentDidUpdate = function (prevProps) {
+  const oldTxsToRender = prevProps.txsToRender
+  const {
+    txsToRender: newTxsToRender,
+    selectedAddress,
+    updateNetworkNonce,
+  } = this.props
+
+  if (newTxsToRender.length > oldTxsToRender.length) {
+    updateNetworkNonce(selectedAddress)
+  }
 }

 TxList.prototype.render = function () {
--- a/ui/app/constants/error-keys.js
+++ b/ui/app/constants/error-keys.js
@ -1,3 +1,3 @@
 export const INSUFFICIENT_FUNDS_ERROR_KEY = 'insufficientFunds'
 export const GAS_LIMIT_TOO_LOW_ERROR_KEY = 'gasLimitTooLow'
-export const TRANSACTION_ERROR = 'transactionError'
+export const TRANSACTION_ERROR_KEY = 'transactionError'
--- a/ui/app/css/itcss/components/send.scss
+++ b/ui/app/css/itcss/components/send.scss
@ -626,6 +626,23 @@
      top: 18px;
      right: 12px;
    }
+
+    &__qr-code {
+      position: absolute;
+      top: 13px;
+      right: 33px;
+      cursor: pointer;
+      padding: 8px 5px 5px;
+      border-radius: 4px;
+    }
+
+    &__qr-code:hover {
+      background: #f1f1f1;
+    }
+
+    &__input.with-qr {
+      padding-right: 65px;
+    }
  }

  &__to-autocomplete, &__memo-text-area, &__hex-data {
--- a/ui/app/first-time/init-menu.js
+++ b/ui/app/first-time/init-menu.js
@ -130,7 +130,7 @@ class InitializeMenuScreen extends Component {
              textDecoration: 'underline',
              marginTop: '32px',
            },
-          }, 'Use classic interface'),
+          }, this.context.t('classicInterface')),
        ]),

      ])
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@ -51,6 +51,7 @@ function reduceApp (state, action) {
    sidebarOpen: false,
    alertOpen: false,
    alertMessage: null,
+    qrCodeData: null,
    networkDropdownOpen: false,
    currentView: seedWords ? seedConfView : defaultView,
    accountDetail: {
@ -65,6 +66,7 @@ function reduceApp (state, action) {
    buyView: {},
    isMouseUser: false,
    gasIsLoading: false,
+    networkNonce: null,
  }, state.appState)

  switch (action.type) {
@ -90,7 +92,7 @@ function reduceApp (state, action) {
        sidebarOpen: false,
      })

-    // sidebar methods
+    // alert methods
    case actions.ALERT_OPEN:
      return extend(appState, {
        alertOpen: true,
@ -103,6 +105,13 @@ function reduceApp (state, action) {
        alertMessage: null,
      })

+    // qr scanner methods
+    case actions.QR_CODE_DETECTED:
+      return extend(appState, {
+        qrCodeData: action.value,
+      })
+
+
    // modal methods:
    case actions.MODAL_OPEN:
      const { name, ...modalProps } = action.payload
@ -701,6 +710,11 @@ function reduceApp (state, action) {
        gasIsLoading: false,
      })

+    case actions.SET_NETWORK_NONCE:
+      return extend(appState, {
+        networkNonce: action.value,
+      })
+
    default:
      return appState
  }
--- a/ui/app/selectors/confirm-transaction.js
+++ b/ui/app/selectors/confirm-transaction.js
@ -147,14 +147,20 @@ export const tokenAmountAndToAddressSelector = createSelector(

 export const approveTokenAmountAndToAddressSelector = createSelector(
  tokenDataParamsSelector,
-  params => {
+  tokenDecimalsSelector,
+  (params, tokenDecimals) => {
    let toAddress = ''
    let tokenAmount = 0

    if (params && params.length) {
      toAddress = params.find(param => param.name === TOKEN_PARAM_SPENDER).value
      const value = Number(params.find(param => param.name === TOKEN_PARAM_VALUE).value)
-      tokenAmount = roundExponential(value)
+
+      if (tokenDecimals) {
+        tokenAmount = calcTokenAmount(value, tokenDecimals)
+      }
+      
+      tokenAmount = roundExponential(tokenAmount)
    }

    return {
--- a/ui/app/util.js
+++ b/ui/app/util.js
@ -271,9 +271,9 @@ function getContractAtAddress (tokenAddress) {
  return global.eth.contract(abi).at(tokenAddress)
 }

-function exportAsFile (filename, data) {
+function exportAsFile (filename, data, type = 'text/csv') {
  // source: https://stackoverflow.com/a/33542499 by Ludovic Feltz
-  const blob = new Blob([data], {type: 'text/csv'})
+  const blob = new Blob([data], {type})
  if (window.navigator.msSaveOrOpenBlob) {
    window.navigator.msSaveBlob(blob, filename)
  } else {
--- a/ui/lib/webcam-utils.js
+++ b/ui/lib/webcam-utils.js
@ -0,0 +1,36 @@
+'use strict'
+
+import DetectRTC from 'detectrtc'
+const { ENVIRONMENT_TYPE_POPUP } = require('../../app/scripts/lib/enums')
+const { getEnvironmentType, getPlatform } = require('../../app/scripts/lib/util')
+const { PLATFORM_BRAVE, PLATFORM_FIREFOX } = require('../../app/scripts/lib/enums')
+
+class WebcamUtils {
+
+  static checkStatus () {
+    return new Promise((resolve, reject) => {
+      const isPopup = getEnvironmentType(window.location.href) === ENVIRONMENT_TYPE_POPUP
+      const isFirefoxOrBrave = getPlatform() === (PLATFORM_FIREFOX || PLATFORM_BRAVE)
+      try {
+        DetectRTC.load(_ => {
+          if (DetectRTC.hasWebcam) {
+              let environmentReady = true
+              if ((isFirefoxOrBrave && isPopup) || (isPopup && !DetectRTC.isWebsiteHasWebcamPermissions)) {
+                environmentReady = false
+              }
+              resolve({
+                permissions: DetectRTC.isWebsiteHasWebcamPermissions,
+                environmentReady,
+              })
+          } else {
+              reject({type: 'NO_WEBCAM_FOUND'})
+          }
+        })
+      } catch (e) {
+        reject({type: 'UNKNOWN_ERROR'})
+      }
+    })
+  }
+}
+
+module.exports = WebcamUtils