From 2526f8a1d8f59758b7bc04bb088fab6ad74b16a1 Mon Sep 17 00:00:00 2001
From: Whymarrh Whitby <whymarrh.whitby@gmail.com>
Date: Mon, 9 Jul 2018 17:24:12 -0230
Subject: [PATCH 1/3] Inline locale variable in fetchLocale fn

---
 ui/i18n-helper.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ui/i18n-helper.js b/ui/i18n-helper.js
index 79aa93116..269f6e1a4 100644
--- a/ui/i18n-helper.js
+++ b/ui/i18n-helper.js
@@ -29,8 +29,7 @@ const getMessage = (locale, key, substitutions) => {
 async function fetchLocale (localeName) {
   try {
     const response = await fetch(`./_locales/${localeName}/messages.json`)
-    const locale = await response.json()
-    return locale
+    return await response.json()
   } catch (error) {
     log.error(`failed to fetch ${localeName} locale because of ${error}`)
     return {}

From 94489b544ad4a68ddd961f8b549aaac8507266e6 Mon Sep 17 00:00:00 2001
From: Whymarrh Whitby <whymarrh.whitby@gmail.com>
Date: Mon, 9 Jul 2018 17:37:06 -0230
Subject: [PATCH 2/3] Fallback to English and then the key for I18nProvider#t

---
 ui/app/i18n-provider.js |  5 ++++-
 ui/i18n-helper.js       | 22 ++++++++++++----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/ui/app/i18n-provider.js b/ui/app/i18n-provider.js
index 2856e0ed6..d46911f7c 100644
--- a/ui/app/i18n-provider.js
+++ b/ui/app/i18n-provider.js
@@ -8,8 +8,11 @@ const t = require('../i18n-helper').getMessage
 class I18nProvider extends Component {
   getChildContext () {
     const { localeMessages } = this.props
+    const { current, en } = localeMessages
     return {
-      t: t.bind(null, localeMessages),
+      t (key, ...args) {
+        return t(current, key, ...args) || t(en, key, ...args) || `[${key}]`
+      },
     }
   }
 
diff --git a/ui/i18n-helper.js b/ui/i18n-helper.js
index 269f6e1a4..bc927ee65 100644
--- a/ui/i18n-helper.js
+++ b/ui/i18n-helper.js
@@ -1,20 +1,22 @@
 // cross-browser connection to extension i18n API
 const log = require('loglevel')
 
+/**
+ * Returns a localized message for the given key
+ * @param {object} locale The locale
+ * @param {string} key The message key
+ * @param {string[]} substitutions A list of message substitution replacements
+ * @return {null|string} The localized message
+ */
 const getMessage = (locale, key, substitutions) => {
-  // check locale is loaded
   if (!locale) {
-    // throw new Error('Translator - has not loaded a locale yet.')
-    return ''
+    return null
   }
-  // check entry is present
-  const { current, en } = locale
-  const entry = current[key] || en[key]
-  if (!entry) {
-    // throw new Error(`Translator - Unable to find value for "${key}"`)
-    log.error(`Translator - Unable to find value for "${key}"`)
-    return `[${key}]`
+  if (!locale[key]) {
+    log.error(`Translator - Unable to find value for key "${key}"`)
+    return null
   }
+  const entry = locale[key]
   let phrase = entry.message
   // perform substitutions
   if (substitutions && substitutions.length) {

From 9bfcb9c505595cb2e539700433835f30c8bcf049 Mon Sep 17 00:00:00 2001
From: Whymarrh Whitby <whymarrh.whitby@gmail.com>
Date: Mon, 9 Jul 2018 17:51:55 -0230
Subject: [PATCH 3/3] Remove unneeded MetaMaskConnect connect wrapper

---
 ui/app/components/pages/home.js |  2 +-
 ui/app/metamask-connect.js      | 27 ---------------------------
 2 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 ui/app/metamask-connect.js

diff --git a/ui/app/components/pages/home.js b/ui/app/components/pages/home.js
index c53413d3b..d24d5cc55 100644
--- a/ui/app/components/pages/home.js
+++ b/ui/app/components/pages/home.js
@@ -1,6 +1,6 @@
 const { Component } = require('react')
+const { connect } = require('react-redux')
 const PropTypes = require('prop-types')
-const connect = require('../../metamask-connect')
 const { Redirect, withRouter } = require('react-router-dom')
 const { compose } = require('recompose')
 const h = require('react-hyperscript')
diff --git a/ui/app/metamask-connect.js b/ui/app/metamask-connect.js
deleted file mode 100644
index 81fa7e403..000000000
--- a/ui/app/metamask-connect.js
+++ /dev/null
@@ -1,27 +0,0 @@
-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