Merge branch 'master' into i#1203MainNetSwitch

1 files changed, 19 insertions, 24 deletions

diff --git a/ui/app/info.js b/ui/app/info.js
index e79580be4..aa4503b62 100644
--- a/ui/app/info.js
+++ b/ui/app/info.js
@@ -3,7 +3,6 @@ const Component = require('react').Component
 const h = require('react-hyperscript')
 const connect = require('react-redux').connect
 const actions = require('./actions')
-const extension = require('../../app/scripts/lib/extension')
 
 module.exports = connect(mapStateToProps)(InfoScreen)
 
@@ -17,13 +16,8 @@ function InfoScreen () {
 }
 
 InfoScreen.prototype.render = function () {
-  var state = this.props
-  var manifest
-  try {
-    manifest = extension.runtime.getManifest()
-  } catch (e) {
-    manifest = { version: '2.0.0' }
-  }
+  const state = this.props
+  const version = global.platform.getVersion()
 
   return (
     h('.flex-column.flex-grow', [
@@ -53,12 +47,12 @@ InfoScreen.prototype.render = function () {
               style: {
                 marginBottom: '10px',
               },
-            }, `Version: ${manifest.version}`),
+            }, `Version: ${version}`),
           ]),
 
           h('div', {
             style: {
-              marginBottom: '10px',
+              marginBottom: '5px',
             }},
             [
               h('div', [
@@ -93,7 +87,7 @@ InfoScreen.prototype.render = function () {
 
           h('hr', {
             style: {
-              margin: '20px 0 ',
+              margin: '10px 0 ',
               width: '7em',
             },
           }),
@@ -103,6 +97,13 @@ InfoScreen.prototype.render = function () {
               paddingLeft: '30px',
             }},
             [
+              h('div.fa.fa-github', [
+                h('a.info', {
+                  href: 'https://github.com/MetaMask/faq',
+                  target: '_blank',
+                  onClick (event) { this.navigateTo(event.target.href) },
+                }, 'Need Help? Read our FAQ!'),
+              ]),
               h('div', [
                 h('a', {
                   href: 'https://metamask.io/',
@@ -110,10 +111,12 @@ InfoScreen.prototype.render = function () {
                   onClick (event) { this.navigateTo(event.target.href) },
                 }, [
                   h('img.icon-size', {
-                    src: manifest.icons['128'],
+                    src: 'images/icon-128.png',
                     style: {
-                      filter: 'grayscale(100%)', /* IE6-9 */
-                      WebkitFilter: 'grayscale(100%)', /* Microsoft Edge and Firefox 35+ */
+                      // IE6-9
+                      filter: 'grayscale(100%)',
+                      // Microsoft Edge and Firefox 35+
+                      WebkitFilter: 'grayscale(100%)',
                     },
                   }),
                   h('div.info', 'Visit our web site'),
@@ -139,17 +142,9 @@ InfoScreen.prototype.render = function () {
                 h('a.info', {
                   target: '_blank',
                   style: { width: '85vw' },
-                  onClick () { extension.tabs.create({url: 'mailto:help@metamask.io?subject=Feedback'}) },
+                  onClick () { this.navigateTo('mailto:help@metamask.io?subject=Feedback') },
                 }, 'Email us!'),
               ]),
-
-              h('div.fa.fa-github', [
-                h('a.info', {
-                  href: 'https://github.com/MetaMask/metamask-plugin/issues',
-                  target: '_blank',
-                  onClick (event) { this.navigateTo(event.target.href) },
-                }, 'Start a thread on GitHub'),
-              ]),
             ]),
         ]),
       ]),
@@ -158,5 +153,5 @@ InfoScreen.prototype.render = function () {
 }
 
 InfoScreen.prototype.navigateTo = function (url) {
-  extension.tabs.create({ url })
+  global.platform.openWindow({ url })
 }