From abaf5a96fa4d8fbb2e29381f471809622b4b3608 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Mon, 18 Mar 2024 20:30:04 +0100
Subject: [PATCH] Bugfix: sort accounts drag & drop

---
 dev/Settings/User/Accounts.js                      |  2 +-
 dev/Stores/User/Account.js                         |  2 --
 .../app/templates/Views/User/SettingsAccounts.html | 14 +++++++-------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/dev/Settings/User/Accounts.js b/dev/Settings/User/Accounts.js
index edaf08ad8..5f23b981a 100644
--- a/dev/Settings/User/Accounts.js
+++ b/dev/Settings/User/Accounts.js
@@ -89,7 +89,7 @@ export class UserSettingsAccounts /*extends AbstractViewSettings*/ {
 
 	accountsAndIdentitiesAfterMove() {
 		Remote.request('AccountsAndIdentitiesSortOrder', null, {
-			Accounts: AccountUserStore.getEmailAddresses().filter(v => v != SettingsGet('mainEmail')),
+			Accounts: AccountUserStore.filter(item => item.isAdditional()).map(item => item.email),
 			Identities: IdentityUserStore.map(item => (item ? item.id() : ""))
 		});
 	}
diff --git a/dev/Stores/User/Account.js b/dev/Stores/User/Account.js
index b1d45d42f..122ba358e 100644
--- a/dev/Stores/User/Account.js
+++ b/dev/Stores/User/Account.js
@@ -2,8 +2,6 @@ import { addObservablesTo, koArrayWithDestroy } from 'External/ko';
 
 export const AccountUserStore = koArrayWithDestroy();
 
-AccountUserStore.getEmailAddresses = () => AccountUserStore.map(item => item.email);
-
 addObservablesTo(AccountUserStore, {
 	email: '',
 	loading: false
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsAccounts.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsAccounts.html
index 16f320e8d..4eb5a8c87 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsAccounts.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsAccounts.html
@@ -16,13 +16,13 @@
 		<span data-i18n="SETTINGS_ACCOUNTS/BUTTON_ADD_ACCOUNT"></span>
 	</a>
 	<table class="table table-hover list-table accounts-list" data-bind="i18nUpdate: accounts">
-		<tbody>
-			<td></td>
-			<td colspan="3" data-bind="text: mainEmail"></td>
-		</tbody>
 		<tbody data-bind="foreach: accounts">
-			<!-- ko if:isAdditional -->
-			<tr draggable="true" data-bind="sortableItem: { list: $root.accounts, afterMove: $root.accountsAndIdentitiesAfterMove }">
+			<tr draggable="true" data-bind="attr: {draggable:isAdditional}, sortableItem: { list: $root.accounts, afterMove: $root.accountsAndIdentitiesAfterMove }">
+				<!-- ko if:!isAdditional() -->
+				<td></td>
+				<td colspan="3" data-bind="text: displayName"></td>
+				<!-- /ko -->
+				<!-- ko if:isAdditional -->
 				<td>
 					<i class="fontastic drag-handle">⬍</i>
 				</td>
@@ -39,8 +39,8 @@
 				<td>
 					<span class="delete fontastic" data-bind="visible: !askDelete(), click: function (oAccount) { $root.accountForDeletion(oAccount); }">🗑</span>
 				</td>
+				<!-- /ko -->
 			</tr>
-			<!-- /ko -->
 		</tbody>
 	</table>
 </div>