Merge branch 'develop' into add/payment-method-promotions

Author: vladolaru

changelog/fix-e2e-all-wc-7_7-merchant-save-dispute-without-evidence

@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: E2E test-only change, no production code affected.
+
+

changelog/fix-multi-currency-order-total-type

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix number format when converting order prices.

includes/multi-currency/Compatibility.php

@@ -212,7 +212,7 @@ public function convert_order_prices( $results ) {
 			}
 
 			$exchange_rate = $order->get_meta( '_wcpay_multi_currency_order_exchange_rate', true );
-			$order->set_total( number_format( $order->get_total() * ( 1 / $exchange_rate ), wc_get_price_decimals() ) );
+			$order->set_total( wc_format_decimal( $order->get_total() * ( 1 / $exchange_rate ), wc_get_price_decimals() ) );
 		}
 
 		remove_filter( 'woocommerce_order_query', [ $this, 'convert_order_prices' ] );

tests/e2e/specs/wcpay/merchant/merchant-disputes-respond.spec.ts

@@ -643,11 +643,6 @@ test.describe( 'Disputes > Respond to a dispute', () => {
 					hasText: 'Evidence saved!',
 				} )
 			).toBeVisible( { timeout: 10000 } );
-
-			// Sanity-check the field didn't reset visually before leaving the page
-			await expect(
-				merchantPage.getByLabel( 'PRODUCT DESCRIPTION' )
-			).toHaveValue( 'my product description' );
 		} );
 
 		await test.step( 'Go back to the payment details page', async () => {