MC-40702: Order currency is used instead of bas currency in the shipping label for form

Author: engcom-Echo

dev/tests/integration/testsuite/Magento/Shipping/Block/Adminhtml/Order/AddToPackageTest.php

@@ -77,9 +77,11 @@ public function testGetCommentsHtml(): void
      */
     public function testGetCurrencyCodeCustomValue ()
     {
-        $expectedCurrencyCode = '<span class="customs-value-currency">
-                                        FR                                    </span>';
-        $this->assertStringContainsString($expectedCurrencyCode, $this->getHtml());
+        $template = '/<span class="customs-value-currency">\s*?(?<currency>[A-Za-z]+)\s*?<\/span>/';
+        $matches = [];
+        preg_match($template, $this->getHtml(), $matches);
+        $currency = $matches['currency'] ?? null;
+        $this->assertEquals('FR',$currency );
     }
 
     /**

dev/tests/integration/testsuite/Magento/Shipping/_files/shipping_with_carrier_data_different_currency_code.php

@@ -20,7 +20,7 @@
 /** @var Transaction $transaction */
 $transaction = $objectManager->get(Transaction::class);
 /** @var ProductRepositoryInterface $productRepository */
-$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
 $product = $productRepository->get('simple');
 /** @var Order $order */
 $order = $objectManager->get(OrderInterfaceFactory::class)->create()->loadByIncrementId('100000001');
@@ -42,7 +42,7 @@
 $tracking = [
     'carrier_code' => 'ups',
     'title' => 'United Parcel Service',
-    'number' => '987654321'
+    'number' => '987654321',
 ];
 
 $shipment = $objectManager->get(ShipmentFactory::class)->create($order, $shipmentItems, [$tracking]);