Al-amin/removed UK/EU redirection flag (#2721)

alamin-deriv · web-flow · commit 419c2a48ad6e · 2022-03-12T11:09:03.000+04:00
* removed redirection flag

* refactor: Removed UK redirection logic

* fixed soundCloud error
diff --git a/src/common/utility.js b/src/common/utility.js
@@ -425,7 +425,6 @@ export const useCallbackRef = (callback) => {
     return callback_ref
 }
 
-const uk_subdomain_countries = ['gb']
 const eu_subdomain_countries = ['nl']
 
 const redirect = (subdomain) => {
@@ -440,23 +439,11 @@ const redirectToDeriv = (full_domain) => {
 export const handleDerivRedirect = (country, subdomain) => {
     if (eu_subdomain_countries.includes(country)) {
         redirect(subdomain.includes('staging') ? 'staging-eu' : 'eu')
-    } else if (uk_subdomain_countries.includes(country)) {
-        redirect(subdomain.includes('staging') ? 'staging-uk' : 'uk')
     }
 }
 
-const handleUKRedirect = (country, subdomain, full_domain) => {
-    if (eu_subdomain_countries.includes(country)) {
-        redirect(subdomain.includes('staging') ? 'staging-eu' : 'eu')
-    } else if (!uk_subdomain_countries.includes(country)) {
-        redirectToDeriv(full_domain)
-    }
-}
-
-const handleEURedirect = (country, subdomain, full_domain) => {
-    if (uk_subdomain_countries.includes(country)) {
-        redirect(subdomain.includes('staging') ? 'staging-uk' : 'uk')
-    } else if (!eu_subdomain_countries.includes(country)) {
+const handleEURedirect = (country, full_domain) => {
+    if (!eu_subdomain_countries.includes(country)) {
         redirectToDeriv(full_domain)
     }
 }
@@ -465,12 +452,9 @@ export const handleRedirect = (subdomain, residence, current_client_country, ful
     const country = residence ? residence : current_client_country
 
     const eu_domains = ['eu', 'staging-eu']
-    const uk_domains = ['uk', 'staging-uk']
 
     if (eu_domains.includes(subdomain)) {
-        handleEURedirect(country, subdomain, full_domain)
-    } else if (uk_domains.includes(subdomain)) {
-        handleUKRedirect(country, subdomain, full_domain)
+        handleEURedirect(country, full_domain)
     } else {
         handleDerivRedirect(country, subdomain)
     }
diff --git a/src/components/layout/layout.js b/src/components/layout/layout.js
@@ -156,12 +156,9 @@ const Layout = ({
     const residence = client_information_cookie.get('residence')
 
     React.useEffect(() => {
-        const is_redirection_enabled = localStorage['is_redirection_enabled']
         const subdomain = window.location.hostname.split('.').slice(0, -2).join('.')
 
-        if (is_redirection_enabled) {
-            handleRedirect(subdomain, residence, current_client_country, window.location.hostname)
-        }
+        handleRedirect(subdomain, residence, current_client_country, window.location.hostname)
     }, [website_status])
 
     const onAccept = () => {
