From 5a32cf8eabed5aa53ca09d9b22bb09964332a490 Mon Sep 17 00:00:00 2001
From: NoriDev <m1nthing2322@gmail.com>
Date: Thu, 5 Oct 2023 13:25:12 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=E3=83=81=E3=83=A3=E3=83=83=E3=83=88?=
 =?UTF-8?q?=E3=81=82=E3=82=8C=E3=81=93=E3=82=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG_CHERRYPICK.md                                  | 2 ++
 packages/frontend/src/pages/messaging/index.vue          | 7 -------
 packages/frontend/src/pages/messaging/messaging-room.vue | 6 ------
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md
index 68cb4431eb..b12c1fde63 100644
--- a/CHANGELOG_CHERRYPICK.md
+++ b/CHANGELOG_CHERRYPICK.md
@@ -44,6 +44,8 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2023xx](CHANGE
   - 리액션 변경 기능을 사용할 수 없음
 - Fix: 노트 상세 페이지의 노트 입력 폼을 누르기 전에 일부 요소가 표시될 수 있음
 - Fix: 히트맵이 표시되지 않음
+- Fix: 대화 페이지에서 일부 요소가 중복으로 표시될 수 있음
+- Fix: 브랜딩에서 적용한 이미지가 대화 페이지에서 반영되지 않음
 
 ### Server
 - Revert: Feat: 이모티콘 중복 체크 (misskey-dev/misskey#11941)
diff --git a/packages/frontend/src/pages/messaging/index.vue b/packages/frontend/src/pages/messaging/index.vue
index a0e867bbf0..78881e36f7 100644
--- a/packages/frontend/src/pages/messaging/index.vue
+++ b/packages/frontend/src/pages/messaging/index.vue
@@ -18,11 +18,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<MkChatPreview v-for="message in items" :key="message.id" :message="message"/>
 				</MkPagination>
 			</div>
-			<div v-if="!fetching && messages.length == 0" class="_fullinfo">
-				<img src="https://xn--931a.moe/assets/info.jpg" class="_ghost" alt=""/>
-				<div>{{ i18n.ts.noHistory }}</div>
-			</div>
-			<MkLoading v-if="fetching"/>
 		</div>
 	</MkSpacer>
 </MkStickyContainer>
@@ -45,7 +40,6 @@ const router = useRouter();
 
 let tab = $ref('direct');
 
-let fetching = $ref(true);
 let messages;
 let connection;
 
@@ -144,7 +138,6 @@ onMounted(() => {
 			const _messages = userMessages.concat(groupMessages);
 			_messages.sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime());
 			messages = _messages;
-			fetching = false;
 		});
 	});
 
diff --git a/packages/frontend/src/pages/messaging/messaging-room.vue b/packages/frontend/src/pages/messaging/messaging-room.vue
index 317e2a1351..ec18698e87 100644
--- a/packages/frontend/src/pages/messaging/messaging-room.vue
+++ b/packages/frontend/src/pages/messaging/messaging-room.vue
@@ -15,12 +15,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<MkSpacer :contentMax="800">
 			<div :class="$style.body">
 				<MkPagination v-if="pagination" ref="pagingComponent" :key="userAcct || groupId" :pagination="pagination">
-					<template #empty>
-						<div class="_fullinfo">
-							<img src="https://xn--931a.moe/assets/info.jpg" class="_ghost"/>
-							<div>{{ i18n.ts.noMessagesYet }}</div>
-						</div>
-					</template>
 					<template #default="{ items: messages, fetching: pFetching }">
 						<MkDateSeparatedList
 							v-if="messages.length > 0"