@@ -766,6 +766,12 @@ class ThreadController extends BaseController with EmailActionController, PopupM
766766 }
767767
768768 void selectEmail (PresentationEmail presentationEmailSelected) {
769+ if (mailboxDashBoardController.isSelectAllPageEnabled.value) {
770+ mailboxDashBoardController.isSelectAllPageEnabled.value = false ;
771+ }
772+ if (mailboxDashBoardController.isSelectAllEmailsEnabled.value) {
773+ mailboxDashBoardController.isSelectAllEmailsEnabled.value = false ;
774+ }
769775 final emailsInCurrentMailbox = mailboxDashBoardController.emailsInCurrentMailbox;
770776
771777 if (_rangeSelectionMode && latestEmailSelectedOrUnselected.value != null && latestEmailSelectedOrUnselected.value? .id != presentationEmailSelected.id) {
@@ -817,6 +823,7 @@ class ThreadController extends BaseController with EmailActionController, PopupM
817823 .map ((email) => email.toSelectedEmail (selectMode: SelectMode .INACTIVE ))
818824 .toList ();
819825 mailboxDashBoardController.isSelectAllEmailsEnabled.value = false ;
826+ mailboxDashBoardController.isSelectAllPageEnabled.value = false ;
820827 mailboxDashBoardController.updateEmailList (newEmailList);
821828 mailboxDashBoardController.currentSelectMode.value = SelectMode .INACTIVE ;
822829 mailboxDashBoardController.listEmailSelected.clear ();
@@ -1389,6 +1396,12 @@ class ThreadController extends BaseController with EmailActionController, PopupM
13891396
13901397 void handleLoadMoreEmailsRequest () {
13911398 log ('ThreadController::handleLoadMoreEmailsRequest:' );
1399+ if (mailboxDashBoardController.isSelectAllPageEnabled.value) {
1400+ mailboxDashBoardController.isSelectAllPageEnabled.value = false ;
1401+ }
1402+ if (mailboxDashBoardController.isSelectAllEmailsEnabled.value) {
1403+ mailboxDashBoardController.isSelectAllEmailsEnabled.value = false ;
1404+ }
13921405 if (isSearchActive) {
13931406 _searchMoreEmails ();
13941407 } else {
@@ -1397,7 +1410,7 @@ class ThreadController extends BaseController with EmailActionController, PopupM
13971410 }
13981411
13991412 bool validateToShowSelectionEmailsBanner () {
1400- return mailboxDashBoardController.isSelectionEnabled () &&
1413+ return mailboxDashBoardController.isSelectAllPageEnabled.isTrue &&
14011414 selectedMailbox != null &&
14021415 selectedMailbox! .countTotalEmails > ThreadConstants .maxCountEmails &&
14031416 mailboxDashBoardController.listEmailSelected.length <
0 commit comments