diff options
author | Dan Finlay <dan@danfinlay.com> | 2016-04-14 06:28:44 +0800 |
---|---|---|
committer | Dan Finlay <dan@danfinlay.com> | 2016-04-14 06:28:44 +0800 |
commit | d814a45dffa6a872f6e336cad33ca41ffb102887 (patch) | |
tree | d8cdd0c4b8c6559efaf6846b24f0d6440f3c94f5 /app | |
parent | 9f1438b85b3dac8f1dd98f7bd6e101035cfce0a5 (diff) | |
download | tangerine-wallet-browser-d814a45dffa6a872f6e336cad33ca41ffb102887.tar tangerine-wallet-browser-d814a45dffa6a872f6e336cad33ca41ffb102887.tar.gz tangerine-wallet-browser-d814a45dffa6a872f6e336cad33ca41ffb102887.tar.bz2 tangerine-wallet-browser-d814a45dffa6a872f6e336cad33ca41ffb102887.tar.lz tangerine-wallet-browser-d814a45dffa6a872f6e336cad33ca41ffb102887.tar.xz tangerine-wallet-browser-d814a45dffa6a872f6e336cad33ca41ffb102887.tar.zst tangerine-wallet-browser-d814a45dffa6a872f6e336cad33ca41ffb102887.zip |
Moved UI into repo with its own dependency stack
Diffstat (limited to 'app')
-rw-r--r-- | app/scripts/lib/tx-notification.js | 4 | ||||
-rw-r--r-- | app/scripts/popup.js | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/app/scripts/lib/tx-notification.js b/app/scripts/lib/tx-notification.js index c7f62408b..75985dee1 100644 --- a/app/scripts/lib/tx-notification.js +++ b/app/scripts/lib/tx-notification.js @@ -1,5 +1,5 @@ const createId = require('hat') -const uiUtils = require('metamask-ui/app/util') +const uiUtils = require('../../../ui/app/util') var notificationHandlers = {} module.exports = createTxNotification @@ -46,4 +46,4 @@ function createTxNotification(opts){ confirm: opts.confirm, cancel: opts.cancel, } -}
\ No newline at end of file +} diff --git a/app/scripts/popup.js b/app/scripts/popup.js index e6dae0d81..523ecbd8f 100644 --- a/app/scripts/popup.js +++ b/app/scripts/popup.js @@ -4,8 +4,8 @@ const async = require('async') const Multiplex = require('multiplex') const Dnode = require('dnode') const Web3 = require('web3') -const MetaMaskUi = require('metamask-ui') -const MetaMaskUiCss = require('metamask-ui/css') +const MetaMaskUi = require('../../ui') +const MetaMaskUiCss = require('../../ui/css') const injectCss = require('inject-css') const PortStream = require('./lib/port-stream.js') const StreamProvider = require('./lib/stream-provider.js') @@ -66,7 +66,7 @@ function linkDnode(stream, cb){ // setup push events accountManager.on = eventEmitter.on.bind(eventEmitter) cb(null, accountManager) - }) + }) } function getCurrentDomain(cb){ @@ -96,4 +96,4 @@ function setupApp(err, opts){ currentDomain: opts.currentDomain, }) -}
\ No newline at end of file +} |