From 111f5e32bc8f0fec4dcf88f6a132de57a346d9b6 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Wed, 6 Dec 2023 13:14:28 +0100
Subject: [PATCH] update matomo config

---
 apps/remix-ide/src/app/tabs/settings-tab.tsx               | 4 ----
 apps/remix-ide/src/assets/js/loader.js                     | 7 +++++--
 .../app/src/lib/remix-app/components/modals/matomo.tsx     | 4 ----
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/apps/remix-ide/src/app/tabs/settings-tab.tsx b/apps/remix-ide/src/app/tabs/settings-tab.tsx
index a95bf5f0cc..3950e72a47 100644
--- a/apps/remix-ide/src/app/tabs/settings-tab.tsx
+++ b/apps/remix-ide/src/app/tabs/settings-tab.tsx
@@ -95,14 +95,10 @@ module.exports = class SettingsTab extends ViewPlugin {
       _paq.push(['optUserOut'])
       // revoke tracking consent
       _paq.push(['forgetConsentGiven']);
-      // OR revoke cookie consent
-      _paq.push(['forgetCookieConsentGiven']);
     } else {
       _paq.push(['forgetUserOptOut'])
       // user has given consent to process their data
       _paq.push(['setConsentGiven']);
-      // OR user has given consent to store and use cookies
-      _paq.push(['setCookieConsentGiven']);
     }
     this.dispatch({
       ...this
diff --git a/apps/remix-ide/src/assets/js/loader.js b/apps/remix-ide/src/assets/js/loader.js
index ed718e6312..5938aeaf9c 100644
--- a/apps/remix-ide/src/assets/js/loader.js
+++ b/apps/remix-ide/src/assets/js/loader.js
@@ -20,14 +20,17 @@ if (domains[window.location.hostname]) {
   _paq.push(['enableJSErrorTracking']);
   // require user tracking consent before processing data
   _paq.push(['requireConsent']);
-  // OR require user cookie consent before storing any cookies
-  _paq.push(['requireCookieConsent']);
   _paq.push(['trackPageView']);
   _paq.push(['enableLinkTracking']);
   _paq.push(['enableHeartBeatTimer']);
   if (!window.localStorage.getItem('config-v0.8:.remix.config') ||
     (window.localStorage.getItem('config-v0.8:.remix.config') && !window.localStorage.getItem('config-v0.8:.remix.config').includes('settings/matomo-analytics'))) {
     _paq.push(['optUserOut'])
+
+  } else {
+    _paq.push(['forgetUserOptOut'])
+    // user has given consent to process their data
+    _paq.push(['setConsentGiven'])
   }
   (function () {
     var u = "https://ethereumfoundation.matomo.cloud/";
diff --git a/libs/remix-ui/app/src/lib/remix-app/components/modals/matomo.tsx b/libs/remix-ui/app/src/lib/remix-app/components/modals/matomo.tsx
index 93974f15b3..b1fb029b77 100644
--- a/libs/remix-ui/app/src/lib/remix-app/components/modals/matomo.tsx
+++ b/libs/remix-ui/app/src/lib/remix-app/components/modals/matomo.tsx
@@ -59,8 +59,6 @@ const MatomoDialog = (props) => {
     _paq.push(['optUserOut'])
     // revoke tracking consent
     _paq.push(['forgetConsentGiven']);
-    // OR revoke cookie consent
-    _paq.push(['forgetCookieConsentGiven']);
     setVisible(false)
   }
 
@@ -68,8 +66,6 @@ const MatomoDialog = (props) => {
     _paq.push(['forgetUserOptOut'])
     // user has given consent to process their data
     _paq.push(['setConsentGiven']);
-    // OR user has given consent to store and use cookies
-    _paq.push(['setCookieConsentGiven']);
     settings.updateMatomoAnalyticsChoice(true)
     setVisible(false)
   }