cilantro-react 0.1.1 → 0.1.2

package/dist/index.js

@@ -63,6 +63,7 @@ __export(index_exports, {
   useSignerSelection: () => useSignerSelection,
   useSigners: () => useSigners,
   useSignersForSelectedWallet: () => useSignersForSelectedWallet,
+  useSignersRaw: () => useSignersRaw,
   useTransactionSigning: () => useTransactionSigning,
   useWalletAddress: () => useWalletAddress,
   useWallets: () => useWallets
@@ -263,25 +264,34 @@ function CilantroAuthProvider({
   const login = async (usernameOrEmail, password) => {
     try {
       const result = await (0, import_auth.login)({ usernameOrEmail, password });
-      const responseData = extractResponseData(result);
-      if (!responseData?.jwt) throw new Error("No JWT token received from server");
-      const jwt = responseData.jwt;
-      const userType = responseData.userType;
+      const data = result && typeof result === "object" && "data" in result ? result.data : void 0;
+      if (!data?.jwt) throw new Error("No JWT token received from server");
+      const jwt = data.jwt;
+      const userType = data.userType;
       setToken(jwt);
       setSdkAuth(jwt);
       if (typeof window !== "undefined") {
         localStorage.setItem(jwtStorageKey, jwt);
         document.cookie = `cilantro_jwt=${jwt}; path=/; max-age=${60 * 60 * 24 * 7}`;
       }
-      try {
-        const payload = JSON.parse(atob(jwt.split(".")[1]));
+      if (data.user && typeof data.user === "object") {
+        const u = data.user;
         setUser({
-          username: payload.username,
-          email: payload.email,
-          userType: userType ?? payload.userType
+          username: u.username,
+          email: u.email,
+          userType: userType ?? u.userType
         });
-      } catch {
-        setUser({ userType });
+      } else {
+        try {
+          const payload = JSON.parse(atob(jwt.split(".")[1]));
+          setUser({
+            username: payload.username,
+            email: payload.email,
+            userType: userType ?? payload.userType
+          });
+        } catch {
+          setUser({ userType });
+        }
       }
       onLoginSuccess?.();
     } catch (error) {
@@ -364,12 +374,12 @@ function WalletProvider({ children, storageKey = DEFAULT_STORAGE_KEY }) {
           setSelectedWallet(wallet);
         } else {
           setSelectedWallet(wallets[0]);
-          if (typeof window !== "undefined") localStorage.setItem(storageKey, wallets[0].id);
+          if (typeof window !== "undefined") localStorage.setItem(storageKey, wallets[0].id ?? wallets[0].walletId);
         }
       } else {
         if (wallets.length > 0) {
           setSelectedWallet(wallets[0]);
-          if (typeof window !== "undefined") localStorage.setItem(storageKey, wallets[0].id);
+          if (typeof window !== "undefined") localStorage.setItem(storageKey, wallets[0].id ?? wallets[0].walletId);
         }
       }
     } else if (wallets.length === 0) {
@@ -383,19 +393,13 @@ function WalletProvider({ children, storageKey = DEFAULT_STORAGE_KEY }) {
       if (token) setSdkAuth(token);
       const result = await (0, import_wallet.findAll)();
       const walletsList = extractResponseData(result) ?? [];
-      const formattedWallets = Array.isArray(walletsList) ? walletsList.map((wallet) => {
-        const w = wallet;
-        return {
-          id: String(w.walletId ?? w.id ?? ""),
-          walletId: String(w.walletId ?? w.id ?? ""),
-          walletName: w.walletName ?? "",
-          address: w.walletAddress ?? w.address ?? "",
-          walletAddress: w.walletAddress ?? w.address ?? "",
-          chain: w.chain ?? "solana",
-          active: w.active !== false,
-          ...w
-        };
-      }) : [];
+      const list = Array.isArray(walletsList) ? walletsList : [];
+      const formattedWallets = list.map((w) => ({
+        ...w,
+        id: w.walletId,
+        address: w.walletAddress,
+        active: w.isActive
+      }));
       setWallets(formattedWallets);
     } catch (error) {
       console.error("Failed to load wallets:", error);
@@ -408,7 +412,7 @@ function WalletProvider({ children, storageKey = DEFAULT_STORAGE_KEY }) {
     const wallet = wallets.find((w) => w.id === walletId || w.walletId === walletId);
     if (wallet) {
       setSelectedWallet(wallet);
-      if (typeof window !== "undefined") localStorage.setItem(storageKey, wallet.id);
+      if (typeof window !== "undefined") localStorage.setItem(storageKey, wallet.id ?? wallet.walletId);
     }
   };
   const refreshWallets = async () => {
@@ -651,6 +655,52 @@ function useSigners(options = {}) {
   return { signers, isLoading, error, refresh };
 }
 
+// src/hooks/useSignersRaw.ts
+var import_react5 = require("react");
+var import_wallet3 = require("cilantro-sdk/wallet");
+function useSignersRaw(options = {}) {
+  const { walletId } = options;
+  const { token } = useCilantroAuth();
+  const [signersRaw, setSignersRaw] = (0, import_react5.useState)(null);
+  const [isLoading, setIsLoading] = (0, import_react5.useState)(false);
+  const [error, setError] = (0, import_react5.useState)(null);
+  const load = (0, import_react5.useCallback)(async () => {
+    if (!walletId) {
+      setSignersRaw(null);
+      return;
+    }
+    setIsLoading(true);
+    setError(null);
+    try {
+      if (token) setSdkAuth(token);
+      const result = await (0, import_wallet3.listSigners)(walletId);
+      setSignersRaw(result);
+    } catch (err) {
+      setSignersRaw(null);
+      setError(err instanceof Error ? err.message : String(err));
+    } finally {
+      setIsLoading(false);
+    }
+  }, [walletId, token]);
+  (0, import_react5.useEffect)(() => {
+    if (!walletId) {
+      setSignersRaw(null);
+      setError(null);
+      return;
+    }
+    load();
+  }, [walletId, load]);
+  const refresh = (0, import_react5.useCallback)(async () => {
+    if (walletId) await load();
+  }, [walletId, load]);
+  return {
+    signersRaw: walletId ? signersRaw : null,
+    isLoading,
+    error,
+    refresh
+  };
+}
+
 // src/hooks/useSignersForSelectedWallet.ts
 function useSignersForSelectedWallet(options = {}) {
   const { walletId: walletIdOverride } = options;
@@ -660,28 +710,21 @@ function useSignersForSelectedWallet(options = {}) {
 }
 
 // src/hooks/useDelegatedKeys.ts
-var import_react5 = require("react");
+var import_react6 = require("react");
 var import_delegated_keys = require("cilantro-sdk/delegated-keys");
 function normalizeKeys(list) {
-  return list.filter((k) => k != null && typeof k === "object" && "id" in k).map((k) => ({
-    id: String(k.id ?? ""),
-    walletId: String(k.walletId ?? ""),
-    name: k.name,
-    publicKey: String(k.publicKey ?? ""),
-    permissions: k.permissions ?? {},
-    isActive: k.isActive !== false,
-    createdAt: k.createdAt,
-    expiresAt: k.expiresAt,
-    ...k
+  return list.map((k) => ({
+    ...k,
+    id: k.delegatedKeyId
   }));
 }
 function useDelegatedKeys(options = {}) {
   const { walletId, filterActive = true } = options;
   const { token } = useCilantroAuth();
-  const [keys, setKeys] = (0, import_react5.useState)([]);
-  const [isLoading, setIsLoading] = (0, import_react5.useState)(false);
-  const [error, setError] = (0, import_react5.useState)(null);
-  const loadKeys = (0, import_react5.useCallback)(async () => {
+  const [keys, setKeys] = (0, import_react6.useState)([]);
+  const [isLoading, setIsLoading] = (0, import_react6.useState)(false);
+  const [error, setError] = (0, import_react6.useState)(null);
+  const loadKeys = (0, import_react6.useCallback)(async () => {
     if (!walletId) {
       setKeys([]);
       return;
@@ -693,12 +736,16 @@ function useDelegatedKeys(options = {}) {
       const result = await (0, import_delegated_keys.findAll)(walletId);
       const keysData = extractResponseData(result) ?? [];
       const list = Array.isArray(keysData) ? keysData : [];
-      let loaded = normalizeKeys(list);
+      const valid = list.filter(
+        (k) => k != null && typeof k === "object" && "delegatedKeyId" in k
+      );
+      let loaded = normalizeKeys(valid);
       if (filterActive) {
         const now = Date.now();
         loaded = loaded.filter((key) => {
           if (!key.isActive) return false;
-          const exp = key.expiresAt ? new Date(key.expiresAt).getTime() : null;
+          const raw = key.expiresAt;
+          const exp = raw != null && (typeof raw === "string" || typeof raw === "number") ? new Date(raw).getTime() : null;
           return exp === null || exp > now;
         });
       }
@@ -710,17 +757,17 @@ function useDelegatedKeys(options = {}) {
       setIsLoading(false);
     }
   }, [walletId, token, filterActive]);
-  (0, import_react5.useEffect)(() => {
+  (0, import_react6.useEffect)(() => {
     loadKeys();
   }, [loadKeys]);
-  const refresh = (0, import_react5.useCallback)(async () => {
+  const refresh = (0, import_react6.useCallback)(async () => {
     if (walletId) await loadKeys();
   }, [walletId, loadKeys]);
   return { keys, isLoading, error, refresh };
 }
 
 // src/hooks/useSignerSelection.ts
-var import_react6 = require("react");
+var import_react7 = require("react");
 function useSignerSelection(options = {}) {
   const { walletId: walletIdOverride, signingMethod = "sdk-signer" } = options;
   const { selectedWallet } = useWallets();
@@ -728,17 +775,17 @@ function useSignerSelection(options = {}) {
   const { signers: availableSigners, isLoading: isLoadingSigners } = useSigners({
     walletId: effectiveWalletId || null
   });
-  const [selectedWalletId, setSelectedWalletId] = (0, import_react6.useState)(effectiveWalletId);
-  const [selectedSigner, setSelectedSigner] = (0, import_react6.useState)(null);
-  (0, import_react6.useEffect)(() => {
+  const [selectedWalletId, setSelectedWalletId] = (0, import_react7.useState)(effectiveWalletId);
+  const [selectedSigner, setSelectedSigner] = (0, import_react7.useState)(null);
+  (0, import_react7.useEffect)(() => {
     setSelectedWalletId(effectiveWalletId);
   }, [effectiveWalletId]);
-  (0, import_react6.useEffect)(() => {
+  (0, import_react7.useEffect)(() => {
     if (signingMethod !== "sdk-signer") {
       setSelectedSigner(null);
     }
   }, [signingMethod]);
-  const reset = (0, import_react6.useCallback)(() => {
+  const reset = (0, import_react7.useCallback)(() => {
     setSelectedWalletId("");
     setSelectedSigner(null);
   }, []);
@@ -754,7 +801,7 @@ function useSignerSelection(options = {}) {
 }
 
 // src/hooks/useCanSign.ts
-var import_react7 = require("react");
+var import_react8 = require("react");
 function useCanSign(options = {}) {
   const {
     signingMethod = "sdk-signer",
@@ -764,7 +811,7 @@ function useCanSign(options = {}) {
   const { token } = useCilantroAuth();
   const { selectedWallet } = useWallets();
   const { selectedSigner } = useSignerSelection({ signingMethod });
-  return (0, import_react7.useMemo)(() => {
+  return (0, import_react8.useMemo)(() => {
     const hasToken = !!token;
     const hasWallet = !!selectedWallet?.id || !!selectedWallet?.walletId;
     const isSdkSigner = signingMethod === "sdk-signer";
@@ -789,7 +836,7 @@ function useCanSign(options = {}) {
 }
 
 // src/hooks/useMessageSigning.ts
-var import_react8 = require("react");
+var import_react9 = require("react");
 
 // src/core/signer-signing/core.ts
 var import_web3 = require("@solana/web3.js");
@@ -848,7 +895,7 @@ var import_helpers6 = require("cilantro-sdk/helpers");
 var import_web32 = require("@solana/web3.js");
 var import_helpers4 = require("cilantro-sdk/helpers");
 var import_transactions = require("cilantro-sdk/transactions");
-var import_wallet3 = require("cilantro-sdk/wallet");
+var import_wallet4 = require("cilantro-sdk/wallet");
 async function createEmailSignerHelper(walletId, email) {
   const trimmedEmail = email.trim();
   if (!trimmedEmail) throw new Error("Email address is required");
@@ -865,7 +912,7 @@ async function createPhoneSignerHelper(walletId, phone) {
 }
 async function createExternalSignerHelper(walletId, address) {
   if (!address.trim()) throw new Error("Wallet address is required");
-  return await (0, import_wallet3.createExternalWalletSigner)(walletId, { address: address.trim(), chain: "solana" });
+  return await (0, import_wallet4.createExternalWalletSigner)(walletId, { address: address.trim(), chain: "solana" });
 }
 async function registerPasskeySigner(walletId) {
   if (!(0, import_helpers4.isWebAuthnSupported)()) throw new Error("WebAuthn is not supported in this browser");
@@ -909,9 +956,10 @@ async function signAndSendPasskeyTransaction(walletId, signerId, transaction, op
     });
   }
   const unsignedTransaction = transaction.serialize({ verifySignatures: false }).toString("base64");
-  const authOptions = await (0, import_wallet3.startPasskeyAuthentication)(walletId, {
-    credentialId: options?.credentialId
-  });
+  const authOptions = await (0, import_wallet4.startPasskeyAuthentication)(
+    walletId,
+    { credentialId: options?.credentialId }
+  );
   const authData = extractResponseData(authOptions);
   if (!authData) throw new Error("Failed to get authentication options");
   const authDataValue = authData && typeof authData === "object" && "data" in authData ? authData.data : authData;
@@ -930,7 +978,10 @@ async function signAndSendPasskeyTransaction(walletId, signerId, transaction, op
   };
   const result = await (0, import_transactions.sendRawPasskeyTransaction)(dto);
   const resultData = extractResponseData(result);
-  return { signature: resultData?.signature ?? "", status: resultData?.status };
+  return {
+    signature: resultData?.signature ?? "",
+    status: resultData?.status
+  };
 }
 
 // src/core/signer-signing/errors.ts
@@ -996,10 +1047,11 @@ async function signMessageWithSigner(walletId, signer, messageText) {
     validateSignerActive(signer, signerType);
     const storageOptions = getStorageOptions();
     try {
-      const signature = await (0, import_helpers6.signWithEmailSigner)(walletId, signerId, message, storageOptions);
+      const signatureBytes = await (0, import_helpers6.signWithEmailSigner)(walletId, signerId, message, storageOptions);
       const keypair = await (0, import_helpers6.getEmailSignerKeypair)(walletId, signerId, storageOptions);
       return {
-        signature: Buffer.from(signature).toString("hex"),
+        signature: Buffer.from(signatureBytes).toString("base64"),
+        message: messageText,
         publicKey: Buffer.from(keypair.publicKey).toString("hex"),
         signerType: SIGNER_TYPES.EMAIL
       };
@@ -1011,10 +1063,11 @@ async function signMessageWithSigner(walletId, signer, messageText) {
     validateSignerActive(signer, signerType);
     const storageOptions = getStorageOptions();
     try {
-      const signature = await (0, import_helpers6.signWithPhoneSigner)(walletId, signerId, message, storageOptions);
+      const signatureBytes = await (0, import_helpers6.signWithPhoneSigner)(walletId, signerId, message, storageOptions);
       const keypair = await (0, import_helpers6.getPhoneSignerKeypair)(walletId, signerId, storageOptions);
       return {
-        signature: Buffer.from(signature).toString("hex"),
+        signature: Buffer.from(signatureBytes).toString("base64"),
+        message: messageText,
         publicKey: Buffer.from(keypair.publicKey).toString("hex"),
         signerType: SIGNER_TYPES.PHONE
       };
@@ -1024,8 +1077,10 @@ async function signMessageWithSigner(walletId, signer, messageText) {
   }
   if (signerType === SIGNER_TYPES.PASSKEY) {
     const signResult = await signWithPasskey(walletId, signerId, messageText, { useBrowserAutofill: false });
+    const signatureBase64 = Buffer.from(signResult.signature, "hex").toString("base64");
     return {
-      signature: signResult.signature,
+      signature: signatureBase64,
+      message: messageText,
       signerType: SIGNER_TYPES.PASSKEY,
       signer: signResult.signer
     };
@@ -1033,10 +1088,11 @@ async function signMessageWithSigner(walletId, signer, messageText) {
   if (signerType === SIGNER_TYPES.EXTERNAL || signerType === SIGNER_TYPES.API_KEY) {
     validateSignerActive(signer, signerType);
     const storageOptions = getStorageOptions();
-    const signature = await (0, import_helpers6.signWithSigner)(walletId, signerId, signerType, message, storageOptions);
+    const signatureBytes = await (0, import_helpers6.signWithSigner)(walletId, signerId, signerType, message, storageOptions);
     const keypair = await (0, import_helpers6.deriveSignerKeypair)(walletId, signerId, signerType, storageOptions);
     return {
-      signature: Buffer.from(signature).toString("hex"),
+      signature: Buffer.from(signatureBytes).toString("base64"),
+      message: messageText,
       publicKey: Buffer.from(keypair.publicKey).toString("base64"),
       signerType
     };
@@ -1046,7 +1102,7 @@ async function signMessageWithSigner(walletId, signer, messageText) {
 
 // src/core/signer-signing/transaction-signing.ts
 var import_helpers7 = require("cilantro-sdk/helpers");
-var import_wallet4 = require("cilantro-sdk/wallet");
+var import_wallet5 = require("cilantro-sdk/wallet");
 
 // src/core/signer-signing/validation.ts
 var import_web33 = require("@solana/web3.js");
@@ -1152,14 +1208,16 @@ async function signTransactionWithEmailOrPhone(walletId, signerId, signerType, u
   );
 }
 async function submitSignedTransaction(walletId, signedTransactionBase64) {
-  const submitResult = await (0, import_wallet4.submitTransaction)(walletId, {
+  const submitResult = await (0, import_wallet5.submitTransaction)(walletId, {
     signedTransaction: signedTransactionBase64
   });
   const resultData = extractResponseData(submitResult);
   if (!resultData?.signature) throw new Error("Server did not return a transaction signature");
+  const status = resultData.status ?? "pending";
   return {
     signature: resultData.signature,
-    confirmationStatus: resultData.status === "confirmed" ? "confirmed" : "pending"
+    status,
+    confirmationStatus: status
   };
 }
 async function handlePasskeyTransaction(walletId, signerId, transaction, connection) {
@@ -1172,7 +1230,7 @@ async function handlePasskeyTransaction(walletId, signerId, transaction, connect
   const result = await signAndSendPasskeyTransaction(walletId, signerId, transaction, {
     useBrowserAutofill: false
   });
-  let confirmationStatus = "confirmed";
+  let status = "confirmed";
   try {
     await connection.confirmTransaction({
       signature: result.signature,
@@ -1182,12 +1240,12 @@ async function handlePasskeyTransaction(walletId, signerId, transaction, connect
   } catch (error) {
     const errorMsg = extractErrorMessage(error);
     if (errorMsg.includes("block height exceeded") || errorMsg.includes("expired") || errorMsg.includes("timeout")) {
-      confirmationStatus = "pending";
+      status = "pending";
     } else {
       throw new Error(`Transaction confirmation failed: ${errorMsg}. Signature: ${result.signature}`);
     }
   }
-  return { signature: result.signature, confirmationStatus };
+  return { signature: result.signature, status, confirmationStatus: status };
 }
 async function handleEmailOrPhoneTransaction(walletId, signer, signerType, signerId, transaction) {
   validateSignerActive(signer, signerType);
@@ -1299,24 +1357,17 @@ async function signAndSendTransactionWithSigner(walletId, signer, transaction, c
 
 // src/core/signer-signing/wallet-data.ts
 var import_web34 = require("@solana/web3.js");
-var import_wallet5 = require("cilantro-sdk/wallet");
+var import_wallet6 = require("cilantro-sdk/wallet");
 async function getWalletData(walletId) {
-  const walletDataResponse = await (0, import_wallet5.findOne)(walletId);
+  const walletDataResponse = await (0, import_wallet6.findOne)(walletId);
   const walletData = extractResponseData(walletDataResponse);
   if (!walletData) throw new Error("Wallet data is empty");
-  const address = String(
-    walletData.address ?? walletData.walletAddress ?? walletData.solanaAddress ?? walletData.publicKey ?? walletData.pubkey ?? ""
-  ).trim();
-  if (!address) throw new Error(`No wallet address found. Available fields: ${Object.keys(walletData).join(", ")}`);
+  const address = String(walletData.walletAddress ?? "").trim();
+  if (!address) throw new Error("No wallet address found (walletAddress is empty).");
   const walletPublicKey = new import_web34.PublicKey(address);
-  const adminData = walletData.admin;
-  const adminPubkey = String(
-    walletData.adminSignerPubkey ?? walletData.adminSigner ?? adminData?.publicKey ?? ""
-  ).trim();
+  const adminPubkey = String(walletData.adminSignerPubkey ?? "").trim();
   if (!adminPubkey) {
-    throw new Error(
-      `adminSignerPubkey not found in wallet data. Available fields: ${Object.keys(walletData).join(", ")}`
-    );
+    throw new Error("adminSignerPubkey not found in wallet data.");
   }
   const adminSignerPubkey = new import_web34.PublicKey(adminPubkey);
   return { walletPublicKey, adminSignerPubkey };
@@ -1332,9 +1383,9 @@ function useMessageSigning(options) {
     walletAdapterSignMessage,
     walletAdapterPublicKey
   } = options;
-  const [messageText, setMessageText] = (0, import_react8.useState)("Hello, Solana!");
-  const [signResultState, setSignResultState] = (0, import_react8.useState)({ status: "idle" });
-  const [isSigning, setIsSigning] = (0, import_react8.useState)(false);
+  const [messageText, setMessageText] = (0, import_react9.useState)("Hello, Solana!");
+  const [signResultState, setSignResultState] = (0, import_react9.useState)({ status: "idle" });
+  const [isSigning, setIsSigning] = (0, import_react9.useState)(false);
   const handleSign = async () => {
     setIsSigning(true);
     setSignResultState({ status: "loading" });
@@ -1364,7 +1415,7 @@ function useMessageSigning(options) {
       setSignResultState({
         status: "success",
         message: `Message signed successfully with ${signerType} signer!`,
-        detail: { message: messageText, ...result }
+        detail: { ...result }
       });
     } catch (error) {
       const errorMsg = extractErrorMessage(error);
@@ -1392,7 +1443,7 @@ function useMessageSigning(options) {
 }
 
 // src/hooks/useTransactionSigning.ts
-var import_react9 = require("react");
+var import_react10 = require("react");
 function useTransactionSigning(options) {
   const {
     token,
@@ -1403,9 +1454,9 @@ function useTransactionSigning(options) {
     walletAdapterPublicKey,
     connection
   } = options;
-  const [transactionResultState, setTransactionResultState] = (0, import_react9.useState)({ status: "idle" });
-  const [isSigningTransaction, setIsSigningTransaction] = (0, import_react9.useState)(false);
-  const [isSendingTransaction, setIsSendingTransaction] = (0, import_react9.useState)(false);
+  const [transactionResultState, setTransactionResultState] = (0, import_react10.useState)({ status: "idle" });
+  const [isSigningTransaction, setIsSigningTransaction] = (0, import_react10.useState)(false);
+  const [isSendingTransaction, setIsSendingTransaction] = (0, import_react10.useState)(false);
   const signTransaction = async (transaction) => {
     setIsSigningTransaction(true);
     setTransactionResultState({ status: "loading" });
@@ -1483,6 +1534,7 @@ function useTransactionSigning(options) {
         message: `Transaction sent with ${signerType} signer!`,
         detail: {
           signature: result.signature,
+          status: result.status,
           confirmationStatus: result.confirmationStatus,
           explorerUrl: `https://solscan.io/tx/${result.signature}?cluster=devnet`
         }
@@ -1617,8 +1669,9 @@ function WalletSelector(props) {
   const effectiveValue = value ?? selectedWallet?.id ?? selectedWallet?.walletId ?? "";
   const selected = wallets.find((w) => w.id === effectiveValue || w.walletId === effectiveValue) ?? selectedWallet;
   const handleSelect = (wallet) => {
-    selectWallet(wallet.id);
-    onWalletChange?.(wallet.id, wallet);
+    const id = wallet.id ?? wallet.walletId;
+    selectWallet(id);
+    onWalletChange?.(id, wallet);
   };
   const handleValueChange = (id) => {
     selectWallet(id);
@@ -1666,7 +1719,10 @@ function WalletSelector(props) {
   }
   return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("div", { className: cn(className, classNames?.root), "data-cilantro-wallet-selector": true, children: /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(Select, { value: effectiveValue || void 0, onValueChange: handleValueChange, disabled: isLoading, children: [
     /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(SelectTrigger, { className: classNames?.trigger, "aria-label": "Select wallet", children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(SelectValue, { placeholder: isLoading ? "Loading..." : placeholder }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(SelectContent, { className: classNames?.content, children: wallets.map((w) => /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(SelectItem, { value: w.id, className: classNames?.item, children: w.walletName || w.id }, w.id)) })
+    /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(SelectContent, { className: classNames?.content, children: wallets.map((w) => {
+      const id = w.id ?? w.walletId;
+      return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(SelectItem, { value: id, className: classNames?.item, children: w.walletName || id }, id);
+    }) })
   ] }) });
 }
 
@@ -1802,10 +1858,11 @@ function DelegatedKeySelector(props) {
     filterActive
   });
   const onSelect = (key) => {
-    onChange?.(key.id, key);
+    const id = key.id ?? key.delegatedKeyId;
+    onChange?.(id, key);
   };
   const handleValueChange = (id) => {
-    const key = keys.find((k) => k.id === id) ?? null;
+    const key = keys.find((k) => (k.id ?? k.delegatedKeyId) === id) ?? null;
     onChange?.(id, key);
   };
   if (children) {
@@ -1844,7 +1901,13 @@ function DelegatedKeySelector(props) {
       "aria-live": "polite",
       children: isLoading ? /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("p", { className: cn("text-sm text-muted-foreground", classNames?.message), children: "Loading delegated keys..." }) : error ? /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("p", { className: cn("text-sm text-destructive", classNames?.message), role: "alert", children: error }) : keys.length === 0 ? /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("p", { className: cn("text-sm text-muted-foreground", classNames?.message), children: "No delegated keys found." }) : /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(Select, { value: (value ?? "") || void 0, onValueChange: handleValueChange, children: [
         /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(SelectTrigger, { className: classNames?.trigger, "aria-label": "Select delegated key", children: /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(SelectValue, { placeholder }) }),
-        /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(SelectContent, { className: classNames?.content, children: keys.map((k) => /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(SelectItem, { value: k.id, className: classNames?.item, children: k.name || k.publicKey.slice(0, 8) + "..." }, k.id)) })
+        /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(SelectContent, { className: classNames?.content, children: keys.map((k) => {
+          const id = k.id ?? k.delegatedKeyId;
+          return /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(SelectItem, { value: id, className: classNames?.item, children: [
+            k.publicKey.slice(0, 8),
+            "..."
+          ] }, id);
+        }) })
       ] })
     }
   );
@@ -2159,7 +2222,7 @@ function TransactionSigningForm({
 }
 
 // src/components/LoginForm.tsx
-var import_react10 = require("react");
+var import_react11 = require("react");
 
 // src/ui/input.tsx
 var React7 = __toESM(require("react"));
@@ -2195,9 +2258,9 @@ function LoginForm({
   renderSwitchToRegister
 }) {
   const { login, isLoading } = useCilantroAuth();
-  const [usernameOrEmail, setUsernameOrEmail] = (0, import_react10.useState)("");
-  const [password, setPassword] = (0, import_react10.useState)("");
-  const [error, setError] = (0, import_react10.useState)(null);
+  const [usernameOrEmail, setUsernameOrEmail] = (0, import_react11.useState)("");
+  const [password, setPassword] = (0, import_react11.useState)("");
+  const [error, setError] = (0, import_react11.useState)(null);
   const handleSubmit = async (e) => {
     e.preventDefault();
     setError(null);
@@ -2277,7 +2340,7 @@ function LoginForm({
 }
 
 // src/components/RegisterForm.tsx
-var import_react11 = require("react");
+var import_react12 = require("react");
 var import_jsx_runtime17 = require("react/jsx-runtime");
 function RegisterForm({
   className,
@@ -2291,10 +2354,10 @@ function RegisterForm({
   renderSwitchToLogin
 }) {
   const { register, isLoading } = useCilantroAuth();
-  const [username, setUsername] = (0, import_react11.useState)("");
-  const [email, setEmail] = (0, import_react11.useState)("");
-  const [password, setPassword] = (0, import_react11.useState)("");
-  const [error, setError] = (0, import_react11.useState)(null);
+  const [username, setUsername] = (0, import_react12.useState)("");
+  const [email, setEmail] = (0, import_react12.useState)("");
+  const [password, setPassword] = (0, import_react12.useState)("");
+  const [error, setError] = (0, import_react12.useState)(null);
   const handleSubmit = async (e) => {
     e.preventDefault();
     setError(null);
@@ -2391,7 +2454,7 @@ function RegisterForm({
 }
 
 // src/components/AuthForm.tsx
-var import_react12 = require("react");
+var import_react13 = require("react");
 var import_jsx_runtime18 = require("react/jsx-runtime");
 function AuthForm({
   defaultMode = "login",
@@ -2410,12 +2473,12 @@ function AuthForm({
   isActive = true
 }) {
   const { login, register, isLoading } = useCilantroAuth();
-  const [mode, setMode] = (0, import_react12.useState)(defaultMode);
-  const [usernameOrEmail, setUsernameOrEmail] = (0, import_react12.useState)("");
-  const [username, setUsername] = (0, import_react12.useState)("");
-  const [email, setEmail] = (0, import_react12.useState)("");
-  const [password, setPassword] = (0, import_react12.useState)("");
-  const [error, setError] = (0, import_react12.useState)(null);
+  const [mode, setMode] = (0, import_react13.useState)(defaultMode);
+  const [usernameOrEmail, setUsernameOrEmail] = (0, import_react13.useState)("");
+  const [username, setUsername] = (0, import_react13.useState)("");
+  const [email, setEmail] = (0, import_react13.useState)("");
+  const [password, setPassword] = (0, import_react13.useState)("");
+  const [error, setError] = (0, import_react13.useState)(null);
   const isLogin = mode === "login";
   const handleSubmit = async (e) => {
     e.preventDefault();
@@ -2602,7 +2665,7 @@ function AuthGuard({
 }
 
 // src/components/AddSignerForm.tsx
-var import_react13 = require("react");
+var import_react14 = require("react");
 
 // src/ui/dialog.tsx
 var React8 = __toESM(require("react"));
@@ -2680,12 +2743,12 @@ function AddSignerForm({
   classNames,
   asDialog = true
 }) {
-  const [signerType, setSignerType] = (0, import_react13.useState)(null);
-  const [email, setEmail] = (0, import_react13.useState)("");
-  const [phone, setPhone] = (0, import_react13.useState)("");
-  const [address, setAddress] = (0, import_react13.useState)("");
-  const [isSubmitting, setIsSubmitting] = (0, import_react13.useState)(false);
-  const [error, setError] = (0, import_react13.useState)(null);
+  const [signerType, setSignerType] = (0, import_react14.useState)(null);
+  const [email, setEmail] = (0, import_react14.useState)("");
+  const [phone, setPhone] = (0, import_react14.useState)("");
+  const [address, setAddress] = (0, import_react14.useState)("");
+  const [isSubmitting, setIsSubmitting] = (0, import_react14.useState)(false);
+  const [error, setError] = (0, import_react14.useState)(null);
   const resetForm = () => {
     setSignerType(null);
     setEmail("");
@@ -2958,7 +3021,7 @@ function AddSignerForm({
 }
 
 // src/components/SignerList.tsx
-var import_react14 = require("react");
+var import_react15 = require("react");
 var import_jsx_runtime22 = require("react/jsx-runtime");
 function SignerList({
   walletId,
@@ -2969,7 +3032,7 @@ function SignerList({
   children
 }) {
   const { signers, isLoading, error, refresh } = useSigners({ walletId });
-  const [addSignerOpen, setAddSignerOpen] = (0, import_react14.useState)(false);
+  const [addSignerOpen, setAddSignerOpen] = (0, import_react15.useState)(false);
   const handleAddSuccess = () => {
     refresh();
     onSignerAdded?.();
@@ -3149,6 +3212,7 @@ function ThemeProvider({
   useSignerSelection,
   useSigners,
   useSignersForSelectedWallet,
+  useSignersRaw,
   useTransactionSigning,
   useWalletAddress,
   useWallets