hotfix: merge modal scroll and image error fix

git-goods · Nov 18, 2024 · 570e9cb · 570e9cb
1 parent 01c00df
commit 570e9cb
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/apps/web/src/app/[locale]/mypage/ProfileSection.tsx b/apps/web/src/app/[locale]/mypage/ProfileSection.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @next/next/no-img-element */
 'use client';
 
 import { memo } from 'react';
@@ -46,7 +47,7 @@ export const ProfileSection = memo(
       return (
         <section className={profileSectionStyle}>
           <div className={profileImageStyle}>
-            <Image src={data.profileImage ?? ''} alt="profile" width={160} height={160} />
+            <img src={data.profileImage ?? ''} alt="profile" width={160} height={160} />
           </div>
           <div className={profileTextStyle}>
             <p className={profileNameStyle}>{data?.username}</p>

diff --git a/apps/web/src/app/[locale]/mypage/my-pet/(merge)/MergePersona.tsx b/apps/web/src/app/[locale]/mypage/my-pet/(merge)/MergePersona.tsx
@@ -155,7 +155,7 @@ const listStyle = cx(
     overflowY: 'auto',
     display: 'flex',
     flexWrap: 'wrap',
-    maxHeight: 'calc(100vh - 542px)',
+    maxHeight: 'calc(100vh - 780px)',
     overflow: 'auto',
   }),
   customScrollStyle,

diff --git a/apps/web/src/app/[locale]/mypage/my-pet/(merge)/MergePreview.tsx b/apps/web/src/app/[locale]/mypage/my-pet/(merge)/MergePreview.tsx
@@ -45,7 +45,7 @@ export const MergePreview = ({ materialPersona, targetPersona }: MergePersonaPro
 
 const containerStyle = css({
   position: 'relative',
-  padding: '32px',
+  padding: '32px 32px 12px',
   overflow: 'hidden',
   minHeight: 'fit-content',
 });

diff --git a/apps/web/src/components/GNB/DesktopGNB.tsx b/apps/web/src/components/GNB/DesktopGNB.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @next/next/no-img-element */
 import Image from 'next/image';
 import { getTranslations } from 'next-intl/server';
 import { css, cx } from '_panda/css';
@@ -41,7 +42,7 @@ export async function DesktopGNB() {
             <a href="/mypage" className={profileStyle}>
               <>
                 <div className="profile-image">
-                  <Image src={session.user.image} alt="profile" width={160} height={160} />
+                  <img src={session.user.image} alt="profile" width={160} height={160} />
                 </div>
                 <button className={center()}>
                   <span className="profile-name">{session.user.name}</span>

diff --git a/apps/web/src/components/GNB/MobileGNB.tsx b/apps/web/src/components/GNB/MobileGNB.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @next/next/no-img-element */
 'use client';
 
 import type { ReactNode } from 'react';
@@ -48,7 +49,7 @@ export const MobileGNB = () => {
           {isAuth && (
             <Link href="/mypage">
               <div className="profile-image">
-                <Image src={data.user.image} alt="profile" width={28} height={28} />
+                <img src={data.user.image} alt="profile" width={28} height={28} />
               </div>
             </Link>
           )}