Merge branch 'master' into i3471-checkbalanceonconfirmscreen

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Current Master
 
+- Fix bug where the "Reset account" feature would not clear the network cache.
+
 ## 4.4.0 Mon Mar 26 2018
 
 - Internationalization: Taiwanese, Thai, Slovenian

app/_locales/en/messages.json

@@ -235,7 +235,7 @@
   "done": {
     "message": "Done"
   },
-  "downloadStatelogs": {
+  "downloadStateLogs": {
     "message": "Download State Logs"
   },
   "dropped": {
@@ -671,6 +671,12 @@
   "save": {
     "message": "Save"
   },
+  "reprice_title": {
+    "message": "Reprice Transaction"
+  },
+  "reprice_subtitle": {
+    "message": "Increase your gas price to attempt to overwrite and speed up your transaction"
+  },
   "saveAsFile": {
     "message": "Save as File",
     "description": "Account export process"

app/_locales/index.json

@@ -0,0 +1,19 @@
+[
+  { "code": "de", "name": "German" },
+  { "code": "en", "name": "English" },
+  { "code": "es", "name": "Spanish" },
+  { "code": "fr", "name": "French" },
+  { "code": "hn", "name": "Hindi" },
+  { "code": "it", "name": "Italian" },
+  { "code": "ja", "name": "Japanese" },
+  { "code": "ko", "name": "Korean" },
+  { "code": "nl", "name": "Dutch" },
+  { "code": "ph", "name": "Tagalog" },
+  { "code": "pt", "name": "Portuguese" },
+  { "code": "ru", "name": "Russian" },
+  { "code": "sl", "name": "Slovenian" },
+  { "code": "th", "name": "Thai" },
+  { "code": "vi", "name": "Vietnamese" },
+  { "code": "zh_CN", "name": "Mandarin" },
+  { "code": "zh_TW", "name": "Taiwanese" }
+]

app/_locales/it/messages.json

@@ -223,7 +223,7 @@
   "done": {
     "message": "Finito"
   },
-  "downloadStatelogs": {
+  "downloadStateLogs": {
     "message": "Scarica i log di Stato"
   },
   "edit": {

app/_locales/pt/messages.json

@@ -223,7 +223,7 @@
   "done": {
     "message": "Finalizado"
   },
-  "downloadStatelogs": {
+  "downloadStateLogs": {
     "message": "Descarregar Registos de Estado"
   },
   "edit": {

app/scripts/background.js

@@ -19,7 +19,7 @@ const setupRaven = require('./lib/setupRaven')
 const reportFailedTxToSentry = require('./lib/reportFailedTxToSentry')
 const setupMetamaskMeshMetrics = require('./lib/setupMetamaskMeshMetrics')
 const EdgeEncryptor = require('./edge-encryptor')
-
+const getFirstPreferredLangCode = require('./lib/get-first-preferred-lang-code')
 
 const STORAGE_KEY = 'metamask-config'
 const METAMASK_DEBUG = 'GULP_METAMASK_DEBUG'
@@ -58,7 +58,8 @@ setupMetamaskMeshMetrics()
 
 async function initialize () {
   const initState = await loadStateFromPersistence()
-  await setupController(initState)
+  const initLangCode = await getFirstPreferredLangCode()
+  await setupController(initState, initLangCode)
   log.debug('MetaMask initialization complete.')
 }
 
@@ -89,7 +90,7 @@ async function loadStateFromPersistence () {
   return versionedData.data
 }
 
-function setupController (initState) {
+function setupController (initState, initLangCode) {
   //
   // MetaMask Controller
   //
@@ -101,6 +102,8 @@ function setupController (initState) {
     showUnapprovedTx: triggerUi,
     // initial state
     initState,
+    // initial locale code
+    initLangCode,
     // platform specific api
     platform,
     encryptor: isEdge ? new EdgeEncryptor() : undefined,

app/scripts/controllers/preferences.js

@@ -11,6 +11,7 @@ class PreferencesController {
       tokens: [],
       useBlockie: false,
       featureFlags: {},
+      currentLocale: opts.initLangCode,
     }, opts.initState)
     this.store = new ObservableStore(initState)
   }
@@ -24,6 +25,10 @@ class PreferencesController {
     return this.store.getState().useBlockie
   }
 
+  setCurrentLocale (key) {
+    this.store.updateState({ currentLocale: key })
+  }
+
   setSelectedAddress (_address) {
     return new Promise((resolve, reject) => {
       const address = normalizeAddress(_address)

app/scripts/lib/extractEthjsErrorMessage.js

@@ -0,0 +1,27 @@
+const ethJsRpcSlug = 'Error: [ethjs-rpc] rpc error with payload '
+const errorLabelPrefix = 'Error: '
+
+module.exports = extractEthjsErrorMessage
+
+
+//
+// ethjs-rpc provides overly verbose error messages
+// if we detect this type of message, we extract the important part
+// Below is an example input and output
+//
+// Error: [ethjs-rpc] rpc error with payload {"id":3947817945380,"jsonrpc":"2.0","params":["0xf8eb8208708477359400830398539406012c8cf97bead5deae237070f9587f8e7a266d80b8843d7d3f5a0000000000000000000000000000000000000000000000000000000000081d1a000000000000000000000000000000000000000000000000001ff973cafa800000000000000000000000000000000000000000000000000000038d7ea4c68000000000000000000000000000000000000000000000000000000000000003f48025a04c32a9b630e0d9e7ff361562d850c86b7a884908135956a7e4a336fa0300d19ca06830776423f25218e8d19b267161db526e66895567147015b1f3fc47aef9a3c7"],"method":"eth_sendRawTransaction"} Error: replacement transaction underpriced
+//
+// Transaction Failed: replacement transaction underpriced
+//
+
+
+function extractEthjsErrorMessage(errorMessage) {
+  const isEthjsRpcError = errorMessage.includes(ethJsRpcSlug)
+  if (isEthjsRpcError) {
+    const payloadAndError = errorMessage.slice(ethJsRpcSlug.length)
+    const originalError = payloadAndError.slice(payloadAndError.indexOf(errorLabelPrefix) + errorLabelPrefix.length)
+    return originalError
+  } else {
+    return errorMessage
+  }
+}

app/scripts/lib/get-first-preferred-lang-code.js

@@ -0,0 +1,16 @@
+const extension = require('extensionizer')
+const promisify = require('pify')
+const allLocales = require('../../_locales/index.json')
+
+const existingLocaleCodes = allLocales.map(locale => locale.code)
+
+async function getFirstPreferredLangCode () {
+  const userPreferredLocaleCodes = await promisify(
+    extension.i18n.getAcceptLanguages,
+    { errorFirst: false }
+  )()
+  const firstPreferredLangCode = userPreferredLocaleCodes.find(code => existingLocaleCodes.includes(code))
+  return firstPreferredLangCode || 'en'
+}
+
+module.exports = getFirstPreferredLangCode

app/scripts/lib/reportFailedTxToSentry.js

@@ -1,5 +1,4 @@
-const ethJsRpcSlug = 'Error: [ethjs-rpc] rpc error with payload '
+const extractEthjsErrorMessage = require('./extractEthjsErrorMessage')
-const errorLabelPrefix = 'Error: '
 
 module.exports = reportFailedTxToSentry
 
@@ -9,30 +8,9 @@ module.exports = reportFailedTxToSentry
 //
 
 function reportFailedTxToSentry({ raven, txMeta }) {
-  const errorMessage = extractErrorMessage(txMeta.err.message)
+  const errorMessage = 'Transaction Failed: ' + extractEthjsErrorMessage(txMeta.err.message)
   raven.captureMessage(errorMessage, {
     // "extra" key is required by Sentry
     extra: txMeta,
   })
 }
-
-//
-// ethjs-rpc provides overly verbose error messages
-// if we detect this type of message, we extract the important part
-// Below is an example input and output
-//
-// Error: [ethjs-rpc] rpc error with payload {"id":3947817945380,"jsonrpc":"2.0","params":["0xf8eb8208708477359400830398539406012c8cf97bead5deae237070f9587f8e7a266d80b8843d7d3f5a0000000000000000000000000000000000000000000000000000000000081d1a000000000000000000000000000000000000000000000000001ff973cafa800000000000000000000000000000000000000000000000000000038d7ea4c68000000000000000000000000000000000000000000000000000000000000003f48025a04c32a9b630e0d9e7ff361562d850c86b7a884908135956a7e4a336fa0300d19ca06830776423f25218e8d19b267161db526e66895567147015b1f3fc47aef9a3c7"],"method":"eth_sendRawTransaction"} Error: replacement transaction underpriced
-//
-// Transaction Failed: replacement transaction underpriced
-//
-
-function extractErrorMessage(errorMessage) {
-  const isEthjsRpcError = errorMessage.includes(ethJsRpcSlug)
-  if (isEthjsRpcError) {
-    const payloadAndError = errorMessage.slice(ethJsRpcSlug.length)
-    const originalError = payloadAndError.slice(payloadAndError.indexOf(errorLabelPrefix) + errorLabelPrefix.length)
-    return `Transaction Failed: ${originalError}`
-  } else {
-    return `Transaction Failed: ${errorMessage}`
-  }
-}

app/scripts/lib/setupRaven.js

@@ -1,5 +1,6 @@
 const Raven = require('raven-js')
 const METAMASK_DEBUG = 'GULP_METAMASK_DEBUG'
+const extractEthjsErrorMessage = require('./extractEthjsErrorMessage')
 const PROD = 'https://3567c198f8a8412082d32655da2961d0@sentry.io/273505'
 const DEV = 'https://f59f3dd640d2429d9d0e2445a87ea8e1@sentry.io/273496'
 
@@ -21,8 +22,12 @@ function setupRaven(opts) {
   const client = Raven.config(ravenTarget, {
     release,
     transport: function(opts) {
-      // modify report urls
       const report = opts.data
+      // simplify ethjs error messages
+      report.exception.values.forEach(item => {
+        item.value = extractEthjsErrorMessage(item.value)
+      })
+      // modify report urls
       rewriteReportUrls(report)
       // make request normally
       client._makeRequest(opts)

app/scripts/metamask-controller.js

@@ -82,6 +82,7 @@ module.exports = class MetamaskController extends EventEmitter {
     // preferences controller
     this.preferencesController = new PreferencesController({
       initState: initState.PreferencesController,
+      initLangCode: opts.initLangCode,
     })
 
     // currency controller
@@ -351,6 +352,7 @@ module.exports = class MetamaskController extends EventEmitter {
       getState: (cb) => cb(null, this.getState()),
       setCurrentCurrency: this.setCurrentCurrency.bind(this),
       setUseBlockie: this.setUseBlockie.bind(this),
+      setCurrentLocale: this.setCurrentLocale.bind(this),
       markAccountsFound: this.markAccountsFound.bind(this),
       markPasswordForgotten: this.markPasswordForgotten.bind(this),
       unMarkPasswordForgotten: this.unMarkPasswordForgotten.bind(this),
@@ -365,7 +367,7 @@ module.exports = class MetamaskController extends EventEmitter {
       placeSeedWords: this.placeSeedWords.bind(this),
       verifySeedPhrase: nodeify(this.verifySeedPhrase, this),
       clearSeedWordCache: this.clearSeedWordCache.bind(this),
-      resetAccount: this.resetAccount.bind(this),
+      resetAccount: nodeify(this.resetAccount, this),
       importAccountWithStrategy: this.importAccountWithStrategy.bind(this),
 
       // vault management
@@ -583,10 +585,15 @@ module.exports = class MetamaskController extends EventEmitter {
   /**
    * ?
    */
-  resetAccount (cb) {
+  async resetAccount (cb) {
     const selectedAddress = this.preferencesController.getSelectedAddress()
     this.txController.wipeTransactions(selectedAddress)
-    cb(null, selectedAddress)
+
+    const networkController = this.networkController
+    const oldType = networkController.getProviderConfig().type
+    await networkController.setProviderType(oldType, true)
+
+    return selectedAddress
   }
 
   /**
@@ -1029,6 +1036,15 @@ module.exports = class MetamaskController extends EventEmitter {
     }
   }
 
+  setCurrentLocale (key, cb) {
+    try {
+      this.preferencesController.setCurrentLocale(key)
+      cb(null)
+    } catch (err) {
+      cb(err)
+    }
+  }
+
   recordFirstTimeInfo (initState) {
     if (!('firstTimeInfo' in initState)) {
       initState.firstTimeInfo = {

app/scripts/popup.js

@@ -10,6 +10,10 @@ const NotificationManager = require('./lib/notification-manager')
 const notificationManager = new NotificationManager()
 const setupRaven = require('./lib/setupRaven')
 
+start().catch(log.error)
+
+async function start() {
+
   // create platform global
   global.platform = new ExtensionPlatform()
 
@@ -76,3 +80,5 @@ function displayCriticalError (err) {
     log.error(err.stack)
     throw err
   }
+
+}

development/genStates.js

@@ -1,6 +1,8 @@
 const fs = require('fs')
 const path = require('path')
 const promisify = require('pify')
+const enLocaleMessages = require('../app/_locales/en/messages.json')
+
 
 start().catch(console.error)
 
@@ -12,6 +14,9 @@ async function start () {
     const stateFilePath = path.join(__dirname, 'states', stateFileName)
     const stateFileContent = await promisify(fs.readFile)(stateFilePath, 'utf8')
     const state = JSON.parse(stateFileContent)
+
+    state.localeMessages = { en: enLocaleMessages, current: {} }
+
     const stateName = stateFileName.split('.')[0].replace(/-/g, ' ', 'g')
     states[stateName] = state
   }))

development/states/add-token.json

@@ -106,7 +106,8 @@
       "errors": {},
       "maxModeOn": false,
       "editingTransactionId": null
-    }
+    },
+    "currentLocale": "en"
   },
   "appState": {
     "menuOpen": false,

development/states/confirm-new-ui.json

@@ -128,7 +128,8 @@
       "errors": {},
       "maxModeOn": false,
       "editingTransactionId": null
-    }
+    },
+    "currentLocale": "en"
   },
   "appState": {
     "menuOpen": false,

development/states/confirm-sig-requests.json

@@ -149,7 +149,8 @@
       "errors": {},
       "maxModeOn": false,
       "editingTransactionId": null
-    }
+    },
+    "currentLocale": "en"
   },
   "appState": {
     "menuOpen": false,

development/states/first-time.json

@@ -36,7 +36,8 @@
     },
     "shapeShiftTxList": [],
     "lostAccounts": [],
-    "tokens": []
+    "tokens": [],
+    "currentLocale": "en"
   },
   "appState": {
     "menuOpen": false,

development/states/send-edit.json

@@ -128,7 +128,8 @@
       "errors": {},
       "maxModeOn": false,
       "editingTransactionId": null
-    }
+    },
+    "currentLocale": "en"
   },
   "appState": {
     "menuOpen": false,

development/states/send-new-ui.json

@@ -107,7 +107,8 @@
       "errors": {},
       "maxModeOn": false,
       "editingTransactionId": null
-    }
+    },
+    "currentLocale": "en"
   },
   "appState": {
     "menuOpen": false,

mascara/src/app/first-time/index.js

@@ -20,7 +20,6 @@ class FirstTimeFlow extends Component {
     seedWords: PropTypes.string,
     address: PropTypes.string,
     noActiveNotices: PropTypes.bool,
-    goToBuyEtherView: PropTypes.func.isRequired,
   };
 
   static defaultProps = {
@@ -171,4 +170,3 @@ export default connect(
     openBuyEtherModal: () => dispatch(showModal({ name: 'DEPOSIT_ETHER'})),
   })
 )(FirstTimeFlow)
-

old-ui/app/config.js

@@ -168,7 +168,6 @@ ConfigScreen.prototype.render = function () {
               h('a', {
                 href: 'http://metamask.helpscoutdocs.com/article/36-resetting-an-account',
                 target: '_blank',
-                onClick (event) { this.navigateTo(event.target.href) },
               }, 'Read more.'),
             ]),
             h('br'),
@@ -260,7 +259,3 @@ function currentProviderDisplay (metamaskState) {
     h('span', value),
   ])
 }
-
-ConfigScreen.prototype.navigateTo = function (url) {
-  global.platform.openWindow({ url })
-}

package-lock.json

@@ -5352,6 +5352,11 @@
             "json-rpc-error": "2.0.0",
             "promise-to-callback": "1.0.0"
           }
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
         }
       }
     },
@@ -5665,6 +5670,13 @@
             "ethjs-util": "0.1.4",
             "pify": "2.3.0",
             "tape": "4.8.0"
+          },
+          "dependencies": {
+            "pify": {
+              "version": "2.3.0",
+              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+              "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
+            }
           }
         },
         "ethjs-format": {
@@ -7053,6 +7065,13 @@
             "pify": "2.3.0",
             "pinkie-promise": "2.0.1",
             "rimraf": "2.6.2"
+          },
+          "dependencies": {
+            "pify": {
+              "version": "2.3.0",
+              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+              "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
+            }
           }
         }
       }
@@ -8357,6 +8376,13 @@
         "object-assign": "4.1.1",
         "pify": "2.3.0",
         "pinkie-promise": "2.0.1"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
+        }
       }
     },
     "globjoin": {
@@ -11917,6 +11943,13 @@
         "pify": "2.3.0",
         "pinkie-promise": "2.0.1",
         "strip-bom": "2.0.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
+        }
       }
     },
     "loader-runner": {
@@ -16461,6 +16494,13 @@
         "graceful-fs": "4.1.11",
         "pify": "2.3.0",
         "pinkie-promise": "2.0.1"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
+        }
       }
     },
     "pathval": {
@@ -16507,9 +16547,9 @@
       "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
     "pify": {
-      "version": "2.3.0",
+      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
+      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
     },
     "ping-pong-stream": {
       "version": "1.0.0",
@@ -19786,6 +19826,14 @@
             "object-assign": "4.1.1",
             "pify": "2.3.0",
             "pinkie-promise": "2.0.1"
+          },
+          "dependencies": {
+            "pify": {
+              "version": "2.3.0",
+              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+              "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+              "dev": true
+            }
           }
         },
         "has-flag": {
@@ -20050,6 +20098,12 @@
           "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
           "dev": true
         },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        },
         "postcss": {
           "version": "5.2.18",
           "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
@@ -21654,6 +21708,12 @@
           "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=",
           "dev": true
         },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        },
         "replace-ext": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",

package.json

@@ -21,13 +21,15 @@
     "test:coverage": "nyc npm run test:unit && npm run test:coveralls-upload",
     "test:coveralls-upload": "if [ $COVERALLS_REPO_TOKEN ]; then nyc report --reporter=text-lcov | coveralls; fi",
     "test:flat": "npm run test:flat:build && karma start test/flat.conf.js",
-    "test:flat:build": "npm run test:flat:build:ui && npm run test:flat:build:tests",
+    "test:flat:build": "npm run test:flat:build:ui && npm run test:flat:build:tests && npm run test:flat:build:locales",
     "test:flat:build:tests": "node test/integration/index.js",
     "test:flat:build:states": "node development/genStates.js",
+    "test:flat:build:locales": "mkdirp dist/chrome && cp -R app/_locales dist/chrome/_locales",
     "test:flat:build:ui": "npm run test:flat:build:states && browserify ./development/mock-dev.js -o ./development/bundle.js",
     "test:mascara": "npm run test:mascara:build && karma start test/mascara.conf.js",
-    "test:mascara:build": "mkdirp dist/mascara && npm run test:mascara:build:ui && npm run test:mascara:build:background && npm run test:mascara:build:tests",
+    "test:mascara:build": "mkdirp dist/mascara && npm run test:mascara:build:ui && npm run test:mascara:build:background && npm run test:mascara:build:tests && npm run test:mascara:build:locales",
     "test:mascara:build:ui": "browserify mascara/test/test-ui.js -o dist/mascara/ui.js",
+    "test:mascara:build:locales": "mkdirp dist/chrome && cp -R app/_locales dist/chrome/_locales",
     "test:mascara:build:background": "browserify mascara/src/background.js -o dist/mascara/background.js",
     "test:mascara:build:tests": "browserify test/integration/lib/first-time.js -o dist/mascara/tests.js",
     "sentry": "export RELEASE=`cat app/manifest.json| jq -r .version` && npm run sentry:release && npm run sentry:upload",
@@ -149,6 +151,7 @@
     "promise-filter": "^1.1.0",
     "promise-to-callback": "^1.0.0",
     "pump": "^3.0.0",
+    "pify": "^3.0.0",
     "pumpify": "^1.3.4",
     "qrcode-npm": "0.0.3",
     "ramda": "^0.24.1",
@@ -212,7 +215,7 @@
     "enzyme": "^3.3.0",
     "enzyme-adapter-react-15": "^1.0.5",
     "eslint-plugin-chai": "0.0.1",
-    "eslint-plugin-mocha": "^4.9.0",
+    "eslint-plugin-mocha": "^5.0.0",
     "eslint-plugin-react": "^7.4.0",
     "eth-json-rpc-middleware": "^1.2.7",
     "fs-promise": "^2.0.3",
@@ -257,7 +260,7 @@
     "react-testutils-additions": "^15.2.0",
     "selenium-webdriver": "^3.5.0",
     "redux-test-utils": "^0.2.2",
-    "sinon": "^4.0.0",
+    "sinon": "^5.0.0",
     "stylelint-config-standard": "^18.2.0",
     "tape": "^4.5.1",
     "testem": "^2.0.0",

test/base.conf.js

@@ -19,11 +19,13 @@ module.exports = function(config) {
       'test/integration/jquery-3.1.0.min.js',
       { pattern: 'dist/chrome/images/**/*.*', watched: false, included: false, served: true },
       { pattern: 'dist/chrome/fonts/**/*.*', watched: false, included: false, served: true },
+      { pattern: 'dist/chrome/_locales/**/*.*', watched: false, included: false, served: true },
     ],
 
     proxies: {
       '/images/': '/base/dist/chrome/images/',
       '/fonts/': '/base/dist/chrome/fonts/',
+      '/_locales/': '/base/dist/chrome/_locales/',
     },
 
     // test results reporter to use

ui/app/accounts/import/index.js

@@ -1,43 +1,38 @@
 const inherits = require('util').inherits
 const Component = require('react').Component
 const h = require('react-hyperscript')
-const connect = require('react-redux').connect
+const connect = require('../../metamask-connect')
-const t = require('../../../i18n')
 import Select from 'react-select'
 
 // Subviews
 const JsonImportView = require('./json.js')
 const PrivateKeyImportView = require('./private-key.js')
 
-const menuItems = [
-  t('privateKey'),
-  t('jsonFile'),
-]
 
-module.exports = connect(mapStateToProps)(AccountImportSubview)
+module.exports = connect()(AccountImportSubview)
-
-function mapStateToProps (state) {
-  return {
-    menuItems,
-  }
-}
 
 inherits(AccountImportSubview, Component)
 function AccountImportSubview () {
   Component.call(this)
 }
 
+AccountImportSubview.prototype.getMenuItemTexts = function () {
+  return [
+    this.props.t('privateKey'),
+    this.props.t('jsonFile'),
+  ]
+}
+
 AccountImportSubview.prototype.render = function () {
-  const props = this.props
   const state = this.state || {}
-  const { menuItems } = props
+  const menuItems = this.getMenuItemTexts()
   const { type } = state
 
   return (
     h('div.new-account-import-form', [
 
       h('.new-account-import-disclaimer', [
-        h('span', t('importAccountMsg')),
+        h('span', this.props.t('importAccountMsg')),
         h('span', {
           style: {
             cursor: 'pointer',
@@ -48,12 +43,12 @@ AccountImportSubview.prototype.render = function () {
               url: 'https://metamask.helpscoutdocs.com/article/17-what-are-loose-accounts',
             })
           },
-        }, t('here')),
+        }, this.props.t('here')),
       ]),
 
       h('div.new-account-import-form__select-section', [
 
-        h('div.new-account-import-form__select-label', t('selectType')),
+        h('div.new-account-import-form__select-label', this.props.t('selectType')),
 
         h(Select, {
           className: 'new-account-import-form__select',
@@ -79,16 +74,15 @@ AccountImportSubview.prototype.render = function () {
 }
 
 AccountImportSubview.prototype.renderImportView = function () {
-  const props = this.props
   const state = this.state || {}
   const { type } = state
-  const { menuItems } = props
+  const menuItems = this.getMenuItemTexts()
   const current = type || menuItems[0]
 
   switch (current) {
-    case t('privateKey'):
+    case this.props.t('privateKey'):
       return h(PrivateKeyImportView)
-    case t('jsonFile'):
+    case this.props.t('jsonFile'):
       return h(JsonImportView)
     default:
       return h(JsonImportView)

ui/app/accounts/import/json.js

@@ -1,10 +1,10 @@
 const Component = require('react').Component
 const PropTypes = require('prop-types')
 const h = require('react-hyperscript')
-const connect = require('react-redux').connect
+const connect = require('../../metamask-connect')
 const actions = require('../../actions')
 const FileInput = require('react-simple-file-input').default
-const t = require('../../../i18n')
+
 
 const HELP_LINK = 'https://support.metamask.io/kb/article/7-importing-accounts'
 
@@ -24,11 +24,11 @@ class JsonImportSubview extends Component {
     return (
       h('div.new-account-import-form__json', [
 
-        h('p', t('usedByClients')),
+        h('p', this.props.t('usedByClients')),
         h('a.warning', {
           href: HELP_LINK,
           target: '_blank',
-        }, t('fileImportFail')),
+        }, this.props.t('fileImportFail')),
 
         h(FileInput, {
           readAs: 'text',
@@ -43,7 +43,7 @@ class JsonImportSubview extends Component {
 
         h('input.new-account-import-form__input-password', {
           type: 'password',
-          placeholder: t('enterPassword'),
+          placeholder: this.props.t('enterPassword'),
           id: 'json-password-box',
           onKeyPress: this.createKeyringOnEnter.bind(this),
         }),
@@ -53,13 +53,13 @@ class JsonImportSubview extends Component {
           h('button.btn-secondary.new-account-create-form__button', {
             onClick: () => this.props.goHome(),
           }, [
-            t('cancel'),
+            this.props.t('cancel'),
           ]),
 
           h('button.btn-primary.new-account-create-form__button', {
             onClick: () => this.createNewKeychain(),
           }, [
-            t('import'),
+            this.props.t('import'),
           ]),
 
         ]),
@@ -84,14 +84,14 @@ class JsonImportSubview extends Component {
     const state = this.state
 
     if (!state) {
-      const message = t('validFileImport')
+      const message = this.props.t('validFileImport')
       return this.props.displayWarning(message)
     }
 
     const { fileContents } = state
 
     if (!fileContents) {
-      const message = t('needImportFile')
+      const message = this.props.t('needImportFile')
       return this.props.displayWarning(message)
     }
 
@@ -99,7 +99,7 @@ class JsonImportSubview extends Component {
     const password = passwordInput.value
 
     if (!password) {
-      const message = t('needImportPassword')
+      const message = this.props.t('needImportPassword')
       return this.props.displayWarning(message)
     }
 
@@ -112,6 +112,7 @@ JsonImportSubview.propTypes = {
   goHome: PropTypes.func,
   displayWarning: PropTypes.func,
   importNewJsonAccount: PropTypes.func,
+    t: PropTypes.func,
 }
 
 const mapStateToProps = state => {

ui/app/accounts/import/private-key.js

@@ -1,9 +1,8 @@
 const inherits = require('util').inherits
 const Component = require('react').Component
 const h = require('react-hyperscript')
-const connect = require('react-redux').connect
+const connect = require('../../metamask-connect')
 const actions = require('../../actions')
-const t = require('../../../i18n')
 
 module.exports = connect(mapStateToProps, mapDispatchToProps)(PrivateKeyImportView)
 
@@ -34,7 +33,7 @@ PrivateKeyImportView.prototype.render = function () {
   return (
     h('div.new-account-import-form__private-key', [
 
-      h('span.new-account-create-form__instruction', t('pastePrivateKey')),
+      h('span.new-account-create-form__instruction', this.props.t('pastePrivateKey')),
 
       h('div.new-account-import-form__private-key-password-container', [
 
@@ -51,13 +50,13 @@ PrivateKeyImportView.prototype.render = function () {
         h('button.btn-secondary--lg.new-account-create-form__button', {
           onClick: () => goHome(),
         }, [
-          t('cancel'),
+          this.props.t('cancel'),
         ]),
 
         h('button.btn-primary--lg.new-account-create-form__button', {
           onClick: () => this.createNewKeychain(),
         }, [
-          t('import'),
+          this.props.t('import'),
         ]),
 
       ]),

ui/app/accounts/import/seed.js

@@ -1,8 +1,7 @@
 const inherits = require('util').inherits
 const Component = require('react').Component
 const h = require('react-hyperscript')
-const connect = require('react-redux').connect
+const connect = require('../../metamask-connect')
-const t = require('../../../i18n')
 
 module.exports = connect(mapStateToProps)(SeedImportSubview)
 
@@ -21,10 +20,10 @@ SeedImportSubview.prototype.render = function () {
       style: {
       },
     }, [
-      t('pasteSeed'),
+      this.props.t('pasteSeed'),
       h('textarea'),
       h('br'),
-      h('button', t('submit')),
+      h('button', this.props.t('submit')),
     ])
   )
 }

ui/app/accounts/new-account/create-form.js

@@ -1,9 +1,8 @@
 const { Component } = require('react')
 const PropTypes = require('prop-types')
 const h = require('react-hyperscript')
-const { connect } = require('react-redux')
+const connect = require('../../metamask-connect')
 const actions = require('../../actions')
-const t = require('../../../i18n')
 
 class NewAccountCreateForm extends Component {
   constructor (props) {
@@ -14,7 +13,7 @@ class NewAccountCreateForm extends Component {
 
     this.state = {
       newAccountName: '',
-      defaultAccountName: t('newAccountNumberName', [newAccountNumber]),
+      defaultAccountName: this.props.t('newAccountNumberName', [newAccountNumber]),
     }
   }
 
@@ -25,7 +24,7 @@ class NewAccountCreateForm extends Component {
     return h('div.new-account-create-form', [
 
       h('div.new-account-create-form__input-label', {}, [
-        t('accountName'),
+        this.props.t('accountName'),
       ]),
 
       h('div.new-account-create-form__input-wrapper', {}, [
@@ -41,13 +40,13 @@ class NewAccountCreateForm extends Component {
         h('button.btn-secondary--lg.new-account-create-form__button', {
           onClick: () => this.props.goHome(),
         }, [
-          t('cancel'),
+          this.props.t('cancel'),
         ]),
 
         h('button.btn-primary--lg.new-account-create-form__button', {
           onClick: () => this.props.createAccount(newAccountName || defaultAccountName),
         }, [
-          t('create'),
+          this.props.t('create'),
         ]),
 
       ]),
@@ -62,6 +61,7 @@ NewAccountCreateForm.propTypes = {
   createAccount: PropTypes.func,
   goHome: PropTypes.func,
   numberOfExistingAccounts: PropTypes.number,
+  t: PropTypes.func,
 }
 
 const mapStateToProps = state => {

ui/app/accounts/new-account/index.js

@@ -1,9 +1,8 @@
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
-const connect = require('react-redux').connect
+const connect = require('../../metamask-connect')
 const actions = require('../../actions')
-const t = require('../../../i18n')
 const { getCurrentViewContext } = require('../../selectors')
 const classnames = require('classnames')
 
@@ -46,7 +45,7 @@ AccountDetailsModal.prototype.render = function () {
 
     h('div.new-account__header', [
 
-      h('div.new-account__title', t('newAccount')),
+      h('div.new-account__title', this.props.t('newAccount')),
 
       h('div.new-account__tabs', [
 
@@ -56,7 +55,7 @@ AccountDetailsModal.prototype.render = function () {
             'new-account__tabs__unselected cursor-pointer': displayedForm !== 'CREATE',
           }),
           onClick: () => displayForm('CREATE'),
-        }, t('createDen')),
+        }, this.props.t('createDen')),
 
         h('div.new-account__tabs__tab', {
           className: classnames('new-account__tabs__tab', {
@@ -64,7 +63,7 @@ AccountDetailsModal.prototype.render = function () {
             'new-account__tabs__unselected cursor-pointer': displayedForm !== 'IMPORT',
           }),
           onClick: () => displayForm('IMPORT'),
-        }, t('import')),
+        }, this.props.t('import')),
 
       ]),
 

ui/app/actions.js

@@ -2,6 +2,7 @@ const abi = require('human-standard-token-abi')
 const getBuyEthUrl = require('../../app/scripts/lib/buy-eth-url')
 const { getTokenAddressFromTokenObject } = require('./util')
 const ethUtil = require('ethereumjs-util')
+const { fetchLocale } = require('../i18n-helper')
 
 var actions = {
   _setBackgroundConnection: _setBackgroundConnection,
@@ -23,7 +24,7 @@ var actions = {
   NETWORK_DROPDOWN_CLOSE: 'UI_NETWORK_DROPDOWN_CLOSE',
   showNetworkDropdown: showNetworkDropdown,
   hideNetworkDropdown: hideNetworkDropdown,
-  // menu state
+  // menu state/
   getNetworkStatus: 'getNetworkStatus',
   // transition state
   TRANSITION_FORWARD: 'TRANSITION_FORWARD',
@@ -254,6 +255,13 @@ var actions = {
   SET_USE_BLOCKIE: 'SET_USE_BLOCKIE',
   setUseBlockie,
 
+  // locale
+  SET_CURRENT_LOCALE: 'SET_CURRENT_LOCALE',
+  SET_LOCALE_MESSAGES: 'SET_LOCALE_MESSAGES',
+  setCurrentLocale,
+  updateCurrentLocale,
+  setLocaleMessages,
+  //
   // Feature Flags
   setFeatureFlag,
   updateFeatureFlags,
@@ -1792,6 +1800,38 @@ function setUseBlockie (val) {
   }
 }
 
+function updateCurrentLocale (key) {
+  return (dispatch) => {
+    dispatch(actions.showLoadingIndication())
+    fetchLocale(key)
+      .then((localeMessages) => {
+        log.debug(`background.setCurrentLocale`)
+        background.setCurrentLocale(key, (err) => {
+          dispatch(actions.hideLoadingIndication())
+          if (err) {
+            return dispatch(actions.displayWarning(err.message))
+          }
+          dispatch(actions.setCurrentLocale(key))
+          dispatch(actions.setLocaleMessages(localeMessages))
+        })
+      })
+  }
+}
+
+function setCurrentLocale (key) {
+  return {
+    type: actions.SET_CURRENT_LOCALE,
+    value: key,
+  }
+}
+
+function setLocaleMessages (localeMessages) {
+  return {
+    type: actions.SET_LOCALE_MESSAGES,
+    value: localeMessages,
+  }
+}
+
 function setNetworkEndpoints (networkEndpointType) {
   return dispatch => {
     log.debug('background.setNetworkEndpoints')

ui/app/add-token.js

@@ -2,7 +2,7 @@ const inherits = require('util').inherits
 const Component = require('react').Component
 const classnames = require('classnames')
 const h = require('react-hyperscript')
-const connect = require('react-redux').connect
+const connect = require('./metamask-connect')
 const R = require('ramda')
 const Fuse = require('fuse.js')
 const contractMap = require('eth-contract-metadata')
@@ -26,7 +26,6 @@ const fuse = new Fuse(contractList, {
 const actions = require('./actions')
 const ethUtil = require('ethereumjs-util')
 const { tokenInfoGetter } = require('./token-util')
-const t = require('../i18n')
 
 const emptyAddr = '0x0000000000000000000000000000000000000000'
 
@@ -140,28 +139,31 @@ AddTokenScreen.prototype.validate = function () {
   if (customAddress) {
     const validAddress = ethUtil.isValidAddress(customAddress)
     if (!validAddress) {
-      errors.customAddress = t('invalidAddress')
+      errors.customAddress = this.props.t('invalidAddress')
     }
 
-    const validDecimals = customDecimals !== null && customDecimals >= 0 && customDecimals < 36
+    const validDecimals = customDecimals !== null
+      && customDecimals !== ''
+      && customDecimals >= 0
+      && customDecimals < 36
     if (!validDecimals) {
-      errors.customDecimals = t('decimalsMustZerotoTen')
+      errors.customDecimals = this.props.t('decimalsMustZerotoTen')
     }
 
     const symbolLen = customSymbol.trim().length
     const validSymbol = symbolLen > 0 && symbolLen < 10
     if (!validSymbol) {
-      errors.customSymbol = t('symbolBetweenZeroTen')
+      errors.customSymbol = this.props.t('symbolBetweenZeroTen')
     }
 
     const ownAddress = identitiesList.includes(standardAddress)
     if (ownAddress) {
-      errors.customAddress = t('personalAddressDetected')
+      errors.customAddress = this.props.t('personalAddressDetected')
     }
 
     const tokenAlreadyAdded = this.checkExistingAddresses(customAddress)
     if (tokenAlreadyAdded) {
-      errors.customAddress = t('tokenAlreadyAdded')
+      errors.customAddress = this.props.t('tokenAlreadyAdded')
     }
   } else if (
     Object.entries(selectedTokens)
@@ -169,7 +171,7 @@ AddTokenScreen.prototype.validate = function () {
         isEmpty && !isSelected
       ), true)
   ) {
-    errors.tokenSelector = t('mustSelectOne')
+    errors.tokenSelector = this.props.t('mustSelectOne')
   }
 
   return {
@@ -199,7 +201,7 @@ AddTokenScreen.prototype.renderCustomForm = function () {
           'add-token__add-custom-field--error': errors.customAddress,
         }),
       }, [
-        h('div.add-token__add-custom-label', t('tokenAddress')),
+        h('div.add-token__add-custom-label', this.props.t('tokenAddress')),
         h('input.add-token__add-custom-input', {
           type: 'text',
           onChange: this.tokenAddressDidChange,
@@ -212,7 +214,7 @@ AddTokenScreen.prototype.renderCustomForm = function () {
           'add-token__add-custom-field--error': errors.customSymbol,
         }),
       }, [
-        h('div.add-token__add-custom-label', t('tokenSymbol')),
+        h('div.add-token__add-custom-label', this.props.t('tokenSymbol')),
         h('input.add-token__add-custom-input', {
           type: 'text',
           onChange: this.tokenSymbolDidChange,
@@ -226,7 +228,7 @@ AddTokenScreen.prototype.renderCustomForm = function () {
           'add-token__add-custom-field--error': errors.customDecimals,
         }),
       }, [
-        h('div.add-token__add-custom-label', t('decimal')),
+        h('div.add-token__add-custom-label', this.props.t('decimal')),
         h('input.add-token__add-custom-input', {
           type: 'number',
           onChange: this.tokenDecimalsDidChange,
@@ -248,7 +250,7 @@ AddTokenScreen.prototype.renderTokenList = function () {
   const results = [...addressSearchResult, ...fuseSearchResult]
 
   return h('div', [
-      results.length > 0 && h('div.add-token__token-icons-title', t('popularTokens')),
+      results.length > 0 && h('div.add-token__token-icons-title', this.props.t('popularTokens')),
       h('div.add-token__token-icons-container', Array(6).fill(undefined)
         .map((_, i) => {
           const { logo, symbol, name, address } = results[i] || {}
@@ -303,10 +305,10 @@ AddTokenScreen.prototype.renderConfirmation = function () {
     h('div.add-token', [
       h('div.add-token__wrapper', [
         h('div.add-token__title-container.add-token__confirmation-title', [
-          h('div.add-token__description', t('likeToAddTokens')),
+          h('div.add-token__description', this.props.t('likeToAddTokens')),
         ]),
         h('div.add-token__content-container.add-token__confirmation-content', [
-          h('div.add-token__description.add-token__confirmation-description', t('balances')),
+          h('div.add-token__description.add-token__confirmation-description', this.props.t('balances')),
           h('div.add-token__confirmation-token-list',
             Object.entries(tokens)
               .map(([ address, token ]) => (
@@ -325,10 +327,10 @@ AddTokenScreen.prototype.renderConfirmation = function () {
       h('div.add-token__buttons', [
         h('button.btn-secondary--lg.add-token__cancel-button', {
           onClick: () => this.setState({ isShowingConfirmation: false }),
-        }, t('back')),
+        }, this.props.t('back')),
         h('button.btn-primary--lg', {
           onClick: () => addTokens(tokens).then(goHome),
-        }, t('addTokens')),
+        }, this.props.t('addTokens')),
       ]),
     ])
   )
@@ -348,14 +350,14 @@ AddTokenScreen.prototype.renderTabs = function () {
       h('div.add-token__content-container', [
         h('div.add-token__info-box', [
           h('div.add-token__info-box__close'),
-          h('div.add-token__info-box__title', t('whatsThis')),
+          h('div.add-token__info-box__title', this.props.t('whatsThis')),
-          h('div.add-token__info-box__copy', t('keepTrackTokens')),
+          h('div.add-token__info-box__copy', this.props.t('keepTrackTokens')),
-          h('div.add-token__info-box__copy--blue', t('learnMore')),
+          h('div.add-token__info-box__copy--blue', this.props.t('learnMore')),
         ]),
         h('div.add-token__input-container', [
           h('input.add-token__input', {
             type: 'text',
-            placeholder: t('searchTokens'),
+            placeholder: this.props.t('searchTokens'),
             onChange: e => this.setState({ searchQuery: e.target.value }),
           }),
           h('div.add-token__search-input-error-message', errors.tokenSelector),
@@ -379,9 +381,9 @@ AddTokenScreen.prototype.render = function () {
         onClick: () => goHome(),
       }, [
         h('i.fa.fa-angle-left.fa-lg'),
-        h('span', t('cancel')),
+        h('span', this.props.t('cancel')),
       ]),
-      h('div.add-token__header__title', t('addTokens')),
+      h('div.add-token__header__title', this.props.t('addTokens')),
       !isShowingConfirmation && h('div.add-token__header__tabs', [
 
         h('div.add-token__header__tabs__tab', {
@@ -390,7 +392,7 @@ AddTokenScreen.prototype.render = function () {
             'add-token__header__tabs__unselected cursor-pointer': displayedTab !== 'SEARCH',
           }),
           onClick: () => this.displayTab('SEARCH'),
-        }, t('search')),
+        }, this.props.t('search')),
 
         h('div.add-token__header__tabs__tab', {
           className: classnames('add-token__header__tabs__tab', {
@@ -398,7 +400,7 @@ AddTokenScreen.prototype.render = function () {
             'add-token__header__tabs__unselected cursor-pointer': displayedTab !== 'CUSTOM_TOKEN',
           }),
           onClick: () => this.displayTab('CUSTOM_TOKEN'),
-        }, t('customToken')),
+        }, this.props.t('customToken')),
 
       ]),
     ]),
@@ -410,10 +412,10 @@ AddTokenScreen.prototype.render = function () {
     !isShowingConfirmation && h('div.add-token__buttons', [
       h('button.btn-secondary--lg.add-token__cancel-button', {
         onClick: goHome,
-      }, t('cancel')),
+      }, this.props.t('cancel')),
       h('button.btn-primary--lg.add-token__confirm-button', {
         onClick: this.onNext,
-      }, t('next')),
+      }, this.props.t('next')),
     ]),
   ])
 }

ui/app/app.js

@@ -1,10 +1,9 @@
 const inherits = require('util').inherits
 const Component = require('react').Component
-const connect = require('react-redux').connect
+const connect = require('./metamask-connect')
 const h = require('react-hyperscript')
 const actions = require('./actions')
 const classnames = require('classnames')
-const t = require('../i18n')
 
 // mascara
 const MascaraFirstTime = require('../../mascara/src/app/first-time').default
@@ -294,8 +293,8 @@ App.prototype.renderAppBar = function () {
 
             // metamask name
             h('.flex-row', [
-              h('h1', t('appName')),
+              h('h1', this.props.t('appName')),
-              h('div.beta-label', t('beta')),
+              h('div.beta-label', this.props.t('beta')),
             ]),
           ]),
 
@@ -557,15 +556,15 @@ App.prototype.getConnectingLabel = function () {
   let name
 
   if (providerName === 'mainnet') {
-    name = t('connectingToMainnet')
+    name = this.props.t('connectingToMainnet')
   } else if (providerName === 'ropsten') {
-    name = t('connectingToRopsten')
+    name = this.props.t('connectingToRopsten')
   } else if (providerName === 'kovan') {
-    name = t('connectingToRopsten')
+    name = this.props.t('connectingToRopsten')
   } else if (providerName === 'rinkeby') {
-    name = t('connectingToRinkeby')
+    name = this.props.t('connectingToRinkeby')
   } else {
-    name = t('connectingToUnknown')
+    name = this.props.t('connectingToUnknown')
   }
 
   return name
@@ -578,15 +577,15 @@ App.prototype.getNetworkName = function () {
   let name
 
   if (providerName === 'mainnet') {
-    name = t('mainnet')
+    name = this.props.t('mainnet')
   } else if (providerName === 'ropsten') {
-    name = t('ropsten')
+    name = this.props.t('ropsten')
   } else if (providerName === 'kovan') {
-    name = t('kovan')
+    name = this.props.t('kovan')
   } else if (providerName === 'rinkeby') {
-    name = t('rinkeby')
+    name = this.props.t('rinkeby')
   } else {
-    name = t('unknownNetwork')
+    name = this.props.t('unknownNetwork')
   }
 
   return name

ui/app/components/account-dropdowns.js

@@ -3,13 +3,12 @@ const PropTypes = require('prop-types')
 const h = require('react-hyperscript')
 const actions = require('../actions')
 const genAccountLink = require('etherscan-link').createAccountLink
-const connect = require('react-redux').connect
+const connect = require('../metamask-connect')
 const Dropdown = require('./dropdown').Dropdown
 const DropdownMenuItem = require('./dropdown').DropdownMenuItem
 const Identicon = require('./identicon')
 const ethUtil = require('ethereumjs-util')
 const copyToClipboard = require('copy-to-clipboard')
-const t = require('../../i18n')
 
 class AccountDropdowns extends Component {
   constructor (props) {
@@ -80,7 +79,7 @@ class AccountDropdowns extends Component {
     try { // Sometimes keyrings aren't loaded yet:
       const type = keyring.type
       const isLoose = type !== 'HD Key Tree'
-      return isLoose ? h('.keyring-label.allcaps', t('loose')) : null
+      return isLoose ? h('.keyring-label.allcaps', this.props.t('loose')) : null
     } catch (e) { return }
   }
 
@@ -130,7 +129,7 @@ class AccountDropdowns extends Component {
                 diameter: 32,
               },
             ),
-            h('span', { style: { marginLeft: '20px', fontSize: '24px' } }, t('createAccount')),
+            h('span', { style: { marginLeft: '20px', fontSize: '24px' } }, this.props.t('createAccount')),
           ],
         ),
         h(
@@ -155,7 +154,7 @@ class AccountDropdowns extends Component {
                 fontSize: '24px',
                 marginBottom: '5px',
               },
-            }, t('importAccount')),
+            }, this.props.t('importAccount')),
           ]
         ),
       ]
@@ -193,7 +192,7 @@ class AccountDropdowns extends Component {
               global.platform.openWindow({ url })
             },
           },
-          t('etherscanView'),
+          this.props.t('etherscanView'),
         ),
         h(
           DropdownMenuItem,
@@ -205,7 +204,7 @@ class AccountDropdowns extends Component {
               actions.showQrView(selected, identity ? identity.name : '')
             },
           },
-          t('showQRCode'),
+          this.props.t('showQRCode'),
         ),
         h(
           DropdownMenuItem,
@@ -217,7 +216,7 @@ class AccountDropdowns extends Component {
               copyToClipboard(checkSumAddress)
             },
           },
-          t('copyAddress'),
+          this.props.t('copyAddress'),
         ),
         h(
           DropdownMenuItem,
@@ -227,7 +226,7 @@ class AccountDropdowns extends Component {
               actions.requestAccountExport()
             },
           },
-          t('exportPrivateKey'),
+          this.props.t('exportPrivateKey'),
         ),
       ]
     )
@@ -301,6 +300,7 @@ AccountDropdowns.propTypes = {
   style: PropTypes.object,
   enableAccountOptions: PropTypes.bool,
   enableAccountsSelector: PropTypes.bool,
+    t: PropTypes.func,
 }
 
 const mapDispatchToProps = (dispatch) => {

ui/app/components/account-export.js

@@ -5,8 +5,7 @@ const exportAsFile = require('../util').exportAsFile
 const copyToClipboard = require('copy-to-clipboard')
 const actions = require('../actions')
 const ethUtil = require('ethereumjs-util')
-const connect = require('react-redux').connect
+const connect = require('../metamask-connect')
-const t = require('../../i18n')
 
 module.exports = connect(mapStateToProps)(ExportAccountView)
 
@@ -36,7 +35,7 @@ ExportAccountView.prototype.render = function () {
   if (notExporting) return h('div')
 
   if (exportRequested) {
-    const warning = t('exportPrivateKeyWarning')
+    const warning = this.props.t('exportPrivateKeyWarning')
     return (
       h('div', {
         style: {
@@ -54,7 +53,7 @@ ExportAccountView.prototype.render = function () {
             h('p.error', warning),
             h('input#exportAccount.sizing-input', {
               type: 'password',
-              placeholder: t('confirmPassword').toLowerCase(),
+              placeholder: this.props.t('confirmPassword').toLowerCase(),
               onKeyPress: this.onExportKeyPress.bind(this),
               style: {
                 position: 'relative',
@@ -75,10 +74,10 @@ ExportAccountView.prototype.render = function () {
                 style: {
                   marginRight: '10px',
                 },
-              }, t('submit')),
+              }, this.props.t('submit')),
               h('button', {
                 onClick: () => this.props.dispatch(actions.backToAccountDetail(this.props.address)),
-              }, t('cancel')),
+              }, this.props.t('cancel')),
             ]),
           (this.props.warning) && (
           h('span.error', {
@@ -99,7 +98,7 @@ ExportAccountView.prototype.render = function () {
         margin: '0 20px',
       },
     }, [
-      h('label', t('copyPrivateKey') + ':'),
+      h('label', this.props.t('copyPrivateKey') + ':'),
       h('p.error.cursor-pointer', {
         style: {
           textOverflow: 'ellipsis',
@@ -113,13 +112,13 @@ ExportAccountView.prototype.render = function () {
       }, plainKey),
       h('button', {
         onClick: () => this.props.dispatch(actions.backToAccountDetail(this.props.address)),
-      }, t('done')),
+      }, this.props.t('done')),
       h('button', {
         style: {
           marginLeft: '10px',
         },
         onClick: () => exportAsFile(`MetaMask ${nickname} Private Key`, plainKey),
-      }, t('saveAsFile')),
+      }, this.props.t('saveAsFile')),
     ])
   }
 }

ui/app/components/account-menu/index.js

@@ -1,12 +1,11 @@
 const inherits = require('util').inherits
 const Component = require('react').Component
-const connect = require('react-redux').connect
+const connect = require('../../metamask-connect')
 const h = require('react-hyperscript')
 const actions = require('../../actions')
 const { Menu, Item, Divider, CloseArea } = require('../dropdowns/components/menu')
 const Identicon = require('../identicon')
 const { formatBalance } = require('../../util')
-const t = require('../../../i18n')
 
 module.exports = connect(mapStateToProps, mapDispatchToProps)(AccountMenu)
 
@@ -71,10 +70,10 @@ AccountMenu.prototype.render = function () {
     h(Item, {
       className: 'account-menu__header',
     }, [
-      t('myAccounts'),
+      this.props.t('myAccounts'),
       h('button.account-menu__logout-button', {
         onClick: lockMetamask,
-      }, t('logout')),
+      }, this.props.t('logout')),
     ]),
     h(Divider),
     h('div.account-menu__accounts', this.renderAccounts()),
@@ -82,23 +81,23 @@ AccountMenu.prototype.render = function () {
     h(Item, {
       onClick: () => showNewAccountPage('CREATE'),
       icon: h('img.account-menu__item-icon', { src: 'images/plus-btn-white.svg' }),
-      text: t('createAccount'),
+      text: this.props.t('createAccount'),
     }),
     h(Item, {
       onClick: () => showNewAccountPage('IMPORT'),
       icon: h('img.account-menu__item-icon', { src: 'images/import-account.svg' }),
-      text: t('importAccount'),
+      text: this.props.t('importAccount'),
     }),
     h(Divider),
     h(Item, {
       onClick: showInfoPage,
       icon: h('img', { src: 'images/mm-info-icon.svg' }),
-      text: t('infoHelp'),
+      text: this.props.t('infoHelp'),
     }),
     h(Item, {
       onClick: showConfigPage,
       icon: h('img.account-menu__item-icon', { src: 'images/settings.svg' }),
-      text: t('settings'),
+      text: this.props.t('settings'),
     }),
   ])
 }
@@ -156,6 +155,6 @@ AccountMenu.prototype.indicateIfLoose = function (keyring) {
   try { // Sometimes keyrings aren't loaded yet:
     const type = keyring.type
     const isLoose = type !== 'HD Key Tree'
-    return isLoose ? h('.keyring-label.allcaps', t('imported')) : null
+    return isLoose ? h('.keyring-label.allcaps', this.props.t('imported')) : null
   } catch (e) { return }
 }

ui/app/components/balance-component.js

@@ -1,5 +1,5 @@
 const Component = require('react').Component
-const connect = require('react-redux').connect
+const connect = require('../metamask-connect')
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
 const TokenBalance = require('./token-balance')

ui/app/components/bn-as-decimal-input.js

@@ -4,9 +4,9 @@ const inherits = require('util').inherits
 const ethUtil = require('ethereumjs-util')
 const BN = ethUtil.BN
 const extend = require('xtend')
-const t = require('../../i18n')
+const connect = require('../metamask-connect')
 
-module.exports = BnAsDecimalInput
+module.exports = connect()(BnAsDecimalInput)
 
 inherits(BnAsDecimalInput, Component)
 function BnAsDecimalInput () {
@@ -137,13 +137,13 @@ BnAsDecimalInput.prototype.constructWarning = function () {
   let message = name ? name + ' ' : ''
 
   if (min && max) {
-    message += t('betweenMinAndMax', [`${newMin} ${suffix}`, `${newMax} ${suffix}`])
+    message += this.props.t('betweenMinAndMax', [`${newMin} ${suffix}`, `${newMax} ${suffix}`])
   } else if (min) {
-    message += t('greaterThanMin', [`${newMin} ${suffix}`])
+    message += this.props.t('greaterThanMin', [`${newMin} ${suffix}`])
   } else if (max) {
-    message += t('lessThanMax', [`${newMax} ${suffix}`])
+    message += this.props.t('lessThanMax', [`${newMax} ${suffix}`])
   } else {
-    message += t('invalidInput')
+    message += this.props.t('invalidInput')
   }
 
   return message

ui/app/components/buy-button-subview.js

@@ -1,7 +1,7 @@
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
-const connect = require('react-redux').connect
+const connect = require('../metamask-connect')
 const actions = require('../actions')
 const CoinbaseForm = require('./coinbase-form')
 const ShapeshiftForm = require('./shapeshift-form')
@@ -9,7 +9,6 @@ const Loading = require('./loading')
 const AccountPanel = require('./account-panel')
 const RadioList = require('./custom-radio-list')
 const networkNames = require('../../../app/scripts/config.js').networkNames
-const t = require('../../i18n')
 
 module.exports = connect(mapStateToProps)(BuyButtonSubview)
 
@@ -77,7 +76,7 @@ BuyButtonSubview.prototype.headerSubview = function () {
             paddingTop: '4px',
             paddingBottom: '4px',
           },
-        }, t('depositEth')),
+        }, this.props.t('depositEth')),
       ]),
 
       // loading indication
@@ -119,7 +118,7 @@ BuyButtonSubview.prototype.headerSubview = function () {
             paddingTop: '4px',
             paddingBottom: '4px',
           },
-        }, t('selectService')),
+        }, this.props.t('selectService')),
       ]),
 
     ])
@@ -144,7 +143,7 @@ BuyButtonSubview.prototype.primarySubview = function () {
     case '4':
     case '42':
       const networkName = networkNames[network]
-      const label = `${networkName} ${t('testFaucet')}`
+      const label = `${networkName} ${this.props.t('testFaucet')}`
       return (
         h('div.flex-column', {
           style: {
@@ -165,14 +164,14 @@ BuyButtonSubview.prototype.primarySubview = function () {
               style: {
                 marginTop: '15px',
               },
-            }, t('borrowDharma'))
+            }, this.props.t('borrowDharma'))
           ) : null,
       ])
     )
 
     default:
       return (
-        h('h2.error', t('unknownNetworkId'))
+        h('h2.error', this.props.t('unknownNetworkId'))
       )
 
   }
@@ -204,8 +203,8 @@ BuyButtonSubview.prototype.mainnetSubview = function () {
             'ShapeShift',
           ],
           subtext: {
-            'Coinbase': `${t('crypto')}/${t('fiat')} (${t('usaOnly')})`,
+            'Coinbase': `${this.props.t('crypto')}/${this.props.t('fiat')} (${this.props.t('usaOnly')})`,
-            'ShapeShift': t('crypto'),
+            'ShapeShift': this.props.t('crypto'),
           },
           onClick: this.radioHandler.bind(this),
         }),

ui/app/components/coinbase-form.js

@@ -1,9 +1,8 @@
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
-const connect = require('react-redux').connect
+const connect = require('../metamask-connect')
 const actions = require('../actions')
-const t = require('../../i18n')
 
 module.exports = connect(mapStateToProps)(CoinbaseForm)
 
@@ -38,11 +37,11 @@ CoinbaseForm.prototype.render = function () {
     }, [
       h('button.btn-green', {
         onClick: this.toCoinbase.bind(this),
-      }, t('continueToCoinbase')),
+      }, this.props.t('continueToCoinbase')),
 
       h('button.btn-red', {
         onClick: () => props.dispatch(actions.goHome()),
-      }, t('cancel')),
+      }, this.props.t('cancel')),
     ]),
   ])
 }

ui/app/components/copyButton.js

@@ -2,11 +2,11 @@ const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
 const copyToClipboard = require('copy-to-clipboard')
-const t = require('../../i18n')
+const connect = require('../metamask-connect')
 
 const Tooltip = require('./tooltip')
 
-module.exports = CopyButton
+module.exports = connect()(CopyButton)
 
 inherits(CopyButton, Component)
 function CopyButton () {
@@ -23,7 +23,7 @@ CopyButton.prototype.render = function () {
   const value = props.value
   const copied = state.copied
 
-  const message = copied ? t('copiedButton') : props.title || t('copyButton')
+  const message = copied ? this.props.t('copiedButton') : props.title || this.props.t('copyButton')
 
   return h('.copy-button', {
     style: {

ui/app/components/copyable.js

@@ -4,9 +4,9 @@ const inherits = require('util').inherits
 
 const Tooltip = require('./tooltip')
 const copyToClipboard = require('copy-to-clipboard')
-const t = require('../../i18n')
+const connect = require('../metamask-connect')
 
-module.exports = Copyable
+module.exports = connect()(Copyable)
 
 inherits(Copyable, Component)
 function Copyable () {
@@ -23,7 +23,7 @@ Copyable.prototype.render = function () {
   const { copied } = state
 
   return h(Tooltip, {
-    title: copied ? t('copiedExclamation') : t('copy'),
+    title: copied ? this.props.t('copiedExclamation') : this.props.t('copy'),
     position: 'bottom',
   }, h('span', {
     style: {

ui/app/components/customize-gas-modal/index.js

@@ -1,9 +1,8 @@
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
-const connect = require('react-redux').connect
+const connect = require('../../metamask-connect')
 const actions = require('../../actions')
-const t = require('../../../i18n')
 const GasModalCard = require('./gas-modal-card')
 
 const ethUtil = require('ethereumjs-util')
@@ -150,7 +149,7 @@ CustomizeGasModal.prototype.validate = function ({ gasTotal, gasLimit }) {
   })
 
   if (!balanceIsSufficient) {
-    error = t('balanceIsInsufficientGas')
+    error = this.props.t('balanceIsInsufficientGas')
   }
 
   const gasLimitTooLow = gasLimit && conversionGreaterThan(
@@ -166,7 +165,7 @@ CustomizeGasModal.prototype.validate = function ({ gasTotal, gasLimit }) {
   )
 
   if (gasLimitTooLow) {
-    error = t('gasLimitTooLow')
+    error = this.props.t('gasLimitTooLow')
   }
 
   this.setState({ error })
@@ -259,7 +258,7 @@ CustomizeGasModal.prototype.render = function () {
     }, [
       h('div.send-v2__customize-gas__header', {}, [
 
-        h('div.send-v2__customize-gas__title', t('customGas')),
+        h('div.send-v2__customize-gas__title', this.props.t('customGas')),
 
         h('div.send-v2__customize-gas__close', {
           onClick: hideModal,
@@ -275,8 +274,8 @@ CustomizeGasModal.prototype.render = function () {
           // max: 1000,
           step: multiplyCurrencies(MIN_GAS_PRICE_GWEI, 10),
           onChange: value => this.convertAndSetGasPrice(value),
-          title: t('gasPrice'),
+          title: this.props.t('gasPrice'),
-          copy: t('gasPriceCalculation'),
+          copy: this.props.t('gasPriceCalculation'),
         }),
 
         h(GasModalCard, {
@@ -285,8 +284,8 @@ CustomizeGasModal.prototype.render = function () {
           // max: 100000,
           step: 1,
           onChange: value => this.convertAndSetGasLimit(value),
-          title: t('gasLimit'),
+          title: this.props.t('gasLimit'),
-          copy: t('gasLimitCalculation'),
+          copy: this.props.t('gasLimitCalculation'),
         }),
 
       ]),
@@ -299,7 +298,7 @@ CustomizeGasModal.prototype.render = function () {
 
         h('div.send-v2__customize-gas__revert', {
           onClick: () => this.revert(),
-        }, [t('revert')]),
+        }, [this.props.t('revert')]),
 
         h('div.send-v2__customize-gas__buttons', [
           h('button.btn-secondary.send-v2__customize-gas__cancel', {
@@ -307,12 +306,12 @@ CustomizeGasModal.prototype.render = function () {
             style: {
               marginRight: '10px',
             },
-          }, [t('cancel')]),
+          }, [this.props.t('cancel')]),
 
           h('button.btn-primary.send-v2__customize-gas__save', {
             onClick: () => !error && this.save(newGasPrice, gasLimit, gasTotal),
             className: error && 'btn-primary--disabled',
-          }, [t('save')]),
+          }, [this.props.t('save')]),
         ]),
 
       ]),

ui/app/components/dropdowns/components/account-dropdowns.js

@@ -3,14 +3,14 @@ const PropTypes = require('prop-types')
 const h = require('react-hyperscript')
 const actions = require('../../../actions')
 const genAccountLink = require('../../../../lib/account-link.js')
-const connect = require('react-redux').connect
+const connect = require('../../../metamask-connect')
 const Dropdown = require('./dropdown').Dropdown
 const DropdownMenuItem = require('./dropdown').DropdownMenuItem
 const Identicon = require('../../identicon')
 const ethUtil = require('ethereumjs-util')
 const copyToClipboard = require('copy-to-clipboard')
 const { formatBalance } = require('../../../util')
-const t = require('../../../../i18n')
+
 
 class AccountDropdowns extends Component {
   constructor (props) {
@@ -130,7 +130,7 @@ class AccountDropdowns extends Component {
                   actions.showEditAccountModal(identity)
                 },
               }, [
-                t('edit'),
+                this.props.t('edit'),
               ]),
             ]),
 
@@ -144,7 +144,7 @@ class AccountDropdowns extends Component {
     try { // Sometimes keyrings aren't loaded yet:
       const type = keyring.type
       const isLoose = type !== 'HD Key Tree'
-      return isLoose ? h('.keyring-label.allcaps', t('loose')) : null
+      return isLoose ? h('.keyring-label.allcaps', this.props.t('loose')) : null
     } catch (e) { return }
   }
 
@@ -202,7 +202,7 @@ class AccountDropdowns extends Component {
                 fontSize: '16px',
                 lineHeight: '23px',
               },
-            }, t('createAccount')),
+            }, this.props.t('createAccount')),
           ],
         ),
         h(
@@ -236,7 +236,7 @@ class AccountDropdowns extends Component {
                 fontSize: '16px',
                 lineHeight: '23px',
               },
-            }, t('importAccount')),
+            }, this.props.t('importAccount')),
           ]
         ),
       ]
@@ -287,7 +287,7 @@ class AccountDropdowns extends Component {
               menuItemStyles,
             ),
           },
-          t('accountDetails'),
+          this.props.t('accountDetails'),
         ),
         h(
           DropdownMenuItem,
@@ -303,7 +303,7 @@ class AccountDropdowns extends Component {
               menuItemStyles,
             ),
           },
-          t('etherscanView'),
+          this.props.t('etherscanView'),
         ),
         h(
           DropdownMenuItem,
@@ -319,7 +319,7 @@ class AccountDropdowns extends Component {
               menuItemStyles,
             ),
           },
-          t('copyAddress'),
+          this.props.t('copyAddress'),
         ),
         h(
           DropdownMenuItem,
@@ -331,7 +331,7 @@ class AccountDropdowns extends Component {
               menuItemStyles,
             ),
           },
-          t('exportPrivateKey'),
+          this.props.t('exportPrivateKey'),
         ),
         h(
           DropdownMenuItem,
@@ -346,7 +346,7 @@ class AccountDropdowns extends Component {
               menuItemStyles,
             ),
           },
-          t('addToken'),
+          this.props.t('addToken'),
         ),
 
       ]
@@ -425,6 +425,7 @@ AccountDropdowns.propTypes = {
   enableAccountsSelector: PropTypes.bool,
   enableAccountOption: PropTypes.bool,
   enableAccountOptions: PropTypes.bool,
+    t: PropTypes.func,
 }
 
 const mapDispatchToProps = (dispatch) => {

ui/app/components/dropdowns/network-dropdown.js

@@ -1,14 +1,14 @@
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
-const connect = require('react-redux').connect
+const connect = require('../../metamask-connect')
 const actions = require('../../actions')
 const Dropdown = require('./components/dropdown').Dropdown
 const DropdownMenuItem = require('./components/dropdown').DropdownMenuItem
 const NetworkDropdownIcon = require('./components/network-dropdown-icon')
-const t = require('../../../i18n')
 const R = require('ramda')
 
+
 // classes from nodes of the toggle element.
 const notToggleElementClassnames = [
   'menu-icon',
@@ -94,13 +94,13 @@ NetworkDropdown.prototype.render = function () {
   }, [
 
     h('div.network-dropdown-header', {}, [
-      h('div.network-dropdown-title', {}, t('networks')),
+      h('div.network-dropdown-title', {}, this.props.t('networks')),
 
       h('div.network-dropdown-divider'),
 
       h('div.network-dropdown-content',
         {},
-        t('defaultNetwork')
+        this.props.t('defaultNetwork')
       ),
     ]),
 
@@ -122,7 +122,7 @@ NetworkDropdown.prototype.render = function () {
           style: {
             color: providerType === 'mainnet' ? '#ffffff' : '#9b9b9b',
           },
-        }, t('mainnet')),
+        }, this.props.t('mainnet')),
       ]
     ),
 
@@ -144,7 +144,7 @@ NetworkDropdown.prototype.render = function () {
           style: {
             color: providerType === 'ropsten' ? '#ffffff' : '#9b9b9b',
           },
-        }, t('ropsten')),
+        }, this.props.t('ropsten')),
       ]
     ),
 
@@ -166,7 +166,7 @@ NetworkDropdown.prototype.render = function () {
           style: {
             color: providerType === 'kovan' ? '#ffffff' : '#9b9b9b',
           },
-        }, t('kovan')),
+        }, this.props.t('kovan')),
       ]
     ),
 
@@ -188,7 +188,7 @@ NetworkDropdown.prototype.render = function () {
           style: {
             color: providerType === 'rinkeby' ? '#ffffff' : '#9b9b9b',
           },
-        }, t('rinkeby')),
+        }, this.props.t('rinkeby')),
       ]
     ),
 
@@ -210,7 +210,7 @@ NetworkDropdown.prototype.render = function () {
           style: {
             color: activeNetwork === 'http://localhost:8545' ? '#ffffff' : '#9b9b9b',
           },
-        }, t('localhost')),
+        }, this.props.t('localhost')),
       ]
     ),
 
@@ -234,7 +234,7 @@ NetworkDropdown.prototype.render = function () {
           style: {
             color: activeNetwork === 'custom' ? '#ffffff' : '#9b9b9b',
           },
-        }, t('customRPC')),
+        }, this.props.t('customRPC')),
       ]
     ),
 
@@ -249,15 +249,15 @@ NetworkDropdown.prototype.getNetworkName = function () {
   let name
 
   if (providerName === 'mainnet') {
-    name = t('mainnet')
+    name = this.props.t('mainnet')
   } else if (providerName === 'ropsten') {
-    name = t('ropsten')
+    name = this.props.t('ropsten')
   } else if (providerName === 'kovan') {
-    name = t('kovan')
+    name = this.props.t('kovan')
   } else if (providerName === 'rinkeby') {
-    name = t('rinkeby')
+    name = this.props.t('rinkeby')
   } else {
-    name = t('unknownNetwork')
+    name = this.props.t('unknownNetwork')
   }
 
   return name

ui/app/components/dropdowns/token-menu-dropdown.js

@@ -1,9 +1,9 @@
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
-const connect = require('react-redux').connect
+const connect = require('../../metamask-connect')
 const actions = require('../../actions')
-const t = require('../../../i18n')
+
 
 module.exports = connect(null, mapDispatchToProps)(TokenMenuDropdown)
 
@@ -44,7 +44,7 @@ TokenMenuDropdown.prototype.render = function () {
             showHideTokenConfirmationModal(this.props.token)
             this.props.onClose()
           },
-        }, t('hideToken')),
+        }, this.props.t('hideToken')),
 
       ]),
     ]),

ui/app/components/ens-input.js

@@ -8,11 +8,10 @@ const ENS = require('ethjs-ens')
 const networkMap = require('ethjs-ens/lib/network-map.json')
 const ensRE = /.+\..+$/
 const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'
-const t = require('../../i18n')
+const connect = require('../metamask-connect')
 const ToAutoComplete = require('./send/to-autocomplete')
 
-
+module.exports = connect()(EnsInput)
-module.exports = EnsInput
 
 inherits(EnsInput, Component)
 function EnsInput () {
@@ -71,13 +70,13 @@ EnsInput.prototype.lookupEnsName = function (recipient) {
   log.info(`ENS attempting to resolve name: ${recipient}`)
   this.ens.lookup(recipient.trim())
   .then((address) => {
-    if (address === ZERO_ADDRESS) throw new Error(t('noAddressForName'))
+    if (address === ZERO_ADDRESS) throw new Error(this.props.t('noAddressForName'))
     if (address !== ensResolution) {
       this.setState({
         loadingEns: false,
         ensResolution: address,
         nickname: recipient.trim(),
-        hoverText: address + '\n' + t('clickCopy'),
+        hoverText: address + '\n' + this.props.t('clickCopy'),
         ensFailure: false,
       })
     }

ui/app/components/hex-as-decimal-input.js

@@ -4,9 +4,9 @@ const inherits = require('util').inherits
 const ethUtil = require('ethereumjs-util')
 const BN = ethUtil.BN
 const extend = require('xtend')
-const t = require('../../i18n')
+const connect = require('../metamask-connect')
 
-module.exports = HexAsDecimalInput
+module.exports = connect()(HexAsDecimalInput)
 
 inherits(HexAsDecimalInput, Component)
 function HexAsDecimalInput () {
@@ -127,13 +127,13 @@ HexAsDecimalInput.prototype.constructWarning = function () {
   let message = name ? name + ' ' : ''
 
   if (min && max) {
-    message += t('betweenMinAndMax', [min, max])
+    message += this.props.t('betweenMinAndMax', [min, max])
   } else if (min) {
-    message += t('greaterThanMin', [min])
+    message += this.props.t('greaterThanMin', [min])
   } else if (max) {
-    message += t('lessThanMax', [max])
+    message += this.props.t('lessThanMax', [max])
   } else {
-    message += t('invalidInput')
+    message += this.props.t('invalidInput')
   }
 
   return message

ui/app/components/identicon.js

@@ -1,7 +1,7 @@
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
-const connect = require('react-redux').connect
+const connect = require('../metamask-connect')
 const isNode = require('detect-node')
 const findDOMNode = require('react-dom').findDOMNode
 const jazzicon = require('jazzicon')

ui/app/components/modals/account-details-modal.js

@@ -1,14 +1,13 @@
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
-const connect = require('react-redux').connect
+const connect = require('../../metamask-connect')
 const actions = require('../../actions')
 const AccountModalContainer = require('./account-modal-container')
 const { getSelectedIdentity } = require('../../selectors')
 const genAccountLink = require('../../../lib/account-link.js')
 const QrView = require('../qr-code')
 const EditableLabel = require('../editable-label')
-const t = require('../../../i18n')
 
 function mapStateToProps (state) {
   return {
@@ -65,12 +64,12 @@ AccountDetailsModal.prototype.render = function () {
 
       h('button.btn-primary.account-modal__button', {
         onClick: () => global.platform.openWindow({ url: genAccountLink(address, network) }),
-      }, t('etherscanView')),
+      }, this.props.t('etherscanView')),
 
       // Holding on redesign for Export Private Key functionality
       h('button.btn-primary.account-modal__button', {
         onClick: () => showExportPrivateKeyModal(),
-      }, t('exportPrivateKey')),
+      }, this.props.t('exportPrivateKey')),
 
   ])
 }

ui/app/components/modals/account-modal-container.js

@@ -1,11 +1,10 @@
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
-const connect = require('react-redux').connect
+const connect = require('../../metamask-connect')
 const actions = require('../../actions')
 const { getSelectedIdentity } = require('../../selectors')
 const Identicon = require('../identicon')
-const t = require('../../../i18n')
 
 function mapStateToProps (state) {
   return {
@@ -60,7 +59,7 @@ AccountModalContainer.prototype.render = function () {
 
         h('i.fa.fa-angle-left.fa-lg'),
 
-        h('span.account-modal-back__text', ' ' + t('back')),
+        h('span.account-modal-back__text', ' ' + this.props.t('back')),
 
       ]),
 

ui/app/components/modals/buy-options-modal.js

@@ -1,10 +1,9 @@
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
-const connect = require('react-redux').connect
+const connect = require('../../metamask-connect')
 const actions = require('../../actions')
 const networkNames = require('../../../../app/scripts/config.js').networkNames
-const t = require('../../../i18n')
 
 function mapStateToProps (state) {
   return {
@@ -57,15 +56,15 @@ BuyOptions.prototype.render = function () {
       }, [
         h('div.buy-modal-content-title', {
           style: {},
-        }, t('transfers')),
+        }, this.props.t('transfers')),
-        h('div', {}, t('howToDeposit')),
+        h('div', {}, this.props.t('howToDeposit')),
       ]),
 
       h('div.buy-modal-content-options.flex-column.flex-center', {}, [
 
         isTestNetwork
-          ? this.renderModalContentOption(networkName, t('testFaucet'), () => toFaucet(network))
+          ? this.renderModalContentOption(networkName, this.props.t('testFaucet'), () => toFaucet(network))
-          : this.renderModalContentOption('Coinbase', t('depositFiat'), () => toCoinbase(address)),
+          : this.renderModalContentOption('Coinbase', this.props.t('depositFiat'), () => toCoinbase(address)),
 
         // h('div.buy-modal-content-option', {}, [
         //   h('div.buy-modal-content-option-title', {}, 'Shapeshift'),
@@ -73,8 +72,8 @@ BuyOptions.prototype.render = function () {
         // ]),,
 
         this.renderModalContentOption(
-          t('directDeposit'),
+          this.props.t('directDeposit'),
-          t('depositFromAccount'),
+          this.props.t('depositFromAccount'),
           () => this.goToAccountDetailsModal()
         ),
 
@@ -85,7 +84,7 @@ BuyOptions.prototype.render = function () {
           background: 'white',
         },
         onClick: () => { this.props.hideModal() },
-      }, h('div.buy-modal-content-footer#buy-modal-content-footer-text', {}, t('cancel'))),
+      }, h('div.buy-modal-content-footer#buy-modal-content-footer-text', {}, this.props.t('cancel'))),
     ]),
   ])
 }

ui/app/components/modals/deposit-ether-modal.js

@@ -1,22 +1,18 @@
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
-const connect = require('react-redux').connect
+const connect = require('../../metamask-connect')
 const actions = require('../../actions')
 const networkNames = require('../../../../app/scripts/config.js').networkNames
 const ShapeshiftForm = require('../shapeshift-form')
-const t = require('../../../i18n')
 
-const DIRECT_DEPOSIT_ROW_TITLE = t('directDepositEther')
+let DIRECT_DEPOSIT_ROW_TITLE
-const DIRECT_DEPOSIT_ROW_TEXT = t('directDepositEtherExplainer')
+let DIRECT_DEPOSIT_ROW_TEXT
-const COINBASE_ROW_TITLE = t('buyCoinbase')
+let COINBASE_ROW_TITLE
-const COINBASE_ROW_TEXT = t('buyCoinbaseExplainer')
+let COINBASE_ROW_TEXT
-const SHAPESHIFT_ROW_TITLE = t('depositShapeShift')
+let SHAPESHIFT_ROW_TITLE
-const SHAPESHIFT_ROW_TEXT = t('depositShapeShiftExplainer')
+let SHAPESHIFT_ROW_TEXT
-const FAUCET_ROW_TITLE = t('testFaucet')
+let FAUCET_ROW_TITLE
-const facuetRowText = (networkName) => {
-  return t('getEtherFromFaucet', [networkName])
-}
 
 function mapStateToProps (state) {
   return {
@@ -44,9 +40,18 @@ function mapDispatchToProps (dispatch) {
 }
 
 inherits(DepositEtherModal, Component)
-function DepositEtherModal () {
+function DepositEtherModal (props) {
   Component.call(this)
 
+  // need to set after i18n locale has loaded
+  DIRECT_DEPOSIT_ROW_TITLE = props.t('directDepositEther')
+  DIRECT_DEPOSIT_ROW_TEXT = props.t('directDepositEtherExplainer')
+  COINBASE_ROW_TITLE = props.t('buyCoinbase')
+  COINBASE_ROW_TEXT = props.t('buyCoinbaseExplainer')
+  SHAPESHIFT_ROW_TITLE = props.t('depositShapeShift')
+  SHAPESHIFT_ROW_TEXT = props.t('depositShapeShiftExplainer')
+  FAUCET_ROW_TITLE = props.t('testFaucet')
+
   this.state = {
     buyingWithShapeshift: false,
   }
@@ -54,6 +59,10 @@ function DepositEtherModal () {
 
 module.exports = connect(mapStateToProps, mapDispatchToProps)(DepositEtherModal)
 
+DepositEtherModal.prototype.facuetRowText = function (networkName) {
+  return this.props.t('getEtherFromFaucet', [networkName])
+}
+
 DepositEtherModal.prototype.renderRow = function ({
   logo,
   title,
@@ -113,10 +122,10 @@ DepositEtherModal.prototype.render = function () {
 
     h('div.page-container__header', [
 
-      h('div.page-container__title', [t('depositEther')]),
+      h('div.page-container__title', [this.props.t('depositEther')]),
 
       h('div.page-container__subtitle', [
-        t('needEtherInWallet'),
+        this.props.t('needEtherInWallet'),
       ]),
 
       h('div.page-container__header-close', {
@@ -139,7 +148,7 @@ DepositEtherModal.prototype.render = function () {
           }),
           title: DIRECT_DEPOSIT_ROW_TITLE,
           text: DIRECT_DEPOSIT_ROW_TEXT,
-          buttonLabel: t('viewAccount'),
+          buttonLabel: this.props.t('viewAccount'),
           onButtonClick: () => this.goToAccountDetailsModal(),
           hide: buyingWithShapeshift,
         }),
@@ -147,8 +156,8 @@ DepositEtherModal.prototype.render = function () {
         this.renderRow({
           logo: h('i.fa.fa-tint.fa-2x'),
           title: FAUCET_ROW_TITLE,
-          text: facuetRowText(networkName),
+          text: this.facuetRowText(networkName),
-          buttonLabel: t('getEther'),
+          buttonLabel: this.props.t('getEther'),
           onButtonClick: () => toFaucet(network),
           hide: !isTestNetwork || buyingWithShapeshift,
         }),
@@ -162,7 +171,7 @@ DepositEtherModal.prototype.render = function () {
           }),
           title: COINBASE_ROW_TITLE,
           text: COINBASE_ROW_TEXT,
-          buttonLabel: t('continueToCoinbase'),
+          buttonLabel: this.props.t('continueToCoinbase'),
           onButtonClick: () => toCoinbase(address),
           hide: isTestNetwork || buyingWithShapeshift,
         }),
@@ -175,7 +184,7 @@ DepositEtherModal.prototype.render = function () {
           }),
           title: SHAPESHIFT_ROW_TITLE,
           text: SHAPESHIFT_ROW_TEXT,
-          buttonLabel: t('shapeshiftBuy'),
+          buttonLabel: this.props.t('shapeshiftBuy'),
           onButtonClick: () => this.setState({ buyingWithShapeshift: true }),
           hide: isTestNetwork,
           hideButton: buyingWithShapeshift,

ui/app/components/modals/edit-account-name-modal.js

@@ -1,10 +1,9 @@
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
-const connect = require('react-redux').connect
+const connect = require('../../metamask-connect')
 const actions = require('../../actions')
 const { getSelectedAccount } = require('../../selectors')
-const t = require('../../../i18n')
 
 function mapStateToProps (state) {
   return {
@@ -51,7 +50,7 @@ EditAccountNameModal.prototype.render = function () {
       ]),
 
       h('div.edit-account-name-modal-title', {
-      }, [t('editAccountName')]),
+      }, [this.props.t('editAccountName')]),
 
       h('input.edit-account-name-modal-input', {
         placeholder: identity.name,
@@ -70,7 +69,7 @@ EditAccountNameModal.prototype.render = function () {
         },
         disabled: this.state.inputText.length === 0,
       }, [
-        t('save'),
+        this.props.t('save'),
       ]),
 
     ]),

ui/app/components/modals/export-private-key-modal.js

@@ -1,13 +1,12 @@
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
-const connect = require('react-redux').connect
+const connect = require('../../metamask-connect')
 const ethUtil = require('ethereumjs-util')
 const actions = require('../../actions')
 const AccountModalContainer = require('./account-modal-container')
 const { getSelectedIdentity } = require('../../selectors')
 const ReadOnlyInput = require('../readonly-input')
-const t = require('../../../i18n')
 const copyToClipboard = require('copy-to-clipboard')
 
 function mapStateToProps (state) {
@@ -49,8 +48,8 @@ ExportPrivateKeyModal.prototype.exportAccountAndGetPrivateKey = function (passwo
 
 ExportPrivateKeyModal.prototype.renderPasswordLabel = function (privateKey) {
   return h('span.private-key-password-label', privateKey
-    ? t('copyPrivateKey')
+    ? this.props.t('copyPrivateKey')
-    : t('typePassword')
+    : this.props.t('typePassword')
   )
 }
 
@@ -87,8 +86,8 @@ ExportPrivateKeyModal.prototype.renderButtons = function (privateKey, password,
     ),
 
     (privateKey
-      ? this.renderButton('btn-primary--lg export-private-key__button', () => hideModal(), t('done'))
+      ? this.renderButton('btn-primary--lg export-private-key__button', () => hideModal(), this.props.t('done'))
-      : this.renderButton('btn-primary--lg export-private-key__button', () => this.exportAccountAndGetPrivateKey(this.state.password, address), t('confirm'))
+      : this.renderButton('btn-primary--lg export-private-key__button', () => this.exportAccountAndGetPrivateKey(this.state.password, address), this.props.t('confirm'))
     ),
 
   ])
@@ -121,7 +120,7 @@ ExportPrivateKeyModal.prototype.render = function () {
 
       h('div.account-modal-divider'),
 
-      h('span.modal-body-title', t('showPrivateKeys')),
+      h('span.modal-body-title', this.props.t('showPrivateKeys')),
 
       h('div.private-key-password', {}, [
         this.renderPasswordLabel(privateKey),
@@ -131,7 +130,7 @@ ExportPrivateKeyModal.prototype.render = function () {
         !warning ? null : h('span.private-key-password-error', warning),
       ]),
 
-      h('div.private-key-password-warning', t('privateKeyWarning')),
+      h('div.private-key-password-warning', this.props.t('privateKeyWarning')),
 
       this.renderButtons(privateKey, this.state.password, address, hideModal),
 

ui/app/components/modals/hide-token-confirmation-modal.js

@@ -1,10 +1,9 @@
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
-const connect = require('react-redux').connect
+const connect = require('../../metamask-connect')
 const actions = require('../../actions')
 const Identicon = require('../identicon')
-const t = require('../../../i18n')
 
 function mapStateToProps (state) {
   return {
@@ -42,7 +41,7 @@ HideTokenConfirmationModal.prototype.render = function () {
     h('div.hide-token-confirmation__container', {
     }, [
       h('div.hide-token-confirmation__title', {}, [
-        t('hideTokenPrompt'),
+        this.props.t('hideTokenPrompt'),
       ]),
 
       h(Identicon, {
@@ -55,19 +54,19 @@ HideTokenConfirmationModal.prototype.render = function () {
       h('div.hide-token-confirmation__symbol', {}, symbol),
 
       h('div.hide-token-confirmation__copy', {}, [
-        t('readdToken'),
+        this.props.t('readdToken'),
       ]),
 
       h('div.hide-token-confirmation__buttons', {}, [
         h('button.btn-cancel.hide-token-confirmation__button.allcaps', {
           onClick: () => hideModal(),
         }, [
-          t('cancel'),
+          this.props.t('cancel'),
         ]),
         h('button.btn-clear.hide-token-confirmation__button.allcaps', {
           onClick: () => hideToken(address),
         }, [
-          t('hide'),
+          this.props.t('hide'),
         ]),
       ]),
     ]),

ui/app/components/modals/modal.js

@@ -6,7 +6,6 @@ const FadeModal = require('boron').FadeModal
 const actions = require('../../actions')
 const isMobileView = require('../../../lib/is-mobile-view')
 const isPopupOrNotification = require('../../../../app/scripts/lib/is-popup-or-notification')
-const t = require('../../../i18n')
 
 // Modal Components
 const BuyOptions = require('./buy-options-modal')
@@ -174,8 +173,8 @@ const MODALS = {
   BETA_UI_NOTIFICATION_MODAL: {
     contents: [
       h(NotifcationModal, {
-        header: t('uiWelcome'),
+        header: 'uiWelcome',
-        message: t('uiWelcomeMessage'),
+        message: 'uiWelcomeMessage',
       }),
     ],
     mobileModalStyle: {
@@ -191,8 +190,8 @@ const MODALS = {
   OLD_UI_NOTIFICATION_MODAL: {
     contents: [
       h(NotifcationModal, {
-        header: t('oldUI'),
+        header: 'oldUI',
-        message: t('oldUIMessage'),
+        message: 'oldUIMessage',
       }),
     ],
     mobileModalStyle: {

ui/app/components/modals/new-account-modal.js

@@ -1,9 +1,8 @@
 const { Component } = require('react')
 const PropTypes = require('prop-types')
 const h = require('react-hyperscript')
-const { connect } = require('react-redux')
+const connect = require('../../metamask-connect')
 const actions = require('../../actions')
-const t = require('../../../i18n')
 
 class NewAccountModal extends Component {
   constructor (props) {
@@ -12,7 +11,7 @@ class NewAccountModal extends Component {
     const newAccountNumber = numberOfExistingAccounts + 1
 
     this.state = {
-      newAccountName: `${t('account')} ${newAccountNumber}`,
+      newAccountName: `${props.t('account')} ${newAccountNumber}`,
     }
   }
 
@@ -23,7 +22,7 @@ class NewAccountModal extends Component {
       h('div.new-account-modal-wrapper', {
       }, [
         h('div.new-account-modal-header', {}, [
-          t('newAccount'),
+          this.props.t('newAccount'),
         ]),
 
         h('div.modal-close-x', {
@@ -31,19 +30,19 @@ class NewAccountModal extends Component {
         }),
 
         h('div.new-account-modal-content', {}, [
-          t('accountName'),
+          this.props.t('accountName'),
         ]),
 
         h('div.new-account-input-wrapper', {}, [
           h('input.new-account-input', {
             value: this.state.newAccountName,
-            placeholder: t('sampleAccountName'),
+            placeholder: this.props.t('sampleAccountName'),
             onChange: event => this.setState({ newAccountName: event.target.value }),
           }, []),
         ]),
 
         h('div.new-account-modal-content.after-input', {}, [
-          t('or'),
+          this.props.t('or'),
         ]),
 
         h('div.new-account-modal-content.after-input.pointer', {
@@ -51,13 +50,13 @@ class NewAccountModal extends Component {
             this.props.hideModal()
             this.props.showImportPage()
           },
-        }, t('importAnAccount')),
+        }, this.props.t('importAnAccount')),
 
         h('div.new-account-modal-content.button.allcaps', {}, [
           h('button.btn-clear', {
             onClick: () => this.props.createAccount(newAccountName),
           }, [
-            t('save'),
+            this.props.t('save'),
           ]),
         ]),
       ]),
@@ -70,6 +69,7 @@ NewAccountModal.propTypes = {
   showImportPage: PropTypes.func,
   createAccount: PropTypes.func,
   numberOfExistingAccounts: PropTypes.number,
+    t: PropTypes.func,
 }
 
 const mapStateToProps = state => {

ui/app/components/modals/notification-modal.js

@@ -1,7 +1,7 @@
 const { Component } = require('react')
 const PropTypes = require('prop-types')
 const h = require('react-hyperscript')
-const { connect } = require('react-redux')
+const connect = require('../../metamask-connect')
 const actions = require('../../actions')
 
 class NotificationModal extends Component {
@@ -22,12 +22,12 @@ class NotificationModal extends Component {
       }, [
 
         h('div.notification-modal__header', {}, [
-          header,
+          this.props.t(header),
         ]),
 
         h('div.notification-modal__message-wrapper', {}, [
           h('div.notification-modal__message', {}, [
-            message,
+            this.props.t(message),
           ]),
         ]),
 
@@ -62,6 +62,7 @@ NotificationModal.propTypes = {
   showCancelButton: PropTypes.bool,
   showConfirmButton: PropTypes.bool,
   onConfirm: PropTypes.func,
+    t: PropTypes.func,
 }
 
 const mapDispatchToProps = dispatch => {

ui/app/components/modals/notification-modals/confirm-reset-account.js

@@ -1,7 +1,7 @@
 const { Component } = require('react')
 const PropTypes = require('prop-types')
 const h = require('react-hyperscript')
-const { connect } = require('react-redux')
+const connect = require('../../../metamask-connect')
 const actions = require('../../../actions')
 const NotifcationModal = require('../notification-modal')
 

ui/app/components/modals/shapeshift-deposit-tx-modal.js

@@ -1,7 +1,7 @@
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
-const connect = require('react-redux').connect
+const connect = require('../../metamask-connect')
 const actions = require('../../actions')
 const QrView = require('../qr-code')
 const AccountModalContainer = require('./account-modal-container')

ui/app/components/network-display.js

@@ -1,9 +1,8 @@
 const { Component } = require('react')
 const h = require('react-hyperscript')
 const PropTypes = require('prop-types')
-const { connect } = require('react-redux')
+const connect = require('../metamask-connect')
 const NetworkDropdownIcon = require('./dropdowns/components/network-dropdown-icon')
-const t = require('../../i18n')
 
 const networkToColorHash = {
   1: '#038789',
@@ -31,7 +30,7 @@ class NetworkDisplay extends Component {
     const { provider: { type } } = this.props
     return h('.network-display__container', [
       this.renderNetworkIcon(),
-      h('.network-name', t(type)),
+      h('.network-name', this.props.t(type)),
     ])
   }
 }
@@ -39,6 +38,7 @@ class NetworkDisplay extends Component {
 NetworkDisplay.propTypes = {
   network: PropTypes.string,
   provider: PropTypes.object,
+  t: PropTypes.func,
 }
 
 const mapStateToProps = ({ metamask: { network, provider } }) => {

ui/app/components/network.js

@@ -1,11 +1,11 @@
 const Component = require('react').Component
 const h = require('react-hyperscript')
+const connect = require('../metamask-connect')
 const classnames = require('classnames')
 const inherits = require('util').inherits
 const NetworkDropdownIcon = require('./dropdowns/components/network-dropdown-icon')
-const t = require('../../i18n')
 
-module.exports = Network
+module.exports = connect()(Network)
 
 inherits(Network, Component)
 
@@ -34,7 +34,7 @@ Network.prototype.render = function () {
       onClick: (event) => this.props.onClick(event),
     }, [
       h('img', {
-        title: t('attemptingConnect'),
+        title: props.t('attemptingConnect'),
         style: {
           width: '27px',
         },
@@ -42,22 +42,22 @@ Network.prototype.render = function () {
       }),
     ])
   } else if (providerName === 'mainnet') {
-    hoverText = t('mainnet')
+    hoverText = props.t('mainnet')
     iconName = 'ethereum-network'
   } else if (providerName === 'ropsten') {
-    hoverText = t('ropsten')
+    hoverText = props.t('ropsten')
     iconName = 'ropsten-test-network'
   } else if (parseInt(networkNumber) === 3) {
-    hoverText = t('ropsten')
+    hoverText = props.t('ropsten')
     iconName = 'ropsten-test-network'
   } else if (providerName === 'kovan') {
-    hoverText = t('kovan')
+    hoverText = props.t('kovan')
     iconName = 'kovan-test-network'
   } else if (providerName === 'rinkeby') {
-    hoverText = t('rinkeby')
+    hoverText = props.t('rinkeby')
     iconName = 'rinkeby-test-network'
   } else {
-    hoverText = t('unknownNetwork')
+    hoverText = props.t('unknownNetwork')
     iconName = 'unknown-private-network'
   }
 
@@ -85,7 +85,7 @@ Network.prototype.render = function () {
                 backgroundColor: '#038789', // $blue-lagoon
                 nonSelectBackgroundColor: '#15afb2',
               }),
-              h('.network-name', t('mainnet')),
+              h('.network-name', props.t('mainnet')),
               h('i.fa.fa-chevron-down.fa-lg.network-caret'),
             ])
           case 'ropsten-test-network':
@@ -94,7 +94,7 @@ Network.prototype.render = function () {
                 backgroundColor: '#e91550', // $crimson
                 nonSelectBackgroundColor: '#ec2c50',
               }),
-              h('.network-name', t('ropsten')),
+              h('.network-name', props.t('ropsten')),
               h('i.fa.fa-chevron-down.fa-lg.network-caret'),
             ])
           case 'kovan-test-network':
@@ -103,7 +103,7 @@ Network.prototype.render = function () {
                 backgroundColor: '#690496', // $purple
                 nonSelectBackgroundColor: '#b039f3',
               }),
-              h('.network-name', t('kovan')),
+              h('.network-name', props.t('kovan')),
               h('i.fa.fa-chevron-down.fa-lg.network-caret'),
             ])
           case 'rinkeby-test-network':
@@ -112,7 +112,7 @@ Network.prototype.render = function () {
                 backgroundColor: '#ebb33f', // $tulip-tree
                 nonSelectBackgroundColor: '#ecb23e',
               }),
-              h('.network-name', t('rinkeby')),
+              h('.network-name', props.t('rinkeby')),
               h('i.fa.fa-chevron-down.fa-lg.network-caret'),
             ])
           default:
@@ -124,7 +124,7 @@ Network.prototype.render = function () {
                 },
               }),
 
-              h('.network-name', t('privateNetwork')),
+              h('.network-name', props.t('privateNetwork')),
               h('i.fa.fa-chevron-down.fa-lg.network-caret'),
             ])
         }

ui/app/components/notice.js

@@ -4,9 +4,9 @@ const h = require('react-hyperscript')
 const ReactMarkdown = require('react-markdown')
 const linker = require('extension-link-enabler')
 const findDOMNode = require('react-dom').findDOMNode
-const t = require('../../i18n')
+const connect = require('../metamask-connect')
 
-module.exports = Notice
+module.exports = connect()(Notice)
 
 inherits(Notice, Component)
 function Notice () {
@@ -111,7 +111,7 @@ Notice.prototype.render = function () {
         style: {
           marginTop: '18px',
         },
-      }, t('accept')),
+      }, this.props.t('accept')),
     ])
   )
 }

ui/app/components/pending-msg-details.js

@@ -1,11 +1,11 @@
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
-const t = require('../../i18n')
+const connect = require('../metamask-connect')
 
 const AccountPanel = require('./account-panel')
 
-module.exports = PendingMsgDetails
+module.exports = connect()(PendingMsgDetails)
 
 inherits(PendingMsgDetails, Component)
 function PendingMsgDetails () {
@@ -40,7 +40,7 @@ PendingMsgDetails.prototype.render = function () {
       // message data
       h('.tx-data.flex-column.flex-justify-center.flex-grow.select-none', [
         h('.flex-column.flex-space-between', [
-          h('label.font-small.allcaps', t('message')),
+          h('label.font-small.allcaps', this.props.t('message')),
           h('span.font-small', msgParams.data),
         ]),
       ]),

ui/app/components/pending-msg.js

@@ -2,9 +2,9 @@ const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
 const PendingTxDetails = require('./pending-msg-details')
-const t = require('../../i18n')
+const connect = require('../metamask-connect')
 
-module.exports = PendingMsg
+module.exports = connect()(PendingMsg)
 
 inherits(PendingMsg, Component)
 function PendingMsg () {
@@ -30,14 +30,14 @@ PendingMsg.prototype.render = function () {
           fontWeight: 'bold',
           textAlign: 'center',
         },
-      }, t('signMessage')),
+      }, this.props.t('signMessage')),
 
       h('.error', {
         style: {
           margin: '10px',
         },
       }, [
-        t('signNotice'),
+        this.props.t('signNotice'),
         h('a', {
           href: 'https://medium.com/metamask/the-new-secure-way-to-sign-data-in-your-browser-6af9dd2a1527',
           style: { color: 'rgb(247, 134, 28)' },
@@ -46,7 +46,7 @@ PendingMsg.prototype.render = function () {
             const url = 'https://medium.com/metamask/the-new-secure-way-to-sign-data-in-your-browser-6af9dd2a1527'
             global.platform.openWindow({ url })
           },
-        }, t('readMore')),
+        }, this.props.t('readMore')),
       ]),
 
       // message details
@@ -56,10 +56,10 @@ PendingMsg.prototype.render = function () {
       h('.flex-row.flex-space-around', [
         h('button', {
           onClick: state.cancelMessage,
-        }, t('cancel')),
+        }, this.props.t('cancel')),
         h('button', {
           onClick: state.signMessage,
-        }, t('sign')),
+        }, this.props.t('sign')),
       ]),
     ])
 

ui/app/components/pending-tx/confirm-deploy-contract.js

@@ -1,5 +1,5 @@
 const { Component } = require('react')
-const { connect } = require('react-redux')
+const connect = require('../../metamask-connect')
 const h = require('react-hyperscript')
 const PropTypes = require('prop-types')
 const actions = require('../../actions')
@@ -8,7 +8,6 @@ const ethUtil = require('ethereumjs-util')
 const BN = ethUtil.BN
 const hexToBn = require('../../../../app/scripts/lib/hex-to-bn')
 const { conversionUtil } = require('../../conversion-util')
-const t = require('../../../i18n')
 const SenderToRecipient = require('../sender-to-recipient')
 const NetworkDisplay = require('../network-display')
 
@@ -33,7 +32,7 @@ class ConfirmDeployContract extends Component {
     if (valid && this.verifyGasParams()) {
       this.props.sendTransaction(txMeta, event)
     } else {
-      this.props.displayWarning('invalidGasParams')
+      this.props.displayWarning(this.props.t('invalidGasParams'))
       this.setState({ submitting: false })
     }
   }
@@ -178,7 +177,7 @@ class ConfirmDeployContract extends Component {
 
     return (
       h('section.flex-row.flex-center.confirm-screen-row', [
-        h('span.confirm-screen-label.confirm-screen-section-column', [ t('gasFee') ]),
+        h('span.confirm-screen-label.confirm-screen-section-column', [ this.props.t('gasFee') ]),
         h('div.confirm-screen-section-column', [
           h('div.confirm-screen-row-info', `${fiatGas} ${currentCurrency.toUpperCase()}`),
 
@@ -217,8 +216,8 @@ class ConfirmDeployContract extends Component {
     return (
       h('section.flex-row.flex-center.confirm-screen-row.confirm-screen-total-box ', [
         h('div.confirm-screen-section-column', [
-          h('span.confirm-screen-label', [ t('total') + ' ' ]),
+          h('span.confirm-screen-label', [ this.props.t('total') + ' ' ]),
-          h('div.confirm-screen-total-box__subtitle', [ t('amountPlusGas') ]),
+          h('div.confirm-screen-total-box__subtitle', [ this.props.t('amountPlusGas') ]),
         ]),
 
         h('div.confirm-screen-section-column', [
@@ -248,11 +247,11 @@ class ConfirmDeployContract extends Component {
           h('.page-container__header-row', [
             h('span.page-container__back-button', {
               onClick: () => backToAccountDetail(selectedAddress),
-            }, t('back')),
+            }, this.props.t('back')),
             window.METAMASK_UI_TYPE === 'notification' && h(NetworkDisplay),
           ]),
-          h('.page-container__title', t('confirmContract')),
+          h('.page-container__title', this.props.t('confirmContract')),
-          h('.page-container__subtitle', t('pleaseReviewTransaction')),
+          h('.page-container__subtitle', this.props.t('pleaseReviewTransaction')),
         ]),
         // Main Send token Card
         h('.page-container__content', [
@@ -275,7 +274,7 @@ class ConfirmDeployContract extends Component {
 
           h('div.confirm-screen-rows', [
             h('section.flex-row.flex-center.confirm-screen-row', [
-              h('span.confirm-screen-label.confirm-screen-section-column', [ t('from') ]),
+              h('span.confirm-screen-label.confirm-screen-section-column', [ this.props.t('from') ]),
               h('div.confirm-screen-section-column', [
                 h('div.confirm-screen-row-info', fromName),
                 h('div.confirm-screen-row-detail', `...${fromAddress.slice(fromAddress.length - 4)}`),
@@ -283,9 +282,9 @@ class ConfirmDeployContract extends Component {
             ]),
 
             h('section.flex-row.flex-center.confirm-screen-row', [
-              h('span.confirm-screen-label.confirm-screen-section-column', [ t('to') ]),
+              h('span.confirm-screen-label.confirm-screen-section-column', [ this.props.t('to') ]),
               h('div.confirm-screen-section-column', [
-                h('div.confirm-screen-row-info', t('newContract')),
+                h('div.confirm-screen-row-info', this.props.t('newContract')),
               ]),
             ]),
 
@@ -303,12 +302,12 @@ class ConfirmDeployContract extends Component {
             // Cancel Button
             h('button.btn-cancel.page-container__footer-button.allcaps', {
               onClick: event => this.cancel(event, txMeta),
-            }, t('cancel')),
+            }, this.props.t('cancel')),
 
             // Accept Button
             h('button.btn-confirm.page-container__footer-button.allcaps', {
               onClick: event => this.onSubmit(event),
-            }, t('confirm')),
+            }, this.props.t('confirm')),
           ]),
         ]),
       ])
@@ -325,6 +324,7 @@ ConfirmDeployContract.propTypes = {
   conversionRate: PropTypes.number,
   currentCurrency: PropTypes.string,
   selectedAddress: PropTypes.string,
+  t: PropTypes.func,
 }
 
 const mapStateToProps = state => {
@@ -347,7 +347,7 @@ const mapDispatchToProps = dispatch => {
   return {
     backToAccountDetail: address => dispatch(actions.backToAccountDetail(address)),
     cancelTransaction: ({ id }) => dispatch(actions.cancelTx({ id })),
-    displayWarning: warning => actions.displayWarning(t(warning)),
+    displayWarning: warning => actions.displayWarning(warning),
   }
 }
 

ui/app/components/pending-tx/confirm-send-ether.js

@@ -1,5 +1,5 @@
 const Component = require('react').Component
-const { connect } = require('react-redux')
+const connect = require('../../metamask-connect')
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
 const actions = require('../../actions')
@@ -18,7 +18,6 @@ const {
   isBalanceSufficient,
 } = require('../send/send-utils')
 const GasFeeDisplay = require('../send/gas-fee-display-v2')
-const t = require('../../../i18n')
 const SenderToRecipient = require('../sender-to-recipient')
 const NetworkDisplay = require('../network-display')
 
@@ -205,7 +204,7 @@ ConfirmSendEther.prototype.getData = function () {
     },
     to: {
       address: txParams.to,
-      name: identities[txParams.to] ? identities[txParams.to].name : t('newRecipient'),
+      name: identities[txParams.to] ? identities[txParams.to].name : this.props.t('newRecipient'),
     },
     memo: txParams.memo || '',
     gasFeeInFIAT,
@@ -311,7 +310,7 @@ ConfirmSendEther.prototype.render = function () {
 
         h('div.confirm-screen-rows', [
           h('section.flex-row.flex-center.confirm-screen-row', [
-            h('span.confirm-screen-label.confirm-screen-section-column', [ t('from') ]),
+            h('span.confirm-screen-label.confirm-screen-section-column', [ this.props.t('from') ]),
             h('div.confirm-screen-section-column', [
               h('div.confirm-screen-row-info', fromName),
               h('div.confirm-screen-row-detail', `...${fromAddress.slice(fromAddress.length - 4)}`),
@@ -319,7 +318,7 @@ ConfirmSendEther.prototype.render = function () {
           ]),
 
           h('section.flex-row.flex-center.confirm-screen-row', [
-            h('span.confirm-screen-label.confirm-screen-section-column', [ t('to') ]),
+            h('span.confirm-screen-label.confirm-screen-section-column', [ this.props.t('to') ]),
             h('div.confirm-screen-section-column', [
               h('div.confirm-screen-row-info', toName),
               h('div.confirm-screen-row-detail', `...${toAddress.slice(toAddress.length - 4)}`),
@@ -327,7 +326,7 @@ ConfirmSendEther.prototype.render = function () {
           ]),
 
           h('section.flex-row.flex-center.confirm-screen-row', [
-            h('span.confirm-screen-label.confirm-screen-section-column', [ t('gasFee') ]),
+            h('span.confirm-screen-label.confirm-screen-section-column', [ this.props.t('gasFee') ]),
             h('div.confirm-screen-section-column', [
               h(GasFeeDisplay, {
                 gasTotal: gasTotal || gasFeeInHex,
@@ -345,8 +344,8 @@ ConfirmSendEther.prototype.render = function () {
                 'confirm-screen-section-column': !errors['insufficientFunds'],
               }),
             }, [
-              h('span.confirm-screen-label', [ t('total') + ' ' ]),
+              h('span.confirm-screen-label', [ this.props.t('total') + ' ' ]),
-              h('div.confirm-screen-total-box__subtitle', [ t('amountPlusGas') ]),
+              h('div.confirm-screen-total-box__subtitle', [ this.props.t('amountPlusGas') ]),
             ]),
 
             h('div.confirm-screen-section-column', [
@@ -449,10 +448,10 @@ ConfirmSendEther.prototype.render = function () {
               clearSend()
               this.cancel(event, txMeta)
             },
-          }, t('cancel')),
+          }, this.props.t('cancel')),
 
           // Accept Button
-          h('button.btn-confirm.page-container__footer-button.allcaps', [t('confirm')]),
+          h('button.btn-confirm.page-container__footer-button.allcaps', [this.props.t('confirm')]),
         ]),
       ]),
     ])
@@ -478,9 +477,9 @@ ConfirmSendEther.prototype.onSubmit = function (event) {
   if (valid && this.verifyGasParams() && balanceIsSufficient) {
     this.props.sendTransaction(txMeta, event)
   } else if (!balanceIsSufficient) {
-    updateSendErrors({ insufficientFunds: t('insufficientFunds') })
+    updateSendErrors({ insufficientFunds: this.props.t('insufficientFunds') })
   } else {
-    updateSendErrors({ invalidGasParams: t('invalidGasParams') })
+    updateSendErrors({ invalidGasParams: this.props.t('invalidGasParams') })
     this.setState({ submitting: false })
   }
 }

ui/app/components/pending-tx/confirm-send-token.js

@@ -1,12 +1,11 @@
 const Component = require('react').Component
-const { connect } = require('react-redux')
+const connect = require('../../metamask-connect')
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
 const tokenAbi = require('human-standard-token-abi')
 const abiDecoder = require('abi-decoder')
 abiDecoder.addABI(tokenAbi)
 const actions = require('../../actions')
-const t = require('../../../i18n')
 const clone = require('clone')
 const Identicon = require('../identicon')
 const GasFeeDisplay = require('../send/gas-fee-display-v2.js')
@@ -177,7 +176,7 @@ ConfirmSendToken.prototype.getAmount = function () {
       ? +(sendTokenAmount * tokenExchangeRate * conversionRate).toFixed(2)
       : null,
     token: typeof value === 'undefined'
-      ? t('unknown')
+      ? this.props.t('unknown')
       : +sendTokenAmount.toFixed(decimals),
   }
 
@@ -249,7 +248,7 @@ ConfirmSendToken.prototype.getData = function () {
     },
     to: {
       address: value,
-      name: identities[value] ? identities[value].name : t('newRecipient'),
+      name: identities[value] ? identities[value].name : this.props.t('newRecipient'),
     },
     memo: txParams.memo || '',
   }
@@ -295,7 +294,7 @@ ConfirmSendToken.prototype.renderGasFee = function () {
 
   return (
     h('section.flex-row.flex-center.confirm-screen-row', [
-      h('span.confirm-screen-label.confirm-screen-section-column', [ t('gasFee') ]),
+      h('span.confirm-screen-label.confirm-screen-section-column', [ this.props.t('gasFee') ]),
       h('div.confirm-screen-section-column', [
         h(GasFeeDisplay, {
           gasTotal: gasTotal || gasFeeInHex,
@@ -317,8 +316,8 @@ ConfirmSendToken.prototype.renderTotalPlusGas = function () {
     ? (
       h('section.flex-row.flex-center.confirm-screen-row.confirm-screen-total-box ', [
         h('div.confirm-screen-section-column', [
-          h('span.confirm-screen-label', [ t('total') + ' ' ]),
+          h('span.confirm-screen-label', [ this.props.t('total') + ' ' ]),
-          h('div.confirm-screen-total-box__subtitle', [ t('amountPlusGas') ]),
+          h('div.confirm-screen-total-box__subtitle', [ this.props.t('amountPlusGas') ]),
         ]),
 
         h('div.confirm-screen-section-column', [
@@ -335,13 +334,13 @@ ConfirmSendToken.prototype.renderTotalPlusGas = function () {
             'confirm-screen-section-column': !errors['insufficientFunds'],
           }),
         }, [
-          h('span.confirm-screen-label', [ t('total') + ' ' ]),
+          h('span.confirm-screen-label', [ this.props.t('total') + ' ' ]),
-          h('div.confirm-screen-total-box__subtitle', [ t('amountPlusGas') ]),
+          h('div.confirm-screen-total-box__subtitle', [ this.props.t('amountPlusGas') ]),
         ]),
 
         h('div.confirm-screen-section-column', [
           h('div.confirm-screen-row-info', `${tokenAmount} ${symbol}`),
-          h('div.confirm-screen-row-detail', `+ ${fiatGas} ${currentCurrency} ${t('gas')}`),
+          h('div.confirm-screen-row-detail', `+ ${fiatGas} ${currentCurrency} ${this.props.t('gas')}`),
         ]),
 
         this.renderErrorMessage('insufficientFunds'),
@@ -373,10 +372,11 @@ ConfirmSendToken.prototype.render = function () {
 
   this.inputs = []
 
-  const title = txMeta.lastGasPrice ? 'Reprice Transaction' : t('confirm')
+  const isTxReprice = Boolean(txMeta.lastGasPrice)
-  const subtitle = txMeta.lastGasPrice
+  const title = isTxReprice ? this.props.t('reprice_title') : this.props.t('confirm')
-    ? 'Increase your gas fee to attempt to overwrite and speed up your transaction'
+  const subtitle = isTxReprice
-    : t('pleaseReviewTransaction')
+    ? this.props.t('reprice_subtitle')
+    : this.props.t('pleaseReviewTransaction')
 
   return (
     h('div.confirm-screen-container.confirm-send-token', [
@@ -385,7 +385,7 @@ ConfirmSendToken.prototype.render = function () {
         h('div.page-container__header', [
           !txMeta.lastGasPrice && h('button.confirm-screen-back-button', {
             onClick: () => editTransaction(txMeta),
-          }, t('edit')),
+          }, this.props.t('edit')),
           h('div.page-container__title', title),
           h('div.page-container__subtitle', subtitle),
         ]),
@@ -429,7 +429,7 @@ ConfirmSendToken.prototype.render = function () {
 
           h('div.confirm-screen-rows', [
             h('section.flex-row.flex-center.confirm-screen-row', [
-              h('span.confirm-screen-label.confirm-screen-section-column', [ t('from') ]),
+              h('span.confirm-screen-label.confirm-screen-section-column', [ this.props.t('from') ]),
               h('div.confirm-screen-section-column', [
                 h('div.confirm-screen-row-info', fromName),
                 h('div.confirm-screen-row-detail', `...${fromAddress.slice(fromAddress.length - 4)}`),
@@ -437,7 +437,7 @@ ConfirmSendToken.prototype.render = function () {
             ]),
 
             toAddress && h('section.flex-row.flex-center.confirm-screen-row', [
-              h('span.confirm-screen-label.confirm-screen-section-column', [ t('to') ]),
+              h('span.confirm-screen-label.confirm-screen-section-column', [ this.props.t('to') ]),
               h('div.confirm-screen-section-column', [
                 h('div.confirm-screen-row-info', toName),
                 h('div.confirm-screen-row-detail', `...${toAddress.slice(toAddress.length - 4)}`),
@@ -451,6 +451,7 @@ ConfirmSendToken.prototype.render = function () {
           ]),
 
         ]),
+
         h('form#pending-tx-form', {
           onSubmit: this.onSubmit,
         }, [
@@ -458,10 +459,10 @@ ConfirmSendToken.prototype.render = function () {
             // Cancel Button
             h('button.btn-cancel.page-container__footer-button.allcaps', {
               onClick: (event) => this.cancel(event, txMeta),
-            }, t('cancel')),
+            }, this.props.t('cancel')),
 
             // Accept Button
-            h('button.btn-confirm.page-container__footer-button.allcaps', [t('confirm')]),
+            h('button.btn-confirm.page-container__footer-button.allcaps', [this.props.t('confirm')]),
           ]),
         ]),
       ]),
@@ -480,9 +481,9 @@ ConfirmSendToken.prototype.onSubmit = function (event) {
   if (valid && this.verifyGasParams() && balanceIsSufficient) {
     this.props.sendTransaction(txMeta, event)
   } else if (!balanceIsSufficient) {
-    updateSendErrors({ insufficientFunds: t('insufficientFunds') })
+    updateSendErrors({ insufficientFunds: this.props.t('insufficientFunds') })
   } else {
-    updateSendErrors({ invalidGasParams: t('invalidGasParams') })
+    updateSendErrors({ invalidGasParams: this.props.t('invalidGasParams') })
     this.setState({ submitting: false })
   }
 }

ui/app/components/pending-tx/index.js

@@ -1,5 +1,5 @@
 const Component = require('react').Component
-const { connect } = require('react-redux')
+const connect = require('../../metamask-connect')
 const h = require('react-hyperscript')
 const clone = require('clone')
 const abi = require('human-standard-token-abi')

ui/app/components/qr-code.js

@@ -2,7 +2,7 @@ const Component = require('react').Component
 const h = require('react-hyperscript')
 const qrCode = require('qrcode-npm').qrcode
 const inherits = require('util').inherits
-const connect = require('react-redux').connect
+const connect = require('../metamask-connect')
 const isHexPrefixed = require('ethereumjs-util').isHexPrefixed
 const ReadOnlyInput = require('./readonly-input')
 

ui/app/components/send/account-list-item.js

@@ -1,7 +1,7 @@
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
-const connect = require('react-redux').connect
+const connect = require('../../metamask-connect')
 const Identicon = require('../identicon')
 const CurrencyDisplay = require('./currency-display')
 const { conversionRateSelector, getCurrentCurrency } = require('../../selectors')

ui/app/components/send/gas-fee-display-v2.js

@@ -2,9 +2,9 @@ const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
 const CurrencyDisplay = require('./currency-display')
-const t = require('../../../i18n')
+const connect = require('../../metamask-connect')
 
-module.exports = GasFeeDisplay
+module.exports = connect()(GasFeeDisplay)
 
 inherits(GasFeeDisplay, Component)
 function GasFeeDisplay () {
@@ -33,8 +33,8 @@ GasFeeDisplay.prototype.render = function () {
         readOnly: true,
       })
       : gasLoadingError
-        ? h('div..currency-display.currency-display--message', 'Set with the gas price customizer.')
+        ? h('div.currency-display.currency-display--message', this.props.t('setGasPrice'))
-        : h('div.currency-display', t('loading')),
+        : h('div.currency-display', this.props.t('loading')),
 
     h('button.sliders-icon-container', {
       onClick,

ui/app/components/send/gas-tooltip.js

@@ -2,9 +2,9 @@ const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
 const InputNumber = require('../input-number.js')
-const t = require('../../../i18n')
+const connect = require('../../metamask-connect')
 
-module.exports = GasTooltip
+module.exports = connect()(GasTooltip)
 
 inherits(GasTooltip, Component)
 function GasTooltip () {
@@ -82,7 +82,7 @@ GasTooltip.prototype.render = function () {
             'marginTop': '81px',
           },
         }, [
-          h('span.gas-tooltip-label', {}, [t('gasLimit')]),
+          h('span.gas-tooltip-label', {}, [this.props.t('gasLimit')]),
           h('i.fa.fa-info-circle'),
         ]),
         h(InputNumber, {

ui/app/components/send/send-v2-container.js

@@ -1,4 +1,4 @@
-const connect = require('react-redux').connect
+const connect = require('../../metamask-connect')
 const actions = require('../../actions')
 const abi = require('ethereumjs-abi')
 const SendEther = require('../../send-v2')

ui/app/components/send/to-autocomplete.js

@@ -2,9 +2,9 @@ const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
 const AccountListItem = require('./account-list-item')
-const t = require('../../../i18n')
+const connect = require('../../metamask-connect')
 
-module.exports = ToAutoComplete
+module.exports = connect()(ToAutoComplete)
 
 inherits(ToAutoComplete, Component)
 function ToAutoComplete () {
@@ -93,7 +93,7 @@ ToAutoComplete.prototype.render = function () {
   return h('div.send-v2__to-autocomplete', {}, [
 
     h('input.send-v2__to-autocomplete__input', {
-      placeholder: t('recipientAddress'),
+      placeholder: this.props.t('recipientAddress'),
       className: inError ? `send-v2__error-border` : '',
       value: to,
       onChange: event => onChange(event.target.value),

ui/app/components/sender-to-recipient.js

@@ -1,7 +1,7 @@
 const { Component } = require('react')
 const h = require('react-hyperscript')
+const connect = require('../metamask-connect')
 const PropTypes = require('prop-types')
-const t = require('../../i18n')
 const Identicon = require('./identicon')
 
 class SenderToRecipient extends Component {
@@ -21,7 +21,7 @@ class SenderToRecipient extends Component {
         this.renderRecipientIcon(),
         h(
           '.sender-to-recipient__name.sender-to-recipient__recipient-name',
-          recipientName || t('newContract')
+          recipientName || this.props.t('newContract')
         ),
       ])
     )
@@ -61,6 +61,7 @@ SenderToRecipient.propTypes = {
   senderAddress: PropTypes.string,
   recipientName: PropTypes.string,
   recipientAddress: PropTypes.string,
+  t: PropTypes.func,
 }
 
-module.exports = SenderToRecipient
+module.exports = connect()(SenderToRecipient)

ui/app/components/shapeshift-form.js

@@ -1,13 +1,12 @@
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
 const Component = require('react').Component
-const connect = require('react-redux').connect
+const connect = require('../metamask-connect')
 const classnames = require('classnames')
 const { qrcode } = require('qrcode-npm')
 const { shapeShiftSubview, pairUpdate, buyWithShapeShift } = require('../actions')
 const { isValidAddress } = require('../util')
 const SimpleDropdown = require('./dropdowns/simple-dropdown')
-const t = require('../../i18n')
 
 function mapStateToProps (state) {
   const {
@@ -94,7 +93,7 @@ ShapeshiftForm.prototype.onBuyWithShapeShift = function () {
       }))
       .catch(() => this.setState({
         showQrCode: false,
-        errorMessage: t('invalidRequest'),
+        errorMessage: this.props.t('invalidRequest'),
         isLoading: false,
       }))
   }
@@ -126,10 +125,10 @@ ShapeshiftForm.prototype.renderMarketInfo = function () {
 
   return h('div.shapeshift-form__metadata', {}, [
 
-    this.renderMetadata(t('status'), limit ? t('available') : t('unavailable')),
+    this.renderMetadata(this.props.t('status'), limit ? this.props.t('available') : this.props.t('unavailable')),
-    this.renderMetadata(t('limit'), limit),
+    this.renderMetadata(this.props.t('limit'), limit),
-    this.renderMetadata(t('exchangeRate'), rate),
+    this.renderMetadata(this.props.t('exchangeRate'), rate),
-    this.renderMetadata(t('min'), minimum),
+    this.renderMetadata(this.props.t('min'), minimum),
 
   ])
 }
@@ -143,7 +142,7 @@ ShapeshiftForm.prototype.renderQrCode = function () {
   return h('div.shapeshift-form', {}, [
 
     h('div.shapeshift-form__deposit-instruction', [
-      t('depositCoin', [depositCoin.toUpperCase()]),
+      this.props.t('depositCoin', [depositCoin.toUpperCase()]),
     ]),
 
     h('div', depositAddress),
@@ -180,7 +179,7 @@ ShapeshiftForm.prototype.render = function () {
 
             h('div.shapeshift-form__selector', [
 
-              h('div.shapeshift-form__selector-label', t('deposit')),
+              h('div.shapeshift-form__selector-label', this.props.t('deposit')),
 
               h(SimpleDropdown, {
                 selectedOption: this.state.depositCoin,
@@ -200,7 +199,7 @@ ShapeshiftForm.prototype.render = function () {
             h('div.shapeshift-form__selector', [
 
               h('div.shapeshift-form__selector-label', [
-                t('receive'),
+                this.props.t('receive'),
               ]),
 
               h('div.shapeshift-form__selector-input', ['ETH']),
@@ -218,7 +217,7 @@ ShapeshiftForm.prototype.render = function () {
           }, [
 
             h('div.shapeshift-form__address-input-label', [
-              t('refundAddress'),
+              this.props.t('refundAddress'),
             ]),
 
             h('input.shapeshift-form__address-input', {
@@ -240,7 +239,7 @@ ShapeshiftForm.prototype.render = function () {
         className: btnClass,
         disabled: !token,
         onClick: () => this.onBuyWithShapeShift(),
-      }, [t('buy')]),
+      }, [this.props.t('buy')]),
 
     ])
 }

ui/app/components/shift-list-item.js

@@ -1,12 +1,11 @@
 const inherits = require('util').inherits
 const Component = require('react').Component
 const h = require('react-hyperscript')
-const connect = require('react-redux').connect
+const connect = require('../metamask-connect')
 const vreme = new (require('vreme'))()
 const explorerLink = require('etherscan-link').createExplorerLink
 const actions = require('../actions')
 const addressSummary = require('../util').addressSummary
-const t = require('../../i18n')
 
 const CopyButton = require('./copyButton')
 const EthBalance = require('./eth-balance')
@@ -76,7 +75,7 @@ ShiftListItem.prototype.renderUtilComponents = function () {
           value: this.props.depositAddress,
         }),
         h(Tooltip, {
-          title: t('qrCode'),
+          title: this.props.t('qrCode'),
         }, [
           h('i.fa.fa-qrcode.pointer.pop-hover', {
             onClick: () => props.dispatch(actions.reshowQrCode(props.depositAddress, props.depositType)),
@@ -136,8 +135,8 @@ ShiftListItem.prototype.renderInfo = function () {
             color: '#ABA9AA',
             width: '100%',
           },
-        }, t('toETHviaShapeShift', [props.depositType])),
+        }, this.props.t('toETHviaShapeShift', [props.depositType])),
-        h('div', t('noDeposits')),
+        h('div', this.props.t('noDeposits')),
         h('div', {
           style: {
             fontSize: 'x-small',
@@ -159,8 +158,8 @@ ShiftListItem.prototype.renderInfo = function () {
             color: '#ABA9AA',
             width: '100%',
           },
-        }, t('toETHviaShapeShift', [props.depositType])),
+        }, this.props.t('toETHviaShapeShift', [props.depositType])),
-        h('div', t('conversionProgress')),
+        h('div', this.props.t('conversionProgress')),
         h('div', {
           style: {
             fontSize: 'x-small',
@@ -185,7 +184,7 @@ ShiftListItem.prototype.renderInfo = function () {
             color: '#ABA9AA',
             width: '100%',
           },
-        }, t('fromShapeShift')),
+        }, this.props.t('fromShapeShift')),
         h('div', formatDate(props.time)),
         h('div', {
           style: {
@@ -197,7 +196,7 @@ ShiftListItem.prototype.renderInfo = function () {
       ])
 
     case 'failed':
-      return h('span.error', '(' + t('failed') + ')')
+      return h('span.error', '(' + this.props.t('failed') + ')')
     default:
       return ''
   }

ui/app/components/signature-request.js

@@ -2,14 +2,13 @@ const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
 const Identicon = require('./identicon')
-const connect = require('react-redux').connect
+const connect = require('../metamask-connect')
 const ethUtil = require('ethereumjs-util')
 const classnames = require('classnames')
 
 const AccountDropdownMini = require('./dropdowns/account-dropdown-mini')
 
 const actions = require('../actions')
-const t = require('../../i18n')
 const { conversionUtil } = require('../conversion-util')
 
 const {
@@ -55,7 +54,7 @@ SignatureRequest.prototype.renderHeader = function () {
 
     h('div.request-signature__header-background'),
 
-    h('div.request-signature__header__text', t('sigRequest')),
+    h('div.request-signature__header__text', this.props.t('sigRequest')),
 
     h('div.request-signature__header__tip-container', [
       h('div.request-signature__header__tip'),
@@ -76,7 +75,7 @@ SignatureRequest.prototype.renderAccountDropdown = function () {
 
   return h('div.request-signature__account', [
 
-    h('div.request-signature__account-text', [t('account') + ':']),
+    h('div.request-signature__account-text', [this.props.t('account') + ':']),
 
     h(AccountDropdownMini, {
       selectedAccount,
@@ -103,7 +102,7 @@ SignatureRequest.prototype.renderBalance = function () {
 
   return h('div.request-signature__balance', [
 
-    h('div.request-signature__balance-text', [t('balance')]),
+    h('div.request-signature__balance-text', [this.props.t('balance')]),
 
     h('div.request-signature__balance-value', `${balanceInEther} ETH`),
 
@@ -137,7 +136,7 @@ SignatureRequest.prototype.renderRequestInfo = function () {
   return h('div.request-signature__request-info', [
 
     h('div.request-signature__headline', [
-      t('yourSigRequested'),
+      this.props.t('yourSigRequested'),
     ]),
 
   ])
@@ -155,18 +154,18 @@ SignatureRequest.prototype.msgHexToText = function (hex) {
 
 SignatureRequest.prototype.renderBody = function () {
   let rows
-  let notice = t('youSign') + ':'
+  let notice = this.props.t('youSign') + ':'
 
   const { txData } = this.props
   const { type, msgParams: { data } } = txData
 
   if (type === 'personal_sign') {
-    rows = [{ name: t('message'), value: this.msgHexToText(data) }]
+    rows = [{ name: this.props.t('message'), value: this.msgHexToText(data) }]
   } else if (type === 'eth_signTypedData') {
     rows = data
   } else if (type === 'eth_sign') {
-    rows = [{ name: t('message'), value: data }]
+    rows = [{ name: this.props.t('message'), value: data }]
-    notice = t('signNotice')
+    notice = this.props.t('signNotice')
   }
 
   return h('div.request-signature__body', {}, [
@@ -225,10 +224,10 @@ SignatureRequest.prototype.renderFooter = function () {
   return h('div.request-signature__footer', [
     h('button.btn-secondary--lg.request-signature__footer__cancel-button', {
       onClick: cancel,
-    }, t('cancel')),
+    }, this.props.t('cancel')),
     h('button.btn-primary--lg', {
       onClick: sign,
-    }, t('sign')),
+    }, this.props.t('sign')),
   ])
 }
 

ui/app/components/token-balance.js

@@ -2,7 +2,7 @@ const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
 const TokenTracker = require('eth-token-tracker')
-const connect = require('react-redux').connect
+const connect = require('../metamask-connect')
 const selectors = require('../selectors')
 
 function mapStateToProps (state) {

ui/app/components/token-cell.js

@@ -1,7 +1,7 @@
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
-const connect = require('react-redux').connect
+const connect = require('../metamask-connect')
 const Identicon = require('./identicon')
 const prefixForNetwork = require('../../lib/etherscan-prefix-for-network')
 const selectors = require('../selectors')

ui/app/components/token-list.js

@@ -3,9 +3,8 @@ const h = require('react-hyperscript')
 const inherits = require('util').inherits
 const TokenTracker = require('eth-token-tracker')
 const TokenCell = require('./token-cell.js')
-const connect = require('react-redux').connect
+const connect = require('../metamask-connect')
 const selectors = require('../selectors')
-const t = require('../../i18n')
 
 function mapStateToProps (state) {
   return {
@@ -43,7 +42,7 @@ TokenList.prototype.render = function () {
   const { tokens, isLoading, error } = state
 
   if (isLoading) {
-    return this.message(t('loadingTokens'))
+    return this.message(this.props.t('loadingTokens'))
   }
 
   if (error) {
@@ -53,7 +52,7 @@ TokenList.prototype.render = function () {
         padding: '80px',
       },
     }, [
-      t('troubleTokenBalances'),
+      this.props.t('troubleTokenBalances'),
       h('span.hotFix', {
         style: {
           color: 'rgba(247, 134, 28, 1)',
@@ -64,7 +63,7 @@ TokenList.prototype.render = function () {
           url: `https://ethplorer.io/address/${userAddress}`,
         })
         },
-      }, t('here')),
+      }, this.props.t('here')),
     ])
   }
 

ui/app/components/tx-list-item.js

@@ -1,6 +1,6 @@
 const Component = require('react').Component
 const h = require('react-hyperscript')
-const connect = require('react-redux').connect
+const connect = require('../metamask-connect')
 const inherits = require('util').inherits
 const classnames = require('classnames')
 const abi = require('human-standard-token-abi')
@@ -14,7 +14,6 @@ const { conversionUtil, multiplyCurrencies } = require('../conversion-util')
 const { calcTokenAmount } = require('../token-util')
 
 const { getCurrentCurrency } = require('../selectors')
-const t = require('../../i18n')
 
 module.exports = connect(mapStateToProps, mapDispatchToProps)(TxListItem)
 
@@ -75,7 +74,7 @@ TxListItem.prototype.getAddressText = function () {
     default:
       return address
         ? `${address.slice(0, 10)}...${address.slice(-4)}`
-        : t('contractDeployment')
+        : this.props.t('contractDeployment')
   }
 }
 
@@ -307,21 +306,21 @@ TxListItem.prototype.txStatusIndicator = function () {
   let name
 
   if (transactionStatus === 'unapproved') {
-    name = t('unapproved')
+    name = this.props.t('unapproved')
   } else if (transactionStatus === 'rejected') {
-    name = t('rejected')
+    name = this.props.t('rejected')
   } else if (transactionStatus === 'approved') {
-    name = t('approved')
+    name = this.props.t('approved')
   } else if (transactionStatus === 'signed') {
-    name = t('signed')
+    name = this.props.t('signed')
   } else if (transactionStatus === 'submitted') {
-    name = t('submitted')
+    name = this.props.t('submitted')
   } else if (transactionStatus === 'confirmed') {
-    name = t('confirmed')
+    name = this.props.t('confirmed')
   } else if (transactionStatus === 'failed') {
-    name = t('failed')
+    name = this.props.t('failed')
   } else if (transactionStatus === 'dropped') {
-    name = t('dropped')
+    name = this.props.t('dropped')
   }
   return name
 }

ui/app/components/tx-list.js

@@ -1,5 +1,5 @@
 const Component = require('react').Component
-const connect = require('react-redux').connect
+const connect = require('../metamask-connect')
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
 const prefixForNetwork = require('../../lib/etherscan-prefix-for-network')
@@ -10,7 +10,6 @@ const { formatDate } = require('../util')
 const { showConfTxPage } = require('../actions')
 const classnames = require('classnames')
 const { tokenInfoGetter } = require('../token-util')
-const t = require('../../i18n')
 
 module.exports = connect(mapStateToProps, mapDispatchToProps)(TxList)
 
@@ -40,7 +39,7 @@ TxList.prototype.render = function () {
   return h('div.flex-column', [
     h('div.flex-row.tx-list-header-wrapper', [
       h('div.flex-row.tx-list-header', [
-        h('div', t('transactions')),
+        h('div', this.props.t('transactions')),
       ]),
     ]),
     h('div.flex-column.tx-list-container', {}, [
@@ -57,7 +56,7 @@ TxList.prototype.renderTransaction = function () {
     : [h(
         'div.tx-list-item.tx-list-item--empty',
         { key: 'tx-list-none' },
-        [ t('noTransactions') ],
+        [ this.props.t('noTransactions') ],
       )]
 }
 
@@ -111,7 +110,7 @@ TxList.prototype.renderTransactionListItem = function (transaction, conversionRa
 
   if (isUnapproved) {
     opts.onClick = () => showConfTxPage({ id: transactionId })
-    opts.transactionStatus = t('Not Started')
+    opts.transactionStatus = this.props.t('notStarted')
   } else if (transactionHash) {
     opts.onClick = () => this.view(transactionHash, transactionNetworkId)
   }

ui/app/components/tx-view.js

@@ -1,11 +1,10 @@
 const Component = require('react').Component
-const connect = require('react-redux').connect
+const connect = require('../metamask-connect')
 const h = require('react-hyperscript')
 const ethUtil = require('ethereumjs-util')
 const inherits = require('util').inherits
 const actions = require('../actions')
 const selectors = require('../selectors')
-const t = require('../../i18n')
 
 const BalanceComponent = require('./balance-component')
 const TxList = require('./tx-list')
@@ -73,21 +72,21 @@ TxView.prototype.renderButtons = function () {
           onClick: () => showModal({
             name: 'DEPOSIT_ETHER',
           }),
-        }, t('deposit')),
+        }, this.props.t('deposit')),
 
         h('button.btn-primary.hero-balance-button', {
           style: {
             marginLeft: '0.8em',
           },
           onClick: showSendPage,
-        }, t('send')),
+        }, this.props.t('send')),
       ])
     )
     : (
       h('div.flex-row.flex-center.hero-balance-buttons', [
         h('button.btn-primary.hero-balance-button', {
           onClick: showSendTokenPage,
-        }, t('send')),
+        }, this.props.t('send')),
       ])
     )
 }

ui/app/components/wallet-view.js

@@ -1,5 +1,5 @@
 const Component = require('react').Component
-const connect = require('react-redux').connect
+const connect = require('../metamask-connect')
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
 const classnames = require('classnames')
@@ -11,7 +11,6 @@ const actions = require('../actions')
 const BalanceComponent = require('./balance-component')
 const TokenList = require('./token-list')
 const selectors = require('../selectors')
-const t = require('../../i18n')
 
 module.exports = connect(mapStateToProps, mapDispatchToProps)(WalletView)
 
@@ -117,7 +116,7 @@ WalletView.prototype.render = function () {
         onClick: hideSidebar,
       }),
 
-      h('div.wallet-view__keyring-label.allcaps', isLoose ? t('imported') : ''),
+      h('div.wallet-view__keyring-label.allcaps', isLoose ? this.props.t('imported') : ''),
 
       h('div.flex-column.flex-center.wallet-view__name-container', {
         style: { margin: '0 auto' },
@@ -134,13 +133,13 @@ WalletView.prototype.render = function () {
           selectedIdentity.name,
         ]),
 
-        h('button.btn-clear.wallet-view__details-button.allcaps', t('details')),
+        h('button.btn-clear.wallet-view__details-button.allcaps', this.props.t('details')),
       ]),
     ]),
 
     h(Tooltip, {
       position: 'bottom',
-      title: this.state.hasCopied ? t('copiedExclamation') : t('copyToClipboard'),
+      title: this.state.hasCopied ? this.props.t('copiedExclamation') : this.props.t('copyToClipboard'),
       wrapperClassName: 'wallet-view__tooltip',
     }, [
       h('button.wallet-view__address', {
@@ -173,7 +172,7 @@ WalletView.prototype.render = function () {
         showAddTokenPage()
         hideSidebar()
       },
-    }, t('addToken')),
+    }, this.props.t('addToken')),
   ])
 }
 

ui/app/conf-tx.js

@@ -1,7 +1,7 @@
 const inherits = require('util').inherits
 const Component = require('react').Component
 const h = require('react-hyperscript')
-const connect = require('react-redux').connect
+const connect = require('./metamask-connect')
 const actions = require('./actions')
 const txHelper = require('../lib/tx-helper')
 

ui/app/css/itcss/components/token-list.scss

@@ -10,9 +10,14 @@ $wallet-balance-breakpoint-range: "screen and (min-width: #{$break-large}) and (
   transition: linear 200ms;
   background-color: rgba($wallet-balance-bg, 0);
   position: relative;
+  flex: 1;
+  min-width: 0;
 
   &__token-balance {
     font-size: 1.5rem;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
 
     @media #{$wallet-balance-breakpoint-range} {
       font-size: 95%;
@@ -51,7 +56,8 @@ $wallet-balance-breakpoint-range: "screen and (min-width: #{$break-large}) and (
   &__balance-ellipsis {
     display: flex;
     align-items: center;
-    width: 100%;
+    min-width: 0;
+    flex: 1;
   }
 
   &__ellipsis {
@@ -61,6 +67,7 @@ $wallet-balance-breakpoint-range: "screen and (min-width: #{$break-large}) and (
 
   &__balance-wrapper {
     flex: 1 1 auto;
+    min-width: 0;
   }
 }
 

ui/app/first-time/init-menu.js

@@ -1,12 +1,11 @@
 const inherits = require('util').inherits
 const EventEmitter = require('events').EventEmitter
 const Component = require('react').Component
-const connect = require('react-redux').connect
+const connect = require('../metamask-connect')
 const h = require('react-hyperscript')
 const Mascot = require('../components/mascot')
 const actions = require('../actions')
 const Tooltip = require('../components/tooltip')
-const t = require('../../i18n')
 const getCaretCoordinates = require('textarea-caret')
 const environmentType = require('../../../app/scripts/lib/environment-type')
 const { OLD_UI_NETWORK_TYPE } = require('../../../app/scripts/config').enums
@@ -60,7 +59,7 @@ InitializeMenuScreen.prototype.renderMenu = function (state) {
           color: '#7F8082',
           marginBottom: 10,
         },
-      }, t('appName')),
+      }, this.props.t('appName')),
 
 
       h('div', [
@@ -70,10 +69,10 @@ InitializeMenuScreen.prototype.renderMenu = function (state) {
             color: '#7F8082',
             display: 'inline',
           },
-        }, t('encryptNewDen')),
+        }, this.props.t('encryptNewDen')),
 
         h(Tooltip, {
-          title: t('denExplainer'),
+          title: this.props.t('denExplainer'),
         }, [
           h('i.fa.fa-question-circle.pointer', {
             style: {
@@ -93,7 +92,7 @@ InitializeMenuScreen.prototype.renderMenu = function (state) {
       h('input.large-input.letter-spacey', {
         type: 'password',
         id: 'password-box',
-        placeholder: t('newPassword'),
+        placeholder: this.props.t('newPassword'),
         onInput: this.inputChanged.bind(this),
         style: {
           width: 260,
@@ -105,7 +104,7 @@ InitializeMenuScreen.prototype.renderMenu = function (state) {
       h('input.large-input.letter-spacey', {
         type: 'password',
         id: 'password-box-confirm',
-        placeholder: t('confirmPassword'),
+        placeholder: this.props.t('confirmPassword'),
         onKeyPress: this.createVaultOnEnter.bind(this),
         onInput: this.inputChanged.bind(this),
         style: {
@@ -120,7 +119,7 @@ InitializeMenuScreen.prototype.renderMenu = function (state) {
         style: {
           margin: 12,
         },
-      }, t('createDen')),
+      }, this.props.t('createDen')),
 
       h('.flex-row.flex-center.flex-grow', [
         h('p.pointer', {
@@ -130,7 +129,7 @@ InitializeMenuScreen.prototype.renderMenu = function (state) {
             color: 'rgb(247, 134, 28)',
             textDecoration: 'underline',
           },
-        }, t('importDen')),
+        }, this.props.t('importDen')),
       ]),
 
       h('.flex-row.flex-center.flex-grow', [
@@ -179,12 +178,12 @@ InitializeMenuScreen.prototype.createNewVaultAndKeychain = function () {
   var passwordConfirm = passwordConfirmBox.value
 
   if (password.length < 8) {
-    this.warning = t('passwordShort')
+    this.warning = this.props.t('passwordShort')
     this.props.dispatch(actions.displayWarning(this.warning))
     return
   }
   if (password !== passwordConfirm) {
-    this.warning = t('passwordMismatch')
+    this.warning = this.props.t('passwordMismatch')
     this.props.dispatch(actions.displayWarning(this.warning))
     return
   }

ui/app/keychains/hd/create-vault-complete.js

@@ -1,6 +1,6 @@
 const inherits = require('util').inherits
 const Component = require('react').Component
-const connect = require('react-redux').connect
+const connect = require('../../metamask-connect')
 const h = require('react-hyperscript')
 const actions = require('../../actions')
 const exportAsFile = require('../../util').exportAsFile

ui/app/keychains/hd/recover-seed/confirmation.js

@@ -1,10 +1,9 @@
 const inherits = require('util').inherits
 
 const Component = require('react').Component
-const connect = require('react-redux').connect
+const connect = require('../../../metamask-connect')
 const h = require('react-hyperscript')
 const actions = require('../../../actions')
-const t = require('../../../../i18n')
 
 module.exports = connect(mapStateToProps)(RevealSeedConfirmation)
 
@@ -50,13 +49,13 @@ RevealSeedConfirmation.prototype.render = function () {
         },
       }, [
 
-        h('h4', t('revealSeedWordsWarning')),
+        h('h4', this.props.t('revealSeedWordsWarning')),
 
         // confirmation
         h('input.large-input.letter-spacey', {
           type: 'password',
           id: 'password-box',
-          placeholder: t('enterPasswordConfirm'),
+          placeholder: this.props.t('enterPasswordConfirm'),
           onKeyPress: this.checkConfirmation.bind(this),
           style: {
             width: 260,
@@ -92,7 +91,7 @@ RevealSeedConfirmation.prototype.render = function () {
         ),
 
         props.inProgress && (
-          h('span.in-progress-notification', t('generatingSeed'))
+          h('span.in-progress-notification', this.props.t('generatingSeed'))
         ),
       ]),
     ])

ui/app/keychains/hd/restore-vault.js

@@ -1,8 +1,7 @@
 const inherits = require('util').inherits
 const PersistentForm = require('../../../lib/persistent-form')
-const connect = require('react-redux').connect
+const connect = require('../../metamask-connect')
 const h = require('react-hyperscript')
-const t = require('../../../i18n')
 const actions = require('../../actions')
 
 module.exports = connect(mapStateToProps)(RestoreVaultScreen)
@@ -37,23 +36,23 @@ RestoreVaultScreen.prototype.render = function () {
           padding: 6,
         },
       }, [
-        t('restoreVault'),
+        this.props.t('restoreVault'),
       ]),
 
       // wallet seed entry
-      h('h3', t('walletSeed')),
+      h('h3', this.props.t('walletSeed')),
       h('textarea.twelve-word-phrase.letter-spacey', {
         dataset: {
           persistentFormId: 'wallet-seed',
         },
-        placeholder: t('secretPhrase'),
+        placeholder: this.props.t('secretPhrase'),
       }),
 
       // password
       h('input.large-input.letter-spacey', {
         type: 'password',
         id: 'password-box',
-        placeholder: t('newPassword8Chars'),
+        placeholder: this.props.t('newPassword8Chars'),
         dataset: {
           persistentFormId: 'password',
         },
@@ -67,7 +66,7 @@ RestoreVaultScreen.prototype.render = function () {
       h('input.large-input.letter-spacey', {
         type: 'password',
         id: 'password-box-confirm',
-        placeholder: t('confirmPassword'),
+        placeholder: this.props.t('confirmPassword'),
         onKeyPress: this.createOnEnter.bind(this),
         dataset: {
           persistentFormId: 'password-confirmation',
@@ -97,7 +96,7 @@ RestoreVaultScreen.prototype.render = function () {
           style: {
             textTransform: 'uppercase',
           },
-        }, t('cancel')),
+        }, this.props.t('cancel')),
 
         // submit
         h('button.primary', {
@@ -105,7 +104,7 @@ RestoreVaultScreen.prototype.render = function () {
           style: {
             textTransform: 'uppercase',
           },
-        }, t('ok')),
+        }, this.props.t('ok')),
       ]),
     ])
   )
@@ -136,13 +135,13 @@ RestoreVaultScreen.prototype.createNewVaultAndRestore = function () {
   var passwordConfirmBox = document.getElementById('password-box-confirm')
   var passwordConfirm = passwordConfirmBox.value
   if (password.length < 8) {
-    this.warning = t('passwordNotLongEnough')
+    this.warning = this.props.t('passwordNotLongEnough')
 
     this.props.dispatch(actions.displayWarning(this.warning))
     return
   }
   if (password !== passwordConfirm) {
-    this.warning = t('passwordsDontMatch')
+    this.warning = this.props.t('passwordsDontMatch')
     this.props.dispatch(actions.displayWarning(this.warning))
     return
   }
@@ -152,18 +151,18 @@ RestoreVaultScreen.prototype.createNewVaultAndRestore = function () {
 
   // true if the string has more than a space between words.
   if (seed.split('  ').length > 1) {
-    this.warning = t('spaceBetween')
+    this.warning = this.props.t('spaceBetween')
     this.props.dispatch(actions.displayWarning(this.warning))
     return
   }
   // true if seed contains a character that is not between a-z or a space
   if (!seed.match(/^[a-z ]+$/)) {
-    this.warning = t('loweCaseWords')
+    this.warning = this.props.t('loweCaseWords')
       this.props.dispatch(actions.displayWarning(this.warning))
     return
   }
   if (seed.split(' ').length !== 12) {
-    this.warning = t('seedPhraseReq')
+    this.warning = this.props.t('seedPhraseReq')
     this.props.dispatch(actions.displayWarning(this.warning))
     return
   }

ui/app/metamask-connect.js

@@ -0,0 +1,27 @@
+const connect = require('react-redux').connect
+const t = require('../i18n-helper').getMessage
+
+const metamaskConnect = (mapStateToProps, mapDispatchToProps) => {
+    return connect(
+        _higherOrderMapStateToProps(mapStateToProps),
+        mapDispatchToProps
+    )
+}
+
+const _higherOrderMapStateToProps = (mapStateToProps) => {
+    let _t
+    let currentLocale
+    return (state, ownProps = {}) => {
+        const stateProps = mapStateToProps
+            ? mapStateToProps(state, ownProps)
+            : ownProps
+        if (currentLocale !== state.metamask.currentLocale) {
+            currentLocale = state.metamask.currentLocale
+            _t = t.bind(null, state.localeMessages)
+        }
+        stateProps.t = _t
+        return stateProps
+    }
+}
+
+module.exports = metamaskConnect

ui/app/new-keychain.js

@@ -1,7 +1,7 @@
 const inherits = require('util').inherits
 const Component = require('react').Component
 const h = require('react-hyperscript')
-const connect = require('react-redux').connect
+const connect = require('./metamask-connect')
 
 module.exports = connect(mapStateToProps)(NewKeychain)
 

ui/app/reducers.js

@@ -7,6 +7,7 @@ const copyToClipboard = require('copy-to-clipboard')
 const reduceIdentities = require('./reducers/identities')
 const reduceMetamask = require('./reducers/metamask')
 const reduceApp = require('./reducers/app')
+const reduceLocale = require('./reducers/locale')
 
 window.METAMASK_CACHED_LOG_STATE = null
 
@@ -38,6 +39,12 @@ function rootReducer (state, action) {
 
   state.appState = reduceApp(state, action)
 
+  //
+  // LocaleMessages
+  //
+
+  state.localeMessages = reduceLocale(state, action)
+
   window.METAMASK_CACHED_LOG_STATE = state
   return state
 }

ui/app/reducers/locale.js

@@ -0,0 +1,17 @@
+const extend = require('xtend')
+const actions = require('../actions')
+
+module.exports = reduceMetamask
+
+function reduceMetamask (state, action) {
+  const localeMessagesState = extend({}, state.localeMessages)
+
+  switch (action.type) {
+    case actions.SET_LOCALE_MESSAGES:
+      return extend(localeMessagesState, {
+        current: action.value,
+      })
+    default:
+      return localeMessagesState
+  }
+}

ui/app/reducers/metamask.js

@@ -47,6 +47,7 @@ function reduceMetamask (state, action) {
     networkEndpointType: OLD_UI_NETWORK_TYPE,
     isRevealingSeedWords: false,
     welcomeScreenSeen: false,
+    currentLocale: '',
   }, state.metamask)
 
   switch (action.type) {
@@ -357,6 +358,11 @@ function reduceMetamask (state, action) {
         welcomeScreenSeen: true,
       })
 
+    case action.SET_CURRENT_LOCALE:
+      return extend(metamaskState, {
+        currentLocale: action.value,
+      })
+
     default:
       return metamaskState
 

ui/app/select-app.js

@@ -1,6 +1,6 @@
 const inherits = require('util').inherits
 const Component = require('react').Component
-const connect = require('react-redux').connect
+const connect = require('./metamask-connect')
 const h = require('react-hyperscript')
 const App = require('./app')
 const OldApp = require('../../old-ui/app/app')