diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2018-06-02 08:06:30 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-02 08:06:30 +0800 |
| commit | 72dde75e58b2aaec22e41b2fe742bee7e9c35777 (patch) | |
| tree | d742d6bfb6272f01bdfcc548045b64621e1702dc /app | |
| parent | 1da103a6ed14b86e499ee8308e0e792a14abed22 (diff) | |
| parent | 4be8e780cd64014d07c036c29faa77f947437c4a (diff) | |
| download | tangerine-wallet-browser-72dde75e58b2aaec22e41b2fe742bee7e9c35777.tar.gz tangerine-wallet-browser-72dde75e58b2aaec22e41b2fe742bee7e9c35777.tar.zst tangerine-wallet-browser-72dde75e58b2aaec22e41b2fe742bee7e9c35777.zip | |
Merge pull request #4425 from MetaMask/master
Merge Master into Develop
Diffstat (limited to 'app')
| -rw-r--r-- | app/manifest.json | 6 | ||||
| -rw-r--r-- | app/scripts/controllers/user-actions.js | 17 |
2 files changed, 21 insertions, 2 deletions
diff --git a/app/manifest.json b/app/manifest.json index 141026d10..dbce13f7c 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "__MSG_appName__", "short_name": "__MSG_appName__", - "version": "4.6.1", + "version": "4.7.1", "manifest_version": 2, "author": "https://metamask.io", "description": "__MSG_appDescription__", @@ -68,6 +68,8 @@ "matches": [ "https://metamask.io/*" ], - "ids": ["*"] + "ids": [ + "*" + ] } }
\ No newline at end of file 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 |