From ee053cfe042c96372641e3f897085739d889858a Mon Sep 17 00:00:00 2001
From: Tobiloba0 <tabilon58@gmail.com>
Date: Thu, 30 Jul 2026 01:08:49 +0100
Subject: [PATCH] Add vesting pending admin visibility

---
 contracts/vesting/src/lib.rs                  | 39 ++++++++++++++
 frontend/app/claim/ClaimVesting.tsx           | 29 ++++++++--
 .../[contractId]/components/AdminPanel.tsx    | 35 +++---------
 frontend/components/PendingAdminBanner.tsx    | 54 +++++++++++++++++++
 frontend/lib/vesting.ts                       | 29 ++++++++++
 5 files changed, 155 insertions(+), 31 deletions(-)
 create mode 100644 frontend/components/PendingAdminBanner.tsx

diff --git a/contracts/vesting/src/lib.rs b/contracts/vesting/src/lib.rs
index 8f007fd5..94151806 100644
--- a/contracts/vesting/src/lib.rs
+++ b/contracts/vesting/src/lib.rs
@@ -121,6 +121,12 @@ impl VestingContract {
         env.events().publish((symbol_short!("acc_adm"),), pending);
     }
 
+    /// Cancel a proposed admin transfer. Must be called by the current admin.
+    pub fn cancel_admin_proposal(env: Env) {
+        Self::_require_admin(&env);
+        env.storage().instance().remove(&DataKey::PendingAdmin);
+    }
+
     /// Create a cliff + linear vesting schedule for `recipient`.
     ///
     /// `cliff_ledger` — ledger number when tokens start unlocking.
@@ -495,6 +501,12 @@ impl VestingContract {
             .expect("not initialized")
     }
 
+    /// Returns the address proposed via `propose_admin` that has not yet
+    /// accepted the role, or `None` when no transfer is in progress.
+    pub fn pending_admin(env: Env) -> Option<Address> {
+        env.storage().instance().get(&DataKey::PendingAdmin)
+    }
+
     /// Returns the token contract address managed by this vesting contract.
     pub fn get_token_contract(env: Env) -> Address {
         env.storage()
@@ -913,6 +925,33 @@ mod test {
         assert!(!schedule.revoked);
     }
 
+    #[test]
+    fn test_pending_admin_getter_and_cancel() {
+        let env = Env::default();
+        env.mock_all_auths();
+
+        let contract_id = env.register_contract(None, VestingContract);
+        let client = VestingContractClient::new(&env, &contract_id);
+
+        let admin = Address::generate(&env);
+        let proposed = Address::generate(&env);
+        let token = Address::generate(&env);
+
+        client.initialize(&admin, &token);
+
+        assert_eq!(client.pending_admin(), None);
+
+        client.propose_admin(&proposed);
+        assert_eq!(client.pending_admin(), Some(proposed.clone()));
+
+        client.cancel_admin_proposal();
+        assert_eq!(client.pending_admin(), None);
+
+        client.propose_admin(&proposed);
+        client.accept_admin();
+        assert_eq!(client.pending_admin(), None);
+    }
+
     #[test]
     fn test_vested_before_cliff() {
         let env = Env::default();
diff --git a/frontend/app/claim/ClaimVesting.tsx b/frontend/app/claim/ClaimVesting.tsx
index e3f714bd..01968f4f 100644
--- a/frontend/app/claim/ClaimVesting.tsx
+++ b/frontend/app/claim/ClaimVesting.tsx
@@ -2,15 +2,17 @@
 
 import { useCallback, useState } from "react";
 import { Button } from "@/components/ui/Button";
+import { PendingAdminBanner } from "@/components/PendingAdminBanner";
 import { useToast } from "@/app/providers/ToastProvider";
 import { useWallet } from "@/app/hooks/useWallet";
 import {
+  fetchVestingAdminState,
   fetchScheduleCount,
   fetchVestingInfo,
   buildReleaseTx,
   submitTx,
   formatTokenAmount,
-  truncateAddress,
+  type VestingAdminState,
   type VestingInfo,
 } from "@/lib/vesting";
 
@@ -24,6 +26,7 @@ export function ClaimVesting() {
   const [contractId, setContractId] = useState("");
   // One VestingInfo entry per schedule index
   const [schedules, setSchedules] = useState<VestingInfo[]>([]);
+  const [adminState, setAdminState] = useState<VestingAdminState | null>(null);
   const [loading, setLoading] = useState(false);
   // Track which schedule index is currently releasing
   const [releasingIndex, setReleasingIndex] = useState<number | null>(null);
@@ -48,13 +51,25 @@ export function ClaimVesting() {
 
     setError(null);
     setSchedules([]);
+    setAdminState(null);
     setLoading(true);
 
     try {
-      const count = await fetchScheduleCount(trimmed, publicKey);
+      const [count, vestingAdmin] = await Promise.all([
+        fetchScheduleCount(trimmed, publicKey),
+        fetchVestingAdminState(trimmed),
+      ]);
+      setAdminState(vestingAdmin);
 
       if (count === 0) {
-        setError("No vesting schedule found for your wallet on this contract.");
+        if (
+          vestingAdmin.pendingAdmin === publicKey ||
+          vestingAdmin.admin === publicKey
+        ) {
+          setError(null);
+        } else {
+          setError("No vesting schedule found for your wallet on this contract.");
+        }
         return;
       }
 
@@ -192,6 +207,14 @@ export function ClaimVesting() {
             )}
           </div>
 
+          {adminState?.pendingAdmin && (
+            <PendingAdminBanner
+              pendingAdmin={adminState.pendingAdmin}
+              connectedWallet={publicKey}
+              nonPendingMessage="The current admin can cancel the proposal from the contract's admin section."
+            />
+          )}
+
           {/* ── One card per schedule ─────────────────────────────────── */}
           {schedules.map((info, idx) => (
             <ScheduleCard
diff --git a/frontend/app/dashboard/[contractId]/components/AdminPanel.tsx b/frontend/app/dashboard/[contractId]/components/AdminPanel.tsx
index 8970a464..c5119cee 100644
--- a/frontend/app/dashboard/[contractId]/components/AdminPanel.tsx
+++ b/frontend/app/dashboard/[contractId]/components/AdminPanel.tsx
@@ -1,17 +1,12 @@
 "use client";
 
 import React from "react";
-import {
-  ShieldAlert,
-  ExternalLink,
-  Lock,
-  UserPlus,
-  CircleAlert,
-} from "lucide-react";
+import { ShieldAlert, ExternalLink, Lock, CircleAlert } from "lucide-react";
 import { useWallet } from "../../../hooks/useWallet";
 import { useNetwork } from "../../../providers/NetworkProvider";
 import { useAdminAction } from "../hooks/useAdminAction";
 import { useTokenAdminState } from "../hooks/useTokenAdminState";
+import { PendingAdminBanner } from "@/components/PendingAdminBanner";
 import { MintCard } from "./admin/MintCard";
 import { SupplyCard } from "./admin/SupplyCard";
 import { VestingCard } from "./admin/VestingCard";
@@ -149,27 +144,11 @@ export function AdminPanel({
       )}
 
       {!state.locked && state.pendingAdmin && (
-        <div className="mb-6 flex items-start gap-3 rounded-xl border border-stellar-500/30 bg-stellar-500/5 p-4">
-          <UserPlus
-            className="mt-0.5 h-5 w-5 shrink-0 text-stellar-400"
-            aria-hidden="true"
-          />
-          <div className="text-sm">
-            <p className="font-semibold text-stellar-200">
-              Admin transfer pending
-            </p>
-            <p className="mt-1 text-xs leading-relaxed text-stellar-100/80">
-              A two-step admin transfer is in progress. Pending admin →{" "}
-              <span className="font-mono text-stellar-300">
-                {state.pendingAdmin.slice(0, 6)}…{state.pendingAdmin.slice(-6)}
-              </span>
-              .{" "}
-              {state.pendingAdmin === publicKey
-                ? "Your connected wallet is the pending admin — accept the role below to finalize."
-                : "It is not finalized until the pending admin accepts. As the current admin you can cancel or overwrite it below."}
-            </p>
-          </div>
-        </div>
+        <PendingAdminBanner
+          pendingAdmin={state.pendingAdmin}
+          connectedWallet={publicKey}
+          nonPendingMessage="It is not finalized until the pending admin accepts. As the current admin you can cancel or overwrite it below."
+        />
       )}
 
       <div className="grid grid-cols-1 md:grid-cols-2 gap-6 pb-12">
diff --git a/frontend/components/PendingAdminBanner.tsx b/frontend/components/PendingAdminBanner.tsx
new file mode 100644
index 00000000..275cbb6d
--- /dev/null
+++ b/frontend/components/PendingAdminBanner.tsx
@@ -0,0 +1,54 @@
+"use client";
+
+import { UserPlus } from "lucide-react";
+import { truncateAddress } from "@/lib/stellar";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/Alert";
+
+export interface PendingAdminBannerProps {
+  pendingAdmin: string;
+  connectedWallet?: string | null;
+  title?: string;
+  /**
+   * Extra guidance shown when the current wallet is not the pending admin.
+   * This keeps the copy accurate across token and vesting admin panels.
+   */
+  nonPendingMessage?: string;
+}
+
+/**
+ * Shared banner for the two-step admin transfer flow.
+ *
+ * The token dashboard already used this pattern inline. Pulling it into a
+ * shared component lets other admin surfaces — including vesting — reuse the
+ * same visibility affordance when a proposal is in flight.
+ */
+export function PendingAdminBanner({
+  pendingAdmin,
+  connectedWallet,
+  title = "Admin transfer pending",
+  nonPendingMessage = "It is not finalized until the pending admin accepts.",
+}: PendingAdminBannerProps) {
+  const isPendingAdmin =
+    !!connectedWallet && connectedWallet === pendingAdmin;
+
+  return (
+    <Alert variant="default" className="mb-6">
+      <div className="flex items-start gap-3">
+        <UserPlus className="mt-0.5 h-5 w-5 shrink-0 text-stellar-400" />
+        <div>
+          <AlertTitle>{title}</AlertTitle>
+          <AlertDescription>
+            A two-step admin transfer is in progress. Pending admin →{" "}
+            <span className="font-mono font-medium text-stellar-300">
+              {truncateAddress(pendingAdmin)}
+            </span>
+            .{" "}
+            {isPendingAdmin
+              ? "Your connected wallet is the pending admin — accept the role below to finalize it."
+              : nonPendingMessage}
+          </AlertDescription>
+        </div>
+      </div>
+    </Alert>
+  );
+}
diff --git a/frontend/lib/vesting.ts b/frontend/lib/vesting.ts
index d892ad99..7aeaee47 100644
--- a/frontend/lib/vesting.ts
+++ b/frontend/lib/vesting.ts
@@ -31,6 +31,11 @@ export interface VestingInfo {
   isPaused: boolean;
 }
 
+export interface VestingAdminState {
+  admin: string | null;
+  pendingAdmin: string | null;
+}
+
 /* ── XDR Decoders ──────────────────────────────────────────────────── */
 
 function decodeI128(val: StellarSdk.xdr.ScVal): bigint {
@@ -95,6 +100,18 @@ function toU32ScVal(value: number): StellarSdk.xdr.ScVal {
   return StellarSdk.nativeToScVal(BigInt(value), { type: "u32" });
 }
 
+async function fetchOptionalAddress(
+  contractId: string,
+  method: string,
+): Promise<string | null> {
+  try {
+    const result = await simulateCall(contractId, method);
+    return decodeAddress(result);
+  } catch {
+    return null;
+  }
+}
+
 export async function fetchScheduleCount(
   contractId: string,
   recipientAddress: string,
@@ -231,6 +248,18 @@ export async function fetchVestingInfo(
   };
 }
 
+/** Fetch the vesting contract's admin and any pending admin proposal. */
+export async function fetchVestingAdminState(
+  contractId: string,
+): Promise<VestingAdminState> {
+  const [admin, pendingAdmin] = await Promise.all([
+    fetchOptionalAddress(contractId, "get_admin"),
+    fetchOptionalAddress(contractId, "pending_admin"),
+  ]);
+
+  return { admin, pendingAdmin };
+}
+
 /**
  * Build a release() transaction XDR for signing.
  * The caller should sign via wallet and then submit.