Merge branch 'develop' into add/9490-filter-txns-by-payment-method

changelog/add-woopay-klaviyo-newsletter-support

@@ -0,0 +1,4 @@
+Significance: patch
+Type: add
+
+Add WooPay Klaviyo newsletter integration.

changelog/feat-9810-add-seller-message

@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Add seller_message to failed order notes

changelog/fix-198-mccy-fedex-conversion

@@ -0,0 +1,5 @@
+Significance: patch
+Type: fix
+Comment: Fix FedEx insurance rates with different currencies.
+
+

changelog/fix-8620-fee-types-in-fees-brakedown-tooltip-are-not-internationalised

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Use translatable strings on the fee breakdown tooltip of the payment settings screen.

changelog/fix-9418-hide-transaction-fees-when-transaction-is-not-captured

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Hide transaction fee on admin view order screen when transaction is not captured.

changelog/fix-9987-filter-csv-disputes

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix filtering in async Disputes CSV export

changelog/fix-9996-currency-conversion-fee-phrasing

@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Use "currency conversion fee" instead "foreign exchange fee" in payment timeline and various other places.

changelog/fix-ece-button-for-price-including-tax

@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Show express checkout for products w/o shipping but where tax is included into price.

changelog/fix-tokenized-ece-product-bundles-totals

@@ -0,0 +1,5 @@
+Significance: patch
+Type: fix
+Comment: fix: tokenized ECE item compatibility w/ product bundles
+
+

changelog/update-9919-embedded-components-width

@@ -0,0 +1,4 @@
+Significance: patch
+Type: update
+
+Update Embedded Components and MOX to support custom width and paddings.

client/data/disputes/hooks.ts

@@ -17,7 +17,6 @@ import type {
 } from 'wcpay/types/disputes';
 import type { ApiError } from 'wcpay/types/errors';
 import { STORE_NAME } from '../constants';
-import { disputeAwaitingResponseStatuses } from 'wcpay/disputes/filters/config';
 
 /**
  * Returns the dispute object, error object, and loading state.
@@ -98,11 +97,6 @@ export const useDisputes = ( {
 		( select ) => {
 			const { getDisputes, isResolving } = select( STORE_NAME );
 
-			const search =
-				filter === 'awaiting_response'
-					? disputeAwaitingResponseStatuses
-					: undefined;
-
 			const query = {
 				paged: Number.isNaN( parseInt( paged ?? '', 10 ) )
 					? '1'
@@ -119,7 +113,7 @@ export const useDisputes = ( {
 					dateBetween.sort( ( a, b ) =>
 						moment( a ).diff( moment( b ) )
 					),
-				search,
+				filter,
 				statusIs,
 				statusIsNot,
 				orderBy: orderBy || 'created',
@@ -163,11 +157,6 @@ export const useDisputesSummary = ( {
 		( select ) => {
 			const { getDisputesSummary, isResolving } = select( STORE_NAME );
 
-			const search =
-				filter === 'awaiting_response'
-					? disputeAwaitingResponseStatuses
-					: undefined;
-
 			const query = {
 				paged: Number.isNaN( parseInt( paged ?? '', 10 ) )
 					? '1'
@@ -180,7 +169,7 @@ export const useDisputesSummary = ( {
 				dateBefore,
 				dateAfter,
 				dateBetween,
-				search,
+				filter,
 				statusIs,
 				statusIsNot,
 			};

client/data/disputes/resolvers.js

@@ -20,6 +20,7 @@ import {
 	updateDisputesSummary,
 	updateErrorForDispute,
 } from './actions';
+import { disputeAwaitingResponseStatuses } from 'wcpay/disputes/filters/config';
 
 const formatQueryFilters = ( query ) => ( {
 	user_email: query.userEmail,
@@ -31,7 +32,10 @@ const formatQueryFilters = ( query ) => ( {
 		formatDateValue( query.dateBetween[ 0 ] ),
 		formatDateValue( query.dateBetween[ 1 ], true ),
 	],
-	search: query.search,
+	search:
+		query.filter === 'awaiting_response'
+			? disputeAwaitingResponseStatuses
+			: query.search,
 	status_is: query.statusIs,
 	status_is_not: query.statusIsNot,
 	locale: query.locale,
@@ -42,7 +46,6 @@ export function getDisputesCSV( query ) {
 		`${ NAMESPACE }/disputes/download`,
 		formatQueryFilters( query )
 	);
-
 	return path;
 }
 

client/disputes/index.tsx

@@ -372,6 +372,7 @@ export const DisputesList = (): JSX.Element => {
 			date_after: dateAfter,
 			date_between: dateBetween,
 			match,
+			filter,
 			status_is: statusIs,
 			status_is_not: statusIsNot,
 		} = getQuery();
@@ -407,6 +408,7 @@ export const DisputesList = (): JSX.Element => {
 							dateBefore,
 							dateBetween,
 							match,
+							filter,
 							statusIs,
 							statusIsNot,
 						} ),

client/onboarding/style.scss

@@ -85,10 +85,12 @@ body.wcpay-onboarding__body {
 			}
 
 			&__content {
-				max-width: 400px;
+				max-width: 615px;
+				width: 100%;
 
-				@media screen and ( min-width: $break-mobile ) {
-					width: 400px;
+				@media screen and ( max-width: $break-mobile ) {
+					width: 100%;
+					padding: 0 $gap;
 				}
 			}
 

client/payment-details/timeline/map-events.js

@@ -410,12 +410,12 @@ export const feeBreakdown = ( event ) => {
 			fixedRate !== 0
 				? __(
 						/* translators: %1$s% is the fee percentage and %2$s is the fixed rate */
-						'Foreign exchange fee: %1$s%% + %2$s',
+						'Currency conversion fee: %1$s%% + %2$s',
 						'woocommerce-payments'
 				  )
 				: __(
 						/* translators: %1$s% is the fee percentage */
-						'Foreign exchange fee: %1$s%%',
+						'Currency conversion fee: %1$s%%',
 						'woocommerce-payments'
 				  ),
 		'additional-wcpay-subscription':

client/payment-details/timeline/test/__snapshots__/map-events.js.snap

@@ -397,7 +397,7 @@ exports[`mapTimelineEvents single currency events formats captured events with f
           International card fee: 1.5%
         </li>
         <li>
-          Foreign exchange fee: 2%
+          Currency conversion fee: 2%
         </li>
         <li>
           Discount