From 88df66e2b50415a159242ebdfce305a2f8e82f1f Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Tue, 18 May 2021 11:49:33 +0200
Subject: [PATCH] fix matomo send transaction

---
 .../src/app/tabs/runTab/contractDropdown.js   | 34 +++++++++----------
 .../app/tabs/runTab/model/dropdownlogic.js    |  2 +-
 .../remix-ide/src/app/tabs/runTab/settings.js | 26 ++++++--------
 .../remix-ide/src/app/ui/universal-dapp-ui.js |  8 +++--
 apps/remix-ide/src/blockchain/blockchain.js   | 21 +++++++-----
 5 files changed, 46 insertions(+), 45 deletions(-)

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
         </label>
         <div class="${css.environment}">
-          <select id="selectExEnvOptions" data-id="settingsSelectEnvOptions" onchange=${() => { this.updateNetwork() }} class="form-control ${css.select} custom-select">
+          <select id="selectExEnvOptions" data-id="settingsSelectEnvOptions" class="form-control ${css.select} custom-select">
             <option id="vm-mode"
               title="Execution environment does not connect to any node, everything is local and in memory only."
               value="vm" name="executionContext"> JavaScript VM
@@ -192,8 +192,17 @@ class SettingsUI {
       this.setFinalContext()
     })
 
+    this.blockchain.event.register('networkStatus', ({ error, network }) => {
+      if (error) {
+        this.netUI.innerHTML = 'can\'t detect network '
+        return
+      }
+      const networkProvider = this._components.networkModule.getNetworkProvider.bind(this._components.networkModule)
+      this.netUI.innerHTML = (networkProvider() !== 'vm') ? `${network.name} (${network.id || '-'}) network` : ''    
+    })
+
     setInterval(() => {
-      this.updateNetwork()
+      this.fillAccountsList()
     }, 1000)
 
     this.el = el
@@ -273,7 +282,6 @@ class SettingsUI {
     // set the final context. Cause it is possible that this is not the one we've originaly selected
     this.selectExEnv.value = this.blockchain.getProvider()
     this.event.trigger('clearInstance', [])
-    this.updateNetwork()
     this.updatePlusButton()
   }
 
@@ -390,18 +398,6 @@ class SettingsUI {
     })
   }
 
-  updateNetwork () {
-    this.blockchain.updateNetwork((err, { id, name } = {}) => {
-      if (err) {
-        this.netUI.innerHTML = 'can\'t detect network '
-        return
-      }
-      const network = this._components.networkModule.getNetworkProvider.bind(this._components.networkModule)
-      this.netUI.innerHTML = (network() !== 'vm') ? `${name} (${id || '-'}) network` : ''
-    })
-    this.fillAccountsList()
-  }
-
   // TODO: unclear what's the goal of accountListCallId, feels like it can be simplified
   async fillAccountsList () {
     this.accountListCallId++
diff --git a/apps/remix-ide/src/app/ui/universal-dapp-ui.js b/apps/remix-ide/src/app/ui/universal-dapp-ui.js
index e3eb358090..8265cd0c7c 100644
--- a/apps/remix-ide/src/app/ui/universal-dapp-ui.js
+++ b/apps/remix-ide/src/app/ui/universal-dapp-ui.js
@@ -244,8 +244,12 @@ UniversalDAppUI.prototype.runTransaction = function (lookupOnly, args, valArr, i
       outputOverride.appendChild(decoded)
     }
   }
-  const info = `${lookupOnly ? 'call' : args.funABI.type !== 'fallback' ? 'lowLevelInteracions' : 'transact'}_${this.blockchain.executionContext.executionContext}`
-  _paq.push(['trackEvent', 'udapp', info])
+  let callinfo = ""
+  if (lookupOnly) callinfo = 'call'
+  else if (args.funABI.type === 'fallback' || args.funABI.type === 'receive') callinfo = 'lowLevelInteracions'
+  else callinfo = 'transact'
+   
+  _paq.push(['trackEvent', 'udapp', callinfo, this.blockchain.getCurrentNetworkStatus().network.name])
   const params = args.funABI.type !== 'fallback' ? inputsValues : ''
   this.blockchain.runOrCallContractMethod(
     args.contractName,
diff --git a/apps/remix-ide/src/blockchain/blockchain.js b/apps/remix-ide/src/blockchain/blockchain.js
index 973e267683..ec9579a1e8 100644
--- a/apps/remix-ide/src/blockchain/blockchain.js
+++ b/apps/remix-ide/src/blockchain/blockchain.js
@@ -41,6 +41,7 @@ class Blockchain {
     this.executionContext.event.register('contextChanged', this.resetEnvironment.bind(this))
 
     this.networkcallid = 0
+    this.networkStatus = { name: ' - ', id: ' - ' } 
     this.setupEvents()
     this.setupProviders()
   }
@@ -57,6 +58,17 @@ class Blockchain {
     this.executionContext.event.register('removeProvider', (name) => {
       this.event.trigger('removeProvider', [name])
     })
+
+    setInterval(() => {
+      this.detectNetwork((error, network) => {
+        this.networkStatus = { network, error }
+        this.event.trigger('networkStatus', [this.networkStatus])
+      })
+    }, 1000)
+  }
+
+  getCurrentNetworkStatus () {
+    return this.networkStatus
   }
 
   setupProviders () {
@@ -197,15 +209,6 @@ class Blockchain {
     return this.executionContext.setProviderFromEndpoint(target, context, cb)
   }
 
-  updateNetwork (cb) {
-    this.executionContext.detectNetwork((err, { id, name } = {}) => {
-      if (err) {
-        return cb(err)
-      }
-      cb(null, { id, name })
-    })
-  }
-
   detectNetwork (cb) {
     return this.executionContext.detectNetwork(cb)
   }