From 95873ce278bb492b72d9eaa6c68790a8e0517ed8 Mon Sep 17 00:00:00 2001
From: wooktori <jjun9503@gmail.com>
Date: Mon, 5 Jan 2026 09:49:27 +0900
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=EC=B1=84=ED=8C=85=20=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=97=90=EC=84=9C=20=EA=B5=AC=EA=B8=80=20?=
 =?UTF-8?q?=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EB=82=98=EC=98=A4=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 next.config.ts                                      |  4 ++++
 src/components/pages/chat/chat-other-chat/index.tsx | 10 +++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/next.config.ts b/next.config.ts
index 2d85301d..45e91916 100644
--- a/next.config.ts
+++ b/next.config.ts
@@ -27,6 +27,10 @@ const nextConfig: NextConfig = {
         port: '',
         pathname: '/**',
       },
+      {
+        protocol: 'https',
+        hostname: 'lh3.googleusercontent.com',
+      },
     ],
     //imagesSizes, deviceSizes는 기본 설정
     imageSizes: [96, 128, 256, 384],
diff --git a/src/components/pages/chat/chat-other-chat/index.tsx b/src/components/pages/chat/chat-other-chat/index.tsx
index 2715330b..39630e81 100644
--- a/src/components/pages/chat/chat-other-chat/index.tsx
+++ b/src/components/pages/chat/chat-other-chat/index.tsx
@@ -1,7 +1,4 @@
-import Image from 'next/image';
-
-import { DEFAULT_PROFILE_IMAGE } from 'constants/default-images';
-
+import { ImageWithFallback } from '@/components/ui';
 import { formatKoreanTime } from '@/lib/formatDateTime';
 import { ChatMessage } from '@/types/service/chat';
 
@@ -14,15 +11,14 @@ interface IProps {
 export const OtherChat = ({ item }: IProps) => {
   const { senderProfileImage, senderName, content, timestamp, createdAt } = item;
   const time = timestamp ?? createdAt;
-
   return (
     <div className='flex'>
-      <Image
+      <ImageWithFallback
         width={40}
         className='mr-3 size-10 rounded-full object-cover'
         alt='프로필 이미지'
         height={40}
-        src={senderProfileImage || DEFAULT_PROFILE_IMAGE}
+        src={senderProfileImage || ''}
       />
 
       <div className='mr-1.5 max-w-60'>

From 4e6148d43a292de6b3edb868267abfcb3d6d810d Mon Sep 17 00:00:00 2001
From: wooktori <jjun9503@gmail.com>
Date: Mon, 5 Jan 2026 10:08:38 +0900
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=EC=B1=84=ED=8C=85=20=EC=9C=A0?=
 =?UTF-8?q?=EC=A0=80=20=EB=AA=A9=EB=A1=9D=EC=97=90=EC=84=9C=20=EB=B0=A9?=
 =?UTF-8?q?=EC=9E=A5=20=EC=A0=9C=EC=9D=BC=20=EC=9C=84=EB=A1=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/pages/chat/chat-user-list/index.tsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/pages/chat/chat-user-list/index.tsx b/src/components/pages/chat/chat-user-list/index.tsx
index f8e79059..6cab7ee5 100644
--- a/src/components/pages/chat/chat-user-list/index.tsx
+++ b/src/components/pages/chat/chat-user-list/index.tsx
@@ -27,6 +27,12 @@ export const UserList = ({ onClose, roomId, roomType, userId }: UserListProps) =
   const isCurrentUserOwner = data?.participants.some(
     (participant) => participant.userId === userId && participant.isOwner,
   );
+  const sortedParticipants = data?.participants
+    ? [...data.participants].sort((a, b) => {
+        if (a.isOwner === b.isOwner) return 0;
+        return a.isOwner ? -1 : 1;
+      })
+    : [];
 
   return (
     <div className='bg-mono-white flex h-[calc(100vh-112px)] flex-col'>
@@ -55,7 +61,7 @@ export const UserList = ({ onClose, roomId, roomType, userId }: UserListProps) =
 
       {/* 유저 리스트 */}
       <div className='scrollbar-thin flex-1 overflow-y-auto'>
-        {data?.participants.map((user, index) => (
+        {sortedParticipants.map((user, index) => (
           <div key={user.userId}>
             <div className='bg-mono-white flex h-22 items-center gap-4 p-5'>
               <div className='h-12 w-12 overflow-hidden rounded-full'>

From 46cddcda85475dad20254a5e44ddd23fc08b1e6a Mon Sep 17 00:00:00 2001
From: wooktori <jjun9503@gmail.com>
Date: Mon, 5 Jan 2026 10:25:07 +0900
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=EB=A9=94=EC=84=B8=EC=A7=80=20?=
 =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=EC=97=90=EC=84=9C=20=EA=B5=AC?=
 =?UTF-8?q?=EA=B8=80=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/pages/chat/chat-list/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/pages/chat/chat-list/index.tsx b/src/components/pages/chat/chat-list/index.tsx
index b30b24bc..fbee6ff4 100644
--- a/src/components/pages/chat/chat-list/index.tsx
+++ b/src/components/pages/chat/chat-list/index.tsx
@@ -1,11 +1,11 @@
 'use client';
-import Image from 'next/image';
 import { useRouter } from 'next/navigation';
 
 import { useMemo } from 'react';
 
 import { DEFAULT_PROFILE_IMAGE } from 'constants/default-images';
 
+import { ImageWithFallback } from '@/components/ui';
 import { useChatListSocket, useGetChatList } from '@/hooks/use-chat';
 import { cn } from '@/lib/utils';
 
@@ -52,7 +52,7 @@ export const ChatList = ({ userId, accessToken }: IProps) => {
             >
               {/* 프로필 이미지 - 이미지 수정 필요💥💥*/}
               <div className='relative size-12 overflow-hidden rounded-full'>
-                <Image
+                <ImageWithFallback
                   className='object-cover'
                   alt='프로필 이미지'
                   fill