@phantom/react-sdk 1.0.0-beta.0 → 1.0.0-beta.2

package/README.md

@@ -97,7 +97,6 @@ function App() {
         embeddedWalletType: "app-wallet", // or 'user-wallet'
         addressTypes: [AddressType.solana, AddressType.ethereum],
         apiBaseUrl: "https://api.phantom.app/v1/wallets",
-        organizationId: "your-org-id",
       }}
     >
       <YourApp />
@@ -153,7 +152,7 @@ await connect({
   },
 });
 
-// Apple authentication (skips provider selection) 
+// Apple authentication (skips provider selection)
 await connect({
   authOptions: {
     provider: "apple",
@@ -195,7 +194,6 @@ Creates non-custodial wallets embedded in your application.
     embeddedWalletType: "app-wallet",
     addressTypes: [AddressType.solana],
     apiBaseUrl: "https://api.phantom.app/v1/wallets",
-    organizationId: "your-org-id",
   }}
 >
   <YourApp />
@@ -215,7 +213,6 @@ Creates non-custodial wallets embedded in your application.
     embeddedWalletType: "user-wallet",
     addressTypes: [AddressType.solana, AddressType.ethereum],
     apiBaseUrl: "https://api.phantom.app/v1/wallets",
-    organizationId: "your-org-id",
   }}
 >
   <YourApp />
@@ -233,7 +230,6 @@ When using `AddressType.solana`, you can choose between two Solana libraries:
     addressTypes: [AddressType.solana],
     solanaProvider: "web3js", // or 'kit'
     apiBaseUrl: "https://api.phantom.app/v1/wallets",
-    organizationId: "your-org-id",
   }}
 >
   <YourApp />
@@ -378,7 +374,7 @@ function SolanaOperations() {
     // Create transaction
     const connection = new Connection("https://api.mainnet-beta.solana.com");
     const { blockhash } = await connection.getLatestBlockhash();
-    
+
     const fromAddress = await solana.getPublicKey();
     const transferInstruction = SystemProgram.transfer({
       fromPubkey: new PublicKey(fromAddress),
@@ -400,7 +396,7 @@ function SolanaOperations() {
   };
 
   const switchNetwork = async () => {
-    await solana.switchNetwork('devnet');
+    await solana.switchNetwork("devnet");
   };
 
   return (
@@ -408,13 +404,14 @@ function SolanaOperations() {
       <button onClick={signMessage}>Sign Message</button>
       <button onClick={signAndSendTransaction}>Send Transaction</button>
       <button onClick={switchNetwork}>Switch to Devnet</button>
-      <p>Connected: {solana.isConnected ? 'Yes' : 'No'}</p>
+      <p>Connected: {solana.isConnected ? "Yes" : "No"}</p>
     </div>
   );
 }
 ```
 
 **Available methods:**
+
 - `signMessage(message)` - Sign a message
 - `signTransaction(transaction)` - Sign without sending
 - `signAndSendTransaction(transaction)` - Sign and send
@@ -447,32 +444,42 @@ function EthereumOperations() {
           { name: "name", type: "string" },
           { name: "version", type: "string" },
           { name: "chainId", type: "uint256" },
-          { name: "verifyingContract", type: "address" }
+          { name: "verifyingContract", type: "address" },
         ],
         Mail: [
           { name: "from", type: "string" },
           { name: "to", type: "string" },
-          { name: "contents", type: "string" }
-        ]
+          { name: "contents", type: "string" },
+        ],
       },
       primaryType: "Mail",
       domain: {
         name: "Ether Mail",
         version: "1",
         chainId: 1,
-        verifyingContract: "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC"
+        verifyingContract: "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC",
       },
       message: {
         from: "Alice",
         to: "Bob",
-        contents: "Hello!"
-      }
+        contents: "Hello!",
+      },
     };
 
     const signature = await ethereum.signTypedData(typedData);
     console.log("Typed data signature:", signature);
   };
 
+  const signTransaction = async () => {
+    const signedTx = await ethereum.signTransaction({
+      to: "0x742d35Cc6634C0532925a3b8D4C8db86fB5C4A7E",
+      value: "1000000000000000000", // 1 ETH in wei
+      gas: "21000",
+    });
+    console.log("Transaction signed:", signedTx);
+    // Transaction is signed but not sent - you can broadcast it later
+  };
+
   const sendTransaction = async () => {
     const result = await ethereum.sendTransaction({
       to: "0x742d35Cc6634C0532925a3b8D4C8db86fB5C4A7E",
@@ -490,19 +497,22 @@ function EthereumOperations() {
     <div>
       <button onClick={signPersonalMessage}>Sign Personal Message</button>
       <button onClick={signTypedData}>Sign Typed Data</button>
-      <button onClick={sendTransaction}>Send Transaction</button>
+      <button onClick={signTransaction}>Sign Transaction</button>
+      <button onClick={sendTransaction}>Sign & Send Transaction</button>
       <button onClick={switchChain}>Switch to Polygon</button>
-      <p>Connected: {ethereum.isConnected ? 'Yes' : 'No'}</p>
+      <p>Connected: {ethereum.isConnected ? "Yes" : "No"}</p>
     </div>
   );
 }
 ```
 
 **Available methods:**
+
 - `request(args)` - EIP-1193 requests
 - `signPersonalMessage(message, address)` - Sign personal message
 - `signTypedData(typedData)` - Sign EIP-712 typed data
-- `sendTransaction(transaction)` - Send transaction
+- `signTransaction(transaction)` - Sign transaction without sending
+- `sendTransaction(transaction)` - Sign and send transaction
 - `switchChain(chainId)` - Switch chains
 - `getChainId()` - Get current chain ID
 - `getAccounts()` - Get connected accounts
@@ -521,21 +531,13 @@ Hook for managing auto-confirm functionality with the Phantom extension. Auto-co
 import { useAutoConfirm, NetworkId } from "@phantom/react-sdk";
 
 function AutoConfirmControls() {
-  const {
-    enable,
-    disable, 
-    status,
-    supportedChains,
-    isLoading,
-    error,
-    refetch,
-  } = useAutoConfirm();
+  const { enable, disable, status, supportedChains, isLoading, error, refetch } = useAutoConfirm();
 
   const handleEnable = async () => {
     try {
       // Enable auto-confirm for specific chains
       const result = await enable({
-        chains: [NetworkId.SOLANA_DEVNET, NetworkId.ETHEREUM_MAINNET]
+        chains: [NetworkId.SOLANA_DEVNET, NetworkId.ETHEREUM_MAINNET],
       });
       console.log("Auto-confirm enabled:", result);
     } catch (err) {
@@ -563,14 +565,14 @@ function AutoConfirmControls() {
   return (
     <div>
       <h3>Auto-Confirm Settings</h3>
-      
+
       <div>
         <strong>Status:</strong> {status?.enabled ? "Enabled" : "Disabled"}
         {status?.chains && (
           <div>
             <strong>Active Chains:</strong>
             <ul>
-              {status.chains.map((chain) => (
+              {status.chains.map(chain => (
                 <li key={chain}>{chain}</li>
               ))}
             </ul>
@@ -582,7 +584,7 @@ function AutoConfirmControls() {
         <strong>Supported Chains:</strong>
         {supportedChains?.chains && (
           <ul>
-            {supportedChains.chains.map((chain) => (
+            {supportedChains.chains.map(chain => (
               <li key={chain}>{chain}</li>
             ))}
           </ul>
@@ -635,7 +637,7 @@ interface AutoConfirmSupportedChainsResult {
 **Available Methods:**
 
 - `enable(params)` - Enable auto-confirm for specific chains
-- `disable()` - Disable auto-confirm completely  
+- `disable()` - Disable auto-confirm completely
 - `refetch()` - Refresh status and supported chains from extension
 - `status` - Current auto-confirm status (enabled/disabled and active chains)
 - `supportedChains` - List of chains that support auto-confirm
@@ -778,29 +780,27 @@ function EthereumExample() {
 
 Quick reference of all available hooks:
 
-| Hook                        | Purpose                    | Returns                                        |
-| --------------------------- | -------------------------- | ---------------------------------------------- |
-| `useConnect`                | Connect to wallet          | `{ connect, isConnecting, error }`             |
-| `useAccounts`               | Get wallet addresses       | `WalletAddress[]` or `null`                    |
-| `useIsExtensionInstalled`   | Check extension status     | `{ isLoading, isInstalled }`                   |
-| `useDisconnect`             | Disconnect from wallet     | `{ disconnect, isDisconnecting }`              |
-| `useAutoConfirm`            | Auto-confirm management (injected only) | `{ enable, disable, status, supportedChains, ... }` |
-| `useSolana`                 | Solana chain operations    | `{ signMessage, signAndSendTransaction, ... }` |
-| `useEthereum`               | Ethereum chain operations  | `{ signPersonalMessage, sendTransaction, ... }`|
-| `usePhantom`                | Get provider context       | `{ isConnected, isReady }`                     |
+| Hook                      | Purpose                                 | Returns                                             |
+| ------------------------- | --------------------------------------- | --------------------------------------------------- |
+| `useConnect`              | Connect to wallet                       | `{ connect, isConnecting, error }`                  |
+| `useAccounts`             | Get wallet addresses                    | `WalletAddress[]` or `null`                         |
+| `useIsExtensionInstalled` | Check extension status                  | `{ isLoading, isInstalled }`                        |
+| `useDisconnect`           | Disconnect from wallet                  | `{ disconnect, isDisconnecting }`                   |
+| `useAutoConfirm`          | Auto-confirm management (injected only) | `{ enable, disable, status, supportedChains, ... }` |
+| `useSolana`               | Solana chain operations                 | `{ signMessage, signAndSendTransaction, ... }`      |
+| `useEthereum`             | Ethereum chain operations               | `{ signPersonalMessage, sendTransaction, ... }`     |
+| `usePhantom`              | Get provider context                    | `{ isConnected, isReady }`                          |
 
 ## Configuration Reference
 
 ```typescript
 interface PhantomSDKConfig {
   providerType: "injected" | "embedded";
-  appName?: string; // Optional app name for branding
-  appLogo?: string; // Optional app logo URL for branding
   addressTypes?: [AddressType, ...AddressType[]]; // Networks to enable (e.g., [AddressType.solana])
 
   // Required for embedded provider only
   apiBaseUrl?: string; // Phantom API base URL
-  organizationId?: string; // Your organization ID
+  appId: string; // Your app ID
   authOptions?: {
     authUrl?: string; // Custom auth URL (optional)
     redirectUrl?: string; // Custom redirect URL (optional)
@@ -819,8 +819,8 @@ The React SDK supports separate debug configuration that can be changed without
 
 ```typescript
 interface PhantomDebugConfig {
-  enabled?: boolean;     // Enable debug logging
-  level?: DebugLevel;    // Debug level (ERROR, WARN, INFO, DEBUG)
+  enabled?: boolean; // Enable debug logging
+  level?: DebugLevel; // Debug level (ERROR, WARN, INFO, DEBUG)
   callback?: DebugCallback; // Custom debug message handler
 }
 ```
@@ -839,7 +839,6 @@ function App() {
   // SDK configuration - static, won't change when debug settings change
   const config: PhantomSDKConfig = {
     providerType: "embedded",
-    organizationId: "your-org-id",
     // ... other config
   };
 
@@ -866,12 +865,12 @@ Debug callbacks receive a `DebugMessage` object:
 
 ```typescript
 interface DebugMessage {
-  timestamp: number;     // Unix timestamp
-  level: DebugLevel;     // Message level
-  category: string;      // Component category
-  message: string;       // Debug message text
-  data?: any;           // Additional debug data (optional)
+  timestamp: number; // Unix timestamp
+  level: DebugLevel; // Message level
+  category: string; // Component category
+  message: string; // Debug message text
+  data?: any; // Additional debug data (optional)
 }
 ```
 
-For more details and examples, see the [@phantom/browser-sdk documentation](../browser-sdk/README.md).
+For more details and examples, see the [@phantom/browser-sdk documentation](../browser-sdk/README.md).

package/dist/index.d.ts

@@ -3,7 +3,6 @@ import { ReactNode } from 'react';
 import { BrowserSDKConfig, DebugConfig, AuthOptions, BrowserSDK, WalletAddress, AutoConfirmEnableParams, AutoConfirmResult, AutoConfirmSupportedChainsResult } from '@phantom/browser-sdk';
 export { AddressType, AutoConfirmEnableParams, AutoConfirmResult, AutoConfirmSupportedChainsResult, DebugLevel, DebugMessage, NetworkId, SignedTransaction, WalletAddress, debug } from '@phantom/browser-sdk';
 import * as _phantom_embedded_provider_core from '@phantom/embedded-provider-core';
-import * as _phantom_parsers from '@phantom/parsers';
 import { ISolanaChain, IEthereumChain, EthTransactionRequest } from '@phantom/chains';
 export { EthTransactionRequest, IEthereumChain, ISolanaChain } from '@phantom/chains';
 
@@ -50,6 +49,10 @@ declare function useDisconnect(): {
 
 declare function useAccounts(): _phantom_embedded_provider_core.WalletAddress[] | null;
 
+/**
+ * React hook to check if Phantom extension is installed
+ * Uses waitForPhantomExtension for proper detection with retry logic
+ */
 declare function useIsExtensionInstalled(): {
     isLoading: boolean;
     isInstalled: boolean;
@@ -73,16 +76,21 @@ declare function useAutoConfirm(): UseAutoConfirmResult;
  */
 declare function useSolana(): {
     solana: ISolanaChain | null;
-    signMessage: (message: string | Uint8Array) => Promise<_phantom_parsers.ParsedSignatureResult>;
+    signMessage: (message: string | Uint8Array) => Promise<{
+        signature: Uint8Array;
+        publicKey: string;
+    }>;
     signTransaction: <T>(transaction: T) => Promise<T>;
-    signAndSendTransaction: <T>(transaction: T) => Promise<_phantom_parsers.ParsedTransactionResult>;
+    signAndSendTransaction: <T>(transaction: T) => Promise<{
+        signature: string;
+    }>;
     connect: (options?: {
         onlyIfTrusted?: boolean;
     }) => Promise<{
         publicKey: string;
     }>;
     disconnect: () => Promise<void>;
-    switchNetwork: (network: "mainnet" | "devnet") => Promise<void>;
+    switchNetwork: (network: "mainnet" | "devnet") => Promise<void | undefined>;
     getPublicKey: () => Promise<string | null>;
     isAvailable: boolean;
     isConnected: boolean;
@@ -101,8 +109,9 @@ declare function useEthereum(): {
     }) => Promise<T>;
     signPersonalMessage: (message: string, address: string) => Promise<string>;
     signMessage: (message: string) => Promise<string>;
+    signTransaction: (transaction: EthTransactionRequest) => Promise<string>;
     signTypedData: (typedData: any) => Promise<string>;
-    sendTransaction: (transaction: EthTransactionRequest) => Promise<_phantom_parsers.ParsedTransactionResult>;
+    sendTransaction: (transaction: EthTransactionRequest) => Promise<string>;
     switchChain: (chainId: number) => Promise<void>;
     getChainId: () => Promise<number>;
     getAccounts: () => Promise<string[]>;

package/dist/index.js

@@ -52,14 +52,6 @@ var import_browser_sdk = require("@phantom/browser-sdk");
 var import_jsx_runtime = require("react/jsx-runtime");
 var PhantomContext = (0, import_react.createContext)(void 0);
 function PhantomProvider({ children, config, debugConfig }) {
-  const [isConnected, setIsConnected] = (0, import_react.useState)(false);
-  const [isConnecting, setIsConnecting] = (0, import_react.useState)(false);
-  const [connectError, setConnectError] = (0, import_react.useState)(null);
-  const [addresses, setAddresses] = (0, import_react.useState)([]);
-  const [walletId, setWalletId] = (0, import_react.useState)(null);
-  const [currentProviderType, setCurrentProviderType] = (0, import_react.useState)(config.providerType || null);
-  const [isPhantomAvailable, setIsPhantomAvailable] = (0, import_react.useState)(false);
-  const [sdk, setSdk] = (0, import_react.useState)(null);
   const memoizedConfig = (0, import_react.useMemo)(() => {
     return {
       ...config,
@@ -67,6 +59,16 @@ function PhantomProvider({ children, config, debugConfig }) {
       providerType: config.providerType || "embedded"
     };
   }, [config]);
+  const [isConnected, setIsConnected] = (0, import_react.useState)(false);
+  const [isConnecting, setIsConnecting] = (0, import_react.useState)(false);
+  const [connectError, setConnectError] = (0, import_react.useState)(null);
+  const [addresses, setAddresses] = (0, import_react.useState)([]);
+  const [walletId, setWalletId] = (0, import_react.useState)(null);
+  const [currentProviderType, setCurrentProviderType] = (0, import_react.useState)(
+    memoizedConfig.providerType || null
+  );
+  const [isPhantomAvailable, setIsPhantomAvailable] = (0, import_react.useState)(false);
+  const [sdk, setSdk] = (0, import_react.useState)(null);
   (0, import_react.useEffect)(() => {
     const sdkInstance = new import_browser_sdk.BrowserSDK(memoizedConfig);
     const handleConnectStart = () => {
@@ -123,21 +125,21 @@ function PhantomProvider({ children, config, debugConfig }) {
   (0, import_react.useEffect)(() => {
     if (!sdk)
       return;
-    const initialize = () => {
+    const initialize = async () => {
       try {
-        const available = import_browser_sdk.BrowserSDK.isPhantomInstalled();
+        const available = await import_browser_sdk.BrowserSDK.isPhantomInstalled();
         setIsPhantomAvailable(available);
       } catch (err) {
         console.error("Error checking Phantom extension:", err);
         setIsPhantomAvailable(false);
       }
-      if (config.autoConnect !== false) {
+      if (memoizedConfig.autoConnect !== false) {
         sdk.autoConnect().catch(() => {
         });
       }
     };
     initialize();
-  }, [sdk, config.autoConnect]);
+  }, [sdk, memoizedConfig.autoConnect]);
   const value = (0, import_react.useMemo)(
     () => ({
       sdk,
@@ -149,16 +151,7 @@ function PhantomProvider({ children, config, debugConfig }) {
       currentProviderType,
       isPhantomAvailable
     }),
-    [
-      sdk,
-      isConnected,
-      isConnecting,
-      connectError,
-      addresses,
-      walletId,
-      currentProviderType,
-      isPhantomAvailable
-    ]
+    [sdk, isConnected, isConnecting, connectError, addresses, walletId, currentProviderType, isPhantomAvailable]
   );
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(PhantomContext.Provider, { value, children });
 }
@@ -235,36 +228,33 @@ function useAccounts() {
 // src/hooks/useIsExtensionInstalled.ts
 var React = __toESM(require("react"));
 var import_browser_sdk2 = require("@phantom/browser-sdk");
-var cachedIsInstalled = null;
 function useIsExtensionInstalled() {
-  const { sdk } = usePhantom();
-  const [isLoading, setIsLoading] = React.useState(cachedIsInstalled === null);
-  const [isInstalled, setIsInstalled] = React.useState(cachedIsInstalled ?? false);
+  const [isLoading, setIsLoading] = React.useState(true);
+  const [isInstalled, setIsInstalled] = React.useState(false);
   React.useEffect(() => {
-    if (!sdk) {
-      setIsLoading(false);
-      return;
-    }
-    if (cachedIsInstalled !== null) {
-      setIsInstalled(cachedIsInstalled);
-      setIsLoading(false);
-      return;
-    }
-    const checkExtension = () => {
+    let isMounted = true;
+    const checkExtension = async () => {
       try {
         setIsLoading(true);
-        const result = import_browser_sdk2.BrowserSDK.isPhantomInstalled();
-        cachedIsInstalled = result;
-        setIsInstalled(result);
+        const result = await (0, import_browser_sdk2.waitForPhantomExtension)(3e3);
+        if (isMounted) {
+          setIsInstalled(result);
+        }
       } catch (error) {
-        cachedIsInstalled = false;
-        setIsInstalled(false);
+        if (isMounted) {
+          setIsInstalled(false);
+        }
       } finally {
-        setIsLoading(false);
+        if (isMounted) {
+          setIsLoading(false);
+        }
       }
     };
     checkExtension();
-  }, [sdk]);
+    return () => {
+      isMounted = false;
+    };
+  }, []);
   return { isLoading, isInstalled };
 }
 
@@ -301,53 +291,47 @@ function useAutoConfirm() {
     },
     [sdk, isInjected]
   );
-  const disable = (0, import_react4.useCallback)(
-    async () => {
-      if (!sdk) {
-        throw new Error("SDK not initialized");
-      }
-      if (!isInjected) {
-        throw new Error("Auto-confirm is only available for injected (extension) providers");
-      }
-      try {
-        setIsLoading(true);
-        setError(null);
-        await sdk.disableAutoConfirm();
-        const newStatus = await sdk.getAutoConfirmStatus();
-        setStatus(newStatus);
-      } catch (err) {
-        const error2 = err instanceof Error ? err : new Error("Unknown error occurred");
-        setError(error2);
-        throw error2;
-      } finally {
-        setIsLoading(false);
-      }
-    },
-    [sdk, isInjected]
-  );
-  const refetch = (0, import_react4.useCallback)(
-    async () => {
-      if (!sdk || !isInjected) {
-        return;
-      }
-      try {
-        setIsLoading(true);
-        setError(null);
-        const [statusResult, supportedResult] = await Promise.all([
-          sdk.getAutoConfirmStatus(),
-          sdk.getSupportedAutoConfirmChains()
-        ]);
-        setStatus(statusResult);
-        setSupportedChains(supportedResult);
-      } catch (err) {
-        const error2 = err instanceof Error ? err : new Error("Failed to fetch auto-confirm data");
-        setError(error2);
-      } finally {
-        setIsLoading(false);
-      }
-    },
-    [sdk, isInjected]
-  );
+  const disable = (0, import_react4.useCallback)(async () => {
+    if (!sdk) {
+      throw new Error("SDK not initialized");
+    }
+    if (!isInjected) {
+      throw new Error("Auto-confirm is only available for injected (extension) providers");
+    }
+    try {
+      setIsLoading(true);
+      setError(null);
+      await sdk.disableAutoConfirm();
+      const newStatus = await sdk.getAutoConfirmStatus();
+      setStatus(newStatus);
+    } catch (err) {
+      const error2 = err instanceof Error ? err : new Error("Unknown error occurred");
+      setError(error2);
+      throw error2;
+    } finally {
+      setIsLoading(false);
+    }
+  }, [sdk, isInjected]);
+  const refetch = (0, import_react4.useCallback)(async () => {
+    if (!sdk || !isInjected) {
+      return;
+    }
+    try {
+      setIsLoading(true);
+      setError(null);
+      const [statusResult, supportedResult] = await Promise.all([
+        sdk.getAutoConfirmStatus(),
+        sdk.getSupportedAutoConfirmChains()
+      ]);
+      setStatus(statusResult);
+      setSupportedChains(supportedResult);
+    } catch (err) {
+      const error2 = err instanceof Error ? err : new Error("Failed to fetch auto-confirm data");
+      setError(error2);
+    } finally {
+      setIsLoading(false);
+    }
+  }, [sdk, isInjected]);
   (0, import_react4.useEffect)(() => {
     if (sdk && isInjected) {
       refetch();
@@ -372,6 +356,13 @@ function useAutoConfirm() {
 var import_react5 = require("react");
 function useSolana() {
   const { sdk, isConnected } = usePhantom();
+  const getSolanaChain = (0, import_react5.useCallback)(() => {
+    if (!sdk)
+      throw new Error("Phantom SDK not initialized.");
+    if (!sdk.isConnected())
+      throw new Error("Phantom SDK not connected. Call connect() first.");
+    return sdk.solana;
+  }, [sdk]);
   const solanaChain = (0, import_react5.useMemo)(() => {
     if (!sdk || !isConnected)
       return null;
@@ -381,41 +372,50 @@ function useSolana() {
       return null;
     }
   }, [sdk, isConnected]);
-  const signMessage = (0, import_react5.useCallback)(async (message) => {
-    if (!solanaChain)
-      throw new Error("Solana chain not available. Ensure SDK is connected.");
-    return solanaChain.signMessage(message);
-  }, [solanaChain]);
-  const signTransaction = (0, import_react5.useCallback)(async (transaction) => {
-    if (!solanaChain)
-      throw new Error("Solana chain not available. Ensure SDK is connected.");
-    return solanaChain.signTransaction(transaction);
-  }, [solanaChain]);
-  const signAndSendTransaction = (0, import_react5.useCallback)(async (transaction) => {
-    if (!solanaChain)
-      throw new Error("Solana chain not available. Ensure SDK is connected.");
-    return solanaChain.signAndSendTransaction(transaction);
-  }, [solanaChain]);
-  const connect = (0, import_react5.useCallback)(async (options) => {
-    if (!solanaChain)
-      throw new Error("Solana chain not available. Ensure SDK is connected.");
-    return solanaChain.connect(options);
-  }, [solanaChain]);
+  const signMessage = (0, import_react5.useCallback)(
+    async (message) => {
+      const chain = getSolanaChain();
+      return chain.signMessage(message);
+    },
+    [getSolanaChain]
+  );
+  const signTransaction = (0, import_react5.useCallback)(
+    async (transaction) => {
+      const chain = getSolanaChain();
+      return chain.signTransaction(transaction);
+    },
+    [getSolanaChain]
+  );
+  const signAndSendTransaction = (0, import_react5.useCallback)(
+    async (transaction) => {
+      const chain = getSolanaChain();
+      return chain.signAndSendTransaction(transaction);
+    },
+    [getSolanaChain]
+  );
+  const connect = (0, import_react5.useCallback)(
+    async (options) => {
+      const chain = getSolanaChain();
+      return chain.connect(options);
+    },
+    [getSolanaChain]
+  );
   const disconnect = (0, import_react5.useCallback)(async () => {
-    if (!solanaChain)
-      throw new Error("Solana chain not available. Ensure SDK is connected.");
-    return solanaChain.disconnect();
-  }, [solanaChain]);
-  const switchNetwork = (0, import_react5.useCallback)(async (network) => {
-    if (!solanaChain)
-      throw new Error("Solana chain not available. Ensure SDK is connected.");
-    return solanaChain.switchNetwork(network);
-  }, [solanaChain]);
+    const chain = getSolanaChain();
+    return chain.disconnect();
+  }, [getSolanaChain]);
+  const switchNetwork = (0, import_react5.useCallback)(
+    async (network) => {
+      const chain = getSolanaChain();
+      return chain.switchNetwork?.(network);
+    },
+    [getSolanaChain]
+  );
   const getPublicKey = (0, import_react5.useCallback)(async () => {
-    if (!solanaChain)
+    if (!sdk || !sdk.isConnected())
       return null;
-    return solanaChain.getPublicKey();
-  }, [solanaChain]);
+    return sdk.solana.getPublicKey();
+  }, [sdk]);
   return {
     // Chain instance for advanced usage
     solana: solanaChain,
@@ -437,6 +437,13 @@ function useSolana() {
 var import_react6 = require("react");
 function useEthereum() {
   const { sdk, isConnected } = usePhantom();
+  const getEthereumChain = (0, import_react6.useCallback)(() => {
+    if (!sdk)
+      throw new Error("Phantom SDK not initialized.");
+    if (!sdk.isConnected())
+      throw new Error("Phantom SDK not connected. Call connect() first.");
+    return sdk.ethereum;
+  }, [sdk]);
   const ethereumChain = (0, import_react6.useMemo)(() => {
     if (!sdk || !isConnected)
       return null;
@@ -446,50 +453,70 @@ function useEthereum() {
       return null;
     }
   }, [sdk, isConnected]);
-  const request = (0, import_react6.useCallback)(async (args) => {
-    if (!ethereumChain)
-      throw new Error("Ethereum chain not available. Ensure SDK is connected.");
-    return ethereumChain.request(args);
-  }, [ethereumChain]);
-  const signPersonalMessage = (0, import_react6.useCallback)(async (message, address) => {
-    return request({
-      method: "personal_sign",
-      params: [message, address]
-    });
-  }, [request]);
-  const sendTransaction = (0, import_react6.useCallback)(async (transaction) => {
-    if (!ethereumChain)
-      throw new Error("Ethereum chain not available. Ensure SDK is connected.");
-    return ethereumChain.sendTransaction(transaction);
-  }, [ethereumChain]);
-  const switchChain = (0, import_react6.useCallback)(async (chainId) => {
-    if (!ethereumChain)
-      throw new Error("Ethereum chain not available. Ensure SDK is connected.");
-    return ethereumChain.switchChain(chainId);
-  }, [ethereumChain]);
+  const request = (0, import_react6.useCallback)(
+    async (args) => {
+      const chain = getEthereumChain();
+      return chain.request(args);
+    },
+    [getEthereumChain]
+  );
+  const signPersonalMessage = (0, import_react6.useCallback)(
+    async (message, address) => {
+      return request({
+        method: "personal_sign",
+        params: [message, address]
+      });
+    },
+    [request]
+  );
+  const signTransaction = (0, import_react6.useCallback)(
+    async (transaction) => {
+      const chain = getEthereumChain();
+      return chain.signTransaction(transaction);
+    },
+    [getEthereumChain]
+  );
+  const sendTransaction = (0, import_react6.useCallback)(
+    async (transaction) => {
+      const chain = getEthereumChain();
+      return chain.sendTransaction(transaction);
+    },
+    [getEthereumChain]
+  );
+  const switchChain = (0, import_react6.useCallback)(
+    async (chainId) => {
+      const chain = getEthereumChain();
+      return chain.switchChain(chainId);
+    },
+    [getEthereumChain]
+  );
   const getChainId = (0, import_react6.useCallback)(async () => {
-    if (!ethereumChain)
-      throw new Error("Ethereum chain not available. Ensure SDK is connected.");
-    return ethereumChain.getChainId();
-  }, [ethereumChain]);
+    const chain = getEthereumChain();
+    return chain.getChainId();
+  }, [getEthereumChain]);
   const getAccounts = (0, import_react6.useCallback)(async () => {
-    if (!ethereumChain)
-      throw new Error("Ethereum chain not available. Ensure SDK is connected.");
-    return ethereumChain.getAccounts();
-  }, [ethereumChain]);
-  const signMessage = (0, import_react6.useCallback)(async (message) => {
-    return request({
-      method: "eth_sign",
-      params: [await getAccounts().then((accounts) => accounts[0]), message]
-    });
-  }, [request, getAccounts]);
-  const signTypedData = (0, import_react6.useCallback)(async (typedData) => {
-    const accounts = await getAccounts();
-    return request({
-      method: "eth_signTypedData_v4",
-      params: [accounts[0], JSON.stringify(typedData)]
-    });
-  }, [request, getAccounts]);
+    const chain = getEthereumChain();
+    return chain.getAccounts();
+  }, [getEthereumChain]);
+  const signMessage = (0, import_react6.useCallback)(
+    async (message) => {
+      return request({
+        method: "eth_sign",
+        params: [await getAccounts().then((accounts) => accounts[0]), message]
+      });
+    },
+    [request, getAccounts]
+  );
+  const signTypedData = (0, import_react6.useCallback)(
+    async (typedData) => {
+      const accounts = await getAccounts();
+      return request({
+        method: "eth_signTypedData_v4",
+        params: [accounts[0], JSON.stringify(typedData)]
+      });
+    },
+    [request, getAccounts]
+  );
   return {
     // Chain instance for advanced usage
     ethereum: ethereumChain,
@@ -498,6 +525,7 @@ function useEthereum() {
     // Convenient methods
     signPersonalMessage,
     signMessage,
+    signTransaction,
     signTypedData,
     sendTransaction,
     switchChain,

package/dist/index.mjs

@@ -4,14 +4,6 @@ import { BrowserSDK } from "@phantom/browser-sdk";
 import { jsx } from "react/jsx-runtime";
 var PhantomContext = createContext(void 0);
 function PhantomProvider({ children, config, debugConfig }) {
-  const [isConnected, setIsConnected] = useState(false);
-  const [isConnecting, setIsConnecting] = useState(false);
-  const [connectError, setConnectError] = useState(null);
-  const [addresses, setAddresses] = useState([]);
-  const [walletId, setWalletId] = useState(null);
-  const [currentProviderType, setCurrentProviderType] = useState(config.providerType || null);
-  const [isPhantomAvailable, setIsPhantomAvailable] = useState(false);
-  const [sdk, setSdk] = useState(null);
   const memoizedConfig = useMemo(() => {
     return {
       ...config,
@@ -19,6 +11,16 @@ function PhantomProvider({ children, config, debugConfig }) {
       providerType: config.providerType || "embedded"
     };
   }, [config]);
+  const [isConnected, setIsConnected] = useState(false);
+  const [isConnecting, setIsConnecting] = useState(false);
+  const [connectError, setConnectError] = useState(null);
+  const [addresses, setAddresses] = useState([]);
+  const [walletId, setWalletId] = useState(null);
+  const [currentProviderType, setCurrentProviderType] = useState(
+    memoizedConfig.providerType || null
+  );
+  const [isPhantomAvailable, setIsPhantomAvailable] = useState(false);
+  const [sdk, setSdk] = useState(null);
   useEffect(() => {
     const sdkInstance = new BrowserSDK(memoizedConfig);
     const handleConnectStart = () => {
@@ -75,21 +77,21 @@ function PhantomProvider({ children, config, debugConfig }) {
   useEffect(() => {
     if (!sdk)
       return;
-    const initialize = () => {
+    const initialize = async () => {
       try {
-        const available = BrowserSDK.isPhantomInstalled();
+        const available = await BrowserSDK.isPhantomInstalled();
         setIsPhantomAvailable(available);
       } catch (err) {
         console.error("Error checking Phantom extension:", err);
         setIsPhantomAvailable(false);
       }
-      if (config.autoConnect !== false) {
+      if (memoizedConfig.autoConnect !== false) {
         sdk.autoConnect().catch(() => {
         });
       }
     };
     initialize();
-  }, [sdk, config.autoConnect]);
+  }, [sdk, memoizedConfig.autoConnect]);
   const value = useMemo(
     () => ({
       sdk,
@@ -101,16 +103,7 @@ function PhantomProvider({ children, config, debugConfig }) {
       currentProviderType,
       isPhantomAvailable
     }),
-    [
-      sdk,
-      isConnected,
-      isConnecting,
-      connectError,
-      addresses,
-      walletId,
-      currentProviderType,
-      isPhantomAvailable
-    ]
+    [sdk, isConnected, isConnecting, connectError, addresses, walletId, currentProviderType, isPhantomAvailable]
   );
   return /* @__PURE__ */ jsx(PhantomContext.Provider, { value, children });
 }
@@ -186,37 +179,34 @@ function useAccounts() {
 
 // src/hooks/useIsExtensionInstalled.ts
 import * as React from "react";
-import { BrowserSDK as BrowserSDK2 } from "@phantom/browser-sdk";
-var cachedIsInstalled = null;
+import { waitForPhantomExtension } from "@phantom/browser-sdk";
 function useIsExtensionInstalled() {
-  const { sdk } = usePhantom();
-  const [isLoading, setIsLoading] = React.useState(cachedIsInstalled === null);
-  const [isInstalled, setIsInstalled] = React.useState(cachedIsInstalled ?? false);
+  const [isLoading, setIsLoading] = React.useState(true);
+  const [isInstalled, setIsInstalled] = React.useState(false);
   React.useEffect(() => {
-    if (!sdk) {
-      setIsLoading(false);
-      return;
-    }
-    if (cachedIsInstalled !== null) {
-      setIsInstalled(cachedIsInstalled);
-      setIsLoading(false);
-      return;
-    }
-    const checkExtension = () => {
+    let isMounted = true;
+    const checkExtension = async () => {
       try {
         setIsLoading(true);
-        const result = BrowserSDK2.isPhantomInstalled();
-        cachedIsInstalled = result;
-        setIsInstalled(result);
+        const result = await waitForPhantomExtension(3e3);
+        if (isMounted) {
+          setIsInstalled(result);
+        }
       } catch (error) {
-        cachedIsInstalled = false;
-        setIsInstalled(false);
+        if (isMounted) {
+          setIsInstalled(false);
+        }
       } finally {
-        setIsLoading(false);
+        if (isMounted) {
+          setIsLoading(false);
+        }
       }
     };
     checkExtension();
-  }, [sdk]);
+    return () => {
+      isMounted = false;
+    };
+  }, []);
   return { isLoading, isInstalled };
 }
 
@@ -253,53 +243,47 @@ function useAutoConfirm() {
     },
     [sdk, isInjected]
   );
-  const disable = useCallback3(
-    async () => {
-      if (!sdk) {
-        throw new Error("SDK not initialized");
-      }
-      if (!isInjected) {
-        throw new Error("Auto-confirm is only available for injected (extension) providers");
-      }
-      try {
-        setIsLoading(true);
-        setError(null);
-        await sdk.disableAutoConfirm();
-        const newStatus = await sdk.getAutoConfirmStatus();
-        setStatus(newStatus);
-      } catch (err) {
-        const error2 = err instanceof Error ? err : new Error("Unknown error occurred");
-        setError(error2);
-        throw error2;
-      } finally {
-        setIsLoading(false);
-      }
-    },
-    [sdk, isInjected]
-  );
-  const refetch = useCallback3(
-    async () => {
-      if (!sdk || !isInjected) {
-        return;
-      }
-      try {
-        setIsLoading(true);
-        setError(null);
-        const [statusResult, supportedResult] = await Promise.all([
-          sdk.getAutoConfirmStatus(),
-          sdk.getSupportedAutoConfirmChains()
-        ]);
-        setStatus(statusResult);
-        setSupportedChains(supportedResult);
-      } catch (err) {
-        const error2 = err instanceof Error ? err : new Error("Failed to fetch auto-confirm data");
-        setError(error2);
-      } finally {
-        setIsLoading(false);
-      }
-    },
-    [sdk, isInjected]
-  );
+  const disable = useCallback3(async () => {
+    if (!sdk) {
+      throw new Error("SDK not initialized");
+    }
+    if (!isInjected) {
+      throw new Error("Auto-confirm is only available for injected (extension) providers");
+    }
+    try {
+      setIsLoading(true);
+      setError(null);
+      await sdk.disableAutoConfirm();
+      const newStatus = await sdk.getAutoConfirmStatus();
+      setStatus(newStatus);
+    } catch (err) {
+      const error2 = err instanceof Error ? err : new Error("Unknown error occurred");
+      setError(error2);
+      throw error2;
+    } finally {
+      setIsLoading(false);
+    }
+  }, [sdk, isInjected]);
+  const refetch = useCallback3(async () => {
+    if (!sdk || !isInjected) {
+      return;
+    }
+    try {
+      setIsLoading(true);
+      setError(null);
+      const [statusResult, supportedResult] = await Promise.all([
+        sdk.getAutoConfirmStatus(),
+        sdk.getSupportedAutoConfirmChains()
+      ]);
+      setStatus(statusResult);
+      setSupportedChains(supportedResult);
+    } catch (err) {
+      const error2 = err instanceof Error ? err : new Error("Failed to fetch auto-confirm data");
+      setError(error2);
+    } finally {
+      setIsLoading(false);
+    }
+  }, [sdk, isInjected]);
   useEffect3(() => {
     if (sdk && isInjected) {
       refetch();
@@ -324,6 +308,13 @@ function useAutoConfirm() {
 import { useCallback as useCallback4, useMemo as useMemo2 } from "react";
 function useSolana() {
   const { sdk, isConnected } = usePhantom();
+  const getSolanaChain = useCallback4(() => {
+    if (!sdk)
+      throw new Error("Phantom SDK not initialized.");
+    if (!sdk.isConnected())
+      throw new Error("Phantom SDK not connected. Call connect() first.");
+    return sdk.solana;
+  }, [sdk]);
   const solanaChain = useMemo2(() => {
     if (!sdk || !isConnected)
       return null;
@@ -333,41 +324,50 @@ function useSolana() {
       return null;
     }
   }, [sdk, isConnected]);
-  const signMessage = useCallback4(async (message) => {
-    if (!solanaChain)
-      throw new Error("Solana chain not available. Ensure SDK is connected.");
-    return solanaChain.signMessage(message);
-  }, [solanaChain]);
-  const signTransaction = useCallback4(async (transaction) => {
-    if (!solanaChain)
-      throw new Error("Solana chain not available. Ensure SDK is connected.");
-    return solanaChain.signTransaction(transaction);
-  }, [solanaChain]);
-  const signAndSendTransaction = useCallback4(async (transaction) => {
-    if (!solanaChain)
-      throw new Error("Solana chain not available. Ensure SDK is connected.");
-    return solanaChain.signAndSendTransaction(transaction);
-  }, [solanaChain]);
-  const connect = useCallback4(async (options) => {
-    if (!solanaChain)
-      throw new Error("Solana chain not available. Ensure SDK is connected.");
-    return solanaChain.connect(options);
-  }, [solanaChain]);
+  const signMessage = useCallback4(
+    async (message) => {
+      const chain = getSolanaChain();
+      return chain.signMessage(message);
+    },
+    [getSolanaChain]
+  );
+  const signTransaction = useCallback4(
+    async (transaction) => {
+      const chain = getSolanaChain();
+      return chain.signTransaction(transaction);
+    },
+    [getSolanaChain]
+  );
+  const signAndSendTransaction = useCallback4(
+    async (transaction) => {
+      const chain = getSolanaChain();
+      return chain.signAndSendTransaction(transaction);
+    },
+    [getSolanaChain]
+  );
+  const connect = useCallback4(
+    async (options) => {
+      const chain = getSolanaChain();
+      return chain.connect(options);
+    },
+    [getSolanaChain]
+  );
   const disconnect = useCallback4(async () => {
-    if (!solanaChain)
-      throw new Error("Solana chain not available. Ensure SDK is connected.");
-    return solanaChain.disconnect();
-  }, [solanaChain]);
-  const switchNetwork = useCallback4(async (network) => {
-    if (!solanaChain)
-      throw new Error("Solana chain not available. Ensure SDK is connected.");
-    return solanaChain.switchNetwork(network);
-  }, [solanaChain]);
+    const chain = getSolanaChain();
+    return chain.disconnect();
+  }, [getSolanaChain]);
+  const switchNetwork = useCallback4(
+    async (network) => {
+      const chain = getSolanaChain();
+      return chain.switchNetwork?.(network);
+    },
+    [getSolanaChain]
+  );
   const getPublicKey = useCallback4(async () => {
-    if (!solanaChain)
+    if (!sdk || !sdk.isConnected())
       return null;
-    return solanaChain.getPublicKey();
-  }, [solanaChain]);
+    return sdk.solana.getPublicKey();
+  }, [sdk]);
   return {
     // Chain instance for advanced usage
     solana: solanaChain,
@@ -389,6 +389,13 @@ function useSolana() {
 import { useCallback as useCallback5, useMemo as useMemo3 } from "react";
 function useEthereum() {
   const { sdk, isConnected } = usePhantom();
+  const getEthereumChain = useCallback5(() => {
+    if (!sdk)
+      throw new Error("Phantom SDK not initialized.");
+    if (!sdk.isConnected())
+      throw new Error("Phantom SDK not connected. Call connect() first.");
+    return sdk.ethereum;
+  }, [sdk]);
   const ethereumChain = useMemo3(() => {
     if (!sdk || !isConnected)
       return null;
@@ -398,50 +405,70 @@ function useEthereum() {
       return null;
     }
   }, [sdk, isConnected]);
-  const request = useCallback5(async (args) => {
-    if (!ethereumChain)
-      throw new Error("Ethereum chain not available. Ensure SDK is connected.");
-    return ethereumChain.request(args);
-  }, [ethereumChain]);
-  const signPersonalMessage = useCallback5(async (message, address) => {
-    return request({
-      method: "personal_sign",
-      params: [message, address]
-    });
-  }, [request]);
-  const sendTransaction = useCallback5(async (transaction) => {
-    if (!ethereumChain)
-      throw new Error("Ethereum chain not available. Ensure SDK is connected.");
-    return ethereumChain.sendTransaction(transaction);
-  }, [ethereumChain]);
-  const switchChain = useCallback5(async (chainId) => {
-    if (!ethereumChain)
-      throw new Error("Ethereum chain not available. Ensure SDK is connected.");
-    return ethereumChain.switchChain(chainId);
-  }, [ethereumChain]);
+  const request = useCallback5(
+    async (args) => {
+      const chain = getEthereumChain();
+      return chain.request(args);
+    },
+    [getEthereumChain]
+  );
+  const signPersonalMessage = useCallback5(
+    async (message, address) => {
+      return request({
+        method: "personal_sign",
+        params: [message, address]
+      });
+    },
+    [request]
+  );
+  const signTransaction = useCallback5(
+    async (transaction) => {
+      const chain = getEthereumChain();
+      return chain.signTransaction(transaction);
+    },
+    [getEthereumChain]
+  );
+  const sendTransaction = useCallback5(
+    async (transaction) => {
+      const chain = getEthereumChain();
+      return chain.sendTransaction(transaction);
+    },
+    [getEthereumChain]
+  );
+  const switchChain = useCallback5(
+    async (chainId) => {
+      const chain = getEthereumChain();
+      return chain.switchChain(chainId);
+    },
+    [getEthereumChain]
+  );
   const getChainId = useCallback5(async () => {
-    if (!ethereumChain)
-      throw new Error("Ethereum chain not available. Ensure SDK is connected.");
-    return ethereumChain.getChainId();
-  }, [ethereumChain]);
+    const chain = getEthereumChain();
+    return chain.getChainId();
+  }, [getEthereumChain]);
   const getAccounts = useCallback5(async () => {
-    if (!ethereumChain)
-      throw new Error("Ethereum chain not available. Ensure SDK is connected.");
-    return ethereumChain.getAccounts();
-  }, [ethereumChain]);
-  const signMessage = useCallback5(async (message) => {
-    return request({
-      method: "eth_sign",
-      params: [await getAccounts().then((accounts) => accounts[0]), message]
-    });
-  }, [request, getAccounts]);
-  const signTypedData = useCallback5(async (typedData) => {
-    const accounts = await getAccounts();
-    return request({
-      method: "eth_signTypedData_v4",
-      params: [accounts[0], JSON.stringify(typedData)]
-    });
-  }, [request, getAccounts]);
+    const chain = getEthereumChain();
+    return chain.getAccounts();
+  }, [getEthereumChain]);
+  const signMessage = useCallback5(
+    async (message) => {
+      return request({
+        method: "eth_sign",
+        params: [await getAccounts().then((accounts) => accounts[0]), message]
+      });
+    },
+    [request, getAccounts]
+  );
+  const signTypedData = useCallback5(
+    async (typedData) => {
+      const accounts = await getAccounts();
+      return request({
+        method: "eth_signTypedData_v4",
+        params: [accounts[0], JSON.stringify(typedData)]
+      });
+    },
+    [request, getAccounts]
+  );
   return {
     // Chain instance for advanced usage
     ethereum: ethereumChain,
@@ -450,6 +477,7 @@ function useEthereum() {
     // Convenient methods
     signPersonalMessage,
     signMessage,
+    signTransaction,
     signTypedData,
     sendTransaction,
     switchChain,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phantom/react-sdk",
-  "version": "1.0.0-beta.0",
+  "version": "1.0.0-beta.2",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
@@ -26,9 +26,9 @@
     "prettier": "prettier --write \"src/**/*.{ts,tsx}\""
   },
   "dependencies": {
-    "@phantom/browser-sdk": "^1.0.0-beta.0",
-    "@phantom/chains": "^1.0.0-beta.0",
-    "@phantom/constants": "^1.0.0-beta.0"
+    "@phantom/browser-sdk": "^1.0.0-beta.2",
+    "@phantom/chains": "^1.0.0-beta.2",
+    "@phantom/constants": "^1.0.0-beta.2"
   },
   "devDependencies": {
     "@testing-library/dom": "^10.4.0",