Fixed default borderRadius value for the express checkout buttons (#9398

)
Automattic · Sep 6, 2024 · f65efc5 · f65efc5
1 parent 64b54f3
commit f65efc5
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 16 deletions.
diff --git a/changelog/9311-fix-default-border-radius b/changelog/9311-fix-default-border-radius
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fixed default borderRadius value for the express checkout buttons
diff --git a/client/express-checkout/utils/index.ts b/client/express-checkout/utils/index.ts
@@ -179,7 +179,7 @@ export const getExpressCheckoutButtonAppearance = () => {
 	return {
 		variables: {
 			borderRadius: `${
-				buttonSettings?.radius ?? getDefaultBorderRadius()
+				buttonSettings?.radius || getDefaultBorderRadius()
 			}px`,
 			spacingUnit: '6px',
 		},

diff --git a/client/globals.d.ts b/client/globals.d.ts
@@ -185,4 +185,11 @@ declare global {
 		homeUrl: string;
 		siteTitle: string;
 	};
+
+	interface Window {
+		wcpaySettings: typeof wcpaySettings;
+		wc: typeof wc;
+		wcTracks: typeof wcTracks;
+		wcSettings: typeof wcSettings;
+	}
 }
diff --git a/client/payment-methods-map.tsx b/client/payment-methods-map.tsx
@@ -24,20 +24,6 @@ import {
 	SofortIcon,
 } from 'wcpay/payment-methods-icons';
 
-declare global {
-	interface Window {
-		wcpaySettings: {
-			accountStatus: {
-				country: string;
-			};
-		};
-		wcPayFrontendTracks: {
-			event: string;
-			properties: Record< string, unknown >;
-		};
-	}
-}
-
 const accountCountry = window.wcpaySettings?.accountStatus?.country || 'US';
 
 export interface PaymentMethodMapEntry {

diff --git a/client/utils/express-checkout/index.js b/client/utils/express-checkout/index.js
@@ -24,7 +24,7 @@ export const getExpressCheckoutConfig = ( key ) => {
 
 export const getDefaultBorderRadius = () => {
 	return parseInt(
-		wcpaySettings?.defaultExpressCheckoutBorderRadius ?? 4,
+		window?.wcpaySettings?.defaultExpressCheckoutBorderRadius || 4,
 		10
 	);
 };