A4A MSD: point WooPayments license queries at the shared helper

Now that the commissions dashboard lives in the MSD dashboard, switch
the remaining attached-WooPayments-licenses call sites — the dashboard
data hook, the route-loader prefetch, and the classic landing page —
to wooPaymentsLicensesQuery and WOOPAYMENTS_PLUGIN, so their cache
keys can never drift from the overview store count.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

Author: yashwin

client/a8c-for-agencies/sections/woopayments/primary/woopayment-landing/index.tsx

@@ -1,9 +1,4 @@
-import {
-	JetpackLicenseFilter,
-	JetpackLicenseSortField,
-	JetpackLicenseSortDirection,
-} from '@automattic/api-core';
-import { jetpackAgencyLicensesQuery } from '@automattic/api-queries';
+import { wooPaymentsLicensesQuery } from '@automattic/api-queries';
 import page from '@automattic/calypso-router';
 import { useQuery } from '@tanstack/react-query';
 import { useTranslate } from 'i18n-calypso';
@@ -23,12 +18,7 @@ const WooPaymentsLanding = () => {
 	const agencyId = useSelector( getActiveAgencyId );
 
 	const { data: licenses, isFetched } = useQuery( {
-		...jetpackAgencyLicensesQuery( agencyId ?? 0, {
-			filter: JetpackLicenseFilter.Attached,
-			search: 'woopayments',
-			sortField: JetpackLicenseSortField.IssuedAt,
-			sortDirection: JetpackLicenseSortDirection.Descending,
-		} ),
+		...wooPaymentsLicensesQuery( agencyId ?? 0 ),
 		enabled: !! agencyId,
 		refetchOnWindowFocus: false,
 	} );

client/dashboard/agency/earn/woopayments/use-woopayments-dashboard-data.ts

@@ -1,13 +1,9 @@
-import {
-	JetpackLicenseFilter,
-	JetpackLicenseSortField,
-	JetpackLicenseSortDirection,
-} from '@automattic/api-core';
 import {
 	agencySitesWithPluginsQuery,
 	agencyWooPaymentsDataQuery,
-	jetpackAgencyLicensesQuery,
 	jetpackTestConnectionQuery,
+	wooPaymentsLicensesQuery,
+	WOOPAYMENTS_PLUGIN,
 } from '@automattic/api-queries';
 import { useQueries, useQuery } from '@tanstack/react-query';
 import { useMemo } from 'react';
@@ -54,12 +50,7 @@ export interface WooPaymentsDashboardData {
  */
 export default function useWooPaymentsDashboardData( agencyId: number ): WooPaymentsDashboardData {
 	const { data: licenseSites, isLoading: isLoadingLicensesWithWooPayments } = useQuery( {
-		...jetpackAgencyLicensesQuery( agencyId, {
-			filter: JetpackLicenseFilter.Attached,
-			search: 'woopayments',
-			sortField: JetpackLicenseSortField.IssuedAt,
-			sortDirection: JetpackLicenseSortDirection.Descending,
-		} ),
+		...wooPaymentsLicensesQuery( agencyId ),
 		enabled: !! agencyId,
 		refetchOnWindowFocus: false,
 		select: ( licenses ) =>
@@ -71,7 +62,7 @@ export default function useWooPaymentsDashboardData( agencyId: number ): WooPaym
 	} );
 
 	const { isLoading: isLoadingSitesWithPlugins, data: sitesWithPlugins } = useQuery( {
-		...agencySitesWithPluginsQuery( agencyId, [ 'woocommerce-payments/woocommerce-payments' ] ),
+		...agencySitesWithPluginsQuery( agencyId, [ WOOPAYMENTS_PLUGIN ] ),
 		enabled: !! agencyId,
 		refetchOnWindowFocus: false,
 	} );

client/dashboard/app/router/agency.tsx

@@ -1,8 +1,3 @@
-import {
-	JetpackLicenseFilter,
-	JetpackLicenseSortField,
-	JetpackLicenseSortDirection,
-} from '@automattic/api-core';
 import {
 	activeAgencyQuery,
 	agencyProductsQuery,
@@ -11,7 +6,6 @@ import {
 	agencySiteQuery,
 	agencySitesWithPluginsQuery,
 	agencyWooPaymentsDataQuery,
-	jetpackAgencyLicensesQuery,
 	mcpSettingsQuery,
 	queryClient,
 	rawUserPreferencesQuery,
@@ -22,6 +16,8 @@ import {
 	referralsQuery,
 	referralCommissionPayoutQuery,
 	tipaltiPayeeQuery,
+	wooPaymentsLicensesQuery,
+	WOOPAYMENTS_PLUGIN,
 } from '@automattic/api-queries';
 import { createRoute, createLazyRoute, notFound, Outlet } from '@tanstack/react-router';
 import { __ } from '@wordpress/i18n';
@@ -307,16 +303,9 @@ export const earnWooPaymentsRoute = createRoute( {
 		}
 		const [ sitesWithPlugins, licenses ] = await Promise.all( [
 			queryClient.ensureQueryData(
-				agencySitesWithPluginsQuery( agency.id, [ 'woocommerce-payments/woocommerce-payments' ] )
-			),
-			queryClient.ensureQueryData(
-				jetpackAgencyLicensesQuery( agency.id, {
-					filter: JetpackLicenseFilter.Attached,
-					search: 'woopayments',
-					sortField: JetpackLicenseSortField.IssuedAt,
-					sortDirection: JetpackLicenseSortDirection.Descending,
-				} )
+				agencySitesWithPluginsQuery( agency.id, [ WOOPAYMENTS_PLUGIN ] )
 			),
+			queryClient.ensureQueryData( wooPaymentsLicensesQuery( agency.id ) ),
 		] );
 		if ( sitesWithPlugins.length > 0 || licenses.length > 0 ) {
 			await Promise.all( [