From 097404b0c5cba1df442070149b9167c63aa75b95 Mon Sep 17 00:00:00 2001
From: maryia-matskevich-deriv <maryia.frantsava@binary.com>
Date: Tue, 10 Dec 2024 11:23:53 +0300
Subject: [PATCH 1/3] fix: The button "Import strategy" does not work on the
 "Moving strategies to Deriv Bot"

---
 src/pages/dashboard/announcements/announcements.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/dashboard/announcements/announcements.tsx b/src/pages/dashboard/announcements/announcements.tsx
index bdade419..7bbe51c5 100644
--- a/src/pages/dashboard/announcements/announcements.tsx
+++ b/src/pages/dashboard/announcements/announcements.tsx
@@ -137,7 +137,7 @@ const Announcements = observer(({ is_mobile, is_tablet, handleTabChange }: TAnno
         if (selected_announcement?.should_toggle_qs_modal) {
             setFormVisibility(true);
         }
-        if (selected_announcement?.should_toggle_modal) {
+        if (selected_announcement?.should_toggle_load_modal) {
             toggleLoadModal();
         }
         selected_announcement?.onConfirm?.();

From 8b38343c4adb381da4251a41e6ac149d20d6f846 Mon Sep 17 00:00:00 2001
From: maryia-matskevich-deriv <maryia.frantsava@binary.com>
Date: Wed, 11 Dec 2024 10:57:27 +0300
Subject: [PATCH 2/3] fix: appearance of the tour modal w after we open the
 load modal w and switch to the bot builder

---
 .../dbot-tours/bot-builder-tour/bot-builder-tour-desktop.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/tutorials/dbot-tours/bot-builder-tour/bot-builder-tour-desktop.tsx b/src/pages/tutorials/dbot-tours/bot-builder-tour/bot-builder-tour-desktop.tsx
index a7d87ca5..d9476ea9 100644
--- a/src/pages/tutorials/dbot-tours/bot-builder-tour/bot-builder-tour-desktop.tsx
+++ b/src/pages/tutorials/dbot-tours/bot-builder-tour/bot-builder-tour-desktop.tsx
@@ -10,8 +10,9 @@ import { useTourHandler } from '../useTourHandler';
 
 const BotBuilderTourDesktop = observer(() => {
     const { is_close_tour, is_finished, handleJoyrideCallback, setIsCloseTour } = useTourHandler();
-    const { dashboard } = useStore();
+    const { dashboard, load_modal } = useStore();
     const { active_tab, active_tour, setActiveTour, setTourDialogVisibility } = dashboard;
+    const { is_load_modal_open } = load_modal;
     const token = getSetting('bot_builder_token');
     if (!token && active_tab === 1) setTourDialogVisibility(true);
 
@@ -27,7 +28,7 @@ const BotBuilderTourDesktop = observer(() => {
 
     return (
         <>
-            {!is_finished ? <TourStartDialog /> : <TourEndDialog />}
+            {is_finished ? <TourEndDialog /> : !is_load_modal_open && <TourStartDialog />}
             {active_tour && (
                 <ReactJoyrideWrapper
                     handleCallback={handleJoyrideCallback}

From 33e15f1e4d4fc39cd1420c25dca6d337da1671d0 Mon Sep 17 00:00:00 2001
From: maryia-matskevich-deriv
 <103181650+maryia-matskevich-deriv@users.noreply.github.com>
Date: Wed, 11 Dec 2024 11:27:54 +0300
Subject: [PATCH 3/3] Update
 src/pages/tutorials/dbot-tours/bot-builder-tour/bot-builder-tour-desktop.tsx

Co-authored-by: mayuran-deriv <129507167+mayuran-deriv@users.noreply.github.com>
---
 .../dbot-tours/bot-builder-tour/bot-builder-tour-desktop.tsx    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/tutorials/dbot-tours/bot-builder-tour/bot-builder-tour-desktop.tsx b/src/pages/tutorials/dbot-tours/bot-builder-tour/bot-builder-tour-desktop.tsx
index d9476ea9..e4096221 100644
--- a/src/pages/tutorials/dbot-tours/bot-builder-tour/bot-builder-tour-desktop.tsx
+++ b/src/pages/tutorials/dbot-tours/bot-builder-tour/bot-builder-tour-desktop.tsx
@@ -28,7 +28,7 @@ const BotBuilderTourDesktop = observer(() => {
 
     return (
         <>
-            {is_finished ? <TourEndDialog /> : !is_load_modal_open && <TourStartDialog />}
+            {is_finished ? <TourEndDialog /> : (!is_load_modal_open ? <TourStartDialog />: null)}
             {active_tour && (
                 <ReactJoyrideWrapper
                     handleCallback={handleJoyrideCallback}