From c49a7d988ecd034404adfa4933509d1035725a9c Mon Sep 17 00:00:00 2001 From: Sandeep Date: Fri, 19 Jul 2024 17:46:14 +0800 Subject: [PATCH 1/5] chore: :fire: updated migration content --- src/components/Banner/fixed-dbot-banner.jsx | 11 +++++++---- src/components/Banner/move-to-dbot-banner.jsx | 14 ++++++++++---- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/components/Banner/fixed-dbot-banner.jsx b/src/components/Banner/fixed-dbot-banner.jsx index 790bdc2f3..8a4351781 100644 --- a/src/components/Banner/fixed-dbot-banner.jsx +++ b/src/components/Banner/fixed-dbot-banner.jsx @@ -11,10 +11,13 @@ const FixedDbotBanner = () => ( {translate('Important: ')} - {translate('Binary Bot will be discontinued soon. ')} - - {translate('Upgrade to Deriv Bot')} - + {translate('Binary Bot will be discontinued on')} + + {translate('31 August 2024.')} + + {translate('Upgrade to Deriv Bot')} + + {translate(' to continue trading.')} diff --git a/src/components/Banner/move-to-dbot-banner.jsx b/src/components/Banner/move-to-dbot-banner.jsx index 2534f767f..51e0a87df 100644 --- a/src/components/Banner/move-to-dbot-banner.jsx +++ b/src/components/Banner/move-to-dbot-banner.jsx @@ -39,7 +39,7 @@ const shouldShowPopup = () => { const MoveToDbotBanner = () => { const container_class = 'mv-dbot-banner'; - const [open_modal, setOpenModal] = useState(false); + const [open_modal, setOpenModal] = useState(true); useEffect(() => { try { @@ -72,14 +72,20 @@ const MoveToDbotBanner = () => {
move to deriv
-
{translate('Binary bot is retiring soon')}
+
+ {translate('Binary bot is retiring on 31 August 2024')}{' '} +
-

{translate('Binary bot will be discontinued soon.')}

{translate( - 'Import your existing strategies (XML files) to Deriv Bot today and enjoy a faster, more efficient trading experience with advanced features.' + 'Follow these steps to keep trading with your favourite strategies on Deriv Bot:' )}

+

{translate('1. Download your Binary Bot strategy in XML format.')}

+

{translate('2. Switch to Deriv Bot and import your strategy.')}

+

{translate('3. Run your updated strategy to check its performance.')}

+

{translate('4. Save the updated strategy for quicker re-imports.')}

+

{translate('Upgrade today and experience seamless trading on Deriv Bot.')}

From 0bf51886a5b18655904a8a7524199ac2009184ab Mon Sep 17 00:00:00 2001 From: Sandeep Date: Fri, 19 Jul 2024 17:54:04 +0800 Subject: [PATCH 2/5] chore: :fire: updated var to retrigger the popup after content update --- src/components/Banner/move-to-dbot-banner.jsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/Banner/move-to-dbot-banner.jsx b/src/components/Banner/move-to-dbot-banner.jsx index 51e0a87df..6157e7e27 100644 --- a/src/components/Banner/move-to-dbot-banner.jsx +++ b/src/components/Banner/move-to-dbot-banner.jsx @@ -8,7 +8,7 @@ import { visitDerivBot } from './redirect-to-dbot'; import './move-to-dbot-banner.scss'; const updateLastPopupTime = () => { - localStorage.setItem('last_deriv_redirect_popup_time', new Date().toString()); + localStorage.setItem('migration_popup_timer', new Date().toString()); }; const daysBetween = (date1, date2) => { @@ -18,15 +18,15 @@ const daysBetween = (date1, date2) => { }; const shouldShowPopup = () => { - const last_deriv_redirect_popup_time = localStorage.getItem('last_deriv_redirect_popup_time'); + const migration_popup_timer = localStorage.getItem('migration_popup_timer'); - if (!last_deriv_redirect_popup_time) { + if (!migration_popup_timer) { updateLastPopupTime(); return true; } const allowed_delay = 1; // One week in days - const last_popup_date = new Date(last_deriv_redirect_popup_time); + const last_popup_date = new Date(migration_popup_timer); const current_date = new Date(); if (daysBetween(last_popup_date, current_date) >= allowed_delay) { From d05d39cbc74d502ba65c0efc41f0fd6e4795ee02 Mon Sep 17 00:00:00 2001 From: Sandeep Date: Mon, 22 Jul 2024 16:09:39 +0800 Subject: [PATCH 3/5] fix: :fire: updated list style and indentation --- src/components/Banner/move-to-dbot-banner.jsx | 10 ++++++---- src/components/Banner/move-to-dbot-banner.scss | 5 +++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/components/Banner/move-to-dbot-banner.jsx b/src/components/Banner/move-to-dbot-banner.jsx index 6157e7e27..4323470e2 100644 --- a/src/components/Banner/move-to-dbot-banner.jsx +++ b/src/components/Banner/move-to-dbot-banner.jsx @@ -81,10 +81,12 @@ const MoveToDbotBanner = () => { 'Follow these steps to keep trading with your favourite strategies on Deriv Bot:' )}

-

{translate('1. Download your Binary Bot strategy in XML format.')}

-

{translate('2. Switch to Deriv Bot and import your strategy.')}

-

{translate('3. Run your updated strategy to check its performance.')}

-

{translate('4. Save the updated strategy for quicker re-imports.')}

+
    +
  1. {translate('Download your Binary Bot strategy in XML format.')}
    2. +
  2. {translate('Switch to Deriv Bot and import your strategy.')}
    3. +
  3. {translate('Run your updated strategy to check its performance.')}
    4. +
  4. {translate('Save the updated strategy for quicker re-imports.')}
    5. +

{translate('Upgrade today and experience seamless trading on Deriv Bot.')}

diff --git a/src/components/Banner/move-to-dbot-banner.scss b/src/components/Banner/move-to-dbot-banner.scss index f4e030d76..f23eeb3ae 100644 --- a/src/components/Banner/move-to-dbot-banner.scss +++ b/src/components/Banner/move-to-dbot-banner.scss @@ -44,4 +44,9 @@ justify-content: center; margin-bottom: 16px; } + + &__orderd-list { + margin: 0; + padding: 0 16px; + } } From 6860c7a1ecee776767657653a36a3ee25cf0d690 Mon Sep 17 00:00:00 2001 From: Sandeep Date: Mon, 22 Jul 2024 16:13:59 +0800 Subject: [PATCH 4/5] chore: :fire: removed unwanted space --- src/components/Banner/move-to-dbot-banner.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Banner/move-to-dbot-banner.jsx b/src/components/Banner/move-to-dbot-banner.jsx index 4323470e2..a43c86907 100644 --- a/src/components/Banner/move-to-dbot-banner.jsx +++ b/src/components/Banner/move-to-dbot-banner.jsx @@ -73,7 +73,7 @@ const MoveToDbotBanner = () => { move to deriv
- {translate('Binary bot is retiring on 31 August 2024')}{' '} + {translate('Binary bot is retiring on 31 August 2024')}

From 79d4fd2416fb55a3a4f27a0471b4c097d83afb45 Mon Sep 17 00:00:00 2001 From: Sandeep Date: Tue, 23 Jul 2024 10:35:24 +0800 Subject: [PATCH 5/5] fix: :fire: made the url bold --- src/components/Banner/fixed-dbot-banner.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/Banner/fixed-dbot-banner.scss b/src/components/Banner/fixed-dbot-banner.scss index 5770bed30..1d592c2a9 100644 --- a/src/components/Banner/fixed-dbot-banner.scss +++ b/src/components/Banner/fixed-dbot-banner.scss @@ -28,6 +28,7 @@ &__visit-deriv-bot { color: var(--text-prominent); text-decoration: underline; + font-weight: bold; &:hover { text-decoration: underline; }