Refactor disputes

Automattic · Oct 28, 2024 · 284592d · 284592d
1 parent b5aef87
commit 284592d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/client/disputes/evidence/test/index.js b/client/disputes/evidence/test/index.js
@@ -96,6 +96,7 @@ describe( 'Dispute evidence form', () => {
 
 		global.wcpaySettings = {
 			restUrl: 'http://example.com/wp-json/',
+			dateFormat: 'M j, Y',
 		};
 	} );
 	afterEach( () => {
@@ -190,6 +191,8 @@ describe( 'Dispute evidence page', () => {
 					precision: 2,
 				},
 			},
+			dateFormat: 'M j, Y',
+			timeFormat: 'g:iA',
 		};
 	} );
 

diff --git a/client/disputes/info/index.tsx b/client/disputes/info/index.tsx
@@ -5,7 +5,6 @@
  */
 import * as React from 'react';
 import { __ } from '@wordpress/i18n';
-import { dateI18n } from '@wordpress/date';
 import moment from 'moment';
 import { Link } from '@woocommerce/components';
 
@@ -20,6 +19,7 @@ import { formatExplicitCurrency } from 'multi-currency/interface/functions';
 import './style.scss';
 import Loadable from 'components/loadable';
 import { Dispute } from 'wcpay/types/disputes';
+import { formatDateTime } from 'wcpay/utils/date-time';
 
 const fields: { key: string; label: string }[] = [
 	{ key: 'created', label: __( 'Dispute date', 'woocommerce-payments' ) },
@@ -69,20 +69,20 @@ const Info = ( {
 				transactionId: __( 'Transaction link', 'woocommerce-payments' ),
 		  }
 		: {
-				created: dateI18n(
-					'M j, Y',
-					moment( dispute.created * 1000 ).toISOString()
+				created: formatDateTime(
+					moment( dispute.created * 1000 ).toISOString(),
+					{ includeTime: false, useGmt: false }
 				),
 				amount: formatExplicitCurrency(
 					dispute.amount || 0,
 					dispute.currency || 'USD'
 				),
 				dueBy: dispute.evidence_details
-					? dateI18n(
-							'M j, Y - g:iA',
+					? formatDateTime(
 							moment(
 								dispute.evidence_details.due_by * 1000
-							).toISOString()
+							).toISOString(),
+							{ separator: ' - ', useGmt: false }
 					  )
 					: null,
 				reason: composeDisputeReason( dispute ),

diff --git a/client/disputes/info/test/index.tsx b/client/disputes/info/test/index.tsx
@@ -29,6 +29,8 @@ declare const global: {
 				precision: number;
 			};
 		};
+		dateFormat: string;
+		timeFormat: string;
 	};
 };
 
@@ -49,6 +51,8 @@ describe( 'Dispute info', () => {
 					precision: 2,
 				},
 			},
+			dateFormat: 'M j, Y',
+			timeFormat: 'g:iA',
 		};
 	} );