diff --git a/apps/remix-ide/src/app/tabs/runTab/contractDropdown.js b/apps/remix-ide/src/app/tabs/runTab/contractDropdown.js
index 2a8336125d..6918c305a3 100644
--- a/apps/remix-ide/src/app/tabs/runTab/contractDropdown.js
+++ b/apps/remix-ide/src/app/tabs/runTab/contractDropdown.js
@@ -48,24 +48,22 @@ class ContractDropdownUI {
}
listenToContextChange () {
- this.blockchain.event.register('contextChanged', () => {
- this.blockchain.updateNetwork((err, { name } = {}) => {
- if (err) {
- console.log('can\'t detect network')
- return
- }
- this.exEnvironment = this.blockchain.getProvider()
- this.networkName = name
+ this.blockchain.event.register('networkStatus', ({ error, network }) => {
+ if (error) {
+ console.log('can\'t detect network')
+ return
+ }
+ this.exEnvironment = this.blockchain.getProvider()
+ this.networkName = network.name
- const savedConfig = window.localStorage.getItem(`ipfs/${this.exEnvironment}/${this.networkName}`)
+ const savedConfig = window.localStorage.getItem(`ipfs/${this.exEnvironment}/${this.networkName}`)
- // check if an already selected option exist else use default workflow
- if (savedConfig !== null) {
- this.setCheckedState(savedConfig)
- } else {
- this.setCheckedState(this.networkName === 'Main')
- }
- })
+ // check if an already selected option exist else use default workflow
+ if (savedConfig !== null) {
+ this.setCheckedState(savedConfig)
+ } else {
+ this.setCheckedState(this.networkName === 'Main')
+ }
})
}
@@ -306,10 +304,10 @@ class ContractDropdownUI {
const data = self.runView.compilersArtefacts.getCompilerAbstract(contractObject.contract.file)
self.runView.compilersArtefacts.addResolvedContract(helper.addressToString(address), data)
if (self.ipfsCheckedState) {
- _paq.push(['trackEvent', 'udapp', `DeployAndPublish_${this.networkName}`])
+ _paq.push(['trackEvent', 'udapp', 'DeployAndPublish', this.networkName])
publishToStorage('ipfs', self.runView.fileProvider, self.runView.fileManager, selectedContract)
} else {
- _paq.push(['trackEvent', 'udapp', `DeployOnly_${this.networkName}`])
+ _paq.push(['trackEvent', 'udapp', 'DeployOnly', this.networkName])
}
}
diff --git a/apps/remix-ide/src/app/tabs/runTab/model/dropdownlogic.js b/apps/remix-ide/src/app/tabs/runTab/model/dropdownlogic.js
index 15764a6dbe..2ee225fef3 100644
--- a/apps/remix-ide/src/app/tabs/runTab/model/dropdownlogic.js
+++ b/apps/remix-ide/src/app/tabs/runTab/model/dropdownlogic.js
@@ -55,7 +55,7 @@ class DropdownLogic {
cb(null, 'abi', abi)
})
} else {
- _paq.push(['trackEvent', 'udapp', 'AtAddressLoadWithInstance'])
+ _paq.push(['trackEvent', 'udapp', 'AtAddressLoadWithArtifacts'])
cb(null, 'instance')
}
}
diff --git a/apps/remix-ide/src/app/tabs/runTab/settings.js b/apps/remix-ide/src/app/tabs/runTab/settings.js
index 4cc9ff4f00..551248000a 100644
--- a/apps/remix-ide/src/app/tabs/runTab/settings.js
+++ b/apps/remix-ide/src/app/tabs/runTab/settings.js
@@ -97,7 +97,7 @@ class SettingsUI {
Environment
-