eduvia/workavia-mail-front
11
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

TF-996: apply correct content email when swipe

Browse Source
This commit is contained in:
ManhNTX
2022-10-29 20:08:19 +07:00
committed by Dat H. Pham
parent ecf1b0688e
commit 78af37e0f5
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/features/email/presentation/email_controller.dart
+9 -7
View File
@@ -344,14 +344,16 @@ class EmailController extends BaseController with AppLoaderMixin {
); );
presentationEmailsLoaded.removeWhere((e) => e.emailCurrent!.id == emailLoaded.emailCurrent!.id); presentationEmailsLoaded.removeWhere((e) => e.emailCurrent!.id == emailLoaded.emailCurrent!.id);
presentationEmailsLoaded.add(emailLoaded); presentationEmailsLoaded.add(emailLoaded);
emailContents.value = success.emailContentsDisplayed; if(success.emailCurrent?.id == mailboxDashBoardController.selectedEmail.value?.id) {
initialEmailContents = success.emailContents; emailContents.value = success.emailContentsDisplayed;
attachments.value = success.attachments; initialEmailContents = success.emailContents;
attachments.value = success.attachments;
final isShowMessageReadReceipt = success.emailCurrent final isShowMessageReadReceipt = success.emailCurrent
?.hasReadReceipt(mailboxDashBoardController.mapMailboxById) == true; ?.hasReadReceipt(mailboxDashBoardController.mapMailboxById) == true;
if (isShowMessageReadReceipt) { if (isShowMessageReadReceipt) {
_handleReadReceipt(); _handleReadReceipt();
}
} }
} }
lib/features/email/presentation/email_view.dart
+6 -3
View File
@@ -242,11 +242,11 @@ class EmailView extends GetWidget<EmailController> {
if (BuildUtils.isWeb) if (BuildUtils.isWeb)
Expanded(child: Padding( Expanded(child: Padding(
padding: const EdgeInsets.only(left: 16, bottom: 16), padding: const EdgeInsets.only(left: 16, bottom: 16),
child: _buildEmailContent(context, constraints))) child: _buildEmailContent(context, constraints, email)))
else else
Padding( Padding(
padding: const EdgeInsets.all(16), padding: const EdgeInsets.all(16),
child: _buildEmailContent(context, constraints)) child: _buildEmailContent(context, constraints, email))
], ],
); );
}); });
@@ -715,7 +715,10 @@ class EmailView extends GetWidget<EmailController> {
}); });
} }
Widget _buildEmailContent(BuildContext context, BoxConstraints constraints) { Widget _buildEmailContent(BuildContext context, BoxConstraints constraints, PresentationEmail email) {
if(email.id != controller.mailboxDashBoardController.selectedEmail.value?.id) {
return const SizedBox.shrink();
}
return Obx(() { return Obx(() {
if (controller.emailContents.isNotEmpty) { if (controller.emailContents.isNotEmpty) {
final allEmailContents = controller.emailContents.asHtmlString; final allEmailContents = controller.emailContents.asHtmlString;