TF-1706 Fix grey bar on server CYRUS

(cherry picked from commit 3ae632c967607cd84ddd79da8d9e17421f6b31ff)
This commit is contained in:
dab246
2023-05-15 18:14:34 +07:00
committed by Dat Vu
parent 5bfd61abd8
commit 5e69c8bd1c
7 changed files with 94 additions and 5 deletions
@@ -1459,7 +1459,7 @@ class ComposerController extends BaseController {
final arguments = composerArguments.value;
if (arguments != null) {
if (arguments.emailActionType == EmailActionType.editDraft) {
return arguments.presentationEmail?.from?.first.emailAddress ?? '';
return arguments.presentationEmail?.firstEmailAddressInFrom ?? '';
} else {
return mailboxDashBoardController.userProfile.value?.email ?? '';
}
@@ -454,7 +454,8 @@ class EmailView extends GetWidget<SingleEmailController> {
return <Widget>[
_markAsEmailUnreadAction(context, email),
_markAsEmailSpamOrUnSpamAction(context, email),
_quickCreatingRuleAction(context, email),
if (email.from?.isNotEmpty == true)
_quickCreatingRuleAction(context, email),
];
}
@@ -567,7 +568,8 @@ class EmailView extends GetWidget<SingleEmailController> {
return [
_markAsEmailUnreadPopupItemAction(context, email),
_markAsEmailSpamOrUnSpamPopupItemAction(context, email, mailboxContain),
_quickCreatingRulePopupItemAction(context, email)
if (email.from?.isNotEmpty == true)
_quickCreatingRulePopupItemAction(context, email)
];
}
@@ -195,7 +195,7 @@ class EmailChangeListener extends ChangeListener {
id: presentationEmail.id?.id.value ?? '',
title: presentationEmail.subject ?? '',
message: presentationEmail.preview,
emailAddress: presentationEmail.from?.first,
emailAddress: presentationEmail.firstFromAddress,
payload: notificationPayload.encodeToString,
);
}