From a15dd23d606aa7334138bcad0b2da2b504ec658a Mon Sep 17 00:00:00 2001
From: LianaHus <liana@ethdev.com>
Date: Tue, 6 Oct 2020 11:06:19 +0200
Subject: [PATCH 01/14] added new item to settings for matomo

---
 apps/remix-ide/src/app/tabs/settings-tab.js | 24 +++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/apps/remix-ide/src/app/tabs/settings-tab.js b/apps/remix-ide/src/app/tabs/settings-tab.js
index 2c304465c2..431a71868f 100644
--- a/apps/remix-ide/src/app/tabs/settings-tab.js
+++ b/apps/remix-ide/src/app/tabs/settings-tab.js
@@ -37,6 +37,8 @@ module.exports = class SettingsTab extends ViewPlugin {
       optionVMLabel: null,
       personal: null,
       personalLabel: null,
+      useMatomoAnalytics: null,
+      useMatomoAnalyticsLabel: null,
       warnPersonalMode: null,
       generateContractMetadata: null,
       generateContractMetadataLabel: null,
@@ -117,6 +119,17 @@ module.exports = class SettingsTab extends ViewPlugin {
     if (this.config.get('settings/personal-mode')) this._view.personal.setAttribute('checked', '')
     elementStateChanged(self._view.personalLabel, !this.config.get('settings/personal-mode'))
 
+    this._view.useMatomoAnalytics = yo`<input onchange=${onchangeMatomoAnalytics} id="settingsMatomoAnalytics" type="checkbox" class="custom-control-input">`
+    this._view.useMatomoAnalyticsMode = yo`<i class="${css.icon} fas fa-exclamation-triangle text-warning" aria-hidden="true"></i>`
+    this._view.useMatomoAnalyticsLabel = yo`
+      <label class="form-check-label custom-control-label align-middle" for="settingsMatomoAnalytics">
+        <span>${this._view.useMatomoAnalyticsMode} Enable Matomo Analytics. The statystics we are collecting is helping to improve plugins usage. We choose Matomo Analytics which is </span>
+        <a target="_blank" href="https://matomo.org/free-software">open source</a>
+      </label>
+    `
+    if (this.config.get('settings/matomo-analytics')) this._view.useMatomoAnalytics.setAttribute('checked', '')
+    elementStateChanged(self._view.personalLabel, !this.config.get('settings/matomo-analytics'))
+
     this._view.generateContractMetadata = yo`<input onchange=${onchangeGenerateContractMetadata} id="generatecontractmetadata" data-id="settingsTabGenerateContractMetadata" type="checkbox" class="custom-control-input">`
     this._view.generateContractMetadataLabel = yo`<label class="form-check-label custom-control-label align-middle" data-id="settingsTabGenerateContractMetadataLabel" for="generatecontractmetadata">Generate contract metadata. Generate a JSON file in the contract folder. Allows to specify library addresses the contract depends on. If nothing is specified, Remix deploys libraries automatically.</label>`
     if (this.config.get('settings/generate-contract-metadata') === undefined) this.config.set('settings/generate-contract-metadata', true)
@@ -148,6 +161,10 @@ module.exports = class SettingsTab extends ViewPlugin {
             ${this._view.personal}>
             ${this._view.personalLabel}
           </div>
+          <div class="custom-control custom-checkbox mb-1">
+            ${this._view.useMatomoAnalytics}>
+            ${this._view.useMatomoAnalyticsLabel}
+          </div>
         </div>
       </div>
       `
@@ -200,6 +217,13 @@ module.exports = class SettingsTab extends ViewPlugin {
       self.config.set('settings/personal-mode', !isChecked)
       elementStateChanged(self._view.personalLabel, isChecked)
     }
+    function onchangeMatomoAnalytics () {
+      const isChecked = self.config.get('settings/matomo-analytics')
+
+      self.config.set('settings/matomo-analytics', !isChecked)
+      elementStateChanged(self._view.useMatomoAnalyticsLabel, isChecked)
+    }
+
     function elementStateChanged (el, isChanged) {
       if (isChanged) {
         el.classList.remove('text-dark')

From 311daa8d5893b15a3b5b581ccc43caae0d9be032 Mon Sep 17 00:00:00 2001
From: LianaHus <liana@ethdev.com>
Date: Tue, 6 Oct 2020 12:14:13 +0200
Subject: [PATCH 02/14] text color corrected

---
 apps/remix-ide/src/app/tabs/settings-tab.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/remix-ide/src/app/tabs/settings-tab.js b/apps/remix-ide/src/app/tabs/settings-tab.js
index 431a71868f..b07385aeaa 100644
--- a/apps/remix-ide/src/app/tabs/settings-tab.js
+++ b/apps/remix-ide/src/app/tabs/settings-tab.js
@@ -122,7 +122,7 @@ module.exports = class SettingsTab extends ViewPlugin {
     this._view.useMatomoAnalytics = yo`<input onchange=${onchangeMatomoAnalytics} id="settingsMatomoAnalytics" type="checkbox" class="custom-control-input">`
     this._view.useMatomoAnalyticsMode = yo`<i class="${css.icon} fas fa-exclamation-triangle text-warning" aria-hidden="true"></i>`
     this._view.useMatomoAnalyticsLabel = yo`
-      <label class="form-check-label custom-control-label align-middle" for="settingsMatomoAnalytics">
+      <label class="form-check-label custom-control-label text-secondary align-middle" for="settingsMatomoAnalytics">
         <span>${this._view.useMatomoAnalyticsMode} Enable Matomo Analytics. The statystics we are collecting is helping to improve plugins usage. We choose Matomo Analytics which is </span>
         <a target="_blank" href="https://matomo.org/free-software">open source</a>
       </label>

From cb0362c740c8d947e65ab03f88c810b9573dd1ef Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Mon, 15 Feb 2021 11:44:25 +0100
Subject: [PATCH 03/14] add tags for activation tracking

---
 apps/remix-ide/index.html                   | 16 ++++++++++++++++
 apps/remix-ide/src/app/tabs/settings-tab.js | 14 +++++++++-----
 apps/remix-ide/src/remixAppManager.js       |  3 +++
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/apps/remix-ide/index.html b/apps/remix-ide/index.html
index 095c829e7e..27e1742864 100644
--- a/apps/remix-ide/index.html
+++ b/apps/remix-ide/index.html
@@ -32,6 +32,22 @@
 		<link rel="icon" type="x-icon" href="assets/img/icon.png">
 		<script src="assets/js/browserfs.min.js"></script>
 		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
+		<!-- Matomo -->
+		<script type="text/javascript">
+			var _paq = window._paq = window._paq || [];
+			/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+			_paq.push(['disableCookies']);
+			_paq.push(['trackPageView']);
+			_paq.push(['enableLinkTracking']);
+			(function() {
+				var u="https://matomo.ethereum.org/";
+				_paq.push(['setTrackerUrl', u+'matomo.php']);
+				_paq.push(['setSiteId', '27']);
+				var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+				g.type='text/javascript'; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+			})();
+			</script>
+			<!-- End Matomo Code -->
 	</head>
 	<body>
 		<script>
diff --git a/apps/remix-ide/src/app/tabs/settings-tab.js b/apps/remix-ide/src/app/tabs/settings-tab.js
index b07385aeaa..ae42a5d507 100644
--- a/apps/remix-ide/src/app/tabs/settings-tab.js
+++ b/apps/remix-ide/src/app/tabs/settings-tab.js
@@ -141,6 +141,13 @@ module.exports = class SettingsTab extends ViewPlugin {
     this._view.themes = this._deps.themeModule.getThemes()
     this._view.themesCheckBoxes = this.createThemeCheckies()
 
+    this._view.matomo = yo`
+      <div class="custom-control custom-checkbox mb-1">
+        ${this._view.useMatomoAnalytics}>
+        ${this._view.useMatomoAnalyticsLabel}
+      </div>
+    `
+
     this._view.config.general = yo`
       <div class="${css.info} border-top">
         <div class="card-body pt-3 pb-2">
@@ -158,13 +165,10 @@ module.exports = class SettingsTab extends ViewPlugin {
             ${this._view.textWrapLabel}
           </div>
           <div class="custom-control custom-checkbox mb-1">
-            ${this._view.personal}>
+            ${this._view.personal}
             ${this._view.personalLabel}
           </div>
-          <div class="custom-control custom-checkbox mb-1">
-            ${this._view.useMatomoAnalytics}>
-            ${this._view.useMatomoAnalyticsLabel}
-          </div>
+
         </div>
       </div>
       `
diff --git a/apps/remix-ide/src/remixAppManager.js b/apps/remix-ide/src/remixAppManager.js
index 4252e40052..43f2edfce7 100644
--- a/apps/remix-ide/src/remixAppManager.js
+++ b/apps/remix-ide/src/remixAppManager.js
@@ -4,6 +4,7 @@ import { IframePlugin } from '@remixproject/engine-web'
 import { EventEmitter } from 'events'
 import QueryParams from './lib/query-params'
 import { PermissionHandler } from './app/ui/persmission-handler'
+const _paq = window._paq = window._paq || []
 
 const requiredModules = [ // services + layout views + system views
   'manager', 'compilerArtefacts', 'compilerMetadata', 'contextualListener', 'editor', 'offsetToLineColumnConverter', 'network', 'theme',
@@ -65,6 +66,7 @@ export class RemixAppManager extends PluginManager {
   onPluginActivated (plugin) {
     this.pluginLoader.set(plugin, this.actives)
     this.event.emit('activate', plugin)
+    _paq.push(['trackEvent', 'pluginManager', 'activate', plugin])
   }
 
   getAll () {
@@ -80,6 +82,7 @@ export class RemixAppManager extends PluginManager {
   onPluginDeactivated (plugin) {
     this.pluginLoader.set(plugin, this.actives)
     this.event.emit('deactivate', plugin)
+    _paq.push(['trackEvent', 'pluginManager', 'deactivate', plugin])
   }
 
   isRequired (name) {

From 8a2b3fd522d96d921c19e1d9c49a453569d6874b Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Mon, 15 Feb 2021 13:39:22 +0100
Subject: [PATCH 04/14] add elements' initialization to constructor

---
 apps/remix-ide/src/app/tabs/settings-tab.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/remix-ide/src/app/tabs/settings-tab.js b/apps/remix-ide/src/app/tabs/settings-tab.js
index ae42a5d507..a67c01a020 100644
--- a/apps/remix-ide/src/app/tabs/settings-tab.js
+++ b/apps/remix-ide/src/app/tabs/settings-tab.js
@@ -39,6 +39,8 @@ module.exports = class SettingsTab extends ViewPlugin {
       personalLabel: null,
       useMatomoAnalytics: null,
       useMatomoAnalyticsLabel: null,
+      useMatomoAnalyticsMode: null,
+      matomo: null,
       warnPersonalMode: null,
       generateContractMetadata: null,
       generateContractMetadataLabel: null,

From 87f102ed8e107a68aff125758f82b1b83b382557 Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Tue, 16 Feb 2021 11:39:28 +0100
Subject: [PATCH 05/14] added opt in/out and some events`

---
 .../components/plugin-manager-component.js    | 15 +++++++++--
 apps/remix-ide/src/app/tabs/settings-tab.js   | 26 +++++++++----------
 .../src/app/ui/landing-page/landing-page.js   | 16 +++++++++---
 apps/remix-ide/src/remixAppManager.js         |  4 +--
 4 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/apps/remix-ide/src/app/components/plugin-manager-component.js b/apps/remix-ide/src/app/components/plugin-manager-component.js
index 48b758e49f..b44e453672 100644
--- a/apps/remix-ide/src/app/components/plugin-manager-component.js
+++ b/apps/remix-ide/src/app/components/plugin-manager-component.js
@@ -6,6 +6,7 @@ const csjs = require('csjs-inject')
 const EventEmitter = require('events')
 const LocalPlugin = require('./local-plugin')
 const addToolTip = require('../ui/tooltip')
+const _paq = window._paq = window._paq || []
 
 const css = csjs`
   .pluginSearch {
@@ -101,6 +102,16 @@ class PluginManagerComponent extends ViewPlugin {
     return this.appManager.actives.includes(name)
   }
 
+  activate (name) {
+    this.appManager.activatePlugin(profile.name)
+    _paq.push(['trackEvent', 'manager', 'activate', name])
+  }
+
+  deactivate (name) {
+    this.appManager.deactivatePlugin(profile.name)
+    _paq.push(['trackEvent', 'manager', 'deactivate', name])
+  }
+
   renderItem (profile) {
     const displayName = (profile.displayName) ? profile.displayName : profile.name
 
@@ -118,7 +129,7 @@ class PluginManagerComponent extends ViewPlugin {
     const activationButton = this.isActive(profile.name)
       ? yo`
       <button
-        onclick="${_ => this.appManager.deactivatePlugin(profile.name)}"
+        onclick="${_ => this.deactivate(profile.name)}"
         class="btn btn-secondary btn-sm" data-id="pluginManagerComponentDeactivateButton${profile.name}"
       >
         Deactivate
@@ -126,7 +137,7 @@ class PluginManagerComponent extends ViewPlugin {
       `
       : yo`
       <button
-        onclick="${_ => this.appManager.activatePlugin(profile.name)}"
+        onclick="${_ => this.activate(profile.name)}"
         class="btn btn-success btn-sm" data-id="pluginManagerComponentActivateButton${profile.name}"
       >
         Activate
diff --git a/apps/remix-ide/src/app/tabs/settings-tab.js b/apps/remix-ide/src/app/tabs/settings-tab.js
index a67c01a020..58f52c8939 100644
--- a/apps/remix-ide/src/app/tabs/settings-tab.js
+++ b/apps/remix-ide/src/app/tabs/settings-tab.js
@@ -40,7 +40,6 @@ module.exports = class SettingsTab extends ViewPlugin {
       useMatomoAnalytics: null,
       useMatomoAnalyticsLabel: null,
       useMatomoAnalyticsMode: null,
-      matomo: null,
       warnPersonalMode: null,
       generateContractMetadata: null,
       generateContractMetadataLabel: null,
@@ -143,13 +142,6 @@ module.exports = class SettingsTab extends ViewPlugin {
     this._view.themes = this._deps.themeModule.getThemes()
     this._view.themesCheckBoxes = this.createThemeCheckies()
 
-    this._view.matomo = yo`
-      <div class="custom-control custom-checkbox mb-1">
-        ${this._view.useMatomoAnalytics}>
-        ${this._view.useMatomoAnalyticsLabel}
-      </div>
-    `
-
     this._view.config.general = yo`
       <div class="${css.info} border-top">
         <div class="card-body pt-3 pb-2">
@@ -170,7 +162,10 @@ module.exports = class SettingsTab extends ViewPlugin {
             ${this._view.personal}
             ${this._view.personalLabel}
           </div>
-
+          <div class="custom-control custom-checkbox mb-1">
+            ${this._view.useMatomoAnalytics}>
+            ${this._view.useMatomoAnalyticsLabel}
+          </div>
         </div>
       </div>
       `
@@ -223,11 +218,14 @@ module.exports = class SettingsTab extends ViewPlugin {
       self.config.set('settings/personal-mode', !isChecked)
       elementStateChanged(self._view.personalLabel, isChecked)
     }
-    function onchangeMatomoAnalytics () {
-      const isChecked = self.config.get('settings/matomo-analytics')
-
-      self.config.set('settings/matomo-analytics', !isChecked)
-      elementStateChanged(self._view.useMatomoAnalyticsLabel, isChecked)
+    function onchangeMatomoAnalytics (event) {
+      elementStateChanged(self._view.useMatomoAnalyticsLabel, event.target.checked)
+      const _paq = window._paq = window._paq || []
+      if (this.checked) {
+        _paq.push(['forgetUserOptOut'])
+      } else {
+        _paq.push(['optUserOut'])
+      }
     }
 
     function elementStateChanged (el, isChanged) {
diff --git a/apps/remix-ide/src/app/ui/landing-page/landing-page.js b/apps/remix-ide/src/app/ui/landing-page/landing-page.js
index 35a4d0c925..2fb038e582 100644
--- a/apps/remix-ide/src/app/ui/landing-page/landing-page.js
+++ b/apps/remix-ide/src/app/ui/landing-page/landing-page.js
@@ -5,10 +5,11 @@ const yo = require('yo-yo')
 const csjs = require('csjs-inject')
 const globalRegistry = require('../../../global/registry')
 const CompilerImport = require('../../compiler/compiler-imports')
-var modalDialogCustom = require('../modal-dialog-custom')
-var tooltip = require('../tooltip')
-var GistHandler = require('../../../lib/gist-handler')
-var QueryParams = require('../../../lib/query-params.js')
+const modalDialogCustom = require('../modal-dialog-custom')
+const tooltip = require('../tooltip')
+const GistHandler = require('../../../lib/gist-handler')
+const QueryParams = require('../../../lib/query-params.js')
+const _paq = window._paq = window._paq || []
 
 const css = csjs`
   .text {
@@ -219,10 +220,12 @@ export class LandingPage extends ViewPlugin {
       this.mediumPanel.classList.remove('d-block')
       this.mediumPanel.classList.add('d-none')
       this.twitterPanel.classList.toggle('d-block')
+      _paq.push(['trackEvent', 'pluginManager', 'media', 'twitter'])
     } else {
       this.twitterPanel.classList.remove('d-block')
       this.twitterPanel.classList.add('d-none')
       this.mediumPanel.classList.toggle('d-block')
+      _paq.push(['trackEvent', 'pluginManager', 'media', 'medium'])
     }
   }
 
@@ -258,22 +261,27 @@ export class LandingPage extends ViewPlugin {
     const startSolidity = async () => {
       await this.appManager.activatePlugin(['solidity', 'udapp', 'solidityStaticAnalysis', 'solidityUnitTesting'])
       this.verticalIcons.select('solidity')
+      _paq.push(['trackEvent', 'pluginManager', 'userActivate', 'solidity'])
     }
     const startDebugger = async () => {
       await this.appManager.activatePlugin('debugger')
       this.verticalIcons.select('debugger')
+      _paq.push(['trackEvent', 'pluginManager', 'userActivate', 'debugger'])
     }
     const startSolhint = async () => {
       await this.appManager.activatePlugin(['solidity', 'solhint'])
       this.verticalIcons.select('solhint')
+      _paq.push(['trackEvent', 'pluginManager', 'userActivate', 'solhint'])
     }
     const startLearnEth = async () => {
       await this.appManager.activatePlugin(['solidity', 'LearnEth', 'solidityUnitTesting'])
       this.verticalIcons.select('LearnEth')
+      _paq.push(['trackEvent', 'pluginManager', 'userActivate', 'learnEth'])
     }
     const startSourceVerify = async () => {
       await this.appManager.activatePlugin(['solidity', 'source-verification'])
       this.verticalIcons.select('source-verification')
+      _paq.push(['trackEvent', 'pluginManager', 'userActivate', 'source-verification'])
     }
     const startPluginManager = async () => {
       await this.appManager.activatePlugin('pluginManager')
diff --git a/apps/remix-ide/src/remixAppManager.js b/apps/remix-ide/src/remixAppManager.js
index 43f2edfce7..13ee13438f 100644
--- a/apps/remix-ide/src/remixAppManager.js
+++ b/apps/remix-ide/src/remixAppManager.js
@@ -66,7 +66,7 @@ export class RemixAppManager extends PluginManager {
   onPluginActivated (plugin) {
     this.pluginLoader.set(plugin, this.actives)
     this.event.emit('activate', plugin)
-    _paq.push(['trackEvent', 'pluginManager', 'activate', plugin])
+    _paq.push(['trackEvent', 'pluginManager', 'activate', plugin.name])
   }
 
   getAll () {
@@ -82,7 +82,7 @@ export class RemixAppManager extends PluginManager {
   onPluginDeactivated (plugin) {
     this.pluginLoader.set(plugin, this.actives)
     this.event.emit('deactivate', plugin)
-    _paq.push(['trackEvent', 'pluginManager', 'deactivate', plugin])
+    _paq.push(['trackEvent', 'pluginManager', 'deactivate', plugin.name])
   }
 
   isRequired (name) {

From 0b3fc43f6d1be77d2c32326540b3904818e975c9 Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Tue, 16 Feb 2021 12:13:19 +0100
Subject: [PATCH 06/14] fixed typeo

---
 apps/remix-ide/src/app/components/plugin-manager-component.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/remix-ide/src/app/components/plugin-manager-component.js b/apps/remix-ide/src/app/components/plugin-manager-component.js
index b44e453672..c85c762bdd 100644
--- a/apps/remix-ide/src/app/components/plugin-manager-component.js
+++ b/apps/remix-ide/src/app/components/plugin-manager-component.js
@@ -103,12 +103,12 @@ class PluginManagerComponent extends ViewPlugin {
   }
 
   activate (name) {
-    this.appManager.activatePlugin(profile.name)
+    this.appManager.activatePlugin(name)
     _paq.push(['trackEvent', 'manager', 'activate', name])
   }
 
   deactivate (name) {
-    this.appManager.deactivatePlugin(profile.name)
+    this.appManager.deactivatePlugin(name)
     _paq.push(['trackEvent', 'manager', 'deactivate', name])
   }
 

From 2b1e86e5195523e28912ed9f964dc85bf6cc9c73 Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Tue, 16 Feb 2021 12:35:56 +0100
Subject: [PATCH 07/14] typo

---
 apps/remix-ide/src/app/tabs/settings-tab.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/remix-ide/src/app/tabs/settings-tab.js b/apps/remix-ide/src/app/tabs/settings-tab.js
index 58f52c8939..34ed31836b 100644
--- a/apps/remix-ide/src/app/tabs/settings-tab.js
+++ b/apps/remix-ide/src/app/tabs/settings-tab.js
@@ -163,7 +163,7 @@ module.exports = class SettingsTab extends ViewPlugin {
             ${this._view.personalLabel}
           </div>
           <div class="custom-control custom-checkbox mb-1">
-            ${this._view.useMatomoAnalytics}>
+            ${this._view.useMatomoAnalytics}
             ${this._view.useMatomoAnalyticsLabel}
           </div>
         </div>

From f534ad4b2066f5434f9d85eb9c2ebf64cea4a418 Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Tue, 16 Feb 2021 13:02:22 +0100
Subject: [PATCH 08/14] rename to avoid overwriting

---
 .../src/app/components/plugin-manager-component.js        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/remix-ide/src/app/components/plugin-manager-component.js b/apps/remix-ide/src/app/components/plugin-manager-component.js
index c85c762bdd..21325c018e 100644
--- a/apps/remix-ide/src/app/components/plugin-manager-component.js
+++ b/apps/remix-ide/src/app/components/plugin-manager-component.js
@@ -102,12 +102,12 @@ class PluginManagerComponent extends ViewPlugin {
     return this.appManager.actives.includes(name)
   }
 
-  activate (name) {
+  activateP (name) {
     this.appManager.activatePlugin(name)
     _paq.push(['trackEvent', 'manager', 'activate', name])
   }
 
-  deactivate (name) {
+  deactivateP (name) {
     this.appManager.deactivatePlugin(name)
     _paq.push(['trackEvent', 'manager', 'deactivate', name])
   }
@@ -129,7 +129,7 @@ class PluginManagerComponent extends ViewPlugin {
     const activationButton = this.isActive(profile.name)
       ? yo`
       <button
-        onclick="${_ => this.deactivate(profile.name)}"
+        onclick="${() => this.deactivateP(profile.name)}"
         class="btn btn-secondary btn-sm" data-id="pluginManagerComponentDeactivateButton${profile.name}"
       >
         Deactivate
@@ -137,7 +137,7 @@ class PluginManagerComponent extends ViewPlugin {
       `
       : yo`
       <button
-        onclick="${_ => this.activate(profile.name)}"
+        onclick="${() => this.activateP(profile.name)}"
         class="btn btn-success btn-sm" data-id="pluginManagerComponentActivateButton${profile.name}"
       >
         Activate

From aa3a09fbf01dd07e48f388953bb233ea22f53080 Mon Sep 17 00:00:00 2001
From: aniket-engg <aniketengg.225@gmail.com>
Date: Mon, 15 Feb 2021 16:23:19 +0530
Subject: [PATCH 09/14] fixes #826

---
 apps/remix-ide/src/app/tabs/runTab/contractDropdown.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/remix-ide/src/app/tabs/runTab/contractDropdown.js b/apps/remix-ide/src/app/tabs/runTab/contractDropdown.js
index 04a53a3774..859c192a5a 100644
--- a/apps/remix-ide/src/app/tabs/runTab/contractDropdown.js
+++ b/apps/remix-ide/src/app/tabs/runTab/contractDropdown.js
@@ -1,6 +1,6 @@
 import publishToStorage from '../../../publishToStorage'
-
 const yo = require('yo-yo')
+const ethJSUtil = require('ethereumjs-util')
 const css = require('../styles/run-tab-styles')
 const modalDialogCustom = require('../../ui/modal-dialog-custom')
 const remixLib = require('@remix-project/remix-lib')
@@ -97,7 +97,9 @@ class ContractDropdownUI {
 
   enableAtAddress (enable) {
     if (enable) {
-      if (this.atAddressButtonInput.value === '') return
+      const address = this.atAddressButtonInput.value
+      if (!address || !ethJSUtil.isValidAddress(address) ||
+      (/[a-f]/.test(address) && /[A-F]/.test(address) && !ethJSUtil.isValidChecksumAddress(address))) return
       this.atAddress.removeAttribute('disabled')
       this.atAddress.setAttribute('title', 'Interact with the given contract.')
     } else {

From 709a1f0b548da6d5b2d36c6767180f7478fd5e66 Mon Sep 17 00:00:00 2001
From: aniket-engg <aniketengg.225@gmail.com>
Date: Mon, 15 Feb 2021 17:06:32 +0530
Subject: [PATCH 10/14] addAtAddressInstance command updated in tests

---
 .../src/commands/addAtAddressInstance.ts      | 18 +++----------
 apps/remix-ide-e2e/src/tests/ballot.test.ts   | 26 +++++++++----------
 2 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/apps/remix-ide-e2e/src/commands/addAtAddressInstance.ts b/apps/remix-ide-e2e/src/commands/addAtAddressInstance.ts
index 50116dec42..31d8a96078 100644
--- a/apps/remix-ide-e2e/src/commands/addAtAddressInstance.ts
+++ b/apps/remix-ide-e2e/src/commands/addAtAddressInstance.ts
@@ -15,21 +15,9 @@ class addAtAddressInstance extends EventEmitter {
 
 function addInstance (browser: NightwatchBrowser, address: string, isValidFormat: boolean, isValidChecksum: boolean, callback: VoidFunction) {
   browser.clickLaunchIcon('udapp').clearValue('.ataddressinput').setValue('.ataddressinput', address, function () {
-    browser.click('button[id^="runAndDeployAtAdressButton"]')
-      .execute(function () {
-        const ret = document.querySelector('div[class^="modal-body"] div').innerHTML
-        const modal = document.querySelector('#modal-footer-ok') as HTMLElement
-
-        modal.click()
-        return ret
-      }, [], function (result) {
-        if (!isValidFormat) {
-          browser.assert.equal(result.value, 'Invalid address.')
-        } else if (!isValidChecksum) {
-          browser.assert.equal(result.value, 'Invalid checksum address.')
-        }
-        callback()
-      })
+    if (!isValidFormat || !isValidChecksum)
+      browser.assert.elementPresent('button[id^="runAndDeployAtAdressButton"]:disabled')
+    else callback()
   })
 }
 
diff --git a/apps/remix-ide-e2e/src/tests/ballot.test.ts b/apps/remix-ide-e2e/src/tests/ballot.test.ts
index 4728197006..2fbdb2a0bb 100644
--- a/apps/remix-ide-e2e/src/tests/ballot.test.ts
+++ b/apps/remix-ide-e2e/src/tests/ballot.test.ts
@@ -36,19 +36,19 @@ module.exports = {
         })
   },
 
-  'Debug Ballot / delegate': function (browser: NightwatchBrowser) {
-    browser.pause(500)
-      .click('*[data-id="txLoggerDebugButton0x41fab8ea5b1d9fba5e0a6545ca1a2d62fff518578802c033c2b9a031a01c31b3"]')
-      .waitForElementVisible('*[data-id="buttonNavigatorJumpPreviousBreakpoint"]')
-    // .clickLaunchIcon('debugger')
-      .click('*[data-id="buttonNavigatorJumpPreviousBreakpoint"]')
-      .pause(2000)
-      .waitForElementVisible('#stepdetail')
-      .goToVMTraceStep(79)
-      .pause(1000)
-      .checkVariableDebug('soliditystate', stateCheck)
-      .checkVariableDebug('soliditylocals', localsCheck)
-  },
+  // 'Debug Ballot / delegate': function (browser: NightwatchBrowser) {
+  //   browser.pause(500)
+  //     .click('*[data-id="txLoggerDebugButton0x41fab8ea5b1d9fba5e0a6545ca1a2d62fff518578802c033c2b9a031a01c31b3"]')
+  //     .waitForElementVisible('*[data-id="buttonNavigatorJumpPreviousBreakpoint"]')
+  //   // .clickLaunchIcon('debugger')
+  //     .click('*[data-id="buttonNavigatorJumpPreviousBreakpoint"]')
+  //     .pause(2000)
+  //     .waitForElementVisible('#stepdetail')
+  //     .goToVMTraceStep(79)
+  //     .pause(1000)
+  //     .checkVariableDebug('soliditystate', stateCheck)
+  //     .checkVariableDebug('soliditylocals', localsCheck)
+  // },
 
   'Access Ballot via at address': function (browser: NightwatchBrowser) {
     browser.clickLaunchIcon('udapp')

From 4f9aded7a881ea85a5fecdc0d9cc749a0c5c89c6 Mon Sep 17 00:00:00 2001
From: aniket-engg <aniketengg.225@gmail.com>
Date: Mon, 15 Feb 2021 17:56:54 +0530
Subject: [PATCH 11/14] linting fix

---
 .../src/commands/addAtAddressInstance.ts      |  4 +--
 apps/remix-ide-e2e/src/tests/ballot.test.ts   | 26 +++++++++----------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/apps/remix-ide-e2e/src/commands/addAtAddressInstance.ts b/apps/remix-ide-e2e/src/commands/addAtAddressInstance.ts
index 31d8a96078..c3b59aa332 100644
--- a/apps/remix-ide-e2e/src/commands/addAtAddressInstance.ts
+++ b/apps/remix-ide-e2e/src/commands/addAtAddressInstance.ts
@@ -15,9 +15,7 @@ class addAtAddressInstance extends EventEmitter {
 
 function addInstance (browser: NightwatchBrowser, address: string, isValidFormat: boolean, isValidChecksum: boolean, callback: VoidFunction) {
   browser.clickLaunchIcon('udapp').clearValue('.ataddressinput').setValue('.ataddressinput', address, function () {
-    if (!isValidFormat || !isValidChecksum)
-      browser.assert.elementPresent('button[id^="runAndDeployAtAdressButton"]:disabled')
-    else callback()
+    if (!isValidFormat || !isValidChecksum) { browser.assert.elementPresent('button[id^="runAndDeployAtAdressButton"]:disabled') } else callback()
   })
 }
 
diff --git a/apps/remix-ide-e2e/src/tests/ballot.test.ts b/apps/remix-ide-e2e/src/tests/ballot.test.ts
index 2fbdb2a0bb..4728197006 100644
--- a/apps/remix-ide-e2e/src/tests/ballot.test.ts
+++ b/apps/remix-ide-e2e/src/tests/ballot.test.ts
@@ -36,19 +36,19 @@ module.exports = {
         })
   },
 
-  // 'Debug Ballot / delegate': function (browser: NightwatchBrowser) {
-  //   browser.pause(500)
-  //     .click('*[data-id="txLoggerDebugButton0x41fab8ea5b1d9fba5e0a6545ca1a2d62fff518578802c033c2b9a031a01c31b3"]')
-  //     .waitForElementVisible('*[data-id="buttonNavigatorJumpPreviousBreakpoint"]')
-  //   // .clickLaunchIcon('debugger')
-  //     .click('*[data-id="buttonNavigatorJumpPreviousBreakpoint"]')
-  //     .pause(2000)
-  //     .waitForElementVisible('#stepdetail')
-  //     .goToVMTraceStep(79)
-  //     .pause(1000)
-  //     .checkVariableDebug('soliditystate', stateCheck)
-  //     .checkVariableDebug('soliditylocals', localsCheck)
-  // },
+  'Debug Ballot / delegate': function (browser: NightwatchBrowser) {
+    browser.pause(500)
+      .click('*[data-id="txLoggerDebugButton0x41fab8ea5b1d9fba5e0a6545ca1a2d62fff518578802c033c2b9a031a01c31b3"]')
+      .waitForElementVisible('*[data-id="buttonNavigatorJumpPreviousBreakpoint"]')
+    // .clickLaunchIcon('debugger')
+      .click('*[data-id="buttonNavigatorJumpPreviousBreakpoint"]')
+      .pause(2000)
+      .waitForElementVisible('#stepdetail')
+      .goToVMTraceStep(79)
+      .pause(1000)
+      .checkVariableDebug('soliditystate', stateCheck)
+      .checkVariableDebug('soliditylocals', localsCheck)
+  },
 
   'Access Ballot via at address': function (browser: NightwatchBrowser) {
     browser.clickLaunchIcon('udapp')

From b90a2b8edc6ef6db94f21493e360c3ef23a3af43 Mon Sep 17 00:00:00 2001
From: aniket-engg <aniketengg.225@gmail.com>
Date: Tue, 16 Feb 2021 00:09:26 +0530
Subject: [PATCH 12/14] addAtAddressInstance updated

---
 .../remix-ide-e2e/src/commands/addAtAddressInstance.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/apps/remix-ide-e2e/src/commands/addAtAddressInstance.ts b/apps/remix-ide-e2e/src/commands/addAtAddressInstance.ts
index c3b59aa332..8df05cba92 100644
--- a/apps/remix-ide-e2e/src/commands/addAtAddressInstance.ts
+++ b/apps/remix-ide-e2e/src/commands/addAtAddressInstance.ts
@@ -15,7 +15,15 @@ class addAtAddressInstance extends EventEmitter {
 
 function addInstance (browser: NightwatchBrowser, address: string, isValidFormat: boolean, isValidChecksum: boolean, callback: VoidFunction) {
   browser.clickLaunchIcon('udapp').clearValue('.ataddressinput').setValue('.ataddressinput', address, function () {
-    if (!isValidFormat || !isValidChecksum) { browser.assert.elementPresent('button[id^="runAndDeployAtAdressButton"]:disabled') } else callback()
+    if (!isValidFormat || !isValidChecksum) browser.assert.elementPresent('button[id^="runAndDeployAtAdressButton"]:disabled')
+    else {
+      browser.click('button[id^="runAndDeployAtAdressButton"]')
+        .execute(function () {
+          const modal = document.querySelector('#modal-footer-ok') as HTMLElement
+          modal.click()
+        })
+    }
+    callback()
   })
 }
 

From 01877261d1146703224a465c4a6ccc7feb557103 Mon Sep 17 00:00:00 2001
From: aniket-engg <aniketengg.225@gmail.com>
Date: Tue, 16 Feb 2021 16:10:31 +0530
Subject: [PATCH 13/14] address checks updated

---
 apps/remix-ide/src/app/tabs/runTab/contractDropdown.js    | 3 +--
 apps/remix-ide/src/app/tabs/runTab/model/dropdownlogic.js | 6 ------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/apps/remix-ide/src/app/tabs/runTab/contractDropdown.js b/apps/remix-ide/src/app/tabs/runTab/contractDropdown.js
index 859c192a5a..20101d1174 100644
--- a/apps/remix-ide/src/app/tabs/runTab/contractDropdown.js
+++ b/apps/remix-ide/src/app/tabs/runTab/contractDropdown.js
@@ -98,8 +98,7 @@ class ContractDropdownUI {
   enableAtAddress (enable) {
     if (enable) {
       const address = this.atAddressButtonInput.value
-      if (!address || !ethJSUtil.isValidAddress(address) ||
-      (/[a-f]/.test(address) && /[A-F]/.test(address) && !ethJSUtil.isValidChecksumAddress(address))) return
+      if (!address || !ethJSUtil.isValidChecksumAddress(address)) return
       this.atAddress.removeAttribute('disabled')
       this.atAddress.setAttribute('title', 'Interact with the given contract.')
     } else {
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 f958bbd1f4..28fcc76d8d 100644
--- a/apps/remix-ide/src/app/tabs/runTab/model/dropdownlogic.js
+++ b/apps/remix-ide/src/app/tabs/runTab/model/dropdownlogic.js
@@ -43,12 +43,6 @@ class DropdownLogic {
   }
 
   loadContractFromAddress (address, confirmCb, cb) {
-    if (!ethJSUtil.isValidAddress(address)) {
-      return cb('Invalid address.')
-    }
-    if (/[a-f]/.test(address) && /[A-F]/.test(address) && !ethJSUtil.isValidChecksumAddress(address)) {
-      return cb('Invalid checksum address.')
-    }
     if (/.(.abi)$/.exec(this.config.get('currentFile'))) {
       confirmCb(() => {
         var abi

From cabd5a76d55b61d88515310a2144d7e28f268047 Mon Sep 17 00:00:00 2001
From: aniket-engg <aniketengg.225@gmail.com>
Date: Tue, 16 Feb 2021 16:28:35 +0530
Subject: [PATCH 14/14] linting fix

---
 apps/remix-ide/src/app/tabs/runTab/model/dropdownlogic.js | 1 -
 1 file changed, 1 deletion(-)

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 28fcc76d8d..a2d01d02f4 100644
--- a/apps/remix-ide/src/app/tabs/runTab/model/dropdownlogic.js
+++ b/apps/remix-ide/src/app/tabs/runTab/model/dropdownlogic.js
@@ -1,4 +1,3 @@
-var ethJSUtil = require('ethereumjs-util')
 var remixLib = require('@remix-project/remix-lib')
 var txHelper = remixLib.execution.txHelper
 var CompilerAbstract = require('../../../compiler/compiler-abstract')