UI: свайпы вкладок и навигация тредов

shine-UI/js/components/toolbar.js

@@ -1,4 +1,4 @@
-import { resolveToolbarActive } from '../router.js';
+import { getToolbarNavigationTarget, resolveToolbarActive } from '../router.js';
 import { state } from '../state.js';
 import { openAuthRequiredModal } from '../services/auth-required-modal.js';
 
@@ -33,7 +33,7 @@ function getTotalUnreadMessages() {
 
 function navigateWithGuestRules(pageId, navigate) {
   if (state.session.isAuthorized) {
-    navigate(pageId);
+    navigate(getToolbarNavigationTarget(pageId));
     return;
   }
   if (pageId === 'messages-list') {
@@ -57,7 +57,7 @@ function navigateWithGuestRules(pageId, navigate) {
     });
     return;
   }
-  navigate(pageId);
+  navigate(getToolbarNavigationTarget(pageId));
 }
 
 export function renderToolbar(currentPageId, navigate) {
@@ -93,7 +93,7 @@ export function renderToolbar(currentPageId, navigate) {
       btn.append(badge);
     }
     if (item.pageId === 'channels-list') {
-      btn.addEventListener('click', () => navigate('channels-list'));
+      btn.addEventListener('click', () => navigate(getToolbarNavigationTarget('channels-list')));
     } else {
       btn.addEventListener('click', () => navigateWithGuestRules(item.pageId, navigate));
     }