From f677b0d8409cc428819cde7aac32bc290a1f3342 Mon Sep 17 00:00:00 2001
From: Valentyna Dudchak <dudchak.valya@gmail.com>
Date: Sun, 24 Nov 2024 18:27:53 +0200
Subject: [PATCH] fixed conditional rendering & optimized using useMemo

---
 .../ProfessionalInfoTab.tsx                   |  2 +-
 .../AboutStudentAccordion.tsx                 | 26 +++++++-------
 .../AboutTutorAccordion.tsx                   | 36 ++++++++++---------
 .../about-user-block.constants.ts             |  2 ++
 4 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/src/containers/edit-profile/professional-info-tab/ProfessionalInfoTab.tsx b/src/containers/edit-profile/professional-info-tab/ProfessionalInfoTab.tsx
index 87f482d08..27c213f4f 100644
--- a/src/containers/edit-profile/professional-info-tab/ProfessionalInfoTab.tsx
+++ b/src/containers/edit-profile/professional-info-tab/ProfessionalInfoTab.tsx
@@ -100,7 +100,7 @@ const ProfessionalInfoTab: FC = () => {
     })
   }
 
-  const TutorInfo = userRole === UserRoleEnum.Tutor && (
+  const TutorInfo = (
     <Box component='section' id='education'>
       <Box sx={highlightElem}></Box>
       <TitleWithDescription
diff --git a/src/containers/edit-profile/professional-info-tab/about-student-accordion/AboutStudentAccordion.tsx b/src/containers/edit-profile/professional-info-tab/about-student-accordion/AboutStudentAccordion.tsx
index 33e668560..f1cd5a579 100644
--- a/src/containers/edit-profile/professional-info-tab/about-student-accordion/AboutStudentAccordion.tsx
+++ b/src/containers/edit-profile/professional-info-tab/about-student-accordion/AboutStudentAccordion.tsx
@@ -1,4 +1,4 @@
-import { FC } from 'react'
+import { FC, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 
 import {
@@ -15,7 +15,10 @@ import Accordions from '~/components/accordion/Accordions'
 import AppTextArea from '~/components/app-text-area/AppTextArea'
 
 import { styles } from '~/containers/edit-profile/professional-info-tab/about-tutor-accordion/AboutTutorAccordion.styles'
-import { aboutStudentKeys } from '~/containers/user-profile/about-user-block/about-user-block.constants'
+import {
+  aboutStudentKeys,
+  mockHandleStudentInputChange
+} from '~/containers/user-profile/about-user-block/about-user-block.constants'
 
 interface AboutStudentAccordionProps {
   data: AboutStudentData
@@ -25,20 +28,15 @@ interface AboutStudentAccordionProps {
   >
 }
 
-const AboutStudentAccordion: FC<AboutStudentAccordionProps> = ({
-  data,
-  handleInputChange
-}) => {
+const AboutStudentAccordion: FC<AboutStudentAccordionProps> = ({ data }) => {
   const { t } = useTranslation()
   const [expandedItem, handleAccordionChange] = useAccordions({
     initialState: 0,
     toggle: true
   })
 
-  const mockHandleInputChange = () => null
-
-  const accordionItems: AccordionItem[] = aboutStudentKeys.map((item) => {
-    return {
+  const accordionItems: AccordionItem[] = useMemo(() => {
+    return aboutStudentKeys.map((item) => ({
       title: `editProfilePage.profile.professionalTab.accordionStudent.${item}`,
       content: (
         <AppTextArea
@@ -47,12 +45,12 @@ const AboutStudentAccordion: FC<AboutStudentAccordionProps> = ({
             'editProfilePage.profile.professionalTab.accordionStudent.textareaLabel'
           )}
           maxLength={1000}
-          onChange={mockHandleInputChange}
-          value={data.education}
+          onChange={mockHandleStudentInputChange}
+          value={data[item]}
         />
       )
-    }
-  })
+    }))
+  }, [t, data])
 
   return (
     <Accordions
diff --git a/src/containers/edit-profile/professional-info-tab/about-tutor-accordion/AboutTutorAccordion.tsx b/src/containers/edit-profile/professional-info-tab/about-tutor-accordion/AboutTutorAccordion.tsx
index e75922bb4..9fdb7d9b9 100644
--- a/src/containers/edit-profile/professional-info-tab/about-tutor-accordion/AboutTutorAccordion.tsx
+++ b/src/containers/edit-profile/professional-info-tab/about-tutor-accordion/AboutTutorAccordion.tsx
@@ -1,4 +1,4 @@
-import { FC } from 'react'
+import { FC, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 
 import {
@@ -35,22 +35,24 @@ const AboutTutorAccordion: FC<AboutTutorAccordionProps> = ({
     toggle: true
   })
 
-  const accordionItems: AccordionItem[] = aboutTutorKeys.map((item) => {
-    return {
-      title: `editProfilePage.profile.professionalTab.accordionTutor.${item}`,
-      content: (
-        <AppTextArea
-          fullWidth
-          label={t(
-            'editProfilePage.profile.professionalTab.accordionTutor.textareaLabel'
-          )}
-          maxLength={1000}
-          onChange={handleInputChange(item)}
-          value={data.education}
-        />
-      )
-    }
-  })
+  const accordionItems: AccordionItem[] = useMemo(() => {
+    return aboutTutorKeys.map((item) => {
+      return {
+        title: `editProfilePage.profile.professionalTab.accordionTutor.${item}`,
+        content: (
+          <AppTextArea
+            fullWidth
+            label={t(
+              'editProfilePage.profile.professionalTab.accordionTutor.textareaLabel'
+            )}
+            maxLength={1000}
+            onChange={handleInputChange(item)}
+            value={data[item]}
+          />
+        )
+      }
+    })
+  }, [t, handleInputChange, data])
 
   return (
     <Accordions
diff --git a/src/containers/user-profile/about-user-block/about-user-block.constants.ts b/src/containers/user-profile/about-user-block/about-user-block.constants.ts
index a611a4aef..90e722083 100644
--- a/src/containers/user-profile/about-user-block/about-user-block.constants.ts
+++ b/src/containers/user-profile/about-user-block/about-user-block.constants.ts
@@ -19,3 +19,5 @@ export const aboutTutorKeys: Array<keyof ProfessionalBlock> = [
   'scientificActivities',
   'awards'
 ]
+
+export const mockHandleStudentInputChange = () => null