fix: filter card brands by key instead of localized title

jimmyn · jimmyn · commit 3db424c5eb03 · 2025-10-10T11:26:28.000+02:00
Card brand detection was breaking in non-English locales because it filtered
by comparing title !== 'Card', but 'Card' is a translated string (e.g.,
"Tarjeta" in Spanish, "Carte" in French). This caused the fallback brand
to be incorrectly detected as a real brand, hiding the logo when it shouldn't.

Fixed by filtering array keys (key !== 'default') instead of comparing
localized titles, making the detection locale-independent.

Changes:
- WCGatewayMoneiCC.php: Filter by array_keys and check !== 'default'
- MoneiCCBlocksSupport.php: Filter by array_keys and check !== 'default'
- monei-cc-component.js: Filter keys instead of values, update map to use key
diff --git a/assets/js/components/monei-cc-component.js b/assets/js/components/monei-cc-component.js
@@ -353,8 +353,8 @@ export const MoneiCCContent = ( props ) => {
  */
 export const CreditCardLabel = ( moneiData ) => {
 	const cardBrands = moneiData?.cardBrands
-		? Object.values( moneiData.cardBrands ).filter(
-				( brand ) => brand.title !== 'Card'
+		? Object.keys( moneiData.cardBrands ).filter(
+				( key ) => key !== 'default'
 		  )
 		: [];
 
@@ -365,14 +365,17 @@ export const CreditCardLabel = ( moneiData ) => {
 			) }
 			{ cardBrands.length > 0 ? (
 				<span className="monei-card-brands">
-					{ cardBrands.map( ( brand, index ) => (
-						<img
-							key={ index }
-							src={ brand.url }
-							alt={ brand.title }
-							className="card-brand-icon"
-						/>
-					) ) }
+					{ cardBrands.map( ( key ) => {
+						const brand = moneiData.cardBrands[ key ];
+						return (
+							<img
+								key={ key }
+								src={ brand.url }
+								alt={ brand.title }
+								className="card-brand-icon"
+							/>
+						);
+					} ) }
 				</span>
 			) : (
 				moneiData?.logo && (
diff --git a/src/Gateways/Blocks/MoneiCCBlocksSupport.php b/src/Gateways/Blocks/MoneiCCBlocksSupport.php
@@ -151,7 +151,7 @@ public function get_payment_method_data() {
 		}
 
 		// Remove logo when card brands are available
-		if ( ! empty( $data['cardBrands'] ) && count( array_filter( $data['cardBrands'], fn( $b ) => $b['title'] !== 'Card' ) ) > 0 ) {
+		if ( ! empty( $data['cardBrands'] ) && count( array_filter( array_keys( $data['cardBrands'] ), fn( $key ) => $key !== 'default' ) ) > 0 ) {
 			unset( $data['logo'] );
 		}
 
diff --git a/src/Gateways/PaymentMethods/WCGatewayMoneiCC.php b/src/Gateways/PaymentMethods/WCGatewayMoneiCC.php
@@ -99,7 +99,7 @@ public function __construct(
 
 		// Hide logo if card brands are available
 		$cardBrands    = $this->cardBrandHelper->getCardBrandsConfig();
-		$hasCardBrands = ! empty( $cardBrands ) && count( array_filter( $cardBrands, fn( $b ) => $b['title'] !== 'Card' ) ) > 0;
+		$hasCardBrands = ! empty( $cardBrands ) && count( array_filter( array_keys( $cardBrands ), fn( $key ) => $key !== 'default' ) ) > 0;
 
 		$this->icon          = ( $this->hide_logo || $hasCardBrands ) ? '' : $iconMarkup;
 		$this->redirect_flow = ( ! empty( $this->get_option( 'cc_mode' ) ) && 'yes' === $this->get_option( 'cc_mode' ) ) ? true : false;
@@ -430,8 +430,13 @@ public function monei_scripts() {
 		}
 
 		// Return early if redirect flow (doesn't need component scripts)
-		// OR if not on a page that needs scripts
-		if ( $this->redirect_flow || ( ! is_checkout() && ! is_checkout_pay_page() && ! is_add_payment_method_page() ) ) {
+		if ( $this->redirect_flow ) {
+			return;
+		}
+
+		// Return early if not on a page that needs scripts
+		$is_required_page = is_checkout() || is_checkout_pay_page() || is_add_payment_method_page();
+		if ( ! $is_required_page ) {
 			return;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ public function get_payment_method_data() {`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`// Remove logo when card brands are available`
`154`		`- if ( ! empty( $data['cardBrands'] ) && count( array_filter( $data['cardBrands'], fn( $b ) => $b['title'] !== 'Card' ) ) > 0 ) {`
	`154`	`+ if ( ! empty( $data['cardBrands'] ) && count( array_filter( array_keys( $data['cardBrands'] ), fn( $key ) => $key !== 'default' ) ) > 0 ) {`
`155`	`155`	`unset( $data['logo'] );`
`156`	`156`	`}`
`157`	`157`