binary-com · Aug 26, 2021 · Aug 20, 2021 · Aug 20, 2021 · Aug 20, 2021 · Aug 23, 2021
@@ -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: domain_full_url,
+    domain_full_url: domain_full_url,
 })
 export const default_server_url = 'green.binaryws.com'
 

@@ -12,8 +12,13 @@ const CheckboxSpan = styled.span`
         font-size: 1.75rem;
     }
 `
-
-const AgreementLabel = ({ handleChangeCheckbox, isChecked, color }) => {
+const AgreementLabel = ({
+    handleChangeCheckbox,
+    isChecked,
+    color,
+    link_path = 'terms_and_conditions',
+    link_text = 'I agree to the <0>terms and conditions</0>',
+}) => {
     const handleChange = (event) => {
         handleChangeCheckbox(event)
     }
@@ -42,11 +47,11 @@ const AgreementLabel = ({ handleChangeCheckbox, isChecked, color }) => {
             <CheckboxSpan color={color}>
                 <Localize
                     fontSize="var(--text-size-xs)"
-                    translate_text="I agree to the <0>terms and conditions</0>"
+                    translate_text={link_text}
                     components={[
                         <LocalizedLinkText
                             key={0}
-                            type="terms_and_conditions"
+                            type={link_path}
                             external="true"
                             rel="noopener noreferrer"
                             size="14px"
@@ -63,6 +68,8 @@ AgreementLabel.propTypes = {
     color: PropTypes.string,
     handleChangeCheckbox: PropTypes.func,
     isChecked: PropTypes.bool,
+    link_path: PropTypes.string,
+    link_text: PropTypes.string,
 }
 
 export default AgreementLabel
@@ -143,6 +143,8 @@ const deriv_other_products = ['binary', 'smart_trader']
 const deriv_social_platforms = ['blog', 'community', 'api', '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_no_modal = ['terms_and_conditions']
+// !only for  paths without localisation: add item to this array if you need to make an internal link open on a new tab without modal window
+const only_en_new_tab_no_modal = ['tnc/security-and-privacy.pdf']
 
 const getURLFormat = (type, locale, to, affiliate_lang) => {
     if (deriv_app_links.includes(type)) {
@@ -154,10 +156,11 @@ 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}/${type.replace(
-            /_/g,
-            '-',
-        )}`
+        return `${localized_link_url.domain_full_url}${
+            locale === 'en' ? '' : '/' + locale
+        }/${type.replace(/_/g, '-')}`
+    } else if (only_en_new_tab_no_modal.includes(type)) {
+        return `${localized_link_url.domain_full_url}/${type.replace(/_/g, '-')}`
     } else {
         return to
     }
@@ -189,9 +192,14 @@ const ExternalLink = ({
         !affiliate_links.includes(type) &&
         !deriv_app_links.includes(type) &&
         !deriv_social_platforms.includes(type) &&
-        !new_tab_no_modal.includes(type)
+        !new_tab_no_modal.includes(type) &&
+        !only_en_new_tab_no_modal.includes(type)
 
     const default_style = { cursor: 'pointer' }
+    let final_target = target
+    if (new_tab_no_modal.includes(type) || only_en_new_tab_no_modal.includes(type)) {
+        final_target = '__blank'
+    }
 
     const handleClick = (e) => {
         if (show_modal) {
@@ -217,7 +225,7 @@ const ExternalLink = ({
             href={!show_modal ? url : ''}
             onClick={show_modal ? handleClick : null}
             disabled={!mounted}
-            target={new_tab_no_modal.includes(type) ? '__blank' : target}
+            target={final_target}
             rel={rel}
             {...props}
         >