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

feature/default_network_editable
Dan Finlay 8 years ago
commit c42b37a6e7
  1. 1
      app/scripts/background.js
  2. 2
      ui/app/info.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))

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

Loading…
Cancel
Save