Merge pull request #13 from themoment-team/HotFix/buildError

HotFix Build Error
themoment-team · May 21, 2024 · 07635f2 · 07635f2
2 parents ff27d0c + e28ee59
commit 07635f2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/src/components/CardModal/BusinessCardModal/index.tsx b/src/components/CardModal/BusinessCardModal/index.tsx
@@ -24,12 +24,12 @@ const CardModal: React.FC<Props> = ({
   const [isPrinting, setIsPrinting] = useState(false);
 
   const commonProps = {
-    name: userInfo?.name,
-    major: userInfo?.major,
-    phoneNumber: userInfo ? formatPhoneNumber(userInfo.phoneNumber) : '',
-    email: userInfo?.email,
-    mbti: isValidMBTI(userInfo?.mbti) ? userInfo.mbti : undefined,
-    instagram: userInfo.instagram,
+    name: userInfo!.name,
+    major: userInfo?.major || '',
+    phoneNumber: formatPhoneNumber(userInfo!.phoneNumber),
+    email: userInfo!.email,
+    mbti: userInfo && isValidMBTI(userInfo.mbti) ? userInfo.mbti : undefined,
+    instagram: userInfo?.instagram || '',
     imageUrl: imageUrl,
   };
 

diff --git a/src/pageContainers/SelectPage/index.tsx b/src/pageContainers/SelectPage/index.tsx
@@ -32,14 +32,13 @@ const SelectPage: React.FC<Props> = ({
   };
 
   const commonProps = {
-    name: userInfo.name,
-    major: userInfo.major,
-    phoneNumber: formatPhoneNumber(userInfo.phoneNumber),
-    email: userInfo.email,
-    mbti: isValidMBTI(userInfo?.mbti) ? userInfo.mbti : undefined,
-    instagram: userInfo.instagram,
-    imageUrl:
-      selectedButton === SelectedType.YES ? convertedImageUrl! : imageUrl,
+    name: userInfo!.name,
+    major: userInfo?.major || '',
+    phoneNumber: formatPhoneNumber(userInfo!.phoneNumber),
+    email: userInfo!.email,
+    mbti: userInfo && isValidMBTI(userInfo.mbti) ? userInfo.mbti : undefined,
+    instagram: userInfo?.instagram || '',
+    imageUrl: imageUrl,
   };
 
   return (