Skip to content

Pagination is broken in "My Vaults" page #406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DiRaiks merged 2 commits into from
Oct 29, 2026
Merged

Pagination is broken in "My Vaults" page #406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce2a146
fix: fix pagination for my vaults page fallback mode
ev-d Oct 23, 2026
12c2f57
Merge branch 'develop' into fix/my-vaults-rpc-pagination
ev-d Oct 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion features/home/use-vault-list-params.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,18 @@ const DEFAULT_PARAMS: FetchVaultsParams = {
perPage: VAULTS_PER_PAGE,
};

// only positive integers: `?page=-1` or `?page=1.5` would yield a negative or
// fractional offset, which breaks `BigInt` and slices from the end of the list
const parsePage = (value: string | string[] | undefined): number => {
const page = Number(value);
return Number.isInteger(page) && page >= 1 ? page : DEFAULT_PARAMS.page;
};

const queryToParams = (
query: Record<string, string | string[] | undefined>,
): FetchVaultsParams => {
return {
page: Number(query.page) || DEFAULT_PARAMS.page,
page: parsePage(query.page),
sortBy:
(query.sortBy as FetchVaultsParams['sortBy']) || DEFAULT_PARAMS.sortBy,
sortDir:
Expand Down
13 changes: 10 additions & 3 deletions modules/vaults/api/fetch-vaults.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,8 @@ const LIMIT_BY_ADDRESS = 200n;
const fetchVaultsDataByAddressRPC = async (
ctx: FetchVaultsContext,
address: Address,
offset: bigint,
limit: bigint,
): Promise<{ vaults: VaultEntryRaw[]; total: number }> => {
const { vaultModule } = ctx;
const vaultViewer = await vaultModule.contracts.getContractVaultViewer();
Expand All @@ -260,8 +262,13 @@ const fetchVaultsDataByAddressRPC = async (
vaultAddresses.push(...vaults);
}

const pageAddresses = vaultAddresses.slice(
Number(offset),
Number(offset + limit),
);

const vaults = await Promise.all(
vaultAddresses.map((vaultAddress) =>
pageAddresses.map((vaultAddress) =>
fetchVaultRPC(ctx, vaultAddress).catch((e) => {
console.warn(
`[fetchConnectedVaultsRPC] Failed to fetch vault data for ${vaultAddress}:`,
Expand All @@ -274,7 +281,7 @@ const fetchVaultsDataByAddressRPC = async (
),
);

return { vaults, total: vaults.length };
return { vaults, total: vaultAddresses.length };
};

const fetchConnectedVaultsRPC = async (
Expand All @@ -285,7 +292,7 @@ const fetchConnectedVaultsRPC = async (
const limit = BigInt(params.perPage);

const { vaults, total } = await (params.address
? fetchVaultsDataByAddressRPC(ctx, params.address)
? fetchVaultsDataByAddressRPC(ctx, params.address, offset, limit)
: fetchVaultsDataBatchRPC(ctx, offset, limit));

return {
Expand Down
Loading