Refactor wallet handling to use DbWalletWithLegacy type

- Updated wallet construction logic across multiple components and hooks to utilize the DbWalletWithLegacy type for improved type safety.
- Enhanced proxy data validation checks to ensure consistent handling of proxy-related logic.
- Adjusted API routes to accommodate the new type, ensuring compatibility with existing wallet structures.

Author: QSchlegel

src/components/pages/homepage/wallets/new-wallet-flow/ready/index.tsx

@@ -20,6 +20,7 @@ import { Button } from "@/components/ui/button";
 import ProgressIndicator from "@/components/pages/homepage/wallets/new-wallet-flow/shared/ProgressIndicator";
 import WalletFlowPageLayout from "@/components/pages/homepage/wallets/new-wallet-flow/shared/WalletFlowPageLayout";
 import { buildMultisigWallet } from "@/utils/common";
+import { DbWalletWithLegacy } from "@/types/wallet";
 
 export default function PageSuccessWallet() {
   const router = useRouter();
@@ -36,7 +37,7 @@ export default function PageSuccessWallet() {
   );
 
   // Build wallet with address and other computed fields
-  const wallet = walletData ? buildMultisigWallet(walletData, network) : null;
+  const wallet = walletData ? buildMultisigWallet(walletData as DbWalletWithLegacy, network) : null;
 
   const handleViewWallets = () => {
     setLoading(true);

src/components/pages/wallet/governance/ballot/ballot.tsx

@@ -81,7 +81,7 @@ export default function BallotCard({
   );
 
   // Check if we have valid proxy data (proxy enabled, selected, proxies exist, and selected proxy is found)
-  const hasValidProxy = isProxyEnabled && selectedProxyId && proxies && proxies.length > 0 && proxies.find((p: any) => p.id === selectedProxyId);
+  const hasValidProxy = !!(isProxyEnabled && selectedProxyId && proxies && proxies.length > 0 && proxies.find((p: any) => p.id === selectedProxyId));
 
   // CreateBallot mutation
   const createBallot = api.ballot.create.useMutation();

src/components/pages/wallet/governance/card-info.tsx

@@ -132,7 +132,7 @@ export default function CardInfo({ appWallet, manualUtxos }: { appWallet: Wallet
   }, [isProxyEnabled, selectedProxyId, appWallet?.scriptCbor, network, proxies]);
 
   // Use proxy DRep info only if proxy is enabled AND we have valid proxy data, otherwise use standard DRep info
-  const hasValidProxyData = isProxyEnabled && proxyDrepId && proxies.length > 0 && proxies.find(p => p.id === selectedProxyId);
+  const hasValidProxyData = !!(isProxyEnabled && proxyDrepId && proxies.length > 0 && proxies.find(p => p.id === selectedProxyId));
   const displayDrepId = hasValidProxyData ? proxyDrepId : currentDrepId;
   const displayDrepInfo = hasValidProxyData ? proxyDrepInfo : currentDrepInfo;
 

src/components/pages/wallet/governance/drep/registerDrep.tsx

@@ -45,7 +45,7 @@ export default function RegisterDRep() {
   );
 
   // Check if we have valid proxy data (proxy enabled, selected, proxies exist, and selected proxy is found)
-  const hasValidProxy = isProxyEnabled && selectedProxyId && proxies && proxies.length > 0 && proxies.find((p: any) => p.id === selectedProxyId);
+  const hasValidProxy = !!(isProxyEnabled && selectedProxyId && proxies && proxies.length > 0 && proxies.find((p: any) => p.id === selectedProxyId));
 
   const [manualUtxos, setManualUtxos] = useState<UTxO[]>([]);
   const [formState, setFormState] = useState({

src/components/pages/wallet/governance/drep/retire.tsx

@@ -38,7 +38,7 @@ export default function Retire({ appWallet, manualUtxos }: { appWallet: Wallet;
   );
 
   // Check if we have valid proxy data (proxy enabled, selected, proxies exist, and selected proxy is found)
-  const hasValidProxy = isProxyEnabled && selectedProxyId && proxies && proxies.length > 0 && proxies.find((p: any) => p.id === selectedProxyId);
+  const hasValidProxy = !!(isProxyEnabled && selectedProxyId && proxies && proxies.length > 0 && proxies.find((p: any) => p.id === selectedProxyId));
 
   // Helper function to get multisig inputs (like in register component)
   const getMsInputs = useCallback(async (): Promise<{ utxos: UTxO[]; walletAddress: string }> => {

src/components/pages/wallet/governance/drep/updateDrep.tsx

@@ -46,7 +46,7 @@ export default function UpdateDRep() {
   );
 
   // Check if we have valid proxy data (proxy enabled, selected, proxies exist, and selected proxy is found)
-  const hasValidProxy = isProxyEnabled && selectedProxyId && proxies && proxies.length > 0 && proxies.find((p: any) => p.id === selectedProxyId);
+  const hasValidProxy = !!(isProxyEnabled && selectedProxyId && proxies && proxies.length > 0 && proxies.find((p: any) => p.id === selectedProxyId));
 
   // Helper function to get multisig inputs (like in register component)
   const getMsInputs = useCallback(async (): Promise<{ utxos: UTxO[]; walletAddress: string }> => {

src/components/pages/wallet/governance/proposal/voteButtton.tsx

@@ -88,7 +88,7 @@ export default function VoteButton({
   );
 
   // Check if we have valid proxy data (proxy enabled, selected, proxies exist, and selected proxy is found)
-  const hasValidProxy = isProxyEnabled && selectedProxyId && proxies && proxies.length > 0 && proxies.find((p: any) => p.id === selectedProxyId);
+  const hasValidProxy = !!(isProxyEnabled && selectedProxyId && proxies && proxies.length > 0 && proxies.find((p: any) => p.id === selectedProxyId));
 
   async function voteProxy() {
     if (!hasValidProxy) {
@@ -120,14 +120,14 @@ export default function VoteButton({
       );
       proxyContract.proxyAddress = proxy.proxyAddress;
 
-      // Prepare vote
-      const vote = {
+      // Prepare vote data
+      const voteData = {
         proposalId,
         voteKind: voteKind,
       };
 
       // Vote using proxy
-      const txBuilderResult = await proxyContract.voteProxyDrep([vote], utxos, multisigWallet?.getScript().address);
+      const txBuilderResult = await proxyContract.voteProxyDrep([voteData], utxos, multisigWallet?.getScript().address);
 
       await newTransaction({
         txBuilder: txBuilderResult,

src/hooks/useAppWallet.ts

@@ -4,6 +4,7 @@ import { buildWallet } from "./common";
 import { useSiteStore } from "@/lib/zustand/site";
 import { useRouter } from "next/router";
 import { useWalletsStore } from "@/lib/zustand/wallets";
+import { DbWalletWithLegacy } from "@/types/wallet";
 
 export default function useAppWallet() {
   const router = useRouter();
@@ -21,7 +22,7 @@ export default function useAppWallet() {
   );
 
   if (wallet) {
-    return { appWallet: buildWallet(wallet, network, walletsUtxos[walletId]), isLoading };
+    return { appWallet: buildWallet(wallet as DbWalletWithLegacy, network, walletsUtxos[walletId]), isLoading };
   }
 
   return { appWallet: undefined, isLoading };

src/hooks/useMultisigWallet.ts

@@ -4,6 +4,7 @@ import { api } from "@/utils/api";
 import { useSiteStore } from "@/lib/zustand/site";
 import { useUserStore } from "@/lib/zustand/user";
 import { buildMultisigWallet } from "./common";
+import { DbWalletWithLegacy } from "@/types/wallet";
 
 export default function useMultisigWallet() {
   const router = useRouter();
@@ -19,7 +20,7 @@ export default function useMultisigWallet() {
     },
   );
   if (wallet) {
-    return { multisigWallet: buildMultisigWallet(wallet, network), wallet, isLoading };
+    return { multisigWallet: buildMultisigWallet(wallet as DbWalletWithLegacy, network), wallet, isLoading };
   }
 
   return { multisigWallet: undefined, wallet: undefined, isLoading };

src/hooks/useUserWallets.ts

@@ -2,6 +2,7 @@ import { useUserStore } from "@/lib/zustand/user";
 import { useSiteStore } from "@/lib/zustand/site";
 import { api } from "@/utils/api";
 import { buildWallet } from "./common";
+import { DbWalletWithLegacy } from "@/types/wallet";
 
 export default function useUserWallets() {
   const network = useSiteStore((state) => state.network);
@@ -17,7 +18,7 @@ export default function useUserWallets() {
 
   if (wallets) {
     _wallets = wallets.map((wallet) => {
-      return buildWallet(wallet, network);
+      return buildWallet(wallet as DbWalletWithLegacy, network);
     });
     return { wallets: _wallets, isLoading };
   }