From 72441047c33606169fc4d948bdb31c5951a5c9db Mon Sep 17 00:00:00 2001
From: Andrei Dekterev <avdekterev@gmail.com>
Date: Thu, 9 Jun 2022 17:01:12 +0700
Subject: [PATCH] fix(#2504): Change name of subs to lexic and some styles

---
 .../components/CancelSubPopup/index.tsx       |  8 ++---
 .../components/PageSubscriptions/hooks.tsx    |  4 +++
 .../components/PageSubscriptions/index.tsx    | 30 +++++++++++++------
 .../components/PageSubscriptions/styled.tsx   |  4 +--
 src/requests/getUserSubscribes.tsx            |  3 ++
 5 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/src/features/UserAccount/components/CancelSubPopup/index.tsx b/src/features/UserAccount/components/CancelSubPopup/index.tsx
index c0c65f6e..10e2ae82 100644
--- a/src/features/UserAccount/components/CancelSubPopup/index.tsx
+++ b/src/features/UserAccount/components/CancelSubPopup/index.tsx
@@ -43,8 +43,8 @@ export const CancelSubPopup = (props: Props) => {
 
   const {
     access_to,
-    name,
-    option_name,
+    lexic,
+    option_sys_name,
   } = subscribe
 
   return (
@@ -69,12 +69,12 @@ export const CancelSubPopup = (props: Props) => {
                 <T9n t='if_you_cancel' />
               </Text>
               <ScCancelSub>
-                {option_name} — {name}
+                {option_sys_name && `${option_sys_name[0].toUpperCase()}${option_sys_name.slice(1, option_sys_name.length)}`} — <T9n t={lexic} />
               </ScCancelSub>
               <Text>
                 <T9n t='after_canceling' />
                 &nbsp;
-                {access_to && format(new Date(access_to), 'dd.MM.yyyy')}
+                <b>{access_to && format(new Date(access_to), 'dd.MM.yyyy')}</b>
               </Text>
               <Footer>
                 <ScStillCancelBtn
diff --git a/src/features/UserAccount/components/PageSubscriptions/hooks.tsx b/src/features/UserAccount/components/PageSubscriptions/hooks.tsx
index 4369b4ab..b43eee04 100644
--- a/src/features/UserAccount/components/PageSubscriptions/hooks.tsx
+++ b/src/features/UserAccount/components/PageSubscriptions/hooks.tsx
@@ -3,9 +3,12 @@ import { useEffect, useState } from 'react'
 import { getUserSubscribes, Subscribe } from 'requests/getUserSubscribes'
 import { cancelSubscribe } from 'requests/cancelSubscribe'
 
+import { useLexicsStore } from 'features/LexicsStore'
 import { useAuthStore } from 'features/AuthStore'
 
 export const useUserSubscribes = () => {
+  const { addLexicsConfig } = useLexicsStore()
+
   const [selectedSubscribe, setSelectedSubscribe] = useState<Subscribe>({} as Subscribe)
   const [subscribes, setSubscribes] = useState<any>([])
   const [isCancelPopupOpen, setIsCancelPopupOpen] = useState(false)
@@ -40,6 +43,7 @@ export const useUserSubscribes = () => {
       const allSubscribes = (await (getUserSubscribes(user?.profile?.email || '')))
         .sort((a, b) => Date.parse(b.access_to) - Date.parse(a.access_to))
       setSubscribes(allSubscribes)
+      addLexicsConfig(allSubscribes.map(({ lexic }) => lexic))
       setIsFetching(false)
     })()
     // eslint-disable-next-line react-hooks/exhaustive-deps
diff --git a/src/features/UserAccount/components/PageSubscriptions/index.tsx b/src/features/UserAccount/components/PageSubscriptions/index.tsx
index 5cf524a6..66f1bda3 100644
--- a/src/features/UserAccount/components/PageSubscriptions/index.tsx
+++ b/src/features/UserAccount/components/PageSubscriptions/index.tsx
@@ -65,8 +65,8 @@ export const PageSubscriptions = () => {
                 card,
                 is_active,
                 iso,
+                lexic,
                 name,
-                option_name,
                 price,
                 purchase_type,
                 sub_id,
@@ -78,15 +78,24 @@ export const PageSubscriptions = () => {
                 <ScSubscribe key={`${access_to}${name}`}>
                   <ScItem>
                     <T9n t='subscription_plan' className='payment_title' />
-                    <ScText className='payment_plan'>
-                      {option_name} — {name}
+                    <ScText
+                      isActive={is_active}
+                      className='payment_plan'
+                    >
+                      <T9n t={lexic} />
                     </ScText>
                   </ScItem>
                   <ScItemPaymentSum>
                     <ScItem>
                       <T9n t='sum' className='payment_title' />
-                      <ScText>
-                        {iso} {price}
+                      <ScText isActive={is_active}>
+                        {is_active && !hideCancel ? `${iso} ${price}` : '—'}
+                        {is_active && purchase_type === 'subscription' && !hideCancel ? (
+                          <>
+                            /
+                            <T9n t='month' className='payment_plan' />
+                          </>
+                        ) : ''}
                       </ScText>
                     </ScItem>
                     <ScItem>
@@ -98,14 +107,17 @@ export const PageSubscriptions = () => {
                         }
                         className='payment_title'
                       />
-                      <ScText>
-                        {format(new Date(access_to), 'd MMM   yyyy')}
+                      <ScText isActive={is_active}>
+                        {is_active && !hideCancel ? format(new Date(access_to), 'd MMM   yyyy') : '—'}
                       </ScText>
                     </ScItem>
                   </ScItemPaymentSum>
-                  <ScItem>
+                  <ScItem className='isActive'>
                     <T9n t='payment_method' className='payment_title' />
-                    <ScText className='payment_method'>
+                    <ScText
+                      isActive={is_active}
+                      className='payment_method'
+                    >
                       <ScCard>{card}</ScCard>
                       {/* <Icon
                     refIcon='Edit'
diff --git a/src/features/UserAccount/components/PageSubscriptions/styled.tsx b/src/features/UserAccount/components/PageSubscriptions/styled.tsx
index 6e4e95fc..e4f7f0fb 100644
--- a/src/features/UserAccount/components/PageSubscriptions/styled.tsx
+++ b/src/features/UserAccount/components/PageSubscriptions/styled.tsx
@@ -92,8 +92,8 @@ export const ScItem = styled.div`
   }
 `
 
-export const ScText = styled.span`
-  color: #FFFFFF;
+export const ScText = styled.span<({ isActive?: boolean })>`
+  color: ${({ isActive }) => (isActive ? '#FFFFFF' : 'rgba(255, 255, 255, 0.6)')};
   max-width: 560px;
   
   ${isMobileDevice
diff --git a/src/requests/getUserSubscribes.tsx b/src/requests/getUserSubscribes.tsx
index 8d151e74..ba27bc2a 100644
--- a/src/requests/getUserSubscribes.tsx
+++ b/src/requests/getUserSubscribes.tsx
@@ -13,6 +13,9 @@ export type Subscribe = {
   is_access: boolean,
   is_active: boolean,
   iso: string,
+  lexic: number,
+  lexic1: number,
+  lexic2: number,
   name: string,
   option_name: string,
   option_sys_name: string,