diff options
| author | Frankie <frankie.diamond@gmail.com> | 2017-04-05 15:30:07 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-05 15:30:07 +0800 |
| commit | dd6b4505f41b80a4f4cd3654412349b262c3cd76 (patch) | |
| tree | 571a16459cffbe85f757e35df9c81a601959756b /mascara/src/background.js | |
| parent | 5d967eeebb9f3cf4c2d3fcfe0b74cf6e8440c3cb (diff) | |
| parent | 1aac162b462424f5b6ce6685f337670368bd10b5 (diff) | |
| download | tangerine-wallet-browser-dd6b4505f41b80a4f4cd3654412349b262c3cd76.tar.gz tangerine-wallet-browser-dd6b4505f41b80a4f4cd3654412349b262c3cd76.tar.zst tangerine-wallet-browser-dd6b4505f41b80a4f4cd3654412349b262c3cd76.zip | |
Merge pull request #1309 from MetaMask/mascara2
Mascara - various fixes
Diffstat (limited to 'mascara/src/background.js')
| -rw-r--r-- | mascara/src/background.js | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mascara/src/background.js b/mascara/src/background.js index 6f9fb3d13..957570050 100644 --- a/mascara/src/background.js +++ b/mascara/src/background.js @@ -8,6 +8,7 @@ const PortStream = require('../../app/scripts/lib/port-stream.js') const DbController = require('./lib/index-db-controller') +const SwPlatform = require('../../app/scripts/platforms/sw') const MetamaskController = require('../../app/scripts/metamask-controller') const extension = {} //require('../../app/scripts/lib/extension') @@ -17,7 +18,8 @@ const migrations = require('../../app/scripts/migrations/') const firstTimeState = require('../../app/scripts/first-time-state') const STORAGE_KEY = 'metamask-config' -const METAMASK_DEBUG = 'GULP_METAMASK_DEBUG' +// const METAMASK_DEBUG = 'GULP_METAMASK_DEBUG' +const METAMASK_DEBUG = true let popupIsOpen = false const log = require('loglevel') @@ -70,7 +72,11 @@ function setupController (initState, client) { // MetaMask Controller // + const platform = new SwPlatform() + const controller = new MetamaskController({ + // platform specific implementation + platform, // User confirmation callbacks: showUnconfirmedMessage: noop, unlockAccountMessage: noop, |