simplify the structure of duplicates received by the front end

Automattic · Apr 11, 2024 · 99928ea · 99928ea
1 parent d0756e2
commit 99928ea
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/client/components/payment-methods-list/payment-method.tsx b/client/components/payment-methods-list/payment-method.tsx
@@ -46,7 +46,7 @@ interface PaymentMethodProps {
 	locked: boolean;
 	isPoEnabled: boolean;
 	isPoComplete: boolean;
-	duplicatesData: Record< string, string[] >;
+	duplicatesData: string[];
 }
 
 const PaymentMethodLabel = ( {
@@ -148,7 +148,7 @@ const PaymentMethod = ( {
 		isPoInProgress ||
 		upeCapabilityStatuses.REJECTED === status;
 	const shouldDisplayNotice = id === 'sofort';
-	const isDuplicate = duplicatesData[ id ]?.length > 0;
+	const isDuplicate = duplicatesData.includes( id );
 
 	const needsOverlay =
 		( isManualCaptureEnabled && ! isAllowingManualCapture ) ||

diff --git a/client/components/payment-methods-list/test/payment-method.test.tsx b/client/components/payment-methods-list/test/payment-method.test.tsx
@@ -43,7 +43,7 @@ describe( 'PaymentMethod', () => {
 				locked={ false }
 				isPoEnabled={ false }
 				isPoComplete={ false }
-				duplicatesData={ {} as Record< string, string[] > }
+				duplicatesData={ {} as string[] }
 			/>
 		);
 	};
@@ -102,7 +102,7 @@ describe( 'PaymentMethod', () => {
 				required={ false }
 				isPoEnabled={ false }
 				isPoComplete={ false }
-				duplicatesData={ {} as Record< string, string[] > }
+				duplicatesData={ {} as string[] }
 			/>
 		);
 	};

diff --git a/client/settings/express-checkout/apple-google-pay-item.tsx b/client/settings/express-checkout/apple-google-pay-item.tsx
@@ -27,12 +27,10 @@ const AppleGooglePayExpressCheckoutItem = (): React.ReactElement => {
 	] = usePaymentRequestEnabledSettings() as PaymentRequestEnabledSettingsHook;
 
 	const showIncompatibilityNotice = useExpressCheckoutShowIncompatibilityNotice();
-	const duplicatedPaymentMethods = useGetDuplicatedPaymentMethodIds() as Record<
-		string,
-		string[]
-	>;
-	const isDuplicate =
-		duplicatedPaymentMethods?.apple_pay_google_pay?.length > 0;
+	const duplicatedPaymentMethods = useGetDuplicatedPaymentMethodIds() as string[];
+	const isDuplicate = duplicatedPaymentMethods.includes(
+		'apple_pay_google_pay'
+	);
 
 	return (
 		<li

diff --git a/includes/class-duplicates-detection-service.php b/includes/class-duplicates-detection-service.php
@@ -58,7 +58,8 @@ public function find_duplicates() {
 			->keep_woopayments_enabled_gateways_only()
 			->keep_duplicates_only();
 
-		return $this->gateways_qualified_by_duplicates_detector;
+		// Return payment method IDs list so that front-end can successfully compare with its own list.
+		return array_keys( $this->gateways_qualified_by_duplicates_detector );
 	}
 
 	/**