diff options
author | Dan <danjm.com@gmail.com> | 2018-06-03 17:16:45 +0800 |
---|---|---|
committer | Dan <danjm.com@gmail.com> | 2018-06-03 17:16:45 +0800 |
commit | 8f0a3b83111a9ccf5d515cebbd33cabe9ab16ba7 (patch) | |
tree | 5ab993280fa87add44aad288f155a0ce3b7a0da7 /app/scripts | |
parent | 0f3480a97f2924de899e49a095ef24b9fa5506f1 (diff) | |
parent | 72dde75e58b2aaec22e41b2fe742bee7e9c35777 (diff) | |
download | tangerine-wallet-browser-8f0a3b83111a9ccf5d515cebbd33cabe9ab16ba7.tar.gz tangerine-wallet-browser-8f0a3b83111a9ccf5d515cebbd33cabe9ab16ba7.tar.zst tangerine-wallet-browser-8f0a3b83111a9ccf5d515cebbd33cabe9ab16ba7.zip |
Merge branch 'develop' into handle-import-account-failure-in-ui
Diffstat (limited to 'app/scripts')
-rw-r--r-- | app/scripts/controllers/user-actions.js | 17 | ||||
-rw-r--r-- | app/scripts/lib/createErrorMiddleware.js | 1 | ||||
-rw-r--r-- | app/scripts/migrations/026.js | 2 |
3 files changed, 19 insertions, 1 deletions
diff --git a/app/scripts/controllers/user-actions.js b/app/scripts/controllers/user-actions.js new file mode 100644 index 000000000..f777054b8 --- /dev/null +++ b/app/scripts/controllers/user-actions.js @@ -0,0 +1,17 @@ +const MessageManager = require('./lib/message-manager') +const PersonalMessageManager = require('./lib/personal-message-manager') +const TypedMessageManager = require('./lib/typed-message-manager') + +class UserActionController { + + constructor (opts = {}) { + + this.messageManager = new MessageManager() + this.personalMessageManager = new PersonalMessageManager() + this.typedMessageManager = new TypedMessageManager() + + } + +} + +module.exports = UserActionController diff --git a/app/scripts/lib/createErrorMiddleware.js b/app/scripts/lib/createErrorMiddleware.js index baed99e45..c70beddfd 100644 --- a/app/scripts/lib/createErrorMiddleware.js +++ b/app/scripts/lib/createErrorMiddleware.js @@ -59,6 +59,7 @@ function createErrorMiddleware ({ override = true } = {}) { if (!error) { return done() } sanitizeRPCError(error) log.error(`MetaMask - RPC Error: ${error.message}`, error) + done() }) } } diff --git a/app/scripts/migrations/026.js b/app/scripts/migrations/026.js index 1b8a91a45..4e907e09c 100644 --- a/app/scripts/migrations/026.js +++ b/app/scripts/migrations/026.js @@ -27,7 +27,7 @@ module.exports = { function transformState (state) { if (!state.KeyringController || !state.PreferencesController) { - return + return state } if (!state.KeyringController.walletNicknames) { |