Merge branch 'master' into ModularFiatBalance

feature/default_network_editable
Dan Finlay 8 years ago committed by GitHub
commit d1e91766da
  1. 1
      app/scripts/background.js
  2. 2
      ui/app/info.js

@ -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))

@ -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: {

Loading…
Cancel
Save