Merge branch 'develop' into dev/7886-add-country-codes-enum

Automattic · Jan 9, 2024 · b2a392e · b2a392e
2 parents 71264d5 + 7b71828
commit b2a392e
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 14 deletions.
diff --git a/changelog/dev-refactor-order-dispute-refundable-util b/changelog/dev-refactor-order-dispute-refundable-util
@@ -0,0 +1,3 @@
+Significance: patch
+Type: dev
+Comment: Not user-facing: refactors the refund eligibility logic for disputed orders
diff --git a/changelog/fix-2395-rerender-woopay-button-on-cart-update b/changelog/fix-2395-rerender-woopay-button-on-cart-update
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Re-render WooPay button when cart updates, when checkout updates.
diff --git a/changelog/fix-woopay-tablet-breakpoint b/changelog/fix-woopay-tablet-breakpoint
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Update WooPay tablet breakpoint.
diff --git a/client/checkout/woopay/email-input-iframe.js b/client/checkout/woopay/email-input-iframe.js
@@ -116,7 +116,7 @@ export const handleWooPayEmailInput = async (
 		}
 
 		// If the window width is less than the breakpoint, reset the styles and return.
-		if ( fullScreenModalBreakpoint >= window.innerWidth ) {
+		if ( fullScreenModalBreakpoint > window.innerWidth ) {
 			iframe.style.left = '0';
 			iframe.style.right = '';
 			return;

diff --git a/client/checkout/woopay/express-button/express-checkout-iframe.js b/client/checkout/woopay/express-button/express-checkout-iframe.js
@@ -75,7 +75,7 @@ export const expressCheckoutIframe = async ( api, context, emailSelector ) => {
 		}
 
 		// If the window width is less than the breakpoint, set iframe to full window
-		if ( fullScreenModalBreakpoint >= window.innerWidth ) {
+		if ( fullScreenModalBreakpoint > window.innerWidth ) {
 			iframe.style.left = '0';
 			iframe.style.right = '';
 			iframe.style.top = '0';

diff --git a/client/checkout/woopay/express-button/index.js b/client/checkout/woopay/express-button/index.js
@@ -1,3 +1,4 @@
+/* global jQuery */
 /**
  * External dependencies
  */
@@ -57,17 +58,17 @@ const renderWooPayExpressCheckoutButtonWithCallbacks = () => {
 	renderWooPayExpressCheckoutButton( listenForCartChanges );
 };
 
-document.addEventListener( 'DOMContentLoaded', () => {
+jQuery( ( $ ) => {
 	listenForCartChanges = {
 		start: () => {
-			document.body.addEventListener(
-				'updated_cart_totals',
+			$( document.body ).on(
+				'updated_cart_totals updated_checkout',
 				renderWooPayExpressCheckoutButtonWithCallbacks
 			);
 		},
 		stop: () => {
-			document.body.removeEventListener(
-				'updated_cart_totals',
+			$( document.body ).off(
+				'updated_cart_totals updated_checkout',
 				renderWooPayExpressCheckoutButtonWithCallbacks
 			);
 		},

diff --git a/client/components/disputed-order-notice/index.js b/client/components/disputed-order-notice/index.js
@@ -14,6 +14,7 @@ import { getDetailsURL } from 'wcpay/components/details-link';
 import {
 	isAwaitingResponse,
 	isInquiry,
+	isRefundable,
 	isUnderReview,
 } from 'wcpay/disputes/utils';
 import { useCharge } from 'wcpay/data';
@@ -30,10 +31,7 @@ const DisputedOrderNoticeHandler = ( { chargeId, onDisableOrderRefund } ) => {
 		if ( ! charge?.dispute ) {
 			return;
 		}
-		// Refunds are only allowed if the dispute is an inquiry or if it's won.
-		const isRefundable =
-			isInquiry( dispute ) || [ 'won' ].includes( dispute.status );
-		if ( ! isRefundable ) {
+		if ( ! isRefundable( dispute.status ) ) {
 			onDisableOrderRefund( dispute.status );
 		}
 	}, [ charge, onDisableOrderRefund ] );
@@ -42,8 +40,6 @@ const DisputedOrderNoticeHandler = ( { chargeId, onDisableOrderRefund } ) => {
 	if ( ! charge?.dispute ) {
 		return null;
 	}
-	const isRefundable =
-		isInquiry( dispute ) || [ 'won' ].includes( dispute.status );
 
 	// Special case the dispute "under review" notice which is much simpler.
 	// (And return early.)
@@ -66,7 +62,7 @@ const DisputedOrderNoticeHandler = ( { chargeId, onDisableOrderRefund } ) => {
 	// This may be dead code. Leaving in for now as this is consistent with
 	// the logic before this PR.
 	// https://github.com/Automattic/woocommerce-payments/pull/7557
-	if ( dispute.status === 'lost' && ! isRefundable ) {
+	if ( dispute.status === 'lost' ) {
 		return (
 			<DisputeOrderLockedNotice
 				message={ __(