From bb75dd1c73b58d0f55b380f9529e5f59371d068c Mon Sep 17 00:00:00 2001
From: Andrei Dekterev <andreidekterev@MacBook-Air-Andrei.local>
Date: Wed, 18 May 2022 21:49:34 +0700
Subject: [PATCH] fix(#2248): change links to terms in useraccount and confirm
 popup

---
 .../AuthServiceApp/components/ConfirmPopup/index.tsx        | 6 ++++--
 src/features/AuthServiceApp/config/lexics.tsx               | 1 +
 src/features/AuthServiceApp/styled.tsx                      | 1 +
 .../UserAccount/components/PersonalInfoForm/index.tsx       | 5 +++--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/features/AuthServiceApp/components/ConfirmPopup/index.tsx b/src/features/AuthServiceApp/components/ConfirmPopup/index.tsx
index d52a60d5..e449235e 100644
--- a/src/features/AuthServiceApp/components/ConfirmPopup/index.tsx
+++ b/src/features/AuthServiceApp/components/ConfirmPopup/index.tsx
@@ -2,6 +2,8 @@ import { T9n } from 'features/T9n'
 
 import { client } from 'features/AuthServiceApp/config/clients'
 
+import { AUTH_SERVICE } from 'config/routes'
+
 import {
   ScBody,
   Modal,
@@ -42,11 +44,11 @@ export const ConfirmPopup = (props: Props) => {
           </ScText>
           <ScText>
             <T9n t='by_clicking' />
-            <ScLink href={client.termsLink} target='_blank'>
+            <ScLink href={`${AUTH_SERVICE}${client.termsLink}`} target='_blank'>
               <T9n t='terms_and_conditions' />
             </ScLink>&nbsp;
             <T9n t='and' />
-            <ScLink href={client.privacyLink} target='_blank'>
+            <ScLink href={`${AUTH_SERVICE}${client.privacyLink}`} target='_blank'>
               <T9n t='privacy_policy_and_statement' />
             </ScLink>
           </ScText>
diff --git a/src/features/AuthServiceApp/config/lexics.tsx b/src/features/AuthServiceApp/config/lexics.tsx
index 0e6ae5f8..ea51c171 100644
--- a/src/features/AuthServiceApp/config/lexics.tsx
+++ b/src/features/AuthServiceApp/config/lexics.tsx
@@ -1,6 +1,7 @@
 export const lexics = {
   accept_cookies: 17203,
   accept_privacy: 17202,
+  and: 17878,
   change_password: 13442,
   check_email: 15907,
   check_password: 15842,
diff --git a/src/features/AuthServiceApp/styled.tsx b/src/features/AuthServiceApp/styled.tsx
index ee892d67..dd92d0be 100644
--- a/src/features/AuthServiceApp/styled.tsx
+++ b/src/features/AuthServiceApp/styled.tsx
@@ -41,6 +41,7 @@ export const CenterBlock = styled.div`
   ${isMobileDevice
     ? css`
         margin-top: 107px;
+        overflow-y: auto;
         @media screen and (orientation: landscape) {
           width: 290px;
           margin: auto;
diff --git a/src/features/UserAccount/components/PersonalInfoForm/index.tsx b/src/features/UserAccount/components/PersonalInfoForm/index.tsx
index 3693b3d8..dddab60f 100644
--- a/src/features/UserAccount/components/PersonalInfoForm/index.tsx
+++ b/src/features/UserAccount/components/PersonalInfoForm/index.tsx
@@ -1,5 +1,6 @@
 import { client } from 'config/clients'
 import { formIds } from 'config/form'
+import { AUTH_SERVICE } from 'config/routes'
 
 import { Combobox } from 'features/Combobox'
 import { Input } from 'features/Common'
@@ -113,13 +114,13 @@ export const PersonalInfoForm = (props: Props) => {
       <PrivacyWrapper>
         <PrivacyPolicyLink
           target='_blank'
-          href={client.termsLink}
+          href={`${AUTH_SERVICE}${client.termsLink}`}
         >
           <T9n t='terms_and_conditions' />
         </PrivacyPolicyLink>
         <PrivacyPolicyLink
           target='_blank'
-          href={client.privacyLink}
+          href={`${AUTH_SERVICE}${client.privacyLink}`}
         >
           <T9n t='privacy_policy_and_statement' />
         </PrivacyPolicyLink>