diff options
| author | Dan Finlay <dan@danfinlay.com> | 2016-09-09 01:57:31 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2016-09-09 01:57:31 +0800 |
| commit | c42b37a6e7871525a6dec8c9357b572b048cb221 (patch) | |
| tree | 0b3c5e08aa485dce595d73ac33ad912c82960ab0 | |
| parent | c3dbcb5b02a54bd3772fb768c1b28f2c94a74e58 (diff) | |
| parent | d1e91766da90a1d2161fd48fd4f2545f14a7a918 (diff) | |
| download | dexon-wallet-c42b37a6e7871525a6dec8c9357b572b048cb221.tar.gz dexon-wallet-c42b37a6e7871525a6dec8c9357b572b048cb221.tar.zst dexon-wallet-c42b37a6e7871525a6dec8c9357b572b048cb221.zip | |
Merge branch 'ModularFiatBalance' of github.com:MetaMask/metamask-plugin into ModularFiatBalance
| -rw-r--r-- | app/scripts/background.js | 1 | ||||
| -rw-r--r-- | ui/app/info.js | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/app/scripts/background.js b/app/scripts/background.js index 18aaed7b..21a5eea6 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -86,7 +86,6 @@ function setupControllerConnection (stream) { stream.pipe(dnode).pipe(stream) dnode.on('remote', (remote) => { // push updates to popup - controller.ethStore.removeListener('update', controller.sendUpdate.bind(controller)) controller.ethStore.on('update', controller.sendUpdate.bind(controller)) controller.listeners.push(remote) idStore.on('update', controller.sendUpdate.bind(controller)) diff --git a/ui/app/info.js b/ui/app/info.js index 4e540bd0..5c06409b 100644 --- a/ui/app/info.js +++ b/ui/app/info.js @@ -67,7 +67,7 @@ InfoScreen.prototype.render = function () { `For more information on MetaMask you can visit our web site. If you want to 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', { style: { |