Merge branch 'master' into i3686-txparamundefined-sigrequestsintxlist

2 files changed, 21 insertions, 10 deletions

diff --git a/ui/app/accounts/new-account/create-form.js b/ui/app/accounts/new-account/create-form.js
index 69fbf1e35..48c74192a 100644
--- a/ui/app/accounts/new-account/create-form.js
+++ b/ui/app/accounts/new-account/create-form.js
@@ -1,11 +1,11 @@
 const { Component } = require('react')
 const PropTypes = require('prop-types')
 const h = require('react-hyperscript')
-const connect = require('../../metamask-connect')
+const connect = require('react-redux').connect
 const actions = require('../../actions')
 
 class NewAccountCreateForm extends Component {
-  constructor (props) {
+  constructor (props, context) {
     super(props)
 
     const { numberOfExistingAccounts = 0 } = props
@@ -13,7 +13,7 @@ class NewAccountCreateForm extends Component {
 
     this.state = {
       newAccountName: '',
-      defaultAccountName: this.props.t('newAccountNumberName', [newAccountNumber]),
+      defaultAccountName: context.t('newAccountNumberName', [newAccountNumber]),
     }
   }
 
@@ -24,7 +24,7 @@ class NewAccountCreateForm extends Component {
     return h('div.new-account-create-form', [
 
       h('div.new-account-create-form__input-label', {}, [
-        this.props.t('accountName'),
+        this.context.t('accountName'),
       ]),
 
       h('div.new-account-create-form__input-wrapper', {}, [
@@ -40,13 +40,13 @@ class NewAccountCreateForm extends Component {
         h('button.btn-secondary--lg.new-account-create-form__button', {
           onClick: () => this.props.goHome(),
         }, [
-          this.props.t('cancel'),
+          this.context.t('cancel'),
         ]),
 
         h('button.btn-primary--lg.new-account-create-form__button', {
           onClick: () => this.props.createAccount(newAccountName || defaultAccountName),
         }, [
-          this.props.t('create'),
+          this.context.t('create'),
         ]),
 
       ]),
@@ -97,4 +97,9 @@ const mapDispatchToProps = dispatch => {
   }
 }
 
+NewAccountCreateForm.contextTypes = {
+  t: PropTypes.func,
+}
+
 module.exports = connect(mapStateToProps, mapDispatchToProps)(NewAccountCreateForm)
+
diff --git a/ui/app/accounts/new-account/index.js b/ui/app/accounts/new-account/index.js
index 584016974..207cf7760 100644
--- a/ui/app/accounts/new-account/index.js
+++ b/ui/app/accounts/new-account/index.js
@@ -1,7 +1,8 @@
 const Component = require('react').Component
 const h = require('react-hyperscript')
+const PropTypes = require('prop-types')
 const inherits = require('util').inherits
-const connect = require('../../metamask-connect')
+const connect = require('react-redux').connect
 const actions = require('../../actions')
 const { getCurrentViewContext } = require('../../selectors')
 const classnames = require('classnames')
@@ -36,8 +37,13 @@ function AccountDetailsModal (props) {
   }
 }
 
+AccountDetailsModal.contextTypes = {
+  t: PropTypes.func,
+}
+
 module.exports = connect(mapStateToProps, mapDispatchToProps)(AccountDetailsModal)
 
+
 AccountDetailsModal.prototype.render = function () {
   const { displayedForm, displayForm } = this.props
 
@@ -45,7 +51,7 @@ AccountDetailsModal.prototype.render = function () {
 
     h('div.new-account__header', [
 
-      h('div.new-account__title', this.props.t('newAccount')),
+      h('div.new-account__title', this.context.t('newAccount')),
 
       h('div.new-account__tabs', [
 
@@ -55,7 +61,7 @@ AccountDetailsModal.prototype.render = function () {
             'new-account__tabs__unselected cursor-pointer': displayedForm !== 'CREATE',
           }),
           onClick: () => displayForm('CREATE'),
-        }, this.props.t('createDen')),
+        }, this.context.t('createDen')),
 
         h('div.new-account__tabs__tab', {
           className: classnames('new-account__tabs__tab', {
@@ -63,7 +69,7 @@ AccountDetailsModal.prototype.render = function () {
             'new-account__tabs__unselected cursor-pointer': displayedForm !== 'IMPORT',
           }),
           onClick: () => displayForm('IMPORT'),
-        }, this.props.t('import')),
+        }, this.context.t('import')),
 
       ]),