Fix merge conflicts

Wino.Mail.ViewModels/AccountManagementViewModel.cs

@@ -42,6 +42,7 @@ namespace Wino.Mail.ViewModels
         public bool IsPurchasePanelVisible => !HasUnlimitedAccountProduct;
         public bool IsAccountCreationAlmostOnLimit => Accounts != null && Accounts.Count == FREE_ACCOUNT_COUNT - 1;
         public bool HasAccountsDefined => Accounts != null && Accounts.Any();
+        public bool CanReorderAccounts => Accounts?.Count > 1;
 
         public string UsedAccountsString => string.Format(Translator.WinoUpgradeRemainingAccountsMessage, Accounts.Count, FREE_ACCOUNT_COUNT);
 
@@ -263,6 +264,9 @@ namespace Wino.Mail.ViewModels
                                                  mergedAccountProviderDetailViewModel));
         }
 
+        [RelayCommand(CanExecute = nameof(CanReorderAccounts))]
+        private Task ReorderAccountsAsync() => DialogService.ShowAccountReorderDialogAsync(availableAccounts: Accounts);
+
         public override void OnNavigatedFrom(NavigationMode mode, object parameters)
         {
             base.OnNavigatedFrom(mode, parameters);
@@ -276,6 +280,9 @@ namespace Wino.Mail.ViewModels
         {
             OnPropertyChanged(nameof(HasAccountsDefined));
             OnPropertyChanged(nameof(UsedAccountsString));
+            OnPropertyChanged(nameof(IsAccountCreationAlmostOnLimit));
+
+            ReorderAccountsCommand.NotifyCanExecuteChanged();
         }
 
         private void PagePropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)

Wino.Mail.ViewModels/AppShellViewModel.cs

@@ -39,7 +39,8 @@ namespace Wino.Mail.ViewModels
         IRecipient<RefreshUnreadCountsMessage>,
         IRecipient<AccountsMenuRefreshRequested>,
         IRecipient<MergedInboxRenamed>,
-        IRecipient<LanguageChanged>
+        IRecipient<LanguageChanged>,
+        IRecipient<AccountMenuItemsReordered>
     {
         #region Menu Items
 
@@ -1059,5 +1060,19 @@ namespace Wino.Mail.ViewModels
 
             ChangeLoadedAccount(latestSelectedAccountMenuItem, navigateInbox: false);
         }
+
+        private void ReorderAccountMenuItems(Dictionary<Guid, int> newAccountOrder)
+        {
+            foreach (var item in newAccountOrder)
+            {
+                var menuItem = MenuItems.GetAccountMenuItem(item.Key);
+
+                if (menuItem == null) continue;
+
+                MenuItems.Move(MenuItems.IndexOf(menuItem), item.Value);
+            }
+        }
+
+        public void Receive(AccountMenuItemsReordered message) => ReorderAccountMenuItems(message.newOrderDictionary);
     }
 }

Wino.Mail.ViewModels/ComposePageViewModel.cs

@@ -160,15 +160,7 @@ namespace Wino.Mail.ViewModels
             isUpdatingMimeBlocked = true;
 
             var assignedAccount = CurrentMailDraftItem.AssignedAccount;
-
-            MailItemFolder sentFolder = null;
-
-            // Load the Sent folder if user wanted to have a copy there.
-            if (assignedAccount.Preferences.ShouldAppendMessagesToSentFolder)
-            {
-                sentFolder = await _folderService.GetSpecialFolderByAccountIdAsync(assignedAccount.Id, SpecialFolderType.Sent);
-            }
-
+            var sentFolder = await _folderService.GetSpecialFolderByAccountIdAsync(assignedAccount.Id, SpecialFolderType.Sent);
             var draftSendPreparationRequest = new SendDraftPreparationRequest(CurrentMailDraftItem.MailCopy, currentMimeMessage, CurrentMailDraftItem.AssignedFolder, sentFolder, CurrentMailDraftItem.AssignedAccount.Preferences);
 
             await _worker.ExecuteAsync(draftSendPreparationRequest);

Wino.Mail.ViewModels/Data/AccountProviderDetailViewModel.cs

@@ -17,6 +17,10 @@ namespace Wino.Mail.ViewModels.Data
 
         public string StartupEntityTitle => Account.Name;
 
+        public int Order => Account.Order;
+
+        public string StartupEntityAddresses => Account.Address;
+
         public AccountProviderDetailViewModel(IProviderDetail providerDetail, MailAccount account)
         {
             ProviderDetail = providerDetail;

Wino.Mail.ViewModels/Data/MergedAccountProviderDetailViewModel.cs

@@ -18,6 +18,12 @@ namespace Wino.Mail.ViewModels.Data
 
         public string StartupEntityTitle => MergedInbox.Name;
 
+        public int Order => 0;
+
+        public IProviderDetail ProviderDetail { get; set; }
+
+        public string StartupEntityAddresses => AccountAddresses;
+
         public MergedAccountProviderDetailViewModel(MergedInbox mergedInbox, List<AccountProviderDetailViewModel> holdingAccounts)
         {
             MergedInbox = mergedInbox;