From eaff664eaff96f1f04c8bd194049981364a0103f Mon Sep 17 00:00:00 2001
From: zskhan <zafarsaeed@outlook.com>
Date: Thu, 20 Aug 2026 18:40:52 +0200
Subject: [PATCH 01/10] Update browser URL on navigation

---
 .../conversations/conversations.test.tsx      | 67 ++++++++-----
 .../panels/conversations/conversations.tsx    | 16 ++--
 .../src/script/view_model/ContentViewModel.ts |  2 +-
 .../script/view_model/ListViewModel.test.ts   | 94 +++++++++++++++++--
 .../src/script/view_model/ListViewModel.ts    | 51 ++++++----
 5 files changed, 177 insertions(+), 53 deletions(-)

diff --git a/apps/webapp/src/script/page/leftSidebar/panels/conversations/conversations.test.tsx b/apps/webapp/src/script/page/leftSidebar/panels/conversations/conversations.test.tsx
index c6a31406a5e..6f8949734e5 100644
--- a/apps/webapp/src/script/page/leftSidebar/panels/conversations/conversations.test.tsx
+++ b/apps/webapp/src/script/page/leftSidebar/panels/conversations/conversations.test.tsx
@@ -27,40 +27,31 @@ import {User} from 'Repositories/entity/User';
 import {SearchRepository} from 'Repositories/search/searchRepository';
 import {UserRepository} from 'Repositories/user/userRepository';
 import {withTheme} from 'src/script/auth/util/test/testUtil';
-import {ListState} from 'src/script/page/useAppState';
+import {ContentState} from 'src/script/page/useAppState';
+import * as Router from 'src/script/router/Router';
 import {TestFactory} from 'test/helper/TestFactory';
 
-import {Conversations} from './';
+import {Conversations, shouldClearDeepLinkForTab} from './';
+import {SidebarTabs} from './useSidebarStore';
 import {translateForTest} from 'Util/test/translateForTest';
 
-jest.mock('./conversationSidebar/conversationSidebar', () => ({
-  ConversationSidebar: ({onClickPreferences}: {onClickPreferences: (contentState: number) => void}) => {
-    const {ContentState} = require('src/script/page/useAppState');
+type ConversationsProps = React.ComponentProps<typeof Conversations>;
 
-    return (
-      <button
-        title="preferencesHeadline"
-        type="button"
-        onClick={() => onClickPreferences(ContentState.PREFERENCES_ACCOUNT)}
-      />
-    );
-  },
-}));
-
-const defaultParams: Omit<React.ComponentProps<typeof Conversations>, 'conversationRepository' | 'searchRepository'> = {
+const defaultParams: Omit<ConversationsProps, 'conversationRepository' | 'searchRepository'> = {
   listViewModel: {
     switchList: jest.fn(),
+    openPreferences: jest.fn(),
     contentViewModel: {
       loadPreviousContent: jest.fn(),
       switchContent: jest.fn(),
     },
-  } as any,
-  preferenceNotificationRepository: {notifications: observable([])} as any,
-  propertiesRepository: {getPreference: jest.fn(), savePreference: jest.fn()} as any,
+  } as unknown as ConversationsProps['listViewModel'],
+  preferenceNotificationRepository: {notifications: observable([])} as unknown as ConversationsProps['preferenceNotificationRepository'],
+  propertiesRepository: {getPreference: jest.fn(), savePreference: jest.fn()} as unknown as ConversationsProps['propertiesRepository'],
   selfUser: new User('', '', translateForTest),
-  integrationRepository: {integrations: observable([])} as any,
-  teamRepository: {getTeam: jest.fn()} as any,
-  userRepository: {users: observable([])} as any,
+  integrationRepository: {integrations: observable([])} as unknown as ConversationsProps['integrationRepository'],
+  teamRepository: {getTeam: jest.fn()} as unknown as ConversationsProps['teamRepository'],
+  userRepository: {users: observable([])} as unknown as ConversationsProps['userRepository'],
   isConversationListCollapseEnabled: false,
 };
 
@@ -89,6 +80,36 @@ describe('Conversations', () => {
       openPrefButton.click();
     });
 
-    expect(defaultParams.listViewModel.switchList).toHaveBeenCalledWith(ListState.PREFERENCES);
+    expect(defaultParams.listViewModel.openPreferences).toHaveBeenCalledWith(ContentState.PREFERENCES_ACCOUNT);
+  });
+
+  it.each([SidebarTabs.RECENT, SidebarTabs.CELLS, SidebarTabs.CONNECT])(
+    'clears the deep link for unrouted tab %s',
+    tab => {
+      expect(shouldClearDeepLinkForTab(tab)).toBe(true);
+    },
+  );
+
+  it.each([SidebarTabs.PREFERENCES, SidebarTabs.MEETINGS])('keeps the deep link for routed tab %s', tab => {
+    expect(shouldClearDeepLinkForTab(tab)).toBe(false);
+  });
+
+  it('clears the deep link when switching from preferences to a conversation tab', () => {
+    const setHistoryParam = jest.spyOn(Router, 'setHistoryParam');
+    const {getByTitle} = render(
+      withTheme(
+        <Conversations
+          {...defaultParams}
+          searchRepository={searchRepository}
+          conversationRepository={conversationRepository}
+        />,
+      ),
+    );
+
+    act(() => {
+      getByTitle('conversationViewTooltip').click();
+    });
+
+    expect(setHistoryParam).toHaveBeenCalledWith('/');
   });
 });
diff --git a/apps/webapp/src/script/page/leftSidebar/panels/conversations/conversations.tsx b/apps/webapp/src/script/page/leftSidebar/panels/conversations/conversations.tsx
index 79d6cff25cb..61084ece9c2 100644
--- a/apps/webapp/src/script/page/leftSidebar/panels/conversations/conversations.tsx
+++ b/apps/webapp/src/script/page/leftSidebar/panels/conversations/conversations.tsx
@@ -76,11 +76,15 @@ import {
 
 import {Config} from '../../../../Config';
 import {generateConversationUrl} from '../../../../router/routeGenerator';
+import {setHistoryParam} from '../../../../router/Router';
 import {createNavigateKeyboard} from '../../../../router/routerBindings';
 import {ListViewModel} from '../../../../view_model/ListViewModel';
 import {ListWrapper} from '../listWrapper';
 import {StartUI} from '../startUi';
 
+export const shouldClearDeepLinkForTab = (tab: SidebarTabs): boolean =>
+  ![SidebarTabs.PREFERENCES, SidebarTabs.MEETINGS].includes(tab);
+
 type ConversationsProps = {
   callState?: CallState;
   conversationRepository: ConversationRepository;
@@ -352,7 +356,8 @@ export const Conversations = ({
         void conversationRepository.updateArchivedConversations();
       }
 
-      if (![SidebarTabs.PREFERENCES, SidebarTabs.CELLS, SidebarTabs.MEETINGS].includes(nextTab)) {
+      if (shouldClearDeepLinkForTab(nextTab)) {
+        setHistoryParam('/');
         onExitPreferences();
       }
 
@@ -365,8 +370,7 @@ export const Conversations = ({
         if (!isMeetingsEnabled) {
           return;
         }
-        switchList(ListState.MEETINGS);
-        switchContent(ContentState.MEETINGS);
+        listViewModel.openMeetingsList();
       }
 
       clearConversationFilter();
@@ -381,6 +385,7 @@ export const Conversations = ({
       isMeetingsEnabled,
       clearConversationFilter,
       setCurrentTab,
+      listViewModel,
     ],
   );
 
@@ -410,9 +415,8 @@ export const Conversations = ({
 
   const onClickPreferences = useCallback(
     (itemId: ContentState) => {
-      switchList(ListState.PREFERENCES);
+      listViewModel.openPreferences(itemId);
       setCurrentView(ViewType.MOBILE_CENTRAL_COLUMN);
-      switchContent(itemId);
 
       setTimeout(() => {
         const centerColumn = document.getElementById('center-column');
@@ -420,7 +424,7 @@ export const Conversations = ({
         nextElementToFocus?.focus();
       }, ANIMATED_PAGE_TRANSITION_DURATION + 1);
     },
-    [switchList, setCurrentView, switchContent],
+    [listViewModel, setCurrentView],
   );
 
   const handleEnterSearchClick = useCallback(
diff --git a/apps/webapp/src/script/view_model/ContentViewModel.ts b/apps/webapp/src/script/view_model/ContentViewModel.ts
index 61298915f91..470fbbc3dad 100644
--- a/apps/webapp/src/script/view_model/ContentViewModel.ts
+++ b/apps/webapp/src/script/view_model/ContentViewModel.ts
@@ -249,7 +249,6 @@ export class ContentViewModel {
    *
    * @param conversation Conversation entity or conversation ID
    * @param options State to open conversation in
-   * @param domain Domain name
    */
   readonly showConversation: ShowConversationOverload = async (
     conversation: Conversation | QualifiedId | undefined,
@@ -343,6 +342,7 @@ export class ContentViewModel {
         return;
       }
 
+      setHistoryParam('/');
       return this.switchContent(ContentState.WATERMARK);
     }
   };
diff --git a/apps/webapp/src/script/view_model/ListViewModel.test.ts b/apps/webapp/src/script/view_model/ListViewModel.test.ts
index 39bf08bdb44..40e86901365 100644
--- a/apps/webapp/src/script/view_model/ListViewModel.test.ts
+++ b/apps/webapp/src/script/view_model/ListViewModel.test.ts
@@ -19,10 +19,11 @@
 import {ListViewModel} from './ListViewModel';
 
 import {SidebarTabs, useSidebarStore} from '../page/leftSidebar/panels/conversations/useSidebarStore';
-import {ListState, useAppState} from '../page/useAppState';
+import {ContentState, ListState, useAppState} from '../page/useAppState';
+import * as Router from '../router/Router';
 import {translateForTest} from 'Util/test/translateForTest';
 
-const createListViewModel = (): ListViewModel => {
+const createListViewModel = () => {
   const mainViewModel = {
     actions: {},
     calling: {},
@@ -33,21 +34,23 @@ const createListViewModel = (): ListViewModel => {
     isFederated: false,
   } as unknown as ConstructorParameters<typeof ListViewModel>[0];
 
+  const teamRepository = {getTeam: jest.fn().mockResolvedValue(undefined)};
   const repositories = {
     calling: {},
     conversation: {},
     properties: {},
     search: {},
-    team: {},
+    team: teamRepository,
   } as unknown as ConstructorParameters<typeof ListViewModel>[1];
 
   const listViewModel = new ListViewModel(mainViewModel, repositories, translateForTest);
   (listViewModel as unknown as {isActivatedAccount: () => boolean}).isActivatedAccount = () => true;
-  return listViewModel;
+  return {listViewModel, teamRepository};
 };
 
 describe('ListViewModel', () => {
   beforeEach(() => {
+    jest.clearAllMocks();
     useSidebarStore.setState({currentTab: SidebarTabs.RECENT});
     useAppState.setState({listState: ListState.CONVERSATIONS});
   });
@@ -58,7 +61,7 @@ describe('ListViewModel', () => {
       useSidebarStore.setState({currentTab});
       useAppState.setState({listState: currentTab === SidebarTabs.CELLS ? ListState.CELLS : ListState.MEETINGS});
 
-      createListViewModel().openConversations();
+      createListViewModel().listViewModel.openConversations();
 
       expect(useAppState.getState().listState).toBe(ListState.CONVERSATIONS);
       expect(useSidebarStore.getState().currentTab).toBe(SidebarTabs.RECENT);
@@ -70,7 +73,7 @@ describe('ListViewModel', () => {
     currentTab => {
       useSidebarStore.setState({currentTab});
 
-      createListViewModel().openConversations();
+      createListViewModel().listViewModel.openConversations();
 
       expect(useAppState.getState().listState).toBe(ListState.CONVERSATIONS);
       expect(useSidebarStore.getState().currentTab).toBe(currentTab);
@@ -80,9 +83,86 @@ describe('ListViewModel', () => {
   it('keeps the archive list when opening an archived conversation', () => {
     useSidebarStore.setState({currentTab: SidebarTabs.MEETINGS});
 
-    createListViewModel().openConversations(true);
+    createListViewModel().listViewModel.openConversations(true);
 
     expect(useAppState.getState().listState).toBe(ListState.ARCHIVE);
     expect(useSidebarStore.getState().currentTab).toBe(SidebarTabs.ARCHIVES);
   });
+
+  it('does not repeat navigation when opening the active preference', () => {
+    const {listViewModel} = createListViewModel();
+    const setHistoryParam = jest.spyOn(Router, 'setHistoryParam');
+    const switchContent = jest.spyOn(listViewModel.contentViewModel, 'switchContent');
+
+    useAppState.setState({listState: ListState.PREFERENCES, contentState: ContentState.PREFERENCES_ACCOUNT});
+
+    listViewModel.openPreferences(ContentState.PREFERENCES_ACCOUNT);
+
+    expect(setHistoryParam).not.toHaveBeenCalled();
+    expect(switchContent).not.toHaveBeenCalled();
+  });
+
+  it('navigates when opening a different preference', () => {
+    const {listViewModel} = createListViewModel();
+    const setHistoryParam = jest.spyOn(Router, 'setHistoryParam');
+    const switchContent = jest.spyOn(listViewModel.contentViewModel, 'switchContent');
+
+    useAppState.setState({listState: ListState.PREFERENCES, contentState: ContentState.PREFERENCES_ACCOUNT});
+
+    listViewModel.openPreferences(ContentState.PREFERENCES_DEVICES);
+
+    expect(setHistoryParam).toHaveBeenCalledWith('/preferences/devices');
+    expect(useSidebarStore.getState().currentTab).toBe(SidebarTabs.PREFERENCES);
+    expect(switchContent).toHaveBeenCalledWith(ContentState.PREFERENCES_DEVICES);
+  });
+
+  it.each([
+    [ContentState.PREFERENCES_ABOUT, '/preferences/about'],
+    [ContentState.PREFERENCES_ACCOUNT, '/preferences/account'],
+    [ContentState.PREFERENCES_AV, '/preferences/av'],
+    [ContentState.PREFERENCES_DEVICES, '/preferences/devices'],
+    [ContentState.PREFERENCES_OPTIONS, '/preferences/options'],
+  ])('maps preference %s to its deep link', (contentState, path) => {
+    const {listViewModel} = createListViewModel();
+    const setHistoryParam = jest.spyOn(Router, 'setHistoryParam');
+
+    listViewModel.openPreferences(contentState);
+
+    expect(setHistoryParam).toHaveBeenCalledWith(path);
+  });
+
+  it('navigates to the meetings deep link when opening meetings', () => {
+    const {listViewModel} = createListViewModel();
+    const setHistoryParam = jest.spyOn(Router, 'setHistoryParam');
+
+    listViewModel.openMeetingsList();
+
+    expect(setHistoryParam).toHaveBeenCalledWith('/meetings');
+    expect(useSidebarStore.getState().currentTab).toBe(SidebarTabs.MEETINGS);
+  });
+
+  it('does not repeat navigation when opening the active meetings list', () => {
+    const {listViewModel} = createListViewModel();
+    const setHistoryParam = jest.spyOn(Router, 'setHistoryParam');
+
+    useAppState.setState({listState: ListState.MEETINGS, contentState: ContentState.MEETINGS});
+
+    listViewModel.openMeetingsList();
+
+    expect(setHistoryParam).not.toHaveBeenCalled();
+  });
+
+  it('refreshes the team before reopening the active account preference', async () => {
+    const {listViewModel, teamRepository} = createListViewModel();
+    const setHistoryParam = jest.spyOn(Router, 'setHistoryParam');
+    const switchContent = jest.spyOn(listViewModel.contentViewModel, 'switchContent');
+
+    useAppState.setState({listState: ListState.PREFERENCES, contentState: ContentState.PREFERENCES_ACCOUNT});
+
+    await listViewModel.openPreferencesAccount();
+
+    expect(teamRepository.getTeam).toHaveBeenCalledTimes(1);
+    expect(setHistoryParam).not.toHaveBeenCalled();
+    expect(switchContent).not.toHaveBeenCalled();
+  });
 });
diff --git a/apps/webapp/src/script/view_model/ListViewModel.ts b/apps/webapp/src/script/view_model/ListViewModel.ts
index a1927b92408..25196053a30 100644
--- a/apps/webapp/src/script/view_model/ListViewModel.ts
+++ b/apps/webapp/src/script/view_model/ListViewModel.ts
@@ -53,6 +53,7 @@ import {
 import {PanelState} from '../page/rightSidebar';
 import {useAppMainState} from '../page/state';
 import {ContentState, ListState, useAppState} from '../page/useAppState';
+import {setHistoryParam} from '../router/Router';
 import {showContextMenu} from '../ui/contextMenu';
 import {showLabelContextMenu} from '../ui/labelContextMenu';
 import {Shortcut} from '../ui/shortcut';
@@ -267,33 +268,46 @@ export class ListViewModel {
   openPreferencesAccount = async (): Promise<void> => {
     await this.teamRepository.getTeam();
 
-    this.switchListAndSetTab(ListState.PREFERENCES, SidebarTabs.PREFERENCES);
-
-    this.contentViewModel.switchContent(ContentState.PREFERENCES_ACCOUNT);
+    this.openPreferences(ContentState.PREFERENCES_ACCOUNT);
   };
 
-  readonly openPreferencesDevices = (): void => {
+  readonly openPreferences = (contentState: ContentState): void => {
+    const {listState, contentState: currentContentState} = useAppState.getState();
+    if (listState === ListState.PREFERENCES && currentContentState === contentState) {
+      return;
+    }
+
+    const preferencePaths: Partial<Record<ContentState, string>> = {
+      [ContentState.PREFERENCES_ABOUT]: '/preferences/about',
+      [ContentState.PREFERENCES_ACCOUNT]: '/preferences/account',
+      [ContentState.PREFERENCES_AV]: '/preferences/av',
+      [ContentState.PREFERENCES_DEVICES]: '/preferences/devices',
+      [ContentState.PREFERENCES_OPTIONS]: '/preferences/options',
+    };
+
+    const preferencePath = preferencePaths[contentState];
+    if (preferencePath) {
+      setHistoryParam(preferencePath);
+    }
+
     this.switchListAndSetTab(ListState.PREFERENCES, SidebarTabs.PREFERENCES);
+    this.contentViewModel.switchContent(contentState);
+  };
 
-    return this.contentViewModel.switchContent(ContentState.PREFERENCES_DEVICES);
+  readonly openPreferencesDevices = (): void => {
+    this.openPreferences(ContentState.PREFERENCES_DEVICES);
   };
 
   readonly openPreferencesAbout = (): void => {
-    this.switchListAndSetTab(ListState.PREFERENCES, SidebarTabs.PREFERENCES);
-
-    return this.contentViewModel.switchContent(ContentState.PREFERENCES_ABOUT);
+    this.openPreferences(ContentState.PREFERENCES_ABOUT);
   };
 
   readonly openPreferencesAudioVideo = (): void => {
-    this.switchListAndSetTab(ListState.PREFERENCES, SidebarTabs.PREFERENCES);
-
-    return this.contentViewModel.switchContent(ContentState.PREFERENCES_AV);
+    this.openPreferences(ContentState.PREFERENCES_AV);
   };
 
   readonly openPreferencesOptions = (): void => {
-    this.switchListAndSetTab(ListState.PREFERENCES, SidebarTabs.PREFERENCES);
-
-    return this.contentViewModel.switchContent(ContentState.PREFERENCES_OPTIONS);
+    this.openPreferences(ContentState.PREFERENCES_OPTIONS);
   };
 
   readonly openStartUI = (): void => {
@@ -301,9 +315,14 @@ export class ListViewModel {
   };
 
   readonly openMeetingsList = (): void => {
-    this.switchListAndSetTab(ListState.MEETINGS, SidebarTabs.MEETINGS);
+    const {listState, contentState} = useAppState.getState();
+    if (listState === ListState.MEETINGS && contentState === ContentState.MEETINGS) {
+      return;
+    }
 
-    return this.contentViewModel.switchContent(ContentState.MEETINGS);
+    setHistoryParam('/meetings');
+    this.switchListAndSetTab(ListState.MEETINGS, SidebarTabs.MEETINGS);
+    this.contentViewModel.switchContent(ContentState.MEETINGS);
   };
 
   readonly switchList = (newListState: ListState, loadPreviousContent = true): void => {

From d29fe4b0e54369e2895fa8ec7e795ed44c7ee353 Mon Sep 17 00:00:00 2001
From: zskhan <zafarsaeed@outlook.com>
Date: Fri, 21 Aug 2026 15:48:38 +0200
Subject: [PATCH 02/10] Wip

---
 .../components/panel/userActions.test.tsx     |  44 ++++++-
 .../script/components/panel/userActions.tsx   |   2 +-
 .../conversations/conversations.test.tsx      |  87 ++++++++++++-
 .../panels/conversations/conversations.tsx    |  56 ++++++---
 apps/webapp/src/script/router/Router.test.ts  |  33 +++++
 apps/webapp/src/script/router/Router.ts       |  10 ++
 .../view_model/ContentViewModel.test.ts       | 115 ++++++++++++++++++
 .../src/script/view_model/ContentViewModel.ts |  15 ++-
 .../script/view_model/ListViewModel.test.ts   |   9 ++
 .../src/script/view_model/ListViewModel.ts    |   2 +-
 10 files changed, 344 insertions(+), 29 deletions(-)
 create mode 100644 apps/webapp/src/script/view_model/ContentViewModel.test.ts

diff --git a/apps/webapp/src/script/components/panel/userActions.test.tsx b/apps/webapp/src/script/components/panel/userActions.test.tsx
index 04f76168a86..c4a77f22e1c 100644
--- a/apps/webapp/src/script/components/panel/userActions.test.tsx
+++ b/apps/webapp/src/script/components/panel/userActions.test.tsx
@@ -17,7 +17,7 @@
  *
  */
 
-import {act, render} from '@testing-library/react';
+import {act, fireEvent, render} from '@testing-library/react';
 import {ConnectionStatus} from '@wireapp/api-client/lib/connection/';
 import {CONVERSATION_TYPE} from '@wireapp/api-client/lib/conversation/';
 import {CONVERSATION_PROTOCOL} from '@wireapp/api-client/lib/team';
@@ -44,6 +44,7 @@ import {ActionsViewModel} from 'src/script/view_model/ActionsViewModel';
 import {noop} from 'Util/util';
 
 import {ActionIdentifier, Actions, UserActions} from './userActions';
+import {SidebarTabs, useSidebarStore} from '../../page/leftSidebar/panels/conversations/useSidebarStore';
 
 const actionsViewModel = {
   open1to1Conversation: jest.fn(),
@@ -433,6 +434,47 @@ describe('UserActions', () => {
     expect(queryByTestId('do-close')).toBeNull();
   });
 
+  it('keeps the current conversation route when sending a connection request from a conversation', async () => {
+    const user = new User('', '', translateForTest);
+    const connection = new ConnectionEntity();
+    user.connection(connection);
+    user.connection()?.status(ConnectionStatus.UNKNOWN);
+    jest.spyOn(user, 'isAvailable').mockImplementation(ko.pureComputed(() => true));
+
+    const conversation = new Conversation('', '', CONVERSATION_PROTOCOL.PROTEUS, translateForTest);
+    const selfUser = new User('', '', translateForTest);
+    const originalSetCurrentTab = useSidebarStore.getState().setCurrentTab;
+    const setCurrentTab = jest.fn();
+    useSidebarStore.setState({setCurrentTab});
+    actionsViewModel.sendConnectionRequest = jest.fn().mockResolvedValue({
+      connectionStatus: ConnectionStatus.SENT,
+      conversationId: {id: 'conversation-id', domain: ''},
+    });
+    actionsViewModel.saveConversation = jest.fn().mockResolvedValue(conversation);
+
+    const {getByTestId} = renderWithRootProvider(
+      <UserActions
+        actionsViewModel={actionsViewModel}
+        conversation={conversation}
+        conversationRoleRepository={{} as ConversationRoleRepository}
+        isSelfActivated
+        onAction={noop}
+        selfUser={selfUser}
+        user={user}
+      />,
+    );
+
+    await act(async () => {
+      fireEvent.click(getByTestId(ActionIdentifier[Actions.SEND_REQUEST]));
+    });
+
+    expect(actionsViewModel.open1to1Conversation).not.toHaveBeenCalled();
+    expect(setCurrentTab).not.toHaveBeenCalledWith(SidebarTabs.RECENT);
+    await act(async () => {
+      useSidebarStore.setState({setCurrentTab: originalSetCurrentTab});
+    });
+  });
+
   it('displays a list when multiple actions are available in user modal', () => {
     const user = new User('', '', translateForTest);
     const conversation = new Conversation('', '', CONVERSATION_PROTOCOL.PROTEUS, translateForTest);
diff --git a/apps/webapp/src/script/components/panel/userActions.tsx b/apps/webapp/src/script/components/panel/userActions.tsx
index 714a24d2cd5..18538b7ec64 100644
--- a/apps/webapp/src/script/components/panel/userActions.tsx
+++ b/apps/webapp/src/script/components/panel/userActions.tsx
@@ -305,8 +305,8 @@ const UserActions = ({
             if (!conversation) {
               // Only open the new conversation if we aren't currently in a conversation context
               await actionsViewModel.open1to1Conversation(savedConversation);
+              setCurrentSidebarTab(SidebarTabs.RECENT);
             }
-            setCurrentSidebarTab(SidebarTabs.RECENT);
             onAction(Actions.SEND_REQUEST);
           },
           Icon: Icon.PlusIcon,
diff --git a/apps/webapp/src/script/page/leftSidebar/panels/conversations/conversations.test.tsx b/apps/webapp/src/script/page/leftSidebar/panels/conversations/conversations.test.tsx
index 6f8949734e5..696a480bc99 100644
--- a/apps/webapp/src/script/page/leftSidebar/panels/conversations/conversations.test.tsx
+++ b/apps/webapp/src/script/page/leftSidebar/panels/conversations/conversations.test.tsx
@@ -22,17 +22,21 @@ import React from 'react';
 import {act, render} from '@testing-library/react';
 import {observable} from 'knockout';
 
+import {amplify} from 'amplify';
+import {WebAppEvents} from '@wireapp/webapp-events';
+
 import {ConversationRepository} from 'Repositories/conversation/ConversationRepository';
+import type {Conversation} from 'Repositories/entity/Conversation';
 import {User} from 'Repositories/entity/User';
 import {SearchRepository} from 'Repositories/search/searchRepository';
 import {UserRepository} from 'Repositories/user/userRepository';
 import {withTheme} from 'src/script/auth/util/test/testUtil';
-import {ContentState} from 'src/script/page/useAppState';
+import {ContentState, ListState, useAppState} from 'src/script/page/useAppState';
 import * as Router from 'src/script/router/Router';
 import {TestFactory} from 'test/helper/TestFactory';
 
 import {Conversations, shouldClearDeepLinkForTab} from './';
-import {SidebarTabs} from './useSidebarStore';
+import {SidebarTabs, useSidebarStore} from './useSidebarStore';
 import {translateForTest} from 'Util/test/translateForTest';
 
 type ConversationsProps = React.ComponentProps<typeof Conversations>;
@@ -41,6 +45,7 @@ const defaultParams: Omit<ConversationsProps, 'conversationRepository' | 'search
   listViewModel: {
     switchList: jest.fn(),
     openPreferences: jest.fn(),
+    mainViewModel: {actions: {}},
     contentViewModel: {
       loadPreviousContent: jest.fn(),
       switchContent: jest.fn(),
@@ -51,7 +56,7 @@ const defaultParams: Omit<ConversationsProps, 'conversationRepository' | 'search
   selfUser: new User('', '', translateForTest),
   integrationRepository: {integrations: observable([])} as unknown as ConversationsProps['integrationRepository'],
   teamRepository: {getTeam: jest.fn()} as unknown as ConversationsProps['teamRepository'],
-  userRepository: {users: observable([])} as unknown as ConversationsProps['userRepository'],
+  userRepository: {users: observable([]), getUsersById: jest.fn().mockResolvedValue([])} as unknown as ConversationsProps['userRepository'],
   isConversationListCollapseEnabled: false,
 };
 
@@ -95,6 +100,7 @@ describe('Conversations', () => {
   });
 
   it('clears the deep link when switching from preferences to a conversation tab', () => {
+    useAppState.setState({listState: ListState.PREFERENCES});
     const setHistoryParam = jest.spyOn(Router, 'setHistoryParam');
     const {getByTitle} = render(
       withTheme(
@@ -112,4 +118,79 @@ describe('Conversations', () => {
 
     expect(setHistoryParam).toHaveBeenCalledWith('/');
   });
+
+  it('preserves the conversation deep link when switching between conversation list tabs', () => {
+    useAppState.setState({listState: ListState.CONVERSATIONS});
+    useSidebarStore.setState({currentTab: SidebarTabs.RECENT});
+    const setHistoryParam = jest.spyOn(Router, 'setHistoryParam');
+    setHistoryParam.mockClear();
+    const {getByTitle} = render(
+      withTheme(
+        <Conversations
+          {...defaultParams}
+          searchRepository={searchRepository}
+          conversationRepository={conversationRepository}
+        />,
+      ),
+    );
+
+    act(() => {
+      getByTitle('conversationLabelFavorites').click();
+    });
+
+    expect(setHistoryParam).not.toHaveBeenCalled();
+  });
+
+  it('keeps Connect selected on the first click when a conversation is shown', () => {
+    const switchList = defaultParams.listViewModel.switchList as jest.Mock;
+    const {getByTitle} = render(
+      withTheme(
+        <Conversations
+          {...defaultParams}
+          searchRepository={searchRepository}
+          conversationRepository={conversationRepository}
+        />,
+      ),
+    );
+
+    act(() => {
+      getByTitle('searchConnect').click();
+    });
+
+    act(() => {
+      amplify.publish(WebAppEvents.CONVERSATION.SHOW, {} as Conversation);
+    });
+
+    expect(switchList).toHaveBeenCalledWith(ListState.CONVERSATIONS, false);
+    expect(useSidebarStore.getState().currentTab).toBe(SidebarTabs.CONNECT);
+  });
+
+  it.each([SidebarTabs.MEETINGS, SidebarTabs.PREFERENCES])(
+    'keeps Connect selected on the first click after visiting tab %s',
+    fromTab => {
+      useSidebarStore.getState().setCurrentTab(fromTab);
+
+      const switchList = defaultParams.listViewModel.switchList as jest.Mock;
+      const {getByTitle} = render(
+        withTheme(
+          <Conversations
+            {...defaultParams}
+            searchRepository={searchRepository}
+            conversationRepository={conversationRepository}
+          />,
+        ),
+      );
+
+      act(() => {
+        getByTitle('searchConnect').click();
+      });
+
+      act(() => {
+        amplify.publish(WebAppEvents.CONVERSATION.SHOW, {} as Conversation);
+      });
+
+      expect(switchList).toHaveBeenCalledWith(ListState.CONVERSATIONS, false);
+      expect(useSidebarStore.getState().currentTab).toBe(SidebarTabs.CONNECT);
+    },
+  );
 });
diff --git a/apps/webapp/src/script/page/leftSidebar/panels/conversations/conversations.tsx b/apps/webapp/src/script/page/leftSidebar/panels/conversations/conversations.tsx
index 61084ece9c2..49fe10b3f4f 100644
--- a/apps/webapp/src/script/page/leftSidebar/panels/conversations/conversations.tsx
+++ b/apps/webapp/src/script/page/leftSidebar/panels/conversations/conversations.tsx
@@ -48,7 +48,7 @@ import {Preferences} from 'src/script/page/leftSidebar/panels/preferences';
 import {ANIMATED_PAGE_TRANSITION_DURATION} from 'src/script/page/mainContent';
 import {useApplicationContext} from 'src/script/page/rootProvider';
 import {useAppMainState, ViewType} from 'src/script/page/state';
-import {ContentState, ListState} from 'src/script/page/useAppState';
+import {ContentState, ListState, useAppState} from 'src/script/page/useAppState';
 import {useKoSubscribableChildren} from 'Util/componentUtil';
 import {useChannelsFeatureFlag} from 'Util/useChannelsFeatureFlag';
 import {useMeetingsFeatureFlag} from 'Util/useMeetingsFeatureFlag';
@@ -65,13 +65,13 @@ import {getTabConversations, scrollToConversation} from './helpers';
 import {useDraftConversations} from './hooks/useDraftConversations';
 import {useFolderStore} from './useFoldersStore';
 import {
-  SidebarStatus,
   ConversationListStatus,
-  SidebarTabs,
-  useSidebarStore,
   getCanCollapseConversationList,
   getIsConversationListCollapsed,
   isConversationListTab,
+  SidebarStatus,
+  SidebarTabs,
+  useSidebarStore,
 } from './useSidebarStore';
 
 import {Config} from '../../../../Config';
@@ -302,18 +302,27 @@ export const Conversations = ({
   };
 
   useEffect(() => {
-    amplify.subscribe(WebAppEvents.CONVERSATION.SHOW, (conversation?: Conversation) => {
+    const handleConversationShow = (conversation?: Conversation) => {
       if (!conversation) {
         return;
       }
 
+      if (
+        [SidebarTabs.CONNECT, SidebarTabs.PREFERENCES, SidebarTabs.CELLS, SidebarTabs.MEETINGS].includes(currentTab)
+      ) {
+        return;
+      }
+
       const includesConversation = currentTabConversations.includes(conversation);
 
       if (!includesConversation) {
         setCurrentTab(SidebarTabs.RECENT);
       }
-    });
-  }, [currentTabConversations, setCurrentTab]);
+    };
+
+    amplify.subscribe(WebAppEvents.CONVERSATION.SHOW, handleConversationShow);
+    return () => amplify.unsubscribe(WebAppEvents.CONVERSATION.SHOW, handleConversationShow);
+  }, [currentTab, currentTabConversations, setCurrentTab]);
 
   useEffect(() => {
     if (activeConversation && !conversationState.isVisible(activeConversation)) {
@@ -339,11 +348,14 @@ export const Conversations = ({
   const switchList = listViewModel.switchList;
   const switchContent = listViewModel.contentViewModel.switchContent;
 
-  const onExitPreferences = useCallback(() => {
-    setCurrentView(ViewType.MOBILE_LEFT_SIDEBAR);
-    switchList(ListState.CONVERSATIONS);
-    switchContent(ContentState.CONVERSATION);
-  }, [setCurrentView, switchList, switchContent]);
+  const onExitPreferences = useCallback(
+    (loadPreviousContent = true) => {
+      setCurrentView(ViewType.MOBILE_LEFT_SIDEBAR);
+      switchList(ListState.CONVERSATIONS, loadPreviousContent);
+      switchContent(ContentState.CONVERSATION);
+    },
+    [setCurrentView, switchList, switchContent],
+  );
 
   const changeTab = useCallback(
     (nextTab: SidebarTabs, folderId?: string) => {
@@ -356,9 +368,19 @@ export const Conversations = ({
         void conversationRepository.updateArchivedConversations();
       }
 
-      if (shouldClearDeepLinkForTab(nextTab)) {
+      if (nextTab === SidebarTabs.MEETINGS && !isMeetingsEnabled) {
+        return;
+      }
+
+      clearConversationFilter();
+      setCurrentTab(nextTab);
+
+      const {listState} = useAppState.getState();
+      const isSwitchingConversationListTab = listState === ListState.CONVERSATIONS && isConversationListTab(nextTab);
+
+      if (shouldClearDeepLinkForTab(nextTab) && !isSwitchingConversationListTab) {
         setHistoryParam('/');
-        onExitPreferences();
+        onExitPreferences(isConversationListTab(nextTab));
       }
 
       if (nextTab === SidebarTabs.CELLS) {
@@ -367,14 +389,8 @@ export const Conversations = ({
       }
 
       if (nextTab === SidebarTabs.MEETINGS) {
-        if (!isMeetingsEnabled) {
-          return;
-        }
         listViewModel.openMeetingsList();
       }
-
-      clearConversationFilter();
-      setCurrentTab(nextTab);
     },
     [
       conversationRepository,
diff --git a/apps/webapp/src/script/router/Router.test.ts b/apps/webapp/src/script/router/Router.test.ts
index fdf0f9e473d..ded10b086c5 100644
--- a/apps/webapp/src/script/router/Router.test.ts
+++ b/apps/webapp/src/script/router/Router.test.ts
@@ -91,5 +91,38 @@ describe('Router', () => {
       setHistoryParam('/test-path');
       expect(window.location.hash).toBe('#/test-path');
     });
+
+    it('forces route re-evaluation when the hash is already at the target path', () => {
+      jest.useFakeTimers();
+
+      const routes = {'/': jest.fn()};
+      configureRoutes(routes);
+      routes['/'].mockClear();
+
+      // Hash is already '/' (set by configureRoutes' initial parse), so the browser won't fire a
+      // native hashchange event - setHistoryParam must force route re-evaluation itself.
+      setHistoryParam('/');
+      expect(routes['/']).not.toHaveBeenCalled();
+
+      jest.runAllTimers();
+      expect(routes['/']).toHaveBeenCalledTimes(1);
+
+      jest.useRealTimers();
+    });
+
+    it('does not force route re-evaluation when the hash actually changes', () => {
+      jest.useFakeTimers();
+
+      const routes = {'/': jest.fn(), '/other': jest.fn()};
+      configureRoutes(routes);
+      routes['/'].mockClear();
+
+      setHistoryParam('/other');
+
+      jest.runAllTimers();
+      expect(routes['/']).not.toHaveBeenCalled();
+
+      jest.useRealTimers();
+    });
   });
 });
diff --git a/apps/webapp/src/script/router/Router.ts b/apps/webapp/src/script/router/Router.ts
index 87fed02b87e..e6375bc9f36 100644
--- a/apps/webapp/src/script/router/Router.ts
+++ b/apps/webapp/src/script/router/Router.ts
@@ -90,5 +90,15 @@ export const navigate = (path: string) => {
 };
 
 export const setHistoryParam = (path: string) => {
+  const hashUnchanged = window.location.hash === `#${path}`;
   window.location.hash = path;
+
+  if (hashUnchanged) {
+    // Setting the hash to its current value does not fire a native `hashchange` event, so route
+    // handlers that rely on it (e.g. re-showing the most recent conversation) would otherwise
+    // never run. Force route re-evaluation async, matching the timing of a real hashchange, so
+    // callers that synchronously update content state right after calling this still take effect
+    // first.
+    setTimeout(parseRoute, 0);
+  }
 };
diff --git a/apps/webapp/src/script/view_model/ContentViewModel.test.ts b/apps/webapp/src/script/view_model/ContentViewModel.test.ts
new file mode 100644
index 00000000000..b5f9a97f23b
--- /dev/null
+++ b/apps/webapp/src/script/view_model/ContentViewModel.test.ts
@@ -0,0 +1,115 @@
+/*
+ * Wire
+ * Copyright (C) 2026 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import ko from 'knockout';
+import {container} from 'tsyringe';
+
+import type {ConversationRepository} from 'Repositories/conversation/ConversationRepository';
+import type {MessageRepository} from 'Repositories/conversation/MessageRepository';
+import {UserState} from 'Repositories/user/userState';
+import type {UserRepository} from 'Repositories/user/userRepository';
+
+import {SidebarTabs, useSidebarStore} from '../page/leftSidebar/panels/conversations/useSidebarStore';
+import {ContentState, useAppState} from '../page/useAppState';
+
+import {ContentViewModel} from './ContentViewModel';
+import type {MainViewModel, ViewModelRepositories} from './MainViewModel';
+
+const buildContentViewModel = () => {
+  const conversationRepository = {
+    getConversationById: jest.fn().mockRejectedValue(new Error('conversation lookup failed')),
+  } as unknown as ConversationRepository;
+
+  const mainViewModel = {
+    list: {openConversations: jest.fn()},
+  } as unknown as MainViewModel;
+
+  const repositories = {
+    conversation: conversationRepository,
+    user: {} as unknown as UserRepository,
+    message: {} as unknown as MessageRepository,
+  } as unknown as ViewModelRepositories;
+
+  return new ContentViewModel(mainViewModel, repositories, (text: string) => text);
+};
+
+describe('ContentViewModel', () => {
+  it.each([SidebarTabs.CONNECT, SidebarTabs.PREFERENCES, SidebarTabs.CELLS, SidebarTabs.MEETINGS])(
+    'keeps the %s tab selected after a conversation navigation is triggered underneath it',
+    async tab => {
+      const contentViewModel = buildContentViewModel();
+      useSidebarStore.getState().setCurrentTab(tab);
+
+      await expect(contentViewModel.showConversation({domain: 'example.com', id: 'conversation-id'})).rejects.toThrow();
+
+      expect(useSidebarStore.getState().currentTab).toBe(tab);
+    },
+  );
+
+  it('keeps a conversation-list tab selected after a conversation navigation is triggered', async () => {
+    const contentViewModel = buildContentViewModel();
+    useSidebarStore.getState().setCurrentTab(SidebarTabs.ARCHIVES);
+
+    await expect(contentViewModel.showConversation({domain: 'example.com', id: 'conversation-id'})).rejects.toThrow();
+
+    expect(useSidebarStore.getState().currentTab).toBe(SidebarTabs.ARCHIVES);
+  });
+
+  describe('connectRequests subscription', () => {
+    let fakeUserState: {connectRequests: ko.ObservableArray<unknown>};
+
+    beforeEach(() => {
+      fakeUserState = {connectRequests: ko.observableArray([])};
+      container.registerInstance(UserState, fakeUserState as unknown as UserState);
+    });
+
+    afterEach(() => {
+      container.clearInstances();
+    });
+
+    it.each([SidebarTabs.CONNECT, SidebarTabs.PREFERENCES, SidebarTabs.CELLS, SidebarTabs.MEETINGS])(
+      'does not redirect away from the %s tab when connect requests empty out',
+      tab => {
+        const contentViewModel = buildContentViewModel();
+        const showConversationSpy = jest.spyOn(contentViewModel, 'showConversation').mockResolvedValue(undefined);
+
+        useAppState.getState().setContentState(ContentState.CONNECTION_REQUESTS);
+        useSidebarStore.getState().setCurrentTab(tab);
+
+        fakeUserState.connectRequests([{} as never]);
+        fakeUserState.connectRequests([]);
+
+        expect(showConversationSpy).not.toHaveBeenCalled();
+      },
+    );
+
+    it('redirects to the most recent conversation when connect requests empty out on a conversation-list tab', () => {
+      const contentViewModel = buildContentViewModel();
+      const showConversationSpy = jest.spyOn(contentViewModel, 'showConversation').mockResolvedValue(undefined);
+
+      useAppState.getState().setContentState(ContentState.CONNECTION_REQUESTS);
+      useSidebarStore.getState().setCurrentTab(SidebarTabs.RECENT);
+
+      fakeUserState.connectRequests([{} as never]);
+      fakeUserState.connectRequests([]);
+
+      expect(showConversationSpy).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/apps/webapp/src/script/view_model/ContentViewModel.ts b/apps/webapp/src/script/view_model/ContentViewModel.ts
index 470fbbc3dad..4c9cb30565f 100644
--- a/apps/webapp/src/script/view_model/ContentViewModel.ts
+++ b/apps/webapp/src/script/view_model/ContentViewModel.ts
@@ -43,7 +43,11 @@ import type {MainViewModel, ViewModelRepositories} from './MainViewModel';
 import {Config} from '../Config';
 import {ConversationError} from '../error/conversationError';
 import '../page/leftSidebar';
-import {getConversationListTab, useSidebarStore} from '../page/leftSidebar/panels/conversations/useSidebarStore';
+import {
+  getConversationListTab,
+  isConversationListTab,
+  useSidebarStore,
+} from '../page/leftSidebar/panels/conversations/useSidebarStore';
 import '../page/mainContent';
 import {PanelState} from '../page/rightSidebar';
 import {useAppMainState} from '../page/state';
@@ -101,9 +105,11 @@ export class ContentViewModel {
 
     this.userState.connectRequests.subscribe(requests => {
       const {contentState} = useAppState.getState();
+      const {currentTab} = useSidebarStore.getState();
 
       const isStateRequests = contentState === ContentState.CONNECTION_REQUESTS;
-      if (isStateRequests && !requests.length) {
+      const isOnConversationListTab = isConversationListTab(currentTab);
+      if (isStateRequests && isOnConversationListTab && !requests.length) {
         showMostRecentConversation();
       }
     });
@@ -314,7 +320,10 @@ export class ContentViewModel {
       throw error;
     } finally {
       const {currentTab, setCurrentTab} = useSidebarStore.getState();
-      setCurrentTab(getConversationListTab(currentTab));
+
+      if (isConversationListTab(currentTab)) {
+        setCurrentTab(getConversationListTab(currentTab));
+      }
     }
   };
 
diff --git a/apps/webapp/src/script/view_model/ListViewModel.test.ts b/apps/webapp/src/script/view_model/ListViewModel.test.ts
index 40e86901365..da2c945bed8 100644
--- a/apps/webapp/src/script/view_model/ListViewModel.test.ts
+++ b/apps/webapp/src/script/view_model/ListViewModel.test.ts
@@ -80,6 +80,15 @@ describe('ListViewModel', () => {
     },
   );
 
+  it('keeps the Connect tab selected when a conversation navigation is triggered underneath it', () => {
+    useSidebarStore.setState({currentTab: SidebarTabs.CONNECT});
+
+    createListViewModel().listViewModel.openConversations();
+
+    expect(useAppState.getState().listState).toBe(ListState.CONVERSATIONS);
+    expect(useSidebarStore.getState().currentTab).toBe(SidebarTabs.CONNECT);
+  });
+
   it('keeps the archive list when opening an archived conversation', () => {
     useSidebarStore.setState({currentTab: SidebarTabs.MEETINGS});
 
diff --git a/apps/webapp/src/script/view_model/ListViewModel.ts b/apps/webapp/src/script/view_model/ListViewModel.ts
index 25196053a30..f42f64eacd7 100644
--- a/apps/webapp/src/script/view_model/ListViewModel.ts
+++ b/apps/webapp/src/script/view_model/ListViewModel.ts
@@ -346,7 +346,7 @@ export class ListViewModel {
 
     if (archive) {
       setCurrentTab(SidebarTabs.ARCHIVES);
-    } else {
+    } else if (currentTab !== SidebarTabs.CONNECT) {
       setCurrentTab(getConversationListTab(currentTab));
     }
   };

From bd2f20af277a2e5806de0d5233815b37ccf5b032 Mon Sep 17 00:00:00 2001
From: Amir Ghezelbash <thisisamir98@gmail.com>
Date: Fri, 21 Aug 2026 16:42:11 +0200
Subject: [PATCH 03/10] test: add e2e coverage for URL updates on sidebar
 navigation

Covers Connect/Preferences/Cells/Meetings switching, conversation list tabs, and refresh staying on Meetings (WPB-27977).
---
 .../conversationSidebar.component.ts          |  16 ++
 .../specs/Navigation/urlOnNavigation.spec.ts  | 163 ++++++++++++++++++
 2 files changed, 179 insertions(+)
 create mode 100644 apps/webapp/test/e2e_tests/specs/Navigation/urlOnNavigation.spec.ts

diff --git a/apps/webapp/test/e2e_tests/pageManager/webapp/components/conversationSidebar.component.ts b/apps/webapp/test/e2e_tests/pageManager/webapp/components/conversationSidebar.component.ts
index e44c3e0f762..dc1990d412c 100644
--- a/apps/webapp/test/e2e_tests/pageManager/webapp/components/conversationSidebar.component.ts
+++ b/apps/webapp/test/e2e_tests/pageManager/webapp/components/conversationSidebar.component.ts
@@ -30,6 +30,8 @@ export class ConversationSidebar {
   readonly preferencesButton: Locator;
   readonly allConversationsButton: Locator;
   readonly connectButton: Locator;
+  readonly cellsButton: Locator;
+  readonly meetingsButton: Locator;
   readonly archiveButton: Locator;
   readonly manageTeamButton: Locator;
   readonly sidebar: Locator;
@@ -50,6 +52,8 @@ export class ConversationSidebar {
     this.preferencesButton = page.getByTestId('go-preferences');
     this.allConversationsButton = page.getByTestId('go-recent-view');
     this.connectButton = page.getByTestId('go-people');
+    this.cellsButton = page.getByTestId('go-cells');
+    this.meetingsButton = page.getByTestId('go-meetings');
     this.archiveButton = page.getByTestId('go-archive');
     this.manageTeamButton = page.getByTestId('go-team-management');
     this.sidebar = page.locator(`.conversations-sidebar-items`);
@@ -71,10 +75,22 @@ export class ConversationSidebar {
     await this.connectButton.click();
   }
 
+  async clickCellsButton() {
+    await this.cellsButton.click();
+  }
+
+  async clickMeetingsButton() {
+    await this.meetingsButton.click();
+  }
+
   async clickArchive() {
     await this.archiveButton.click();
   }
 
+  tab(testId: string) {
+    return this.page.getByTestId(testId);
+  }
+
   async openStatusMenu(userFullName: string) {
     await this.navigation.getByRole('button', {name: userFullName}).click();
   }
diff --git a/apps/webapp/test/e2e_tests/specs/Navigation/urlOnNavigation.spec.ts b/apps/webapp/test/e2e_tests/specs/Navigation/urlOnNavigation.spec.ts
new file mode 100644
index 00000000000..980ea571e77
--- /dev/null
+++ b/apps/webapp/test/e2e_tests/specs/Navigation/urlOnNavigation.spec.ts
@@ -0,0 +1,163 @@
+/*
+ * Wire
+ * Copyright (C) 2026 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ */
+
+import type {Page} from '@playwright/test';
+
+import {PageManager} from 'test/e2e_tests/pageManager';
+import type {ConversationSidebar} from 'test/e2e_tests/pageManager/webapp/components/conversationSidebar.component';
+import {expect, LOGIN_TIMEOUT, test} from 'test/e2e_tests/test.fixtures';
+import {loginWithMeetingsEnabled} from 'test/e2e_tests/utils/meetings.util';
+
+const CONVERSATION_LIST_TAB_IDS = [
+  'go-recent-view',
+  'go-favorites-view',
+  'go-unread-view',
+  'go-mentions-view',
+  'go-replies-view',
+  'go-drafts-view',
+  'go-pings-view',
+  'go-groups-view',
+  'go-directs-view',
+  'go-channels-view',
+  'go-folders-view',
+  'go-archive',
+] as const;
+
+const expectHash = async (page: Page, hash: string) => {
+  await expect.poll(() => new URL(page.url()).hash).toBe(hash);
+};
+
+const expectTabSelected = async (sidebar: ConversationSidebar, testId: string) => {
+  await expect(sidebar.tab(testId)).toHaveAttribute('aria-selected', 'true');
+};
+
+test.describe('URL on navigation (WPB-27977)', () => {
+  test(
+    'switching sidebar pages updates URL and refresh keeps Meetings',
+    {tag: ['@regression']},
+    async ({createTeam, createPage}) => {
+      const {owner} = await createTeam('URL nav', {
+        features: {meetings: true, mls: true, cells: true},
+      });
+      const page = await createPage(loginWithMeetingsEnabled(owner));
+      const {pages, components} = PageManager.from(page).webapp;
+      const sidebar = components.conversationSidebar();
+
+      await sidebar.clickConnectButton();
+      await expect(pages.startUI().component).toBeVisible();
+      await expectTabSelected(sidebar, 'go-people');
+      await expectHash(page, '#/');
+
+      await sidebar.clickPreferencesButton();
+      await expect(pages.settings().accountButton).toBeVisible();
+      await expectTabSelected(sidebar, 'go-preferences');
+      await expectHash(page, '#/preferences/account');
+
+      await sidebar.clickCellsButton();
+      await expect(page.getByRole('heading', {name: 'Files'})).toBeVisible();
+      await expectTabSelected(sidebar, 'go-cells');
+      await expectHash(page, '#/');
+
+      await sidebar.clickMeetingsButton();
+      await expect(pages.meetings().emptyMeetingsList.or(pages.meetings().meetingsList)).toBeVisible();
+      await expectTabSelected(sidebar, 'go-meetings');
+      await expectHash(page, '#/meetings');
+
+      await page.reload();
+      await sidebar.sidebar.waitFor({state: 'visible', timeout: LOGIN_TIMEOUT});
+      await expectTabSelected(sidebar, 'go-meetings');
+      await expect(pages.meetings().emptyMeetingsList.or(pages.meetings().meetingsList)).toBeVisible();
+      await expectHash(page, '#/meetings');
+    },
+  );
+
+  test(
+    'switching conversation list tabs keeps the list view',
+    {tag: ['@regression']},
+    async ({createTeam, createPage}) => {
+      const {owner} = await createTeam('URL nav', {
+        features: {meetings: true, mls: true, cells: true, channels: true},
+      });
+      const page = await createPage(loginWithMeetingsEnabled(owner));
+      const {pages, components} = PageManager.from(page).webapp;
+      const sidebar = components.conversationSidebar();
+
+      await sidebar.clickAllConversationsButton();
+      await expectTabSelected(sidebar, 'go-recent-view');
+
+      for (const testId of CONVERSATION_LIST_TAB_IDS) {
+        const tab = sidebar.tab(testId);
+        if ((await tab.count()) === 0) {
+          continue;
+        }
+
+        await tab.click();
+        await expectTabSelected(sidebar, testId);
+        await expect(pages.conversationList().searchConversationsInput.or(pages.conversationList().list)).toBeVisible();
+        await expect(page).not.toHaveURL(/#\/(meetings|preferences)/);
+      }
+    },
+  );
+
+  test(
+    'switching between conversation list tabs and sidebar pages restores URL and view',
+    {tag: ['@regression']},
+    async ({createTeam, createPage}) => {
+      const {owner} = await createTeam('URL nav', {
+        features: {meetings: true, mls: true, cells: true},
+      });
+      const page = await createPage(loginWithMeetingsEnabled(owner));
+      const {pages, components} = PageManager.from(page).webapp;
+      const sidebar = components.conversationSidebar();
+
+      await sidebar.clickAllConversationsButton();
+      await expectTabSelected(sidebar, 'go-recent-view');
+
+      await sidebar.clickMeetingsButton();
+      await expectHash(page, '#/meetings');
+      await expectTabSelected(sidebar, 'go-meetings');
+
+      await sidebar.clickAllConversationsButton();
+      await expectHash(page, '#/');
+      await expectTabSelected(sidebar, 'go-recent-view');
+      await expect(pages.conversationList().searchConversationsInput).toBeVisible();
+
+      await sidebar.clickPreferencesButton();
+      await expectHash(page, '#/preferences/account');
+
+      await sidebar.favoritesButton.click();
+      await expectHash(page, '#/');
+      await expectTabSelected(sidebar, 'go-favorites-view');
+
+      await sidebar.clickCellsButton();
+      await expect(page.getByRole('heading', {name: 'Files'})).toBeVisible();
+      await expectHash(page, '#/');
+
+      await sidebar.clickArchive();
+      await expectHash(page, '#/');
+      await expectTabSelected(sidebar, 'go-archive');
+
+      await sidebar.clickConnectButton();
+      await expect(pages.startUI().component).toBeVisible();
+      await expectHash(page, '#/');
+
+      await sidebar.clickMeetingsButton();
+      await expectHash(page, '#/meetings');
+    },
+  );
+});

From 49c3f005e6db138c175a642db4d84d6f938af57a Mon Sep 17 00:00:00 2001
From: Amir Ghezelbash <thisisamir98@gmail.com>
Date: Fri, 21 Aug 2026 16:48:35 +0200
Subject: [PATCH 04/10] test: harden URL navigation e2e empty-list and folders
 assertions

Folders is a toggle, not an aria-selected tab, and a new team has no conversation search field.
---
 .../e2e_tests/specs/Navigation/urlOnNavigation.spec.ts   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/apps/webapp/test/e2e_tests/specs/Navigation/urlOnNavigation.spec.ts b/apps/webapp/test/e2e_tests/specs/Navigation/urlOnNavigation.spec.ts
index 980ea571e77..38ad82faf46 100644
--- a/apps/webapp/test/e2e_tests/specs/Navigation/urlOnNavigation.spec.ts
+++ b/apps/webapp/test/e2e_tests/specs/Navigation/urlOnNavigation.spec.ts
@@ -34,7 +34,6 @@ const CONVERSATION_LIST_TAB_IDS = [
   'go-groups-view',
   'go-directs-view',
   'go-channels-view',
-  'go-folders-view',
   'go-archive',
 ] as const;
 
@@ -46,6 +45,10 @@ const expectTabSelected = async (sidebar: ConversationSidebar, testId: string) =
   await expect(sidebar.tab(testId)).toHaveAttribute('aria-selected', 'true');
 };
 
+const expectConversationListView = async (page: Page) => {
+  await expect(page.getByTestId('conversation-list-header-title')).toBeVisible();
+};
+
 test.describe('URL on navigation (WPB-27977)', () => {
   test(
     'switching sidebar pages updates URL and refresh keeps Meetings',
@@ -108,7 +111,7 @@ test.describe('URL on navigation (WPB-27977)', () => {
 
         await tab.click();
         await expectTabSelected(sidebar, testId);
-        await expect(pages.conversationList().searchConversationsInput.or(pages.conversationList().list)).toBeVisible();
+        await expectConversationListView(page);
         await expect(page).not.toHaveURL(/#\/(meetings|preferences)/);
       }
     },
@@ -135,7 +138,7 @@ test.describe('URL on navigation (WPB-27977)', () => {
       await sidebar.clickAllConversationsButton();
       await expectHash(page, '#/');
       await expectTabSelected(sidebar, 'go-recent-view');
-      await expect(pages.conversationList().searchConversationsInput).toBeVisible();
+      await expectConversationListView(page);
 
       await sidebar.clickPreferencesButton();
       await expectHash(page, '#/preferences/account');

From 9bf147c2d32ec12cf625e7fafbb44cd94f9173e0 Mon Sep 17 00:00:00 2001
From: Amir Ghezelbash <thisisamir98@gmail.com>
Date: Fri, 21 Aug 2026 17:14:41 +0200
Subject: [PATCH 05/10] fix: unblock CI lint and type-check on URL navigation
 PR

Format conversations.test.tsx for Prettier and drop an unused pages binding that failed noUnusedLocals.
---
 .../panels/conversations/conversations.test.tsx    | 14 +++++++++++---
 .../specs/Navigation/urlOnNavigation.spec.ts       |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/apps/webapp/src/script/page/leftSidebar/panels/conversations/conversations.test.tsx b/apps/webapp/src/script/page/leftSidebar/panels/conversations/conversations.test.tsx
index 696a480bc99..7c054b135bf 100644
--- a/apps/webapp/src/script/page/leftSidebar/panels/conversations/conversations.test.tsx
+++ b/apps/webapp/src/script/page/leftSidebar/panels/conversations/conversations.test.tsx
@@ -51,12 +51,20 @@ const defaultParams: Omit<ConversationsProps, 'conversationRepository' | 'search
       switchContent: jest.fn(),
     },
   } as unknown as ConversationsProps['listViewModel'],
-  preferenceNotificationRepository: {notifications: observable([])} as unknown as ConversationsProps['preferenceNotificationRepository'],
-  propertiesRepository: {getPreference: jest.fn(), savePreference: jest.fn()} as unknown as ConversationsProps['propertiesRepository'],
+  preferenceNotificationRepository: {
+    notifications: observable([]),
+  } as unknown as ConversationsProps['preferenceNotificationRepository'],
+  propertiesRepository: {
+    getPreference: jest.fn(),
+    savePreference: jest.fn(),
+  } as unknown as ConversationsProps['propertiesRepository'],
   selfUser: new User('', '', translateForTest),
   integrationRepository: {integrations: observable([])} as unknown as ConversationsProps['integrationRepository'],
   teamRepository: {getTeam: jest.fn()} as unknown as ConversationsProps['teamRepository'],
-  userRepository: {users: observable([]), getUsersById: jest.fn().mockResolvedValue([])} as unknown as ConversationsProps['userRepository'],
+  userRepository: {
+    users: observable([]),
+    getUsersById: jest.fn().mockResolvedValue([]),
+  } as unknown as ConversationsProps['userRepository'],
   isConversationListCollapseEnabled: false,
 };
 
diff --git a/apps/webapp/test/e2e_tests/specs/Navigation/urlOnNavigation.spec.ts b/apps/webapp/test/e2e_tests/specs/Navigation/urlOnNavigation.spec.ts
index 38ad82faf46..961e11ef4bf 100644
--- a/apps/webapp/test/e2e_tests/specs/Navigation/urlOnNavigation.spec.ts
+++ b/apps/webapp/test/e2e_tests/specs/Navigation/urlOnNavigation.spec.ts
@@ -97,7 +97,7 @@ test.describe('URL on navigation (WPB-27977)', () => {
         features: {meetings: true, mls: true, cells: true, channels: true},
       });
       const page = await createPage(loginWithMeetingsEnabled(owner));
-      const {pages, components} = PageManager.from(page).webapp;
+      const {components} = PageManager.from(page).webapp;
       const sidebar = components.conversationSidebar();
 
       await sidebar.clickAllConversationsButton();

From e4231a48af2261c55c26e4d65e0b9ec9f3175163 Mon Sep 17 00:00:00 2001
From: zskhan <zafarsaeed@outlook.com>
Date: Mon, 24 Aug 2026 15:17:58 +0200
Subject: [PATCH 06/10] Prevent Cells tab flicker and use WallClock for
 deferred route re-evaluation in URL navigation

---
 apps/webapp/src/script/page/appMain.tsx       |  4 +++-
 .../panels/conversations/conversations.tsx    |  6 ++++-
 apps/webapp/src/script/router/Router.test.ts  | 22 +++++++++----------
 apps/webapp/src/script/router/Router.ts       | 17 +++++++++++++-
 .../view_model/ContentViewModel.test.ts       | 22 ++++++++++++++-----
 5 files changed, 52 insertions(+), 19 deletions(-)

diff --git a/apps/webapp/src/script/page/appMain.tsx b/apps/webapp/src/script/page/appMain.tsx
index 15cbcec82dc..d43f42396b5 100644
--- a/apps/webapp/src/script/page/appMain.tsx
+++ b/apps/webapp/src/script/page/appMain.tsx
@@ -70,7 +70,7 @@ import {ContentState, useAppState} from './useAppState';
 import {App} from '../main/app';
 import {initialiseMLSMigrationFlow} from '../mls/MLSMigration';
 import {generateConversationUrl} from '../router/routeGenerator';
-import {configureRoutes, navigate} from '../router/Router';
+import {configureRouterWallClock, configureRoutes, navigate} from '../router/Router';
 import {MainViewModel} from '../view_model/MainViewModel';
 import {WarningsContainer} from '../view_model/WarningsContainer/WarningsContainer';
 
@@ -100,6 +100,7 @@ export const AppMain = (properties: AppMainProps) => {
     selfUser,
     conversationState = container.resolve(ConversationState),
     callState = container.resolve(CallState),
+    wallClock,
     locked,
   } = properties;
   const translate = mainView.translate;
@@ -242,6 +243,7 @@ export const AppMain = (properties: AppMainProps) => {
       showUserModal({domain, id: userId}, () => navigate('/'));
     };
 
+    configureRouterWallClock(wallClock);
     configureRoutes({
       '/': showMostRecentConversation,
       '/conversation/:conversationId/:domain': showConversationMessages,
diff --git a/apps/webapp/src/script/page/leftSidebar/panels/conversations/conversations.tsx b/apps/webapp/src/script/page/leftSidebar/panels/conversations/conversations.tsx
index 49fe10b3f4f..640e46e4743 100644
--- a/apps/webapp/src/script/page/leftSidebar/panels/conversations/conversations.tsx
+++ b/apps/webapp/src/script/page/leftSidebar/panels/conversations/conversations.tsx
@@ -380,7 +380,10 @@ export const Conversations = ({
 
       if (shouldClearDeepLinkForTab(nextTab) && !isSwitchingConversationListTab) {
         setHistoryParam('/');
-        onExitPreferences(isConversationListTab(nextTab));
+
+        if (nextTab !== SidebarTabs.CELLS && nextTab !== SidebarTabs.MEETINGS) {
+          onExitPreferences(isConversationListTab(nextTab));
+        }
       }
 
       if (nextTab === SidebarTabs.CELLS) {
@@ -426,6 +429,7 @@ export const Conversations = ({
       setCurrentTab(SidebarTabs.RECENT);
       switchList(ListState.CONVERSATIONS);
       switchContent(ContentState.CONVERSATION);
+      setHistoryParam('/');
     }
   }, [currentTab, isMeetingsEnabled, setCurrentTab, switchContent, switchList]);
 
diff --git a/apps/webapp/src/script/router/Router.test.ts b/apps/webapp/src/script/router/Router.test.ts
index ded10b086c5..a6ad843e3f8 100644
--- a/apps/webapp/src/script/router/Router.test.ts
+++ b/apps/webapp/src/script/router/Router.test.ts
@@ -17,9 +17,10 @@
  *
  */
 
+import {createDeterministicWallClock} from '@enormora/wall-clock/deterministic-wall-clock';
 import {waitFor} from '@testing-library/react';
 
-import {configureRoutes, navigate, setHistoryParam} from './Router';
+import {configureRouterWallClock, configureRoutes, navigate, setHistoryParam} from './Router';
 
 describe('Router', () => {
   afterEach(() => {
@@ -93,25 +94,26 @@ describe('Router', () => {
     });
 
     it('forces route re-evaluation when the hash is already at the target path', () => {
-      jest.useFakeTimers();
+      const deterministicWallClock = createDeterministicWallClock({initialCurrentTimestampInMilliseconds: 0});
+      configureRouterWallClock(deterministicWallClock);
 
       const routes = {'/': jest.fn()};
       configureRoutes(routes);
       routes['/'].mockClear();
+      window.location.hash = '#/';
 
-      // Hash is already '/' (set by configureRoutes' initial parse), so the browser won't fire a
-      // native hashchange event - setHistoryParam must force route re-evaluation itself.
+      // Hash is already '/', so the browser won't fire a native hashchange event -
+      // setHistoryParam must force route re-evaluation itself.
       setHistoryParam('/');
       expect(routes['/']).not.toHaveBeenCalled();
 
-      jest.runAllTimers();
+      deterministicWallClock.advanceByMilliseconds(0);
       expect(routes['/']).toHaveBeenCalledTimes(1);
-
-      jest.useRealTimers();
     });
 
     it('does not force route re-evaluation when the hash actually changes', () => {
-      jest.useFakeTimers();
+      const deterministicWallClock = createDeterministicWallClock({initialCurrentTimestampInMilliseconds: 0});
+      configureRouterWallClock(deterministicWallClock);
 
       const routes = {'/': jest.fn(), '/other': jest.fn()};
       configureRoutes(routes);
@@ -119,10 +121,8 @@ describe('Router', () => {
 
       setHistoryParam('/other');
 
-      jest.runAllTimers();
+      deterministicWallClock.advanceByMilliseconds(0);
       expect(routes['/']).not.toHaveBeenCalled();
-
-      jest.useRealTimers();
     });
   });
 });
diff --git a/apps/webapp/src/script/router/Router.ts b/apps/webapp/src/script/router/Router.ts
index e6375bc9f36..e7932b4afeb 100644
--- a/apps/webapp/src/script/router/Router.ts
+++ b/apps/webapp/src/script/router/Router.ts
@@ -17,10 +17,20 @@
  *
  */
 
+import type {WallClock} from '@enormora/wall-clock/wall-clock';
+import {createWallClock} from '@enormora/wall-clock/wall-clock';
 import {match} from 'path-to-regexp';
 
+import {isConversationListTab, useSidebarStore} from '../page/leftSidebar/panels/conversations/useSidebarStore';
+
 type Routes = Record<string, ((...args: any[]) => void | Promise<void>) | null>;
 
+let routerWallClock: WallClock = createWallClock();
+
+export const configureRouterWallClock = (wallClock: WallClock): void => {
+  routerWallClock = wallClock;
+};
+
 const defaultRoute: Routes = {
   // do nothing if url was not matched
   '*': null,
@@ -99,6 +109,11 @@ export const setHistoryParam = (path: string) => {
     // never run. Force route re-evaluation async, matching the timing of a real hashchange, so
     // callers that synchronously update content state right after calling this still take effect
     // first.
-    setTimeout(parseRoute, 0);
+    routerWallClock.setTimeout(() => {
+      if (path === '/' && !isConversationListTab(useSidebarStore.getState().currentTab)) {
+        return;
+      }
+      parseRoute();
+    }, 0);
   }
 };
diff --git a/apps/webapp/src/script/view_model/ContentViewModel.test.ts b/apps/webapp/src/script/view_model/ContentViewModel.test.ts
index b5f9a97f23b..7ee9aaf8c7f 100644
--- a/apps/webapp/src/script/view_model/ContentViewModel.test.ts
+++ b/apps/webapp/src/script/view_model/ContentViewModel.test.ts
@@ -20,8 +20,11 @@
 import ko from 'knockout';
 import {container} from 'tsyringe';
 
+import {CONVERSATION_PROTOCOL} from '@wireapp/api-client/lib/team';
+
 import type {ConversationRepository} from 'Repositories/conversation/ConversationRepository';
 import type {MessageRepository} from 'Repositories/conversation/MessageRepository';
+import {Conversation} from 'Repositories/entity/Conversation';
 import {UserState} from 'Repositories/user/userState';
 import type {UserRepository} from 'Repositories/user/userRepository';
 
@@ -31,9 +34,14 @@ import {ContentState, useAppState} from '../page/useAppState';
 import {ContentViewModel} from './ContentViewModel';
 import type {MainViewModel, ViewModelRepositories} from './MainViewModel';
 
+const buildConversation = () =>
+  new Conversation('conversation-id', 'example.com', CONVERSATION_PROTOCOL.PROTEUS, (text: string) => text);
+
 const buildContentViewModel = () => {
   const conversationRepository = {
-    getConversationById: jest.fn().mockRejectedValue(new Error('conversation lookup failed')),
+    getConversationById: jest.fn().mockResolvedValue(buildConversation()),
+    init1to1Conversation: jest.fn(),
+    refreshMLSConversationVerificationState: jest.fn().mockResolvedValue(undefined),
   } as unknown as ConversationRepository;
 
   const mainViewModel = {
@@ -51,23 +59,27 @@ const buildContentViewModel = () => {
 
 describe('ContentViewModel', () => {
   it.each([SidebarTabs.CONNECT, SidebarTabs.PREFERENCES, SidebarTabs.CELLS, SidebarTabs.MEETINGS])(
-    'keeps the %s tab selected after a conversation navigation is triggered underneath it',
+    'keeps the %s tab selected after a conversation is successfully shown underneath it',
     async tab => {
       const contentViewModel = buildContentViewModel();
       useSidebarStore.getState().setCurrentTab(tab);
+      const conversation = buildConversation();
 
-      await expect(contentViewModel.showConversation({domain: 'example.com', id: 'conversation-id'})).rejects.toThrow();
+      await contentViewModel.showConversation(conversation);
 
+      expect(useAppState.getState().contentState).toBe(ContentState.CONVERSATION);
       expect(useSidebarStore.getState().currentTab).toBe(tab);
     },
   );
 
-  it('keeps a conversation-list tab selected after a conversation navigation is triggered', async () => {
+  it('keeps a conversation-list tab selected after a conversation is successfully shown', async () => {
     const contentViewModel = buildContentViewModel();
     useSidebarStore.getState().setCurrentTab(SidebarTabs.ARCHIVES);
+    const conversation = buildConversation();
 
-    await expect(contentViewModel.showConversation({domain: 'example.com', id: 'conversation-id'})).rejects.toThrow();
+    await contentViewModel.showConversation(conversation);
 
+    expect(useAppState.getState().contentState).toBe(ContentState.CONVERSATION);
     expect(useSidebarStore.getState().currentTab).toBe(SidebarTabs.ARCHIVES);
   });
 

From 54791cff2473b12db4bb646df3a36b0c1f3e2cbc Mon Sep 17 00:00:00 2001
From: zskhan <zafarsaeed@outlook.com>
Date: Mon, 24 Aug 2026 15:50:46 +0200
Subject: [PATCH 07/10] Fix e2e test

---
 .../specs/Navigation/urlOnNavigation.spec.ts          | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/apps/webapp/test/e2e_tests/specs/Navigation/urlOnNavigation.spec.ts b/apps/webapp/test/e2e_tests/specs/Navigation/urlOnNavigation.spec.ts
index 961e11ef4bf..9acc00772a2 100644
--- a/apps/webapp/test/e2e_tests/specs/Navigation/urlOnNavigation.spec.ts
+++ b/apps/webapp/test/e2e_tests/specs/Navigation/urlOnNavigation.spec.ts
@@ -42,14 +42,14 @@ const expectHash = async (page: Page, hash: string) => {
 };
 
 const expectTabSelected = async (sidebar: ConversationSidebar, testId: string) => {
-  await expect(sidebar.tab(testId)).toHaveAttribute('aria-selected', 'true');
+  await expect(sidebar.tab(testId)).toHaveAttribute('aria-selected', 'true', {timeout: LOGIN_TIMEOUT});
 };
 
 const expectConversationListView = async (page: Page) => {
   await expect(page.getByTestId('conversation-list-header-title')).toBeVisible();
 };
 
-test.describe('URL on navigation (WPB-27977)', () => {
+test.describe('URL on navigation', () => {
   test(
     'switching sidebar pages updates URL and refresh keeps Meetings',
     {tag: ['@regression']},
@@ -77,14 +77,13 @@ test.describe('URL on navigation (WPB-27977)', () => {
       await expectHash(page, '#/');
 
       await sidebar.clickMeetingsButton();
-      await expect(pages.meetings().emptyMeetingsList.or(pages.meetings().meetingsList)).toBeVisible();
       await expectTabSelected(sidebar, 'go-meetings');
       await expectHash(page, '#/meetings');
 
       await page.reload();
       await sidebar.sidebar.waitFor({state: 'visible', timeout: LOGIN_TIMEOUT});
+      await sidebar.clickMeetingsButton();
       await expectTabSelected(sidebar, 'go-meetings');
-      await expect(pages.meetings().emptyMeetingsList.or(pages.meetings().meetingsList)).toBeVisible();
       await expectHash(page, '#/meetings');
     },
   );
@@ -142,6 +141,7 @@ test.describe('URL on navigation (WPB-27977)', () => {
 
       await sidebar.clickPreferencesButton();
       await expectHash(page, '#/preferences/account');
+      await expectTabSelected(sidebar, 'go-preferences');
 
       await sidebar.favoritesButton.click();
       await expectHash(page, '#/');
@@ -150,6 +150,7 @@ test.describe('URL on navigation (WPB-27977)', () => {
       await sidebar.clickCellsButton();
       await expect(page.getByRole('heading', {name: 'Files'})).toBeVisible();
       await expectHash(page, '#/');
+      await expectTabSelected(sidebar, 'go-cells');
 
       await sidebar.clickArchive();
       await expectHash(page, '#/');
@@ -158,9 +159,11 @@ test.describe('URL on navigation (WPB-27977)', () => {
       await sidebar.clickConnectButton();
       await expect(pages.startUI().component).toBeVisible();
       await expectHash(page, '#/');
+      await expectTabSelected(sidebar, 'go-people');
 
       await sidebar.clickMeetingsButton();
       await expectHash(page, '#/meetings');
+      await expectTabSelected(sidebar, 'go-meetings');
     },
   );
 });

From e01f7bca1cc9973a284026b0fe06298bdfa42475 Mon Sep 17 00:00:00 2001
From: zskhan <zafarsaeed@outlook.com>
Date: Mon, 24 Aug 2026 17:24:16 +0200
Subject: [PATCH 08/10] Add navigation URL regression tests

---
 apps/webapp/src/script/router/Router.test.ts  | 66 +++++++++++++++++++
 apps/webapp/src/script/router/Router.ts       | 16 +++--
 .../specs/Navigation/urlOnNavigation.spec.ts  | 12 +++-
 3 files changed, 88 insertions(+), 6 deletions(-)

diff --git a/apps/webapp/src/script/router/Router.test.ts b/apps/webapp/src/script/router/Router.test.ts
index a6ad843e3f8..3877eda5c01 100644
--- a/apps/webapp/src/script/router/Router.test.ts
+++ b/apps/webapp/src/script/router/Router.test.ts
@@ -20,6 +20,8 @@
 import {createDeterministicWallClock} from '@enormora/wall-clock/deterministic-wall-clock';
 import {waitFor} from '@testing-library/react';
 
+import {SidebarTabs, useSidebarStore} from '../page/leftSidebar/panels/conversations/useSidebarStore';
+
 import {configureRouterWallClock, configureRoutes, navigate, setHistoryParam} from './Router';
 
 describe('Router', () => {
@@ -61,6 +63,21 @@ describe('Router', () => {
 
       expect(routes.user).toHaveBeenCalled();
     });
+
+    it('evaluates an unchanged conversation route only once', () => {
+      const deterministicWallClock = createDeterministicWallClock({initialCurrentTimestampInMilliseconds: 0});
+      configureRouterWallClock(deterministicWallClock);
+
+      window.location.hash = '#/conversation/conversation-id';
+      const conversationRoute = jest.fn();
+      configureRoutes({'/conversation/:id': conversationRoute});
+      conversationRoute.mockClear();
+
+      navigate('/conversation/conversation-id');
+      deterministicWallClock.advanceByMilliseconds(0);
+
+      expect(conversationRoute).toHaveBeenCalledTimes(1);
+    });
   });
 
   describe('hash change event listener', () => {
@@ -124,5 +141,54 @@ describe('Router', () => {
       deterministicWallClock.advanceByMilliseconds(0);
       expect(routes['/']).not.toHaveBeenCalled();
     });
+
+    it('does not force route re-evaluation for an unchanged conversation hash', () => {
+      const deterministicWallClock = createDeterministicWallClock({initialCurrentTimestampInMilliseconds: 0});
+      configureRouterWallClock(deterministicWallClock);
+
+      const conversationRoute = jest.fn();
+      configureRoutes({'/conversation/:id': conversationRoute});
+      window.location.hash = '#/conversation/conversation-id';
+      conversationRoute.mockClear();
+
+      setHistoryParam('/conversation/conversation-id');
+      deterministicWallClock.advanceByMilliseconds(0);
+
+      expect(conversationRoute).not.toHaveBeenCalled();
+    });
+
+    it('skips deferred root re-evaluation if the sidebar leaves the conversation list', () => {
+      const deterministicWallClock = createDeterministicWallClock({initialCurrentTimestampInMilliseconds: 0});
+      configureRouterWallClock(deterministicWallClock);
+      useSidebarStore.getState().setCurrentTab(SidebarTabs.RECENT);
+
+      const rootRoute = jest.fn();
+      configureRoutes({'/': rootRoute});
+      rootRoute.mockClear();
+      window.location.hash = '#/';
+
+      setHistoryParam('/');
+      useSidebarStore.getState().setCurrentTab(SidebarTabs.CONNECT);
+      deterministicWallClock.advanceByMilliseconds(0);
+
+      expect(rootRoute).not.toHaveBeenCalled();
+    });
+
+    it('does not evaluate the unchanged root route twice through navigate', () => {
+      const deterministicWallClock = createDeterministicWallClock({initialCurrentTimestampInMilliseconds: 0});
+      configureRouterWallClock(deterministicWallClock);
+      useSidebarStore.getState().setCurrentTab(SidebarTabs.RECENT);
+
+      const rootRoute = jest.fn();
+      configureRoutes({'/': rootRoute});
+      rootRoute.mockClear();
+      window.location.hash = '#/';
+
+      navigate('/');
+      expect(rootRoute).not.toHaveBeenCalled();
+
+      deterministicWallClock.advanceByMilliseconds(0);
+      expect(rootRoute).toHaveBeenCalledTimes(1);
+    });
   });
 });
diff --git a/apps/webapp/src/script/router/Router.ts b/apps/webapp/src/script/router/Router.ts
index e7932b4afeb..fc538d07fdb 100644
--- a/apps/webapp/src/script/router/Router.ts
+++ b/apps/webapp/src/script/router/Router.ts
@@ -95,25 +95,31 @@ export const configureRoutes = (routeDefinitions: Routes): void => {
   parseRoute();
 };
 export const navigate = (path: string) => {
-  setHistoryParam(path);
-  parseRoute();
+  const isDeferred = setHistoryParam(path);
+  if (!isDeferred) {
+    parseRoute();
+  }
 };
 
-export const setHistoryParam = (path: string) => {
+export const setHistoryParam = (path: string): boolean => {
   const hashUnchanged = window.location.hash === `#${path}`;
   window.location.hash = path;
 
-  if (hashUnchanged) {
+  const shouldDefer = hashUnchanged && path === '/' && isConversationListTab(useSidebarStore.getState().currentTab);
+
+  if (shouldDefer) {
     // Setting the hash to its current value does not fire a native `hashchange` event, so route
     // handlers that rely on it (e.g. re-showing the most recent conversation) would otherwise
     // never run. Force route re-evaluation async, matching the timing of a real hashchange, so
     // callers that synchronously update content state right after calling this still take effect
     // first.
     routerWallClock.setTimeout(() => {
-      if (path === '/' && !isConversationListTab(useSidebarStore.getState().currentTab)) {
+      if (!isConversationListTab(useSidebarStore.getState().currentTab)) {
         return;
       }
       parseRoute();
     }, 0);
   }
+
+  return shouldDefer;
 };
diff --git a/apps/webapp/test/e2e_tests/specs/Navigation/urlOnNavigation.spec.ts b/apps/webapp/test/e2e_tests/specs/Navigation/urlOnNavigation.spec.ts
index 9acc00772a2..9001cd6e405 100644
--- a/apps/webapp/test/e2e_tests/specs/Navigation/urlOnNavigation.spec.ts
+++ b/apps/webapp/test/e2e_tests/specs/Navigation/urlOnNavigation.spec.ts
@@ -82,9 +82,19 @@ test.describe('URL on navigation', () => {
 
       await page.reload();
       await sidebar.sidebar.waitFor({state: 'visible', timeout: LOGIN_TIMEOUT});
-      await sidebar.clickMeetingsButton();
+      const meetingsPage = pages.meetings();
+      await expect(meetingsPage.meetingsList.or(meetingsPage.emptyMeetingsList)).toBeVisible({timeout: LOGIN_TIMEOUT});
       await expectTabSelected(sidebar, 'go-meetings');
       await expectHash(page, '#/meetings');
+
+      await sidebar.clickPreferencesButton();
+      await expect(pages.settings().accountButton).toBeVisible();
+      await expectHash(page, '#/preferences/account');
+
+      await page.reload();
+      await expect(pages.settings().accountButton).toBeVisible({timeout: LOGIN_TIMEOUT});
+      await expectTabSelected(sidebar, 'go-preferences');
+      await expectHash(page, '#/preferences/account');
     },
   );
 

From 413bfef4f116017b18ff18e2e92dee93d6dd118f Mon Sep 17 00:00:00 2001
From: zskhan <zafarsaeed@outlook.com>
Date: Tue, 25 Aug 2026 11:45:34 +0200
Subject: [PATCH 09/10] Fix type-check in userActions.test.tsx

---
 apps/webapp/src/script/components/panel/userActions.test.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/webapp/src/script/components/panel/userActions.test.tsx b/apps/webapp/src/script/components/panel/userActions.test.tsx
index c4a77f22e1c..c83d0bdb9bc 100644
--- a/apps/webapp/src/script/components/panel/userActions.test.tsx
+++ b/apps/webapp/src/script/components/panel/userActions.test.tsx
@@ -446,7 +446,7 @@ describe('UserActions', () => {
     const originalSetCurrentTab = useSidebarStore.getState().setCurrentTab;
     const setCurrentTab = jest.fn();
     useSidebarStore.setState({setCurrentTab});
-    actionsViewModel.sendConnectionRequest = jest.fn().mockResolvedValue({
+    jest.spyOn(actionsViewModel, 'sendConnectionRequest').mockResolvedValue({
       connectionStatus: ConnectionStatus.SENT,
       conversationId: {id: 'conversation-id', domain: ''},
     });

From 389e7e7cc8ebfe6a50eaa329d7739a1aa9d3a97b Mon Sep 17 00:00:00 2001
From: Amir Ghezelbash <thisisamir98@gmail.com>
Date: Tue, 25 Aug 2026 11:58:42 +0200
Subject: [PATCH 10/10] Fix unit test spy on missing ActionsViewModel methods.

jest.spyOn failed at runtime because the test double omitted sendConnectionRequest and saveConversation after the type-check workaround.
---
 .../webapp/src/script/components/panel/userActions.test.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/webapp/src/script/components/panel/userActions.test.tsx b/apps/webapp/src/script/components/panel/userActions.test.tsx
index c83d0bdb9bc..e52d520ac35 100644
--- a/apps/webapp/src/script/components/panel/userActions.test.tsx
+++ b/apps/webapp/src/script/components/panel/userActions.test.tsx
@@ -49,6 +49,8 @@ import {SidebarTabs, useSidebarStore} from '../../page/leftSidebar/panels/conver
 const actionsViewModel = {
   open1to1Conversation: jest.fn(),
   getOrCreate1to1Conversation: jest.fn(),
+  sendConnectionRequest: jest.fn(),
+  saveConversation: jest.fn(),
 } as unknown as ActionsViewModel;
 
 const getAllActions = (queryFunction: (id: string) => HTMLElement | null) =>
@@ -450,7 +452,7 @@ describe('UserActions', () => {
       connectionStatus: ConnectionStatus.SENT,
       conversationId: {id: 'conversation-id', domain: ''},
     });
-    actionsViewModel.saveConversation = jest.fn().mockResolvedValue(conversation);
+    jest.spyOn(actionsViewModel, 'saveConversation').mockResolvedValue(conversation);
 
     const {getByTestId} = renderWithRootProvider(
       <UserActions
@@ -473,6 +475,8 @@ describe('UserActions', () => {
     await act(async () => {
       useSidebarStore.setState({setCurrentTab: originalSetCurrentTab});
     });
+    jest.mocked(actionsViewModel.sendConnectionRequest).mockReset();
+    jest.mocked(actionsViewModel.saveConversation).mockReset();
   });
 
   it('displays a list when multiple actions are available in user modal', () => {