From 46b7b036399d8c8cd02728451b53714d37baace9 Mon Sep 17 00:00:00 2001
From: ignaciosantise <25931366+ignaciosantise@users.noreply.github.com>
Date: Thu, 27 Mar 2025 14:56:03 -0300
Subject: [PATCH 1/2] fix: check loaders before loading new page of wallets

---
 .../scaffold/src/partials/w3m-all-wallets-list/index.tsx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/scaffold/src/partials/w3m-all-wallets-list/index.tsx b/packages/scaffold/src/partials/w3m-all-wallets-list/index.tsx
index ebb806a8c..d2d6040a4 100644
--- a/packages/scaffold/src/partials/w3m-all-wallets-list/index.tsx
+++ b/packages/scaffold/src/partials/w3m-all-wallets-list/index.tsx
@@ -28,7 +28,7 @@ interface AllWalletsListProps {
 }
 
 export function AllWalletsList({ columns, itemWidth, onItemPress }: AllWalletsListProps) {
-  const [loading, setLoading] = useState<boolean>(false);
+  const [loading, setLoading] = useState<boolean>(ApiController.state.wallets.length === 0);
   const [loadingError, setLoadingError] = useState<boolean>(false);
   const [pageLoading, setPageLoading] = useState<boolean>(false);
   const { maxWidth, padding } = useCustomDimensions();
@@ -115,7 +115,12 @@ export function AllWalletsList({ columns, itemWidth, onItemPress }: AllWalletsLi
 
   const fetchNextPage = async () => {
     try {
-      if (walletList.length < ApiController.state.count && !pageLoading) {
+      if (
+        walletList.length < ApiController.state.count &&
+        !pageLoading &&
+        !loading &&
+        ApiController.state.page > 0
+      ) {
         setPageLoading(true);
         await ApiController.fetchWallets({ page: ApiController.state.page + 1 });
         setPageLoading(false);

From c75e94ae97d2e7b5017a2fa879a58fb1d3a03821 Mon Sep 17 00:00:00 2001
From: ignaciosantise <25931366+ignaciosantise@users.noreply.github.com>
Date: Thu, 27 Mar 2025 15:13:48 -0300
Subject: [PATCH 2/2] chore: added changeset

---
 .changeset/two-bikes-wave.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 .changeset/two-bikes-wave.md

diff --git a/.changeset/two-bikes-wave.md b/.changeset/two-bikes-wave.md
new file mode 100644
index 000000000..0182cbbbb
--- /dev/null
+++ b/.changeset/two-bikes-wave.md
@@ -0,0 +1,18 @@
+---
+'@reown/appkit-scaffold-react-native': patch
+'@reown/appkit-ethers5-react-native': patch
+'@reown/appkit-common-react-native': patch
+'@reown/appkit-ethers-react-native': patch
+'@reown/appkit-wagmi-react-native': patch
+'@reown/appkit-core-react-native': patch
+'@reown/appkit-siwe-react-native': patch
+'@reown/appkit-ui-react-native': patch
+'@reown/appkit-auth-ethers-react-native': patch
+'@reown/appkit-auth-wagmi-react-native': patch
+'@reown/appkit-coinbase-ethers-react-native': patch
+'@reown/appkit-coinbase-wagmi-react-native': patch
+'@reown/appkit-scaffold-utils-react-native': patch
+'@reown/appkit-wallet-react-native': patch
+---
+
+fix: solved issue with wallet page loaders