diff options
| author | Dan Finlay <somniac@me.com> | 2016-09-09 01:50:05 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-09 01:50:05 +0800 |
| commit | d1e91766da90a1d2161fd48fd4f2545f14a7a918 (patch) | |
| tree | ea275db6ce1597979d8f0f186f9e1342c20db437 | |
| parent | 2ca58f5bf7767b18583e49b5acb3ff35c95b617f (diff) | |
| parent | 382e532d6dde80b8d5bd2a288fd7bc3753b9de3c (diff) | |
| download | tangerine-wallet-browser-d1e91766da90a1d2161fd48fd4f2545f14a7a918.tar.gz tangerine-wallet-browser-d1e91766da90a1d2161fd48fd4f2545f14a7a918.tar.zst tangerine-wallet-browser-d1e91766da90a1d2161fd48fd4f2545f14a7a918.zip | |
Merge branch 'master' 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 18aaed7bf..21a5eea65 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 4e540bd03..5c06409bd 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: { |