Merge branch 'master' into i18n

1 files changed, 31 insertions, 2 deletions

diff --git a/ui/app/settings.js b/ui/app/settings.js
index 4e25ce084..466f739d5 100644
--- a/ui/app/settings.js
+++ b/ui/app/settings.js
@@ -201,7 +201,13 @@ class Settings extends Component {
           h('div.settings__content-item-col', [
             h('button.settings__clear-button', {
               onClick (event) {
-                exportAsFile('MetaMask State Logs', window.logState())
+                window.logStateString((err, result) => {
+                  if (err) {
+                    this.state.dispatch(actions.displayWarning('Error in retrieving state logs.'))
+                  } else {
+                    exportAsFile('MetaMask State Logs.json', result)
+                  }
+                })
               },
             }, 'Download State Logs'),
           ]),
@@ -250,6 +256,24 @@ class Settings extends Component {
     )
   }
 
+  renderResetAccount () {
+    const { showResetAccountConfirmationModal } = this.props
+
+    return h('div.settings__content-row', [
+      h('div.settings__content-item', 'Reset Account'),
+      h('div.settings__content-item', [
+        h('div.settings__content-item-col', [
+          h('button.settings__clear-button.settings__clear-button--orange', {
+            onClick (event) {
+              event.preventDefault()
+              showResetAccountConfirmationModal()
+            },
+          }, 'Reset Account'),
+        ]),
+      ]),
+    ])
+  }
+
   renderSettingsContent () {
     const { warning, isMascara } = this.props
 
@@ -262,6 +286,7 @@ class Settings extends Component {
         this.renderStateLogs(),
         this.renderSeedWords(),
         !isMascara && this.renderOldUI(),
+        this.renderResetAccount(),
         this.renderBlockieOptIn(),
       ])
     )
@@ -342,7 +367,7 @@ class Settings extends Component {
             this.renderLogo(),
             h('div.settings__info-item', [
               h('div.settings__info-version-header', 'MetaMask Version'),
-              h('div.settings__info-version-number', version),
+              h('div.settings__info-version-number', `${version}`),
             ]),
             h('div.settings__info-item', [
               h(
@@ -387,6 +412,7 @@ Settings.propTypes = {
   displayWarning: PropTypes.func,
   revealSeedConfirmation: PropTypes.func,
   setFeatureFlagToBeta: PropTypes.func,
+  showResetAccountConfirmationModal: PropTypes.func,
   warning: PropTypes.string,
   goHome: PropTypes.func,
   isMascara: PropTypes.bool,
@@ -412,6 +438,9 @@ const mapDispatchToProps = dispatch => {
       return dispatch(actions.setFeatureFlag('betaUI', false, 'OLD_UI_NOTIFICATION_MODAL'))
         .then(() => dispatch(actions.setNetworkEndpoints(OLD_UI_NETWORK_TYPE)))
     },
+    showResetAccountConfirmationModal: () => {
+      return dispatch(actions.showModal({ name: 'CONFIRM_RESET_ACCOUNT' }))
+    },
   }
 }