Fix merge conflicts from uat-next

1 files changed, 2 insertions, 0 deletions

diff --git a/mock-dev.js b/mock-dev.js
index 0a3eb12ce..8827ddfdd 100644
--- a/mock-dev.js
+++ b/mock-dev.js
@@ -23,6 +23,7 @@ const states = require('./development/states')
 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 +68,7 @@ const controller = new MetamaskController({
   initState: firstTimeState,
 })
 global.metamaskController = controller
+global.platform = new ExtensionPlatform
 
 //
 // User Interface