From 15a701dcb330ef8f6ea1d4441a8dc30510fdf2a4 Mon Sep 17 00:00:00 2001
From: Farabi <farabi@deriv.com>
Date: Tue, 15 Oct 2024 12:08:10 +0800
Subject: [PATCH 1/5] chore: added rudderstack track events for announcement
 click

---
 packages/bot-web-ui/src/analytics/constants.ts       |  1 +
 .../src/analytics/rudderstack-dashboard.ts           |  9 +++++++++
 .../pages/dashboard/announcements/announcements.tsx  | 12 +++++++++++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/packages/bot-web-ui/src/analytics/constants.ts b/packages/bot-web-ui/src/analytics/constants.ts
index 16be0653402a..678f251ff22b 100644
--- a/packages/bot-web-ui/src/analytics/constants.ts
+++ b/packages/bot-web-ui/src/analytics/constants.ts
@@ -18,6 +18,7 @@ export enum ACTION {
     GOOGLE_DRIVE_CONNECT = 'google_drive_connect',
     GOOGLE_DRIVE_DISCONNECT = 'google_drive_disconnect',
     SWITCH_LOAD_STRATEGY_TAB = 'switch_load_strategy_tab',
+    ANNOUNCEMENT_CLICK = 'announcement_click',
 }
 
 export type TFormStrategy = {
diff --git a/packages/bot-web-ui/src/analytics/rudderstack-dashboard.ts b/packages/bot-web-ui/src/analytics/rudderstack-dashboard.ts
index 840df02185de..e5782b69afa4 100644
--- a/packages/bot-web-ui/src/analytics/rudderstack-dashboard.ts
+++ b/packages/bot-web-ui/src/analytics/rudderstack-dashboard.ts
@@ -9,3 +9,12 @@ export const rudderStackSendDashboardClickEvent = ({ dashboard_click_name, subpa
         dashboard_click_name,
     });
 };
+
+export const rudderStackSendAnnouncementClickEvent = ({ announcement_name }: TEvents['ce_bot_form']) => {
+    Analytics.trackEvent('ce_bot_form', {
+        action: ACTION.ANNOUNCEMENT_CLICK,
+        form_name,
+        subform_source: 'dashboard',
+        announcement_name,
+    });
+};
diff --git a/packages/bot-web-ui/src/pages/dashboard/announcements/announcements.tsx b/packages/bot-web-ui/src/pages/dashboard/announcements/announcements.tsx
index 6ca0793b21bc..9969e3838172 100644
--- a/packages/bot-web-ui/src/pages/dashboard/announcements/announcements.tsx
+++ b/packages/bot-web-ui/src/pages/dashboard/announcements/announcements.tsx
@@ -7,6 +7,8 @@ import { observer } from '@deriv/stores';
 import { localize } from '@deriv/translations';
 import { Notifications as Announcement } from '@deriv-com/ui';
 import { useDBotStore } from 'Stores/useDBotStore';
+import { rudderStackSendOpenEvent } from '../../../analytics/rudderstack-common-events';
+import { rudderStackSendAnnouncementClickEvent } from '../../../analytics/rudderstack-dashboard';
 import { guide_content } from '../../tutorials/constants';
 import { performButtonAction } from './utils/accumulator-helper-functions';
 import { MessageAnnounce, TitleAnnounce } from './announcement-components';
@@ -42,6 +44,7 @@ const Announcements = observer(({ is_mobile, is_tablet, handleTabChange }: TAnno
         setSelectedAnnouncement(announcement);
         setIsAnnounceDialogOpen(true);
         setIsOpenAnnounceList(prev => !prev);
+        rudderStackSendAnnouncementClickEvent({ announcement_name: announce_id });
 
         let data: Record<string, boolean> | null = null;
         data = JSON.parse(localStorage.getItem('bot-announcements') ?? '{}');
@@ -136,7 +139,14 @@ const Announcements = observer(({ is_mobile, is_tablet, handleTabChange }: TAnno
         <div className='announcements'>
             <button
                 className='announcements__button'
-                onClick={() => setIsOpenAnnounceList(prevState => !prevState)}
+                onClick={() => {
+                    setIsOpenAnnounceList(prevState => !prevState);
+                    if (!is_open_announce_list) {
+                        rudderStackSendOpenEvent({
+                            subform_name: 'announcements',
+                        });
+                    }
+                }}
                 data-testid='btn-announcements'
             >
                 <StandaloneBullhornRegularIcon fill='var(--icon-black-plus)' iconSize='sm' />

From 018c9c72bc57a3f026106846bedaed038e09a393 Mon Sep 17 00:00:00 2001
From: Farabi <farabi@deriv.com>
Date: Tue, 15 Oct 2024 14:45:50 +0800
Subject: [PATCH 2/5] chore: added announcement action and close events

---
 packages/bot-web-ui/src/analytics/constants.ts      |  1 +
 .../src/analytics/rudderstack-common-events.ts      |  2 ++
 .../src/analytics/rudderstack-dashboard.ts          | 13 +++++++++++++
 .../dashboard/announcements/announcement-dialog.tsx |  9 ++++++++-
 .../pages/dashboard/announcements/announcements.tsx | 13 ++++++++++++-
 5 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/packages/bot-web-ui/src/analytics/constants.ts b/packages/bot-web-ui/src/analytics/constants.ts
index 678f251ff22b..0063b6e3af96 100644
--- a/packages/bot-web-ui/src/analytics/constants.ts
+++ b/packages/bot-web-ui/src/analytics/constants.ts
@@ -19,6 +19,7 @@ export enum ACTION {
     GOOGLE_DRIVE_DISCONNECT = 'google_drive_disconnect',
     SWITCH_LOAD_STRATEGY_TAB = 'switch_load_strategy_tab',
     ANNOUNCEMENT_CLICK = 'announcement_click',
+    ANNOUNCEMENT_ACTION = 'announcement_action',
 }
 
 export type TFormStrategy = {
diff --git a/packages/bot-web-ui/src/analytics/rudderstack-common-events.ts b/packages/bot-web-ui/src/analytics/rudderstack-common-events.ts
index 7a58c1d82b45..f57600bfb22a 100644
--- a/packages/bot-web-ui/src/analytics/rudderstack-common-events.ts
+++ b/packages/bot-web-ui/src/analytics/rudderstack-common-events.ts
@@ -23,6 +23,7 @@ export const rudderStackSendCloseEvent = ({
     quick_strategy_tab,
     selected_strategy,
     load_strategy_tab,
+    announcement_name,
 }: TEvents['ce_bot_form'] & TFormStrategy) => {
     Analytics.trackEvent('ce_bot_form', {
         action: ACTION.CLOSE,
@@ -31,6 +32,7 @@ export const rudderStackSendCloseEvent = ({
         quick_strategy_tab,
         strategy_name: getRsStrategyType(selected_strategy),
         load_strategy_tab,
+        announcement_name,
     });
 };
 
diff --git a/packages/bot-web-ui/src/analytics/rudderstack-dashboard.ts b/packages/bot-web-ui/src/analytics/rudderstack-dashboard.ts
index e5782b69afa4..fb2dc5cd7210 100644
--- a/packages/bot-web-ui/src/analytics/rudderstack-dashboard.ts
+++ b/packages/bot-web-ui/src/analytics/rudderstack-dashboard.ts
@@ -18,3 +18,16 @@ export const rudderStackSendAnnouncementClickEvent = ({ announcement_name }: TEv
         announcement_name,
     });
 };
+
+export const rudderStackSendAnnouncementActionEvent = ({
+    announcement_name,
+    announcement_action,
+}: TEvents['ce_bot_form']) => {
+    Analytics.trackEvent('ce_bot_form', {
+        action: ACTION.ANNOUNCEMENT_ACTION,
+        form_name,
+        subform_source: 'dashboard',
+        announcement_name,
+        announcement_action,
+    });
+};
diff --git a/packages/bot-web-ui/src/pages/dashboard/announcements/announcement-dialog.tsx b/packages/bot-web-ui/src/pages/dashboard/announcements/announcement-dialog.tsx
index 4f5a11561bc4..a0b2037e3d1c 100644
--- a/packages/bot-web-ui/src/pages/dashboard/announcements/announcement-dialog.tsx
+++ b/packages/bot-web-ui/src/pages/dashboard/announcements/announcement-dialog.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import { Dialog, Text } from '@deriv/components';
 import { LabelPairedCheckCaptionFillIcon } from '@deriv/quill-icons';
+import { rudderStackSendCloseEvent } from '../../../analytics/rudderstack-common-events';
 import { IconAnnounceModal } from './announcement-components';
 import { TAnnounce, TContentItem } from './config';
 import './announcement-dialog.scss';
@@ -44,7 +45,13 @@ const AnnouncementDialog = ({
             onCancel={handleOnCancel}
             is_mobile_full_width
             has_close_icon
-            onClose={() => setIsAnnounceDialogOpen(false)}
+            onClose={() => {
+                setIsAnnounceDialogOpen(false);
+                rudderStackSendCloseEvent({
+                    subform_name: 'announcements',
+                    announcement_name: id,
+                });
+            }}
             className={is_tablet ? `${base_classname} ${base_classname}--tablet` : base_classname}
         >
             <div className={`${base_classname}__body-text`}>
diff --git a/packages/bot-web-ui/src/pages/dashboard/announcements/announcements.tsx b/packages/bot-web-ui/src/pages/dashboard/announcements/announcements.tsx
index 9969e3838172..28a195d9395b 100644
--- a/packages/bot-web-ui/src/pages/dashboard/announcements/announcements.tsx
+++ b/packages/bot-web-ui/src/pages/dashboard/announcements/announcements.tsx
@@ -8,7 +8,10 @@ import { localize } from '@deriv/translations';
 import { Notifications as Announcement } from '@deriv-com/ui';
 import { useDBotStore } from 'Stores/useDBotStore';
 import { rudderStackSendOpenEvent } from '../../../analytics/rudderstack-common-events';
-import { rudderStackSendAnnouncementClickEvent } from '../../../analytics/rudderstack-dashboard';
+import {
+    rudderStackSendAnnouncementActionEvent,
+    rudderStackSendAnnouncementClickEvent,
+} from '../../../analytics/rudderstack-dashboard';
 import { guide_content } from '../../tutorials/constants';
 import { performButtonAction } from './utils/accumulator-helper-functions';
 import { MessageAnnounce, TitleAnnounce } from './announcement-components';
@@ -105,6 +108,10 @@ const Announcements = observer(({ is_mobile, is_tablet, handleTabChange }: TAnno
     };
 
     const handleOnCancel = () => {
+        rudderStackSendAnnouncementActionEvent({
+            announcement_name: selected_announcement?.announcement.id,
+            announcement_action: selected_announcement?.announcement.cancel_button_text,
+        });
         if (selected_announcement?.switch_tab_on_cancel) {
             handleTabChange(selected_announcement.switch_tab_on_cancel);
             if (selected_announcement.announcement.id === 'ACCUMULATOR_ANNOUNCE') {
@@ -116,6 +123,10 @@ const Announcements = observer(({ is_mobile, is_tablet, handleTabChange }: TAnno
     };
 
     const handleOnConfirm = () => {
+        rudderStackSendAnnouncementActionEvent({
+            announcement_name: selected_announcement?.announcement.id,
+            announcement_action: selected_announcement?.announcement.confirm_button_text,
+        });
         if (selected_announcement?.switch_tab_on_confirm) {
             handleTabChange(selected_announcement.switch_tab_on_confirm);
         }

From 29655f0fc7050ffe129441c7dd19c3992b71007d Mon Sep 17 00:00:00 2001
From: Farabi <farabi@deriv.com>
Date: Tue, 15 Oct 2024 16:53:00 +0800
Subject: [PATCH 3/5] fix: pass announcement name as the main title and subform
 names

---
 packages/bot-web-ui/src/analytics/rudderstack-dashboard.ts | 2 ++
 .../pages/dashboard/announcements/announcement-dialog.tsx  | 2 +-
 .../src/pages/dashboard/announcements/announcements.tsx    | 7 ++++---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/bot-web-ui/src/analytics/rudderstack-dashboard.ts b/packages/bot-web-ui/src/analytics/rudderstack-dashboard.ts
index fb2dc5cd7210..513d8dd84984 100644
--- a/packages/bot-web-ui/src/analytics/rudderstack-dashboard.ts
+++ b/packages/bot-web-ui/src/analytics/rudderstack-dashboard.ts
@@ -14,6 +14,7 @@ export const rudderStackSendAnnouncementClickEvent = ({ announcement_name }: TEv
     Analytics.trackEvent('ce_bot_form', {
         action: ACTION.ANNOUNCEMENT_CLICK,
         form_name,
+        subform_name: 'announcements',
         subform_source: 'dashboard',
         announcement_name,
     });
@@ -26,6 +27,7 @@ export const rudderStackSendAnnouncementActionEvent = ({
     Analytics.trackEvent('ce_bot_form', {
         action: ACTION.ANNOUNCEMENT_ACTION,
         form_name,
+        subform_name: 'announcements',
         subform_source: 'dashboard',
         announcement_name,
         announcement_action,
diff --git a/packages/bot-web-ui/src/pages/dashboard/announcements/announcement-dialog.tsx b/packages/bot-web-ui/src/pages/dashboard/announcements/announcement-dialog.tsx
index a0b2037e3d1c..18cd082c3d94 100644
--- a/packages/bot-web-ui/src/pages/dashboard/announcements/announcement-dialog.tsx
+++ b/packages/bot-web-ui/src/pages/dashboard/announcements/announcement-dialog.tsx
@@ -49,7 +49,7 @@ const AnnouncementDialog = ({
                 setIsAnnounceDialogOpen(false);
                 rudderStackSendCloseEvent({
                     subform_name: 'announcements',
-                    announcement_name: id,
+                    announcement_name: main_title,
                 });
             }}
             className={is_tablet ? `${base_classname} ${base_classname}--tablet` : base_classname}
diff --git a/packages/bot-web-ui/src/pages/dashboard/announcements/announcements.tsx b/packages/bot-web-ui/src/pages/dashboard/announcements/announcements.tsx
index 28a195d9395b..6cce1e704dfb 100644
--- a/packages/bot-web-ui/src/pages/dashboard/announcements/announcements.tsx
+++ b/packages/bot-web-ui/src/pages/dashboard/announcements/announcements.tsx
@@ -47,7 +47,7 @@ const Announcements = observer(({ is_mobile, is_tablet, handleTabChange }: TAnno
         setSelectedAnnouncement(announcement);
         setIsAnnounceDialogOpen(true);
         setIsOpenAnnounceList(prev => !prev);
-        rudderStackSendAnnouncementClickEvent({ announcement_name: announce_id });
+        rudderStackSendAnnouncementClickEvent({ announcement_name: announcement.announcement.main_title });
 
         let data: Record<string, boolean> | null = null;
         data = JSON.parse(localStorage.getItem('bot-announcements') ?? '{}');
@@ -109,7 +109,7 @@ const Announcements = observer(({ is_mobile, is_tablet, handleTabChange }: TAnno
 
     const handleOnCancel = () => {
         rudderStackSendAnnouncementActionEvent({
-            announcement_name: selected_announcement?.announcement.id,
+            announcement_name: selected_announcement?.announcement.main_title,
             announcement_action: selected_announcement?.announcement.cancel_button_text,
         });
         if (selected_announcement?.switch_tab_on_cancel) {
@@ -124,7 +124,7 @@ const Announcements = observer(({ is_mobile, is_tablet, handleTabChange }: TAnno
 
     const handleOnConfirm = () => {
         rudderStackSendAnnouncementActionEvent({
-            announcement_name: selected_announcement?.announcement.id,
+            announcement_name: selected_announcement?.announcement.main_title,
             announcement_action: selected_announcement?.announcement.confirm_button_text,
         });
         if (selected_announcement?.switch_tab_on_confirm) {
@@ -155,6 +155,7 @@ const Announcements = observer(({ is_mobile, is_tablet, handleTabChange }: TAnno
                     if (!is_open_announce_list) {
                         rudderStackSendOpenEvent({
                             subform_name: 'announcements',
+                            subform_source: 'dashboard',
                         });
                     }
                 }}

From 114920cfa5824d12c81a97d07568d8e2e0940a01 Mon Sep 17 00:00:00 2001
From: Farabi <farabi@deriv.com>
Date: Wed, 16 Oct 2024 11:27:31 +0800
Subject: [PATCH 4/5] chore: added load strategy open event on import
 announcement click

---
 .../src/pages/dashboard/announcements/announcements.tsx   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/bot-web-ui/src/pages/dashboard/announcements/announcements.tsx b/packages/bot-web-ui/src/pages/dashboard/announcements/announcements.tsx
index 6cce1e704dfb..62ad8591a985 100644
--- a/packages/bot-web-ui/src/pages/dashboard/announcements/announcements.tsx
+++ b/packages/bot-web-ui/src/pages/dashboard/announcements/announcements.tsx
@@ -127,6 +127,14 @@ const Announcements = observer(({ is_mobile, is_tablet, handleTabChange }: TAnno
             announcement_name: selected_announcement?.announcement.main_title,
             announcement_action: selected_announcement?.announcement.confirm_button_text,
         });
+        if (selected_announcement?.announcement.confirm_button_text === 'Import strategy') {
+            rudderStackSendOpenEvent({
+                subpage_name: 'bot_builder',
+                subform_source: 'announcements',
+                subform_name: 'load_strategy',
+                load_strategy_tab: 'recent',
+            });
+        }
         if (selected_announcement?.switch_tab_on_confirm) {
             handleTabChange(selected_announcement.switch_tab_on_confirm);
         }

From d4b1ed7a187043aace98a755c79187a3c31a1e57 Mon Sep 17 00:00:00 2001
From: Farabi <farabi@deriv.com>
Date: Wed, 16 Oct 2024 12:19:26 +0800
Subject: [PATCH 5/5] fix: call the open load strategy event from config

---
 .../src/pages/dashboard/announcements/announcements.tsx  | 8 --------
 .../src/pages/dashboard/announcements/config.tsx         | 9 +++++++++
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/packages/bot-web-ui/src/pages/dashboard/announcements/announcements.tsx b/packages/bot-web-ui/src/pages/dashboard/announcements/announcements.tsx
index 62ad8591a985..6cce1e704dfb 100644
--- a/packages/bot-web-ui/src/pages/dashboard/announcements/announcements.tsx
+++ b/packages/bot-web-ui/src/pages/dashboard/announcements/announcements.tsx
@@ -127,14 +127,6 @@ const Announcements = observer(({ is_mobile, is_tablet, handleTabChange }: TAnno
             announcement_name: selected_announcement?.announcement.main_title,
             announcement_action: selected_announcement?.announcement.confirm_button_text,
         });
-        if (selected_announcement?.announcement.confirm_button_text === 'Import strategy') {
-            rudderStackSendOpenEvent({
-                subpage_name: 'bot_builder',
-                subform_source: 'announcements',
-                subform_name: 'load_strategy',
-                load_strategy_tab: 'recent',
-            });
-        }
         if (selected_announcement?.switch_tab_on_confirm) {
             handleTabChange(selected_announcement.switch_tab_on_confirm);
         }
diff --git a/packages/bot-web-ui/src/pages/dashboard/announcements/config.tsx b/packages/bot-web-ui/src/pages/dashboard/announcements/config.tsx
index 00d5f7035525..fa82d0fd71d1 100644
--- a/packages/bot-web-ui/src/pages/dashboard/announcements/config.tsx
+++ b/packages/bot-web-ui/src/pages/dashboard/announcements/config.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import { OpenLiveChatLink } from '@deriv/components';
 import { Localize, localize } from '@deriv/translations';
 import { DBOT_TABS } from 'Constants/bot-contents';
+import { rudderStackSendOpenEvent } from '../../../analytics/rudderstack-common-events';
 import { handleOnConfirmAccumulator } from './utils/accumulator-helper-functions';
 import { IconAnnounce } from './announcement-components';
 
@@ -75,6 +76,14 @@ export const ANNOUNCEMENTS: Record<string, TAnnouncement> = {
         should_not_be_cancel: true,
         should_toggle_modal: true,
         switch_tab_on_confirm: DBOT_TABS.BOT_BUILDER,
+        onConfirm: () => {
+            rudderStackSendOpenEvent({
+                subpage_name: 'bot_builder',
+                subform_source: 'announcements',
+                subform_name: 'load_strategy',
+                load_strategy_tab: 'recent',
+            });
+        },
     },
 
     BLOCKLY_ANNOUNCE: {