aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2017-02-28 02:39:48 +0800
committerDan Finlay <dan@danfinlay.com>2017-02-28 02:40:37 +0800
commitb5d03cd52418cfd09ce51a23c01e78262d3ffc9b (patch)
treee19ca7c5a1880f8849376794a42c6b85fbf80fdb /app
parent5edb3db96939de2dee31fa19cb8e715dc649bfd6 (diff)
downloadtangerine-wallet-browser-b5d03cd52418cfd09ce51a23c01e78262d3ffc9b.tar.gz
tangerine-wallet-browser-b5d03cd52418cfd09ce51a23c01e78262d3ffc9b.tar.zst
tangerine-wallet-browser-b5d03cd52418cfd09ce51a23c01e78262d3ffc9b.zip
add controllers to root scripts folder
Diffstat (limited to 'app')
-rw-r--r--app/scripts/controllers/currency.js (renamed from app/scripts/lib/controllers/currency.js)0
-rw-r--r--app/scripts/controllers/preferences.js (renamed from app/scripts/lib/controllers/preferences.js)0
-rw-r--r--app/scripts/controllers/shapeshift.js (renamed from app/scripts/lib/controllers/shapeshift.js)0
-rw-r--r--app/scripts/metamask-controller.js6
4 files changed, 3 insertions, 3 deletions
diff --git a/app/scripts/lib/controllers/currency.js b/app/scripts/controllers/currency.js
index c4904f8ac..c4904f8ac 100644
--- a/app/scripts/lib/controllers/currency.js
+++ b/app/scripts/controllers/currency.js
diff --git a/app/scripts/lib/controllers/preferences.js b/app/scripts/controllers/preferences.js
index 9343fe67b..9343fe67b 100644
--- a/app/scripts/lib/controllers/preferences.js
+++ b/app/scripts/controllers/preferences.js
diff --git a/app/scripts/lib/controllers/shapeshift.js b/app/scripts/controllers/shapeshift.js
index 3d955c01f..3d955c01f 100644
--- a/app/scripts/lib/controllers/shapeshift.js
+++ b/app/scripts/controllers/shapeshift.js
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index d8136667f..bdffc87ac 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -11,10 +11,10 @@ const streamIntoProvider = require('web3-stream-provider/handler')
const MetaMaskProvider = require('web3-provider-engine/zero.js')
const setupMultiplex = require('./lib/stream-utils.js').setupMultiplex
const KeyringController = require('./keyring-controller')
-const PreferencesController = require('./lib/controllers/preferences')
-const CurrencyController = require('./lib/controllers/currency')
+const PreferencesController = require('./controllers/preferences')
+const CurrencyController = require('./controllers/currency')
const NoticeController = require('./notice-controller')
-const ShapeShiftController = require('./lib/controllers/shapeshift')
+const ShapeShiftController = require('./controllers/shapeshift')
const MessageManager = require('./lib/message-manager')
const PersonalMessageManager = require('./lib/personal-message-manager')
const TxManager = require('./transaction-manager')