show banner for uk with mf/vitual account

Author: mahdiyeh-deriv

src/banners/banners.es6

@@ -2,36 +2,23 @@ import $banner from "text!./banners.html";
 import liveapi from "../websockets/binary_websockets";
 import "css!banners/banners.css";
 
-export const isEuCountry = (clients_country, landing_company) => {
-  const eu_shortcode_regex = new RegExp("^(maltainvest|malta|iom)$");
-  const eu_excluded_regex = new RegExp("^mt$");
-  const financial_shortcode =
-    (landing_company && landing_company.financial_company)
-      ? landing_company.financial_company.shortcode
-      : "";
-  const gaming_shortcode =
-    (landing_company && landing_company.gaming_company)
-      ? landing_company.gaming_company.shortcode
-      : "";
 
-  return financial_shortcode || gaming_shortcode
-    ? eu_shortcode_regex.test(financial_shortcode) ||
-        eu_shortcode_regex.test(gaming_shortcode)
-    : eu_excluded_regex.test(clients_country);
+const shouldShowBanner = (auth) => {
+  const has_mf  = auth.account_list.filter( item => item.landing_company_name === 'maltainvest').length;
+  const has_mlt = auth.account_list.filter( item => item.landing_company_name === 'malta').length;
+  const has_iom = auth.account_list.filter( item => item.landing_company_name === 'iom').length;
+  const current_loginId =  local_storage.get('authorize').loginid;
+  const getLoginId = loginids().filter( item => item.id === current_loginId);
+  const is_mf = getLoginId[0].is_mf;
+  const is_virtual = getLoginId[0].is_virtual;
+  if (is_mf) {
+    return true;
+  } else if (is_virtual && has_mf && !has_iom && !has_mlt) {
+    return true;
+  }
+  return false;
 };
 
-export const isMFCountry = (landing_company) => {
-  const mf_shortcode_regex = new RegExp("^(maltainvest)$");
-  const gaming_shortcode =
-  (landing_company && landing_company.gaming_company)
-    ? landing_company.gaming_company.shortcode
-    : "";
-
-    return gaming_shortcode 
-    ? mf_shortcode_regex.test(gaming_shortcode) 
-    : false;
-}
-
 export const init = () => {
   const banner = $($banner).i18n();
   const nav = $("body").find("nav");
@@ -43,36 +30,33 @@ export const init = () => {
 
 const showBanner = () => {
   const banner = document.getElementById("close_banner_container");
-  if (local_storage.get("oauth")) {
-    liveapi.cached.authorize().then(() => {
-      const current_loginId =  local_storage.get('authorize').loginid;
-      const getLoginId = loginids().filter( item => item.id === current_loginId);
-      const is_mf_account = getLoginId[0].is_mf;
-      const is_virtual = getLoginId[0].is_virtual;
-      const country = local_storage.get("authorize").country;
-      liveapi.send({ landing_company: country }).then((data) => {
-        const landing_company = data.landing_company;
-        if (isEuCountry(country, landing_company) && 
-        (is_mf_account || (isMFCountry(landing_company) && is_virtual))) {
-          banner.classList.remove("invisible");
-        } else {
-          banner.classList.add("invisible");
-        }
+  liveapi.cached.send({ website_status: 1 }).then((status) => {
+    const ip_country = status.website_status.clients_country;
+      if (local_storage.get("oauth")) {
+      liveapi.cached.authorize().then((res) => {
+        const country = local_storage.get("authorize").country;
+        liveapi.send({ landing_company: country }).then((data) => {
+          const landing_company = data.landing_company;
+          if ((isEuCountry(country, landing_company) && shouldShowBanner(res.authorize))
+          || (loginids().length == 1 && isEuCountrySelected(ip_country))) {
+            banner.classList.remove("invisible");
+          } else {
+            banner.classList.add("invisible");
+          }
+        });
       });
-    });
-  } else {
-    liveapi.send({ website_status: 1 }).then((data) => {
-      const country = data.website_status.clients_country;
-      liveapi.send({ landing_company: country }).then((response) => {
+    } else {
+      liveapi.send({ landing_company: ip_country }).then((response) => {
         const landing_company = response.landing_company;
-        if (isEuCountry(country, landing_company)) {
+        if (isEuCountry(ip_country, landing_company)) {
           banner.classList.remove("invisible");
         } else {
           banner.classList.add("invisible");
         }
       });
-    });
-  }
+    }
+  })
+  
 };
 
 liveapi.events.on("login", () => {
@@ -87,5 +71,4 @@ liveapi.events.on("switch_account", () => {
 
 export default {
   init,
-  isEuCountry
 };

src/common/util.js

@@ -525,3 +525,58 @@ function getDerivUrl(page) {
 
   return deriv_url;
 }
+
+function isEuCountry(clients_country, landing_company) {
+  var eu_shortcode_regex = new RegExp("^(maltainvest|malta|iom)$");
+  var eu_excluded_regex = new RegExp("^mt$");
+  var financial_shortcode =
+    (landing_company && landing_company.financial_company)
+      ? landing_company.financial_company.shortcode
+      : "";
+  var gaming_shortcode =
+    (landing_company && landing_company.gaming_company)
+      ? landing_company.gaming_company.shortcode
+      : "";
+
+  return financial_shortcode || gaming_shortcode
+    ? eu_shortcode_regex.test(financial_shortcode) ||
+        eu_shortcode_regex.test(gaming_shortcode)
+    : eu_excluded_regex.test(clients_country);
+}
+
+function isEuCountrySelected(selected_country) {
+  return eu_countries.includes(selected_country)
+}
+
+var eu_countries = [
+  'it',
+  'de',
+  'fr',
+  'lu',
+  'gr',
+  'mf',
+  'es',
+  'sk',
+  'lt',
+  'nl',
+  'at',
+  'bg',
+  'si',
+  'cy',
+  'be',
+  'ro',
+  'hr',
+  'pt',
+  'pl',
+  'lv',
+  'ee',
+  'cz',
+  'fi',
+  'hu',
+  'dk',
+  'se',
+  'ie',
+  'im',
+  'gb',
+  'mt',
+];