chore: bump core-backend + refactor query (#40731)

## **Description**

Refactored multichain activity transaction queries to use apiClient
query options directly and removed the now-redundant local query helper.

Bump core-backend 

## **Changelog**

<!--
If this PR is not End-User-Facing and should not show up in the
CHANGELOG, you can choose to either:
1. Write `CHANGELOG entry: null`
2. Label with `no-changelog`

If this PR is End-User-Facing, please write a short User-Facing
description in the past tense like:
`CHANGELOG entry: Added a new tab for users to see their NFTs`
`CHANGELOG entry: Fixed a bug that was causing some NFTs to flicker`

(This helps the Release Engineer do their job more quickly and
accurately)
-->

CHANGELOG entry: chore: bump core-backend; refactor query

## **Related issues**

Fixes:

## **Manual testing steps**

1. Activity list works as normal

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

<!-- CURSOR_SUMMARY -->
---

> [!NOTE]
> **Medium Risk**
> Touches multichain activity transaction fetching by switching to
`apiClient`-provided infinite query options and adjusting `react-query`
enable/refetch behavior, which could affect caching, pagination, or when
requests fire. Dependency bump to `@metamask/core-backend` may also
change runtime query option defaults.
> 
> **Overview**
> **Multichain Activity v2 transaction fetching was refactored** to use
`apiClient.accounts.getV4MultiAccountTransactionsInfiniteQueryOptions`
directly instead of the local `queries.transactions` helper, and
`ui/helpers/queries.ts` was removed.
> 
> `useTransactionsQuery` now explicitly gates queries on external
services + non-empty networks/accounts and sets additional `react-query`
behaviors (`keepPreviousData`, `refetchOnMount`,
`refetchOnWindowFocus`); `usePrefetchTransactions` was updated
accordingly, and tests were rewritten to mock the new `apiClient`
query-options call.
> 
> Separately, **`@metamask/core-backend` was bumped to `^6.1.0`** (with
corresponding lockfile updates).
> 
> <sup>Written by [Cursor
Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit
4c14966. This will update automatically
on new commits. Configure
[here](https://cursor.com/dashboard?tab=bugbot).</sup>
<!-- /CURSOR_SUMMARY -->

Author: n3ps

package.json

@@ -302,7 +302,7 @@
     "@metamask/connectivity-controller": "^0.1.0",
     "@metamask/contract-metadata": "^2.5.0",
     "@metamask/controller-utils": "^11.18.0",
-    "@metamask/core-backend": "^6.0.0",
+    "@metamask/core-backend": "^6.1.0",
     "@metamask/delegation-controller": "^2.0.1",
     "@metamask/delegation-core": "^0.2.0-rc.1",
     "@metamask/delegation-deployments": "^0.15.0",

ui/components/multichain/activity-v2/hooks.test.tsx

@@ -17,16 +17,19 @@ import {
 
 const mockUseInfiniteQuery = jest.fn();
 const mockUseQueryClient = jest.fn();
-const mockQueriesTransactions = jest.fn();
+const mockGetV4MultiAccountTransactionsInfiniteQueryOptions = jest.fn();
 
 jest.mock('@tanstack/react-query', () => ({
   useInfiniteQuery: (...args: unknown[]) => mockUseInfiniteQuery(...args),
   useQueryClient: () => mockUseQueryClient(),
 }));
 
-jest.mock('../../../helpers/queries', () => ({
-  queries: {
-    transactions: (...args: unknown[]) => mockQueriesTransactions(...args),
+jest.mock('../../../helpers/api-client', () => ({
+  apiClient: {
+    accounts: {
+      getV4MultiAccountTransactionsInfiniteQueryOptions: (...args: unknown[]) =>
+        mockGetV4MultiAccountTransactionsInfiniteQueryOptions(...args),
+    },
   },
 }));
 
@@ -536,7 +539,7 @@ describe('Query hooks', () => {
 
   beforeEach(() => {
     mockUseInfiniteQuery.mockReturnValue({ data: undefined });
-    mockQueriesTransactions.mockReturnValue({
+    mockGetV4MultiAccountTransactionsInfiniteQueryOptions.mockReturnValue({
       queryKey: ['transactions'],
       queryFn: jest.fn(),
       getNextPageParam: jest.fn(),
@@ -556,16 +559,18 @@ describe('Query hooks', () => {
   it('useTransactionsQuery composes query options and delegates to useInfiniteQuery', () => {
     renderQueryHook(() => useTransactionsQuery());
 
-    expect(mockQueriesTransactions).toHaveBeenCalledWith(
-      {
-        accountAddresses: [`eip155:0:${expectedEvmAddress}`],
-        evmAddress: expectedEvmAddress,
-        networks: expectedNetworks,
-      },
-      { enabled: true, keepPreviousData: true },
-    );
+    expect(
+      mockGetV4MultiAccountTransactionsInfiniteQueryOptions,
+    ).toHaveBeenCalledWith({
+      accountAddresses: [`eip155:0:${expectedEvmAddress}`],
+      networks: expectedNetworks,
+      includeTxMetadata: true,
+    });
     expect(mockUseInfiniteQuery).toHaveBeenCalledWith(
-      expect.objectContaining({ select: expect.any(Function) }),
+      expect.objectContaining({
+        select: expect.any(Function),
+        enabled: true,
+      }),
     );
   });
 
@@ -583,7 +588,9 @@ describe('Query hooks', () => {
     };
 
     mockUseQueryClient.mockReturnValue(mockQueryClient);
-    mockQueriesTransactions.mockReturnValue(queryOptions);
+    mockGetV4MultiAccountTransactionsInfiniteQueryOptions.mockReturnValue(
+      queryOptions,
+    );
 
     const { result } = renderQueryHook(() => usePrefetchTransactions());
 

ui/components/multichain/activity-v2/hooks.ts

@@ -15,8 +15,8 @@ import { selectTransactions } from '../../../../shared/lib/multichain/transforma
 import { SET_APPROVAL_FOR_ALL } from '../../../../shared/constants/transaction';
 import { selectEnabledNetworksAsCaipChainIds } from '../../../selectors/multichain/networks';
 import { selectRequiredTransactionHashes } from '../../../selectors/transactionController';
-import { queries } from '../../../helpers/queries';
 import { useBridgeActivityData } from '../../../hooks/bridge/useBridgeActivityData';
+import { apiClient } from '../../../helpers/api-client';
 import { calculateFiatFromMarketRates } from './helpers';
 import type { ActivityListFilter } from './helpers';
 
@@ -62,19 +62,25 @@ export function useTransactionsQuery(filter?: ActivityListFilter) {
     [evmAddress, internalTxHashes],
   );
 
-  const queryOptions = useMemo(
-    () =>
-      queries.transactions(
-        { accountAddresses, evmAddress, networks },
-        {
-          enabled: Boolean(useExternalServices) && networks.length > 0,
-          keepPreviousData: true,
-        },
-      ),
-    [evmAddress, accountAddresses, networks, useExternalServices],
-  );
+  const queryOptions =
+    apiClient.accounts.getV4MultiAccountTransactionsInfiniteQueryOptions({
+      accountAddresses,
+      networks,
+      includeTxMetadata: true,
+    });
 
-  return useInfiniteQuery({ ...queryOptions, select: selectFn });
+  // @ts-expect-error apiClient returns v5 types, repo still in v4
+  return useInfiniteQuery({
+    ...queryOptions,
+    select: selectFn,
+    enabled:
+      Boolean(useExternalServices) &&
+      networks.length > 0 &&
+      accountAddresses.length > 0,
+    keepPreviousData: true,
+    refetchOnMount: true,
+    refetchOnWindowFocus: true,
+  });
 }
 
 export function usePrefetchTransactions() {
@@ -83,8 +89,13 @@ export function usePrefetchTransactions() {
   const { evmAddress, accountAddresses, networks } = useTransactionParams();
 
   const queryOptions = useMemo(
-    () => queries.transactions({ accountAddresses, evmAddress, networks }),
-    [evmAddress, accountAddresses, networks],
+    () =>
+      apiClient.accounts.getV4MultiAccountTransactionsInfiniteQueryOptions({
+        accountAddresses,
+        networks,
+        includeTxMetadata: true,
+      }),
+    [accountAddresses, networks],
   );
 
   return useCallback(() => {
@@ -101,6 +112,7 @@ export function usePrefetchTransactions() {
       return;
     }
 
+    // @ts-expect-error apiClient returns v5 types, repo still in v4
     queryClient.prefetchInfiniteQuery(queryOptions).catch(() => {
       // Prefetch is opportunistic
     });

ui/helpers/queries.ts

@@ -5940,19 +5940,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/core-backend@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "@metamask/core-backend@npm:6.0.0"
+"@metamask/core-backend@npm:^6.0.0, @metamask/core-backend@npm:^6.1.0":
+  version: 6.1.0
+  resolution: "@metamask/core-backend@npm:6.1.0"
   dependencies:
-    "@metamask/accounts-controller": "npm:^36.0.0"
-    "@metamask/controller-utils": "npm:^11.18.0"
+    "@metamask/accounts-controller": "npm:^37.0.0"
+    "@metamask/controller-utils": "npm:^11.19.0"
     "@metamask/keyring-controller": "npm:^25.1.0"
     "@metamask/messenger": "npm:^0.3.0"
     "@metamask/profile-sync-controller": "npm:^27.1.0"
     "@metamask/utils": "npm:^11.9.0"
     "@tanstack/query-core": "npm:^5.62.16"
     uuid: "npm:^8.3.2"
-  checksum: 10/b663aa0ce78ffd493f556070906d7f008c0bd97ce613445366340fe61c0db4b85ca5ce7153a21fb4358a1b5fac31973b708ecb1795fa13fb1d827f62718eaca8
+  checksum: 10/9271cb7eea6c8122c505b66ebced1861572bd781f4ed294e4d9dc2d9f7f100412f5c44a8e53f9b6dc02aa2801f64daeb9fcc398d19cdb04222ae121438017686
   languageName: node
   linkType: hard
 
@@ -33369,7 +33369,7 @@ __metadata:
     "@metamask/connectivity-controller": "npm:^0.1.0"
     "@metamask/contract-metadata": "npm:^2.5.0"
     "@metamask/controller-utils": "npm:^11.18.0"
-    "@metamask/core-backend": "npm:^6.0.0"
+    "@metamask/core-backend": "npm:^6.1.0"
     "@metamask/delegation-controller": "npm:^2.0.1"
     "@metamask/delegation-core": "npm:^0.2.0-rc.1"
     "@metamask/delegation-deployments": "npm:^0.15.0"