Skip to content

Commit 46b7b03

Browse files
fix: check loaders before loading new page of wallets
1 parent 9ba983e commit 46b7b03

File tree

1 file changed

+7
-2
lines changed
  • packages/scaffold/src/partials/w3m-all-wallets-list

1 file changed

+7
-2
lines changed

packages/scaffold/src/partials/w3m-all-wallets-list/index.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ interface AllWalletsListProps {
2828
}
2929

3030
export function AllWalletsList({ columns, itemWidth, onItemPress }: AllWalletsListProps) {
31-
const [loading, setLoading] = useState<boolean>(false);
31+
const [loading, setLoading] = useState<boolean>(ApiController.state.wallets.length === 0);
3232
const [loadingError, setLoadingError] = useState<boolean>(false);
3333
const [pageLoading, setPageLoading] = useState<boolean>(false);
3434
const { maxWidth, padding } = useCustomDimensions();
@@ -115,7 +115,12 @@ export function AllWalletsList({ columns, itemWidth, onItemPress }: AllWalletsLi
115115

116116
const fetchNextPage = async () => {
117117
try {
118-
if (walletList.length < ApiController.state.count && !pageLoading) {
118+
if (
119+
walletList.length < ApiController.state.count &&
120+
!pageLoading &&
121+
!loading &&
122+
ApiController.state.page > 0
123+
) {
119124
setPageLoading(true);
120125
await ApiController.fetchWallets({ page: ApiController.state.page + 1 });
121126
setPageLoading(false);

0 commit comments

Comments
 (0)