Skip to content

Commit e1d974e

Browse files
committed
Merge branch 'fix-for-issue-38455' of https://github.com/YuriyYavorskiy/magento2 into fix-for-issue-38455
2 parents 9600a3e + e6ed7af commit e1d974e

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

app/code/Magento/Email/Model/Transport.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -242,11 +242,15 @@ public function sendMessage(): void
242242
private function setReturnPath(SymfonyMessage $email): void
243243
{
244244
if ($this->isSetReturnPath === 2 && $this->returnPathValue) {
245-
$email->getHeaders()->addMailboxListHeader('Sender', [$this->returnPathValue]);
245+
$email->getHeaders()->addMailboxHeader('Sender', $this->returnPathValue);
246246
} elseif ($this->isSetReturnPath === 1 &&
247-
!empty($fromAddresses = $email->getHeaders()->get('From')?->getAddresses())) {
247+
!empty(
248+
/** @var \Symfony\Component\Mime\Address[] $fromAddresses */
249+
$fromAddresses = $email->getHeaders()->get('From')?->getAddresses()
250+
)
251+
) {
248252
reset($fromAddresses);
249-
$email->getHeaders()->addMailboxListHeader('Sender', [current($fromAddresses)->getAddress()]);
253+
$email->getHeaders()->addMailboxHeader('Sender', current($fromAddresses));
250254
}
251255
}
252256

app/code/Magento/SalesGraphQl/Model/Formatter/Order.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function format(OrderInterface $orderModel): array
5757
'shipping_address' => $this->orderAddress->getOrderShippingAddress($orderModel),
5858
'billing_address' => $this->orderAddress->getOrderBillingAddress($orderModel),
5959
'payment_methods' => $this->orderPayments->getOrderPaymentMethod($orderModel),
60-
'applied_coupons' => $orderModel->getCouponCode() ? ['code' => $orderModel->getCouponCode()] : [],
60+
'applied_coupons' => $orderModel->getCouponCode() ? [['code' => $orderModel->getCouponCode()]] : [],
6161
'model' => $orderModel,
6262
'comments' => $this->getOrderComments($orderModel)
6363
];

app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_actions-bar.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
padding: @page-main-actions__padding;
2525
}
2626

27-
.actions-scrollable {
27+
.customer-index-edit .actions-scrollable {
2828
.page-actions {
2929
display: flex;
3030
overflow-x: auto;

0 commit comments

Comments
 (0)