fix: resolve merge conflicts with #1234

Automattic · Aug 12, 2022 · 15fe247 · 15fe247
1 parent fbc94d9
commit 15fe247
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 7 deletions.
diff --git a/src/blocks/donate/streamlined/index.ts b/src/blocks/donate/streamlined/index.ts
@@ -40,7 +40,19 @@ export const processStreamlinedElements = ( parentElement = document ) =>
 		const enableForm = () => el.classList.remove( 'stripe-payment--disabled' );
 		enableForm();
 
-		const getCaptchaToken = async reCaptchaKey => {
+		// Display CC UI.
+		const displayCardUI = () => {
+			if ( isCardUIVisible ) {
+				return;
+			}
+			const inputsHiddenEl = el.querySelector( '.stripe-payment__inputs.stripe-payment--hidden' );
+			if ( inputsHiddenEl ) {
+				inputsHiddenEl.classList.remove( 'stripe-payment--hidden' );
+				isCardUIVisible = true;
+			}
+		};
+
+		const getCaptchaToken = async ( reCaptchaKey: string ) => {
 			return new Promise( ( res, rej ) => {
 				const { grecaptcha } = window;
 
@@ -72,6 +84,10 @@ export const processStreamlinedElements = ( parentElement = document ) =>
 			 */
 			requestPayloadOverrides = {}
 		) => {
+			if ( ! stripe ) {
+				return;
+			}
+
 			// Add reCaptcha challenge to form submission, if available.
 			const reCaptchaKey = settings?.captchaSiteKey;
 			let reCaptchaToken;
@@ -87,7 +103,7 @@ export const processStreamlinedElements = ( parentElement = document ) =>
 					return { error: true };
 				}
 			}
-			const formValues = utils.getFormValues( formElement );
+			const formValues = utils.getDonationFormValues( formElement );
 			const apiRequestPayload = {
 				captchaToken: reCaptchaToken,
 				tokenData: token,

diff --git a/src/blocks/donate/streamlined/utils.ts b/src/blocks/donate/streamlined/utils.ts
@@ -44,7 +44,9 @@ export const renderMessages = (
 	} );
 
 	if ( 'success' === type ) {
-		el.parentElement.replaceWith( el );
+		if ( el.parentElement ) {
+			el.parentElement.replaceWith( el );
+		}
 	}
 };
 
@@ -74,8 +76,9 @@ export const getSettings = ( formElement: HTMLFormElement ) => {
 		feeMultiplier,
 		feeStatic,
 		stripePublishableKey,
+		paymentRequestType,
 		captchaSiteKey,
-	] = JSON.parse( formElement.getAttribute( 'data-settings' ) );
+	] = JSON.parse( settings );
 	return {
 		currency: currency.toLowerCase(),
 		currencySymbol,
@@ -86,6 +89,7 @@ export const getSettings = ( formElement: HTMLFormElement ) => {
 		feeMultiplier: parseFloat( feeMultiplier ),
 		feeStatic: parseFloat( feeStatic ),
 		stripePublishableKey,
+		paymentRequestType,
 		captchaSiteKey,
 	};
 };
@@ -188,7 +192,7 @@ export const sendAPIRequest = async ( endpoint: string, data: object, method = '
 		return { error: responseData };
 	} );
 
-export const renderSuccessMessageWithEmail = ( emailAddress, messagesEl ) => {
+export const renderSuccessMessageWithEmail = ( emailAddress: string, messagesEl: HTMLElement ) => {
 	const successMessage = sprintf(
 		/* Translators: %s is the email address of the current user. */
 		__(

diff --git a/src/types/index.d.ts b/src/types/index.d.ts
@@ -7,6 +7,7 @@ declare global {
 			assets_path: string;
 			is_rendering_streamlined_block?: boolean;
 		};
+		grecaptcha: any
 	}
 
 	type PostId = number;
@@ -28,7 +29,7 @@ declare global {
 		clientId: string;
 		attributes: {
 			// eslint-disable-next-line @typescript-eslint/no-explicit-any
-			[ key: string ]: any;
+			[key: string]: any;
 		};
 		innerBlocks: Block[];
 	};
@@ -38,4 +39,4 @@ declare global {
 	};
 }
 
-export {};
+export { };