Merge branch 'develop' of github.com:Automattic/woocommerce-payments …

…into add/duplicates-detection

changelog/2024-03-30-01-19-36-005298

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Add an instructive error message when customer tries to use 2 different currencies for Stripe Billing subscriptions.

changelog/8499-fix-js-error-on-gpay-click

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix JS error when clicking GPay button on blocks checkout with subscription (w/sign up fee) in cart.

changelog/add-8144-bnpl-cart-summary

@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Add BNPL messaging to cart page.

changelog/add-8167-remove-tos-links-that-are-not-needed-anymore

@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+Remove ToS acceptance copy from all entrypoints in MOX

changelog/add-8557-empty-state-payment-widget

@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Not user-facing: hidden behind feature flag. Add an empty state view for the Payments Activity widget. This is shown when the merchant is yet to have any transactions over WooPayments.

changelog/feat-8516-total-payment-activity

@@ -0,0 +1,4 @@
+Significance: minor
+Type: dev
+
+Payments Activity - add scaffolding for Total Payment Volume.

changelog/fix-7866-tos-decline-busy

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix Decline button state for Accept loading on ToS modal

changelog/fix-8093-onboarding-collides-with-jitm-banners

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix collision between WooPayments header and Woo Express survey banner.

changelog/fix-8134-update-ip-ruleset-after-core-country-change

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Change IP country rule after country settings are changed in WC settings page

changelog/fix-8301-fatal-error-when-connecting-jetpack-to-locqlhost

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix Fatal Error showing when connect to Jetpack on localhost

changelog/fix-8386-remove-utc-label

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Remove incorrect "UTC" label from the time column of Transactions page

changelog/fix-8465-fix-phpcs-reports

@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+
+Fixed phpcs errors

changelog/fix-8567-connect-page-payment-methods

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix payment icons on connect page (Klarna, Afterpay)

changelog/fix-8571-payment-activity-card-safari-visual-bug

@@ -0,0 +1,5 @@
+Significance: patch
+Type: fix
+Comment: Not user-facing: hidden behind feature flag. Fixes payment activity visual bug in safari.
+
+

changelog/fix-afterpay-logo

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fixed Afterpay logo size on settings page

changelog/fix-filesystem-phpcs-reports

@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+
+Ignore alternative function WordPress PHPCS sniffs in the GH workflows and tests

changelog/fix-migrate-woopay-skipped-tracks-event

@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: Complete WooPay Tracks event migration and cleanup migration related code
+
+

changelog/fix-optional-zip

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fixed optional billing field validation

changelog/refactor-8389-remove-unwanted-css-classes

@@ -0,0 +1,4 @@
+Significance: patch
+Type: update
+
+Remove unwanted css overrides on the Payment activity widget wrapper

changelog/refactor-shortcode-checkout-wp-data-dependency

@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+
+refactor: reduce wp-data dependency on shortcode checkout

changelog/replace-deprecated-input-filter-constant

@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+Replace deprecated filter.

changelog/tweak-revert-phpcs-update-revert-pr

@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+
+Updated PHPCS and sniffs used for static analysis

changelog/update-link-by-stripe-logo

@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+Updated Link by Stripe logo

client/cart/blocks/index.js

@@ -0,0 +1,12 @@
+/**
+ * Internal dependencies
+ */
+import { renderBNPLCartMessaging } from './product-details';
+
+const { registerPlugin } = window.wp.plugins;
+
+// Register BNPL site messaging on the cart block.
+registerPlugin( 'bnpl-site-messaging', {
+	render: renderBNPLCartMessaging,
+	scope: 'woocommerce-checkout',
+} );

client/cart/blocks/product-details.js

@@ -0,0 +1,117 @@
+/**
+ * External dependencies
+ */
+import {
+	Elements,
+	PaymentMethodMessagingElement,
+} from '@stripe/react-stripe-js';
+import { select } from '@wordpress/data';
+
+/**
+ * Internal dependencies
+ */
+import { getAppearance, getFontRulesFromPage } from 'wcpay/checkout/upe-styles';
+import { getUPEConfig } from 'utils/checkout';
+import WCPayAPI from '../../checkout/api';
+import request from '../../checkout/utils/request';
+import { useEffect, useState } from 'react';
+
+// Create an API object, which will be used throughout the checkout.
+const api = new WCPayAPI(
+	{
+		publishableKey: getUPEConfig( 'publishableKey' ),
+		accountId: getUPEConfig( 'accountId' ),
+		forceNetworkSavedCards: getUPEConfig( 'forceNetworkSavedCards' ),
+		locale: getUPEConfig( 'locale' ),
+	},
+	request
+);
+
+const isInEditor = () => {
+	const editorStore = select( 'core/editor' );
+
+	return !! editorStore;
+};
+
+// BNPL only supports 2 decimal places.
+const normalizeAmount = ( amount, decimalPlaces = 2 ) => {
+	return amount * Math.pow( 10, 2 - decimalPlaces );
+};
+
+const { ExperimentalOrderMeta } = window.wc.blocksCheckout;
+
+const ProductDetail = ( { cart, context } ) => {
+	const [ appearance, setAppearance ] = useState(
+		getUPEConfig( 'upeBnplCartBlockAppearance' ) || {}
+	);
+
+	const [ fontRules ] = useState( getFontRulesFromPage() );
+
+	useEffect( () => {
+		async function generateUPEAppearance() {
+			// Generate UPE input styles.
+			let upeAppearance = getAppearance( 'bnpl_cart_block' );
+			upeAppearance = await api.saveUPEAppearance(
+				upeAppearance,
+				'bnpl_cart_block'
+			);
+			setAppearance( upeAppearance );
+		}
+
+		if ( Object.keys( appearance ).length === 0 ) {
+			generateUPEAppearance();
+		}
+	}, [ appearance ] );
+
+	if ( Object.keys( appearance ).length === 0 ) {
+		return null;
+	}
+
+	if ( context !== 'woocommerce/cart' ) {
+		return null;
+	}
+
+	const cartTotal = normalizeAmount(
+		cart.cartTotals.total_price,
+		wcSettings.currency.precision
+	);
+
+	const {
+		country,
+		paymentMethods,
+		currencyCode,
+	} = window.wcpayStripeSiteMessaging;
+
+	const amount = parseInt( cartTotal, 10 ) || 0;
+
+	const options = {
+		amount: amount,
+		currency: currencyCode || 'USD',
+		paymentMethodTypes: paymentMethods || [],
+		countryCode: country, // Customer's country or base country of the store.
+	};
+
+	const stripe = api.getStripe();
+
+	return (
+		<div className="wc-block-components-bnpl-wrapper">
+			<Elements
+				stripe={ stripe }
+				options={ { appearance, fonts: fontRules } }
+			>
+				<PaymentMethodMessagingElement options={ options } />
+			</Elements>
+		</div>
+	);
+};
+
+export const renderBNPLCartMessaging = () => {
+	if ( isInEditor() ) {
+		return null;
+	}
+	return (
+		<ExperimentalOrderMeta>
+			<ProductDetail />
+		</ExperimentalOrderMeta>
+	);
+};

client/checkout/blocks/payment-processor.js

@@ -19,11 +19,11 @@ import { useEffect, useRef } from 'react';
 import { usePaymentCompleteHandler } from './hooks';
 import {
 	getStripeElementOptions,
-	useCustomerData,
 	blocksShowLinkButtonHandler,
 	getBlocksEmailValue,
 	isLinkEnabled,
 } from 'wcpay/checkout/utils/upe';
+import { useCustomerData } from './utils';
 import enableStripeLinkPaymentMethod from 'wcpay/checkout/stripe-link';
 import { getUPEConfig } from 'wcpay/utils/checkout';
 import { validateElements } from 'wcpay/checkout/classic/payment-processing';

client/checkout/blocks/test/payment-processor.test.js

@@ -12,8 +12,7 @@ import { PaymentElement } from '@stripe/react-stripe-js';
 jest.mock( 'wcpay/checkout/classic/payment-processing', () => ( {
 	validateElements: jest.fn().mockResolvedValue(),
 } ) );
-jest.mock( 'wcpay/checkout/utils/upe', () => ( {
-	...jest.requireActual( 'wcpay/checkout/utils/upe' ),
+jest.mock( 'wcpay/checkout/blocks/utils', () => ( {
 	useCustomerData: jest.fn().mockReturnValue( { billingAddress: {} } ),
 } ) );
 jest.mock( '../hooks', () => ( {