Fix merge conflicts

Wino.Mail/Views/Abstract/AliasManagementPageAbstract.cs

@@ -0,0 +1,6 @@
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract
+{
+    public abstract class AliasManagementPageAbstract : BasePage<AliasManagementPageViewModel> { }
+}

Wino.Mail/Views/ComposePage.xaml

@@ -443,17 +443,9 @@
                         x:Name="AccountsComboBox"
                         Grid.Column="1"
                         IsEditable="False"
-                        IsEnabled="False"
-                        ItemsSource="{x:Bind ViewModel.Accounts}"
-                        SelectedItem="{x:Bind ViewModel.ComposingAccount, Mode=TwoWay}">
-                        <ComboBox.ItemTemplate>
-                            <DataTemplate x:DataType="entities:MailAccount">
-                                <TextBlock>
-                                    <Run Text="{x:Bind Name}" /><Run Text=" (" /><Run Text="{x:Bind Address}" /><Run Text=")" />
-                                </TextBlock>
-                            </DataTemplate>
-                        </ComboBox.ItemTemplate>
-                    </ComboBox>
+                        ItemsSource="{x:Bind ViewModel.AvailableAliases, Mode=OneWay}"
+                        DisplayMemberPath="AliasAddress"
+                        SelectedItem="{x:Bind ViewModel.SelectedAlias, Mode=TwoWay}" />
 
                     <!--  To  -->
                     <TextBlock

Wino.Mail/Views/ComposePage.xaml.cs

@@ -39,7 +39,8 @@ namespace Wino.Views
     public sealed partial class ComposePage : ComposePageAbstract,
         IRecipient<NavigationPaneModeChanged>,
         IRecipient<CreateNewComposeMailRequested>,
-        IRecipient<ApplicationThemeChanged>
+        IRecipient<ApplicationThemeChanged>,
+        IRecipient<KillChromiumRequested>
     {
         public bool IsComposerDarkMode
         {
@@ -237,12 +238,9 @@ namespace Wino.Views
             // Convert files to MailAttachmentViewModel.
             foreach (var file in files)
             {
-                if (!ViewModel.IncludedAttachments.Any(a => a.FileName == file.Path))
-                {
-                    var attachmentViewModel = await file.ToAttachmentViewModelAsync();
+                var attachmentViewModel = await file.ToAttachmentViewModelAsync();
 
-                    ViewModel.IncludedAttachments.Add(attachmentViewModel);
-                }
+                await ViewModel.IncludeAttachmentAsync(attachmentViewModel);
             }
         }
 
@@ -417,13 +415,6 @@ namespace Wino.Views
             return await ExecuteScriptFunctionAsync("initializeJodit", fonts, composerFont, composerFontSize, readerFont, readerFontSize);
         }
 
-        protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
-        {
-            base.OnNavigatingFrom(e);
-
-            DisposeDisposables();
-            DisposeWebView2();
-        }
 
         private void DisposeWebView2()
         {
@@ -700,5 +691,11 @@ namespace Wino.Views
                 ToBox.Focus(FocusState.Programmatic);
             }
         }
+
+        public void Receive(KillChromiumRequested message)
+        {
+            DisposeDisposables();
+            DisposeWebView2();
+        }
     }
 }

Wino.Mail/Views/MailListPage.xaml

@@ -332,11 +332,6 @@
                         Padding="2,0"
                         Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
                         CornerRadius="8">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="48" />
-                            <RowDefinition Height="2" />
-                        </Grid.RowDefinitions>
-
                         <!--  Commands  -->
                         <Grid>
                             <Grid.ColumnDefinitions>
@@ -478,12 +473,6 @@
                                 </Button.Flyout>
                             </Button>
                         </Grid>
-
-                        <muxc:ProgressBar
-                            x:Name="LoadingProgressBar"
-                            Grid.Row="1"
-                            x:Load="{x:Bind ViewModel.IsInitializingFolder, Mode=OneWay}"
-                            IsIndeterminate="True" />
                     </Grid>
 
                     <!--  Pivot + Sync + Multi Select  -->

Wino.Mail/Views/NewAccountManagementPage.xaml.cs

@@ -44,6 +44,7 @@ namespace Wino.Views
                 WinoPage.SignatureManagementPage => typeof(SignatureManagementPage),
                 WinoPage.AccountDetailsPage => typeof(AccountDetailsPage),
                 WinoPage.MergedAccountDetailsPage => typeof(MergedAccountDetailsPage),
+                WinoPage.AliasManagementPage => typeof(AliasManagementPage),
                 _ => null,
             };
         }

Wino.Mail/Views/Settings/AliasManagementPage.xaml.cs

@@ -0,0 +1,12 @@
+using Wino.Views.Abstract;
+
+namespace Wino.Views.Settings
+{
+    public sealed partial class AliasManagementPage : AliasManagementPageAbstract
+    {
+        public AliasManagementPage()
+        {
+            this.InitializeComponent();
+        }
+    }
+}