From f7714412e5da4a514d978b3f49404f015a106711 Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevgagser@gmail.com>
Date: Tue, 4 Oct 2016 21:46:33 -0700
Subject: Add relevant legal links to help page.

---
 ui/app/info.js | 49 +++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 41 insertions(+), 8 deletions(-)

(limited to 'ui/app/info.js')

diff --git a/ui/app/info.js b/ui/app/info.js
index 5c06409bd..f014e53fe 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'),
               ]),
             ]),
         ]),
-- 
cgit 


From a59422c01dbea4ec3db08ba5efc2d0baf490c6e0 Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevgagser@gmail.com>
Date: Tue, 4 Oct 2016 21:50:56 -0700
Subject: Linting.

---
 ui/app/info.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'ui/app/info.js')

diff --git a/ui/app/info.js b/ui/app/info.js
index f014e53fe..9eb2c2e98 100644
--- a/ui/app/info.js
+++ b/ui/app/info.js
@@ -112,9 +112,9 @@ 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+ */
-                    }
+                      filter: 'grayscale(100%)', /* IE6-9 */
+                      WebkitFilter: 'grayscale(100%)', /* Microsoft Edge and Firefox 35+ */
+                    },
                   }),
                   h('div.info', 'Visit our web site'),
                 ]),
-- 
cgit