Fix Overview and WalletSelect when backend is down (#700)

zeriontech · Jan 23, 2025 · 39b36cf · 39b36cf
1 parent 4781e10
commit 39b36cf
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/src/ui/features/xp-drop/components/XpDropBanner/XpDropBanner.tsx b/src/ui/features/xp-drop/components/XpDropBanner/XpDropBanner.tsx
@@ -17,6 +17,7 @@ export function XpDropBanner({ address }: { address: string }) {
   const { data: walletsMeta } = useWalletsMetaByChunks({
     addresses: [address],
     suspense: false,
+    useErrorBoundary: false,
   });
 
   const walletMeta = walletsMeta?.[0];

diff --git a/src/ui/pages/History/ActionsList/ActionsList.tsx b/src/ui/pages/History/ActionsList/ActionsList.tsx
@@ -55,7 +55,7 @@ export function ActionsList({
                 const hash = addressAction.transaction.hash;
                 return {
                   key: isLocalAddressAction(addressAction)
-                    ? addressAction.relatedTransaction || hash
+                    ? `local-${addressAction.relatedTransaction || hash}`
                     : hash,
                   component: (
                     <ActionItem

diff --git a/src/ui/pages/WalletSelect/WalletSelect.tsx b/src/ui/pages/WalletSelect/WalletSelect.tsx
@@ -108,7 +108,10 @@ export function WalletSelect() {
   );
 
   const { data: walletsMeta, isLoading: isLoadingWalletsMeta } =
-    useWalletsMetaByChunks({ addresses: ownedAddresses });
+    useWalletsMetaByChunks({
+      addresses: ownedAddresses,
+      useErrorBoundary: false,
+    });
 
   const ownedAddressesCount = ownedAddresses.length;
 

diff --git a/src/ui/shared/requests/useWalletsMetaByChunks.ts b/src/ui/shared/requests/useWalletsMetaByChunks.ts
@@ -5,15 +5,18 @@ export function useWalletsMetaByChunks({
   addresses,
   enabled = true,
   suspense = true,
+  useErrorBoundary = true,
 }: {
   addresses: string[];
   enabled?: boolean;
   suspense?: boolean;
+  useErrorBoundary?: boolean;
 }) {
   return useQuery({
     enabled: enabled && addresses.length > 0,
     queryKey: ['ZerionAPI.getWalletsMetaByChunks', addresses],
     queryFn: () => ZerionAPI.getWalletsMetaByChunks(addresses),
     suspense,
+    useErrorBoundary,
   });
 }