From 055bc04d22f96164daac818599bcb4a246a5021c Mon Sep 17 00:00:00 2001
From: QSchlegel <quirin.schlegel@icloud.com>
Date: Fri, 12 Dec 2025 15:39:51 +0100
Subject: [PATCH 1/3] Refactor button component and enhance error handling in
 DRep data fetching

- Updated the Button component to use forwardRef and improved type definitions for better integration with ShadcnButton.
- Enhanced error handling in WalletDataLoaderWrapper and DrepOverviewPage to gracefully manage 404 errors when fetching DRep metadata and details.
- Removed unnecessary console logs in various components to clean up the codebase and improve performance.
- Improved wallet balance fetching logic to handle errors more effectively, ensuring a smoother user experience.
---
 src/components/common/button.tsx              |  36 ++-
 .../wallet-data-loader-wrapper.tsx            |   9 +-
 .../homepage/governance/drep/id/index.tsx     |  15 +-
 .../pages/homepage/governance/drep/index.tsx  |  25 +-
 .../pages/homepage/wallets/index.tsx          |   4 -
 .../governance/proposal/voteButtton.tsx       |   8 +-
 .../pages/wallet/governance/proposals.tsx     | 241 +++++-------------
 src/hooks/common.ts                           |  39 ++-
 src/hooks/useUserWallets.ts                   |   8 +-
 src/hooks/useWalletBalances.ts                |  43 +---
 src/utils/common.ts                           |  43 +++-
 src/utils/multisigSDK.ts                      |   3 -
 12 files changed, 204 insertions(+), 270 deletions(-)

diff --git a/src/components/common/button.tsx b/src/components/common/button.tsx
index fd5f5ab1..32c26efe 100644
--- a/src/components/common/button.tsx
+++ b/src/components/common/button.tsx
@@ -1,18 +1,9 @@
 import { Button as ShadcnButton } from "@/components/ui/button";
 import { Loader } from "lucide-react";
-import { useState } from "react";
+import { useState, forwardRef } from "react";
+import type { ButtonProps as ShadcnButtonProps } from "@/components/ui/button";
 
-export default function Button({
-  children,
-  onClick,
-  disabled = false,
-  loading,
-  className,
-  variant,
-  size,
-  asChild,
-  hold,
-}: {
+export interface ButtonProps {
   children: React.ReactNode;
   onClick?: () => void;
   disabled?: boolean;
@@ -30,12 +21,26 @@ export default function Button({
   size?: "default" | "sm" | "lg" | "icon" | null | undefined;
   asChild?: boolean | undefined;
   hold?: number;
-}) {
+}
+
+const Button = forwardRef<HTMLButtonElement, ButtonProps & ShadcnButtonProps>(function Button({
+  children,
+  onClick,
+  disabled = false,
+  loading,
+  className,
+  variant,
+  size,
+  asChild,
+  hold,
+  ...props
+}, ref) {
   const [holding, setHolding] = useState<boolean>(false);
   const [curTime, setCurTime] = useState<number>(0);
 
   return (
     <ShadcnButton
+      ref={ref}
       variant={variant}
       onClick={hold === undefined ? onClick : undefined}
       disabled={disabled}
@@ -61,6 +66,7 @@ export default function Button({
             }
           : undefined
       }
+      {...props}
     >
       {loading && <Loader className="h-4 w-4 animate-spin mr-2" />}
       {children}
@@ -69,4 +75,6 @@ export default function Button({
         ` (Hold for ${Math.round((hold - (Date.now() - curTime)) / 1000)} secs)`}
     </ShadcnButton>
   );
-}
+});
+
+export default Button;
diff --git a/src/components/common/overall-layout/mobile-wrappers/wallet-data-loader-wrapper.tsx b/src/components/common/overall-layout/mobile-wrappers/wallet-data-loader-wrapper.tsx
index 63983655..6421511b 100644
--- a/src/components/common/overall-layout/mobile-wrappers/wallet-data-loader-wrapper.tsx
+++ b/src/components/common/overall-layout/mobile-wrappers/wallet-data-loader-wrapper.tsx
@@ -173,11 +173,14 @@ export default function WalletDataLoaderWrapper({
       );
       if (!drepInfo) throw new Error(`No dRep for ID ${drepids.cip105} found.`);
       setDrepInfo(drepInfo);
-    } catch (err) {
+    } catch (err: any) {
       // DRep not found (404) is expected if DRep hasn't been registered yet
       // This is normal behavior - the DRep ID exists but isn't registered on-chain
+      const is404 = err?.response?.status === 404 || err?.data?.status_code === 404;
+      if (!is404) {
+        console.error(`Error fetching DRep info:`, err);
+      }
       setDrepInfo(undefined);
-      console.log(`DRep not yet registered on-chain (this is normal before registration)`);
     }
   }
 
@@ -194,7 +197,6 @@ export default function WalletDataLoaderWrapper({
 
         // Fetch all proxy data in parallel using the new batch function
         if (proxies.length > 0) {
-          console.log(`WalletDataLoaderWrapper: Fetching data for ${proxies.length} proxies in parallel`);
           await fetchAllProxyData(
             appWallet.id, 
             proxies, 
@@ -202,7 +204,6 @@ export default function WalletDataLoaderWrapper({
             network.toString(),
             false // Use cache to avoid duplicate requests
           );
-          console.log("WalletDataLoaderWrapper: Successfully fetched all proxy data");
         }
       } catch (error) {
         console.error("WalletDataLoaderWrapper: Error fetching proxy data:", error);
diff --git a/src/components/pages/homepage/governance/drep/id/index.tsx b/src/components/pages/homepage/governance/drep/id/index.tsx
index bb54a28b..525c944d 100644
--- a/src/components/pages/homepage/governance/drep/id/index.tsx
+++ b/src/components/pages/homepage/governance/drep/id/index.tsx
@@ -58,14 +58,21 @@ export default function DrepDetailPage() {
         metadata = await blockchainProvider.get(
           `/governance/dreps/${drepId}/metadata/`,
         );
-      } catch {
-        console.warn(`No metadata found for DRep ${drepId}`);
+      } catch (err: any) {
+        // 404 is expected if metadata doesn't exist - silently ignore
+        const is404 = err?.response?.status === 404 || err?.data?.status_code === 404;
+        if (!is404) {
+          console.warn(`No metadata found for DRep ${drepId}:`, err);
+        }
       }
 
       setDrepInfo(details || null);
       setDrepMetadata(metadata || null);
-    } catch (error) {
-      console.error(`Failed to fetch DRep ${drepId} details:`, error);
+    } catch (error: any) {
+      const is404 = error?.response?.status === 404 || error?.data?.status_code === 404;
+      if (!is404) {
+        console.error(`Failed to fetch DRep ${drepId} details:`, error);
+      }
     } finally {
       setLoading(false);
     }
diff --git a/src/components/pages/homepage/governance/drep/index.tsx b/src/components/pages/homepage/governance/drep/index.tsx
index 3988aa03..766e8167 100644
--- a/src/components/pages/homepage/governance/drep/index.tsx
+++ b/src/components/pages/homepage/governance/drep/index.tsx
@@ -85,17 +85,30 @@ export default function DrepOverviewPage() {
       const details: BlockfrostDrepInfo = await blockchainProvider.get(
         `/governance/dreps/${drepId}`,
       );
-      const metadata: BlockfrostDrepMetadata = await blockchainProvider.get(
-        `/governance/dreps/${drepId}/metadata/`,
-      );
+      
+      let metadata: BlockfrostDrepMetadata | null = null;
+      try {
+        metadata = await blockchainProvider.get(
+          `/governance/dreps/${drepId}/metadata/`,
+        );
+      } catch (err: any) {
+        // 404 is expected if metadata doesn't exist - silently ignore
+        const is404 = err?.response?.status === 404 || err?.data?.status_code === 404;
+        if (!is404) {
+          console.warn(`Failed to fetch metadata for DRep ${drepId}:`, err);
+        }
+      }
 
       setDrepList((prevList) =>
         prevList.map((drep) =>
-          drep.details.drep_id === drepId ? { details, metadata } : drep,
+          drep.details.drep_id === drepId ? { details, metadata: metadata || {} } : drep,
         ),
       );
-    } catch (error) {
-      console.error(`Failed to fetch details for DREP ${drepId}:`, error);
+    } catch (error: any) {
+      const is404 = error?.response?.status === 404 || error?.data?.status_code === 404;
+      if (!is404) {
+        console.error(`Failed to fetch details for DREP ${drepId}:`, error);
+      }
     }
   };
 
diff --git a/src/components/pages/homepage/wallets/index.tsx b/src/components/pages/homepage/wallets/index.tsx
index 614abb61..c3c961b1 100644
--- a/src/components/pages/homepage/wallets/index.tsx
+++ b/src/components/pages/homepage/wallets/index.tsx
@@ -82,10 +82,6 @@ export default function PageWallets() {
               .map((wallet) => {
                 const walletBalance = balances[wallet.id] ?? null;
                 const walletLoadingState = loadingStates[wallet.id] ?? "idle";
-                // Debug log
-                if (process.env.NODE_ENV === "development") {
-                  console.log(`Wallet ${wallet.id}: balance=${walletBalance}, loadingState=${walletLoadingState}`);
-                }
                 return (
                   <CardWallet
                     key={wallet.id}
diff --git a/src/components/pages/wallet/governance/proposal/voteButtton.tsx b/src/components/pages/wallet/governance/proposal/voteButtton.tsx
index 58398e82..39de979e 100644
--- a/src/components/pages/wallet/governance/proposal/voteButtton.tsx
+++ b/src/components/pages/wallet/governance/proposal/voteButtton.tsx
@@ -32,7 +32,7 @@ import {
 } from "@/components/ui/dialog";
 import type { BallotType } from "../ballot/ballot";
 import { useBallotModal } from "@/hooks/useBallotModal";
-import { Plus, Info, Lock, FileText, CheckCircle2, ClipboardList } from "lucide-react";
+import { Plus, Info, Lock, FileText, CheckCircle2, Vote } from "lucide-react";
 import { ProposalDetails } from "@/types/governance";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
 
@@ -343,7 +343,7 @@ export default function VoteButton({
   }
 
   return (
-    <div className="flex w-full max-w-sm flex-col items-stretch justify-center space-y-2 sm:space-y-3">
+    <div className="flex w-full flex-col items-stretch justify-center space-y-2 sm:space-y-3">
       {!isProposalActive ? (
         // Inactive proposal state
         <div className="flex flex-col items-center gap-2">
@@ -429,7 +429,7 @@ export default function VoteButton({
               >
                 {isOnAnyBallot ? (
                   <>
-                    <ClipboardList className="h-4 w-4" />
+                    <Vote className="h-4 w-4" />
                     {ballotCount > 0 && (
                       <span className="absolute -top-1 -right-1 h-4 w-4 flex items-center justify-center text-[10px] font-semibold bg-green-500 dark:bg-green-600 text-white rounded-full border-2 border-white dark:border-gray-800">
                         {ballotCount}
@@ -437,7 +437,7 @@ export default function VoteButton({
                     )}
                   </>
                 ) : (
-                  <ClipboardList className="h-4 w-4" />
+                  <Vote className="h-4 w-4" />
                 )}
               </Button>
             </TooltipTrigger>
diff --git a/src/components/pages/wallet/governance/proposals.tsx b/src/components/pages/wallet/governance/proposals.tsx
index 0c26c538..c2a60acd 100644
--- a/src/components/pages/wallet/governance/proposals.tsx
+++ b/src/components/pages/wallet/governance/proposals.tsx
@@ -298,11 +298,43 @@ export default function AllProposals({ appWallet, utxos, selectedBallotId, onSel
           const proposalId = p.tx_hash + "#" + p.cert_index;
           try {
             // Fetch both metadata and details in parallel
+            // 404 for metadata is expected if proposal doesn't have metadata - handle silently
             const [metadata, details] = await Promise.all([
-              blockchainProvider.get(`/governance/proposals/${p.tx_hash}/${p.cert_index}/metadata`),
+              blockchainProvider.get(`/governance/proposals/${p.tx_hash}/${p.cert_index}/metadata`).catch((err: any) => {
+                const is404 = err?.response?.status === 404 || err?.data?.status_code === 404;
+                if (is404) {
+                  return null; // 404 is expected - proposal has no metadata
+                }
+                throw err; // Re-throw non-404 errors
+              }),
               blockchainProvider.get(`/governance/proposals/${p.tx_hash}/${p.cert_index}`).catch(() => null)
             ]);
 
+            // If metadata is null (404), use default structure
+            if (!metadata) {
+              return {
+                key: proposalId,
+                metadata: {
+                  tx_hash: p.tx_hash,
+                  cert_index: Number(p.cert_index),
+                  governance_type: p.governance_type,
+                  hash: "",
+                  url: "",
+                  bytes: "",
+                  json_metadata: {
+                    body: {
+                      title: "Metadata not available",
+                      abstract: "",
+                      motivation: "",
+                      rationale: "",
+                      references: []
+                    }
+                  }
+                },
+                details: details as ProposalDetails | null
+              };
+            }
+
             return {
               key: proposalId,
               metadata: {
@@ -312,7 +344,7 @@ export default function AllProposals({ appWallet, utxos, selectedBallotId, onSel
               details: details as ProposalDetails | null
             };
           } catch (e: any) {
-            // If metadata fetch fails, try to still get details
+            // If metadata fetch fails with non-404 error, try to still get details
             const details = await blockchainProvider.get(`/governance/proposals/${p.tx_hash}/${p.cert_index}`).catch(() => null);
             
             return {
@@ -634,108 +666,7 @@ export default function AllProposals({ appWallet, utxos, selectedBallotId, onSel
                     {/* Expandable Content */}
                     {isExpanded && (
                       <div className="px-3 sm:px-4 pb-3 sm:pb-4 border-t border-gray-200 dark:border-gray-700 pt-3 sm:pt-4 space-y-3 sm:space-y-4">
-                        {/* Proposal Details */}
-                        {isLoadingDetails ? (
-                          <div className="flex items-center gap-2 text-sm text-gray-600 dark:text-gray-400">
-                            <div className="w-4 h-4 border-2 border-blue-300 border-t-blue-600 rounded-full animate-spin"></div>
-                            Loading details...
-                          </div>
-                        ) : details && (
-                          <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-4 sm:gap-6 pb-3 border-b border-gray-200 dark:border-gray-700">
-                            {/* Status */}
-                            {getProposalStatus(details) && (() => {
-                              const status = getProposalStatus(details)!;
-                              const StatusIcon = status.icon;
-                              return (
-                                <div className="space-y-2">
-                                  <div className="flex items-center gap-2">
-                                    <Clock className="h-4 w-4 text-gray-500" />
-                                    <span className="text-xs sm:text-sm font-medium text-gray-700 dark:text-gray-300">Status</span>
-                                  </div>
-                                  <Badge className={`${status.color} flex items-center gap-1.5 w-fit`}>
-                                    <StatusIcon className="h-3 w-3" />
-                                    {status.label}
-                                  </Badge>
-                                </div>
-                              );
-                            })()}
-
-                            {/* Governance Type */}
-                            <div className="space-y-2">
-                              <div className="flex items-center gap-2">
-                                <FileText className="h-4 w-4 text-gray-500" />
-                                <span className="text-xs sm:text-sm font-medium text-gray-700 dark:text-gray-300">Type</span>
-                              </div>
-                              <div className="text-xs sm:text-sm text-gray-600 dark:text-gray-400 capitalize">
-                                {details.governance_type.replace(/_/g, " ")}
-                              </div>
-                            </div>
-
-                            {/* Deposit */}
-                            {details.deposit && (
-                              <div className="space-y-2">
-                                <div className="flex items-center gap-2">
-                                  <Coins className="h-4 w-4 text-gray-500" />
-                                  <span className="text-xs sm:text-sm font-medium text-gray-700 dark:text-gray-300">Deposit</span>
-                                </div>
-                                <div className="text-xs sm:text-sm text-gray-600 dark:text-gray-400">
-                                  {(parseInt(details.deposit) / 1_000_000).toFixed(2)} ADA
-                                </div>
-                              </div>
-                            )}
-
-                            {/* Ratified Epoch */}
-                            {details.ratified_epoch && (
-                              <div className="space-y-2">
-                                <div className="flex items-center gap-2">
-                                  <Calendar className="h-4 w-4 text-gray-500" />
-                                  <span className="text-xs sm:text-sm font-medium text-gray-700 dark:text-gray-300">Ratified Epoch</span>
-                                </div>
-                                <div className="text-xs sm:text-sm text-gray-600 dark:text-gray-400">
-                                  {details.ratified_epoch}
-                                </div>
-                              </div>
-                            )}
-
-                            {/* Enacted Epoch */}
-                            {details.enacted_epoch && (
-                              <div className="space-y-2">
-                                <div className="flex items-center gap-2">
-                                  <CheckCircle2 className="h-4 w-4 text-gray-500" />
-                                  <span className="text-xs sm:text-sm font-medium text-gray-700 dark:text-gray-300">Enacted Epoch</span>
-                                </div>
-                                <div className="text-xs sm:text-sm text-gray-600 dark:text-gray-400">
-                                  {details.enacted_epoch}
-                                </div>
-                              </div>
-                            )}
-
-                            {/* Expiration */}
-                            {details.expiration && (
-                              <div className="space-y-2">
-                                <div className="flex items-center gap-2">
-                                  <Clock className="h-4 w-4 text-gray-500" />
-                                  <span className="text-xs sm:text-sm font-medium text-gray-700 dark:text-gray-300">Expires In</span>
-                                </div>
-                                <div className="text-xs sm:text-sm text-gray-600 dark:text-gray-400">
-                                  {details.expiration} epochs
-                                </div>
-                              </div>
-                            )}
-
-                            {/* Transaction Hash */}
-                            <div className="space-y-2 sm:col-span-2 lg:col-span-1">
-                              <div className="flex items-center gap-2">
-                                <Hash className="h-4 w-4 text-gray-500" />
-                                <span className="text-xs sm:text-sm font-medium text-gray-700 dark:text-gray-300">Transaction</span>
-                              </div>
-                              <div className="text-xs font-mono text-gray-600 dark:text-gray-400 break-all">
-                                {details.tx_hash}
-                              </div>
-                            </div>
-                          </div>
-                        )}
-                        {/* Abstract - only show if not already visible */}
+                        {/* Abstract - Mobile only */}
                         <div>
                           <h4 className="text-xs sm:text-sm font-semibold mb-2 text-gray-700 dark:text-gray-300">Abstract</h4>
                           <div className="text-xs sm:text-sm text-gray-600 dark:text-gray-300 prose prose-sm sm:prose-base max-w-none prose-headings:text-sm sm:prose-headings:text-base prose-p:text-xs sm:prose-p:text-sm prose-p:my-1 sm:prose-p:my-2">
@@ -745,28 +676,6 @@ export default function AllProposals({ appWallet, utxos, selectedBallotId, onSel
                           </div>
                         </div>
 
-                        {/* Only show additional details not already visible */}
-                        {proposal.json_metadata.body.motivation && (
-                          <div>
-                            <h4 className="text-xs sm:text-sm font-semibold mb-2 text-gray-700 dark:text-gray-300">Motivation</h4>
-                            <div className="text-xs sm:text-sm text-gray-600 dark:text-gray-300 prose prose-sm sm:prose-base max-w-none prose-headings:text-sm sm:prose-headings:text-base prose-p:text-xs sm:prose-p:text-sm prose-p:my-1 sm:prose-p:my-2">
-                              <ReactMarkdown remarkPlugins={[remarkGfm]}>
-                                {proposal.json_metadata.body.motivation}
-                              </ReactMarkdown>
-                            </div>
-                          </div>
-                        )}
-                        {proposal.json_metadata.body.rationale && (
-                          <div>
-                            <h4 className="text-xs sm:text-sm font-semibold mb-2 text-gray-700 dark:text-gray-300">Rationale</h4>
-                            <div className="text-xs sm:text-sm text-gray-600 dark:text-gray-300 prose prose-sm sm:prose-base max-w-none prose-headings:text-sm sm:prose-headings:text-base prose-p:text-xs sm:prose-p:text-sm prose-p:my-1 sm:prose-p:my-2">
-                              <ReactMarkdown remarkPlugins={[remarkGfm]}>
-                                {proposal.json_metadata.body.rationale}
-                              </ReactMarkdown>
-                            </div>
-                          </div>
-                        )}
-
                         {/* Voting History */}
                         {vote && (
                           <div className="pb-3 border-b border-gray-200 dark:border-gray-700">
@@ -785,18 +694,18 @@ export default function AllProposals({ appWallet, utxos, selectedBallotId, onSel
                         )}
 
                         {/* Actions */}
-                        <div className="flex flex-col gap-2 pt-2 border-t border-gray-200 dark:border-gray-700">
+                        <div className="flex flex-col gap-3 pt-3 border-t border-gray-200 dark:border-gray-700">
                           <Link
                             href={`/wallets/${appWallet.id}/governance/proposal/${proposal.tx_hash}:${proposal.cert_index}`}
                             className="w-full"
                           >
-                            <Button variant="outline" className="w-full text-sm sm:text-base">
+                            <Button variant="outline" className="w-full text-sm sm:text-base py-2.5">
                               View Full Details
                             </Button>
                           </Link>
                           <Button
                             variant="default"
-                            className="w-full text-sm bg-green-600 hover:bg-green-700 text-white"
+                            className="w-full text-sm bg-green-600 hover:bg-green-700 text-white py-2.5"
                             onClick={() => {
                               setCurrentProposal(proposalId, proposal.json_metadata.body.title);
                               openModal();
@@ -805,16 +714,14 @@ export default function AllProposals({ appWallet, utxos, selectedBallotId, onSel
                             <Plus className="mr-2 h-4 w-4" />
                             Add to Ballot
                           </Button>
-                          <div className="flex justify-center">
-                            <VoteButton
-                              utxos={utxos}
-                              appWallet={appWallet}
-                              proposalId={proposalId}
-                              proposalTitle={proposal.json_metadata.body.title}
-                              selectedBallotId={selectedBallotId}
-                              proposalDetails={details}
-                            />
-                          </div>
+                          <VoteButton
+                            utxos={utxos}
+                            appWallet={appWallet}
+                            proposalId={proposalId}
+                            proposalTitle={proposal.json_metadata.body.title}
+                            selectedBallotId={selectedBallotId}
+                            proposalDetails={details}
+                          />
                         </div>
                       </div>
                     )}
@@ -960,15 +867,24 @@ function ProposalRow({
           </div>
         </TableCell>
         <TableCell className="py-3 sm:py-4 w-[15%] align-top" onClick={(e) => e.stopPropagation()}>
-          <div className="flex flex-col items-center gap-2 min-w-0">
-            <VoteButton
-              utxos={utxos}
-              appWallet={appWallet}
-              proposalId={proposalId}
-              proposalTitle={proposal.json_metadata.body.title}
-              selectedBallotId={selectedBallotId}
-              proposalDetails={details}
-            />
+          <div className="flex flex-col items-end gap-2.5 min-w-0">
+            {/* Voting Status Indicator */}
+            {voteDisplay && (
+              <div className="flex justify-end">
+                <VoteBadge voteKind={voteDisplay} />
+              </div>
+            )}
+            {/* Action Buttons - Right-aligned for table */}
+            <div className="flex flex-col items-end gap-2">
+              <VoteButton
+                utxos={utxos}
+                appWallet={appWallet}
+                proposalId={proposalId}
+                proposalTitle={proposal.json_metadata.body.title}
+                selectedBallotId={selectedBallotId}
+                proposalDetails={details}
+              />
+            </div>
           </div>
         </TableCell>
       </TableRow>
@@ -984,24 +900,6 @@ function ProposalRow({
                 </div>
               ) : details && (
                 <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-4 sm:gap-6 pb-3 border-b border-gray-200 dark:border-gray-700">
-                  {/* Status */}
-                  {getProposalStatus(details) && (() => {
-                    const status = getProposalStatus(details)!;
-                    const StatusIcon = status.icon;
-                    return (
-                      <div className="space-y-2">
-                        <div className="flex items-center gap-2">
-                          <Clock className="h-4 w-4 text-gray-500" />
-                          <span className="text-xs sm:text-sm font-medium text-gray-700 dark:text-gray-300">Status</span>
-                        </div>
-                        <Badge className={`${status.color} flex items-center gap-1.5 w-fit`}>
-                          <StatusIcon className="h-3 w-3" />
-                          {status.label}
-                        </Badge>
-                      </div>
-                    );
-                  })()}
-
                   {/* Governance Type */}
                   <div className="space-y-2">
                     <div className="flex items-center gap-2">
@@ -1089,16 +987,7 @@ function ProposalRow({
                   </div>
                 </div>
               )}
-              {/* Show full abstract in expanded view */}
-              <div>
-                <h4 className="text-sm font-semibold mb-2 text-gray-700 dark:text-gray-300">Abstract</h4>
-                <div className="text-sm text-gray-600 dark:text-gray-400 prose prose-sm max-w-none">
-                  <ReactMarkdown remarkPlugins={[remarkGfm]}>
-                    {proposal.json_metadata.body.abstract}
-                  </ReactMarkdown>
-                </div>
-              </div>
-              <div className="pt-2 border-t border-gray-200 dark:border-gray-700 flex flex-col sm:flex-row gap-2">
+              <div className="flex flex-col sm:flex-row gap-2">
                 <Button
                   variant="default"
                   className="w-full sm:w-auto text-sm bg-green-600 hover:bg-green-700 text-white"
diff --git a/src/hooks/common.ts b/src/hooks/common.ts
index 8cdf67cc..0bbbbb55 100644
--- a/src/hooks/common.ts
+++ b/src/hooks/common.ts
@@ -34,7 +34,9 @@ export function buildMultisigWallet(
             name: wallet.signersDescriptions[i] || "",
           });
         } catch (e) {
-          console.warn(`Invalid payment address at index ${i}:`, addr);
+          if (process.env.NODE_ENV === "development") {
+            console.warn(`Invalid payment address at index ${i}:`, addr);
+          }
         }
       }
     });
@@ -88,6 +90,10 @@ export function buildWallet(
   network: number,
   utxos?: UTxO[],
 ): Wallet {
+  if (!wallet) {
+    throw new Error("buildWallet: wallet is required");
+  }
+
   // For wallets with rawImportBodies, use stored values instead of deriving
   if (wallet.rawImportBodies?.multisig) {
     const multisig = wallet.rawImportBodies.multisig;
@@ -142,14 +148,33 @@ export function buildWallet(
     throw new Error("Failed to build Multisig Wallet");
   }
 
+  const validScripts = wallet.signersAddresses
+    .filter((addr) => addr) // Filter out null/undefined addresses
+    .map((addr) => {
+      try {
+        return {
+          type: "sig" as const,
+          keyHash: resolvePaymentKeyHash(addr!),
+        };
+        } catch (e) {
+          if (process.env.NODE_ENV === "development") {
+            console.warn(`Invalid payment address in buildWallet:`, addr);
+          }
+          return null;
+        }
+    })
+    .filter((script): script is { type: "sig"; keyHash: string } => script !== null);
+
+  if (validScripts.length === 0) {
+    console.error("buildWallet: No valid payment addresses found");
+    throw new Error("Failed to build wallet: No valid payment addresses");
+  }
+
   const nativeScript = {
-    type: wallet.type ? wallet.type : "atLeast",
-    scripts: wallet.signersAddresses.map((addr) => ({
-      type: "sig",
-      keyHash: resolvePaymentKeyHash(addr),
-    })),
+    type: (wallet.type as "all" | "any" | "atLeast") || "atLeast",
+    scripts: validScripts,
   };
-  if (nativeScript.type == "atLeast") {
+  if (nativeScript.type === "atLeast") {
     //@ts-ignore
     nativeScript.required = wallet.numRequiredSigners!;
   }
diff --git a/src/hooks/useUserWallets.ts b/src/hooks/useUserWallets.ts
index 1f5aff9c..b5f49a03 100644
--- a/src/hooks/useUserWallets.ts
+++ b/src/hooks/useUserWallets.ts
@@ -17,9 +17,11 @@ export default function useUserWallets() {
   let _wallets = wallets;
 
   if (wallets) {
-    _wallets = wallets.map((wallet) => {
-      return buildWallet(wallet as DbWalletWithLegacy, network);
-    });
+    _wallets = wallets
+      .filter((wallet): wallet is DbWalletWithLegacy => wallet != null)
+      .map((wallet) => {
+        return buildWallet(wallet, network);
+      });
     return { wallets: _wallets, isLoading };
   }
 
diff --git a/src/hooks/useWalletBalances.ts b/src/hooks/useWalletBalances.ts
index 2f83015e..b8d2c7ed 100644
--- a/src/hooks/useWalletBalances.ts
+++ b/src/hooks/useWalletBalances.ts
@@ -68,14 +68,10 @@ export default function useWalletBalances(
         const addressNetwork = addressToNetwork(walletAddress);
         const provider = getProvider(addressNetwork);
 
-        console.log(`Fetching balance for wallet ${wallet.id} (${walletAddress.slice(0, 20)}...)`);
-
         // Fetch address info using Blockfrost API
         // This returns an object with an 'amount' array containing assets
         const addressInfo = await provider.get(`/addresses/${walletAddress}/`);
 
-        console.log(`Fetched address info for wallet ${wallet.id}`, addressInfo);
-
         // Calculate balance from assets
         // Blockfrost returns { amount: [{ unit: string, quantity: string }] }
         let balance = 0;
@@ -87,22 +83,20 @@ export default function useWalletBalances(
             const lovelaceAmount = parseInt(lovelaceAsset.quantity);
             balance = lovelaceAmount / 1000000;
             balance = Math.round(balance * 100) / 100;
-            console.log(`Found lovelace asset: ${lovelaceAmount} lovelace = ${balance} ADA`);
-          } else {
-            console.log(`No lovelace asset found in address info for wallet ${wallet.id}`);
           }
-        } else {
-          console.warn(`Invalid address info format for wallet ${wallet.id}:`, addressInfo);
         }
 
-        console.log(`Final balance for wallet ${wallet.id}: ${balance} ADA`);
-
         // Update state
         setBalances((prev) => ({ ...prev, [wallet.id]: balance }));
         setLoadingStates((prev) => ({ ...prev, [wallet.id]: "loaded" }));
         fetchedWalletsRef.current.add(wallet.id);
-      } catch (error) {
-        console.error(`Error fetching balance for wallet ${wallet.id}:`, error);
+      } catch (error: any) {
+        // Handle 404 errors gracefully (address doesn't exist yet - this is normal)
+        const is404 = error?.response?.status === 404 || error?.data?.status_code === 404;
+        if (!is404) {
+          // Only log non-404 errors
+          console.error(`Error fetching balance for wallet ${wallet.id}:`, error);
+        }
         setBalances((prev) => ({ ...prev, [wallet.id]: null }));
         setLoadingStates((prev) => ({ ...prev, [wallet.id]: "error" }));
         fetchedWalletsRef.current.add(wallet.id); // Mark as attempted to avoid retries
@@ -113,17 +107,14 @@ export default function useWalletBalances(
 
   const processQueue = useCallback(async () => {
     if (processingRef.current) {
-      console.log("Queue processing already in progress");
       return;
     }
 
     if (queueRef.current.length === 0) {
-      console.log("Queue is empty, stopping fetch");
       setIsFetching(false);
       return;
     }
 
-    console.log(`Starting to process ${queueRef.current.length} wallets`);
     processingRef.current = true;
     setIsFetching(true);
 
@@ -140,11 +131,9 @@ export default function useWalletBalances(
 
         // Skip if already fetched
         if (fetchedWalletsRef.current.has(wallet.id)) {
-          console.log(`Skipping wallet ${wallet.id} - already fetched`);
           continue;
         }
 
-        console.log(`Processing wallet ${wallet.id} from queue`);
         await fetchWalletBalance(wallet);
 
         // Cooldown between requests (except for the last one)
@@ -152,7 +141,8 @@ export default function useWalletBalances(
           await new Promise((resolve) => setTimeout(resolve, cooldownMs));
         }
       }
-      console.log("Finished processing queue");
+    } catch (error) {
+      console.error("Error processing balance queue:", error);
     } finally {
       processingRef.current = false;
       setIsFetching(queueRef.current.length > 0);
@@ -162,18 +152,14 @@ export default function useWalletBalances(
   useEffect(() => {
     // Wait for wallets to be available
     if (!wallets) {
-      console.log("Wallets not yet loaded, waiting...");
       return;
     }
 
     if (wallets.length === 0) {
-      console.log("No wallets provided to useWalletBalances");
       setIsFetching(false);
       return;
     }
 
-    console.log(`useWalletBalances effect: ${wallets.length} wallets provided`);
-
     // Create a stable reference to wallet IDs for comparison
     const walletIds = wallets.map((w) => w.id).sort().join(",");
 
@@ -182,17 +168,14 @@ export default function useWalletBalances(
 
     // On first load (refresh), clear the fetched wallets set so we refetch balances
     if (isFirstLoad) {
-      console.log("First load detected, clearing fetched wallets cache");
       fetchedWalletsRef.current.clear();
       initializedWalletsRef.current.clear();
     }
 
     // Only process if wallet IDs have actually changed OR if this is the first load
     if (!isFirstLoad && walletIds === lastWalletIdsRef.current) {
-      console.log("Wallet IDs unchanged, checking if queue needs processing");
       // Wallets haven't changed, but check if we need to continue processing
       if (!processingRef.current && queueRef.current.length > 0) {
-        console.log("Resuming queue processing");
         processQueue().catch((error) => {
           console.error("Error processing balance queue:", error);
           processingRef.current = false;
@@ -202,7 +185,6 @@ export default function useWalletBalances(
       return;
     }
 
-    console.log(isFirstLoad ? "First load, processing wallets" : "Wallet IDs changed, processing new wallets");
     lastWalletIdsRef.current = walletIds;
 
     // Filter out wallets that have already been fetched
@@ -210,8 +192,6 @@ export default function useWalletBalances(
       (wallet) => !fetchedWalletsRef.current.has(wallet.id),
     );
 
-    console.log(`${walletsToFetch.length} wallets need balance fetching`);
-
     if (walletsToFetch.length === 0) {
       setIsFetching(false);
       return;
@@ -231,18 +211,13 @@ export default function useWalletBalances(
       queueRef.current.push(wallet);
     });
 
-    console.log(`Added ${walletsToFetch.length} wallets to queue. Queue length: ${queueRef.current.length}`);
-
     // Start processing if not already processing
     if (!processingRef.current) {
-      console.log("Starting queue processing");
       processQueue().catch((error) => {
         console.error("Error processing balance queue:", error);
         processingRef.current = false;
         setIsFetching(false);
       });
-    } else {
-      console.log("Queue processing already in progress, skipping");
     }
 
     // Cleanup on unmount
diff --git a/src/utils/common.ts b/src/utils/common.ts
index 887615aa..783a8965 100644
--- a/src/utils/common.ts
+++ b/src/utils/common.ts
@@ -26,10 +26,6 @@ export function buildMultisigWallet(
     return undefined;
   }
 
-  console.log(
-    "buildMultisigWallet - stakeCredentialHash",
-    wallet.stakeCredentialHash,
-  );
 
   const keys: MultisigKey[] = [];
   if (wallet.signersAddresses.length > 0) {
@@ -44,7 +40,9 @@ export function buildMultisigWallet(
             name: wallet.signersDescriptions[i] || "",
           });
         } catch (e) {
-          console.warn(`Invalid payment address at index ${i}:`, addr);
+          if (process.env.NODE_ENV === "development") {
+            console.warn(`Invalid payment address at index ${i}:`, addr);
+          }
         }
       }
     });
@@ -90,6 +88,10 @@ export function buildWallet(
   network: number,
   utxos?: UTxO[],
 ): Wallet {
+  if (!wallet) {
+    throw new Error("buildWallet: wallet is required");
+  }
+
   // For wallets with rawImportBodies, use stored values instead of deriving
   if (wallet.rawImportBodies?.multisig) {
     const multisig = wallet.rawImportBodies.multisig;
@@ -146,14 +148,33 @@ export function buildWallet(
 
   //depricated -> only payment-script left in for compatibility
   //Remove later when refactoring
+  const validScripts = wallet.signersAddresses
+    .filter((addr) => addr) // Filter out null/undefined addresses
+    .map((addr) => {
+      try {
+        return {
+          type: "sig" as const,
+          keyHash: resolvePaymentKeyHash(addr!),
+        };
+        } catch (e) {
+          if (process.env.NODE_ENV === "development") {
+            console.warn(`Invalid payment address in buildWallet:`, addr);
+          }
+          return null;
+        }
+    })
+    .filter((script): script is { type: "sig"; keyHash: string } => script !== null);
+
+  if (validScripts.length === 0) {
+    console.error("buildWallet: No valid payment addresses found");
+    throw new Error("Failed to build wallet: No valid payment addresses");
+  }
+
   const nativeScript = {
-    type: wallet.type ? wallet.type : "atLeast",
-    scripts: wallet.signersAddresses.map((addr) => ({
-      type: "sig",
-      keyHash: resolvePaymentKeyHash(addr),
-    })),
+    type: (wallet.type as "all" | "any" | "atLeast") || "atLeast",
+    scripts: validScripts,
   };
-  if (nativeScript.type == "atLeast") {
+  if (nativeScript.type === "atLeast") {
     //@ts-ignore
     nativeScript.required = wallet.numRequiredSigners!;
   }
diff --git a/src/utils/multisigSDK.ts b/src/utils/multisigSDK.ts
index b9b89e47..2d7d2d8b 100644
--- a/src/utils/multisigSDK.ts
+++ b/src/utils/multisigSDK.ts
@@ -520,9 +520,6 @@ export class MultisigWallet {
     const paymentKeys = this.getKeysByRole(0);
     const dRepKeys = this.getKeysByRole(3);
     if (!paymentKeys || !dRepKeys || dRepKeys.length === 0) return false;
-    console.log(
-      `Governance enabled: ${dRepKeys.length} dRep keys and ${paymentKeys.length} payment keys`
-    );
     return dRepKeys.length === paymentKeys.length;
   }
 

From 93e40909112aafd6d5dee35f5078b4e5c22c0335 Mon Sep 17 00:00:00 2001
From: QSchlegel <quirin.schlegel@icloud.com>
Date: Fri, 12 Dec 2025 16:50:11 +0100
Subject: [PATCH 2/3] Update DrepOverviewPage to handle nullable metadata

- Modified the DrepOverviewPage component to allow metadata to be null, enhancing type safety and preventing potential runtime errors.
- Adjusted the initial state and data mapping logic to accommodate the new nullable metadata structure.
---
 src/components/pages/homepage/governance/drep/index.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/pages/homepage/governance/drep/index.tsx b/src/components/pages/homepage/governance/drep/index.tsx
index 766e8167..5c7360a8 100644
--- a/src/components/pages/homepage/governance/drep/index.tsx
+++ b/src/components/pages/homepage/governance/drep/index.tsx
@@ -13,7 +13,7 @@ import ScriptIndicator from "./scriptIndicator";
 
 export default function DrepOverviewPage() {
   const [drepList, setDrepList] = useState<
-    Array<{ details: BlockfrostDrepInfo; metadata: BlockfrostDrepMetadata }>
+    Array<{ details: BlockfrostDrepInfo; metadata: BlockfrostDrepMetadata | null }>
   >([]);
   const [loading, setLoading] = useState<boolean>(true);
   const { wallet, connected } = useWallet();
@@ -54,7 +54,7 @@ export default function DrepOverviewPage() {
         if (response) {
           const initialList = response.map((drep: BlockfrostDrepInfo) => ({
             details: { ...drep },
-            metadata: {},
+            metadata: null,
           }));
   
           setDrepList(initialList);
@@ -101,7 +101,7 @@ export default function DrepOverviewPage() {
 
       setDrepList((prevList) =>
         prevList.map((drep) =>
-          drep.details.drep_id === drepId ? { details, metadata: metadata || {} } : drep,
+          drep.details.drep_id === drepId ? { details, metadata: metadata || null } : drep,
         ),
       );
     } catch (error: any) {

From fd1703a8e13ea1d38a0bacfaf51011a7b1cab0f2 Mon Sep 17 00:00:00 2001
From: QSchlegel <quirin.schlegel@icloud.com>
Date: Fri, 12 Dec 2025 16:53:35 +0100
Subject: [PATCH 3/3] Improve error logging in DrepDetailPage for better
 debugging

- Updated console warning and error messages to use formatted strings for clearer output, enhancing the debugging process when metadata is not found or fetching details fails.
---
 src/components/pages/homepage/governance/drep/id/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/pages/homepage/governance/drep/id/index.tsx b/src/components/pages/homepage/governance/drep/id/index.tsx
index 525c944d..d2050b42 100644
--- a/src/components/pages/homepage/governance/drep/id/index.tsx
+++ b/src/components/pages/homepage/governance/drep/id/index.tsx
@@ -62,7 +62,7 @@ export default function DrepDetailPage() {
         // 404 is expected if metadata doesn't exist - silently ignore
         const is404 = err?.response?.status === 404 || err?.data?.status_code === 404;
         if (!is404) {
-          console.warn(`No metadata found for DRep ${drepId}:`, err);
+          console.warn("No metadata found for DRep %s:", drepId, err);
         }
       }
 
@@ -71,7 +71,7 @@ export default function DrepDetailPage() {
     } catch (error: any) {
       const is404 = error?.response?.status === 404 || error?.data?.status_code === 404;
       if (!is404) {
-        console.error(`Failed to fetch DRep ${drepId} details:`, error);
+        console.error("Failed to fetch DRep %s details:", drepId, error);
       }
     } finally {
       setLoading(false);