Al-amin/Red deriv banner missing for vrtc cr accounts with eu ip (#6961)

* Red Deriv banner missing for CR accounts with EU Ip address

* handle QA issue

* Red Deriv banner missing for VRTC(CR) accounts with EU Ip address

Author: alamin-deriv

src/javascript/app/common/deriv_banner.js

@@ -12,73 +12,54 @@ const DerivBanner = (() => {
         el_close_button,
         multiplier_link;
 
-    const onLoad = () => {
+    const redBanner = () => {
         const is_deriv_banner_dismissed = localStorage.getItem('is_deriv_banner_dismissed');
 
-        BinarySocket.wait('authorize', 'website_status', 'landing_company').then(() => {
+        if (!is_deriv_banner_dismissed) {
+            const affiliate_cookie = Cookies.getJSON('affiliate_tracking');
+            let affiliate_token;
 
-            const eu_country = isEuCountrySelected(Client.get('residence')) || isEuCountrySelected(State.getResponse('website_status.clients_country'));
+            if (affiliate_cookie) affiliate_token = affiliate_cookie.t;
+            else {
+                const queryString = window.location.search;
+                const urlParams = new URLSearchParams(queryString);
+                affiliate_token = urlParams.get('t');
+            }
+            
+            el_multiplier_banner_container = getElementById('multiplier_banner_container');
+            multiplier_link = getElementById('multiplier-link');
 
-            if (eu_country) return;
+            const lang = getLanguage().toLowerCase();
+            const multiplier_href = `https://deriv.com/${lang}/trade-types/multiplier/?utm_source=binary&utm_medium=referral&utm_campaign=ww-banner-deriv-1020-en&utm_content=multiplier-banner-synthetic-indices-amplified`;
 
-            if (!is_deriv_banner_dismissed) {
-                const affiliate_cookie = Cookies.getJSON('affiliate_tracking');
-                let affiliate_token;
+            multiplier_link.href = affiliate_token ? `${multiplier_href}&t=${affiliate_token}` : multiplier_href;
 
-                if (affiliate_cookie) affiliate_token = affiliate_cookie.t;
-                else {
-                    const queryString = window.location.search;
-                    const urlParams = new URLSearchParams(queryString);
-                    affiliate_token = urlParams.get('t');
-                }
-            
-                el_multiplier_banner_container = getElementById('multiplier_banner_container');
-                multiplier_link = getElementById('multiplier-link');
+            el_multiplier_banner_container.setVisibility(1);
+            el_close_button = el_multiplier_banner_container.querySelector('.deriv_banner_close') || createElement('div');
+            el_close_button.addEventListener('click', onClose);
+        }
+    };
+
+    const onLoad = () => {
 
-                const lang = getLanguage().toLowerCase();
-                const multiplier_href = `https://deriv.com/${lang}/trade-types/multiplier/?utm_source=binary&utm_medium=referral&utm_campaign=ww-banner-deriv-1020-en&utm_content=multiplier-banner-synthetic-indices-amplified`;
+        BinarySocket.wait('authorize', 'website_status', 'landing_company').then(() => {
 
-                multiplier_link.href = affiliate_token ? `${multiplier_href}&t=${affiliate_token}` : multiplier_href;
+            const eu_country = isEuCountrySelected(Client.get('residence')) || isEuCountrySelected(State.getResponse('website_status.clients_country'));
 
-                el_multiplier_banner_container.setVisibility(1);
-                el_close_button = el_multiplier_banner_container.querySelector('.deriv_banner_close') || createElement('div');
-                el_close_button.addEventListener('click', onClose);
-            }
+            if (eu_country) return;
+            redBanner();
         });
     };
 
     const loginOnLoad = () => {
-        const is_deriv_banner_dismissed = localStorage.getItem('is_deriv_banner_dismissed');
 
         BinarySocket.wait('authorize', 'website_status', 'landing_company').then(() => {
 
             const client_account = Client.get('landing_company_shortcode') === 'svg';
 
             if (!client_account) return;
+            redBanner();
 
-            if (!is_deriv_banner_dismissed) {
-                const affiliate_cookie = Cookies.getJSON('affiliate_tracking');
-                let affiliate_token;
-
-                if (affiliate_cookie) affiliate_token = affiliate_cookie.t;
-                else {
-                    const queryString = window.location.search;
-                    const urlParams = new URLSearchParams(queryString);
-                    affiliate_token = urlParams.get('t');
-                }
-            
-                el_multiplier_banner_container = getElementById('multiplier_banner_container');
-                multiplier_link = getElementById('multiplier-link');
-
-                const lang = getLanguage().toLowerCase();
-                const multiplier_href = `https://deriv.com/${lang}/trade-types/multiplier/?utm_source=binary&utm_medium=referral&utm_campaign=ww-banner-deriv-1020-en&utm_content=multiplier-banner-synthetic-indices-amplified`;
-
-                multiplier_link.href = affiliate_token ? `${multiplier_href}&t=${affiliate_token}` : multiplier_href;
-
-                el_multiplier_banner_container.setVisibility(1);
-                el_close_button = el_multiplier_banner_container.querySelector('.deriv_banner_close') || createElement('div');
-                el_close_button.addEventListener('click', onClose);
-            }
         });
     };
 
@@ -97,6 +78,7 @@ const DerivBanner = (() => {
         onLoad,
         onUnload,
         loginOnLoad,
+        redBanner,
     };
 })();
 

src/javascript/app/common/redirect_banner.js

@@ -1,3 +1,4 @@
+const DerivBanner = require('./deriv_banner');
 const getElementById = require('../../_common/common_functions').getElementById;
 const BinarySocket = require('../base/socket');
 const getLanguage       = require('../../_common/language').get;
@@ -48,13 +49,16 @@ const RedirectBanner = (() => {
             const maltainvest = State.getResponse('authorize.account_list').filter(item => item.landing_company_name === 'maltainvest').length;
             const iom = State.getResponse('authorize.account_list').filter(item => item.landing_company_name === 'iom').length;
             const malta = State.getResponse('authorize.account_list').filter(item => item.landing_company_name === 'malta').length;
+            const svg = State.getResponse('authorize.account_list').filter(item => item.landing_company_name === 'svg').length;
 
             if (eu_country && State.getResponse('authorize.account_list').length === 1) {
                 showBanner();
             } else if (eu_country && virtual_account && maltainvest && !iom && !malta) {
                 showBanner();
             } else if (eu_country && client_account) {
                 showBanner();
+            } else if (svg && virtual_account) {
+                DerivBanner.redBanner();
             }
 
         });