1102: Push publicConfigStore to next turn to avoid race conditiono (#5777)

feature/default_network_editable
Paul Bouchon 6 years ago committed by GitHub
parent fdea642e6d
commit 7fe37276a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      app/scripts/inpage.js

@ -59,7 +59,9 @@ onMessage('metamasksetlocked', () => { isEnabled = false })
// set up a listener for privacy mode responses // set up a listener for privacy mode responses
onMessage('ethereumproviderlegacy', ({ data: { selectedAddress } }) => { onMessage('ethereumproviderlegacy', ({ data: { selectedAddress } }) => {
isEnabled = true isEnabled = true
inpageProvider.publicConfigStore.updateState({ selectedAddress }) setTimeout(() => {
inpageProvider.publicConfigStore.updateState({ selectedAddress })
}, 0)
}, true) }, true)
// augment the provider with its enable method // augment the provider with its enable method
@ -70,7 +72,9 @@ inpageProvider.enable = function ({ force } = {}) {
reject(error) reject(error)
} else { } else {
window.removeEventListener('message', providerHandle) window.removeEventListener('message', providerHandle)
inpageProvider.publicConfigStore.updateState({ selectedAddress }) setTimeout(() => {
inpageProvider.publicConfigStore.updateState({ selectedAddress })
}, 0)
// wait for the background to update with an account // wait for the background to update with an account
inpageProvider.sendAsync({ method: 'eth_accounts', params: [] }, (error, response) => { inpageProvider.sendAsync({ method: 'eth_accounts', params: [] }, (error, response) => {

Loading…
Cancel
Save