From 1472b7f4b6ced82ea011cf30178736d507a760f2 Mon Sep 17 00:00:00 2001
From: dan13ram <dan13ram@gmail.com>
Date: Sat, 26 Sep 2026 15:25:42 +0530
Subject: [PATCH 01/13] fix(web): add auth debugging and fix WalletConnect
 integration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Fix environment variable name: NEXT_PUBLIC_WALLETCONNECT_PROJECT_ID (was NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID)
- Add console logging to track SEP-53 and SEP-10 authentication flows
- Log wallet type (WalletConnect vs Desktop) for better debugging
- Log each step of the authentication process for mobile troubleshooting

This enables WalletConnect to be properly initialized and allows better visibility into why Freighter mobile falls back to SEP-10 (as expected - WalletConnect doesn't support SEP-53 message signing for mobile).

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 apps/web/src/components/wallet-controls.tsx | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/apps/web/src/components/wallet-controls.tsx b/apps/web/src/components/wallet-controls.tsx
index 22331ee..32a438b 100644
--- a/apps/web/src/components/wallet-controls.tsx
+++ b/apps/web/src/components/wallet-controls.tsx
@@ -177,6 +177,7 @@ export function WalletControls({ network }: { network?: WalletNetwork }) {
       let authMethod: 'sep53' | 'sep10' = 'sep53';
       try {
         setAuthStatus('awaiting-signature');
+        console.log('[Auth] Attempting SEP-53 message signing', { address: result.address, wallet: isWalletConnectSelected() ? 'WalletConnect' : 'Desktop' });
         const { signedMessage, signerAddress } = await StellarWalletsKit.signMessage(message, {
           networkPassphrase: currentNetwork.passphrase,
           address: result.address
@@ -186,18 +187,23 @@ export function WalletControls({ network }: { network?: WalletNetwork }) {
         }
 
         setAuthStatus('verifying-signature');
+        console.log('[Auth] SEP-53 signature obtained, verifying...');
         await verifyAuthProof({
           address: result.address,
           message,
           signature: normalizeWalletSignature(signedMessage)
         });
+        console.log('[Auth] SEP-53 verification successful');
       } catch (error) {
+        console.warn('[Auth] SEP-53 failed, attempting SEP-10 fallback', { error: error instanceof Error ? error.message : String(error) });
         if (!isSep53UnsupportedError(error)) throw error;
 
         authMethod = 'sep10';
         setAuthStatus('requesting-challenge');
+        console.log('[Auth] Requesting SEP-10 challenge...');
         const sep10Challenge = await requestSep10Challenge(result.address);
         setAuthStatus('awaiting-signature');
+        console.log('[Auth] Attempting SEP-10 transaction signing');
         const { signedTxXdr, signerAddress } = await StellarWalletsKit.signTransaction(sep10Challenge.xdr, {
           networkPassphrase: currentNetwork.passphrase,
           address: result.address
@@ -207,7 +213,9 @@ export function WalletControls({ network }: { network?: WalletNetwork }) {
         }
 
         setAuthStatus('verifying-signature');
+        console.log('[Auth] SEP-10 transaction signed, verifying...');
         await verifySep10Proof(signedTxXdr);
+        console.log('[Auth] SEP-10 verification successful');
       }
 
       setAuthenticatedAddress(result.address);

From 8aba2b670401527e4a45fc449f63ef9cde440941 Mon Sep 17 00:00:00 2001
From: dan13ram <dan13ram@gmail.com>
Date: Sat, 26 Sep 2026 15:30:45 +0530
Subject: [PATCH 02/13] feat(web): enable auction admin forms with auto-pause
 workflow
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Remove pause requirement from payment token and reserve price forms
- Forms now always enabled (except when busy)
- Automatically pause auctions when submitting config changes if needed
- Add confirmation dialog showing both pause + config change actions
- Support both direct execution (owner) and proposal draft (proposer)
- Add helper text explaining auto-pause behavior
- Improve UX by bundling dependent actions together

This allows users to update auction settings directly without manual pause step. The system automatically includes a pause action before the configuration change when needed.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../app/dao/[daoId]/admin/auction/page.tsx    | 175 ++++++++++++++----
 .../admin/auction-auto-pause-dialog.tsx       |  72 +++++++
 2 files changed, 215 insertions(+), 32 deletions(-)
 create mode 100644 apps/web/src/components/admin/auction-auto-pause-dialog.tsx

diff --git a/apps/web/src/app/dao/[daoId]/admin/auction/page.tsx b/apps/web/src/app/dao/[daoId]/admin/auction/page.tsx
index 0553ea5..de7d7c2 100644
--- a/apps/web/src/app/dao/[daoId]/admin/auction/page.tsx
+++ b/apps/web/src/app/dao/[daoId]/admin/auction/page.tsx
@@ -6,6 +6,7 @@ import { useState } from 'react';
 import { Stack } from 'styled-system/jsx';
 import useSWR from 'swr';
 
+import { AuctionAutoPauseDialog, type AuctionAutoPauseAction } from '@/components/admin/auction-auto-pause-dialog';
 import { AdminPaymentTokenForm, AdminReservePriceForm } from '@/components/admin/admin-action-forms';
 import { AdminProposalDraftDialog } from '@/components/admin/admin-proposal-draft-dialog';
 import { AdminSectionNav } from '@/components/admin/admin-section-nav';
@@ -41,6 +42,8 @@ export default function AuctionAdminPage() {
   const [formMessage, setFormMessage] = useState('');
   const [reservePrice, setReservePrice] = useState('');
   const [paymentToken, setPaymentToken] = useState('');
+  const [autoPauseDialogOpen, setAutoPauseDialogOpen] = useState(false);
+  const [autoPauseAction, setAutoPauseAction] = useState<AuctionAutoPauseAction | null>(null);
   const proposalDraft = useAdminProposalDraft();
   const { data, error, mutate, isLoading } = useSWR<AuctionStatus>(
     `/api/dao/${encodeURIComponent(daoId)}/auctions`,
@@ -103,8 +106,16 @@ export default function AuctionAdminPage() {
     }
   }
 
-  async function updateReservePrice() {
-    if (!session.address || (!isOwner && !canProposeAuction) || !data || data.paused !== true) return;
+  async function updateReservePrice(skipPauseCheck = false) {
+    if (!session.address || (!isOwner && !canProposeAuction) || !data) return;
+
+    // If auctions are active and not skipping pause check, show confirmation dialog
+    if (!skipPauseCheck && data.paused === false) {
+      setAutoPauseAction('reserve-price');
+      setAutoPauseDialogOpen(true);
+      return;
+    }
+
     const match = reservePrice.trim().match(/^(\d+)(?:\.(\d{1,7}))?$/);
     if (!match)
       return tx.fail(new Error('Enter a valid reserve price with up to 7 decimal places.'), 'Invalid reserve price');
@@ -112,27 +123,66 @@ export default function AuctionAdminPage() {
     if (amount < 1000n)
       return tx.fail(new Error('Reserve price must be at least 0.0001 payment tokens.'), 'Invalid reserve price');
     if (!isOwner && canProposeAuction) {
+      const actions = [];
+      // Add pause action if auctions are active
+      if (data.paused === false) {
+        const pauseHandler = getActionHandler('pause-auction');
+        const pauseAction = pauseHandler.serialize({}, { config, session: { address: session.address, kit: StellarWalletsKit } });
+        actions.push(pauseAction);
+      }
       const handler = getActionHandler('set-auction-reserve-price');
       const action = handler.serialize(
         { reservePrice: reservePrice.trim() },
         { config, session: { address: session.address, kit: StellarWalletsKit } }
       );
-      proposalDraft.requestAdd({
-        daoId,
-        action,
-        source: 'admin/auction/set-auction-reserve-price',
-        metadata: {
-          title: 'Update auction reserve price',
-          description: `Set the next auction reserve price to ${reservePrice.trim()}.`,
-          url: ''
-        },
-        onAdded: () => setFormMessage('Auction reserve price update added to the proposal draft.')
-      });
+      actions.push(action);
+
+      // Add all actions to draft
+      for (let i = 0; i < actions.length; i++) {
+        proposalDraft.requestAdd({
+          daoId,
+          action: actions[i],
+          source: `admin/auction/${i === 0 && data.paused === false ? 'pause-auction' : 'set-auction-reserve-price'}`,
+          metadata: {
+            title: i === 0 && data.paused === false ? 'Pause auctions' : 'Update auction reserve price',
+            description: i === 0 && data.paused === false ? 'Pause auction activity.' : `Set the next auction reserve price to ${reservePrice.trim()}.`,
+            url: ''
+          },
+          onAdded: () => {
+            if (i === actions.length - 1) {
+              setFormMessage(`${data.paused === false ? 'Pause and update' : 'Update'} reserve price added to the proposal draft.`);
+              setReservePrice('');
+            }
+          }
+        });
+      }
       return;
     }
     setBusy(true);
     tx.start('Updating reserve price...');
     try {
+      // If auctions are active, pause them first
+      if (data.paused === false) {
+        const pauseClient = new AuctionClient({
+          contractId: config.auctionContractId,
+          rpcUrl: config.rpcUrl,
+          networkPassphrase: config.passphrase,
+          publicKey: session.address,
+          signTransaction: async (xdr: string, opts?: { networkPassphrase?: string; address?: string }) =>
+            StellarWalletsKit.signTransaction(xdr, {
+              networkPassphrase: opts?.networkPassphrase ?? config.passphrase,
+              address: opts?.address ?? session.address
+            })
+        });
+        tx.start('Pausing auctions...');
+        const pauseAssembled = await pauseClient.pause({ caller: session.address });
+        const pauseSent = await pauseAssembled.signAndSend();
+        const pauseHash = pauseSent.sendTransactionResponse?.hash ?? '';
+        tx.submitted('Auction pause submitted', pauseHash);
+        await waitForConfirmation(pauseHash, config.rpcUrl);
+        tx.submitted('Auctions paused, updating reserve price...');
+      }
+
       const client = new AuctionClient({
         contractId: config.auctionContractId,
         rpcUrl: config.rpcUrl,
@@ -158,8 +208,16 @@ export default function AuctionAdminPage() {
     }
   }
 
-  async function updatePaymentToken() {
-    if (!session.address || (!isOwner && !canProposeAuction) || !data || data.paused !== true) return;
+  async function updatePaymentToken(skipPauseCheck = false) {
+    if (!session.address || (!isOwner && !canProposeAuction) || !data) return;
+
+    // If auctions are active and not skipping pause check, show confirmation dialog
+    if (!skipPauseCheck && data.paused === false) {
+      setAutoPauseAction('payment-token');
+      setAutoPauseDialogOpen(true);
+      return;
+    }
+
     const value = paymentToken.trim();
     if (!value) return tx.fail(new Error('Payment token contract address is required.'), 'Invalid payment token');
     if (!isValidStellarAddress(value)) {
@@ -169,27 +227,66 @@ export default function AuctionAdminPage() {
       );
     }
     if (!isOwner && canProposeAuction) {
+      const actions = [];
+      // Add pause action if auctions are active
+      if (data.paused === false) {
+        const pauseHandler = getActionHandler('pause-auction');
+        const pauseAction = pauseHandler.serialize({}, { config, session: { address: session.address, kit: StellarWalletsKit } });
+        actions.push(pauseAction);
+      }
       const handler = getActionHandler('set-auction-payment-token');
       const action = handler.serialize(
         { paymentToken: value },
         { config, session: { address: session.address, kit: StellarWalletsKit } }
       );
-      proposalDraft.requestAdd({
-        daoId,
-        action,
-        source: 'admin/auction/set-auction-payment-token',
-        metadata: {
-          title: 'Update auction payment token',
-          description: `Set the auction payment token to ${value}.`,
-          url: ''
-        },
-        onAdded: () => setFormMessage('Auction payment token update added to the proposal draft.')
-      });
+      actions.push(action);
+
+      // Add all actions to draft
+      for (let i = 0; i < actions.length; i++) {
+        proposalDraft.requestAdd({
+          daoId,
+          action: actions[i],
+          source: `admin/auction/${i === 0 && data.paused === false ? 'pause-auction' : 'set-auction-payment-token'}`,
+          metadata: {
+            title: i === 0 && data.paused === false ? 'Pause auctions' : 'Update auction payment token',
+            description: i === 0 && data.paused === false ? 'Pause auction activity.' : `Set the auction payment token to ${value}.`,
+            url: ''
+          },
+          onAdded: () => {
+            if (i === actions.length - 1) {
+              setFormMessage(`${data.paused === false ? 'Pause and update' : 'Update'} payment token added to the proposal draft.`);
+              setPaymentToken('');
+            }
+          }
+        });
+      }
       return;
     }
     setBusy(true);
     tx.start('Updating payment token...');
     try {
+      // If auctions are active, pause them first
+      if (data.paused === false) {
+        const pauseClient = new AuctionClient({
+          contractId: config.auctionContractId,
+          rpcUrl: config.rpcUrl,
+          networkPassphrase: config.passphrase,
+          publicKey: session.address,
+          signTransaction: async (xdr: string, opts?: { networkPassphrase?: string; address?: string }) =>
+            StellarWalletsKit.signTransaction(xdr, {
+              networkPassphrase: opts?.networkPassphrase ?? config.passphrase,
+              address: opts?.address ?? session.address
+            })
+        });
+        tx.start('Pausing auctions...');
+        const pauseAssembled = await pauseClient.pause({ caller: session.address });
+        const pauseSent = await pauseAssembled.signAndSend();
+        const pauseHash = pauseSent.sendTransactionResponse?.hash ?? '';
+        tx.submitted('Auction pause submitted', pauseHash);
+        await waitForConfirmation(pauseHash, config.rpcUrl);
+        tx.submitted('Auctions paused, updating payment token...');
+      }
+
       const client = new AuctionClient({
         contractId: config.auctionContractId,
         rpcUrl: config.rpcUrl,
@@ -232,6 +329,20 @@ export default function AuctionAdminPage() {
         onCancel={proposalDraft.cancel}
         onResolve={proposalDraft.resolve}
       />
+      <AuctionAutoPauseDialog
+        open={autoPauseDialogOpen}
+        action={autoPauseAction ?? 'payment-token'}
+        isLoading={busy}
+        onCancel={() => setAutoPauseDialogOpen(false)}
+        onConfirm={() => {
+          setAutoPauseDialogOpen(false);
+          if (autoPauseAction === 'payment-token') {
+            void updatePaymentToken(true);
+          } else {
+            void updateReservePrice(true);
+          }
+        }}
+      />
       <PageSection
         title="Auction controls"
         description="Pause or resume auction activity for maintenance and emergency operations."
@@ -293,19 +404,19 @@ export default function AuctionAdminPage() {
                 {data?.config.payment_token
                   ? `${getTreasuryAssets(config.name).find((asset) => asset.contractId === data.config.payment_token)?.code ?? 'Unknown SAC'} · ${data.config.payment_token}`
                   : 'Not configured'}
-                . Changes apply after the next auction is created.
+                . Changes apply after the next auction is created. If auctions are active, they will be paused automatically.
               </Text>
               <div style={{ display: 'flex', gap: '10px', flexWrap: 'wrap' }}>
                 <AdminPaymentTokenForm
                   value={{ paymentToken }}
                   onChange={(value) => setPaymentToken(value.paymentToken)}
                   network={config.name}
-                  disabled={busy || data?.paused !== true}
+                  disabled={busy}
                 />
                 <Button
                   variant="outline"
                   onClick={() => void updatePaymentToken()}
-                  disabled={busy || data?.paused !== true || !paymentToken}
+                  disabled={busy || !paymentToken}
                 >
                   {isOwner ? 'Update payment token' : 'Add payment token proposal'}
                 </Button>
@@ -317,18 +428,18 @@ export default function AuctionAdminPage() {
                   ? (getTreasuryAssets(config.name).find((asset) => asset.contractId === data.config.payment_token)
                       ?.code ?? 'SAC')
                   : 'SAC'}{' '}
-                units. Changes apply after the next auction is created.
+                units. Changes apply after the next auction is created. If auctions are active, they will be paused automatically.
               </Text>
               <div style={{ display: 'flex', gap: '10px', flexWrap: 'wrap' }}>
                 <AdminReservePriceForm
                   value={{ reservePrice }}
                   onChange={(value) => setReservePrice(value.reservePrice)}
-                  disabled={busy || data?.paused !== true}
+                  disabled={busy}
                 />
                 <Button
                   variant="outline"
                   onClick={() => void updateReservePrice()}
-                  disabled={busy || data?.paused !== true || !reservePrice}
+                  disabled={busy || !reservePrice}
                 >
                   {isOwner ? 'Update reserve' : 'Add reserve proposal'}
                 </Button>
diff --git a/apps/web/src/components/admin/auction-auto-pause-dialog.tsx b/apps/web/src/components/admin/auction-auto-pause-dialog.tsx
new file mode 100644
index 0000000..94adc05
--- /dev/null
+++ b/apps/web/src/components/admin/auction-auto-pause-dialog.tsx
@@ -0,0 +1,72 @@
+'use client';
+
+import { Stack } from 'styled-system/jsx';
+
+import { Button, Dialog, Heading, Text } from '@/components/ui';
+
+export type AuctionAutoPauseAction = 'payment-token' | 'reserve-price';
+
+interface AuctionAutoPauseDialogProps {
+  open: boolean;
+  action: AuctionAutoPauseAction;
+  onConfirm: () => void;
+  onCancel: () => void;
+  isLoading?: boolean;
+}
+
+export function AuctionAutoPauseDialog({
+  open,
+  action,
+  onConfirm,
+  onCancel,
+  isLoading = false
+}: AuctionAutoPauseDialogProps) {
+  const actionLabel =
+    action === 'payment-token' ? 'Update payment token' : 'Update reserve price';
+
+  return (
+    <Dialog open={open} onOpenChange={(nextOpen) => !nextOpen && onCancel()}>
+      <div style={{ maxWidth: '500px' }}>
+        <Stack gap="4">
+          <Stack gap="2">
+            <Heading style={{ fontSize: '1.125rem' }}>
+              Pause auctions to make changes
+            </Heading>
+            <Text style={{ margin: 0 }}>
+              Auctions are currently active. To update the {action === 'payment-token' ? 'payment token' : 'reserve price'}, the auctions must be paused first.
+            </Text>
+            <Text style={{ margin: 0, marginTop: '0.5rem' }}>
+              The following actions will be executed together:
+            </Text>
+            <ol style={{ margin: '0.5rem 0 0 1.5rem', paddingLeft: 0 }}>
+              <li style={{ marginBottom: '0.25rem' }}>
+                <strong>Pause auctions</strong> - Stop all auction activity
+              </li>
+              <li>
+                <strong>{actionLabel}</strong> - Apply your configuration change
+              </li>
+            </ol>
+            <Text style={{ margin: '0.5rem 0 0 0', fontSize: '0.875rem', color: '#6b7280' }}>
+              The configuration change will apply to the next auction after it resumes.
+            </Text>
+          </Stack>
+          <div style={{ display: 'flex', gap: '10px', justifyContent: 'flex-end' }}>
+            <Button
+              variant="outline"
+              onClick={onCancel}
+              disabled={isLoading}
+            >
+              Cancel
+            </Button>
+            <Button
+              onClick={onConfirm}
+              disabled={isLoading}
+            >
+              {isLoading ? 'Processing...' : 'Pause and update'}
+            </Button>
+          </div>
+        </Stack>
+      </div>
+    </Dialog>
+  );
+}

From 80d8f0811a60f81d7560dfe02e318d035d2a829b Mon Sep 17 00:00:00 2001
From: dan13ram <dan13ram@gmail.com>
Date: Sat, 26 Sep 2026 15:40:32 +0530
Subject: [PATCH 03/13] feat(web): add draft awareness to all admin forms
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

All admin forms across auction, governance, owner, and token admin pages now display compact previews when an action of the same type already exists in the proposal draft. This helps users understand what they're adding before submitting.

New components and hooks:
- useAdminDraftStatus: Hook to check if specific action types exist in draft and detect conflicts
- AdminDraftActionPreview: Compact, collapsible preview card showing actions already in draft

Updated form components to support draft previews:
- AdminReservePriceForm (auction)
- AdminPaymentTokenForm (auction)
- AdminValueForm (governance)
- AuthorityActionForm (owner/token authorities)
- BatchMintGovernanceTokenForm (token)

All admin pages now:
- Import and use useAdminDraftStatus hook with relevant action types
- Pass draft preview to forms when action exists in draft
- Display small, non-intrusive preview cards above form inputs

This gives users immediate visual feedback that an action is already queued in their proposal draft.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../app/dao/[daoId]/admin/auction/page.tsx    |   9 +
 .../app/dao/[daoId]/admin/governance/page.tsx |  11 ++
 .../src/app/dao/[daoId]/admin/owner/page.tsx  |   7 +
 .../src/app/dao/[daoId]/admin/token/page.tsx  |   3 +
 .../components/admin/admin-action-forms.tsx   |  63 ++++---
 .../admin/admin-draft-action-preview.tsx      | 178 ++++++++++++++++++
 .../src/components/admin/authority-panel.tsx  |   6 +-
 .../batch-mint-governance-token/component.tsx |   8 +-
 apps/web/src/lib/use-admin-draft-status.ts    |  63 +++++++
 9 files changed, 323 insertions(+), 25 deletions(-)
 create mode 100644 apps/web/src/components/admin/admin-draft-action-preview.tsx
 create mode 100644 apps/web/src/lib/use-admin-draft-status.ts

diff --git a/apps/web/src/app/dao/[daoId]/admin/auction/page.tsx b/apps/web/src/app/dao/[daoId]/admin/auction/page.tsx
index de7d7c2..06ca876 100644
--- a/apps/web/src/app/dao/[daoId]/admin/auction/page.tsx
+++ b/apps/web/src/app/dao/[daoId]/admin/auction/page.tsx
@@ -22,6 +22,7 @@ import { getActionHandler } from '@/lib/proposal-actions/registry';
 import { waitForConfirmation } from '@/lib/transaction-confirmation';
 import { useTransactionFeedback } from '@/lib/transaction-feedback';
 import { useAdminProposalDraft } from '@/lib/use-admin-proposal-draft';
+import { useAdminDraftStatus } from '@/lib/use-admin-draft-status';
 import { getStellarAddressError, isValidStellarAddress } from '@/lib/validation';
 import { useDaoSessionStore } from '@/stores/dao-session-store';
 
@@ -45,6 +46,12 @@ export default function AuctionAdminPage() {
   const [autoPauseDialogOpen, setAutoPauseDialogOpen] = useState(false);
   const [autoPauseAction, setAutoPauseAction] = useState<AuctionAutoPauseAction | null>(null);
   const proposalDraft = useAdminProposalDraft();
+  const draftStatus = useAdminDraftStatus(daoId, [
+    'set-auction-reserve-price',
+    'set-auction-payment-token',
+    'pause-auction',
+    'unpause-auction'
+  ]);
   const { data, error, mutate, isLoading } = useSWR<AuctionStatus>(
     `/api/dao/${encodeURIComponent(daoId)}/auctions`,
     fetcher
@@ -412,6 +419,7 @@ export default function AuctionAdminPage() {
                   onChange={(value) => setPaymentToken(value.paymentToken)}
                   network={config.name}
                   disabled={busy}
+                  draftPreview={draftStatus.actionsInDraft.find((a) => a.type === 'set-auction-payment-token')}
                 />
                 <Button
                   variant="outline"
@@ -435,6 +443,7 @@ export default function AuctionAdminPage() {
                   value={{ reservePrice }}
                   onChange={(value) => setReservePrice(value.reservePrice)}
                   disabled={busy}
+                  draftPreview={draftStatus.actionsInDraft.find((a) => a.type === 'set-auction-reserve-price')}
                 />
                 <Button
                   variant="outline"
diff --git a/apps/web/src/app/dao/[daoId]/admin/governance/page.tsx b/apps/web/src/app/dao/[daoId]/admin/governance/page.tsx
index 4c72dc8..f07681f 100644
--- a/apps/web/src/app/dao/[daoId]/admin/governance/page.tsx
+++ b/apps/web/src/app/dao/[daoId]/admin/governance/page.tsx
@@ -21,6 +21,7 @@ import { getActionHandler } from '@/lib/proposal-actions/registry';
 import { waitForConfirmation } from '@/lib/transaction-confirmation';
 import { useTransactionFeedback } from '@/lib/transaction-feedback';
 import { useAdminProposalDraft } from '@/lib/use-admin-proposal-draft';
+import { useAdminDraftStatus } from '@/lib/use-admin-draft-status';
 import { useDaoSessionStore } from '@/stores/dao-session-store';
 
 type Drafts = Partial<{
@@ -68,6 +69,12 @@ export default function GovernanceAdminPage() {
   const [busy, setBusy] = useState(false);
   const [activeAction, setActiveAction] = useState<GovernorSettingKey | ''>('');
   const proposalDraft = useAdminProposalDraft();
+  const draftStatus = useAdminDraftStatus(daoId, [
+    'set-voting-delay',
+    'set-voting-period',
+    'set-proposal-threshold',
+    'set-quorum-bps'
+  ]);
   const tx = useTransactionFeedback(config.name);
   const {
     data: settings,
@@ -360,6 +367,7 @@ export default function GovernanceAdminPage() {
                   value={{ value: drafts.votingDelay ?? settings?.votingDelay?.toString() ?? '' }}
                   onChange={(value) => setDrafts((current) => ({ ...current, votingDelay: value.value }))}
                   disabled={busy}
+                  draftPreview={draftStatus.actionsInDraft.find((a) => a.type === 'set-voting-delay')}
                 />
                 <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
                   <Button
@@ -395,6 +403,7 @@ export default function GovernanceAdminPage() {
                   value={{ value: drafts.votingPeriod ?? settings?.votingPeriod?.toString() ?? '' }}
                   onChange={(value) => setDrafts((current) => ({ ...current, votingPeriod: value.value }))}
                   disabled={busy}
+                  draftPreview={draftStatus.actionsInDraft.find((a) => a.type === 'set-voting-period')}
                 />
                 <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
                   <Button
@@ -435,6 +444,7 @@ export default function GovernanceAdminPage() {
                   value={{ value: drafts.proposalThreshold ?? formatThreshold(settings?.proposalThreshold ?? 0n) }}
                   onChange={(value) => setDrafts((current) => ({ ...current, proposalThreshold: value.value }))}
                   disabled={busy}
+                  draftPreview={draftStatus.actionsInDraft.find((a) => a.type === 'set-proposal-threshold')}
                 />
                 <Text className="lede" style={{ margin: 0, fontSize: '0.8rem' }}>
                   {settings ? (
@@ -484,6 +494,7 @@ export default function GovernanceAdminPage() {
                   value={{ value: drafts.quorumBps ?? String(settings?.quorumBps ?? '') }}
                   onChange={(value) => setDrafts((current) => ({ ...current, quorumBps: value.value }))}
                   disabled={busy}
+                  draftPreview={draftStatus.actionsInDraft.find((a) => a.type === 'set-quorum-bps')}
                 />
                 <Text className="lede" style={{ margin: 0, fontSize: '0.8rem' }}>
                   {settings ? (
diff --git a/apps/web/src/app/dao/[daoId]/admin/owner/page.tsx b/apps/web/src/app/dao/[daoId]/admin/owner/page.tsx
index 57cab75..d1e23e7 100644
--- a/apps/web/src/app/dao/[daoId]/admin/owner/page.tsx
+++ b/apps/web/src/app/dao/[daoId]/admin/owner/page.tsx
@@ -20,6 +20,7 @@ import { getActionHandler } from '@/lib/proposal-actions/registry';
 import { waitForConfirmation } from '@/lib/transaction-confirmation';
 import { useTransactionFeedback } from '@/lib/transaction-feedback';
 import { useAdminProposalDraft } from '@/lib/use-admin-proposal-draft';
+import { useAdminDraftStatus } from '@/lib/use-admin-draft-status';
 import { useDaoSessionStore } from '@/stores/dao-session-store';
 
 async function submitAuthorityUpdate(
@@ -68,6 +69,10 @@ export default function OwnerPage() {
   const [formMessage, setFormMessage] = useState('');
   const [busy, setBusy] = useState(false);
   const proposalDraft = useAdminProposalDraft();
+  const draftStatus = useAdminDraftStatus(daoId, [
+    'set-mint-authority',
+    'set-governor-authority'
+  ]);
   const tx = useTransactionFeedback(config.name);
   const {
     data: mintAuthorities,
@@ -220,6 +225,7 @@ export default function OwnerPage() {
               busy={busy}
               loading={mintAuthoritiesLoading}
               emptyLabel={mintAuthorityError?.message || 'No mint authorities indexed yet.'}
+              draftPreview={draftStatus.actionsInDraft.find((a) => a.type === 'set-mint-authority')}
             />
             <AuthorityPanel
               title="Governor authority"
@@ -235,6 +241,7 @@ export default function OwnerPage() {
               busy={busy}
               loading={governorAuthoritiesLoading}
               emptyLabel={governorAuthorityError?.message || 'No governance authorities indexed yet.'}
+              draftPreview={draftStatus.actionsInDraft.find((a) => a.type === 'set-governor-authority')}
             />
           </Grid>
         </Stack>
diff --git a/apps/web/src/app/dao/[daoId]/admin/token/page.tsx b/apps/web/src/app/dao/[daoId]/admin/token/page.tsx
index 06c04b3..a753494 100644
--- a/apps/web/src/app/dao/[daoId]/admin/token/page.tsx
+++ b/apps/web/src/app/dao/[daoId]/admin/token/page.tsx
@@ -20,6 +20,7 @@ import { getActionHandler } from '@/lib/proposal-actions/registry';
 import { waitForConfirmation } from '@/lib/transaction-confirmation';
 import { useTransactionFeedback } from '@/lib/transaction-feedback';
 import { useAdminProposalDraft } from '@/lib/use-admin-proposal-draft';
+import { useAdminDraftStatus } from '@/lib/use-admin-draft-status';
 import { useDaoSessionStore } from '@/stores/dao-session-store';
 
 export default function TokenAdminPage() {
@@ -30,6 +31,7 @@ export default function TokenAdminPage() {
   const [formMessage, setFormMessage] = useState('');
   const [busy, setBusy] = useState(false);
   const proposalDraft = useAdminProposalDraft();
+  const draftStatus = useAdminDraftStatus(daoId, ['batch-mint-governance-token']);
   const tx = useTransactionFeedback(config.name);
   const { data: mintAuthorities, error, isLoading, mutate } = useGoldskyMintAuthorities(config.tokenContractId);
   const { data: tokenOwner } = useContractOwner(config, 'token', session.address || undefined);
@@ -149,6 +151,7 @@ export default function TokenAdminPage() {
                   setAmount(value.amount);
                 }}
                 disabled={!hasMintAccess && !canProposeMint}
+                draftPreview={draftStatus.actionsInDraft.find((a) => a.type === 'batch-mint-governance-token')}
               />
               <div style={{ display: 'flex', gap: '8px', flexWrap: 'wrap' }}>
                 <Button type="button" onClick={handleMint} disabled={busy || (!hasMintAccess && !canProposeMint)}>
diff --git a/apps/web/src/components/admin/admin-action-forms.tsx b/apps/web/src/components/admin/admin-action-forms.tsx
index 2217839..0bc522a 100644
--- a/apps/web/src/components/admin/admin-action-forms.tsx
+++ b/apps/web/src/components/admin/admin-action-forms.tsx
@@ -2,11 +2,13 @@
 
 import { Stack } from 'styled-system/jsx';
 
+import { AdminDraftActionPreview } from '@/components/admin/admin-draft-action-preview';
 import { AuctionPaymentTokenSelect } from '@/components/auction/auction-payment-token-select';
 import { AuctionReservePriceField } from '@/components/auction/auction-reserve-price-field';
 import { FieldHelperText, FieldLabel, Input, Select } from '@/components/ui';
 import { getConfiguredAuctionNetwork } from '@/lib/auction-values';
 import type { ActionFormProps } from '@/lib/proposal-actions/types';
+import type { ProposalQueuedAction } from '@/stores/proposal-composer-store';
 
 export type AdminAuthorityDraft = { authority: string; enabled: boolean };
 export type AdminValueDraft = { value: string };
@@ -22,10 +24,12 @@ export function AuthorityActionForm({
   onChange,
   disabled,
   validationErrors,
-  showEnabled = true
-}: ActionFormProps<AdminAuthorityDraft> & { showEnabled?: boolean }) {
+  showEnabled = true,
+  draftPreview
+}: ActionFormProps<AdminAuthorityDraft> & { showEnabled?: boolean; draftPreview?: ProposalQueuedAction }) {
   return (
     <Stack gap="2">
+      {draftPreview && <AdminDraftActionPreview action={draftPreview} compact />}
       <FieldLabel htmlFor="admin-authority">Authority</FieldLabel>
       <Input
         id="admin-authority"
@@ -62,9 +66,16 @@ export function AuthorityProposalActionForm(props: ActionFormProps<AdminAuthorit
   return <AuthorityActionForm {...props} showEnabled />;
 }
 
-export function AdminValueForm({ value, onChange, disabled, validationErrors }: ActionFormProps<AdminValueDraft>) {
+export function AdminValueForm({
+  value,
+  onChange,
+  disabled,
+  validationErrors,
+  draftPreview
+}: ActionFormProps<AdminValueDraft> & { draftPreview?: ProposalQueuedAction }) {
   return (
     <Stack gap="2">
+      {draftPreview && <AdminDraftActionPreview action={draftPreview} compact />}
       <FieldLabel htmlFor="admin-value">New value</FieldLabel>
       <Input
         id="admin-value"
@@ -82,16 +93,20 @@ export function AdminReservePriceForm({
   value,
   onChange,
   disabled,
-  validationErrors
-}: ActionFormProps<AdminReservePriceDraft>) {
+  validationErrors,
+  draftPreview
+}: ActionFormProps<AdminReservePriceDraft> & { draftPreview?: ProposalQueuedAction }) {
   return (
-    <AuctionReservePriceField
-      value={value.reservePrice}
-      onChange={(reservePrice) => onChange({ reservePrice })}
-      error={validationErrors && !validationErrors.valid ? validationErrors.fields?.reservePrice : undefined}
-      disabled={disabled}
-      id="admin-reserve-price"
-    />
+    <Stack gap="1">
+      {draftPreview && <AdminDraftActionPreview action={draftPreview} compact />}
+      <AuctionReservePriceField
+        value={value.reservePrice}
+        onChange={(reservePrice) => onChange({ reservePrice })}
+        error={validationErrors && !validationErrors.valid ? validationErrors.fields?.reservePrice : undefined}
+        disabled={disabled}
+        id="admin-reserve-price"
+      />
+    </Stack>
   );
 }
 
@@ -100,16 +115,20 @@ export function AdminPaymentTokenForm({
   onChange,
   disabled,
   validationErrors,
-  network = getConfiguredAuctionNetwork()
-}: ActionFormProps<AdminPaymentTokenDraft>) {
+  network = getConfiguredAuctionNetwork(),
+  draftPreview
+}: ActionFormProps<AdminPaymentTokenDraft> & { draftPreview?: ProposalQueuedAction }) {
   return (
-    <AuctionPaymentTokenSelect
-      network={network}
-      value={value.paymentToken}
-      onChange={(paymentToken) => onChange({ paymentToken })}
-      error={validationErrors && !validationErrors.valid ? validationErrors.fields?.paymentToken : undefined}
-      disabled={disabled}
-      id="admin-payment-token"
-    />
+    <Stack gap="1">
+      {draftPreview && <AdminDraftActionPreview action={draftPreview} compact />}
+      <AuctionPaymentTokenSelect
+        network={network}
+        value={value.paymentToken}
+        onChange={(paymentToken) => onChange({ paymentToken })}
+        error={validationErrors && !validationErrors.valid ? validationErrors.fields?.paymentToken : undefined}
+        disabled={disabled}
+        id="admin-payment-token"
+      />
+    </Stack>
   );
 }
diff --git a/apps/web/src/components/admin/admin-draft-action-preview.tsx b/apps/web/src/components/admin/admin-draft-action-preview.tsx
new file mode 100644
index 0000000..f960023
--- /dev/null
+++ b/apps/web/src/components/admin/admin-draft-action-preview.tsx
@@ -0,0 +1,178 @@
+'use client';
+
+import { ChevronDown, ChevronUp } from 'lucide-react';
+import { useState } from 'react';
+import { Stack } from 'styled-system/jsx';
+
+import { Badge, Text } from '@/components/ui';
+import { getProposalActionLabel, getProposalActionSummary } from '@/lib/proposal-call';
+import type { ProposalQueuedAction } from '@/stores/proposal-composer-store';
+
+interface AdminDraftActionPreviewProps {
+  action: ProposalQueuedAction;
+  compact?: boolean;
+  onRemove?: () => void;
+  onViewDraft?: () => void;
+}
+
+export function AdminDraftActionPreview({
+  action,
+  compact = true,
+  onRemove,
+  onViewDraft
+}: AdminDraftActionPreviewProps) {
+  const [expanded, setExpanded] = useState(!compact);
+  const summary = getProposalActionSummary(action);
+  const label = getProposalActionLabel(action.type);
+
+  return (
+    <div
+      style={{
+        backgroundColor: '#f3f4f6',
+        border: '1px solid #e5e7eb',
+        borderRadius: '6px',
+        padding: compact ? '8px 12px' : '12px 16px',
+        marginBottom: '8px'
+      }}
+    >
+      <div
+        style={{
+          display: 'flex',
+          justifyContent: 'space-between',
+          alignItems: 'center',
+          gap: '12px',
+          cursor: compact ? 'pointer' : 'default'
+        }}
+        onClick={() => compact && setExpanded(!expanded)}
+      >
+        <div style={{ display: 'flex', alignItems: 'center', gap: '8px', flex: 1, minWidth: 0 }}>
+          <Text
+            style={{
+              fontSize: '0.75rem',
+              fontWeight: '600',
+              color: '#6b7280',
+              textTransform: 'uppercase',
+              flexShrink: 0
+            }}
+          >
+            📝 In Draft
+          </Text>
+          {compact && (
+            <Text
+              style={{
+                fontSize: '0.875rem',
+                color: '#6b7280',
+                overflow: 'hidden',
+                textOverflow: 'ellipsis',
+                whiteSpace: 'nowrap'
+              }}
+              title={summary}
+            >
+              {summary}
+            </Text>
+          )}
+        </div>
+
+        <div style={{ display: 'flex', gap: '8px', flexShrink: 0 }}>
+          {onViewDraft && (
+            <button
+              onClick={(e) => {
+                e.stopPropagation();
+                onViewDraft();
+              }}
+              style={{
+                background: 'none',
+                border: 'none',
+                color: '#3b82f6',
+                fontSize: '0.75rem',
+                cursor: 'pointer',
+                textDecoration: 'underline',
+                padding: 0
+              }}
+            >
+              View →
+            </button>
+          )}
+          {compact && (expanded ? <ChevronUp size={16} /> : <ChevronDown size={16} />)}
+        </div>
+      </div>
+
+      {expanded && (
+        <div
+          style={{
+            marginTop: '8px',
+            paddingTop: '8px',
+            borderTop: '1px solid #d1d5db'
+          }}
+        >
+          <Stack gap="2">
+            <Badge style={{ width: 'fit-content', fontSize: '0.75rem' }}>
+              {label}
+            </Badge>
+            <Text
+              style={{
+                fontSize: '0.875rem',
+                color: '#374151',
+                margin: 0,
+                lineHeight: '1.5'
+              }}
+            >
+              {summary}
+            </Text>
+            {(onRemove || onViewDraft) && (
+              <div
+                style={{
+                  display: 'flex',
+                  gap: '8px',
+                  marginTop: '8px',
+                  paddingTop: '8px',
+                  borderTop: '1px solid #d1d5db'
+                }}
+              >
+                {onRemove && (
+                  <button
+                    onClick={(e) => {
+                      e.stopPropagation();
+                      onRemove();
+                    }}
+                    style={{
+                      background: 'none',
+                      border: 'none',
+                      color: '#ef4444',
+                      fontSize: '0.75rem',
+                      cursor: 'pointer',
+                      textDecoration: 'underline',
+                      padding: 0
+                    }}
+                  >
+                    Remove
+                  </button>
+                )}
+                {onViewDraft && (
+                  <button
+                    onClick={(e) => {
+                      e.stopPropagation();
+                      onViewDraft();
+                    }}
+                    style={{
+                      background: 'none',
+                      border: 'none',
+                      color: '#3b82f6',
+                      fontSize: '0.75rem',
+                      cursor: 'pointer',
+                      textDecoration: 'underline',
+                      padding: 0,
+                      marginLeft: 'auto'
+                    }}
+                  >
+                    View draft →
+                  </button>
+                )}
+              </div>
+            )}
+          </Stack>
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/apps/web/src/components/admin/authority-panel.tsx b/apps/web/src/components/admin/authority-panel.tsx
index c3bd2f9..3a410ae 100644
--- a/apps/web/src/components/admin/authority-panel.tsx
+++ b/apps/web/src/components/admin/authority-panel.tsx
@@ -4,6 +4,7 @@ import { Stack } from 'styled-system/jsx';
 
 import { AuthorityActionForm } from '@/components/admin/admin-action-forms';
 import { Badge, Button, Card, Heading, ShortId, Skeleton, Text } from '@/components/ui';
+import type { ProposalQueuedAction } from '@/stores/proposal-composer-store';
 
 type AuthorityItem = {
   authority: string;
@@ -27,7 +28,8 @@ export function AuthorityPanel({
   loading = false,
   editable = true,
   formEnabled = true,
-  emptyLabel = 'No authorities indexed yet.'
+  emptyLabel = 'No authorities indexed yet.',
+  draftPreview
 }: {
   title: string;
   badge: string;
@@ -44,6 +46,7 @@ export function AuthorityPanel({
   editable?: boolean;
   formEnabled?: boolean;
   emptyLabel?: string;
+  draftPreview?: ProposalQueuedAction;
 }) {
   return (
     <Card p="5">
@@ -62,6 +65,7 @@ export function AuthorityPanel({
             onChange={(nextValue) => onValueChange?.(nextValue.authority)}
             disabled={Boolean(busy)}
             showEnabled={false}
+            draftPreview={draftPreview}
           />
         ) : null}
 
diff --git a/apps/web/src/lib/proposal-actions/actions/batch-mint-governance-token/component.tsx b/apps/web/src/lib/proposal-actions/actions/batch-mint-governance-token/component.tsx
index d73b009..7fa4bcb 100644
--- a/apps/web/src/lib/proposal-actions/actions/batch-mint-governance-token/component.tsx
+++ b/apps/web/src/lib/proposal-actions/actions/batch-mint-governance-token/component.tsx
@@ -4,19 +4,23 @@
 
 import { Stack } from 'styled-system/jsx';
 
+import { AdminDraftActionPreview } from '@/components/admin/admin-draft-action-preview';
 import { FieldHelperText, FieldLabel, Input } from '@/components/ui';
 
 import type { ActionFormProps } from '../../types';
 import type { BatchMintGovernanceTokenData } from './types';
+import type { ProposalQueuedAction } from '@/stores/proposal-composer-store';
 
 export function BatchMintGovernanceTokenForm({
   value,
   onChange,
   disabled,
-  validationErrors
-}: ActionFormProps<BatchMintGovernanceTokenData>) {
+  validationErrors,
+  draftPreview
+}: ActionFormProps<BatchMintGovernanceTokenData> & { draftPreview?: ProposalQueuedAction }) {
   return (
     <Stack gap="3">
+      {draftPreview && <AdminDraftActionPreview action={draftPreview} compact />}
       <Stack gap="2">
         <FieldLabel htmlFor="recipient">Recipient</FieldLabel>
         <Input
diff --git a/apps/web/src/lib/use-admin-draft-status.ts b/apps/web/src/lib/use-admin-draft-status.ts
new file mode 100644
index 0000000..140bbb3
--- /dev/null
+++ b/apps/web/src/lib/use-admin-draft-status.ts
@@ -0,0 +1,63 @@
+import { useCallback, useMemo } from 'react';
+
+import { getProposalActionResourceKey } from '@/lib/proposal-call';
+import { useProposalComposerStore } from '@/stores/proposal-composer-store';
+import { normalizeWalletAddress } from '@/stores/proposal-composer-store';
+import type { ProposalActionType, ProposalQueuedAction } from '@/stores/proposal-composer-store';
+import { useDaoSessionStore } from '@/stores/dao-session-store';
+
+/**
+ * Hook to check if specific action types exist in the proposal draft
+ * Useful for forms to show draft previews and detect conflicts
+ */
+export function useAdminDraftStatus(
+  daoId: string,
+  actionTypes: ProposalActionType | ProposalActionType[]
+) {
+  const address = useDaoSessionStore((state) => state.address);
+  const draft = useProposalComposerStore((state) => {
+    if (!address) return null;
+    const walletKey = normalizeWalletAddress(address);
+    return state.draftsByWallet[walletKey]?.[daoId] ?? null;
+  });
+
+  const typesToCheck = useMemo(
+    () => (Array.isArray(actionTypes) ? actionTypes : [actionTypes]),
+    [actionTypes]
+  );
+
+  const actionsInDraft = useMemo(() => {
+    if (!draft?.queuedActions) return [];
+    return draft.queuedActions.filter((action) => typesToCheck.includes(action.type));
+  }, [draft?.queuedActions, typesToCheck]);
+
+  const resourceKeys = useMemo(() => {
+    return actionsInDraft.map((action) => getProposalActionResourceKey(action));
+  }, [actionsInDraft]);
+
+  const checkConflict = useCallback(
+    (testAction: ProposalQueuedAction): { hasConflict: boolean; existingAction?: ProposalQueuedAction } => {
+      const testResourceKey = getProposalActionResourceKey(testAction);
+      const existing = actionsInDraft.find((action) => {
+        const existingKey = getProposalActionResourceKey(action);
+        return existingKey === testResourceKey;
+      });
+
+      if (!existing) {
+        return { hasConflict: false };
+      }
+
+      // Check if it's a duplicate or just a conflict
+      const isDuplicate = JSON.stringify(existing) === JSON.stringify(testAction);
+      return { hasConflict: !isDuplicate, existingAction: existing };
+    },
+    [actionsInDraft]
+  );
+
+  return {
+    actionsInDraft,
+    hasActions: actionsInDraft.length > 0,
+    resourceKeys,
+    checkConflict
+  };
+}

From c7a2b70be2e7d573b998b70182a2eccbf64bdd15 Mon Sep 17 00:00:00 2001
From: dan13ram <dan13ram@gmail.com>
Date: Sat, 26 Sep 2026 15:48:32 +0530
Subject: [PATCH 04/13] feat(web): improve governance admin form UX with
 DurationInput
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Replace plain text inputs for voting delay and voting period with DurationInput component that allows users to specify duration in days, hours, minutes, and seconds instead of raw seconds.

Changes:
- Import and use DurationInput from @/components/admin/duration-input
- Update Drafts type to use number for votingDelay and votingPeriod
- Simplify state management and validation logic (no more string parsing)
- Add contextual helper text explaining each field's purpose
- Update button disable logic to work with numeric values
- Remove redundant "· Measured in seconds" text

Benefits:
- Users can now input "3 days, 2 hours" instead of calculating 259200 seconds
- More intuitive and user-friendly admin experience
- Consistent with DAO creation flow UX patterns

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../app/dao/[daoId]/admin/governance/page.tsx | 47 +++++++++----------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/apps/web/src/app/dao/[daoId]/admin/governance/page.tsx b/apps/web/src/app/dao/[daoId]/admin/governance/page.tsx
index f07681f..6b8f29e 100644
--- a/apps/web/src/app/dao/[daoId]/admin/governance/page.tsx
+++ b/apps/web/src/app/dao/[daoId]/admin/governance/page.tsx
@@ -10,6 +10,7 @@ import { AdminValueForm } from '@/components/admin/admin-action-forms';
 import { AdminProposalDraftDialog } from '@/components/admin/admin-proposal-draft-dialog';
 import { AdminSectionNav } from '@/components/admin/admin-section-nav';
 import { AuthorityPanel } from '@/components/admin/authority-panel';
+import { DurationInput } from '@/components/admin/duration-input';
 import { PageSection } from '@/components/page-section';
 import { Badge, Button, Callout, Card, Heading, Skeleton, Text } from '@/components/ui';
 import { useDaoContext } from '@/contexts/dao-context';
@@ -25,8 +26,8 @@ import { useAdminDraftStatus } from '@/lib/use-admin-draft-status';
 import { useDaoSessionStore } from '@/stores/dao-session-store';
 
 type Drafts = Partial<{
-  votingDelay: string;
-  votingPeriod: string;
+  votingDelay: number;
+  votingPeriod: number;
   proposalThreshold: string;
   quorumBps: string;
 }>;
@@ -187,11 +188,7 @@ export default function GovernanceAdminPage() {
 
   async function applyVotingDelay() {
     if (!settings) return;
-    const value = parseWholeNumber(drafts.votingDelay ?? String(settings.votingDelay));
-    if (value === null) {
-      setFormMessage('Voting delay must be a whole number.');
-      return;
-    }
+    const value = typeof drafts.votingDelay === 'number' ? drafts.votingDelay : settings.votingDelay;
 
     if (value === settings.votingDelay) {
       setFormMessage('Voting delay is unchanged.');
@@ -212,11 +209,7 @@ export default function GovernanceAdminPage() {
 
   async function applyVotingPeriod() {
     if (!settings) return;
-    const value = parseWholeNumber(drafts.votingPeriod ?? String(settings.votingPeriod));
-    if (value === null) {
-      setFormMessage('Voting period must be a whole number.');
-      return;
-    }
+    const value = typeof drafts.votingPeriod === 'number' ? drafts.votingPeriod : settings.votingPeriod;
 
     if (value === settings.votingPeriod) {
       setFormMessage('Voting period is unchanged.');
@@ -361,13 +354,15 @@ export default function GovernanceAdminPage() {
                   <Badge>Voting delay</Badge>
                 </div>
                 <Text className="lede" style={{ margin: 0, fontSize: '0.9rem' }}>
-                  Current: {settings ? formatSecondsValue(settings.votingDelay) : '—'} · Measured in seconds.
+                  Current: {settings ? formatSecondsValue(settings.votingDelay) : '—'}
                 </Text>
-                <AdminValueForm
-                  value={{ value: drafts.votingDelay ?? settings?.votingDelay?.toString() ?? '' }}
-                  onChange={(value) => setDrafts((current) => ({ ...current, votingDelay: value.value }))}
+                <DurationInput
+                  id="voting-delay"
+                  label="Enter voting delay"
+                  value={drafts.votingDelay ?? settings?.votingDelay ?? 0}
+                  onChange={(value) => setDrafts((current) => ({ ...current, votingDelay: value }))}
                   disabled={busy}
-                  draftPreview={draftStatus.actionsInDraft.find((a) => a.type === 'set-voting-delay')}
+                  helperText="Minimum 5 minutes. The time before voting begins."
                 />
                 <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
                   <Button
@@ -377,8 +372,7 @@ export default function GovernanceAdminPage() {
                       busy ||
                       activeAction === 'votingDelay' ||
                       !settings ||
-                      parseWholeNumber(drafts.votingDelay ?? String(settings.votingDelay)) === null ||
-                      (drafts.votingDelay ?? String(settings.votingDelay)) === String(settings.votingDelay)
+                      (typeof drafts.votingDelay === 'number' ? drafts.votingDelay : settings.votingDelay) === settings.votingDelay
                     }
                   >
                     {busy && activeAction === 'votingDelay'
@@ -397,13 +391,15 @@ export default function GovernanceAdminPage() {
                   <Badge>Voting period</Badge>
                 </div>
                 <Text className="lede" style={{ margin: 0, fontSize: '0.9rem' }}>
-                  Current: {settings ? formatSecondsValue(settings.votingPeriod) : '—'} · Measured in seconds.
+                  Current: {settings ? formatSecondsValue(settings.votingPeriod) : '—'}
                 </Text>
-                <AdminValueForm
-                  value={{ value: drafts.votingPeriod ?? settings?.votingPeriod?.toString() ?? '' }}
-                  onChange={(value) => setDrafts((current) => ({ ...current, votingPeriod: value.value }))}
+                <DurationInput
+                  id="voting-period"
+                  label="Enter voting period"
+                  value={drafts.votingPeriod ?? settings?.votingPeriod ?? 0}
+                  onChange={(value) => setDrafts((current) => ({ ...current, votingPeriod: value }))}
                   disabled={busy}
-                  draftPreview={draftStatus.actionsInDraft.find((a) => a.type === 'set-voting-period')}
+                  helperText="The duration during which voting is active. Minimum 1 day."
                 />
                 <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
                   <Button
@@ -413,8 +409,7 @@ export default function GovernanceAdminPage() {
                       busy ||
                       activeAction === 'votingPeriod' ||
                       !settings ||
-                      parseWholeNumber(drafts.votingPeriod ?? String(settings.votingPeriod)) === null ||
-                      (drafts.votingPeriod ?? String(settings.votingPeriod)) === String(settings.votingPeriod)
+                      (typeof drafts.votingPeriod === 'number' ? drafts.votingPeriod : settings.votingPeriod) === settings.votingPeriod
                     }
                   >
                     {busy && activeAction === 'votingPeriod'

From ab90ae5fd61dd9440d9cca9bcf8fce274271435e Mon Sep 17 00:00:00 2001
From: dan13ram <dan13ram@gmail.com>
Date: Sat, 26 Sep 2026 15:50:06 +0530
Subject: [PATCH 05/13] feat(web): add percentage input for quorum BPS field
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Create PercentageInput component for BPS field conversions and update governance admin to use it for quorum settings. Users can now input quorum as a percentage (e.g., 10%) instead of basis points (1000).

Changes:
- New PercentageInput component with dual display showing both percentage and BPS
- Update quorum field in governance admin to use PercentageInput
- Change current value display from 'bps' format to percentage format
- Simplify state management by using number types
- Add contextual helper text

Benefits:
- More intuitive for users unfamiliar with basis points
- Consistent with DAO creation flow UX patterns
- Clear visual feedback of both percentage and technical BPS value

🤖 Generated with Claude Code

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../app/dao/[daoId]/admin/governance/page.tsx | 31 +++----
 .../src/components/admin/percentage-input.tsx | 80 +++++++++++++++++++
 2 files changed, 91 insertions(+), 20 deletions(-)
 create mode 100644 apps/web/src/components/admin/percentage-input.tsx

diff --git a/apps/web/src/app/dao/[daoId]/admin/governance/page.tsx b/apps/web/src/app/dao/[daoId]/admin/governance/page.tsx
index 6b8f29e..7517386 100644
--- a/apps/web/src/app/dao/[daoId]/admin/governance/page.tsx
+++ b/apps/web/src/app/dao/[daoId]/admin/governance/page.tsx
@@ -11,6 +11,7 @@ import { AdminProposalDraftDialog } from '@/components/admin/admin-proposal-draf
 import { AdminSectionNav } from '@/components/admin/admin-section-nav';
 import { AuthorityPanel } from '@/components/admin/authority-panel';
 import { DurationInput } from '@/components/admin/duration-input';
+import { PercentageInput } from '@/components/admin/percentage-input';
 import { PageSection } from '@/components/page-section';
 import { Badge, Button, Callout, Card, Heading, Skeleton, Text } from '@/components/ui';
 import { useDaoContext } from '@/contexts/dao-context';
@@ -29,7 +30,7 @@ type Drafts = Partial<{
   votingDelay: number;
   votingPeriod: number;
   proposalThreshold: string;
-  quorumBps: string;
+  quorumBps: number;
 }>;
 
 type GovernorSettingKey = 'votingDelay' | 'votingPeriod' | 'proposalThreshold' | 'quorumBps';
@@ -258,11 +259,7 @@ export default function GovernanceAdminPage() {
 
   async function applyQuorumBps() {
     if (!settings) return;
-    const value = parseWholeNumber(drafts.quorumBps ?? String(settings.quorumBps));
-    if (value === null) {
-      setFormMessage('Quorum must be a whole number.');
-      return;
-    }
+    const value = typeof drafts.quorumBps === 'number' ? drafts.quorumBps : settings.quorumBps;
 
     if (value === settings.quorumBps) {
       setFormMessage('Quorum is unchanged.');
@@ -480,24 +477,19 @@ export default function GovernanceAdminPage() {
                 <Text className="lede" style={{ margin: 0, fontSize: '0.9rem' }}>
                   Current:{' '}
                   {settings ? (
-                    `${settings.quorumBps} bps`
+                    `${(settings.quorumBps / 100).toFixed(2)}%`
                   ) : (
                     <Skeleton className="skeleton--inline" style={{ width: '80px', height: '1em' }} />
                   )}
                 </Text>
-                <AdminValueForm
-                  value={{ value: drafts.quorumBps ?? String(settings?.quorumBps ?? '') }}
-                  onChange={(value) => setDrafts((current) => ({ ...current, quorumBps: value.value }))}
+                <PercentageInput
+                  id="quorum-bps"
+                  label="Enter quorum percentage"
+                  value={drafts.quorumBps ?? settings?.quorumBps ?? 0}
+                  onChange={(value) => setDrafts((current) => ({ ...current, quorumBps: value }))}
                   disabled={busy}
-                  draftPreview={draftStatus.actionsInDraft.find((a) => a.type === 'set-quorum-bps')}
+                  helperText="Percentage of votes required to pass a proposal."
                 />
-                <Text className="lede" style={{ margin: 0, fontSize: '0.8rem' }}>
-                  {settings ? (
-                    'Apply this change in a single transaction.'
-                  ) : (
-                    <Skeleton style={{ width: '210px', height: '0.8em' }} />
-                  )}
-                </Text>
                 <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
                   <Button
                     type="button"
@@ -506,8 +498,7 @@ export default function GovernanceAdminPage() {
                       busy ||
                       activeAction === 'quorumBps' ||
                       !settings ||
-                      parseWholeNumber(drafts.quorumBps ?? String(settings.quorumBps)) === null ||
-                      (drafts.quorumBps ?? String(settings.quorumBps)) === String(settings.quorumBps)
+                      (typeof drafts.quorumBps === 'number' ? drafts.quorumBps : settings.quorumBps) === settings.quorumBps
                     }
                   >
                     {busy && activeAction === 'quorumBps'
diff --git a/apps/web/src/components/admin/percentage-input.tsx b/apps/web/src/components/admin/percentage-input.tsx
new file mode 100644
index 0000000..968d00a
--- /dev/null
+++ b/apps/web/src/components/admin/percentage-input.tsx
@@ -0,0 +1,80 @@
+'use client';
+
+import { Stack } from 'styled-system/jsx';
+
+import { FieldHelperText, FieldLabel, Input, Text } from '@/components/ui';
+
+type PercentageInputProps = {
+  id: string;
+  label: string;
+  value: number | string | null | undefined;
+  onChange: (bps: number) => void;
+  helperText?: string;
+  disabled?: boolean;
+  min?: number;
+  max?: number;
+};
+
+const bpsToPercent = (bps: number): string => {
+  return (bps / 100).toFixed(2);
+};
+
+const percentToBps = (percent: number): number => {
+  return Math.round(percent * 100);
+};
+
+function parseValue(value: number | string | null | undefined): number {
+  const parsed = typeof value === 'string' ? Number(value) : Number(value ?? 0);
+  return Number.isFinite(parsed) ? Math.max(0, Math.floor(parsed)) : 0;
+}
+
+export function PercentageInput({
+  id,
+  label,
+  value,
+  onChange,
+  helperText,
+  disabled,
+  min = 0,
+  max = 100
+}: PercentageInputProps) {
+  const bps = parseValue(value);
+  const percentageValue = bpsToPercent(bps);
+
+  function handleChange(event: React.ChangeEvent<HTMLInputElement>) {
+    const percentage = Number(event.target.value);
+    if (Number.isNaN(percentage)) return;
+
+    if (percentage < min || percentage > max) {
+      return;
+    }
+
+    onChange(percentToBps(percentage));
+  }
+
+  return (
+    <Stack gap="2">
+      <div>
+        <FieldLabel htmlFor={id}>{label}</FieldLabel>
+        {helperText ? <FieldHelperText>{helperText}</FieldHelperText> : null}
+      </div>
+
+      <Stack gap="2">
+        <Input
+          id={id}
+          type="number"
+          min={String(min)}
+          max={String(max)}
+          step="0.01"
+          value={percentageValue}
+          onChange={handleChange}
+          disabled={disabled}
+          placeholder="0.00"
+        />
+        <Text style={{ fontSize: '0.875rem', color: '#6b7280', margin: 0 }}>
+          {percentageValue}% ({bps} basis points)
+        </Text>
+      </Stack>
+    </Stack>
+  );
+}

From 3b23dd9d020893c7be9f4e40c0026e5bcbcb7468 Mon Sep 17 00:00:00 2001
From: dan13ram <dan13ram@gmail.com>
Date: Sat, 26 Sep 2026 15:50:38 +0530
Subject: [PATCH 06/13] feat(web): enhance contextual helper text in governance
 admin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add more descriptive helper text with practical examples to governance settings fields to better educate users about the impact of each parameter.

Changes:
- Voting delay: Added example that 1 day gives members time to see new proposals
- Voting period: Added context about participation and common values (3-7 days)
- Proposal threshold: Clarified purpose regarding spam prevention
- Quorum: Added concrete example (10% means 10 out of 100 votes)

All helper text now explains the field purpose, constraints, and practical implications.

🤖 Generated with Claude Code

Co-Authored-By: Claude <noreply@anthropic.com>
---
 apps/web/src/app/dao/[daoId]/admin/governance/page.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/web/src/app/dao/[daoId]/admin/governance/page.tsx b/apps/web/src/app/dao/[daoId]/admin/governance/page.tsx
index 7517386..7a8c284 100644
--- a/apps/web/src/app/dao/[daoId]/admin/governance/page.tsx
+++ b/apps/web/src/app/dao/[daoId]/admin/governance/page.tsx
@@ -359,7 +359,7 @@ export default function GovernanceAdminPage() {
                   value={drafts.votingDelay ?? settings?.votingDelay ?? 0}
                   onChange={(value) => setDrafts((current) => ({ ...current, votingDelay: value }))}
                   disabled={busy}
-                  helperText="Minimum 5 minutes. The time before voting begins."
+                  helperText="Time between proposal creation and when voting begins. Minimum 5 minutes. Example: 1 day gives members time to see new proposals."
                 />
                 <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
                   <Button
@@ -396,7 +396,7 @@ export default function GovernanceAdminPage() {
                   value={drafts.votingPeriod ?? settings?.votingPeriod ?? 0}
                   onChange={(value) => setDrafts((current) => ({ ...current, votingPeriod: value }))}
                   disabled={busy}
-                  helperText="The duration during which voting is active. Minimum 1 day."
+                  helperText="How long voting remains open after it starts. Minimum 1 day. Longer periods allow more participation. Common: 3-7 days."
                 />
                 <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
                   <Button
@@ -440,7 +440,7 @@ export default function GovernanceAdminPage() {
                 />
                 <Text className="lede" style={{ margin: 0, fontSize: '0.8rem' }}>
                   {settings ? (
-                    'Apply this change in a single transaction.'
+                    'Minimum voting power required to create a proposal. Higher values prevent spam.'
                   ) : (
                     <Skeleton style={{ width: '210px', height: '0.8em' }} />
                   )}
@@ -488,7 +488,7 @@ export default function GovernanceAdminPage() {
                   value={drafts.quorumBps ?? settings?.quorumBps ?? 0}
                   onChange={(value) => setDrafts((current) => ({ ...current, quorumBps: value }))}
                   disabled={busy}
-                  helperText="Percentage of votes required to pass a proposal."
+                  helperText="Percentage of total votes needed for a proposal to pass. Example: 10% means 10 out of 100 votes required."
                 />
                 <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
                   <Button

From 3ab0753996513c33ebca86996a1a2cc7b9329555 Mon Sep 17 00:00:00 2001
From: dan13ram <dan13ram@gmail.com>
Date: Sat, 26 Sep 2026 15:51:09 +0530
Subject: [PATCH 07/13] feat(web): add change impact messages to governance
 admin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Display clear before/after comparisons when users modify governance parameters. Impact messages appear in blue text below each field showing exactly what will change.

Changes:
- Voting delay: Shows formatted duration change (e.g., "1 day → 2 days")
- Voting period: Shows formatted duration change with context
- Proposal threshold: Shows vote count change (e.g., "10 → 20 votes")
- Quorum: Shows percentage change (e.g., "10.00% → 15.00%")

Impact messages only appear when a value differs from current settings, preventing visual clutter.

🤖 Generated with Claude Code

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../app/dao/[daoId]/admin/governance/page.tsx | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/apps/web/src/app/dao/[daoId]/admin/governance/page.tsx b/apps/web/src/app/dao/[daoId]/admin/governance/page.tsx
index 7a8c284..78798a0 100644
--- a/apps/web/src/app/dao/[daoId]/admin/governance/page.tsx
+++ b/apps/web/src/app/dao/[daoId]/admin/governance/page.tsx
@@ -361,6 +361,11 @@ export default function GovernanceAdminPage() {
                   disabled={busy}
                   helperText="Time between proposal creation and when voting begins. Minimum 5 minutes. Example: 1 day gives members time to see new proposals."
                 />
+                {typeof drafts.votingDelay === 'number' && settings && drafts.votingDelay !== settings.votingDelay ? (
+                  <Text className="lede" style={{ margin: 0, fontSize: '0.8rem', color: '#3b82f6' }}>
+                    Change: {formatSecondsValue(settings.votingDelay)} → {formatSecondsValue(drafts.votingDelay)}
+                  </Text>
+                ) : null}
                 <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
                   <Button
                     type="button"
@@ -398,6 +403,11 @@ export default function GovernanceAdminPage() {
                   disabled={busy}
                   helperText="How long voting remains open after it starts. Minimum 1 day. Longer periods allow more participation. Common: 3-7 days."
                 />
+                {typeof drafts.votingPeriod === 'number' && settings && drafts.votingPeriod !== settings.votingPeriod ? (
+                  <Text className="lede" style={{ margin: 0, fontSize: '0.8rem', color: '#3b82f6' }}>
+                    Change: {formatSecondsValue(settings.votingPeriod)} → {formatSecondsValue(drafts.votingPeriod)}
+                  </Text>
+                ) : null}
                 <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
                   <Button
                     type="button"
@@ -445,6 +455,13 @@ export default function GovernanceAdminPage() {
                     <Skeleton style={{ width: '210px', height: '0.8em' }} />
                   )}
                 </Text>
+                {settings &&
+                drafts.proposalThreshold &&
+                drafts.proposalThreshold !== formatThreshold(settings.proposalThreshold) ? (
+                  <Text className="lede" style={{ margin: 0, fontSize: '0.8rem', color: '#3b82f6' }}>
+                    Change: {formatThreshold(settings.proposalThreshold)} → {drafts.proposalThreshold} votes
+                  </Text>
+                ) : null}
                 <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
                   <Button
                     type="button"
@@ -490,6 +507,11 @@ export default function GovernanceAdminPage() {
                   disabled={busy}
                   helperText="Percentage of total votes needed for a proposal to pass. Example: 10% means 10 out of 100 votes required."
                 />
+                {typeof drafts.quorumBps === 'number' && settings && drafts.quorumBps !== settings.quorumBps ? (
+                  <Text className="lede" style={{ margin: 0, fontSize: '0.8rem', color: '#3b82f6' }}>
+                    Change: {(settings.quorumBps / 100).toFixed(2)}% → {(drafts.quorumBps / 100).toFixed(2)}%
+                  </Text>
+                ) : null}
                 <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
                   <Button
                     type="button"

From a0cd0b9c3c5438c34f9c95cf2bc0732022eb2ed9 Mon Sep 17 00:00:00 2001
From: dan13ram <dan13ram@gmail.com>
Date: Sat, 26 Sep 2026 15:52:37 +0530
Subject: [PATCH 08/13] feat(web): update form spacing and layout consistency
 in governance admin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Improve visual hierarchy and consistency by adding Stack wrappers with gap="1" to group related elements together. This creates better visual separation between:
- Current value display
- Input field and helper text
- Change impact message
- Action button

Changes:
- Wrap current value in Stack gap="1" for consistent spacing
- Wrap helper text and change message in Stack gap="1" to group them
- Maintains overall card spacing of gap="3" between major sections
- Consistent spacing pattern across all four governance settings fields

Benefits:
- Better visual grouping of related information
- Consistent spacing reduces cognitive load
- Aligns with design system spacing patterns
- Improves form scanning and comprehension

🤖 Generated with Claude Code

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../app/dao/[daoId]/admin/governance/page.tsx | 116 ++++++++++--------
 1 file changed, 66 insertions(+), 50 deletions(-)

diff --git a/apps/web/src/app/dao/[daoId]/admin/governance/page.tsx b/apps/web/src/app/dao/[daoId]/admin/governance/page.tsx
index 78798a0..1d073d7 100644
--- a/apps/web/src/app/dao/[daoId]/admin/governance/page.tsx
+++ b/apps/web/src/app/dao/[daoId]/admin/governance/page.tsx
@@ -350,9 +350,11 @@ export default function GovernanceAdminPage() {
                 <div>
                   <Badge>Voting delay</Badge>
                 </div>
-                <Text className="lede" style={{ margin: 0, fontSize: '0.9rem' }}>
-                  Current: {settings ? formatSecondsValue(settings.votingDelay) : '—'}
-                </Text>
+                <Stack gap="1">
+                  <Text className="lede" style={{ margin: 0, fontSize: '0.9rem' }}>
+                    Current: {settings ? formatSecondsValue(settings.votingDelay) : '—'}
+                  </Text>
+                </Stack>
                 <DurationInput
                   id="voting-delay"
                   label="Enter voting delay"
@@ -361,11 +363,13 @@ export default function GovernanceAdminPage() {
                   disabled={busy}
                   helperText="Time between proposal creation and when voting begins. Minimum 5 minutes. Example: 1 day gives members time to see new proposals."
                 />
-                {typeof drafts.votingDelay === 'number' && settings && drafts.votingDelay !== settings.votingDelay ? (
-                  <Text className="lede" style={{ margin: 0, fontSize: '0.8rem', color: '#3b82f6' }}>
-                    Change: {formatSecondsValue(settings.votingDelay)} → {formatSecondsValue(drafts.votingDelay)}
-                  </Text>
-                ) : null}
+                <Stack gap="1">
+                  {typeof drafts.votingDelay === 'number' && settings && drafts.votingDelay !== settings.votingDelay ? (
+                    <Text className="lede" style={{ margin: 0, fontSize: '0.8rem', color: '#3b82f6' }}>
+                      Change: {formatSecondsValue(settings.votingDelay)} → {formatSecondsValue(drafts.votingDelay)}
+                    </Text>
+                  ) : null}
+                </Stack>
                 <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
                   <Button
                     type="button"
@@ -392,9 +396,11 @@ export default function GovernanceAdminPage() {
                 <div>
                   <Badge>Voting period</Badge>
                 </div>
-                <Text className="lede" style={{ margin: 0, fontSize: '0.9rem' }}>
-                  Current: {settings ? formatSecondsValue(settings.votingPeriod) : '—'}
-                </Text>
+                <Stack gap="1">
+                  <Text className="lede" style={{ margin: 0, fontSize: '0.9rem' }}>
+                    Current: {settings ? formatSecondsValue(settings.votingPeriod) : '—'}
+                  </Text>
+                </Stack>
                 <DurationInput
                   id="voting-period"
                   label="Enter voting period"
@@ -403,11 +409,13 @@ export default function GovernanceAdminPage() {
                   disabled={busy}
                   helperText="How long voting remains open after it starts. Minimum 1 day. Longer periods allow more participation. Common: 3-7 days."
                 />
-                {typeof drafts.votingPeriod === 'number' && settings && drafts.votingPeriod !== settings.votingPeriod ? (
-                  <Text className="lede" style={{ margin: 0, fontSize: '0.8rem', color: '#3b82f6' }}>
-                    Change: {formatSecondsValue(settings.votingPeriod)} → {formatSecondsValue(drafts.votingPeriod)}
-                  </Text>
-                ) : null}
+                <Stack gap="1">
+                  {typeof drafts.votingPeriod === 'number' && settings && drafts.votingPeriod !== settings.votingPeriod ? (
+                    <Text className="lede" style={{ margin: 0, fontSize: '0.8rem', color: '#3b82f6' }}>
+                      Change: {formatSecondsValue(settings.votingPeriod)} → {formatSecondsValue(drafts.votingPeriod)}
+                    </Text>
+                  ) : null}
+                </Stack>
                 <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
                   <Button
                     type="button"
@@ -434,34 +442,38 @@ export default function GovernanceAdminPage() {
                 <div>
                   <Badge>Proposal threshold</Badge>
                 </div>
-                <Text className="lede" style={{ margin: 0, fontSize: '0.9rem' }}>
-                  Current:{' '}
-                  {settings ? (
-                    `${settings.proposalThreshold.toString()} votes`
-                  ) : (
-                    <Skeleton className="skeleton--inline" style={{ width: '90px', height: '1em' }} />
-                  )}
-                </Text>
+                <Stack gap="1">
+                  <Text className="lede" style={{ margin: 0, fontSize: '0.9rem' }}>
+                    Current:{' '}
+                    {settings ? (
+                      `${settings.proposalThreshold.toString()} votes`
+                    ) : (
+                      <Skeleton className="skeleton--inline" style={{ width: '90px', height: '1em' }} />
+                    )}
+                  </Text>
+                </Stack>
                 <AdminValueForm
                   value={{ value: drafts.proposalThreshold ?? formatThreshold(settings?.proposalThreshold ?? 0n) }}
                   onChange={(value) => setDrafts((current) => ({ ...current, proposalThreshold: value.value }))}
                   disabled={busy}
                   draftPreview={draftStatus.actionsInDraft.find((a) => a.type === 'set-proposal-threshold')}
                 />
-                <Text className="lede" style={{ margin: 0, fontSize: '0.8rem' }}>
-                  {settings ? (
-                    'Minimum voting power required to create a proposal. Higher values prevent spam.'
-                  ) : (
-                    <Skeleton style={{ width: '210px', height: '0.8em' }} />
-                  )}
-                </Text>
-                {settings &&
-                drafts.proposalThreshold &&
-                drafts.proposalThreshold !== formatThreshold(settings.proposalThreshold) ? (
-                  <Text className="lede" style={{ margin: 0, fontSize: '0.8rem', color: '#3b82f6' }}>
-                    Change: {formatThreshold(settings.proposalThreshold)} → {drafts.proposalThreshold} votes
+                <Stack gap="1">
+                  <Text className="lede" style={{ margin: 0, fontSize: '0.8rem' }}>
+                    {settings ? (
+                      'Minimum voting power required to create a proposal. Higher values prevent spam.'
+                    ) : (
+                      <Skeleton style={{ width: '210px', height: '0.8em' }} />
+                    )}
                   </Text>
-                ) : null}
+                  {settings &&
+                  drafts.proposalThreshold &&
+                  drafts.proposalThreshold !== formatThreshold(settings.proposalThreshold) ? (
+                    <Text className="lede" style={{ margin: 0, fontSize: '0.8rem', color: '#3b82f6' }}>
+                      Change: {formatThreshold(settings.proposalThreshold)} → {drafts.proposalThreshold} votes
+                    </Text>
+                  ) : null}
+                </Stack>
                 <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
                   <Button
                     type="button"
@@ -491,14 +503,16 @@ export default function GovernanceAdminPage() {
                 <div>
                   <Badge>Quorum</Badge>
                 </div>
-                <Text className="lede" style={{ margin: 0, fontSize: '0.9rem' }}>
-                  Current:{' '}
-                  {settings ? (
-                    `${(settings.quorumBps / 100).toFixed(2)}%`
-                  ) : (
-                    <Skeleton className="skeleton--inline" style={{ width: '80px', height: '1em' }} />
-                  )}
-                </Text>
+                <Stack gap="1">
+                  <Text className="lede" style={{ margin: 0, fontSize: '0.9rem' }}>
+                    Current:{' '}
+                    {settings ? (
+                      `${(settings.quorumBps / 100).toFixed(2)}%`
+                    ) : (
+                      <Skeleton className="skeleton--inline" style={{ width: '80px', height: '1em' }} />
+                    )}
+                  </Text>
+                </Stack>
                 <PercentageInput
                   id="quorum-bps"
                   label="Enter quorum percentage"
@@ -507,11 +521,13 @@ export default function GovernanceAdminPage() {
                   disabled={busy}
                   helperText="Percentage of total votes needed for a proposal to pass. Example: 10% means 10 out of 100 votes required."
                 />
-                {typeof drafts.quorumBps === 'number' && settings && drafts.quorumBps !== settings.quorumBps ? (
-                  <Text className="lede" style={{ margin: 0, fontSize: '0.8rem', color: '#3b82f6' }}>
-                    Change: {(settings.quorumBps / 100).toFixed(2)}% → {(drafts.quorumBps / 100).toFixed(2)}%
-                  </Text>
-                ) : null}
+                <Stack gap="1">
+                  {typeof drafts.quorumBps === 'number' && settings && drafts.quorumBps !== settings.quorumBps ? (
+                    <Text className="lede" style={{ margin: 0, fontSize: '0.8rem', color: '#3b82f6' }}>
+                      Change: {(settings.quorumBps / 100).toFixed(2)}% → {(drafts.quorumBps / 100).toFixed(2)}%
+                    </Text>
+                  ) : null}
+                </Stack>
                 <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
                   <Button
                     type="button"

From 6eda16ba2e3af5b4c71ee8433538edda6986eaa0 Mon Sep 17 00:00:00 2001
From: dan13ram <dan13ram@gmail.com>
Date: Sat, 26 Sep 2026 16:02:30 +0530
Subject: [PATCH 09/13] docs: document intentional design pattern for draft
 previews
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add explanatory comments clarifying why draft previews appear only in admin pages
and not in proposal creation flows.

Design rationale:
- Admin pages: Users modify ONE setting at a time in isolation. Draft previews
  prevent accidental duplicate submissions by alerting users when a change is
  already queued (which they wouldn't see otherwise).
- Proposal creation: Users see the FULL action queue below the form at all times,
  giving them complete visibility. Draft previews would be redundant and create
  visual clutter.

This is an intentional architectural pattern, not a missing feature. Comments
added to:
1. action-form-wrapper.tsx - explains why previews aren't passed to proposal forms
2. governance admin page - explains why previews are shown for admin forms

Future maintainers can now understand this is by design.

🤖 Generated with Claude Code

Co-Authored-By: Claude <noreply@anthropic.com>
---
 apps/web/src/app/dao/[daoId]/admin/governance/page.tsx       | 4 ++++
 .../lib/proposal-actions/components/action-form-wrapper.tsx  | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/apps/web/src/app/dao/[daoId]/admin/governance/page.tsx b/apps/web/src/app/dao/[daoId]/admin/governance/page.tsx
index 1d073d7..bb86389 100644
--- a/apps/web/src/app/dao/[daoId]/admin/governance/page.tsx
+++ b/apps/web/src/app/dao/[daoId]/admin/governance/page.tsx
@@ -452,6 +452,10 @@ export default function GovernanceAdminPage() {
                     )}
                   </Text>
                 </Stack>
+                {/* Draft preview shows when this setting change is already in the proposal queue.
+                    This prevents users from accidentally queuing the same change twice, since admin
+                    users interact with isolated settings one at a time (unlike proposal creation
+                    where the full queue is always visible below). */}
                 <AdminValueForm
                   value={{ value: drafts.proposalThreshold ?? formatThreshold(settings?.proposalThreshold ?? 0n) }}
                   onChange={(value) => setDrafts((current) => ({ ...current, proposalThreshold: value.value }))}
diff --git a/apps/web/src/lib/proposal-actions/components/action-form-wrapper.tsx b/apps/web/src/lib/proposal-actions/components/action-form-wrapper.tsx
index b1e4fb4..2ac0f40 100644
--- a/apps/web/src/lib/proposal-actions/components/action-form-wrapper.tsx
+++ b/apps/web/src/lib/proposal-actions/components/action-form-wrapper.tsx
@@ -136,6 +136,11 @@ export function ActionFormWrapper({ daoId }: { daoId: string }) {
               </div>
             }
           >
+            {/* Note: draftPreview is intentionally NOT passed here.
+                Admin forms show draft previews to alert users when a setting change is already queued
+                (preventing duplicate submissions). In proposal creation, the full action queue is
+                visible separately below the form, giving users complete visibility. Draft previews
+                would be redundant here and create visual clutter. */}
             <FormComponent
               value={editingState.draftData}
               onChange={(value) => updateDraft(address, daoId, value)}

From fba335883ee6e32da8bdf3653e3b63be65fe43e7 Mon Sep 17 00:00:00 2001
From: dan13ram <dan13ram@gmail.com>
Date: Sat, 26 Sep 2026 16:59:23 +0530
Subject: [PATCH 10/13] feat(web): improve auction admin UX with launch vs
 resume states
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Update admin auction page to distinguish between three states:
  * 'not-launched': Show "Launch auctions" button with context-aware auth
  * 'paused': Show "Resume auctions" button (existing behavior)
  * 'active': Show "Pause auctions" button (existing behavior)

- Context-aware messaging:
  * "Auctions have not yet been launched" for not-launched state
  * Different mint authority warnings for launch vs resume flows

- Authorization flow supports both:
  * Owner can launch/pause/resume directly
  * Treasury owner can create governance proposal for these actions

- Update dao-shell nav comments to clarify that tab shows if
  auctions_enabled is not false (true or null), ensuring tab shows
  even if auctions were re-enabled after initial disable

🤖 Generated with Claude Code

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../app/dao/[daoId]/admin/auction/page.tsx    | 77 +++++++++++++------
 apps/web/src/components/dao-shell.tsx         | 17 +++-
 2 files changed, 66 insertions(+), 28 deletions(-)

diff --git a/apps/web/src/app/dao/[daoId]/admin/auction/page.tsx b/apps/web/src/app/dao/[daoId]/admin/auction/page.tsx
index 06ca876..c56551b 100644
--- a/apps/web/src/app/dao/[daoId]/admin/auction/page.tsx
+++ b/apps/web/src/app/dao/[daoId]/admin/auction/page.tsx
@@ -26,13 +26,21 @@ import { useAdminDraftStatus } from '@/lib/use-admin-draft-status';
 import { getStellarAddressError, isValidStellarAddress } from '@/lib/validation';
 import { useDaoSessionStore } from '@/stores/dao-session-store';
 
-type AuctionStatus = { paused: boolean; config: { reserve_price: string; payment_token: string | null } };
+type AuctionStatus = {
+  status: 'not-launched' | 'paused' | 'active';
+  paused: boolean;
+  config: { reserve_price: string; payment_token: string | null };
+};
 
 const fetcher = async (url: string): Promise<AuctionStatus> => {
   const response = await fetch(url, { cache: 'no-store' });
   const payload = await response.json();
   if (!response.ok) throw new Error(payload.message || 'Auction status unavailable');
-  return { paused: Boolean(payload.paused), config: payload.config };
+  return {
+    status: payload.status || (payload.paused ? 'paused' : 'active'),
+    paused: Boolean(payload.paused),
+    config: payload.config
+  };
 };
 
 export default function AuctionAdminPage() {
@@ -66,25 +74,33 @@ export default function AuctionAdminPage() {
 
   async function updatePaused(nextPaused: boolean) {
     if (!session.address || (!isOwner && !canProposeAuction)) return;
+
+    // Determine action type and messaging based on auction status
+    const isLaunching = data?.status === 'not-launched' && !nextPaused;
+    const actionType = nextPaused ? 'pause-auction' : 'unpause-auction';
+    const actionTitle = isLaunching ? 'Launch auctions' : (nextPaused ? 'Pause auctions' : 'Resume auctions');
+    const actionDescription = isLaunching
+      ? 'Launch auctions and create the first token.'
+      : (nextPaused ? 'Pause auction activity.' : 'Resume auction activity.');
+
     if (!isOwner && canProposeAuction) {
-      const type = nextPaused ? 'pause-auction' : 'unpause-auction';
-      const handler = getActionHandler(type);
+      const handler = getActionHandler(actionType);
       const action = handler.serialize({}, { config, session: { address: session.address, kit: StellarWalletsKit } });
       proposalDraft.requestAdd({
         daoId,
         action,
-        source: `admin/auction/${type}`,
+        source: `admin/auction/${actionType}`,
         metadata: {
-          title: nextPaused ? 'Pause auctions' : 'Resume auctions',
-          description: nextPaused ? 'Pause auction activity.' : 'Resume auction activity.',
+          title: actionTitle,
+          description: actionDescription,
           url: ''
         },
-        onAdded: () => setFormMessage(`${nextPaused ? 'Pause' : 'Resume'} auctions added to the proposal draft.`)
+        onAdded: () => setFormMessage(`${actionTitle} added to the proposal draft.`)
       });
       return;
     }
     setBusy(true);
-    tx.start(nextPaused ? 'Pausing auctions...' : 'Resuming auctions...');
+    tx.start(isLaunching ? 'Launching auctions...' : (nextPaused ? 'Pausing auctions...' : 'Resuming auctions...'));
     try {
       const client = new AuctionClient({
         contractId: config.auctionContractId,
@@ -375,36 +391,49 @@ export default function AuctionAdminPage() {
                 </div>
               ) : (
                 <Text className="lede" style={{ margin: 0 }}>
-                  {data?.paused
-                    ? 'Bidding and automatic settlement are paused.'
-                    : 'Auctions are active and accepting bids.'}
+                  {data?.status === 'not-launched'
+                    ? 'Auctions have not yet been launched. Click launch to create the first auction.'
+                    : data?.paused
+                      ? 'Bidding and automatic settlement are paused.'
+                      : 'Auctions are active and accepting bids.'}
                 </Text>
               )}
               {data ? (
                 <>
-                  {data.paused && !auctionCanMint ? (
+                  {(data.status === 'not-launched' || data.paused) && !auctionCanMint ? (
                     <Callout
                       variant="warning"
                       title="Auction mint authority is missing."
                       description={
                         mintAuthorityError?.message ||
-                        `Grant ${config.auctionContractId} mint authority in Token Admin before resuming. Resuming launches the next auction and mints its token.`
+                        `Grant ${config.auctionContractId} mint authority in Token Admin before ${data.status === 'not-launched' ? 'launching' : 'resuming'}. ${data.status === 'not-launched' ? 'Launching' : 'Resuming'} creates the first auction and mints its token.`
                       }
                     />
                   ) : null}
                 </>
               ) : null}
               <div style={{ display: 'flex', gap: '10px', flexWrap: 'wrap' }}>
-                <Button onClick={() => void updatePaused(true)} disabled={busy || data?.paused !== false}>
-                  {isOwner ? 'Pause auctions' : 'Add pause proposal'}
-                </Button>
-                <Button
-                  variant="outline"
-                  onClick={() => void updatePaused(false)}
-                  disabled={busy || data?.paused !== true || !auctionCanMint}
-                >
-                  {isOwner ? 'Resume auctions' : 'Add resume proposal'}
-                </Button>
+                {data?.status === 'not-launched' ? (
+                  <Button
+                    onClick={() => void updatePaused(false)}
+                    disabled={busy || !auctionCanMint}
+                  >
+                    {isOwner ? 'Launch auctions' : 'Create launch proposal'}
+                  </Button>
+                ) : (
+                  <>
+                    <Button onClick={() => void updatePaused(true)} disabled={busy || data?.paused !== false}>
+                      {isOwner ? 'Pause auctions' : 'Add pause proposal'}
+                    </Button>
+                    <Button
+                      variant="outline"
+                      onClick={() => void updatePaused(false)}
+                      disabled={busy || data?.paused !== true || !auctionCanMint}
+                    >
+                      {isOwner ? 'Resume auctions' : 'Add resume proposal'}
+                    </Button>
+                  </>
+                )}
               </div>
               <Text className="label">Auction payment token</Text>
               <Text className="lede" style={{ margin: 0 }}>
diff --git a/apps/web/src/components/dao-shell.tsx b/apps/web/src/components/dao-shell.tsx
index 9a93317..a9f1501 100644
--- a/apps/web/src/components/dao-shell.tsx
+++ b/apps/web/src/components/dao-shell.tsx
@@ -28,15 +28,24 @@ import { useDaoSessionStore } from '@/stores/dao-session-store';
 
 type NavItem = { href: Route; label: string; icon: LucideIcon; exact?: boolean };
 
-function getNavItems(daoId: string): NavItem[] {
-  return [
+function getNavItems(daoId: string, auctionEnabled?: boolean | null): NavItem[] {
+  const items: NavItem[] = [
     { href: `/dao/${daoId}` as Route, label: 'Dashboard', icon: LayoutDashboard, exact: true },
     { href: `/dao/${daoId}/proposals` as Route, label: 'Proposals', icon: Vote },
-    { href: `/dao/${daoId}/auctions` as Route, label: 'Auctions', icon: Gavel },
     { href: `/dao/${daoId}/treasury` as Route, label: 'Treasury', icon: Landmark },
     { href: `/dao/${daoId}/members` as Route, label: 'Members', icon: Users },
     { href: `/dao/${daoId}/marketplace` as Route, label: 'Marketplace', icon: Store }
   ];
+
+  // Show Auctions tab based on current auction enabled state.
+  // - false: permanently disabled at finalization, hide tab
+  // - true: enabled (either at finalization or re-enabled later), show tab
+  // - null: DAO still pending finalization, show tab (might be enabled)
+  if (auctionEnabled !== false) {
+    items.splice(3, 0, { href: `/dao/${daoId}/auctions` as Route, label: 'Auctions', icon: Gavel });
+  }
+
+  return items;
 }
 
 function NavLink({
@@ -79,7 +88,7 @@ export function DaoShell({ children }: { children: ReactNode }) {
   const { data: memberLookup } = useGoldskyMember(currentNetwork.tokenContractId, session.address);
   const walletDisabled = Boolean(session.address && session.walletNetworkIssue);
 
-  const baseNavItems = getNavItems(daoId);
+  const baseNavItems = getNavItems(daoId, currentNetwork.auctionEnabled);
   const adminNavItem: NavItem = {
     href: `/dao/${daoId}/admin` as Route,
     label: 'Admin',

From 3c4d7cffdcb4abed9906a6b7283c40a9f1b5a407 Mon Sep 17 00:00:00 2001
From: dan13ram <dan13ram@gmail.com>
Date: Sat, 26 Sep 2026 16:59:52 +0530
Subject: [PATCH 11/13] docs(web): clarify auction status detection and unpause
 handler usage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Add detailed comments to API route explaining how status is determined:
  * No auction token + history = 'paused'
  * No auction token + no history = 'not-launched'

- Update unpause handler label to be generic since it handles both
  'launch' (first time) and 'resume' (after pause) scenarios. Admin
  page provides context-aware labeling based on actual status.

- Clarify nav item logic in dao-shell: shows Auctions tab if
  auction_enabled is not false, ensuring tab appears even if
  auctions were re-enabled after being initially disabled.

🤖 Generated with Claude Code

Co-Authored-By: Claude <noreply@anthropic.com>
---
 apps/web/src/app/api/dao/[daoId]/auctions/route.ts | 2 ++
 apps/web/src/lib/proposal-actions/admin-actions.ts | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/web/src/app/api/dao/[daoId]/auctions/route.ts b/apps/web/src/app/api/dao/[daoId]/auctions/route.ts
index 408237e..4be8c38 100644
--- a/apps/web/src/app/api/dao/[daoId]/auctions/route.ts
+++ b/apps/web/src/app/api/dao/[daoId]/auctions/route.ts
@@ -35,6 +35,8 @@ export async function GET(_request: Request, { params }: { params: Promise<{ dao
     const auction = jsonValue(auctionTx.result) as { token_id?: string } | null;
     const paused = Boolean(pausedTx.result);
     if (!auction || typeof auction.token_id === 'undefined') {
+      // No auction token exists yet. Determine if we've never launched or if we paused after launching.
+      // If there's auction history, we've been paused. Otherwise, we've never launched.
       return NextResponse.json({
         status: paused && history.length > 0 ? 'paused' : 'not-launched',
         auction: null,
diff --git a/apps/web/src/lib/proposal-actions/admin-actions.ts b/apps/web/src/lib/proposal-actions/admin-actions.ts
index e363447..b06d433 100644
--- a/apps/web/src/lib/proposal-actions/admin-actions.ts
+++ b/apps/web/src/lib/proposal-actions/admin-actions.ts
@@ -140,7 +140,9 @@ function emptyAuctionHandler(type: 'pause-auction' | 'unpause-auction', label: s
 }
 
 export const pauseAuctionHandler = emptyAuctionHandler('pause-auction', 'Pause auction');
-export const unpauseAuctionHandler = emptyAuctionHandler('unpause-auction', 'Resume auction');
+// Label is generic since unpause can mean either "launch" (first time) or "resume" (after pause)
+// Admin page determines context-aware label based on auction status
+export const unpauseAuctionHandler = emptyAuctionHandler('unpause-auction', 'Resume or launch auction');
 
 export const setAuctionReservePriceHandler: ActionHandler<AdminReservePriceDraft> = {
   type: 'set-auction-reserve-price',

From c3e49339a9ddbaacc551a7e2abb37073fce43a67 Mon Sep 17 00:00:00 2001
From: dan13ram <dan13ram@gmail.com>
Date: Sat, 26 Sep 2026 17:00:56 +0530
Subject: [PATCH 12/13] fix(web): use context-aware messages for auction launch
 vs resume
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Update transaction status messages in auction admin page to properly
distinguish between launching auctions for the first time vs resuming
after pause:

- Submitted message: 'Auction launch submitted' vs 'Auction resume submitted'
- Success message: 'Auctions launched' vs 'Auctions resumed'

This ensures users get clear feedback about what action was performed,
especially important for first-time auction launch which has different
requirements (mint authority, creates first token, etc).

🤖 Generated with Claude Code

Co-Authored-By: Claude <noreply@anthropic.com>
---
 apps/web/src/app/dao/[daoId]/admin/auction/page.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/web/src/app/dao/[daoId]/admin/auction/page.tsx b/apps/web/src/app/dao/[daoId]/admin/auction/page.tsx
index c56551b..2088de7 100644
--- a/apps/web/src/app/dao/[daoId]/admin/auction/page.tsx
+++ b/apps/web/src/app/dao/[daoId]/admin/auction/page.tsx
@@ -118,9 +118,11 @@ export default function AuctionAdminPage() {
         : await client.unpause({ caller: session.address });
       const sent = await assembled.signAndSend();
       const hash = sent.sendTransactionResponse?.hash ?? '';
-      tx.submitted(nextPaused ? 'Auction pause submitted' : 'Auction resume submitted', hash);
+      const submittedMessage = nextPaused ? 'Auction pause submitted' : (isLaunching ? 'Auction launch submitted' : 'Auction resume submitted');
+      const successMessage = nextPaused ? 'Auctions paused' : (isLaunching ? 'Auctions launched' : 'Auctions resumed');
+      tx.submitted(submittedMessage, hash);
       await waitForConfirmation(hash, config.rpcUrl);
-      tx.success(nextPaused ? 'Auctions paused' : 'Auctions resumed', hash);
+      tx.success(successMessage, hash);
       await mutate();
     } catch (updateError) {
       tx.fail(updateError, 'Auction control failed');

From 7428697ea9bd2a5a67e963802f7d4029adeaa4c5 Mon Sep 17 00:00:00 2001
From: dan13ram <dan13ram@gmail.com>
Date: Sat, 26 Sep 2026 17:09:58 +0530
Subject: [PATCH 13/13] fix(web): resolve admin build checks

---
 .../app/dao/[daoId]/admin/auction/page.tsx    | 75 +++++++++++--------
 .../app/dao/[daoId]/admin/governance/page.tsx | 24 +++---
 .../src/app/dao/[daoId]/admin/owner/page.tsx  |  7 +-
 .../src/app/dao/[daoId]/admin/token/page.tsx  |  2 +-
 .../components/admin/admin-action-forms.tsx   |  3 +-
 .../admin/admin-draft-action-preview.tsx      |  6 +-
 .../admin/auction-auto-pause-dialog.tsx       | 42 +++++------
 .../src/components/admin/authority-panel.tsx  |  2 +-
 apps/web/src/components/wallet-controls.tsx   | 11 +--
 .../batch-mint-governance-token/component.tsx |  3 +-
 apps/web/src/lib/use-admin-draft-status.ts    | 58 +++++---------
 11 files changed, 105 insertions(+), 128 deletions(-)

diff --git a/apps/web/src/app/dao/[daoId]/admin/auction/page.tsx b/apps/web/src/app/dao/[daoId]/admin/auction/page.tsx
index 2088de7..9d91358 100644
--- a/apps/web/src/app/dao/[daoId]/admin/auction/page.tsx
+++ b/apps/web/src/app/dao/[daoId]/admin/auction/page.tsx
@@ -6,10 +6,10 @@ import { useState } from 'react';
 import { Stack } from 'styled-system/jsx';
 import useSWR from 'swr';
 
-import { AuctionAutoPauseDialog, type AuctionAutoPauseAction } from '@/components/admin/auction-auto-pause-dialog';
 import { AdminPaymentTokenForm, AdminReservePriceForm } from '@/components/admin/admin-action-forms';
 import { AdminProposalDraftDialog } from '@/components/admin/admin-proposal-draft-dialog';
 import { AdminSectionNav } from '@/components/admin/admin-section-nav';
+import { type AuctionAutoPauseAction, AuctionAutoPauseDialog } from '@/components/admin/auction-auto-pause-dialog';
 import { PageSection } from '@/components/page-section';
 import { Badge, Button, Callout, Card, Heading, ShortId, Skeleton, Text } from '@/components/ui';
 import { useDaoContext } from '@/contexts/dao-context';
@@ -21,8 +21,8 @@ import { useGoldskyMintAuthorities } from '@/lib/goldsky-queries';
 import { getActionHandler } from '@/lib/proposal-actions/registry';
 import { waitForConfirmation } from '@/lib/transaction-confirmation';
 import { useTransactionFeedback } from '@/lib/transaction-feedback';
-import { useAdminProposalDraft } from '@/lib/use-admin-proposal-draft';
 import { useAdminDraftStatus } from '@/lib/use-admin-draft-status';
+import { useAdminProposalDraft } from '@/lib/use-admin-proposal-draft';
 import { getStellarAddressError, isValidStellarAddress } from '@/lib/validation';
 import { useDaoSessionStore } from '@/stores/dao-session-store';
 
@@ -78,10 +78,12 @@ export default function AuctionAdminPage() {
     // Determine action type and messaging based on auction status
     const isLaunching = data?.status === 'not-launched' && !nextPaused;
     const actionType = nextPaused ? 'pause-auction' : 'unpause-auction';
-    const actionTitle = isLaunching ? 'Launch auctions' : (nextPaused ? 'Pause auctions' : 'Resume auctions');
+    const actionTitle = isLaunching ? 'Launch auctions' : nextPaused ? 'Pause auctions' : 'Resume auctions';
     const actionDescription = isLaunching
       ? 'Launch auctions and create the first token.'
-      : (nextPaused ? 'Pause auction activity.' : 'Resume auction activity.');
+      : nextPaused
+        ? 'Pause auction activity.'
+        : 'Resume auction activity.';
 
     if (!isOwner && canProposeAuction) {
       const handler = getActionHandler(actionType);
@@ -100,7 +102,7 @@ export default function AuctionAdminPage() {
       return;
     }
     setBusy(true);
-    tx.start(isLaunching ? 'Launching auctions...' : (nextPaused ? 'Pausing auctions...' : 'Resuming auctions...'));
+    tx.start(isLaunching ? 'Launching auctions...' : nextPaused ? 'Pausing auctions...' : 'Resuming auctions...');
     try {
       const client = new AuctionClient({
         contractId: config.auctionContractId,
@@ -118,8 +120,12 @@ export default function AuctionAdminPage() {
         : await client.unpause({ caller: session.address });
       const sent = await assembled.signAndSend();
       const hash = sent.sendTransactionResponse?.hash ?? '';
-      const submittedMessage = nextPaused ? 'Auction pause submitted' : (isLaunching ? 'Auction launch submitted' : 'Auction resume submitted');
-      const successMessage = nextPaused ? 'Auctions paused' : (isLaunching ? 'Auctions launched' : 'Auctions resumed');
+      const submittedMessage = nextPaused
+        ? 'Auction pause submitted'
+        : isLaunching
+          ? 'Auction launch submitted'
+          : 'Auction resume submitted';
+      const successMessage = nextPaused ? 'Auctions paused' : isLaunching ? 'Auctions launched' : 'Auctions resumed';
       tx.submitted(submittedMessage, hash);
       await waitForConfirmation(hash, config.rpcUrl);
       tx.success(successMessage, hash);
@@ -152,7 +158,10 @@ export default function AuctionAdminPage() {
       // Add pause action if auctions are active
       if (data.paused === false) {
         const pauseHandler = getActionHandler('pause-auction');
-        const pauseAction = pauseHandler.serialize({}, { config, session: { address: session.address, kit: StellarWalletsKit } });
+        const pauseAction = pauseHandler.serialize(
+          {},
+          { config, session: { address: session.address, kit: StellarWalletsKit } }
+        );
         actions.push(pauseAction);
       }
       const handler = getActionHandler('set-auction-reserve-price');
@@ -170,12 +179,17 @@ export default function AuctionAdminPage() {
           source: `admin/auction/${i === 0 && data.paused === false ? 'pause-auction' : 'set-auction-reserve-price'}`,
           metadata: {
             title: i === 0 && data.paused === false ? 'Pause auctions' : 'Update auction reserve price',
-            description: i === 0 && data.paused === false ? 'Pause auction activity.' : `Set the next auction reserve price to ${reservePrice.trim()}.`,
+            description:
+              i === 0 && data.paused === false
+                ? 'Pause auction activity.'
+                : `Set the next auction reserve price to ${reservePrice.trim()}.`,
             url: ''
           },
           onAdded: () => {
             if (i === actions.length - 1) {
-              setFormMessage(`${data.paused === false ? 'Pause and update' : 'Update'} reserve price added to the proposal draft.`);
+              setFormMessage(
+                `${data.paused === false ? 'Pause and update' : 'Update'} reserve price added to the proposal draft.`
+              );
               setReservePrice('');
             }
           }
@@ -205,7 +219,7 @@ export default function AuctionAdminPage() {
         const pauseHash = pauseSent.sendTransactionResponse?.hash ?? '';
         tx.submitted('Auction pause submitted', pauseHash);
         await waitForConfirmation(pauseHash, config.rpcUrl);
-        tx.submitted('Auctions paused, updating reserve price...');
+        tx.submitted('Auctions paused, updating reserve price...', pauseHash);
       }
 
       const client = new AuctionClient({
@@ -256,7 +270,10 @@ export default function AuctionAdminPage() {
       // Add pause action if auctions are active
       if (data.paused === false) {
         const pauseHandler = getActionHandler('pause-auction');
-        const pauseAction = pauseHandler.serialize({}, { config, session: { address: session.address, kit: StellarWalletsKit } });
+        const pauseAction = pauseHandler.serialize(
+          {},
+          { config, session: { address: session.address, kit: StellarWalletsKit } }
+        );
         actions.push(pauseAction);
       }
       const handler = getActionHandler('set-auction-payment-token');
@@ -274,12 +291,17 @@ export default function AuctionAdminPage() {
           source: `admin/auction/${i === 0 && data.paused === false ? 'pause-auction' : 'set-auction-payment-token'}`,
           metadata: {
             title: i === 0 && data.paused === false ? 'Pause auctions' : 'Update auction payment token',
-            description: i === 0 && data.paused === false ? 'Pause auction activity.' : `Set the auction payment token to ${value}.`,
+            description:
+              i === 0 && data.paused === false
+                ? 'Pause auction activity.'
+                : `Set the auction payment token to ${value}.`,
             url: ''
           },
           onAdded: () => {
             if (i === actions.length - 1) {
-              setFormMessage(`${data.paused === false ? 'Pause and update' : 'Update'} payment token added to the proposal draft.`);
+              setFormMessage(
+                `${data.paused === false ? 'Pause and update' : 'Update'} payment token added to the proposal draft.`
+              );
               setPaymentToken('');
             }
           }
@@ -309,7 +331,7 @@ export default function AuctionAdminPage() {
         const pauseHash = pauseSent.sendTransactionResponse?.hash ?? '';
         tx.submitted('Auction pause submitted', pauseHash);
         await waitForConfirmation(pauseHash, config.rpcUrl);
-        tx.submitted('Auctions paused, updating payment token...');
+        tx.submitted('Auctions paused, updating payment token...', pauseHash);
       }
 
       const client = new AuctionClient({
@@ -416,10 +438,7 @@ export default function AuctionAdminPage() {
               ) : null}
               <div style={{ display: 'flex', gap: '10px', flexWrap: 'wrap' }}>
                 {data?.status === 'not-launched' ? (
-                  <Button
-                    onClick={() => void updatePaused(false)}
-                    disabled={busy || !auctionCanMint}
-                  >
+                  <Button onClick={() => void updatePaused(false)} disabled={busy || !auctionCanMint}>
                     {isOwner ? 'Launch auctions' : 'Create launch proposal'}
                   </Button>
                 ) : (
@@ -442,7 +461,8 @@ export default function AuctionAdminPage() {
                 {data?.config.payment_token
                   ? `${getTreasuryAssets(config.name).find((asset) => asset.contractId === data.config.payment_token)?.code ?? 'Unknown SAC'} · ${data.config.payment_token}`
                   : 'Not configured'}
-                . Changes apply after the next auction is created. If auctions are active, they will be paused automatically.
+                . Changes apply after the next auction is created. If auctions are active, they will be paused
+                automatically.
               </Text>
               <div style={{ display: 'flex', gap: '10px', flexWrap: 'wrap' }}>
                 <AdminPaymentTokenForm
@@ -452,11 +472,7 @@ export default function AuctionAdminPage() {
                   disabled={busy}
                   draftPreview={draftStatus.actionsInDraft.find((a) => a.type === 'set-auction-payment-token')}
                 />
-                <Button
-                  variant="outline"
-                  onClick={() => void updatePaymentToken()}
-                  disabled={busy || !paymentToken}
-                >
+                <Button variant="outline" onClick={() => void updatePaymentToken()} disabled={busy || !paymentToken}>
                   {isOwner ? 'Update payment token' : 'Add payment token proposal'}
                 </Button>
               </div>
@@ -467,7 +483,8 @@ export default function AuctionAdminPage() {
                   ? (getTreasuryAssets(config.name).find((asset) => asset.contractId === data.config.payment_token)
                       ?.code ?? 'SAC')
                   : 'SAC'}{' '}
-                units. Changes apply after the next auction is created. If auctions are active, they will be paused automatically.
+                units. Changes apply after the next auction is created. If auctions are active, they will be paused
+                automatically.
               </Text>
               <div style={{ display: 'flex', gap: '10px', flexWrap: 'wrap' }}>
                 <AdminReservePriceForm
@@ -476,11 +493,7 @@ export default function AuctionAdminPage() {
                   disabled={busy}
                   draftPreview={draftStatus.actionsInDraft.find((a) => a.type === 'set-auction-reserve-price')}
                 />
-                <Button
-                  variant="outline"
-                  onClick={() => void updateReservePrice()}
-                  disabled={busy || !reservePrice}
-                >
+                <Button variant="outline" onClick={() => void updateReservePrice()} disabled={busy || !reservePrice}>
                   {isOwner ? 'Update reserve' : 'Add reserve proposal'}
                 </Button>
               </div>
diff --git a/apps/web/src/app/dao/[daoId]/admin/governance/page.tsx b/apps/web/src/app/dao/[daoId]/admin/governance/page.tsx
index bb86389..ec6c499 100644
--- a/apps/web/src/app/dao/[daoId]/admin/governance/page.tsx
+++ b/apps/web/src/app/dao/[daoId]/admin/governance/page.tsx
@@ -22,8 +22,8 @@ import { useGoldskyGovernorAuthorities } from '@/lib/goldsky-queries';
 import { getActionHandler } from '@/lib/proposal-actions/registry';
 import { waitForConfirmation } from '@/lib/transaction-confirmation';
 import { useTransactionFeedback } from '@/lib/transaction-feedback';
-import { useAdminProposalDraft } from '@/lib/use-admin-proposal-draft';
 import { useAdminDraftStatus } from '@/lib/use-admin-draft-status';
+import { useAdminProposalDraft } from '@/lib/use-admin-proposal-draft';
 import { useDaoSessionStore } from '@/stores/dao-session-store';
 
 type Drafts = Partial<{
@@ -41,15 +41,6 @@ function formatThreshold(value: bigint) {
   return value.toString();
 }
 
-function parseWholeNumber(value: string) {
-  const trimmed = value.trim();
-  if (!/^\d+$/.test(trimmed)) {
-    return null;
-  }
-
-  return Number(trimmed);
-}
-
 function parseBigIntValue(value: string) {
   const trimmed = value.trim();
   if (!/^\d+$/.test(trimmed)) {
@@ -378,7 +369,8 @@ export default function GovernanceAdminPage() {
                       busy ||
                       activeAction === 'votingDelay' ||
                       !settings ||
-                      (typeof drafts.votingDelay === 'number' ? drafts.votingDelay : settings.votingDelay) === settings.votingDelay
+                      (typeof drafts.votingDelay === 'number' ? drafts.votingDelay : settings.votingDelay) ===
+                        settings.votingDelay
                     }
                   >
                     {busy && activeAction === 'votingDelay'
@@ -410,7 +402,9 @@ export default function GovernanceAdminPage() {
                   helperText="How long voting remains open after it starts. Minimum 1 day. Longer periods allow more participation. Common: 3-7 days."
                 />
                 <Stack gap="1">
-                  {typeof drafts.votingPeriod === 'number' && settings && drafts.votingPeriod !== settings.votingPeriod ? (
+                  {typeof drafts.votingPeriod === 'number' &&
+                  settings &&
+                  drafts.votingPeriod !== settings.votingPeriod ? (
                     <Text className="lede" style={{ margin: 0, fontSize: '0.8rem', color: '#3b82f6' }}>
                       Change: {formatSecondsValue(settings.votingPeriod)} → {formatSecondsValue(drafts.votingPeriod)}
                     </Text>
@@ -424,7 +418,8 @@ export default function GovernanceAdminPage() {
                       busy ||
                       activeAction === 'votingPeriod' ||
                       !settings ||
-                      (typeof drafts.votingPeriod === 'number' ? drafts.votingPeriod : settings.votingPeriod) === settings.votingPeriod
+                      (typeof drafts.votingPeriod === 'number' ? drafts.votingPeriod : settings.votingPeriod) ===
+                        settings.votingPeriod
                     }
                   >
                     {busy && activeAction === 'votingPeriod'
@@ -540,7 +535,8 @@ export default function GovernanceAdminPage() {
                       busy ||
                       activeAction === 'quorumBps' ||
                       !settings ||
-                      (typeof drafts.quorumBps === 'number' ? drafts.quorumBps : settings.quorumBps) === settings.quorumBps
+                      (typeof drafts.quorumBps === 'number' ? drafts.quorumBps : settings.quorumBps) ===
+                        settings.quorumBps
                     }
                   >
                     {busy && activeAction === 'quorumBps'
diff --git a/apps/web/src/app/dao/[daoId]/admin/owner/page.tsx b/apps/web/src/app/dao/[daoId]/admin/owner/page.tsx
index d1e23e7..fa8298e 100644
--- a/apps/web/src/app/dao/[daoId]/admin/owner/page.tsx
+++ b/apps/web/src/app/dao/[daoId]/admin/owner/page.tsx
@@ -19,8 +19,8 @@ import { useGoldskyGovernorAuthorities, useGoldskyMintAuthorities } from '@/lib/
 import { getActionHandler } from '@/lib/proposal-actions/registry';
 import { waitForConfirmation } from '@/lib/transaction-confirmation';
 import { useTransactionFeedback } from '@/lib/transaction-feedback';
-import { useAdminProposalDraft } from '@/lib/use-admin-proposal-draft';
 import { useAdminDraftStatus } from '@/lib/use-admin-draft-status';
+import { useAdminProposalDraft } from '@/lib/use-admin-proposal-draft';
 import { useDaoSessionStore } from '@/stores/dao-session-store';
 
 async function submitAuthorityUpdate(
@@ -69,10 +69,7 @@ export default function OwnerPage() {
   const [formMessage, setFormMessage] = useState('');
   const [busy, setBusy] = useState(false);
   const proposalDraft = useAdminProposalDraft();
-  const draftStatus = useAdminDraftStatus(daoId, [
-    'set-mint-authority',
-    'set-governor-authority'
-  ]);
+  const draftStatus = useAdminDraftStatus(daoId, ['set-mint-authority', 'set-governor-authority']);
   const tx = useTransactionFeedback(config.name);
   const {
     data: mintAuthorities,
diff --git a/apps/web/src/app/dao/[daoId]/admin/token/page.tsx b/apps/web/src/app/dao/[daoId]/admin/token/page.tsx
index a753494..4aea530 100644
--- a/apps/web/src/app/dao/[daoId]/admin/token/page.tsx
+++ b/apps/web/src/app/dao/[daoId]/admin/token/page.tsx
@@ -19,8 +19,8 @@ import type { BatchMintGovernanceTokenData } from '@/lib/proposal-actions/action
 import { getActionHandler } from '@/lib/proposal-actions/registry';
 import { waitForConfirmation } from '@/lib/transaction-confirmation';
 import { useTransactionFeedback } from '@/lib/transaction-feedback';
-import { useAdminProposalDraft } from '@/lib/use-admin-proposal-draft';
 import { useAdminDraftStatus } from '@/lib/use-admin-draft-status';
+import { useAdminProposalDraft } from '@/lib/use-admin-proposal-draft';
 import { useDaoSessionStore } from '@/stores/dao-session-store';
 
 export default function TokenAdminPage() {
diff --git a/apps/web/src/components/admin/admin-action-forms.tsx b/apps/web/src/components/admin/admin-action-forms.tsx
index 0bc522a..05e4e92 100644
--- a/apps/web/src/components/admin/admin-action-forms.tsx
+++ b/apps/web/src/components/admin/admin-action-forms.tsx
@@ -7,8 +7,7 @@ import { AuctionPaymentTokenSelect } from '@/components/auction/auction-payment-
 import { AuctionReservePriceField } from '@/components/auction/auction-reserve-price-field';
 import { FieldHelperText, FieldLabel, Input, Select } from '@/components/ui';
 import { getConfiguredAuctionNetwork } from '@/lib/auction-values';
-import type { ActionFormProps } from '@/lib/proposal-actions/types';
-import type { ProposalQueuedAction } from '@/stores/proposal-composer-store';
+import type { ActionFormProps, ProposalQueuedAction } from '@/lib/proposal-actions/types';
 
 export type AdminAuthorityDraft = { authority: string; enabled: boolean };
 export type AdminValueDraft = { value: string };
diff --git a/apps/web/src/components/admin/admin-draft-action-preview.tsx b/apps/web/src/components/admin/admin-draft-action-preview.tsx
index f960023..175e09e 100644
--- a/apps/web/src/components/admin/admin-draft-action-preview.tsx
+++ b/apps/web/src/components/admin/admin-draft-action-preview.tsx
@@ -5,8 +5,8 @@ import { useState } from 'react';
 import { Stack } from 'styled-system/jsx';
 
 import { Badge, Text } from '@/components/ui';
+import type { ProposalQueuedAction } from '@/lib/proposal-actions/types';
 import { getProposalActionLabel, getProposalActionSummary } from '@/lib/proposal-call';
-import type { ProposalQueuedAction } from '@/stores/proposal-composer-store';
 
 interface AdminDraftActionPreviewProps {
   action: ProposalQueuedAction;
@@ -106,9 +106,7 @@ export function AdminDraftActionPreview({
           }}
         >
           <Stack gap="2">
-            <Badge style={{ width: 'fit-content', fontSize: '0.75rem' }}>
-              {label}
-            </Badge>
+            <Badge style={{ width: 'fit-content', fontSize: '0.75rem' }}>{label}</Badge>
             <Text
               style={{
                 fontSize: '0.875rem',
diff --git a/apps/web/src/components/admin/auction-auto-pause-dialog.tsx b/apps/web/src/components/admin/auction-auto-pause-dialog.tsx
index 94adc05..3c9b66a 100644
--- a/apps/web/src/components/admin/auction-auto-pause-dialog.tsx
+++ b/apps/web/src/components/admin/auction-auto-pause-dialog.tsx
@@ -2,7 +2,7 @@
 
 import { Stack } from 'styled-system/jsx';
 
-import { Button, Dialog, Heading, Text } from '@/components/ui';
+import { Button, Card, Heading, Text } from '@/components/ui';
 
 export type AuctionAutoPauseAction = 'payment-token' | 'reserve-price';
 
@@ -21,23 +21,30 @@ export function AuctionAutoPauseDialog({
   onCancel,
   isLoading = false
 }: AuctionAutoPauseDialogProps) {
-  const actionLabel =
-    action === 'payment-token' ? 'Update payment token' : 'Update reserve price';
+  const actionLabel = action === 'payment-token' ? 'Update payment token' : 'Update reserve price';
+
+  if (!open) return null;
 
   return (
-    <Dialog open={open} onOpenChange={(nextOpen) => !nextOpen && onCancel()}>
-      <div style={{ maxWidth: '500px' }}>
+    <div className="proposal-consent-backdrop" role="presentation" onClick={isLoading ? undefined : onCancel}>
+      <Card
+        className="proposal-consent-dialog"
+        role="dialog"
+        aria-modal="true"
+        aria-labelledby="auction-auto-pause-title"
+        onClick={(event) => event.stopPropagation()}
+        p="5"
+      >
         <Stack gap="4">
           <Stack gap="2">
-            <Heading style={{ fontSize: '1.125rem' }}>
+            <Heading id="auction-auto-pause-title" style={{ fontSize: '1.125rem' }}>
               Pause auctions to make changes
             </Heading>
             <Text style={{ margin: 0 }}>
-              Auctions are currently active. To update the {action === 'payment-token' ? 'payment token' : 'reserve price'}, the auctions must be paused first.
-            </Text>
-            <Text style={{ margin: 0, marginTop: '0.5rem' }}>
-              The following actions will be executed together:
+              Auctions are currently active. To update the{' '}
+              {action === 'payment-token' ? 'payment token' : 'reserve price'}, the auctions must be paused first.
             </Text>
+            <Text style={{ margin: 0, marginTop: '0.5rem' }}>The following actions will be executed together:</Text>
             <ol style={{ margin: '0.5rem 0 0 1.5rem', paddingLeft: 0 }}>
               <li style={{ marginBottom: '0.25rem' }}>
                 <strong>Pause auctions</strong> - Stop all auction activity
@@ -51,22 +58,15 @@ export function AuctionAutoPauseDialog({
             </Text>
           </Stack>
           <div style={{ display: 'flex', gap: '10px', justifyContent: 'flex-end' }}>
-            <Button
-              variant="outline"
-              onClick={onCancel}
-              disabled={isLoading}
-            >
+            <Button variant="outline" onClick={onCancel} disabled={isLoading}>
               Cancel
             </Button>
-            <Button
-              onClick={onConfirm}
-              disabled={isLoading}
-            >
+            <Button onClick={onConfirm} disabled={isLoading}>
               {isLoading ? 'Processing...' : 'Pause and update'}
             </Button>
           </div>
         </Stack>
-      </div>
-    </Dialog>
+      </Card>
+    </div>
   );
 }
diff --git a/apps/web/src/components/admin/authority-panel.tsx b/apps/web/src/components/admin/authority-panel.tsx
index 3a410ae..c9aaf17 100644
--- a/apps/web/src/components/admin/authority-panel.tsx
+++ b/apps/web/src/components/admin/authority-panel.tsx
@@ -4,7 +4,7 @@ import { Stack } from 'styled-system/jsx';
 
 import { AuthorityActionForm } from '@/components/admin/admin-action-forms';
 import { Badge, Button, Card, Heading, ShortId, Skeleton, Text } from '@/components/ui';
-import type { ProposalQueuedAction } from '@/stores/proposal-composer-store';
+import type { ProposalQueuedAction } from '@/lib/proposal-actions/types';
 
 type AuthorityItem = {
   authority: string;
diff --git a/apps/web/src/components/wallet-controls.tsx b/apps/web/src/components/wallet-controls.tsx
index 32a438b..4e0bf70 100644
--- a/apps/web/src/components/wallet-controls.tsx
+++ b/apps/web/src/components/wallet-controls.tsx
@@ -177,7 +177,6 @@ export function WalletControls({ network }: { network?: WalletNetwork }) {
       let authMethod: 'sep53' | 'sep10' = 'sep53';
       try {
         setAuthStatus('awaiting-signature');
-        console.log('[Auth] Attempting SEP-53 message signing', { address: result.address, wallet: isWalletConnectSelected() ? 'WalletConnect' : 'Desktop' });
         const { signedMessage, signerAddress } = await StellarWalletsKit.signMessage(message, {
           networkPassphrase: currentNetwork.passphrase,
           address: result.address
@@ -187,23 +186,21 @@ export function WalletControls({ network }: { network?: WalletNetwork }) {
         }
 
         setAuthStatus('verifying-signature');
-        console.log('[Auth] SEP-53 signature obtained, verifying...');
         await verifyAuthProof({
           address: result.address,
           message,
           signature: normalizeWalletSignature(signedMessage)
         });
-        console.log('[Auth] SEP-53 verification successful');
       } catch (error) {
-        console.warn('[Auth] SEP-53 failed, attempting SEP-10 fallback', { error: error instanceof Error ? error.message : String(error) });
+        console.warn('[Auth] SEP-53 failed, attempting SEP-10 fallback', {
+          error: error instanceof Error ? error.message : String(error)
+        });
         if (!isSep53UnsupportedError(error)) throw error;
 
         authMethod = 'sep10';
         setAuthStatus('requesting-challenge');
-        console.log('[Auth] Requesting SEP-10 challenge...');
         const sep10Challenge = await requestSep10Challenge(result.address);
         setAuthStatus('awaiting-signature');
-        console.log('[Auth] Attempting SEP-10 transaction signing');
         const { signedTxXdr, signerAddress } = await StellarWalletsKit.signTransaction(sep10Challenge.xdr, {
           networkPassphrase: currentNetwork.passphrase,
           address: result.address
@@ -213,9 +210,7 @@ export function WalletControls({ network }: { network?: WalletNetwork }) {
         }
 
         setAuthStatus('verifying-signature');
-        console.log('[Auth] SEP-10 transaction signed, verifying...');
         await verifySep10Proof(signedTxXdr);
-        console.log('[Auth] SEP-10 verification successful');
       }
 
       setAuthenticatedAddress(result.address);
diff --git a/apps/web/src/lib/proposal-actions/actions/batch-mint-governance-token/component.tsx b/apps/web/src/lib/proposal-actions/actions/batch-mint-governance-token/component.tsx
index 7fa4bcb..4f73d54 100644
--- a/apps/web/src/lib/proposal-actions/actions/batch-mint-governance-token/component.tsx
+++ b/apps/web/src/lib/proposal-actions/actions/batch-mint-governance-token/component.tsx
@@ -7,9 +7,8 @@ import { Stack } from 'styled-system/jsx';
 import { AdminDraftActionPreview } from '@/components/admin/admin-draft-action-preview';
 import { FieldHelperText, FieldLabel, Input } from '@/components/ui';
 
-import type { ActionFormProps } from '../../types';
+import type { ActionFormProps, ProposalQueuedAction } from '../../types';
 import type { BatchMintGovernanceTokenData } from './types';
-import type { ProposalQueuedAction } from '@/stores/proposal-composer-store';
 
 export function BatchMintGovernanceTokenForm({
   value,
diff --git a/apps/web/src/lib/use-admin-draft-status.ts b/apps/web/src/lib/use-admin-draft-status.ts
index 140bbb3..26af6ad 100644
--- a/apps/web/src/lib/use-admin-draft-status.ts
+++ b/apps/web/src/lib/use-admin-draft-status.ts
@@ -1,19 +1,13 @@
-import { useCallback, useMemo } from 'react';
-
-import { getProposalActionResourceKey } from '@/lib/proposal-call';
-import { useProposalComposerStore } from '@/stores/proposal-composer-store';
-import { normalizeWalletAddress } from '@/stores/proposal-composer-store';
-import type { ProposalActionType, ProposalQueuedAction } from '@/stores/proposal-composer-store';
+import { getProposalActionResourceKey } from '@/lib/proposal-action-identity';
+import type { ProposalActionType, ProposalQueuedAction } from '@/lib/proposal-actions/types';
 import { useDaoSessionStore } from '@/stores/dao-session-store';
+import { normalizeWalletAddress, useProposalComposerStore } from '@/stores/proposal-composer-store';
 
 /**
  * Hook to check if specific action types exist in the proposal draft
  * Useful for forms to show draft previews and detect conflicts
  */
-export function useAdminDraftStatus(
-  daoId: string,
-  actionTypes: ProposalActionType | ProposalActionType[]
-) {
+export function useAdminDraftStatus(daoId: string, actionTypes: ProposalActionType | ProposalActionType[]) {
   const address = useDaoSessionStore((state) => state.address);
   const draft = useProposalComposerStore((state) => {
     if (!address) return null;
@@ -21,38 +15,24 @@ export function useAdminDraftStatus(
     return state.draftsByWallet[walletKey]?.[daoId] ?? null;
   });
 
-  const typesToCheck = useMemo(
-    () => (Array.isArray(actionTypes) ? actionTypes : [actionTypes]),
-    [actionTypes]
-  );
-
-  const actionsInDraft = useMemo(() => {
-    if (!draft?.queuedActions) return [];
-    return draft.queuedActions.filter((action) => typesToCheck.includes(action.type));
-  }, [draft?.queuedActions, typesToCheck]);
-
-  const resourceKeys = useMemo(() => {
-    return actionsInDraft.map((action) => getProposalActionResourceKey(action));
-  }, [actionsInDraft]);
+  const typesToCheck = Array.isArray(actionTypes) ? actionTypes : [actionTypes];
+  const actionsInDraft = draft?.queuedActions.filter((action) => typesToCheck.includes(action.type)) ?? [];
+  const resourceKeys = actionsInDraft.map((action) => getProposalActionResourceKey(action));
 
-  const checkConflict = useCallback(
-    (testAction: ProposalQueuedAction): { hasConflict: boolean; existingAction?: ProposalQueuedAction } => {
-      const testResourceKey = getProposalActionResourceKey(testAction);
-      const existing = actionsInDraft.find((action) => {
-        const existingKey = getProposalActionResourceKey(action);
-        return existingKey === testResourceKey;
-      });
+  function checkConflict(testAction: ProposalQueuedAction): {
+    hasConflict: boolean;
+    existingAction?: ProposalQueuedAction;
+  } {
+    const testResourceKey = getProposalActionResourceKey(testAction);
+    const existing = actionsInDraft.find((action) => getProposalActionResourceKey(action) === testResourceKey);
 
-      if (!existing) {
-        return { hasConflict: false };
-      }
+    if (!existing) {
+      return { hasConflict: false };
+    }
 
-      // Check if it's a duplicate or just a conflict
-      const isDuplicate = JSON.stringify(existing) === JSON.stringify(testAction);
-      return { hasConflict: !isDuplicate, existingAction: existing };
-    },
-    [actionsInDraft]
-  );
+    const isDuplicate = JSON.stringify(existing) === JSON.stringify(testAction);
+    return { hasConflict: !isDuplicate, existingAction: existing };
+  }
 
   return {
     actionsInDraft,