remove cart block checks from the script which is never run for cart …

…block
Automattic · Feb 21, 2025 · 5cc6540 · 5cc6540
1 parent 94dd750
commit 5cc6540
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 29 deletions.
diff --git a/assets/css/admin.rtl.css b/assets/css/admin.rtl.css
@@ -67,6 +67,10 @@
 	background-image: url( '../images/cards/visa.svg' );
 }
 
+.payment-method__brand--alipay {
+	background-image: url( '../images/payment-methods/alipay-logo.svg' );
+}
+
 .payment-method__brand--cartes_bancaires {
 	background-image: url( '../images/cards/cartes_bancaires.svg' );
 }
@@ -135,6 +139,14 @@
 	background-image: url( '../images/payment-methods/klarna.svg' );
 }
 
+.payment-method__brand--grabpay {
+	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;

diff --git a/client/product-details/bnpl-site-messaging/index.js b/client/product-details/bnpl-site-messaging/index.js
@@ -53,18 +53,21 @@ export const initializeBnplSiteMessaging = async () => {
 		paymentMethods,
 		currencyCode,
 		isCart,
-		isCartBlock,
 		cartTotal,
 		isBnplAvailable,
 	} = window.wcpayStripeSiteMessaging;
 
+	// if ( ! isBnplAvailable ) {
+	// 	return;
+	// }
+
 	let amount;
 	let elementLocation = 'bnplProductPage';
 	const paymentMessageContainer = document.getElementById(
 		'payment-method-message'
 	);
 
-	if ( isCart || isCartBlock ) {
+	if ( isCart ) {
 		amount = parseInt( cartTotal, 10 ) || 0;
 		elementLocation = 'bnplClassicCart';
 	} else {
@@ -75,37 +78,33 @@ export const initializeBnplSiteMessaging = async () => {
 		}
 	}
 
-	let paymentMessageElement;
-
-	if ( ! isCartBlock ) {
-		const api = new WCPayAPI(
-			{
-				publishableKey: publishableKey,
-				accountId: accountId,
-				locale: locale,
-			},
-			apiRequest
-		);
+	const api = new WCPayAPI(
+		{
+			publishableKey: publishableKey,
+			accountId: accountId,
+			locale: locale,
+		},
+		apiRequest
+	);
 
-		const options = {
-			amount: amount,
-			currency: currencyCode || 'USD',
-			paymentMethodTypes: paymentMethods || [],
-			countryCode: country, // Customer's country or base country of the store.
-		};
+	const options = {
+		amount: amount,
+		currency: currencyCode || 'USD',
+		paymentMethodTypes: paymentMethods || [],
+		countryCode: country, // Customer's country or base country of the store.
+	};
 
-		const elementsOptions = {
-			appearance: await initializeAppearance( api, elementLocation ),
-			fonts: getFontRulesFromPage(),
-		};
+	const elementsOptions = {
+		appearance: await initializeAppearance( api, elementLocation ),
+		fonts: getFontRulesFromPage(),
+	};
 
-		const stripe = await api.getStripe();
+	const stripe = await api.getStripe();
 
-		paymentMessageElement = stripe
-			.elements( elementsOptions )
-			.create( 'paymentMethodMessaging', options );
-		paymentMessageElement.mount( '#payment-method-message' );
-	}
+	const paymentMessageElement = stripe
+		.elements( elementsOptions )
+		.create( 'paymentMethodMessaging', options );
+	paymentMessageElement.mount( '#payment-method-message' );
 
 	// This function converts relative units (rem/em) to pixels based on the current font size.
 	function convertToPixels( value, baseFontSize ) {