Merge trunk v5.1.2 into develop

Author: botwoo

changelog.txt

@@ -1,5 +1,8 @@
 *** WooCommerce Payments Changelog ***
 
+= 5.1.2 - 2022-12-03 =
+* Fix - Import critical package instead of lazy loading.
+
 = 5.1.1 - 2022-12-02 =
 * Fix - Minor patch fix to cron functionality that does not appear to have front-end ramifications for customers.
 

client/checkout/blocks/fields.js

@@ -30,7 +30,11 @@ const WCPayFields = ( {
 	shouldSavePayment,
 } ) => {
 	const [ errorMessage, setErrorMessage ] = useState( null );
-	const [ fingerprint ] = useFingerprint();
+	const [ fingerprint, fingerprintErrorMessage ] = useFingerprint();
+
+	useEffect( () => {
+		setErrorMessage( fingerprintErrorMessage );
+	}, [ fingerprintErrorMessage ] );
 
 	// When it's time to process the payment, generate a Stripe payment method object.
 	useEffect(

client/checkout/blocks/hooks.js

@@ -7,7 +7,10 @@ import { useEffect, useState } from '@wordpress/element';
  * Internal dependencies
  */
 import confirmCardPayment from './confirm-card-payment.js';
-import { getFingerprint } from '../utils/fingerprint.js';
+import {
+	getFingerprint,
+	FINGERPRINT_GENERIC_ERROR,
+} from '../utils/fingerprint.js';
 
 export const usePaymentCompleteHandler = (
 	api,
@@ -45,7 +48,9 @@ export const useFingerprint = () => {
 				const { visitorId } = await getFingerprint();
 				setFingerprint( visitorId );
 			} catch ( err ) {
-				setError( err );
+				setError(
+					err.message ? err.message : FINGERPRINT_GENERIC_ERROR
+				);
 			}
 		} )();
 	}, [] );

client/checkout/blocks/upe-fields.js

@@ -376,7 +376,7 @@ const ConsumableWCPayFields = ( { api, ...props } ) => {
 		getConfig( 'wcBlocksUPEAppearance' )
 	);
 	const [ fontRules ] = useState( getFontRulesFromPage() );
-	const [ fingerprint ] = useFingerprint();
+	const [ fingerprint, fingerprintErrorMessage ] = useFingerprint();
 
 	useEffect( () => {
 		async function generateUPEAppearance() {
@@ -391,6 +391,11 @@ const ConsumableWCPayFields = ( { api, ...props } ) => {
 			generateUPEAppearance();
 		}
 
+		if ( fingerprintErrorMessage ) {
+			setErrorMessage( fingerprintErrorMessage );
+			return;
+		}
+
 		if ( paymentIntentId || hasRequestedIntent || ! fingerprint ) {
 			return;
 		}
@@ -417,6 +422,7 @@ const ConsumableWCPayFields = ( { api, ...props } ) => {
 		errorMessage,
 		appearance,
 		fingerprint,
+		fingerprintErrorMessage,
 	] );
 
 	if ( ! clientSecret ) {

client/checkout/classic/index.js

@@ -196,6 +196,8 @@ jQuery( function ( $ ) {
 					fingerprint = visitorId;
 				} catch ( error ) {
 					// Do not mount element if fingerprinting is not available
+					showError( error.message );
+
 					return;
 				}
 			}

client/checkout/classic/upe.js

@@ -189,6 +189,8 @@ jQuery( function ( $ ) {
 				fingerprint = visitorId;
 			} catch ( error ) {
 				// Do not mount element if fingerprinting is not available
+				showErrorCheckout( error.message );
+
 				return;
 			}
 		}

client/checkout/utils/fingerprint.js

@@ -1,13 +1,17 @@
-export const getFingerprint = async () => {
-	const FingerprintJS = await import(
-		/* webpackChunkName: "fp_agent" */
-		'@fingerprintjs/fingerprintjs'
-	);
+/** @format */
+/**
+ * Internal dependencies
+ */
+import FingerprintJS from '@fingerprintjs/fingerprintjs';
 
+export const FINGERPRINT_GENERIC_ERROR =
+	'An error was encountered when preparing the payment form. Please try again later.';
+
+export const getFingerprint = async () => {
 	const agent = await FingerprintJS.load( { monitoring: false } );
 
 	if ( ! agent ) {
-		throw new Error( 'Unable to load agent.' );
+		throw new Error( FINGERPRINT_GENERIC_ERROR );
 	}
 
 	return await agent.get();

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "woocommerce-payments",
-  "version": "5.1.1",
+  "version": "5.1.2",
   "main": "webpack.config.js",
   "author": "Automattic",
   "license": "GPL-3.0-or-later",

package.json

@@ -4,7 +4,7 @@ Tags: payment gateway, payment, apple pay, credit card, google pay
 Requires at least: 5.9
 Tested up to: 6.1
 Requires PHP: 7.0
-Stable tag: 5.1.1
+Stable tag: 5.1.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -98,6 +98,9 @@ Please note that our support for the checkout block is still experimental and th
 
 == Changelog ==
 
+= 5.1.2 - 2022-12-03 =
+* Fix - Import critical package instead of lazy loading.
+
 = 5.1.1 - 2022-12-02 =
 * Fix - Minor patch fix to cron functionality that does not appear to have front-end ramifications for customers.