Merge branch 'master' into i#495CustomGasField

6 files changed, 73 insertions, 16 deletions

diff --git a/ui/app/accounts/index.js b/ui/app/accounts/index.js
index 735526c60..7551c498e 100644
--- a/ui/app/accounts/index.js
+++ b/ui/app/accounts/index.js
@@ -54,7 +54,7 @@ AccountsScreen.prototype.render = function () {
       h('hr.horizontal-line'),
 
       // identity selection
-      h('section.identity-section.flex-column', {
+      h('section.identity-section', {
         style: {
           height: '418px',
           overflowY: 'auto',
diff --git a/ui/app/app.js b/ui/app/app.js
index d26af4e77..71e0637d0 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -301,7 +301,7 @@ App.prototype.renderDropdown = function () {
     }),
 
     h(DropMenuItem, {
-      label: 'Help',
+      label: 'Info',
       closeMenu: () => this.setState({ isMainMenuOpen: !isOpen }),
       action: () => this.props.dispatch(actions.showInfoPage()),
       icon: h('i.fa.fa-question.fa-lg'),
@@ -330,6 +330,7 @@ App.prototype.renderBackButton = function (style, justArrow = false) {
 App.prototype.renderBackToInitButton = function () {
   var props = this.props
   var button = null
+  if (!props.isConfirmed) return button
   if (!props.isUnlocked) {
     if (props.currentView.name === 'InitMenu') {
       button = props.forgottenPassword ? h('.flex-row', {
diff --git a/ui/app/config.js b/ui/app/config.js
index b043a47d6..e09a38cd8 100644
--- a/ui/app/config.js
+++ b/ui/app/config.js
@@ -31,7 +31,7 @@ ConfigScreen.prototype.render = function () {
             state.dispatch(actions.goHome())
           },
         }),
-        h('h2.page-subtitle', 'Configuration'),
+        h('h2.page-subtitle', 'Settings'),
       ]),
 
       // conf view
diff --git a/ui/app/first-time/disclaimer.js b/ui/app/first-time/disclaimer.js
index c6174a220..819d4a110 100644
--- a/ui/app/first-time/disclaimer.js
+++ b/ui/app/first-time/disclaimer.js
@@ -19,6 +19,9 @@ function DisclaimerScreen () {
 }
 
 DisclaimerScreen.prototype.render = function () {
+  const state = this.state || {disclaimerDisabled: true}
+  const disabled = state.disclaimerDisabled
+
   return (
     h('.flex-column.flex-center.flex-grow', [
 
@@ -40,18 +43,38 @@ DisclaimerScreen.prototype.render = function () {
 
         .markdown {
           font-family: Times New Roman;
+          overflow-x: hidden;
         }
         .markdown h1, .markdown h2, .markdown h3 {
           margin: 10px 0;
-          font-family: arial sans-serif;
           font-weight: bold;
         }
 
+        .markdown strong {
+          font-weight: bold;
+        }
+        .markdown em {
+          font-style: italic;
+        }
+
+        .markdown p {
+          margin: 10px 0;
+        }
+
+        .markdown a {
+          color: blue;
+        }
+
       `),
 
       h('div.markdown', {
+        onScroll: (e) => {
+          var object = e.currentTarget
+          if (object.offsetHeight + object.scrollTop + 100 >= object.scrollHeight) {
+            this.setState({disclaimerDisabled: false})
+          }
+        },
         style: {
-          // whiteSpace: 'pre-line',
           background: 'rgb(235, 235, 235)',
           height: '310px',
           padding: '6px',
@@ -69,9 +92,9 @@ DisclaimerScreen.prototype.render = function () {
 
       h('button', {
         style: { marginTop: '18px' },
+        disabled,
         onClick: () => this.props.dispatch(actions.agreeToDisclaimer()),
-      }, 'I Agree'),
+      }, disabled ? 'Scroll Down to Enable' : 'I Agree'),
     ])
   )
 }
-
diff --git a/ui/app/info.js b/ui/app/info.js
index 5c06409bd..9eb2c2e98 100644
--- a/ui/app/info.js
+++ b/ui/app/info.js
@@ -56,6 +56,41 @@ InfoScreen.prototype.render = function () {
             }, `Version: ${manifest.version}`),
           ]),
 
+          h('div', {
+            style: {
+              marginBottom: '10px',
+            }},
+            [
+              h('div', [
+                h('a', {
+                  href: 'https://metamask.io/privacy.html',
+                  target: '_blank',
+                  onClick (event) { this.navigateTo(event.target.href) },
+                }, [
+                  h('div.info', 'Privacy Policy'),
+                ]),
+              ]),
+              h('div', [
+                h('a', {
+                  href: 'https://metamask.io/terms.html',
+                  target: '_blank',
+                  onClick (event) { this.navigateTo(event.target.href) },
+                }, [
+                  h('div.info', 'Terms of Use'),
+                ]),
+              ]),
+              h('div', [
+                h('a', {
+                  href: 'https://metamask.io/attributions.html',
+                  target: '_blank',
+                  onClick (event) { this.navigateTo(event.target.href) },
+                }, [
+                  h('div.info', 'Attributions'),
+                ]),
+              ]),
+            ]
+          ),
+
           h('hr', {
             style: {
               margin: '20px 0 ',
@@ -63,12 +98,6 @@ InfoScreen.prototype.render = function () {
             },
           }),
 
-          h('.info',
-            `For more information on MetaMask
-             you can visit our web site. If you want to
-             contact us with questions or just
-             say 'Hi', you can find us on these platforms:`),
-
           h('div', {
             style: {
               paddingLeft: '30px',
@@ -82,6 +111,10 @@ InfoScreen.prototype.render = function () {
                 }, [
                   h('img.icon-size', {
                     src: manifest.icons[128],
+                    style: {
+                      filter: 'grayscale(100%)', /* IE6-9 */
+                      WebkitFilter: 'grayscale(100%)', /* Microsoft Edge and Firefox 35+ */
+                    },
                   }),
                   h('div.info', 'Visit our web site'),
                 ]),
@@ -107,7 +140,7 @@ InfoScreen.prototype.render = function () {
                   target: '_blank',
                   style: { width: '85vw' },
                   onClick () { extension.tabs.create({url: 'mailto:help@metamask.io?subject=Feedback'}) },
-                }, 'Email us any questions or comments!'),
+                }, 'Email us!'),
               ]),
 
               h('div.fa.fa-github', [
@@ -115,7 +148,7 @@ InfoScreen.prototype.render = function () {
                   href: 'https://github.com/metamask/talk/issues',
                   target: '_blank',
                   onClick (event) { this.navigateTo(event.target.href) },
-                }, 'Start a thread on Github'),
+                }, 'Start a thread on GitHub'),
               ]),
             ]),
         ]),
diff --git a/ui/app/store.js b/ui/app/store.js
index 8d891bdc9..ba9e58b49 100644
--- a/ui/app/store.js
+++ b/ui/app/store.js
@@ -4,7 +4,7 @@ const thunkMiddleware = require('redux-thunk')
 const rootReducer = require('./reducers')
 const createLogger = require('redux-logger')
 
-global.METAMASK_DEBUG = false
+global.METAMASK_DEBUG = 'GULP_METAMASK_DEBUG'
 
 module.exports = configureStore