fixup! fixup! fixup! TF-4400 Add collapseThreads for load more & refresh change when force email query = true

Author: dab246

model/lib/email/presentation_email.dart

@@ -261,6 +261,7 @@ class PresentationEmail with EquatableMixin, SearchSnippetMixin, ThreadMixin {
     MessageIdsHeaderValue? messageId,
     MessageIdsHeaderValue? references,
     List<EmailId>? emailIdsInThread,
+    bool clearEmailIdsInThread = false,
   }) {
     return PresentationEmail(
       id: id ?? this.id,
@@ -294,6 +295,7 @@ class PresentationEmail with EquatableMixin, SearchSnippetMixin, ThreadMixin {
       emailInThreadStatus: emailInThreadStatus ?? this.emailInThreadStatus,
       messageId: messageId ?? this.messageId,
       references: references ?? this.references,
-    )..emailIdsInThread = emailIdsInThread ?? this.emailIdsInThread;
+    )..emailIdsInThread =
+        clearEmailIdsInThread ? null : (emailIdsInThread ?? this.emailIdsInThread);
   }
 }

test/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller_test.dart

@@ -495,9 +495,9 @@ void main() {
         getLatestChanges: false,
         propertiesCreated: ThreadConstants.propertiesDefault,
         propertiesUpdated: ThreadConstants.propertiesUpdatedDefault,
-        useCache: anyNamed('useCache'),
-        forceEmailQuery: anyNamed('forceEmailQuery'),
-        collapseThreads: anyNamed('collapseThreads')));
+        useCache: true,
+        forceEmailQuery: false,
+        collapseThreads: false));
     });
 
     test('WHEN user use advanced search/sort/filter feature, '
@@ -555,13 +555,13 @@ void main() {
         testSession, testAccountId,
         limit: ThreadConstants.defaultLimit,
         sort: EmailSortOrderType.mostRecent.getSortOrder().toNullable(),
-        emailFilter: anyNamed('emailFilter'),
+        emailFilter: threadController.getEmailFilterForLoadMailbox(),
         getLatestChanges: false,
         propertiesCreated: ThreadConstants.propertiesDefault,
         propertiesUpdated: ThreadConstants.propertiesUpdatedDefault,
-        useCache: anyNamed('useCache'),
-        forceEmailQuery: anyNamed('forceEmailQuery'),
-        collapseThreads: anyNamed('collapseThreads')
+        useCache: true,
+        forceEmailQuery: false,
+        collapseThreads: false
       )).called(1);
     });
 

test/features/search/verify_before_time_in_search_email_filter_test.dart

@@ -863,7 +863,7 @@ void main() {
         ),
         propertiesUpdated: ThreadConstants.propertiesUpdatedDefault,
         emailFilter: threadController.getEmailFilterForLoadMailbox(),
-        collapseThreads: anyNamed('collapseThreads'),
+        collapseThreads: mailboxDashboardController.collapseThreads,
       )).called(1);
 
       verify(mockSearchEmailInteractor.execute(
@@ -1031,7 +1031,7 @@ void main() {
         ),
         propertiesUpdated: ThreadConstants.propertiesUpdatedDefault,
         emailFilter: threadController.getEmailFilterForLoadMailbox(),
-        collapseThreads: anyNamed('collapseThreads'),
+        collapseThreads: mailboxDashboardController.collapseThreads,
       )).called(1);
 
       verify(mockSearchEmailInteractor.execute(
@@ -1144,7 +1144,7 @@ void main() {
         ),
         propertiesUpdated: ThreadConstants.propertiesUpdatedDefault,
         emailFilter: threadController.getEmailFilterForLoadMailbox(),
-        collapseThreads: anyNamed('collapseThreads'),
+        collapseThreads: mailboxDashboardController.collapseThreads,
       )).called(1);
 
       verify(mockSearchEmailInteractor.execute(