Merge pull request #117 from MeshJS/bug/GA

QSchlegel · web-flow · commit a2be30cecebc · 2025-07-10T10:26:21.000+02:00
fix and ad utxo blocking
diff --git a/src/components/pages/wallet/governance/index.tsx b/src/components/pages/wallet/governance/index.tsx
@@ -27,8 +27,8 @@ export default function PageGovernance() {
     <main className="flex flex-1 flex-col gap-4 p-4 md:gap-8 md:p-8">
       <div className="grid gap-4 md:grid-cols-2 lg:grid-cols-3">
         <CardInfo appWallet={appWallet} />
-        <AllProposals appWallet={appWallet} />
-        <VoteCard appWallet={appWallet} />
+        <AllProposals appWallet={appWallet} utxos={manualUtxos} />
+        <VoteCard appWallet={appWallet} utxos={manualUtxos} />
         <ClarityCard appWallet={appWallet} />
         <div className="flex flex-col gap-4 col-span-2">
           {appWallet && (
@@ -41,12 +41,14 @@ export default function PageGovernance() {
               }}
             />
           )}
-          <VoteCC
-            manualUtxos={manualUtxos}
-            manualSelected={manualSelected}
-            appWallet={appWallet}
-            network={network}
-          />
+          {false && (
+            <VoteCC
+              manualUtxos={manualUtxos}
+              manualSelected={manualSelected}
+              appWallet={appWallet}
+              network={network}
+            />
+          )}
         </div>
       </div>
     </main>
diff --git a/src/components/pages/wallet/governance/proposal/index.tsx b/src/components/pages/wallet/governance/proposal/index.tsx
@@ -9,15 +9,23 @@ import Button from "@/components/common/button";
 import { useWalletsStore } from "@/lib/zustand/wallets";
 import useAppWallet from "@/hooks/useAppWallet";
 import VoteCard from "../vote-card";
+import { UTxO } from "@meshsdk/core";
+import UTxOSelector from "../../new-transaction/utxoSelector";
 
-export default function WalletGovernanceProposal({ id }: { id: string }) {
+export default function WalletGovernanceProposal({
+  id,
+}: {
+  id: string;
+}) {
   const network = useSiteStore((state) => state.network);
   const [proposalMetadata, setProposalMetadata] = useState<
     ProposalMetadata | undefined
   >(undefined);
   const drepInfo = useWalletsStore((state) => state.drepInfo);
   const { appWallet } = useAppWallet();
   const loading = useSiteStore((state) => state.loading);
+  const [manualUtxos, setManualUtxos] = useState<UTxO[]>([]);
+  const [manualSelected, setManualSelected] = useState(false);
 
   useEffect(() => {
     const blockchainProvider = getProvider(network);
@@ -34,7 +42,6 @@ export default function WalletGovernanceProposal({ id }: { id: string }) {
     get();
   }, []);
 
-
   if (!proposalMetadata) return <></>;
 
   return (
@@ -91,7 +98,23 @@ export default function WalletGovernanceProposal({ id }: { id: string }) {
           allowOverflow={true}
         />
       </CardUI>
-      {appWallet && <VoteCard appWallet={appWallet} proposalId={`${proposalMetadata.tx_hash}#${proposalMetadata.cert_index}`}/>}
+      {appWallet && (
+        <UTxOSelector
+          appWallet={appWallet}
+          network={network}
+          onSelectionChange={(utxos, manual) => {
+            setManualUtxos(utxos);
+            setManualSelected(manual);
+          }}
+        />
+      )}
+      {appWallet && (
+        <VoteCard
+          appWallet={appWallet}
+          utxos={manualUtxos}
+          proposalId={`${proposalMetadata.tx_hash}#${proposalMetadata.cert_index}`}
+        />
+      )}
     </main>
   );
 }
diff --git a/src/components/pages/wallet/governance/proposal/voteButtton.tsx b/src/components/pages/wallet/governance/proposal/voteButtton.tsx
@@ -4,7 +4,7 @@ import { useSiteStore } from "@/lib/zustand/site";
 import { getTxBuilder } from "@/utils/get-tx-builder";
 import { getProvider } from "@/utils/get-provider";
 import useTransaction from "@/hooks/useTransaction";
-import { keepRelevant, Quantity, Unit } from "@meshsdk/core";
+import { keepRelevant, Quantity, Unit, UTxO } from "@meshsdk/core";
 import { Wallet } from "@/types/wallet";
 import { useWalletsStore } from "@/lib/zustand/wallets";
 import { useToast } from "@/hooks/use-toast";
@@ -24,13 +24,15 @@ interface VoteButtonProps {
   proposalId: string;
   description?: string;
   metadata?: string;
+  utxos: UTxO[];
 }
 
 export default function VoteButton({
   appWallet,
   proposalId,
   description = "",
   metadata = "",
+  utxos,
 }: VoteButtonProps) {
   const drepInfo = useWalletsStore((state) => state.drepInfo);
   const [loading, setLoading] = useState(false);
@@ -65,10 +67,6 @@ export default function VoteButton({
         throw new Error("Multisig Wallet could not be built.");
       const dRepId = appWallet.dRepId;
       const txBuilder = getTxBuilder(network);
-      const blockchainProvider = getProvider(network);
-      const utxos = await blockchainProvider.fetchAddressUTxOs(
-        appWallet.address,
-      );
 
       const assetMap = new Map<Unit, Quantity>();
       assetMap.set("lovelace", "5000000");
@@ -102,17 +100,6 @@ export default function VoteButton({
         .selectUtxosFrom(utxos)
         .changeAddress(appWallet.address);
         
-      const paymentKeys = multisigWallet.getKeysByRole(0) ?? [];
-      for (const key of paymentKeys) {
-        txBuilder.requiredSignerHash(key.keyHash);
-      }
-
-      if (multisigWallet.stakingEnabled()) {
-        const stakingKeys = multisigWallet.getKeysByRole(2) ?? [];
-        for (const key of stakingKeys) {
-          txBuilder.requiredSignerHash(key.keyHash);
-        }
-      }
       await newTransaction({
         txBuilder,
         description: `Vote: ${voteKind} - ${description}`,
@@ -187,10 +174,10 @@ export default function VoteButton({
 
       <Button
         onClick={vote}
-        disabled={loading || proposalId.length !== 66}
+        disabled={loading || proposalId.length !== 66 || utxos.length === 0}
         className="w-full rounded-md bg-blue-600 px-6 py-2 font-semibold text-white shadow hover:bg-blue-700"
       >
-        {loading ? "Voting..." : "Vote"}
+        {loading ? "Voting..." : utxos.length > 0 ? "Vote" : "No UTxOs Available"}
       </Button>
     </div>
   );
diff --git a/src/components/pages/wallet/governance/proposals.tsx b/src/components/pages/wallet/governance/proposals.tsx
@@ -24,8 +24,9 @@ import {
 } from "@/components/ui/dialog";
 import Link from "next/link";
 import VoteButton from "./proposal/voteButtton";
+import { UTxO } from "@meshsdk/core";
 
-export default function AllProposals({ appWallet }: { appWallet: Wallet }) {
+export default function AllProposals({ appWallet, utxos }: { appWallet: Wallet; utxos: UTxO[] }) {
   const network = useSiteStore((state) => state.network);
   const [proposals, setProposals] = useState<ProposalMetadata[]>([]);
   const [limit, setLimit] = useState(5);
@@ -102,6 +103,7 @@ export default function AllProposals({ appWallet }: { appWallet: Wallet }) {
                     key={proposal.tx_hash}
                     proposal={proposal}
                     appWallet={appWallet}
+                    utxos={utxos}
                   />
                 ))}
             </TableBody>
@@ -125,9 +127,11 @@ export default function AllProposals({ appWallet }: { appWallet: Wallet }) {
 function ProposalRow({
   proposal,
   appWallet,
+  utxos,
 }: {
   proposal: ProposalMetadata;
   appWallet: Wallet;
+  utxos: UTxO[];
 }) {
   return (
     <TableRow>
@@ -149,6 +153,7 @@ function ProposalRow({
       </TableCell>
       <TableCell>
         <VoteButton
+          utxos={utxos}
           appWallet={appWallet}
           proposalId={proposal.tx_hash + "#" + proposal.cert_index}
         />
diff --git a/src/components/pages/wallet/governance/vote-card.tsx b/src/components/pages/wallet/governance/vote-card.tsx
@@ -6,13 +6,15 @@ import { Label } from "@/components/ui/label";
 import { Textarea } from "@/components/ui/textarea";
 import { useState } from "react";
 import VoteButton from "./proposal/voteButtton";
+import { UTxO } from "@meshsdk/core";
 
 interface VoteCardProps {
   appWallet: Wallet;
+  utxos: UTxO[];
   proposalId?: string; // Optional proposalId
 }
 
-export default function VoteCard({ appWallet, proposalId }: VoteCardProps) {
+export default function VoteCard({ appWallet, utxos, proposalId }: VoteCardProps) {
   const drepInfo = useWalletsStore((state) => state.drepInfo);
   const [localProposalId, setLocalProposalId] = useState<string>(proposalId ?? "");
   const [description, setDescription] = useState<string>("");
@@ -69,6 +71,7 @@ export default function VoteCard({ appWallet, proposalId }: VoteCardProps) {
             proposalId={proposalId ?? localProposalId}
             description={description}
             metadata={metadata}
+            utxos={utxos}
           />
         </div>
       </fieldset>
