Merge branch 'master' into qrCode

5 files changed, 12 insertions, 32 deletions

diff --git a/ui/app/accounts/index.js b/ui/app/accounts/index.js
index d3c84d387..735526c60 100644
--- a/ui/app/accounts/index.js
+++ b/ui/app/accounts/index.js
@@ -20,7 +20,6 @@ function mapStateToProps (state) {
     identities: state.metamask.identities,
     unconfTxs: state.metamask.unconfTxs,
     selectedAddress: state.metamask.selectedAddress,
-    currentDomain: state.appState.currentDomain,
     scrollToBottom: state.appState.scrollToBottom,
     pending,
   }
diff --git a/ui/app/components/pending-tx-details.js b/ui/app/components/pending-tx-details.js
index c2e39a1ca..148b5c6df 100644
--- a/ui/app/components/pending-tx-details.js
+++ b/ui/app/components/pending-tx-details.js
@@ -1,7 +1,6 @@
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
-const carratInline = require('fs').readFileSync('./images/forward-carrat.svg', 'utf8')
 
 const MiniAccountPanel = require('./mini-account-panel')
 const EthBalance = require('./eth-balance')
@@ -78,7 +77,7 @@ PTXP.render = function () {
 
         ]),
 
-        forwardCarrat(imageify),
+        forwardCarrat(),
 
         this.miniAccountPanelForRecipient(),
       ]),
@@ -223,30 +222,16 @@ PTXP.warnIfNeeded = function () {
 }
 
 
-function forwardCarrat (imageify) {
-  if (imageify) {
-    return (
-
-      h('img', {
-        src: 'images/forward-carrat.svg',
-        style: {
-          padding: '5px 6px 0px 10px',
-          height: '37px',
-        },
-      })
-
-    )
-  } else {
-    return (
+function forwardCarrat () {
+  return (
 
-      h('div', {
-        dangerouslySetInnerHTML: { __html: carratInline },
-        style: {
-          padding: '0px 6px 0px 10px',
-          height: '45px',
-        },
-      })
+    h('img', {
+      src: 'images/forward-carrat.svg',
+      style: {
+        padding: '5px 6px 0px 10px',
+        height: '37px',
+      },
+    })
 
-    )
-  }
+  )
 }
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js
index 2173eff3d..8eb6ec4d4 100644
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@@ -39,7 +39,6 @@ function reduceApp (state, action) {
     accountDetail: {
       subview: 'transactions',
     },
-    currentDomain: 'example.com',
     transForward: true, // Used to render transition direction
     isLoading: false,   // Used to display loading indicator
     warning: null,      // Used to display error text
diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js
index 7f18480cb..84953d734 100644
--- a/ui/app/reducers/metamask.js
+++ b/ui/app/reducers/metamask.js
@@ -11,7 +11,6 @@ function reduceMetamask (state, action) {
     isInitialized: false,
     isUnlocked: false,
     isEthConfirmed: false,
-    currentDomain: 'example.com',
     rpcTarget: 'https://rawtestrpc.metamask.io/',
     identities: {},
     unconfTxs: {},
diff --git a/ui/index.js b/ui/index.js
index 0e69b00d6..a6905b639 100644
--- a/ui/index.js
+++ b/ui/index.js
@@ -25,9 +25,7 @@ function startApp (metamaskState, accountManager, opts) {
     metamask: metamaskState,
 
     // appState represents the current tab's popup state
-    appState: {
-      currentDomain: opts.currentDomain,
-    },
+    appState: {},
 
     // Which blockchain we are using:
     networkVersion: opts.networkVersion,