MC-5681: Onepage Checkout improvements.

Author: RuslanKostiv1

app/code/Magento/Customer/Model/Address/CustomerAddressDataFormatter.php

@@ -46,38 +46,6 @@ public function __construct(
         $this->customAttributesProcessor = $customAttributesProcessor;
     }
 
-    /**
-     * Prepare list of addressed that was selected by customer on checkout page.
-     *
-     * @param \Magento\Customer\Api\Data\CustomerInterface $customer
-     * @param \Magento\Quote\Model\Quote $quote
-     * @param array $prepareAddressList
-     * @return array
-     */
-    public function prepareSelectedAddresses(
-        \Magento\Customer\Api\Data\CustomerInterface $customer,
-        \Magento\Quote\Model\Quote $quote,
-        array $prepareAddressList
-    ): array {
-        /** @var AddressInterface $billingAddress */
-        $billingAddress = $quote->getBillingAddress();
-        $billingAddressId = $billingAddress->getOrigData('customer_address_id');
-        $prepareAddressList = $this->prepareSelectedAddress($customer, $prepareAddressList, $billingAddressId);
-
-        $shippingAddressId = null;
-        $shippingAssignments = $quote->getExtensionAttributes()->getShippingAssignments();
-        if (isset($shippingAssignments[0])) {
-            $shipping = current($shippingAssignments)->getData('shipping');
-            /** @var AddressInterface $shippingAddress */
-            $shippingAddress = $shipping->getAddress();
-            $shippingAddressId = $shippingAddress->getOrigData('customer_address_id');
-        }
-
-        $prepareAddressList = $this->prepareSelectedAddress($customer, $prepareAddressList, $shippingAddressId);
-
-        return $prepareAddressList;
-    }
-
     /**
      * Prepare customer address data.
      *
@@ -125,29 +93,6 @@ public function prepareAddress(AddressInterface $customerAddress)
         return $resultAddress;
     }
 
-    /**
-     * Prepared address by for given customer with given address id.
-     *
-     * @param \Magento\Customer\Api\Data\CustomerInterface $customer
-     * @param array $addressList
-     * @param int|null $addressId
-     * @return array
-     */
-    private function prepareSelectedAddress(
-        \Magento\Customer\Api\Data\CustomerInterface $customer,
-        array $addressList,
-        $addressId = null
-    ): array {
-        if (null !== $addressId && !isset($addressList[$addressId])) {
-            $selectedAddress = $this->prepareAddress($customer->getAddresses()[$addressId]);
-            if (isset($selectedAddress['id'])) {
-                $addressList[$selectedAddress['id']] = $selectedAddress;
-            }
-        }
-
-        return $addressList;
-    }
-
     /**
      * Set additional customer address data
      *