diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md
index 4f11f634ee..5e675ae178 100644
--- a/CHANGELOG_CHERRYPICK.md
+++ b/CHANGELOG_CHERRYPICK.md
@@ -46,6 +46,7 @@
- Fix: 위젯 추가 영역의 위치가 오른쪽으로 치우쳐 있음
- Fix: 노트 작성 폼의 프로필 아이콘 여백 조정
- Fix: 새 노트 알림이 프로필 아이콘을 밀어내는 문제
+- Fix: 리노트 알림에 프로필 아이콘이 뜨는 문제
---
diff --git a/packages/frontend/src/boot/main-boot.ts b/packages/frontend/src/boot/main-boot.ts
index 45acd2517d..ff92a89026 100644
--- a/packages/frontend/src/boot/main-boot.ts
+++ b/packages/frontend/src/boot/main-boot.ts
@@ -2,7 +2,7 @@ import { computed, createApp, watch, markRaw, version as vueVersion, defineAsync
import { common } from './common';
import { version, ui, lang, updateLocale } from '@/config';
import { i18n, updateI18n } from '@/i18n';
-import { confirm, alert, post, popup, toast } from '@/os';
+import {confirm, alert, post, popup, toast, welcomeToast} from '@/os';
import { useStream } from '@/stream';
import * as sound from '@/scripts/sound';
import { $i, refreshAccount, login, updateAccount, signout } from '@/account';
@@ -175,7 +175,7 @@ export async function mainBoot() {
const lastUsedDate = parseInt(lastUsed, 10);
// 二時間以上前なら
if (Date.now() - lastUsedDate > 1000 * 60 * 60 * 2) {
- toast(i18n.t('welcomeBackWithName', {
+ welcomeToast(i18n.t('welcomeBackWithName', {
name: $i.name || $i.username,
}));
}
diff --git a/packages/frontend/src/components/MkToast.vue b/packages/frontend/src/components/MkToast.vue
index dea6ef7e3d..e135f56472 100644
--- a/packages/frontend/src/components/MkToast.vue
+++ b/packages/frontend/src/components/MkToast.vue
@@ -8,7 +8,6 @@
appear @afterLeave="emit('closed')"
>
-
{{ message }}
@@ -21,8 +20,6 @@
import { onMounted } from 'vue';
import * as os from '@/os';
import { defaultStore } from '@/store';
-import { $i } from "@/account";
-import CPAvatar from '@/components/global/toast-avatar.vue';
defineProps<{
message: string;
@@ -68,20 +65,5 @@ onMounted(() => {
overflow: clip;
text-align: center;
pointer-events: none;
- transition: opacity 0.5s, transform 0.5s;
-
- @media (max-width: 500px) {
- width: 100%;
- top: 0px;
- }
-}
-
-.avatar {
- position: relative;
- vertical-align: bottom;
- border-radius: 100%;
- width: 48px;
- height: 48px;
- margin-top: 16px;
}
diff --git a/packages/frontend/src/components/MkWelcomeToast.vue b/packages/frontend/src/components/MkWelcomeToast.vue
new file mode 100644
index 0000000000..86178883d0
--- /dev/null
+++ b/packages/frontend/src/components/MkWelcomeToast.vue
@@ -0,0 +1,87 @@
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/os.ts b/packages/frontend/src/os.ts
index c44d348046..36a463749e 100644
--- a/packages/frontend/src/os.ts
+++ b/packages/frontend/src/os.ts
@@ -11,6 +11,7 @@ import MkPostFormDialog from '@/components/MkPostFormDialog.vue';
import MkWaitingDialog from '@/components/MkWaitingDialog.vue';
import MkPageWindow from '@/components/MkPageWindow.vue';
import MkToast from '@/components/MkToast.vue';
+import MkWelcomeToast from '@/components/MkWelcomeToast.vue';
import MkDialog from '@/components/MkDialog.vue';
import MkEmojiPickerDialog from '@/components/MkEmojiPickerDialog.vue';
import MkEmojiPickerWindow from '@/components/MkEmojiPickerWindow.vue';
@@ -178,6 +179,12 @@ export function toast(message: string) {
}, {}, 'closed');
}
+export function welcomeToast(message: string) {
+ popup(MkWelcomeToast, {
+ message,
+ }, {}, 'closed');
+}
+
export function alert(props: {
type?: 'error' | 'info' | 'success' | 'warning' | 'waiting' | 'question';
title?: string | null;