Merge branch 'develop' into fix/9794-refresh-page-when-ece-dismissed

.eslintignore

@@ -10,7 +10,3 @@ vendor/*
 release/*
 tests/e2e/docker*
 tests/e2e/deps*
-
-# We'll delete the directory and its contents as part of https://github.com/Automattic/woocommerce-payments/issues/9722 .
-# ignoring it because we're temporariily cleaning it up.
-client/tokenized-payment-request

.gitignore

@@ -97,3 +97,6 @@ tests/e2e-pw/playwright/.cache/
 tests/e2e-pw/tests/e2e-pw/.auth/*
 # Slate docs
 docs/rest-api/build/*
+
+# Jurassic Tube files
+bin/jurassictube/

bin/docker-setup.sh

@@ -27,11 +27,11 @@ cli()
 set +e
 # Wait for containers to be started up before the setup.
 # The db being accessible means that the db container started and the WP has been downloaded and the plugin linked
-cli wp db check --path=/var/www/html --quiet > /dev/null
+cli wp db check --skip_ssl --path=/var/www/html --quiet > /dev/null
 while [[ $? -ne 0 ]]; do
 	echo "Waiting until the service is ready..."
 	sleep 5
-	cli wp db check --path=/var/www/html --quiet > /dev/null
+	cli wp db check --skip_ssl --path=/var/www/html --quiet > /dev/null
 done
 
 # If the plugin is already active then return early

bin/jurassic-tube-setup.sh

@@ -3,29 +3,32 @@
 # Exit if any command fails.
 set -e
 
-echo "Checking if ${PWD}/docker/bin/jt directory exists..."
+# Define Jurassic Tube directory using bin directory
+JT_DIR="${PWD}/bin/jurassictube"
 
-if [ -d "${PWD}/docker/bin/jt" ]; then
-    echo "${PWD}/docker/bin/jt already exists."
+echo "Checking if ${JT_DIR} directory exists..."
+
+if [ -d "${JT_DIR}" ]; then
+    echo "${JT_DIR} already exists."
 else
-    echo "Creating ${PWD}/docker/bin/jt directory..."
-    mkdir -p "${PWD}/docker/bin/jt"
+    echo "Creating ${JT_DIR} directory..."
+    mkdir -p "${JT_DIR}"
 fi
 
-echo "Downloading the latest version of the installer script..."
+echo "Checking if the installer is present and downloading it if not..."
 echo 
 
 # Download the installer (if it's not already present):
-if [ ! -f "${PWD}/docker/bin/jt/installer.sh" ]; then
-    # Download the installer script:
-    curl "https://jurassic.tube/get-installer.php?env=wcpay" -o ${PWD}/docker/bin/jt/installer.sh && chmod +x ${PWD}/docker/bin/jt/installer.sh
+if [ ! -f "${JT_DIR}/installer.sh" ]; then
+    echo "Downloading the standalone installer..."
+    curl "https://jurassic.tube/installer-standalone.sh" -o "${JT_DIR}/installer.sh" && chmod +x "${JT_DIR}/installer.sh"
 fi
 
 echo "Running the installation script..."
 echo 
 
 # Run the installer script
-source $PWD/docker/bin/jt/installer.sh
+"${JT_DIR}/installer.sh"
 
 echo
 read -p "Go to https://jurassic.tube/ in a browser, paste your public key which was printed above into the box, and click 'Add Public Key'. Press enter to continue"
@@ -40,8 +43,24 @@ echo
 read -p "Please enter your Automattic/WordPress.com username: " username
 echo 
 
-${PWD}/docker/bin/jt/config.sh username ${username}
-${PWD}/docker/bin/jt/config.sh subdomain ${subdomain}
+if [ ! -f "${JT_DIR}/config.env" ]; then
+    touch "${JT_DIR}/config.env"
+else
+    > "${JT_DIR}/config.env"
+fi
+
+# Find the WordPress container section and get its port
+PORT=$(docker ps | grep woocommerce_payments_wordpress | sed -En "s/.*0:([0-9]+).*/\1/p")
+
+# Use default if extraction failed
+if [ -z "$PORT" ]; then
+    PORT=8082  # Default fallback
+    echo "Could not extract WordPress container port, using default: ${PORT}"
+fi
+
+echo "username=${username}" >> "${JT_DIR}/config.env"
+echo "subdomain=${subdomain}" >> "${JT_DIR}/config.env"
+echo "localhost=localhost:${PORT}" >> "${JT_DIR}/config.env"
 
 echo "Setup complete!"
 echo "Use the command: npm run tube:start from the root directory of your WC Payments project to start running Jurassic Tube."

changelog/8969-fallback-to-card-payment-type

@@ -0,0 +1,5 @@
+Significance: patch
+Type: update
+Comment: Small change to payment method types fallback scenario.
+
+

changelog/add-9690-recommended-pm

@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Implement gateway method to retrieve recommended payment method.

changelog/add-pass-footer-header-styles-to-woopay

@@ -0,0 +1,5 @@
+Significance: patch
+Type: add
+Comment: Impovements to WooPay themeing, which is not yet released to the public.
+
+

changelog/as-fix-ece-variable-subs

@@ -0,0 +1,4 @@
+Significance: minor
+Type: dev
+
+Refine verification for disabling ECE on subscriptions that require shipping.

changelog/as-hk-address

@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Normalize HK addresses for ECE

changelog/chore-remove-ece-error-assignment-on-loaderror

@@ -0,0 +1,5 @@
+Significance: patch
+Type: update
+Comment: chore: remove ECE error assignment on loaderror
+
+

changelog/chore-remove-tokenized-payment-request-references

@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: chore: remove tokeinzed payment request code
+
+

changelog/feat-tokenized-ece-product-page-base-implementation

@@ -0,0 +1,5 @@
+Significance: patch
+Type: update
+Comment: feat: tokenized ECE product page base implementation
+
+

changelog/fix-9889-log-level

@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Errors were incorrectly marked as info in logs.

changelog/fix-add-payment-method-check

@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: Added a check for the gateway id before comparing it
+
+

changelog/fix-rounding-error-with-deposit-products

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Ceil product prices after applying currency conversion, but before charm pricing and price rounding from settings is applied.

changelog/fix-skip-ssl-requirement-env-setup

@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Skip mysqlcheck SSL Requirement during E2E environment setup

changelog/fix-upe-country-selection

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fixed UPE country detection in Checkout for non-logged in users

changelog/fix-use-effect-console-warning

@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: fix: console warning on plugins page
+
+

changelog/frosso-patch-1

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+fix: undefined $cart_contains_subscription

changelog/update-1-5316-rename-bank-reference-id

@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+Change 'Bank reference key' label to 'Bank reference ID' in Payouts list column for consistency.

changelog/update-9916-go-live-modal-and-notice

@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+Adjust the go-live modal to match the latest design.

changelog/update-confirmation-modal-nox

@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+Update confirmation modal after onbarding

changelog/update-jetpack-onboarding-flow

@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+Update Jetpack onboarding flow

changelog/update-to-standalone-jt

@@ -0,0 +1,4 @@
+Significance: minor
+Type: dev
+
+Update the tunelling setup.

client/checkout/api/test/index.test.js

@@ -43,6 +43,9 @@ const mockAppearance = {
 		'.Button': {},
 		'.Link': {},
 		'.Container': {},
+		'.Footer': {},
+		'.Footer-link': {},
+		'.Header': {},
 	},
 	theme: 'stripe',
 	variables: {

client/checkout/upe-styles/index.js

@@ -156,6 +156,9 @@ export const appearanceSelectors = {
 		buttonSelectors: [ '#place_order' ],
 		linkSelectors: [ 'a' ],
 		containerSelectors: [ '.woocommerce-checkout-review-order-table' ],
+		headerSelectors: [ '.site-header' ],
+		footerSelectors: [ '.site-footer' ],
+		footerLink: [ '.site-footer a' ],
 	},
 
 	/**
@@ -514,6 +517,12 @@ export const getAppearance = ( elementsLocation, forWooPay = false ) => {
 		selectors.containerSelectors,
 		'.Container'
 	);
+	const headerRules = getFieldStyles( selectors.headerSelectors, '.Header' );
+	const footerRules = getFieldStyles( selectors.footerSelectors, '.Footer' );
+	const footerLinkRules = getFieldStyles(
+		selectors.footerLink,
+		'.Footer--link'
+	);
 	const globalRules = {
 		colorBackground: backgroundColor,
 		colorText: paragraphRules.color,
@@ -559,6 +568,9 @@ export const getAppearance = ( elementsLocation, forWooPay = false ) => {
 		appearance.rules = {
 			...appearance.rules,
 			'.Heading': headingRules,
+			'.Header': headerRules,
+			'.Footer': footerRules,
+			'.Footer-link': footerLinkRules,
 			'.Button': buttonRules,
 			'.Link': linkRules,
 			'.Container': containerRules,

client/checkout/upe-styles/test/index.js

@@ -225,6 +225,29 @@ describe( 'Getting styles for automated theming', () => {
 				'.Container': {
 					backgroundColor: 'rgba(0, 0, 0, 0)',
 				},
+				'.Footer': {
+					color: 'rgb(109, 109, 109)',
+					backgroundColor: 'rgba(0, 0, 0, 0)',
+					fontFamily:
+						'"Source Sans Pro", HelveticaNeue-Light, "Helvetica Neue Light"',
+					fontSize: '12px',
+					padding: '10px',
+				},
+				'.Footer-link': {
+					color: 'rgb(109, 109, 109)',
+					fontFamily:
+						'"Source Sans Pro", HelveticaNeue-Light, "Helvetica Neue Light"',
+					fontSize: '12px',
+					padding: '10px',
+				},
+				'.Header': {
+					color: 'rgb(109, 109, 109)',
+					backgroundColor: 'rgba(0, 0, 0, 0)',
+					fontFamily:
+						'"Source Sans Pro", HelveticaNeue-Light, "Helvetica Neue Light"',
+					fontSize: '12px',
+					padding: '10px',
+				},
 			},
 			labels: 'above',
 		} );

client/checkout/upe-styles/upe-styles.js

@@ -78,6 +78,16 @@ const upeSupportedProperties = {
 		...borderOutlineBackgroundProps.slice( 1 ), // Remove backgroundColor
 	],
 	'.Container': [ ...borderOutlineBackgroundProps ],
+	'.Header': [
+		...paddingColorProps,
+		...borderOutlineBackgroundProps,
+		...textFontTransitionProps,
+	],
+	'.Footer': [
+		...paddingColorProps,
+		...borderOutlineBackgroundProps,
+		...textFontTransitionProps,
+	],
 };
 
 // Restricted properties allowed to generate the automated theming of UPE.
@@ -113,6 +123,9 @@ export const upeRestrictedProperties = {
 	'.TabLabel': upeSupportedProperties[ '.TabLabel' ],
 	'.Block': upeSupportedProperties[ '.Block' ],
 	'.Container': upeSupportedProperties[ '.Container' ],
+	'.Header': upeSupportedProperties[ '.Header' ],
+	'.Footer': upeSupportedProperties[ '.Footer' ],
+	'.Footer--link': upeSupportedProperties[ '.Text' ],
 	'.Text': upeSupportedProperties[ '.Text' ],
 	'.Text--redirect': upeSupportedProperties[ '.Text' ],
 };

client/checkout/utils/upe.js

@@ -375,10 +375,9 @@ export const togglePaymentMethodForCountry = ( upeElement ) => {
 		billingInput = document.querySelector( '#billing_country' );
 	}
 
-	/* global wcpayCustomerData */
 	// in the case of "pay for order", there is no "billing country" input, so we need to rely on backend data.
 	const billingCountry =
-		billingInput?.value || wcpayCustomerData?.billing_country || '';
+		billingInput?.value || window?.wcpayCustomerData?.billing_country || '';
 
 	const upeContainer = upeElement?.closest( '.wc_payment_method' );
 	if ( supportedCountries.includes( billingCountry ) ) {

client/components/sandbox-mode-switch-to-live-notice/index.tsx

@@ -16,6 +16,7 @@ import { recordEvent } from 'wcpay/tracks';
 import { ClickTooltip } from 'wcpay/components/tooltip';
 import ErrorBoundary from 'wcpay/components/error-boundary';
 import SetupLivePaymentsModal from './modal';
+import './style.scss';
 
 interface Props {
 	from: string;
@@ -41,18 +42,23 @@ const SandboxModeSwitchToLiveNotice: React.FC< Props > = ( {
 
 	return (
 		<>
-			<BannerNotice status="warning" isDismissible={ false }>
+			<BannerNotice
+				status="warning"
+				className="sandbox-mode-notice"
+				isDismissible={ false }
+			>
 				{ interpolateComponents( {
 					mixedString: sprintf(
 						/* translators: %1$s: WooPayments */
 						__(
 							// eslint-disable-next-line max-len
-							'{{strong}}%1$s is in sandbox mode.{{/strong}} To accept real transactions, {{switchToLiveLink}}set up a live %1$s account.{{/switchToLiveLink}} {{learnMoreIcon/}}',
+							"{{div}}{{strong}}You're using a test account.{{/strong}} To accept payments from shoppers, {{switchToLiveLink}}activate your %1$s account.{{/switchToLiveLink}}{{/div}}{{learnMoreIcon/}}",
 							'woocommerce-payments'
 						),
 						'WooPayments'
 					),
 					components: {
+						div: <div />,
 						strong: <strong />,
 						learnMoreIcon: (
 							<ClickTooltip