m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Merge branch 'ModularFiatBalance' of github.com:MetaMask/metamask-plugin into ModularFiatBalance

Browse Source
This commit is contained in:
Dan Finlay 2016-09-08 10:57:31 -07:00
commit c42b37a6e7
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/scripts/background.js
View File

@ -86,7 +86,6 @@ function setupControllerConnection (stream) {
stream.pipe(dnode).pipe(stream) stream.pipe(dnode).pipe(stream)
dnode.on('remote', (remote) => { dnode.on('remote', (remote) => {
// push updates to popup // push updates to popup
controller.ethStore.removeListener('update', controller.sendUpdate.bind(controller))
controller.ethStore.on('update', controller.sendUpdate.bind(controller)) controller.ethStore.on('update', controller.sendUpdate.bind(controller))
controller.listeners.push(remote) controller.listeners.push(remote)
idStore.on('update', controller.sendUpdate.bind(controller)) idStore.on('update', controller.sendUpdate.bind(controller))

2
ui/app/info.js
View File

@ -67,7 +67,7 @@ InfoScreen.prototype.render = function () {
`For more information on MetaMask `For more information on MetaMask
you can visit our web site. If you want to you can visit our web site. If you want to
contact us with questions or just contact us with questions or just
say 'Hi', you can find us on theise platforms:`), say 'Hi', you can find us on these platforms:`),
h('div', { h('div', {
style: { style: {