fix: resolve conflict error

IT-Cotato · Feb 9, 2025 · ab5f7a8 · ab5f7a8
1 parent abca319
commit ab5f7a8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/pages/Login/FindId/FindId.tsx b/src/pages/Login/FindId/FindId.tsx
@@ -2,7 +2,7 @@ import React, { useCallback, useState } from 'react';
 import styled from 'styled-components';
 import { useNavigate } from 'react-router-dom';
 import api from '@/api/api';
-import CotatoPanel from '@components/CotatoPanel';
+import CotatoPanel, { SizeStateEnum } from '@components/CotatoPanel';
 import panelText from '@assets/find_id_panel_text.svg';
 import CotatoButton from '@components/CotatoButton';
 import CotatoIcon from '@components/CotatoIcon';
@@ -197,7 +197,7 @@ const FindId = () => {
 
   return (
     <Wrapper>
-      <CotatoPanel size="long" textImgSrc={panelText} />
+      <CotatoPanel size={SizeStateEnum.LONG} textImgSrc={panelText} />
       {renderFindId()}
       {renderFindIdResult()}
     </Wrapper>

diff --git a/src/pages/MyPage/generation-management/MypageGenerationManagementAddDialog.tsx b/src/pages/MyPage/generation-management/MypageGenerationManagementAddDialog.tsx
@@ -211,7 +211,7 @@ const MypageGenerationManagementAddDialog = ({
           isEnabled={isValid}
           buttonStyle="filled"
           text="추가하기"
-          handleClick={handleSubmit(onSubmit)}
+          onClick={handleSubmit(onSubmit)}
         />
       </CotatoDialogActions>
     </CotatoDialog>

diff --git a/src/pages/Session/SessionHome.tsx b/src/pages/Session/SessionHome.tsx
@@ -22,6 +22,7 @@ import { toast } from 'react-toastify';
 import { useNavigate, useSearchParams } from 'react-router-dom';
 import { useGeneration } from '@/hooks/useGeneration';
 import getDateString from '@utils/getDateString';
+import { checkIsAtLeastAdmin } from '@utils/role';
 
 //
 //
@@ -288,7 +289,7 @@ const SessionHome = () => {
             onChange={handleGenerationChange}
           />
         )}
-        {checkIsAtLeastAdmin(user?.role) && !isTabletOrSmaller && (
+        {checkIsAtLeastAdmin(userData?.role) && !isTabletOrSmaller && (
           <AddCircleIcon onClick={() => setIsAddModalOpen(true)} />
         )}
       </SettingTab>