From 00c2c7ffdaeb5328698fb0698d3c405396200bf2 Mon Sep 17 00:00:00 2001
From: mup <mrex@tuta.io>
Date: Mon, 19 Feb 2024 14:40:02 +0100
Subject: [PATCH] Remove selectNone from attributes and inject directly in
 onDelete

---
 src/contacts/view/ContactView.ts          | 3 +--
 src/contacts/view/ContactViewerActions.ts | 5 ++---
 src/search/view/SearchView.ts             | 6 ++----
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/contacts/view/ContactView.ts b/src/contacts/view/ContactView.ts
index 1ef9bce93619..22099f1f1c90 100644
--- a/src/contacts/view/ContactView.ts
+++ b/src/contacts/view/ContactView.ts
@@ -279,9 +279,8 @@ export class ContactView extends BaseTopLevelView implements TopLevelView<Contac
 				contacts,
 				onEdit: (c) => this.editContact(c),
 				onExport: exportContacts,
-				onDelete: deleteContacts,
+				onDelete: (contacts: Contact[]) => deleteContacts(contacts, () => this.contactViewModel.listModel.selectNone()),
 				onMerge: confirmMerge,
-				selectNone: () => this.contactViewModel.listModel.selectNone(),
 			})
 		}
 	}
diff --git a/src/contacts/view/ContactViewerActions.ts b/src/contacts/view/ContactViewerActions.ts
index 21173b683dac..d1bb6b3043f6 100644
--- a/src/contacts/view/ContactViewerActions.ts
+++ b/src/contacts/view/ContactViewerActions.ts
@@ -8,10 +8,9 @@ import { Keys } from "../../api/common/TutanotaConstants.js"
 export interface ContactViewToolbarAttrs {
 	contacts: Contact[]
 	onEdit: (contact: Contact) => unknown
-	onDelete: (contacts: Contact[], onConfirm: () => void) => unknown
+	onDelete: (contacts: Contact[]) => unknown
 	onMerge: (left: Contact, right: Contact) => unknown
 	onExport: (contacts: Contact[]) => unknown
-	selectNone: () => unknown
 }
 
 /**
@@ -55,7 +54,7 @@ export class ContactViewerActions implements Component<ContactViewToolbarAttrs>
 			actionButtons.push(
 				m(IconButton, {
 					title: "delete_action",
-					click: () => onDelete(contacts, attrs.selectNone),
+					click: () => onDelete(contacts),
 					icon: Icons.Trash,
 				}),
 			)
diff --git a/src/search/view/SearchView.ts b/src/search/view/SearchView.ts
index d923e42480a9..e92f33c40834 100644
--- a/src/search/view/SearchView.ts
+++ b/src/search/view/SearchView.ts
@@ -357,7 +357,6 @@ export class SearchView extends BaseTopLevelView implements TopLevelView<SearchV
 				onDelete: deleteContacts,
 				onMerge: confirmMerge,
 				onExport: exportContacts,
-				selectNone: noOp,
 			})
 			const isMultiselect = this.searchViewModel.listModel?.state.inMultiselect || selectedContacts.length === 0
 			return m(BackgroundColumnLayout, {
@@ -480,7 +479,7 @@ export class SearchView extends BaseTopLevelView implements TopLevelView<SearchV
 			return m(
 				".flex.col.fill-absolute",
 				// Using contactViewToolbar because it will display empty
-				m(ContactViewerActions, { contacts: [], onExport: noOp, onMerge: noOp, onDelete: noOp, onEdit: noOp, selectNone: noOp }),
+				m(ContactViewerActions, { contacts: [], onExport: noOp, onMerge: noOp, onDelete: noOp, onEdit: noOp }),
 				m(
 					".flex-grow.rel.overflow-hidden",
 					m(ColumnEmptyMessageBox, {
@@ -600,10 +599,9 @@ export class SearchView extends BaseTopLevelView implements TopLevelView<SearchV
 					m(ContactViewerActions, {
 						contacts: this.searchViewModel.getSelectedContacts(),
 						onEdit: () => new ContactEditor(locator.entityClient, getFirstOrThrow(this.searchViewModel.getSelectedContacts())).show(),
-						onDelete: deleteContacts,
+						onDelete: (contacts: Contact[]) => deleteContacts(contacts, () => this.searchViewModel.listModel.selectNone()),
 						onMerge: confirmMerge,
 						onExport: exportContacts,
-						selectNone: () => this.searchViewModel.listModel.selectNone(),
 					}),
 				)
 			}