Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion features/home/vault-table/cells/ether-cell.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ import { formatBalance } from 'utils';
import { BaseCellProps } from 'features/home/vault-table/types';

export const EtherCell: FC<BaseCellProps<bigint>> = ({ value }) => {
return <>{formatBalance(value, { maxDecimalDigits: 5 })}</>;
return <>{formatBalance(value, { maxDecimalDigits: 5 }).trimmed}</>;
};
17 changes: 13 additions & 4 deletions modules/web3/hooks/use-vaults-data-all.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,23 @@ export const useVaultsDataAll = () => {
page: 1,
});

const { data: addressesWithBound, isLoading: isLoadingConnected } =
useVaultsConnectedBound(from, to);
const {
data: addressesWithBound,
isLoading: isLoadingConnected,
isError: isErrorConnected,
} = useVaultsConnectedBound(from, to);
const [connectedVaults, pages] = addressesWithBound ?? [];
const { data: vaults, isLoading, ...rest } = useVaultData(connectedVaults);
const {
data: vaults,
isLoading,
isError: isVaultsDataError,
...rest
} = useVaultData(connectedVaults);

const handlePagination = useCallback((page: number) => {
const toCursor = page * VAULTS_PER_PAGE - 1;
const fromCursor = toCursor - VAULTS_PER_PAGE;
// TODO: refactor. Waiting for Holesky
// TODO: refactor. Waiting for devnet
setPaginationData({ from: toCursor, to: fromCursor, page });
}, []);

Expand All @@ -28,6 +36,7 @@ export const useVaultsDataAll = () => {
pagesCount: Number(pages),
isLoading: isLoadingConnected || isLoading,
handlePagination,
isError: isErrorConnected || isVaultsDataError,
...rest,
};
};
16 changes: 13 additions & 3 deletions modules/web3/hooks/use-vaults-data-by-owner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,23 @@ import { useVaultData } from 'shared/hooks/use-vault-data';
import { useVaultsByOwner } from 'modules/web3/hooks/use-vaults-by-owner';

export const useVaultsDataByOwner = (address: Address) => {
const { data: ownerVaults, isLoading: isLoadingVaultsByOwner } =
useVaultsByOwner(address);
const { data: vaults, isLoading, ...rest } = useVaultData(ownerVaults);
const {
data: ownerVaults,
isLoading: isLoadingVaultsByOwner,
isError: isErrorVaultsByOwner,
} = useVaultsByOwner(address);

const {
data: vaults,
isLoading,
isError: isVaultsError,
...rest
} = useVaultData(ownerVaults);

return {
vaults,
isLoading: isLoadingVaultsByOwner || isLoading,
isError: isErrorVaultsByOwner || isVaultsError,
...rest,
};
};