From a7e63820c56c974ade231c5fc848eaac20b0aaf2 Mon Sep 17 00:00:00 2001
From: Valentin Perignon <valentin.perignon@infomaniak.com>
Date: Tue, 13 Jun 2023 09:36:35 +0200
Subject: [PATCH] fix: Remove multiple selection animations

---
 Mail/Components/BottomBarView.swift              |  1 -
 Mail/Views/Thread List/ThreadListCell.swift      | 16 +++++++---------
 Mail/Views/Thread List/ThreadListModifiers.swift |  8 ++------
 .../ThreadListMultipleSectionViewModel.swift     |  4 +---
 4 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/Mail/Components/BottomBarView.swift b/Mail/Components/BottomBarView.swift
index 87d648ef5..66c4e30ce 100644
--- a/Mail/Components/BottomBarView.swift
+++ b/Mail/Components/BottomBarView.swift
@@ -32,7 +32,6 @@ struct BottomBar<Items: View>: ViewModifier {
                 BottomBarView(items: items)
             }
         }
-//        .animation(.nil, value: isVisible)
         .ignoresSafeArea(.keyboard, edges: .bottom)
     }
 }
diff --git a/Mail/Views/Thread List/ThreadListCell.swift b/Mail/Views/Thread List/ThreadListCell.swift
index d1227baa2..46d35de56 100644
--- a/Mail/Views/Thread List/ThreadListCell.swift	
+++ b/Mail/Views/Thread List/ThreadListCell.swift	
@@ -83,15 +83,13 @@ struct ThreadListCell: View {
     }
 
     private func didLongPressCell() {
-        withAnimation {
-            multipleSelectionViewModel.feedbackGenerator.prepare()
-            multipleSelectionViewModel.isEnabled.toggle()
-            if multipleSelectionViewModel.isEnabled {
-                @InjectService var matomo: MatomoUtils
-                matomo.track(eventWithCategory: .multiSelection, action: .longPress, name: "enable")
-                multipleSelectionViewModel.feedbackGenerator.impactOccurred()
-                multipleSelectionViewModel.toggleSelection(of: thread)
-            }
+        multipleSelectionViewModel.feedbackGenerator.prepare()
+        multipleSelectionViewModel.isEnabled.toggle()
+        if multipleSelectionViewModel.isEnabled {
+            @InjectService var matomo: MatomoUtils
+            matomo.track(eventWithCategory: .multiSelection, action: .longPress, name: "enable")
+            multipleSelectionViewModel.feedbackGenerator.impactOccurred()
+            multipleSelectionViewModel.toggleSelection(of: thread)
         }
     }
 }
diff --git a/Mail/Views/Thread List/ThreadListModifiers.swift b/Mail/Views/Thread List/ThreadListModifiers.swift
index d5463219e..bd4d8bc6a 100644
--- a/Mail/Views/Thread List/ThreadListModifiers.swift	
+++ b/Mail/Views/Thread List/ThreadListModifiers.swift	
@@ -76,9 +76,7 @@ struct ThreadListToolbar: ViewModifier {
                     if multipleSelectionViewModel.isEnabled {
                         Button(MailResourcesStrings.Localizable.buttonCancel) {
                             matomo.track(eventWithCategory: .multiSelection, name: "cancel")
-                            withAnimation {
-                                multipleSelectionViewModel.isEnabled = false
-                            }
+                            multipleSelectionViewModel.isEnabled = false
                         }
                     } else {
                         if isCompactWindow {
@@ -160,9 +158,7 @@ struct ThreadListToolbar: ViewModifier {
                 .disabled(multipleSelectionViewModel.selectedItems.isEmpty)
             }
             .actionsPanel(actionsTarget: $multipleSelectionActionsTarget) {
-                withAnimation {
-                    multipleSelectionViewModel.isEnabled = false
-                }
+                multipleSelectionViewModel.isEnabled = false
             }
             .navigationTitle(
                 multipleSelectionViewModel.isEnabled
diff --git a/Mail/Views/Thread List/ThreadListMultipleSectionViewModel.swift b/Mail/Views/Thread List/ThreadListMultipleSectionViewModel.swift
index 83c07202c..37224350b 100644
--- a/Mail/Views/Thread List/ThreadListMultipleSectionViewModel.swift	
+++ b/Mail/Views/Thread List/ThreadListMultipleSectionViewModel.swift	
@@ -100,9 +100,7 @@ import SwiftUI
         default:
             break
         }
-        withAnimation {
-            isEnabled = false
-        }
+        isEnabled = false
     }
 
     private func setActions() {