Finalized new shell experience.

AGENTS.md

@@ -143,7 +143,7 @@ private string searchQuery = string.Empty;
 - In ViewModels, update all UI-bound properties/collections via `ExecuteUIThread(...)` (especially after awaited calls and any use of `ConfigureAwait(false)`).
 - In `EventDetailsPageViewModel.LoadAttendeesAsync`, never mutate `CurrentEvent.Attendees` outside `ExecuteUIThread(...)`.
 - Never create pure C# controls or controls that heavily manipulate UI structure from `.cs` files. Define controls in XAML and keep UI composition in XAML.
-- For XAML-backed controls and pages, wire framework events like `Loaded`, `Unloaded`, and input events from XAML, not by subscribing in constructors in `.xaml.cs`.
+- Never subscribe to framework events like `Loaded`, `Unloaded`, or input events from constructors in `.xaml.cs` for XAML-backed controls and pages; wire them directly in XAML instead.
 
 
 

Wino.Calendar.ViewModels/CalendarAppShellViewModel.cs

@@ -85,7 +85,6 @@ public partial class CalendarAppShellViewModel : CalendarBaseViewModel,
     [ObservableProperty]
     private bool isStoreUpdateItemVisible;
 
-    private readonly ManageAccountsMenuItem _manageAccountsMenuItem = new();
     private readonly SettingsItem _settingsItem = new();
     private readonly StoreUpdateMenuItem _storeUpdateMenuItem = new();
     private readonly NewCalendarEventMenuItem _newEventMenuItem = new();
@@ -378,9 +377,6 @@ public partial class CalendarAppShellViewModel : CalendarBaseViewModel,
         ForceNavigateCalendarDate();
     }
 
-    [RelayCommand]
-    public void ManageAccounts() => NavigationService.Navigate(WinoPage.AccountManagementPage);
-
     public async Task HandleNavigationItemInvokedAsync(IMenuItem menuItem)
     {
         switch (menuItem)
@@ -388,9 +384,6 @@ public partial class CalendarAppShellViewModel : CalendarBaseViewModel,
             case NewMailMenuItem:
                 await NewEventAsync().ConfigureAwait(false);
                 break;
-            case ManageAccountsMenuItem:
-                NavigationService.Navigate(WinoPage.ManageAccountsPage);
-                break;
             case SettingsItem:
                 NavigationService.Navigate(WinoPage.SettingsPage);
                 break;

Wino.Core.Domain/Interfaces/IStatePersistenceService.cs

@@ -44,11 +44,6 @@ public interface IStatePersistanceService : INotifyPropertyChanged
     /// </summary>
     bool IsEventDetailsVisible { get; set; }
 
-    /// <summary>
-    /// Whether ManageAccountsPage has navigated to a sub-page and can go back.
-    /// </summary>
-    bool IsManageAccountsNavigating { get; set; }
-
     /// <summary>
     /// Whether SettingsPage has navigated to a sub-page and can go back.
     /// </summary>

Wino.Core.Domain/MenuItems/ManageAccountsMenuItem.cs

@@ -1,3 +0,0 @@
-namespace Wino.Core.Domain.MenuItems;
-
-public class ManageAccountsMenuItem : MenuItemBase { }

Wino.Core.Domain/MenuItems/MenuItemBase.cs

@@ -8,10 +8,10 @@ namespace Wino.Core.Domain.MenuItems;
 public partial class MenuItemBase : ObservableObject, IMenuItem
 {
     [ObservableProperty]
-    private bool _isExpanded;
+    public partial bool IsExpanded { get; set; }
 
     [ObservableProperty]
-    private bool _isSelected;
+    public partial bool IsSelected { get; set; }
 
     public IMenuItem ParentMenuItem { get; }
 
@@ -46,7 +46,7 @@ public partial class MenuItemBase : ObservableObject, IMenuItem
 public partial class MenuItemBase<T> : MenuItemBase
 {
     [ObservableProperty]
-    private T _parameter;
+    public partial T Parameter { get; set; }
 
     public MenuItemBase(T parameter, Guid? entityId, IMenuItem parentMenuItem = null) : base(entityId, parentMenuItem) => Parameter = parameter;
 }
@@ -54,7 +54,7 @@ public partial class MenuItemBase<T> : MenuItemBase
 public partial class MenuItemBase<TValue, TCollection> : MenuItemBase<TValue>
 {
     [ObservableProperty]
-    private bool _isChildSelected;
+    public partial bool IsChildSelected { get; set; }
 
     protected MenuItemBase(TValue parameter, Guid? entityId, IMenuItem parentMenuItem = null) : base(parameter, entityId, parentMenuItem) { }
 

Wino.Core.Domain/MenuItems/NewContactMenuItem.cs

@@ -0,0 +1,3 @@
+namespace Wino.Core.Domain.MenuItems;
+
+public sealed class NewContactMenuItem : MenuItemBase { }

Wino.Core.Domain/Translations/en_US/resources.json

@@ -793,7 +793,7 @@
     "SettingsMailSpacing_Description": "Adjust the spacing for listing mails.",
     "SettingsMailSpacing_Title": "Mail Spacing",
     "SettingsManageAccountSettings_Description": "Notifications, signatures, synchronization and other settings per account.",
-    "SettingsManageAccountSettings_Title": "Manage Account Settings",
+    "SettingsManageAccountSettings_Title": "Manage Accounts",
     "SettingsManageAliases_Description": "See e-mail aliases assigned for this account, update or delete them.",
     "SettingsManageAliases_Title": "Aliases",
     "SettingsEditAccountDetails_Title": "Edit Account Details",
@@ -1060,6 +1060,9 @@
     "ContactsPage_EmptyState": "No contacts to display",
     "ContactsPage_AddFirstContact": "Add your first contact",
     "ContactsPage_ContactsCountSuffix": "contacts",
+    "ContactsPane_NewContact": "New Contact",
+    "ContactsPane_DescriptionTitle": "Manage your contacts",
+    "ContactsPane_DescriptionBody": "Create contacts, rename them, update profile pictures, and keep saved details organized in one place.",
     "ContactEditDialog_AddTitle": "Add Contact",
     "ContactInfoBar_ContactAdded": "Contact added successfully.",
     "ContactInfoBar_ContactUpdated": "Contact updated successfully.",

Wino.Mail.ViewModels/ContactsPageViewModel.cs

@@ -7,16 +7,19 @@ using System.Threading;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.Messaging;
 using Wino.Core.Domain;
 using Wino.Core.Domain.Entities.Shared;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Navigation;
 using Wino.Mail.ViewModels.Data;
+using Wino.Messaging.Client.Contacts;
 
 namespace Wino.Mail.ViewModels;
 
-public partial class ContactsPageViewModel : MailBaseViewModel
+public partial class ContactsPageViewModel : MailBaseViewModel,
+    IRecipient<NewContactRequested>
 {
     private const int ContactPageSize = 50;
 
@@ -97,6 +100,9 @@ public partial class ContactsPageViewModel : MailBaseViewModel
     private async void ContactsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
         => await ExecuteUIThread(() => { OnPropertyChanged(nameof(IsEmpty)); });
 
+    void IRecipient<NewContactRequested>.Receive(NewContactRequested message)
+        => _ = AddContactAsync();
+
     [RelayCommand]
     private async Task ReloadContactsAsync()
     {
@@ -219,6 +225,20 @@ public partial class ContactsPageViewModel : MailBaseViewModel
         }
     }
 
+    protected override void RegisterRecipients()
+    {
+        base.RegisterRecipients();
+
+        Messenger.Register<NewContactRequested>(this);
+    }
+
+    protected override void UnregisterRecipients()
+    {
+        base.UnregisterRecipients();
+
+        Messenger.Unregister<NewContactRequested>(this);
+    }
+
     [RelayCommand]
     private async Task EditContactAsync(AccountContactViewModel contactViewModel)
     {

Wino.Mail.ViewModels/MailAppShellViewModel.cs

@@ -54,7 +54,6 @@ public partial class MailAppShellViewModel : MailBaseViewModel,
     public MenuItemCollection MenuItems { get; set; }
 
     private readonly SettingsItem SettingsItem = new SettingsItem();
-    private readonly ManageAccountsMenuItem ManageAccountsMenuItem = new ManageAccountsMenuItem();
     private readonly ContactsMenuItem ContactsMenuItem = new ContactsMenuItem();
     private readonly StoreUpdateMenuItem StoreUpdateMenuItem = new StoreUpdateMenuItem();
 
@@ -820,7 +819,7 @@ public partial class MailAppShellViewModel : MailBaseViewModel,
 
                 if (isManageAccountClicked)
                 {
-                    SelectedMenuItem = ManageAccountsMenuItem;
+                    NavigationService.Navigate(WinoPage.SettingsPage, WinoPage.ManageAccountsPage);
                 }
 
                 return;

Wino.Mail.WinUI/App.xaml.cs

@@ -561,7 +561,7 @@ public partial class App : WinoApplication,
     public Task OpenManageAccountsFromWelcomeAsync()
     {
         Services.GetRequiredService<INavigationService>()
-            .Navigate(WinoPage.ManageAccountsPage, null, NavigationReferenceFrame.ShellFrame, NavigationTransitionType.DrillIn);
+            .Navigate(WinoPage.SettingsPage, WinoPage.ManageAccountsPage, NavigationReferenceFrame.ShellFrame, NavigationTransitionType.DrillIn);
         return Task.CompletedTask;
     }
 

Wino.Mail.WinUI/Selectors/NavigationMenuTemplateSelector.cs

@@ -8,7 +8,6 @@ public partial class NavigationMenuTemplateSelector : DataTemplateSelector
 {
     public DataTemplate MenuItemTemplate { get; set; } = null!;
     public DataTemplate ContactsMenuItemTemplate { get; set; } = null!;
-    public DataTemplate AccountManagementTemplate { get; set; } = null!;
     public DataTemplate ClickableAccountMenuTemplate { get; set; } = null!;
     public DataTemplate MergedAccountTemplate { get; set; } = null!;
     public DataTemplate MergedAccountFolderTemplate { get; set; } = null!;
@@ -21,6 +20,7 @@ public partial class NavigationMenuTemplateSelector : DataTemplateSelector
     public DataTemplate CreateNewFolderTemplate { get; set; } = null!;
     public DataTemplate SeperatorTemplate { get; set; } = null!;
     public DataTemplate NewMailTemplate { get; set; } = null!;
+    public DataTemplate NewContactTemplate { get; set; } = null!;
     public DataTemplate CalendarNewEventTemplate { get; set; } = null!;
     public DataTemplate CategoryItemsTemplate { get; set; } = null!;
     public DataTemplate FixAuthenticationIssueTemplate { get; set; } = null!;
@@ -30,6 +30,8 @@ public partial class NavigationMenuTemplateSelector : DataTemplateSelector
     {
         if (item is NewCalendarEventMenuItem)
             return CalendarNewEventTemplate;
+        else if (item is NewContactMenuItem)
+            return NewContactTemplate;
         else if (item is NewMailMenuItem)
             return NewMailTemplate;
         else if (item is ContactsMenuItem)
@@ -43,8 +45,6 @@ public partial class NavigationMenuTemplateSelector : DataTemplateSelector
         else if (item is AccountMenuItem)
             // Merged inbox account menu items must be nested.
             return ClickableAccountMenuTemplate;
-        else if (item is ManageAccountsMenuItem)
-            return AccountManagementTemplate;
         else if (item is RateMenuItem)
             return RatingItemTemplate;
         else if (item is MergedAccountMenuItem)

Wino.Mail.WinUI/Services/NavigationService.cs

@@ -106,7 +106,7 @@ public class NavigationService : NavigationServiceBase, INavigationService
             WinoPage.AccountDetailsPage => typeof(AccountDetailsPage),
             WinoPage.MergedAccountDetailsPage => typeof(MergedAccountDetailsPage),
             WinoPage.AccountManagementPage => typeof(AccountManagementPage),
-            WinoPage.ManageAccountsPage => typeof(ManageAccountsPage),
+            WinoPage.ManageAccountsPage => typeof(AccountManagementPage),
             WinoPage.SignatureManagementPage => typeof(SignatureManagementPage),
             WinoPage.AboutPage => typeof(AboutPage),
             WinoPage.PersonalizationPage => typeof(PersonalizationPage),
@@ -237,6 +237,11 @@ public class NavigationService : NavigationServiceBase, INavigationService
                                   NavigationReferenceFrame frame = NavigationReferenceFrame.InnerShellFrame,
                                   NavigationTransitionType transition = NavigationTransitionType.None)
     {
+        if (page is WinoPage.ManageAccountsPage or WinoPage.AccountManagementPage)
+        {
+            return NavigateInternal(WinoPage.SettingsPage, WinoPage.ManageAccountsPage, frame, transition);
+        }
+
         var pageType = GetPageType(page);
         if (pageType == null) return false;
 
@@ -441,11 +446,8 @@ public class NavigationService : NavigationServiceBase, INavigationService
 
     private void GoBackInternal(Core.Domain.Enums.NavigationTransitionEffect slideEffect = Core.Domain.Enums.NavigationTransitionEffect.FromRight)
     {
-        // Check if we're navigating within ManageAccountsPage (applies to both modes)
+        if (_statePersistanceService.IsSettingsNavigating)
-        // Check if we're navigating within SettingsPage (applies to both modes)
-        if (_statePersistanceService.IsManageAccountsNavigating || _statePersistanceService.IsSettingsNavigating)
         {
-            // Send message to ManageAccountsPage to go back within its AccountPagesFrame
             WeakReferenceMessenger.Default.Send(new BackBreadcrumNavigationRequested(slideEffect));
             return;
         }

Wino.Mail.WinUI/Services/StatePersistenceService.cs

@@ -34,8 +34,8 @@ public class StatePersistenceService : ObservableObject, IStatePersistanceServic
 
     public bool IsBackButtonVisible =>
         ApplicationMode == WinoApplicationMode.Mail
-            ? (IsReadingMail && IsReaderNarrowed) || IsManageAccountsNavigating || IsSettingsNavigating
+            ? (IsReadingMail && IsReaderNarrowed) || IsSettingsNavigating
-            : IsEventDetailsVisible || IsManageAccountsNavigating || IsSettingsNavigating;
+            : IsEventDetailsVisible || IsSettingsNavigating;
 
     private WinoApplicationMode applicationMode = WinoApplicationMode.Mail;
 
@@ -68,20 +68,6 @@ public class StatePersistenceService : ObservableObject, IStatePersistanceServic
         }
     }
 
-    private bool isManageAccountsNavigating;
-
-    public bool IsManageAccountsNavigating
-    {
-        get => isManageAccountsNavigating;
-        set
-        {
-            if (SetProperty(ref isManageAccountsNavigating, value))
-            {
-                OnPropertyChanged(nameof(IsBackButtonVisible));
-            }
-        }
-    }
-
     private bool isSettingsNavigating;
 
     public bool IsSettingsNavigating

Wino.Mail.WinUI/Styles/DataTemplates.xaml

@@ -26,15 +26,6 @@
 
     <!--#region Navigation Menu Templates-->
 
-    <!--  Manage Accounts etc. Other navigatable.  -->
-    <DataTemplate x:Key="ManageAccountsTemplate" x:DataType="menu:ManageAccountsMenuItem">
-        <coreControls:WinoNavigationViewItem Content="{x:Bind domain:Translator.MenuManageAccounts}" DataContext="{x:Bind}">
-            <muxc:NavigationViewItem.Icon>
-                <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE77B;" />
-            </muxc:NavigationViewItem.Icon>
-        </coreControls:WinoNavigationViewItem>
-    </DataTemplate>
-
     <DataTemplate x:Key="ContactsTemplate" x:DataType="menu:ContactsMenuItem">
         <coreControls:WinoNavigationViewItem Content="{x:Bind domain:Translator.ContactsPage_Title}" DataContext="{x:Bind}">
             <muxc:NavigationViewItem.Icon>

Wino.Mail.WinUI/ViewModels/ContactsShellClient.cs

@@ -1,4 +1,5 @@
 using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.Messaging;
 using Wino.Core.Domain;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
@@ -6,11 +7,14 @@ using Wino.Core.Domain.MenuItems;
 using Wino.Core.Domain.Models;
 using Wino.Core.Domain.Models.Navigation;
 using Wino.Core.ViewModels;
+using Wino.Messaging.Client.Contacts;
 
 namespace Wino.Mail.WinUI.ViewModels;
 
 public sealed class ContactsShellClient(INavigationService navigationService) : CoreBaseViewModel, IShellClient
 {
+    private readonly NewContactMenuItem _newContactMenuItem = new();
+
     public WinoApplicationMode Mode => WinoApplicationMode.Contacts;
     public MenuItemCollection? MenuItems { get; private set; }
     public object? SelectedMenuItem { get; set; }
@@ -20,6 +24,11 @@ public sealed class ContactsShellClient(INavigationService navigationService) :
     {
         base.OnDispatcherAssigned();
         MenuItems ??= new MenuItemCollection(Dispatcher);
+
+        if (MenuItems.Count == 0)
+        {
+            MenuItems.Add(_newContactMenuItem);
+        }
     }
 
     public void Activate(ShellModeActivationContext activationContext)
@@ -33,7 +42,15 @@ public sealed class ContactsShellClient(INavigationService navigationService) :
         OnNavigatedFrom(NavigationMode.New, null!);
     }
 
-    public Task HandleNavigationItemInvokedAsync(IMenuItem? menuItem) => Task.CompletedTask;
+    public Task HandleNavigationItemInvokedAsync(IMenuItem? menuItem)
+    {
+        if (menuItem is NewContactMenuItem)
+        {
+            WeakReferenceMessenger.Default.Send(new NewContactRequested());
+        }
+
+        return Task.CompletedTask;
+    }
 
     public Task HandleNavigationSelectionChangedAsync(IMenuItem? menuItem) => Task.CompletedTask;
 }

Wino.Mail.WinUI/Views/Calendar/CalendarAppShell.xaml

@@ -39,15 +39,6 @@
             </coreControls:WinoNavigationViewItem>
         </DataTemplate>
 
-        <DataTemplate x:Key="CalendarManageAccountsTemplate" x:DataType="menu:ManageAccountsMenuItem">
-            <coreControls:WinoNavigationViewItem DataContext="{x:Bind}" SelectsOnInvoked="False">
-                <muxc:NavigationViewItem.Icon>
-                    <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE77B;" />
-                </muxc:NavigationViewItem.Icon>
-                <TextBlock VerticalAlignment="Center" Text="{x:Bind domain:Translator.MenuManageAccounts}" />
-            </coreControls:WinoNavigationViewItem>
-        </DataTemplate>
-
         <DataTemplate x:Key="CalendarSettingsItemTemplate" x:DataType="menu:SettingsItem">
             <coreControls:WinoNavigationViewItem DataContext="{x:Bind}" SelectsOnInvoked="False">
                 <coreControls:WinoNavigationViewItem.Icon>

Wino.Mail.WinUI/Views/Contacts/ContactsAppShell.xaml

@@ -5,14 +5,16 @@
     xmlns:abstract="using:Wino.Mail.WinUI.Views.Abstract"
     xmlns:coreControls="using:Wino.Mail.WinUI.Controls"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls">
-
+    <Grid
-    <Grid x:Name="RootGrid" Padding="0" ColumnSpacing="0" RowSpacing="0">
+        x:Name="RootGrid"
+        Padding="0"
+        ColumnSpacing="0"
+        RowSpacing="0">
         <muxc:NavigationView
             x:Name="navigationView"
             Grid.Row="1"
             Grid.ColumnSpan="3"
             Margin="-1,-1,0,0"
-            Style="{StaticResource CalendarShellNavigationViewStyle}"
             HorizontalContentAlignment="Stretch"
             VerticalContentAlignment="Stretch"
             AlwaysShowHeader="True"
@@ -25,7 +27,8 @@
             IsTitleBarAutoPaddingEnabled="False"
             OpenPaneLength="{x:Bind StatePersistenceService.OpenPaneLength, Mode=TwoWay}"
             PaneDisplayMode="Auto"
-            ScrollViewer.VerticalScrollBarVisibility="Hidden">
+            ScrollViewer.VerticalScrollBarVisibility="Hidden"
+            Style="{StaticResource CalendarShellNavigationViewStyle}">
             <Grid>
                 <Frame
                     x:Name="InnerShellFrame"

Wino.Mail.WinUI/Views/ManageAccountsPage.xaml

@@ -4,10 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:abstract="using:Wino.Mail.WinUI.Views.Abstract"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:helpers="using:Wino.Helpers"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:viewModelData="using:Wino.Mail.ViewModels.Data"
-    xmlns:winuiControls="using:Microsoft.UI.Xaml.Controls"
     Style="{StaticResource PageStyle}"
     mc:Ignorable="d">
 
@@ -15,38 +12,6 @@
         <Grid
             MaxWidth="900"
             Padding="20"
-            HorizontalAlignment="Stretch"
+            HorizontalAlignment="Stretch" />
-            RowSpacing="20">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="*" />
-            </Grid.RowDefinitions>
-
-            <winuiControls:BreadcrumbBar
-                x:Name="Breadcrumb"
-                ItemClicked="BreadItemClicked"
-                ItemsSource="{x:Bind PageHistory, Mode=OneWay}">
-                <winuiControls:BreadcrumbBar.ItemTemplate>
-                    <DataTemplate x:DataType="viewModelData:BreadcrumbNavigationItemViewModel">
-                        <winuiControls:BreadcrumbBarItem Margin="0,0,8,0">
-                            <winuiControls:BreadcrumbBarItem.ContentTemplate>
-                                <DataTemplate x:DataType="viewModelData:BreadcrumbNavigationItemViewModel">
-                                    <TextBlock
-                                        Margin="0,0,8,10"
-                                        FontWeight="{x:Bind helpers:XamlHelpers.GetFontWeightBySyncState(IsActive), Mode=OneWay}"
-                                        Style="{StaticResource TitleTextBlockStyle}"
-                                        Text="{x:Bind Title, Mode=OneWay}" />
-                                </DataTemplate>
-                            </winuiControls:BreadcrumbBarItem.ContentTemplate>
-                        </winuiControls:BreadcrumbBarItem>
-                    </DataTemplate>
-                </winuiControls:BreadcrumbBar.ItemTemplate>
-            </winuiControls:BreadcrumbBar>
-
-            <Frame
-                x:Name="AccountPagesFrame"
-                Grid.Row="1"
-                Navigated="AccountPagesFrameNavigated" />
-        </Grid>
     </Border>
 </abstract:ManageAccountsPageAbstract>

Wino.Mail.WinUI/Views/ManageAccountsPage.xaml.cs

@@ -1,136 +1,12 @@
-using System.Collections.ObjectModel;
-using System.Linq;
-using CommunityToolkit.Mvvm.Messaging;
-using Microsoft.UI.Xaml.Media.Animation;
-using Microsoft.UI.Xaml.Navigation;
 using Wino.Core.Domain;
-using Wino.Core.Domain.Enums;
-using Wino.Helpers;
-using Wino.Mail.ViewModels.Data;
 using Wino.Mail.WinUI.Views.Abstract;
-using Wino.Messaging.Client.Navigation;
-using Wino.Messaging.UI;
 
 namespace Wino.Views;
 
-public sealed partial class ManageAccountsPage : ManageAccountsPageAbstract,
+public sealed partial class ManageAccountsPage : ManageAccountsPageAbstract
-    IRecipient<BackBreadcrumNavigationRequested>,
-    IRecipient<BreadcrumbNavigationRequested>,
-    IRecipient<MergedInboxRenamed>,
-    IRecipient<AccountUpdatedMessage>
 {
-    public ObservableCollection<BreadcrumbNavigationItemViewModel> PageHistory { get; set; } = new ObservableCollection<BreadcrumbNavigationItemViewModel>();
-
-
     public ManageAccountsPage()
     {
         InitializeComponent();
     }
-
-    protected override void OnNavigatedTo(NavigationEventArgs e)
-    {
-        base.OnNavigatedTo(e);
-
-        // Re-register message handlers after base.OnNavigatedTo unregisters all handlers
-        WeakReferenceMessenger.Default.Register<BreadcrumbNavigationRequested>(this);
-        WeakReferenceMessenger.Default.Register<BackBreadcrumNavigationRequested>(this);
-        WeakReferenceMessenger.Default.Register<MergedInboxRenamed>(this);
-        WeakReferenceMessenger.Default.Register<AccountUpdatedMessage>(this);
-
-        // Register for frame navigation events to track back button visibility
-        AccountPagesFrame.Navigated -= AccountPagesFrameNavigated;
-        AccountPagesFrame.Navigated += AccountPagesFrameNavigated;
-
-        var initialRequest = new BreadcrumbNavigationRequested(Translator.MenuManageAccounts, WinoPage.AccountManagementPage);
-        PageHistory.Add(new BreadcrumbNavigationItemViewModel(initialRequest, true, backStackDepth: AccountPagesFrame.BackStack.Count + 1));
-
-        var accountManagementPageType = ViewModel.NavigationService.GetPageType(WinoPage.AccountManagementPage);
-
-        AccountPagesFrame.Navigate(accountManagementPageType, null, new SuppressNavigationTransitionInfo());
-        UpdateWindowTitle();
-    }
-
-    protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
-    {
-        // Explicitly unregister our message handlers before base.OnNavigatingFrom calls UnregisterAll
-        WeakReferenceMessenger.Default.Unregister<BreadcrumbNavigationRequested>(this);
-        WeakReferenceMessenger.Default.Unregister<BackBreadcrumNavigationRequested>(this);
-        WeakReferenceMessenger.Default.Unregister<MergedInboxRenamed>(this);
-        WeakReferenceMessenger.Default.Unregister<AccountUpdatedMessage>(this);
-
-        // Unregister frame navigation event
-        AccountPagesFrame.Navigated -= AccountPagesFrameNavigated;
-
-        // Reset navigation state when leaving ManageAccountsPage
-        ViewModel.StatePersistenceService.IsManageAccountsNavigating = false;
-
-        base.OnNavigatingFrom(e);
-    }
-
-    void IRecipient<BreadcrumbNavigationRequested>.Receive(BreadcrumbNavigationRequested message)
-    {
-        BreadcrumbNavigationHelper.Navigate(AccountPagesFrame, PageHistory, message, ViewModel.NavigationService.GetPageType);
-        UpdateWindowTitle();
-    }
-
-    private void AccountPagesFrameNavigated(object sender, NavigationEventArgs e)
-    {
-        // Update back button visibility based on whether we can go back within the frame
-        ViewModel.StatePersistenceService.IsManageAccountsNavigating = AccountPagesFrame.CanGoBack;
-    }
-
-    private void GoBackFrame(Core.Domain.Enums.NavigationTransitionEffect slideEffect)
-    {
-        if (!BreadcrumbNavigationHelper.GoBack(AccountPagesFrame, PageHistory, slideEffect))
-            return;
-
-        ViewModel.StatePersistenceService.IsManageAccountsNavigating = AccountPagesFrame.CanGoBack;
-        UpdateWindowTitle();
-    }
-
-    private void BreadItemClicked(Microsoft.UI.Xaml.Controls.BreadcrumbBar sender, Microsoft.UI.Xaml.Controls.BreadcrumbBarItemClickedEventArgs args)
-    {
-        if (!BreadcrumbNavigationHelper.NavigateTo(AccountPagesFrame, PageHistory, args.Index))
-            return;
-
-        ViewModel.StatePersistenceService.IsManageAccountsNavigating = AccountPagesFrame.CanGoBack;
-        UpdateWindowTitle();
-    }
-
-    public void Receive(BackBreadcrumNavigationRequested message)
-    {
-        GoBackFrame(message.SlideEffect);
-    }
-
-    public void Receive(AccountUpdatedMessage message)
-    {
-        var activePage = PageHistory.FirstOrDefault(a => a.Request.PageType == WinoPage.AccountDetailsPage);
-
-        if (activePage == null) return;
-
-        DispatcherQueue.TryEnqueue(() =>
-        {
-            activePage.Title = message.Account.Name;
-            UpdateWindowTitle();
-        });
-    }
-
-    public void Receive(MergedInboxRenamed message)
-    {
-        // TODO: Find better way to retrieve page history from the stack for the merged account.
-        var activePage = PageHistory.LastOrDefault();
-
-        if (activePage == null) return;
-
-        activePage.Title = message.NewName;
-        UpdateWindowTitle();
-    }
-
-    private void UpdateWindowTitle()
-    {
-        var activeTitle = PageHistory.LastOrDefault()?.Title;
-        ViewModel.StatePersistenceService.CoreWindowTitle = string.IsNullOrWhiteSpace(activeTitle)
-            ? Translator.MenuManageAccounts
-            : activeTitle;
-    }
 }

Wino.Mail.WinUI/Views/Settings/ContactsPage.xaml

@@ -106,11 +106,6 @@
         </Grid.RowDefinitions>
 
         <Grid Grid.Row="0">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-
             <StackPanel>
                 <TextBlock
                     FontSize="28"
@@ -118,16 +113,6 @@
                     Text="{x:Bind domain:Translator.ContactsPage_Title, Mode=OneTime}" />
                 <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="{x:Bind domain:Translator.ContactsPage_Subtitle, Mode=OneTime}" />
             </StackPanel>
-
-            <Button
-                Grid.Column="1"
-                Command="{x:Bind ViewModel.AddContactCommand}"
-                Style="{StaticResource AccentButtonStyle}">
-                <StackPanel Orientation="Horizontal" Spacing="8">
-                    <FontIcon FontSize="14" Glyph="&#xE710;" />
-                    <TextBlock Text="{x:Bind domain:Translator.ContactAction_Add, Mode=OneTime}" />
-                </StackPanel>
-            </Button>
         </Grid>
 
         <Grid Grid.Row="1" ColumnSpacing="8">

Wino.Mail.WinUI/Views/SettingsPage.xaml.cs

@@ -8,6 +8,7 @@ using Wino.Core.Domain.Enums;
 using Wino.Helpers;
 using Wino.Mail.ViewModels.Data;
 using Wino.Messaging.Client.Navigation;
+using Wino.Messaging.UI;
 using Wino.Views.Abstract;
 using Wino.Views.Settings;
 
@@ -15,7 +16,9 @@ namespace Wino.Views;
 
 public sealed partial class SettingsPage : SettingsPageAbstract, 
     IRecipient<BreadcrumbNavigationRequested>,
-    IRecipient<BackBreadcrumNavigationRequested>
+    IRecipient<BackBreadcrumNavigationRequested>,
+    IRecipient<MergedInboxRenamed>,
+    IRecipient<AccountUpdatedMessage>
 {
     public ObservableCollection<BreadcrumbNavigationItemViewModel> PageHistory { get; set; } = [];
 
@@ -45,20 +48,20 @@ public sealed partial class SettingsPage : SettingsPageAbstract,
             switch (parameterPage)
             {
                 case WinoPage.AppPreferencesPage:
-                    WeakReferenceMessenger.Default.Send(new BreadcrumbNavigationRequested(Translator.SettingsAppPreferences_Title, WinoPage.AppPreferencesPage));
+                    NavigateBreadcrumb(new BreadcrumbNavigationRequested(Translator.SettingsAppPreferences_Title, WinoPage.AppPreferencesPage));
                     break;
                 case WinoPage.PersonalizationPage:
-                    WeakReferenceMessenger.Default.Send(new BreadcrumbNavigationRequested(Translator.SettingsPersonalization_Title, WinoPage.PersonalizationPage));
+                    NavigateBreadcrumb(new BreadcrumbNavigationRequested(Translator.SettingsPersonalization_Title, WinoPage.PersonalizationPage));
                     break;
                 case WinoPage.StoragePage:
-                    WeakReferenceMessenger.Default.Send(new BreadcrumbNavigationRequested(Translator.SettingsStorage_Title, WinoPage.StoragePage));
+                    NavigateBreadcrumb(new BreadcrumbNavigationRequested(Translator.SettingsStorage_Title, WinoPage.StoragePage));
                     break;
                 case WinoPage.EmailTemplatesPage:
-                    WeakReferenceMessenger.Default.Send(new BreadcrumbNavigationRequested(Translator.SettingsEmailTemplates_Title, WinoPage.EmailTemplatesPage));
+                    NavigateBreadcrumb(new BreadcrumbNavigationRequested(Translator.SettingsEmailTemplates_Title, WinoPage.EmailTemplatesPage));
                     break;
                 case WinoPage.ManageAccountsPage:
                 case WinoPage.AccountManagementPage:
-                    WeakReferenceMessenger.Default.Send(new BreadcrumbNavigationRequested(Translator.SettingsManageAccountSettings_Title, WinoPage.ManageAccountsPage));
+                    NavigateBreadcrumb(new BreadcrumbNavigationRequested(Translator.SettingsManageAccountSettings_Title, WinoPage.ManageAccountsPage));
                     break;
             }
         }
@@ -77,6 +80,14 @@ public sealed partial class SettingsPage : SettingsPageAbstract,
         if (settingsHeader == null) return;
 
         settingsHeader.Title = Translator.MenuSettings;
+        var manageAccountsEntry = PageHistory.FirstOrDefault(a =>
+            a.Request.PageType == WinoPage.ManageAccountsPage || a.Request.PageType == WinoPage.AccountManagementPage);
+
+        if (manageAccountsEntry != null)
+        {
+            manageAccountsEntry.Title = Translator.SettingsManageAccountSettings_Title;
+        }
+
         UpdateWindowTitle();
     }
 
@@ -97,6 +108,8 @@ public sealed partial class SettingsPage : SettingsPageAbstract,
 
         WeakReferenceMessenger.Default.Register<BreadcrumbNavigationRequested>(this);
         WeakReferenceMessenger.Default.Register<BackBreadcrumNavigationRequested>(this);
+        WeakReferenceMessenger.Default.Register<MergedInboxRenamed>(this);
+        WeakReferenceMessenger.Default.Register<AccountUpdatedMessage>(this);
     }
 
     protected override void UnregisterRecipients()
@@ -105,12 +118,13 @@ public sealed partial class SettingsPage : SettingsPageAbstract,
 
         WeakReferenceMessenger.Default.Unregister<BreadcrumbNavigationRequested>(this);
         WeakReferenceMessenger.Default.Unregister<BackBreadcrumNavigationRequested>(this);
+        WeakReferenceMessenger.Default.Unregister<MergedInboxRenamed>(this);
+        WeakReferenceMessenger.Default.Unregister<AccountUpdatedMessage>(this);
     }
 
     void IRecipient<BreadcrumbNavigationRequested>.Receive(BreadcrumbNavigationRequested message)
     {
-        BreadcrumbNavigationHelper.Navigate(SettingsFrame, PageHistory, message, ViewModel.NavigationService.GetPageType);
+        NavigateBreadcrumb(message);
-        UpdateWindowTitle();
     }
 
     private void SettingsFrameNavigated(object sender, NavigationEventArgs e)
@@ -142,6 +156,42 @@ public sealed partial class SettingsPage : SettingsPageAbstract,
         GoBackFrame(message.SlideEffect);
     }
 
+    public void Receive(AccountUpdatedMessage message)
+    {
+        var activePage = PageHistory.LastOrDefault(a => a.Request.PageType == WinoPage.AccountDetailsPage);
+
+        if (activePage == null)
+            return;
+
+        DispatcherQueue.TryEnqueue(() =>
+        {
+            activePage.Title = message.Account.Name;
+            UpdateWindowTitle();
+        });
+    }
+
+    public void Receive(MergedInboxRenamed message)
+    {
+        var activePage = PageHistory.LastOrDefault(a => a.Request.PageType == WinoPage.MergedAccountDetailsPage);
+
+        if (activePage == null)
+            return;
+
+        DispatcherQueue.TryEnqueue(() =>
+        {
+            activePage.Title = message.NewName;
+            UpdateWindowTitle();
+        });
+    }
+
+    private void NavigateBreadcrumb(BreadcrumbNavigationRequested message)
+    {
+        if (!BreadcrumbNavigationHelper.Navigate(SettingsFrame, PageHistory, message, ViewModel.NavigationService.GetPageType))
+            return;
+
+        UpdateWindowTitle();
+    }
+
     private void UpdateWindowTitle()
     {
         var activeTitle = PageHistory.LastOrDefault()?.Title;

Wino.Mail.WinUI/Views/WinoAppShell.xaml

@@ -394,6 +394,23 @@
             </coreControls:WinoNavigationViewItem>
         </DataTemplate>
 
+        <DataTemplate x:Key="NewContactTemplate" x:DataType="menu:NewContactMenuItem">
+            <coreControls:WinoNavigationViewItem
+                Height="50"
+                DataContext="{x:Bind}"
+                SelectsOnInvoked="False">
+                <muxc:NavigationViewItem.Icon>
+                    <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE710;" />
+                </muxc:NavigationViewItem.Icon>
+                <TextBlock
+                    Margin="0,-2,0,0"
+                    VerticalAlignment="Center"
+                    FontSize="16"
+                    Style="{StaticResource FlyoutPickerTitleTextBlockStyle}"
+                    Text="{x:Bind domain:Translator.ContactsPane_NewContact}" />
+            </coreControls:WinoNavigationViewItem>
+        </DataTemplate>
+
         <coreSelectors:NavigationMenuTemplateSelector
             x:Key="NavigationMenuTemplateSelector"
             CalendarNewEventTemplate="{StaticResource CalendarNewEventTemplate}"
@@ -404,6 +421,7 @@
             MergedAccountFolderTemplate="{StaticResource MergedAccountFolderMenuItemTemplate}"
             MergedAccountMoreExpansionItemTemplate="{StaticResource MergedAccountMoreFolderItemTemplate}"
             MergedAccountTemplate="{StaticResource MergedAccountTemplate}"
+            NewContactTemplate="{StaticResource NewContactTemplate}"
             NewMailTemplate="{StaticResource CreateNewMailTemplate}"
             RatingItemTemplate="{StaticResource RatingItemTemplate}"
             SeperatorTemplate="{StaticResource SeperatorTemplate}"
@@ -536,93 +554,114 @@
                     x:Name="PaneCustomContent"
                     Padding="0,0,0,6"
                     Visibility="Collapsed">
-                    <Grid.RowDefinitions>
+                    <Grid
-                        <RowDefinition Height="Auto" />
+                        x:Name="CalendarPaneContent"
-                        <RowDefinition Height="*" />
+                        Visibility="Collapsed">
-                    </Grid.RowDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="*" />
+                        </Grid.RowDefinitions>
 
-                    <calendarControls:WinoCalendarView
+                        <calendarControls:WinoCalendarView
-                        x:Name="CalendarView"
+                            x:Name="CalendarView"
-                        Grid.Row="0"
+                            Grid.Row="0"
-                        Margin="0,12,0,0"
+                            Margin="0,12,0,0"
-                        HorizontalAlignment="Center"
+                            HorizontalAlignment="Center"
-                        TodayBackgroundColor="{ThemeResource SystemAccentColor}" />
+                            TodayBackgroundColor="{ThemeResource SystemAccentColor}" />
 
-                    <ListView
+                        <ListView
-                        x:Name="CalendarHostListView"
+                            x:Name="CalendarHostListView"
-                        Grid.Row="1"
+                            Grid.Row="1"
-                        SelectionMode="None">
+                            SelectionMode="None">
-                        <ListView.Header>
+                            <ListView.Header>
-                            <TextBlock
+                                <TextBlock
-                                Margin="20,12,12,12"
+                                    Margin="20,12,12,12"
-                                FontSize="16"
+                                    FontSize="16"
-                                Text="Calendars" />
+                                    Text="Calendars" />
-                        </ListView.Header>
+                            </ListView.Header>
-                        <ListView.ItemTemplate>
+                            <ListView.ItemTemplate>
-                            <DataTemplate x:DataType="data:GroupedAccountCalendarViewModel">
+                                <DataTemplate x:DataType="data:GroupedAccountCalendarViewModel">
-                                <muxc:Expander
+                                    <muxc:Expander
-                                    HorizontalAlignment="Stretch"
+                                        HorizontalAlignment="Stretch"
-                                    HorizontalContentAlignment="Stretch"
+                                        HorizontalContentAlignment="Stretch"
-                                    IsExpanded="{x:Bind IsExpanded, Mode=TwoWay}">
+                                        IsExpanded="{x:Bind IsExpanded, Mode=TwoWay}">
-                                    <muxc:Expander.Header>
+                                        <muxc:Expander.Header>
-                                        <Grid>
+                                            <Grid>
-                                            <Grid.ColumnDefinitions>
+                                                <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="Auto" />
+                                                    <ColumnDefinition Width="Auto" />
-                                                <ColumnDefinition Width="*" />
+                                                    <ColumnDefinition Width="*" />
-                                            </Grid.ColumnDefinitions>
+                                                </Grid.ColumnDefinitions>
 
-                                            <CheckBox
+                                                <CheckBox
-                                                Width="26"
+                                                    Width="26"
-                                                MinWidth="0"
+                                                    MinWidth="0"
-                                                IsChecked="{x:Bind IsCheckedState, Mode=TwoWay}"
+                                                    IsChecked="{x:Bind IsCheckedState, Mode=TwoWay}"
-                                                IsThreeState="True" />
+                                                    IsThreeState="True" />
 
-                                            <TextBlock
+                                                <TextBlock
-                                                Grid.Column="1"
+                                                    Grid.Column="1"
-                                                VerticalAlignment="Center"
+                                                    VerticalAlignment="Center"
-                                                TextWrapping="Wrap">
+                                                    TextWrapping="Wrap">
-                                                <Run FontWeight="SemiBold" Text="{x:Bind Account.Name}" />
+                                                    <Run FontWeight="SemiBold" Text="{x:Bind Account.Name}" />
-                                                <Run FontSize="12" Text="(" /><Run FontSize="12" Text="{x:Bind Account.Address}" /><Run FontSize="12" Text=")" />
+                                                    <Run FontSize="12" Text="(" /><Run FontSize="12" Text="{x:Bind Account.Address}" /><Run FontSize="12" Text=")" />
-                                            </TextBlock>
+                                                </TextBlock>
-                                        </Grid>
+                                            </Grid>
-                                    </muxc:Expander.Header>
+                                        </muxc:Expander.Header>
-                                    <muxc:Expander.Content>
+                                        <muxc:Expander.Content>
-                                        <ItemsControl ItemsSource="{x:Bind AccountCalendars}">
+                                            <ItemsControl ItemsSource="{x:Bind AccountCalendars}">
-                                            <ItemsControl.ItemTemplate>
+                                                <ItemsControl.ItemTemplate>
-                                                <DataTemplate x:DataType="data:AccountCalendarViewModel">
+                                                    <DataTemplate x:DataType="data:AccountCalendarViewModel">
-                                                    <CheckBox
+                                                        <CheckBox
-                                                        HorizontalAlignment="Stretch"
+                                                            HorizontalAlignment="Stretch"
-                                                        VerticalAlignment="Center"
+                                                            VerticalAlignment="Center"
-                                                        HorizontalContentAlignment="Stretch"
+                                                            HorizontalContentAlignment="Stretch"
-                                                        VerticalContentAlignment="Stretch"
+                                                            VerticalContentAlignment="Stretch"
-                                                        IsChecked="{x:Bind IsChecked, Mode=TwoWay}">
+                                                            IsChecked="{x:Bind IsChecked, Mode=TwoWay}">
-                                                        <Grid Margin="0,0,0,5" ColumnSpacing="6">
+                                                            <Grid Margin="0,0,0,5" ColumnSpacing="6">
-                                                            <Grid.ColumnDefinitions>
+                                                                <Grid.ColumnDefinitions>
-                                                                <ColumnDefinition Width="Auto" />
+                                                                    <ColumnDefinition Width="Auto" />
-                                                                <ColumnDefinition Width="*" />
+                                                                    <ColumnDefinition Width="*" />
-                                                            </Grid.ColumnDefinitions>
+                                                                </Grid.ColumnDefinitions>
 
-                                                            <Ellipse
+                                                                <Ellipse
-                                                                Width="20"
+                                                                    Width="20"
-                                                                Height="20"
+                                                                    Height="20"
-                                                                Fill="{x:Bind helpers:XamlHelpers.GetSolidColorBrushFromHex(BackgroundColorHex), Mode=OneWay}" />
+                                                                    Fill="{x:Bind helpers:XamlHelpers.GetSolidColorBrushFromHex(BackgroundColorHex), Mode=OneWay}" />
 
-                                                            <TextBlock
+                                                                <TextBlock
-                                                                Grid.Column="1"
+                                                                    Grid.Column="1"
-                                                                VerticalAlignment="Center"
+                                                                    VerticalAlignment="Center"
-                                                                FontSize="14"
+                                                                    FontSize="14"
-                                                                Text="{x:Bind Name, Mode=OneWay}"
+                                                                    Text="{x:Bind Name, Mode=OneWay}"
-                                                                TextWrapping="Wrap" />
+                                                                    TextWrapping="Wrap" />
-                                                        </Grid>
+                                                            </Grid>
-                                                    </CheckBox>
+                                                        </CheckBox>
-                                                </DataTemplate>
+                                                    </DataTemplate>
-                                            </ItemsControl.ItemTemplate>
+                                                </ItemsControl.ItemTemplate>
-                                        </ItemsControl>
+                                            </ItemsControl>
-                                    </muxc:Expander.Content>
+                                        </muxc:Expander.Content>
-                                </muxc:Expander>
+                                    </muxc:Expander>
-                            </DataTemplate>
+                                </DataTemplate>
-                        </ListView.ItemTemplate>
+                            </ListView.ItemTemplate>
-                    </ListView>
+                        </ListView>
+                    </Grid>
+
+                    <StackPanel
+                        x:Name="ContactsPaneContent"
+                        Margin="20,20,16,0"
+                        Visibility="Collapsed"
+                        Spacing="6">
+                        <TextBlock
+                            FontSize="16"
+                            FontWeight="SemiBold"
+                            Text="{x:Bind domain:Translator.ContactsPane_DescriptionTitle, Mode=OneTime}"
+                            TextWrapping="WrapWholeWords" />
+                        <TextBlock
+                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                            Style="{StaticResource BodyTextBlockStyle}"
+                            Text="{x:Bind domain:Translator.ContactsPane_DescriptionBody, Mode=OneTime}"
+                            TextWrapping="WrapWholeWords" />
+                    </StackPanel>
                 </Grid>
             </muxc:NavigationView.PaneCustomContent>
             <Grid ColumnSpacing="0">

Wino.Mail.WinUI/Views/WinoAppShell.xaml.cs

@@ -157,7 +157,6 @@ public sealed partial class WinoAppShell : Views.Abstract.WinoAppShellAbstract,
 
     private void ResetShellModeNavigationState()
     {
-        ViewModel.StatePersistenceService.IsManageAccountsNavigating = false;
         ViewModel.StatePersistenceService.IsSettingsNavigating = false;
         InnerShellFrame.BackStack.Clear();
         InnerShellFrame.ForwardStack.Clear();
@@ -187,7 +186,7 @@ public sealed partial class WinoAppShell : Views.Abstract.WinoAppShellAbstract,
 
         if (ViewModel.IsCalendarMode)
         {
-            ViewModel.StatePersistenceService.CoreWindowTitle = ViewModel.StatePersistenceService.AppModeTitle;
+            ViewModel.StatePersistenceService.CoreWindowTitle = string.Empty;
             return;
         }
 
@@ -490,16 +489,29 @@ public sealed partial class WinoAppShell : Views.Abstract.WinoAppShellAbstract,
 
     private void UpdateNavigationPaneLayout(NavigationViewDisplayMode displayMode)
     {
-        if (ViewModel.IsCalendarMode)
+        if (displayMode == NavigationViewDisplayMode.Expanded && navigationView.IsPaneOpen)
         {
-            PaneCustomContent.Visibility = displayMode == NavigationViewDisplayMode.Expanded && navigationView.IsPaneOpen
+            if (ViewModel.IsCalendarMode)
-                ? Visibility.Visible
+            {
-                : Visibility.Collapsed;
+                PaneCustomContent.Visibility = Visibility.Visible;
+                CalendarPaneContent.Visibility = Visibility.Visible;
+                ContactsPaneContent.Visibility = Visibility.Collapsed;
+                InnerShellFrame.Margin = new Thickness(0);
+                return;
+            }
 
-            InnerShellFrame.Margin = new Thickness(0);
+            if (ViewModel.IsContactsMode)
-            return;
+            {
+                PaneCustomContent.Visibility = Visibility.Visible;
+                CalendarPaneContent.Visibility = Visibility.Collapsed;
+                ContactsPaneContent.Visibility = Visibility.Visible;
+                InnerShellFrame.Margin = new Thickness(0);
+                return;
+            }
         }
 
+        CalendarPaneContent.Visibility = Visibility.Collapsed;
+        ContactsPaneContent.Visibility = Visibility.Collapsed;
         PaneCustomContent.Visibility = Visibility.Collapsed;
         InnerShellFrame.Margin = displayMode == NavigationViewDisplayMode.Minimal
             ? new Thickness(7, 0, 0, 0)

Wino.Messages/Client/Contacts/NewContactRequested.cs

@@ -0,0 +1,3 @@
+namespace Wino.Messaging.Client.Contacts;
+
+public record NewContactRequested;