mirror of
https://github.com/vrcx-team/VRCX.git
synced 2026-04-06 00:32:02 +02:00
fix: view more button in notification center should navigate to notification page
This commit is contained in:
@@ -287,9 +287,17 @@ export const useUiStore = defineStore('Ui', () => {
|
||||
const name = String(routeName);
|
||||
removeNotify(name);
|
||||
if (name === 'notification') {
|
||||
const notificationsSettingsStore = useNotificationsSettingsStore();
|
||||
if (notificationsSettingsStore.notificationLayout === 'notification-center') {
|
||||
router.replace({ name: 'feed' });
|
||||
const notificationsSettingsStore =
|
||||
useNotificationsSettingsStore();
|
||||
if (
|
||||
notificationsSettingsStore.notificationLayout ===
|
||||
'notification-center'
|
||||
) {
|
||||
if (router.currentRoute.value.query?.fromCenter) {
|
||||
router.replace({ name: 'notification' });
|
||||
} else {
|
||||
router.replace({ name: 'feed' });
|
||||
}
|
||||
return;
|
||||
}
|
||||
notificationStore.clearUnseenNotifications();
|
||||
@@ -322,7 +330,10 @@ export const useUiStore = defineStore('Ui', () => {
|
||||
function updateTrayIconNotify(force = false) {
|
||||
const notificationsSettingsStore = useNotificationsSettingsStore();
|
||||
let newState;
|
||||
if (notificationsSettingsStore.notificationLayout === 'notification-center') {
|
||||
if (
|
||||
notificationsSettingsStore.notificationLayout ===
|
||||
'notification-center'
|
||||
) {
|
||||
newState =
|
||||
appearanceSettings.notificationIconDot &&
|
||||
(notificationStore.hasUnseenNotifications ||
|
||||
|
||||
@@ -117,7 +117,7 @@
|
||||
|
||||
function navigateToTable() {
|
||||
isNotificationCenterOpen.value = false;
|
||||
router.push({ name: 'notification' });
|
||||
router.push({ name: 'notification', query: { fromCenter: '1' } });
|
||||
}
|
||||
|
||||
function showSendInviteResponseDialog(invite) {
|
||||
|
||||
@@ -150,7 +150,8 @@ describe('NotificationCenterSheet.vue', () => {
|
||||
false
|
||||
);
|
||||
expect(mocks.router.push).toHaveBeenCalledWith({
|
||||
name: 'notification'
|
||||
name: 'notification',
|
||||
query: { fromCenter: '1' }
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user