Merge branch 'develop' into add/1342-transaction-breakdown-block

.github/workflows/e2e-pull-request.yml

@@ -27,7 +27,7 @@ env:
   E2E_BLOG_TOKEN:                ${{ secrets.E2E_BLOG_TOKEN }}
   E2E_USER_TOKEN:                ${{ secrets.E2E_USER_TOKEN }}
   WC_E2E_SCREENSHOTS:            1
-  E2E_SLACK_CHANNEL:             ${{ secrets.E2E_SLACK_CHANNEL }}
+  E2E_SLACK_CHANNEL_ID:          ${{ secrets.E2E_SLACK_CHANNEL_ID }}
   E2E_SLACK_TOKEN:               ${{ secrets.E2E_SLACK_TOKEN }}
   E2E_USE_LOCAL_SERVER:          false
   E2E_RESULT_FILEPATH:           'tests/e2e/results.json'

.github/workflows/e2e-pw-pull-request.yml

@@ -27,7 +27,7 @@ env:
     E2E_BLOG_TOKEN: ${{ secrets.E2E_BLOG_TOKEN }}
     E2E_USER_TOKEN: ${{ secrets.E2E_USER_TOKEN }}
     WC_E2E_SCREENSHOTS: 1
-    E2E_SLACK_CHANNEL: ${{ secrets.E2E_SLACK_CHANNEL }}
+    E2E_SLACK_CHANNEL_ID: ${{ secrets.E2E_SLACK_CHANNEL_ID }}
     E2E_SLACK_TOKEN: ${{ secrets.E2E_SLACK_TOKEN }}
     E2E_USE_LOCAL_SERVER: false
     E2E_RESULT_FILEPATH: 'tests/e2e/results.json'

.github/workflows/e2e-test.yml

@@ -19,7 +19,7 @@ env:
   E2E_BLOG_TOKEN:                ${{ secrets.E2E_BLOG_TOKEN }}
   E2E_USER_TOKEN:                ${{ secrets.E2E_USER_TOKEN }}
   WC_E2E_SCREENSHOTS:            1
-  E2E_SLACK_CHANNEL:             ${{ secrets.E2E_SLACK_CHANNEL }}
+  E2E_SLACK_CHANNEL_ID:          ${{ secrets.E2E_SLACK_CHANNEL_ID }}
   E2E_SLACK_TOKEN:               ${{ secrets.E2E_SLACK_TOKEN }}
   E2E_USE_LOCAL_SERVER:          false
   E2E_RESULT_FILEPATH:           'tests/e2e/results.json'

.github/workflows/e2e-tests-atomic.yml

@@ -6,7 +6,7 @@ on:
 
 env:
   WC_E2E_SCREENSHOTS: 1
-  E2E_SLACK_CHANNEL: ${{ secrets.E2E_SLACK_CHANNEL }}
+  E2E_SLACK_CHANNEL_ID: ${{ secrets.E2E_SLACK_CHANNEL_ID }}
   E2E_SLACK_TOKEN: ${{ secrets.E2E_SLACK_TOKEN }}
   E2E_WP_VERSION: 'nightly'
   E2E_WC_VERSION: 'latest'

assets/css/admin.css

@@ -143,6 +143,10 @@
 	background-image: url( '../images/payment-methods/grabpay.svg' );
 }
 
+.payment-method__brand--wechat_pay {
+	background-image: url( '../images/payment-methods/wechat-pay.svg' );
+}
+
 .wc_gateways tr[data-gateway_id='woocommerce_payments'] .payment-method__icon {
 	border: 1px solid #ddd;
 	border-radius: 2px;

bin/wcpay-live-branches/wcpay-live-branches.user.js

@@ -388,7 +388,7 @@
 		 */
 		function appendHtml( el, contents ) {
 			const $el = $( el );
-			const wooColor = '#7F54B3'; // https://woocommerce.com/brand-and-logo-guidelines/
+			const wooColor = '#873eff'; // https://woocommerce.com/brand-and-logo-guidelines/
 			const styles = $( '<style>' ).text( `
 				#wcpay-live-branches {
 					border: 3px dotted ${ wooColor };

changelog.txt

@@ -1,5 +1,8 @@
 *** WooPayments Changelog ***
 
+= 8.9.2 - 2025-02-21 =
+* Fix - Fixed WooPay opt-in race condition
+
 = 8.9.1 - 2025-02-07 =
 * Fix - Ensures that the tokenised cart for ECE implementation is disabled by default.
 

changelog/add-10382-adds-store-id-to-tracker-request-body

@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Adds store_id property to body of WooPay tracker events.

changelog/add-10390-stripe-notifications-component-loader

@@ -0,0 +1,4 @@
+Significance: patch
+Type: add
+
+Add loader indication for Stripe notifications banner component

changelog/add-9128-account-notifs-component-on-overview-page

@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Add Stripe embedded account notifications component on the Overview page

changelog/add-grabpay-pm-details

@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Add GrabPay payment method details to the View Transaction page.

changelog/add-wechat-checkout-support

@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Add WeChat Pay support to checkout.

changelog/chore-remove-unused-strings-file

@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: chore: remove unused strings file.
+
+

changelog/cleanup-new-payment-process

@@ -0,0 +1,4 @@
+Significance: minor
+Type: dev
+
+Remove routing to the partially re-engineered payment process"

changelog/dev-10355-playwright-slack-integration

@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+
+Add Slack integration to Playwright E2E tests.

changelog/dev-5101-add-e2e-test-non-admin-users-can-login-to-wp-admin

@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+
+Add new E2E tests to make sure a non-admin user, such as an editor, can access the wp-admin without errors.

changelog/feat-enable-tokenized-ece-by-default-round-2

@@ -0,0 +1,4 @@
+Significance: patch
+Type: update
+
+feat: GooglePay/ApplePay refactor to leverage Store API is enabled by default - second try.

changelog/feat-tokenized-ece-account-meta-control

@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: dev: ability to disable the Tokenized ECE via server-side flag
+
+

changelog/fix-10379-woo-logo-size-test-drive-onboarding

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Update the size of Woo logo on the test drive onboarding page.

changelog/fix-10393-frt-advanced-settings

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix the default value of the FRT advanced options.

changelog/fix-5623-handle-fatal-errors-on-wc-subscriptions-deactivated-due-outdated-version

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Prevent fatal errors when subscription is deactivated due outdated version.

changelog/fix-9717-prevent-querying-stripe-billing-every-page-load

@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Improve how Stripe Billing integration is loaded to prevent unnecessary queries on every page load.

changelog/fix-missed-woo-colors

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix Stripe KYC flow Woo color

changelog/fix-redundant-pmme-init

@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Avoid PMME init for unavailable BNPL use-cases.

changelog/fix-woopay-opt-in-race-condition

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fixed WooPay opt-in race condition

changelog/update-10172-csv-export-tracks-event

@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: Add a single tracks event - wcadmin_wcpay_csv_export_click to track export requests of transactions, payouts and disputes, using the new async export method. See - https://github.com/Automattic/woocommerce-payments/issues/9969
+
+

changelog/update-10317

@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+Update the copy in the existing modal for resetting a WooPayments account.

changelog/update-10317-change-reset-account-modal-copy

@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+Update copy in the Woopayments Reset account modal for incomplete onboarding accounts

changelog/update-10391-snackbar-when-user-updates-kyc-on-overview-page

@@ -0,0 +1,4 @@
+Significance: patch
+Type: update
+
+Add a notice indicating that overview page needs to be reloaded after completing the requirements in the embedded component.

changelog/update-add-min-amount-to-capture-error

@@ -0,0 +1,4 @@
+Significance: patch
+Type: update
+
+Add JSON-formatted minimum amount details to the amount too small error message.

changelog/update-deposits-server-export

@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: No need another changelog entry because there is already one that mentions the change in CSV download experience.
+
+

client/cart/blocks/product-details.js

@@ -83,12 +83,21 @@ const ProductDetail = ( { cart, context } ) => {
 		wcSettings.currency.precision
 	);
 
+	if ( ! window.wcpayStripeSiteMessaging ) {
+		return null;
+	}
+
 	const {
 		country,
 		paymentMethods,
 		currencyCode,
+		shouldInitializePMME,
 	} = window.wcpayStripeSiteMessaging;
 
+	if ( ! shouldInitializePMME ) {
+		return null;
+	}
+
 	const amount = parseInt( cartTotal, 10 ) || 0;
 
 	const options = {

client/checkout/blocks/index.js

@@ -42,6 +42,7 @@ import {
 	PAYMENT_METHOD_NAME_AFTERPAY,
 	PAYMENT_METHOD_NAME_KLARNA,
 	PAYMENT_METHOD_NAME_GRABPAY,
+	PAYMENT_METHOD_NAME_WECHAT_PAY,
 } from '../constants.js';
 import { getDeferredIntentCreationUPEFields } from './payment-elements';
 import { handleWooPayEmailInput } from '../woopay/email-input-iframe';
@@ -65,6 +66,7 @@ const upeMethods = {
 	afterpay_clearpay: PAYMENT_METHOD_NAME_AFTERPAY,
 	klarna: PAYMENT_METHOD_NAME_KLARNA,
 	grabpay: PAYMENT_METHOD_NAME_GRABPAY,
+	wechat_pay: PAYMENT_METHOD_NAME_WECHAT_PAY,
 };
 
 const enabledPaymentMethodsConfig = getUPEConfig( 'paymentMethodsConfig' );

client/checkout/constants.js

@@ -13,6 +13,7 @@ export const PAYMENT_METHOD_NAME_AFTERPAY =
 	'woocommerce_payments_afterpay_clearpay';
 export const PAYMENT_METHOD_NAME_KLARNA = 'woocommerce_payments_klarna';
 export const PAYMENT_METHOD_NAME_GRABPAY = 'woocommerce_payments_grabpay';
+export const PAYMENT_METHOD_NAME_WECHAT_PAY = 'woocommerce_payments_wechat_pay';
 export const PAYMENT_METHOD_NAME_EXPRESS_CHECKOUT_ELEMENT =
 	'woocommerce_payments_express_checkout';
 export const PAYMENT_METHOD_NAME_WOOPAY_EXPRESS_CHECKOUT =
@@ -36,6 +37,7 @@ export function getPaymentMethodsConstants() {
 		PAYMENT_METHOD_NAME_CARD,
 		PAYMENT_METHOD_NAME_KLARNA,
 		PAYMENT_METHOD_NAME_GRABPAY,
+		PAYMENT_METHOD_NAME_WECHAT_PAY,
 	];
 }
 

client/components/fraud-risk-tools-banner/style.scss

@@ -11,16 +11,16 @@
 	}
 
 	&__new-feature-pill.wcpay-pill {
-		color: #3c2861;
-		border: 1px solid #3c2861;
+		color: #3c087e;
+		border: 1px solid #3c087e;
 		font-size: 12px;
 		line-height: 14px;
 		border-radius: 14px;
 		margin: 0;
 	}
 
 	&__header {
-		color: #271b3d;
+		color: #2c045d;
 		font-style: normal;
 		font-weight: 400;
 		font-size: 20px;
@@ -29,7 +29,7 @@
 	}
 
 	&__body {
-		color: #271b3d;
+		color: #2c045d;
 		font-size: 13px;
 		line-height: 16px;
 		margin: 0 0 16px;
@@ -56,7 +56,7 @@
 			}
 
 			&.is-tertiary {
-				color: #271b3d;
+				color: #2c045d;
 			}
 		}
 	}

client/components/payment-method-details/index.js

@@ -47,6 +47,7 @@ const formatDetails = ( payment ) => {
 		case 'affirm':
 		case 'afterpay_clearpay':
 		case 'klarna':
+		case 'wechat_pay':
 		default:
 			return <Fragment />;
 	}

client/components/payment-method-logos/index.tsx

@@ -28,7 +28,7 @@ import Bancontact from 'assets/images/payment-methods/bancontact.svg?asset';
 import Eps from 'assets/images/payment-methods/eps.svg?asset';
 import Becs from 'assets/images/payment-methods/becs.svg?asset';
 import Przelewy24 from 'assets/images/payment-methods/przelewy24.svg?asset';
-import WeChatPay from 'assets/images/payment-method-icons/wechat_pay.svg?asset';
+import WeChatPay from 'assets/images/payment-method-icons/wechat-pay.svg?asset';
 import './style.scss';
 
 const PaymentMethods = [

client/components/woopay/save-user/checkout-page-save-user.js

@@ -275,17 +275,34 @@ const CheckoutPageSaveUser = ( { isBlocksCheckout } ) => {
 		isBlocksCheckout,
 	] );
 
+	useEffect( () => {
+		if (
+			! getConfig( 'forceNetworkSavedCards' ) ||
+			! isWCPayWithNewTokenChosen ||
+			isRegisteredUser
+		) {
+			// Clicking the place order button sets the extension data in backend. If user changes the payment method
+			// due to an error, we need to clear the extension data in backend.
+			if ( isBlocksCheckout && userDataSent ) {
+				sendExtensionData( true );
+			}
+			clearValidationError( errorId );
+		}
+	}, [
+		clearValidationError,
+		errorId,
+		isBlocksCheckout,
+		isRegisteredUser,
+		isWCPayWithNewTokenChosen,
+		sendExtensionData,
+		userDataSent,
+	] );
+
 	if (
 		! getConfig( 'forceNetworkSavedCards' ) ||
 		! isWCPayWithNewTokenChosen ||
 		isRegisteredUser
 	) {
-		// Clicking the place order button sets the extension data in backend. If user changes the payment method
-		// due to an error, we need to clear the extension data in backend.
-		if ( isBlocksCheckout && userDataSent ) {
-			sendExtensionData( true );
-		}
-		clearValidationError( errorId );
 		return null;
 	}
 

client/connect-account-page/style.scss

@@ -260,10 +260,9 @@
 
 			img.logo {
 				position: absolute;
-				height: 40px;
-				width: 40px;
-				top: 18px;
-				left: 36px;
+				width: 64px;
+				top: 24px;
+				left: 24px;
 			}
 		}
 	}

client/constants/payment-method.ts

@@ -59,7 +59,6 @@ export const PAYMENT_METHOD_TITLES = {
 	stripe_account: __( 'Stripe Account', 'woocommerce-payments' ),
 	unionpay: __( 'Union Pay', 'woocommerce-payments' ),
 	visa: __( 'Visa', 'woocommerce-payments' ),
-	wechat: __( 'WeChat', 'woocommerce-payments' ),
 	wechat_pay: __( 'WeChat Pay', 'woocommerce-payments' ),
 };