Revert "Revert "Merge branch 'trunk' into experiment/buy-it-again-blo…

…ck""

This reverts commit d84447f.

assets/js/base/context/hooks/cart/use-store-cart-coupons.ts

@@ -1,5 +1,3 @@
-/** @typedef { import('@woocommerce/type-defs/hooks').StoreCartCoupon } StoreCartCoupon */
-
 /**
  * External dependencies
  */
@@ -32,32 +30,23 @@ export const useStoreCartCoupons = ( context = '' ): StoreCartCoupon => {
 	const { setValidationErrors } = useDispatch( VALIDATION_STORE_KEY );
 
 	const {
-		applyCoupon,
-		removeCoupon,
 		isApplyingCoupon,
 		isRemovingCoupon,
-	}: Pick<
-		StoreCartCoupon,
-		| 'applyCoupon'
-		| 'removeCoupon'
-		| 'isApplyingCoupon'
-		| 'isRemovingCoupon'
-		| 'receiveApplyingCoupon'
-	> = useSelect(
-		( select, { dispatch } ) => {
-			const store = select( storeKey );
-			const actions = dispatch( storeKey );
+	}: Pick< StoreCartCoupon, 'isApplyingCoupon' | 'isRemovingCoupon' > =
+		useSelect(
+			( select ) => {
+				const store = select( storeKey );
+
+				return {
+					isApplyingCoupon: store.isApplyingCoupon(),
+					isRemovingCoupon: store.isRemovingCoupon(),
+				};
+			},
+			[ createErrorNotice, createNotice ]
+		);
 
-			return {
-				applyCoupon: actions.applyCoupon,
-				removeCoupon: actions.removeCoupon,
-				isApplyingCoupon: store.isApplyingCoupon(),
-				isRemovingCoupon: store.isRemovingCoupon(),
-				receiveApplyingCoupon: actions.receiveApplyingCoupon,
-			};
-		},
-		[ createErrorNotice, createNotice ]
-	);
+	const { applyCoupon, removeCoupon, receiveApplyingCoupon } =
+		useDispatch( storeKey );
 
 	const applyCouponWithNotices = ( couponCode: string ) => {
 		applyCoupon( couponCode )

assets/js/data/cart/action-types.ts

@@ -1,5 +1,5 @@
 export const ACTION_TYPES = {
-	RECEIVE_CART: 'RECEIVE_CART',
+	SET_CART_DATA: 'SET_CART_DATA',
 	RECEIVE_ERROR: 'RECEIVE_ERROR',
 	REPLACE_ERRORS: 'REPLACE_ERRORS',
 	APPLYING_COUPON: 'APPLYING_COUPON',