Pass currency and do not pass transaction_ids parameter to create ins…

…tant deposit (#7828)
Automattic · Jan 15, 2024 · 48c3a5d · 48c3a5d
1 parent 6bf63af
commit 48c3a5d
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 23 deletions.
diff --git a/changelog/add-7711-instant-deposit-currency b/changelog/add-7711-instant-deposit-currency
@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+Pass currency parameter and not transaction_ids parameter when creating instant deposit.
diff --git a/client/components/account-balances/test/index.test.tsx b/client/components/account-balances/test/index.test.tsx
@@ -145,7 +145,6 @@ const createMockOverview = (
 			fee: 0,
 			net: 0,
 			fee_percentage: 0,
-			transaction_ids: [],
 		},
 	};
 };

diff --git a/client/components/deposits-overview/test/index.tsx b/client/components/deposits-overview/test/index.tsx
@@ -136,7 +136,6 @@ const createMockOverview = (
 			fee: 0,
 			net: 0,
 			fee_percentage: 0,
-			transaction_ids: [],
 		},
 	};
 };

diff --git a/client/data/deposits/actions.js b/client/data/deposits/actions.js
@@ -98,18 +98,18 @@ export function updateInstantDeposit( data ) {
 	};
 }
 
-export function* submitInstantDeposit( transactionIds ) {
+export function* submitInstantDeposit( currency ) {
 	try {
 		yield dispatch( STORE_NAME ).startResolution( 'getInstantDeposit', [
-			transactionIds,
+			currency,
 		] );
 
 		const deposit = yield apiFetch( {
 			path: '/wc/v3/payments/deposits',
 			method: 'POST',
 			data: {
 				type: 'instant',
-				transaction_ids: transactionIds,
+				currency,
 			},
 		} );
 
@@ -153,7 +153,7 @@ export function* submitInstantDeposit( transactionIds ) {
 		);
 	} finally {
 		yield dispatch( STORE_NAME ).finishResolution( 'getInstantDeposit', [
-			transactionIds,
+			currency,
 		] );
 	}
 }
diff --git a/client/data/deposits/hooks.ts b/client/data/deposits/hooks.ts
@@ -235,18 +235,18 @@ export const useDepositsSummary = ( {
 };
 
 export const useInstantDeposit = (
-	transactionIds: string[]
+	currency: string
 ): { inProgress: boolean; submit: () => void; deposit: unknown } => {
 	const { deposit, inProgress } = useSelect( ( select ) => {
 		const { getInstantDeposit, isResolving } = select( STORE_NAME );
 
 		return {
-			deposit: getInstantDeposit( [ transactionIds ] ),
-			inProgress: isResolving( 'getInstantDeposit', [ transactionIds ] ),
+			deposit: getInstantDeposit( [ currency ] ),
+			inProgress: isResolving( 'getInstantDeposit', [ currency ] ),
 		};
 	} );
 	const { submitInstantDeposit } = useDispatch( STORE_NAME );
-	const submit = () => submitInstantDeposit( transactionIds );
+	const submit = () => submitInstantDeposit( currency );
 
 	return { deposit, inProgress, submit };
 };
diff --git a/client/data/deposits/test/overviews.fixture.json b/client/data/deposits/test/overviews.fixture.json
@@ -97,8 +97,7 @@
 				"amount": 12345,
 				"fee": 185.175,
 				"net": 12159.83,
-				"fee_percentage": 1.5,
-				"transaction_ids": [ "txn_XYZ", "txn_ZXY" ]
+				"fee_percentage": 1.5
 			}
 		]
 	},

diff --git a/client/deposits/instant-deposits/index.tsx b/client/deposits/instant-deposits/index.tsx
@@ -33,9 +33,7 @@ const InstantDepositButton: React.FC< InstantDepositButtonProps > = ( {
 } ) => {
 	const [ isModalOpen, setModalOpen ] = useState( false );
 	const buttonDisabled = isButtonDisabled( instantBalance );
-	const { inProgress, submit } = useInstantDeposit(
-		instantBalance.transaction_ids
-	);
+	const { inProgress, submit } = useInstantDeposit( instantBalance.currency );
 	const onClose = () => {
 		setModalOpen( false );
 	};

diff --git a/client/deposits/instant-deposits/test/index.tsx b/client/deposits/instant-deposits/test/index.tsx
@@ -28,7 +28,6 @@ const mockInstantBalance = {
 	fee: 123.45,
 	net: 12221.55,
 	fee_percentage: 1.5,
-	transaction_ids: [ 'txn_ABC123', 'txn_DEF456' ],
 	currency: 'USD',
 } as AccountOverview.InstantBalance;
 
@@ -37,7 +36,6 @@ const mockZeroInstantBalance = {
 	fee: 0,
 	net: 0,
 	fee_percentage: 1.5,
-	transaction_ids: [],
 	currency: 'USD',
 } as AccountOverview.InstantBalance;
 

diff --git a/client/types/account-overview.d.ts b/client/types/account-overview.d.ts
@@ -54,7 +54,6 @@ export interface InstantBalance {
 	fee: number;
 	net: number;
 	fee_percentage: number;
-	transaction_ids: Array< string >;
 }
 
 export interface Overview {

diff --git a/includes/admin/class-wc-rest-payments-deposits-controller.php b/includes/admin/class-wc-rest-payments-deposits-controller.php
@@ -185,6 +185,6 @@ static function ( $filter ) {
 	 */
 	public function manual_deposit( $request ) {
 		$params = $request->get_params();
-		return $this->forward_request( 'manual_deposit', [ $params['type'], $params['transaction_ids'] ] );
+		return $this->forward_request( 'manual_deposit', [ $params['type'], $params['currency'] ] );
 	}
 }
diff --git a/includes/wc-payment-api/class-wc-payments-api-client.php b/includes/wc-payment-api/class-wc-payments-api-client.php
@@ -251,15 +251,15 @@ public function get_deposits_summary( array $filters = [] ) {
 	 * Trigger a manual deposit.
 	 *
 	 * @param string $type Type of deposit. Only "instant" is supported for now.
-	 * @param string $transaction_ids Comma-separated list of transaction IDs that will be associated with this deposit.
+	 * @param string $currency The deposit currency.
 	 * @return array The new deposit object.
 	 * @throws API_Exception - Exception thrown on request failure.
 	 */
-	public function manual_deposit( $type, $transaction_ids ) {
+	public function manual_deposit( $type, $currency ) {
 		return $this->request(
 			[
-				'type'            => $type,
-				'transaction_ids' => $transaction_ids,
+				'type'     => $type,
+				'currency' => $currency,
 			],
 			self::DEPOSITS_API,
 			self::POST
-Original file line number
+Diff line change
@@ Expand Up / @@ -145,7 +145,6 @@ const createMockOverview = ( @@
     			fee: 0,
     			net: 0,
     			fee_percentage: 0,
-    			transaction_ids: [],
     		},
     	};
     };
@@ Expand Down @@