Merge branch 'master' into i18n

1 files changed, 45 insertions, 1 deletions

diff --git a/old-ui/app/config.js b/old-ui/app/config.js
index 75198fba5..9e07cf348 100644
--- a/old-ui/app/config.js
+++ b/old-ui/app/config.js
@@ -30,7 +30,12 @@ ConfigScreen.prototype.render = function () {
   var warning = state.warning
 
   return (
-    h('.flex-column.flex-grow', [
+    h('.flex-column.flex-grow', {
+      style:{
+        maxHeight: '585px',
+        overflowY: 'auto',
+      },
+    }, [
 
       h(Modal, {}, []),
 
@@ -57,6 +62,7 @@ ConfigScreen.prototype.render = function () {
         h('.flex-space-around', {
           style: {
             padding: '20px',
+            overflow: 'auto',
           },
         }, [
 
@@ -144,6 +150,40 @@ ConfigScreen.prototype.render = function () {
             }, 'Reveal Seed Words'),
           ]),
 
+          h('hr.horizontal-line'),
+
+          h('div', {
+            style: {
+              marginTop: '20px',
+            },
+          }, [
+
+            h('p', {
+              style: {
+                fontFamily: 'Montserrat Light',
+                fontSize: '13px',
+              },
+            }, [
+              'Resetting is for developer use only. ',
+              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'),
+
+            h('button', {
+              style: {
+                alignSelf: 'center',
+              },
+              onClick (event) {
+                event.preventDefault()
+                state.dispatch(actions.resetAccount())
+              },
+            }, 'Reset Account'),
+          ]),
+
         ]),
       ]),
     ])
@@ -220,3 +260,7 @@ function currentProviderDisplay (metamaskState) {
     h('span', value),
   ])
 }
+
+ConfigScreen.prototype.navigateTo = function (url) {
+  global.platform.openWindow({ url })
+}