Update snaps/fix tests

woocommerce · May 27, 2021 · 135ec39 · 135ec39
1 parent 6378390
commit 135ec39
Show file tree

Hide file tree

Showing 3 changed files with 1,918 additions and 1,849 deletions.
diff --git a/assets/js/base/context/hooks/payment-methods/use-payment-methods.js b/assets/js/base/context/hooks/payment-methods/use-payment-methods.js
@@ -1,8 +1,7 @@
 /**
  * External dependencies
  */
-import { useEffect, useRef } from '@wordpress/element';
-import isShallowEqual from '@wordpress/is-shallow-equal';
+import { useShallowEqual } from '@woocommerce/base-hooks';
 
 /**
  * Internal dependencies
@@ -17,48 +16,25 @@ const usePaymentMethodState = ( express = false ) => {
 		expressPaymentMethodsInitialized,
 	} = usePaymentMethodDataContext();
 
-	const currentState = useRef( {
-		paymentMethods,
-		isInitialized: paymentMethodsInitialized,
-	} );
-
-	const currentExpressState = useRef( {
-		paymentMethods: expressPaymentMethods,
-		isInitialized: expressPaymentMethodsInitialized,
-	} );
-
-	useEffect( () => {
-		if (
-			paymentMethodsInitialized !== currentState.current.isInitialized ||
-			! isShallowEqual(
-				paymentMethods,
-				currentState.current.paymentMethods
-			)
-		) {
-			currentState.current = {
-				paymentMethods,
-				isInitialized: paymentMethodsInitialized,
-			};
-		}
-	}, [ paymentMethods, paymentMethodsInitialized ] );
-
-	useEffect( () => {
-		if (
-			expressPaymentMethodsInitialized !==
-				currentExpressState.current.isInitialized ||
-			! isShallowEqual(
-				expressPaymentMethods,
-				currentExpressState.current.paymentMethods
-			)
-		) {
-			currentExpressState.current = {
-				paymentMethods: expressPaymentMethods,
-				isInitialized: expressPaymentMethodsInitialized,
-			};
-		}
-	}, [ expressPaymentMethods, expressPaymentMethodsInitialized ] );
-
-	return express ? currentExpressState.current : currentState.current;
+	const currentPaymentMethods = useShallowEqual( paymentMethods );
+	const currentExpressPaymentMethods = useShallowEqual(
+		expressPaymentMethods
+	);
+	const currentPaymentMethodsInitialized = useShallowEqual(
+		paymentMethodsInitialized
+	);
+	const currentExpressPaymentMethodsInitialized = useShallowEqual(
+		expressPaymentMethodsInitialized
+	);
+
+	return {
+		paymentMethods: express
+			? currentExpressPaymentMethods
+			: currentPaymentMethods,
+		isInitialized: express
+			? currentExpressPaymentMethodsInitialized
+			: currentPaymentMethodsInitialized,
+	};
 };
 
 export const usePaymentMethods = () => usePaymentMethodState();