Merge pull request #3050 from MetaMask/uat

[EPIC] Merge UAT into master

1 files changed, 16 insertions, 1 deletions

diff --git a/mock-dev.js b/mock-dev.js
index 0a3eb12ce..8b04352cf 100644
--- a/mock-dev.js
+++ b/mock-dev.js
@@ -20,9 +20,11 @@ const Root = require('./ui/app/root')
 const configureStore = require('./ui/app/store')
 const actions = require('./ui/app/actions')
 const states = require('./development/states')
+const backGroundConnectionModifiers = require('./development/backGroundConnectionModifiers')
 const Selector = require('./development/selector')
 const MetamaskController = require('./app/scripts/metamask-controller')
 const firstTimeState = require('./app/scripts/first-time-state')
+const ExtensionPlatform = require('./app/scripts/platforms/extension')
 const extension = require('./development/mockExtension')
 const noop = function () {}
 
@@ -67,6 +69,7 @@ const controller = new MetamaskController({
   initState: firstTimeState,
 })
 global.metamaskController = controller
+global.platform = new ExtensionPlatform
 
 //
 // User Interface
@@ -83,6 +86,11 @@ actions.update = function(stateName) {
   }
 }
 
+function modifyBackgroundConnection(backgroundConnectionModifier) {
+  const modifiedBackgroundConnection = Object.assign({}, controller.getApi(), backgroundConnectionModifier)
+  actions._setBackgroundConnection(modifiedBackgroundConnection)
+}
+
 var css = MetaMaskUiCss()
 injectCss(css)
 
@@ -111,7 +119,14 @@ function startApp(){
         },
       }, 'Reset State'),
 
-      h(Selector, { actions, selectedKey: selectedView, states, store }),
+      h(Selector, {
+        actions,
+        selectedKey: selectedView,
+        states,
+        store,
+        modifyBackgroundConnection,
+        backGroundConnectionModifiers,
+      }),
 
       h('#app-content', {
         style: {