From 1ef772aa885af20da54fc9159ed533bbcc8194f8 Mon Sep 17 00:00:00 2001
From: Nikolai Berestevich <nikolai.berestevich@regentmarkets.com>
Date: Mon, 19 Jul 2021 11:07:41 +0300
Subject: [PATCH 1/8] nikolai.berestevich/fix/link in the agreement-label 38541

---
 src/components/custom/_agreement-label.js | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/components/custom/_agreement-label.js b/src/components/custom/_agreement-label.js
index 1a6a51ed853..430595f218b 100644
--- a/src/components/custom/_agreement-label.js
+++ b/src/components/custom/_agreement-label.js
@@ -1,7 +1,7 @@
-import React, { useState, useEffect } from 'react'
+import React from 'react'
 import PropTypes from 'prop-types'
 import styled from 'styled-components'
-import { LinkText, Checkbox } from 'components/elements'
+import { Checkbox, LocalizedLinkText } from 'components/elements'
 import { Localize } from 'components/localization'
 import device from 'themes/device.js'
 
@@ -12,19 +12,12 @@ const CheckboxSpan = styled.span`
         font-size: 1.75rem;
     }
 `
-const AgreementLabel = ({ handleChangeCheckbox, isChecked, color }) => {
-    const [language_code, setLanguageCode] = useState('en')
-
-    useEffect(() => {
-        setLanguageCode(localStorage.getItem('i18n'))
-    }, [])
 
+const AgreementLabel = ({ handleChangeCheckbox, isChecked, color }) => {
     const handleChange = (event) => {
         handleChangeCheckbox(event)
     }
 
-    const url = `/${language_code}/terms-and-conditions/`
-
     return (
         <label
             style={{
@@ -51,13 +44,12 @@ const AgreementLabel = ({ handleChangeCheckbox, isChecked, color }) => {
                     fontSize="var(--text-size-xs)"
                     translate_text="I agree to the <0>terms and conditions</0>"
                     components={[
-                        <LinkText
+                        <LocalizedLinkText
                             key={0}
-                            href={url}
+                            to="/terms-and-conditions/"
                             target="_blank"
                             size="14px"
                             color="red"
-                            rel="noopener noreferrer"
                         />,
                     ]}
                 />

From 60bf042a622e48eee578d0921ceb052f15bc12aa Mon Sep 17 00:00:00 2001
From: Nikolai Berestevich <nikolai.berestevich@regentmarkets.com>
Date: Mon, 19 Jul 2021 16:06:10 +0300
Subject: [PATCH 2/8] nikolai.berestevich/fix/link in the agreement-label 38541

---
 src/components/custom/_agreement-label.js     | 8 ++++++--
 src/components/localization/localized-link.js | 7 +++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/components/custom/_agreement-label.js b/src/components/custom/_agreement-label.js
index 430595f218b..064414cb4dd 100644
--- a/src/components/custom/_agreement-label.js
+++ b/src/components/custom/_agreement-label.js
@@ -45,11 +45,15 @@ const AgreementLabel = ({ handleChangeCheckbox, isChecked, color }) => {
                     translate_text="I agree to the <0>terms and conditions</0>"
                     components={[
                         <LocalizedLinkText
+                            path="terms-and-conditions"
                             key={0}
-                            to="/terms-and-conditions/"
-                            target="_blank"
+                            type="terms-and-conditions"
+                            external="true"
+                            to="terms-and-conditions"
                             size="14px"
                             color="red"
+                            target="_blank"
+                            rel="noopener noreferrer"
                         />,
                     ]}
                 />
diff --git a/src/components/localization/localized-link.js b/src/components/localization/localized-link.js
index 6c12d7aa24d..5a84ed09624 100644
--- a/src/components/localization/localized-link.js
+++ b/src/components/localization/localized-link.js
@@ -141,6 +141,8 @@ const affiliate_links = ['affiliate_sign_in', 'affiliate_sign_up']
 const deriv_app_links = ['dbot', 'deriv_app', 'mt5', 'derivx']
 const deriv_other_products = ['binary', 'smart_trader']
 const deriv_social_platforms = ['blog', 'community', 'developers', 'zoho']
+// add item to this array if you need to make external link without modal window
+const deriv_new_page_links = ['terms-and-conditions']
 
 const getURLFormat = (type, locale, to, affiliate_lang) => {
     if (deriv_app_links.includes(type)) {
@@ -181,7 +183,8 @@ const ExternalLink = ({
         !is_mail_link &&
         !affiliate_links.includes(type) &&
         !deriv_app_links.includes(type) &&
-        !deriv_social_platforms.includes(type)
+        !deriv_social_platforms.includes(type) &&
+        !deriv_new_page_links.includes(type)
 
     const default_style = { cursor: 'pointer' }
 
@@ -206,7 +209,7 @@ const ExternalLink = ({
         <StyledAnchor
             style={style ? style : default_style}
             aria-label={aria_label}
-            href={!show_modal ? url : ''}
+            href={!show_modal || deriv_new_page_links.includes(type) ? url : ''}
             onClick={handleClick}
             disabled={!mounted}
             target={target}

From 1d8c3098d7e338dcc255dd0b0b2d5d68df7cecf0 Mon Sep 17 00:00:00 2001
From: Nikolai Berestevich <nikolai.berestevich@regentmarkets.com>
Date: Mon, 19 Jul 2021 16:36:55 +0300
Subject: [PATCH 3/8] nikolai.berestevich/fix/link in the agreement-label 38541

---
 src/components/localization/localized-link.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/localization/localized-link.js b/src/components/localization/localized-link.js
index 5a84ed09624..7b0ad63f651 100644
--- a/src/components/localization/localized-link.js
+++ b/src/components/localization/localized-link.js
@@ -142,7 +142,7 @@ const deriv_app_links = ['dbot', 'deriv_app', 'mt5', 'derivx']
 const deriv_other_products = ['binary', 'smart_trader']
 const deriv_social_platforms = ['blog', 'community', 'developers', 'zoho']
 // add item to this array if you need to make external link without modal window
-const deriv_new_page_links = ['terms-and-conditions']
+const deriv_new_window_links = ['terms-and-conditions']
 
 const getURLFormat = (type, locale, to, affiliate_lang) => {
     if (deriv_app_links.includes(type)) {
@@ -184,7 +184,7 @@ const ExternalLink = ({
         !affiliate_links.includes(type) &&
         !deriv_app_links.includes(type) &&
         !deriv_social_platforms.includes(type) &&
-        !deriv_new_page_links.includes(type)
+        !deriv_new_window_links.includes(type)
 
     const default_style = { cursor: 'pointer' }
 
@@ -209,7 +209,7 @@ const ExternalLink = ({
         <StyledAnchor
             style={style ? style : default_style}
             aria-label={aria_label}
-            href={!show_modal || deriv_new_page_links.includes(type) ? url : ''}
+            href={!show_modal || deriv_new_window_links.includes(type) ? url : ''}
             onClick={handleClick}
             disabled={!mounted}
             target={target}

From ce57e502a1e37056474464bc00d8da27fac0ccb1 Mon Sep 17 00:00:00 2001
From: Nikolai Berestevich <nikolai.berestevich@regentmarkets.com>
Date: Wed, 21 Jul 2021 11:08:56 +0300
Subject: [PATCH 4/8] nikolai.berestevich/fix/link of terms  update

---
 src/components/custom/_agreement-label.js     | 6 +++---
 src/components/localization/localized-link.js | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/custom/_agreement-label.js b/src/components/custom/_agreement-label.js
index 064414cb4dd..26e9399ddca 100644
--- a/src/components/custom/_agreement-label.js
+++ b/src/components/custom/_agreement-label.js
@@ -45,15 +45,15 @@ const AgreementLabel = ({ handleChangeCheckbox, isChecked, color }) => {
                     translate_text="I agree to the <0>terms and conditions</0>"
                     components={[
                         <LocalizedLinkText
-                            path="terms-and-conditions"
                             key={0}
                             type="terms-and-conditions"
                             external="true"
+                            target="_blank"
+                            path="terms-and-conditions"
                             to="terms-and-conditions"
+                            rel="noopener noreferrer"
                             size="14px"
                             color="red"
-                            target="_blank"
-                            rel="noopener noreferrer"
                         />,
                     ]}
                 />
diff --git a/src/components/localization/localized-link.js b/src/components/localization/localized-link.js
index 7b0ad63f651..cc97e1094a0 100644
--- a/src/components/localization/localized-link.js
+++ b/src/components/localization/localized-link.js
@@ -142,7 +142,7 @@ const deriv_app_links = ['dbot', 'deriv_app', 'mt5', 'derivx']
 const deriv_other_products = ['binary', 'smart_trader']
 const deriv_social_platforms = ['blog', 'community', 'developers', 'zoho']
 // add item to this array if you need to make external link without modal window
-const deriv_new_window_links = ['terms-and-conditions']
+const new_tab = ['terms-and-conditions']
 
 const getURLFormat = (type, locale, to, affiliate_lang) => {
     if (deriv_app_links.includes(type)) {
@@ -184,7 +184,7 @@ const ExternalLink = ({
         !affiliate_links.includes(type) &&
         !deriv_app_links.includes(type) &&
         !deriv_social_platforms.includes(type) &&
-        !deriv_new_window_links.includes(type)
+        !new_tab.includes(type)
 
     const default_style = { cursor: 'pointer' }
 
@@ -209,7 +209,7 @@ const ExternalLink = ({
         <StyledAnchor
             style={style ? style : default_style}
             aria-label={aria_label}
-            href={!show_modal || deriv_new_window_links.includes(type) ? url : ''}
+            href={!show_modal ? url : ''}
             onClick={handleClick}
             disabled={!mounted}
             target={target}

From 91cf31999dd19cba98f32fffc6740429431ba789 Mon Sep 17 00:00:00 2001
From: Nikolai Berestevich <nikolai.berestevich@regentmarkets.com>
Date: Wed, 21 Jul 2021 15:00:40 +0300
Subject: [PATCH 5/8] nikolai.berestevich/fix/link of terms  update

---
 src/common/constants.js                       | 2 ++
 src/components/custom/_agreement-label.js     | 5 +++--
 src/components/localization/localized-link.js | 4 +++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/common/constants.js b/src/common/constants.js
index eef2545d524..86e99a4cfde 100644
--- a/src/common/constants.js
+++ b/src/common/constants.js
@@ -28,6 +28,7 @@ export const affiliate_signup_url = `https://login.${domain_url}/signup.php`
 export const affiliate_signin_url = `https://login.${domain_url}/signin.php`
 export const community_url = `https://community.${deriv_com_url}`
 export const oauth_url = `https://oauth.${domain_url}`
+export const terms_and_conditions_url = `https://${domain_url}`
 
 export const application_id = 'f0aef779-d9ec-4517-807e-a84c683c4265'
 export const besquare_signup_url =
@@ -75,6 +76,7 @@ export const localized_link_url = Object.freeze({
     mt5: deriv_mt5_app_url,
     smart_trader: smarttrader_url,
     zoho: zoho_url,
+    'terms-and-conditions': terms_and_conditions_url,
 })
 export const default_server_url = 'green.binaryws.com'
 
diff --git a/src/components/custom/_agreement-label.js b/src/components/custom/_agreement-label.js
index 26e9399ddca..956d9fc138b 100644
--- a/src/components/custom/_agreement-label.js
+++ b/src/components/custom/_agreement-label.js
@@ -49,8 +49,9 @@ const AgreementLabel = ({ handleChangeCheckbox, isChecked, color }) => {
                             type="terms-and-conditions"
                             external="true"
                             target="_blank"
-                            path="terms-and-conditions"
-                            to="terms-and-conditions"
+                            // path="terms-and-conditions"
+                            // to=""
+                            // affiliate_lang=
                             rel="noopener noreferrer"
                             size="14px"
                             color="red"
diff --git a/src/components/localization/localized-link.js b/src/components/localization/localized-link.js
index cc97e1094a0..0dd39166b8d 100644
--- a/src/components/localization/localized-link.js
+++ b/src/components/localization/localized-link.js
@@ -141,7 +141,7 @@ const affiliate_links = ['affiliate_sign_in', 'affiliate_sign_up']
 const deriv_app_links = ['dbot', 'deriv_app', 'mt5', 'derivx']
 const deriv_other_products = ['binary', 'smart_trader']
 const deriv_social_platforms = ['blog', 'community', 'developers', 'zoho']
-// add item to this array if you need to make external link without modal window
+// add item to this array if you need to make an internal link open on a new tab without modal window
 const new_tab = ['terms-and-conditions']
 
 const getURLFormat = (type, locale, to, affiliate_lang) => {
@@ -153,6 +153,8 @@ const getURLFormat = (type, locale, to, affiliate_lang) => {
         return `${localized_link_url[type]}/${getThaiExcludedLocale(locale)}/${to}.html`
     } else if (deriv_social_platforms.includes(type)) {
         return `${localized_link_url[type]}${to}`
+    } else if (new_tab.includes(type)) {
+        return `${localized_link_url[type]}${locale === 'en' ? '' : '/' + locale}/${type}`
     } else {
         return to
     }

From 46b0e35790677bf2a6cffb8c53a35c2870e62c2e Mon Sep 17 00:00:00 2001
From: Nikolai Berestevich <nikolai.berestevich@regentmarkets.com>
Date: Thu, 22 Jul 2021 10:09:20 +0300
Subject: [PATCH 6/8] nikolai.berestevich/fix/link of terms update

---
 src/common/constants.js                       |  4 ++--
 src/components/custom/_agreement-label.js     |  7 ++-----
 src/components/localization/localized-link.js | 12 +++++++-----
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/common/constants.js b/src/common/constants.js
index 86e99a4cfde..d40ec91adc5 100644
--- a/src/common/constants.js
+++ b/src/common/constants.js
@@ -13,6 +13,7 @@ const domain_url =
         : deriv_com_url
 
 // URL
+export const domain_full_url = `https://${domain_url}`
 export const deriv_app_id = domain_url === deriv_com_url ? deriv_com_app_id : deriv_me_app_id
 export const deriv_app_url = `https://app.${domain_url}`
 export const deriv_developer_url = `https://developers.${domain_url}`
@@ -28,7 +29,6 @@ export const affiliate_signup_url = `https://login.${domain_url}/signup.php`
 export const affiliate_signin_url = `https://login.${domain_url}/signin.php`
 export const community_url = `https://community.${deriv_com_url}`
 export const oauth_url = `https://oauth.${domain_url}`
-export const terms_and_conditions_url = `https://${domain_url}`
 
 export const application_id = 'f0aef779-d9ec-4517-807e-a84c683c4265'
 export const besquare_signup_url =
@@ -76,7 +76,7 @@ export const localized_link_url = Object.freeze({
     mt5: deriv_mt5_app_url,
     smart_trader: smarttrader_url,
     zoho: zoho_url,
-    'terms-and-conditions': terms_and_conditions_url,
+    terms_and_conditions: domain_full_url,
 })
 export const default_server_url = 'green.binaryws.com'
 
diff --git a/src/components/custom/_agreement-label.js b/src/components/custom/_agreement-label.js
index 956d9fc138b..d9a593bc79e 100644
--- a/src/components/custom/_agreement-label.js
+++ b/src/components/custom/_agreement-label.js
@@ -46,12 +46,9 @@ const AgreementLabel = ({ handleChangeCheckbox, isChecked, color }) => {
                     components={[
                         <LocalizedLinkText
                             key={0}
-                            type="terms-and-conditions"
+                            type="terms_and_conditions"
                             external="true"
-                            target="_blank"
-                            // path="terms-and-conditions"
-                            // to=""
-                            // affiliate_lang=
+                            // target="_blank"
                             rel="noopener noreferrer"
                             size="14px"
                             color="red"
diff --git a/src/components/localization/localized-link.js b/src/components/localization/localized-link.js
index 0dd39166b8d..5c59d6a9917 100644
--- a/src/components/localization/localized-link.js
+++ b/src/components/localization/localized-link.js
@@ -142,7 +142,7 @@ const deriv_app_links = ['dbot', 'deriv_app', 'mt5', 'derivx']
 const deriv_other_products = ['binary', 'smart_trader']
 const deriv_social_platforms = ['blog', 'community', 'developers', 'zoho']
 // add item to this array if you need to make an internal link open on a new tab without modal window
-const new_tab = ['terms-and-conditions']
+const new_tab_no_modal = ['terms_and_conditions']
 
 const getURLFormat = (type, locale, to, affiliate_lang) => {
     if (deriv_app_links.includes(type)) {
@@ -153,8 +153,10 @@ const getURLFormat = (type, locale, to, affiliate_lang) => {
         return `${localized_link_url[type]}/${getThaiExcludedLocale(locale)}/${to}.html`
     } else if (deriv_social_platforms.includes(type)) {
         return `${localized_link_url[type]}${to}`
-    } else if (new_tab.includes(type)) {
-        return `${localized_link_url[type]}${locale === 'en' ? '' : '/' + locale}/${type}`
+    } else if (new_tab_no_modal.includes(type)) {
+        return `${localized_link_url[type]}${
+            locale === 'en' ? '' : '/' + locale
+        }/terms-and-conditions`
     } else {
         return to
     }
@@ -186,7 +188,7 @@ const ExternalLink = ({
         !affiliate_links.includes(type) &&
         !deriv_app_links.includes(type) &&
         !deriv_social_platforms.includes(type) &&
-        !new_tab.includes(type)
+        !new_tab_no_modal.includes(type)
 
     const default_style = { cursor: 'pointer' }
 
@@ -214,7 +216,7 @@ const ExternalLink = ({
             href={!show_modal ? url : ''}
             onClick={handleClick}
             disabled={!mounted}
-            target={target}
+            target={new_tab_no_modal.includes(type) ? '__blank' : target}
             rel={rel}
             {...props}
         >

From 3082ad467043736a2fe6ce907db8bb3ad46fa95a Mon Sep 17 00:00:00 2001
From: Nikolai Berestevich <nikolai.berestevich@regentmarkets.com>
Date: Thu, 22 Jul 2021 10:13:28 +0300
Subject: [PATCH 7/8] nikolai.berestevich/fix/link of terms update

---
 src/components/custom/_agreement-label.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/custom/_agreement-label.js b/src/components/custom/_agreement-label.js
index d9a593bc79e..a43b9a2902b 100644
--- a/src/components/custom/_agreement-label.js
+++ b/src/components/custom/_agreement-label.js
@@ -48,7 +48,6 @@ const AgreementLabel = ({ handleChangeCheckbox, isChecked, color }) => {
                             key={0}
                             type="terms_and_conditions"
                             external="true"
-                            // target="_blank"
                             rel="noopener noreferrer"
                             size="14px"
                             color="red"

From 185d59efe482e54d6eda182c13607fe9ece8eba9 Mon Sep 17 00:00:00 2001
From: Nikolai Berestevich <nikolai.berestevich@regentmarkets.com>
Date: Thu, 22 Jul 2021 10:26:34 +0300
Subject: [PATCH 8/8] nikolai.berestevich/fix/link of terms update

---
 src/components/localization/localized-link.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/localization/localized-link.js b/src/components/localization/localized-link.js
index 5c59d6a9917..a1a3b3d398e 100644
--- a/src/components/localization/localized-link.js
+++ b/src/components/localization/localized-link.js
@@ -154,9 +154,10 @@ const getURLFormat = (type, locale, to, affiliate_lang) => {
     } else if (deriv_social_platforms.includes(type)) {
         return `${localized_link_url[type]}${to}`
     } else if (new_tab_no_modal.includes(type)) {
-        return `${localized_link_url[type]}${
-            locale === 'en' ? '' : '/' + locale
-        }/terms-and-conditions`
+        return `${localized_link_url[type]}${locale === 'en' ? '' : '/' + locale}/${type.replace(
+            /_/g,
+            '-',
+        )}`
     } else {
         return to
     }