Skip to content

Commit 8ade61a

Browse files
Merge pull request #331 from reown-com/fix/wallet-list
fix: check loaders before loading new page of wallets
2 parents 9ba983e + c75e94a commit 8ade61a

File tree

2 files changed

+25
-2
lines changed

2 files changed

+25
-2
lines changed

.changeset/two-bikes-wave.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
'@reown/appkit-scaffold-react-native': patch
3+
'@reown/appkit-ethers5-react-native': patch
4+
'@reown/appkit-common-react-native': patch
5+
'@reown/appkit-ethers-react-native': patch
6+
'@reown/appkit-wagmi-react-native': patch
7+
'@reown/appkit-core-react-native': patch
8+
'@reown/appkit-siwe-react-native': patch
9+
'@reown/appkit-ui-react-native': patch
10+
'@reown/appkit-auth-ethers-react-native': patch
11+
'@reown/appkit-auth-wagmi-react-native': patch
12+
'@reown/appkit-coinbase-ethers-react-native': patch
13+
'@reown/appkit-coinbase-wagmi-react-native': patch
14+
'@reown/appkit-scaffold-utils-react-native': patch
15+
'@reown/appkit-wallet-react-native': patch
16+
---
17+
18+
fix: solved issue with wallet page loaders

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)