From 0dcb5f811e8a5932586cabe7d202e913d28ef700 Mon Sep 17 00:00:00 2001
From: Prince <prince@deriv.com>
Date: Fri, 11 Jul 2025 15:54:49 +0400
Subject: [PATCH 1/2] chore: potential mistagging log

---
 public/scripts/packages/marketing/package.json  |  2 +-
 public/scripts/packages/marketing/src/cookie.js | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/public/scripts/packages/marketing/package.json b/public/scripts/packages/marketing/package.json
index e8c3ce13442e9..efad692f2fb7f 100644
--- a/public/scripts/packages/marketing/package.json
+++ b/public/scripts/packages/marketing/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@deriv-com/marketing-utils",
-    "version": "1.0.15",
+    "version": "1.0.16",
     "type": "module",
     "repository": {
         "type": "git",
diff --git a/public/scripts/packages/marketing/src/cookie.js b/public/scripts/packages/marketing/src/cookie.js
index c3732fc21bebc..ea3be512d5b01 100644
--- a/public/scripts/packages/marketing/src/cookie.js
+++ b/public/scripts/packages/marketing/src/cookie.js
@@ -229,6 +229,9 @@ function DerivMarketingCookies() {
     }
   });
 
+  let potential_mistagging = true;
+  let overwrite_happened = false;
+
   if (shouldOverwrite(utm_data, current_utm_data)) {
     eraseCookie("affiliate_tracking");
     eraseCookie("utm_data");
@@ -239,6 +242,9 @@ function DerivMarketingCookies() {
       .replaceAll("%7D", "}");
 
     setCookie("utm_data", utm_data_cookie);
+    overwrite_happened = true;
+  } else {
+    potential_mistagging = false;
   }
 
   /* end handling UTMs */
@@ -251,12 +257,20 @@ function DerivMarketingCookies() {
     const affiliateToken =
       searchParams.get("t") || searchParams.get("affiliate_token");
     setCookie("affiliate_tracking", affiliateToken);
+
+    if (overwrite_happened) {
+      potential_mistagging = false;
+    }
   }
 
   if (searchParams.has("sidc")) {
     eraseCookie("affiliate_tracking");
     const sidcValue = searchParams.get("sidc");
     setCookie("affiliate_tracking", sidcValue);
+
+    if (overwrite_happened) {
+      potential_mistagging = false;
+    }
   }
   /* end handling affiliate tracking */
 
@@ -429,6 +443,8 @@ function DerivMarketingCookies() {
         trackEvent("debug_marketing_cookies", {
           marketing_cookies: getStringifiedCookies(),
           cookie_status: testCookieFunctionality(),
+          potential_mistagging,
+          overwrite_happened,
         });
       }, 1000);
     } else if (retries > 0) {

From 45b09681190bf8fc0c705a4e84284d29c1804b1d Mon Sep 17 00:00:00 2001
From: Prince <prince@deriv.com>
Date: Fri, 11 Jul 2025 16:14:59 +0400
Subject: [PATCH 2/2] chore: log dropped affiliate tracking

---
 public/scripts/packages/marketing/src/cookie.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/public/scripts/packages/marketing/src/cookie.js b/public/scripts/packages/marketing/src/cookie.js
index ea3be512d5b01..7286c8b40418a 100644
--- a/public/scripts/packages/marketing/src/cookie.js
+++ b/public/scripts/packages/marketing/src/cookie.js
@@ -231,6 +231,7 @@ function DerivMarketingCookies() {
 
   let potential_mistagging = true;
   let overwrite_happened = false;
+  let dropped_affiliate_tracking = null;
 
   if (shouldOverwrite(utm_data, current_utm_data)) {
     eraseCookie("affiliate_tracking");
@@ -253,14 +254,15 @@ function DerivMarketingCookies() {
   const isAffiliateTokenExist =
     searchParams.has("t") || searchParams.has("affiliate_token");
   if (isAffiliateTokenExist) {
+    if (overwrite_happened) {
+      dropped_affiliate_tracking = getCookie("affiliate_token");
+      potential_mistagging = false;
+    }
+
     eraseCookie("affiliate_tracking");
     const affiliateToken =
       searchParams.get("t") || searchParams.get("affiliate_token");
     setCookie("affiliate_tracking", affiliateToken);
-
-    if (overwrite_happened) {
-      potential_mistagging = false;
-    }
   }
 
   if (searchParams.has("sidc")) {
@@ -269,6 +271,7 @@ function DerivMarketingCookies() {
     setCookie("affiliate_tracking", sidcValue);
 
     if (overwrite_happened) {
+      dropped_affiliate_tracking = getCookie("affiliate_token");
       potential_mistagging = false;
     }
   }
@@ -445,6 +448,7 @@ function DerivMarketingCookies() {
           cookie_status: testCookieFunctionality(),
           potential_mistagging,
           overwrite_happened,
+          dropped_affiliate_tracking,
         });
       }, 1000);
     } else if (retries > 0) {