Add correct TS interface for charge.dispute

client/data/disputes/hooks.ts

@@ -52,7 +52,7 @@ export const useDispute = (
  * Does not return or fetch the dispute object.
  */
 export const useDisputeAccept = (
-	dispute: Dispute
+	dispute: Pick< Dispute, 'id' | 'payment_intent' >
 ): {
 	doAccept: () => void;
 	isLoading: boolean;

client/payment-details/dispute-details/dispute-awaiting-response-details.tsx

@@ -22,8 +22,7 @@ import {
 /**
  * Internal dependencies
  */
-import type { Dispute } from 'wcpay/types/disputes';
-import type { ChargeBillingDetails } from 'wcpay/types/charges';
+import type { ChargeBillingDetails, ChargeDispute } from 'wcpay/types/charges';
 import wcpayTracks from 'tracks';
 import { useDisputeAccept } from 'wcpay/data';
 import { getDisputeFeeFormatted, isInquiry } from 'wcpay/disputes/utils';
@@ -36,7 +35,7 @@ import InlineNotice from 'components/inline-notice';
 import './style.scss';
 
 interface Props {
-	dispute: Dispute;
+	dispute: ChargeDispute;
 	customer: ChargeBillingDetails | null;
 	chargeCreated: number;
 }

client/payment-details/dispute-details/dispute-notice.tsx

@@ -14,11 +14,11 @@ import { createInterpolateElement } from '@wordpress/element';
 import './style.scss';
 import InlineNotice from 'components/inline-notice';
 import { reasons } from 'wcpay/disputes/strings';
-import { Dispute } from 'wcpay/types/disputes';
+import type { Dispute } from 'wcpay/types/disputes';
 import { isInquiry } from 'wcpay/disputes/utils';
 
 interface DisputeNoticeProps {
-	dispute: Dispute;
+	dispute: Pick< Dispute, 'reason' | 'status' >;
 	isUrgent: boolean;
 }
 

client/payment-details/dispute-details/dispute-steps.tsx

@@ -15,14 +15,13 @@ import classNames from 'classnames';
 /**
  * Internal dependencies
  */
-import type { Dispute } from 'wcpay/types/disputes';
-import { ChargeBillingDetails } from 'wcpay/types/charges';
+import type { ChargeBillingDetails, ChargeDispute } from 'wcpay/types/charges';
 import { formatExplicitCurrency } from 'utils/currency';
 import { ClickTooltip } from 'wcpay/components/tooltip';
 import { getDisputeFeeFormatted } from 'wcpay/disputes/utils';
 
 interface Props {
-	dispute: Dispute;
+	dispute: ChargeDispute;
 	customer: ChargeBillingDetails | null;
 	chargeCreated: number;
 	daysRemaining: number;

client/payment-details/dispute-details/dispute-summary-row.tsx

@@ -13,7 +13,7 @@ import classNames from 'classnames';
 /**
  * Internal dependencies
  */
-import type { Dispute } from 'wcpay/types/disputes';
+import type { ChargeDispute } from 'wcpay/types/charges';
 import { HorizontalList } from 'wcpay/components/horizontal-list';
 import { formatExplicitCurrency } from 'wcpay/utils/currency';
 import { reasons } from 'wcpay/disputes/strings';
@@ -23,7 +23,7 @@ import Paragraphs from 'wcpay/components/paragraphs';
 import { getDisputeDeductedBalanceTransaction } from 'wcpay/disputes/utils';
 
 interface Props {
-	dispute: Dispute;
+	dispute: ChargeDispute;
 	daysRemaining: number;
 }
 

client/payment-details/summary/test/index.test.tsx

@@ -11,8 +11,7 @@ import '@wordpress/jest-console';
 /**
  * Internal dependencies
  */
-import type { Charge } from 'wcpay/types/charges';
-import type { Dispute } from 'wcpay/types/disputes';
+import type { Charge, ChargeDispute } from 'wcpay/types/charges';
 import PaymentDetailsSummary from '../';
 import { useAuthorization } from 'wcpay/data';
 import { paymentIntentMock } from 'wcpay/data/payment-intents/test/hooks';
@@ -97,7 +96,7 @@ const getBaseCharge = (): Charge =>
 		},
 	} as any );
 
-const getBaseDispute = (): Dispute =>
+const getBaseDispute = (): ChargeDispute =>
 	( {
 		id: 'dp_1',
 		amount: 2000,
@@ -130,7 +129,7 @@ const getBaseDispute = (): Dispute =>
 		payment_intent: 'pi_1',
 		reason: 'fraudulent',
 		status: 'needs_response',
-	} as Dispute );
+	} as ChargeDispute );
 
 const getBaseMetadata = () => ( {
 	platform: 'ios',
@@ -314,7 +313,7 @@ describe( 'PaymentDetailsSummary', () => {
 						reporting_category: 'dispute',
 					},
 				],
-			} as Dispute,
+			} as ChargeDispute,
 		};
 
 		renderCharge( charge );

client/types/charges.d.ts

@@ -51,6 +51,10 @@ export type OutcomeRiskLevel =
 	| 'not_assessed'
 	| 'unknown';
 
+interface ChargeDispute extends Dispute {
+	charge: string;
+}
+
 export interface Charge {
 	id: string;
 	amount: number;
@@ -62,7 +66,7 @@ export interface Charge {
 	captured?: boolean;
 	created: number;
 	currency: string;
-	dispute?: null | Dispute;
+	dispute?: null | ChargeDispute;
 	disputed: boolean;
 	order: null | OrderDetails;
 	outcome: null | {

client/types/disputes.d.ts

@@ -98,7 +98,7 @@ export interface Dispute {
 	issuer_evidence: IssuerEvidence | null;
 	fileSize?: Record< string, number >;
 	reason: DisputeReason;
-	charge: Charge | string;
+	charge: Charge;
 	amount: number;
 	currency: string;
 	created: number;

client/utils/charge/index.ts

@@ -17,7 +17,7 @@ const failedOutcomeTypes = [ 'issuer_declined', 'invalid' ];
 const blockedOutcomeTypes = [ 'blocked' ];
 
 export const getDisputeStatus = (
-	dispute: null | Dispute = <Dispute>{}
+	dispute: null | Pick< Dispute, 'status' > = <Dispute>{}
 ): string => dispute?.status || '';
 
 export const getChargeOutcomeType = ( charge: Charge = <Charge>{} ): string =>