@phantom/react-sdk 1.0.0 → 1.0.3

package/README.md

@@ -792,7 +792,8 @@ function SolanaOperations() {
     const connection = new Connection("https://api.mainnet-beta.solana.com");
     const { blockhash } = await connection.getLatestBlockhash();
 
-    const fromAddress = await solana.getPublicKey();
+    const fromAddress = solana.publicKey;
+    if (!fromAddress) throw new Error("Not connected");
     const transferInstruction = SystemProgram.transfer({
       fromPubkey: new PublicKey(fromAddress),
       toPubkey: new PublicKey(toAddress),
@@ -833,7 +834,7 @@ function SolanaOperations() {
 - `signTransaction(transaction)` - Sign without sending
 - `signAndSendTransaction(transaction)` - Sign and send
 - `switchNetwork(network)` - Switch between mainnet/devnet
-- `getPublicKey()` - Get current public key
+- `publicKey` - Current public key (or `null` if disconnected)
 - `isConnected` - Connection status
 - `isAvailable` - Provider availability (see note below)
 
@@ -1163,7 +1164,8 @@ function SolanaExample() {
     const { blockhash } = await connection.getLatestBlockhash();
 
     // Create transfer instruction
-    const fromAddress = await solana.getPublicKey();
+    const fromAddress = solana.publicKey;
+    if (!fromAddress) throw new Error("Not connected");
     const transferInstruction = SystemProgram.transfer({
       fromPubkey: new PublicKey(fromAddress),
       toPubkey: new PublicKey(toAddress),
@@ -1209,7 +1211,8 @@ function SolanaKitExample() {
     const rpc = createSolanaRpc("https://api.mainnet-beta.solana.com");
     const { value: latestBlockhash } = await rpc.getLatestBlockhash().send();
 
-    const userPublicKey = await solana.getPublicKey();
+    const userPublicKey = solana.publicKey;
+    if (!userPublicKey) throw new Error("Not connected");
     const transactionMessage = pipe(
       createTransactionMessage({ version: 0 }),
       tx => setTransactionMessageFeePayer(address(userPublicKey), tx),

package/dist/index.js

@@ -210,20 +210,14 @@ function useDiscoveredWallets() {
     try {
       setIsLoading(true);
       setError(null);
-      const initialWallets = sdk.getDiscoveredWallets();
-      if (initialWallets.length > 0) {
-        setWallets(initialWallets);
-        setIsLoading(false);
-      } else {
-        await sdk.discoverWallets();
-        const discoveredWallets = sdk.getDiscoveredWallets();
-        setWallets(discoveredWallets);
-        setIsLoading(false);
-      }
+      await sdk.discoverWallets();
+      const discoveredWallets = sdk.getDiscoveredWallets();
+      setWallets(discoveredWallets);
     } catch (err) {
       const error2 = err instanceof Error ? err : new Error("Failed to fetch discovered wallets");
       setError(error2);
       setWallets([]);
+    } finally {
       setIsLoading(false);
     }
   }, [sdk]);
@@ -318,7 +312,8 @@ function ConnectModalContent({
   const isConnectingState = baseConnect.isConnecting || isConnecting;
   const errorState = baseConnect.error ? baseConnect.error.message : error;
   const showDivider = !(allowedProviders.length === 1 && allowedProviders.includes("injected"));
-  const shouldShowOtherWalletsButton = discoveredWallets.length > 2;
+  const isInjectedOnly = allowedProviders.length === 1 && allowedProviders.includes("injected");
+  const shouldShowOtherWalletsButton = !isInjectedOnly && discoveredWallets.length > 2;
   const walletsToShowInline = shouldShowOtherWalletsButton ? [] : discoveredWallets;
   const connectWithAuthProvider = (0, import_react5.useCallback)(
     async (provider, walletId) => {
@@ -587,7 +582,7 @@ function ConnectModalContent({
             ] })
           }
         ),
-        allowedProviders.includes("injected") && (isExtensionInstalled.isInstalled || discoveredWallets.length > 0) && (!isMobile || isExtensionInstalled.isInstalled) && /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_jsx_runtime2.Fragment, { children: [
+        allowedProviders.includes("injected") && (isExtensionInstalled.isInstalled || discoveredWallets.length > 0) && /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_jsx_runtime2.Fragment, { children: [
           showDivider && /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { style: dividerStyle, children: [
             /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("div", { style: dividerLineStyle }),
             /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { style: dividerTextStyle, children: "OR" }),
@@ -839,9 +834,10 @@ function PhantomProvider({ children, config, debugConfig, theme, appIcon, appNam
       try {
         setIsConnected(true);
         setIsConnecting(false);
-        setUser(data);
         const addrs = await sdk.getAddresses();
         setAddresses(addrs);
+        const normalizedUser = data ?? { addresses: addrs };
+        setUser(normalizedUser);
       } catch (err) {
         console.error("Error connecting:", err);
         try {
@@ -854,11 +850,14 @@ function PhantomProvider({ children, config, debugConfig, theme, appIcon, appNam
     const handleConnectError = (errorData) => {
       setIsConnecting(false);
       setIsConnected(false);
-      const isAutoConnectNoSession = errorData.source === "auto-connect" && (errorData.error === "No valid session found" || errorData.error === "No trusted connections available");
+      const isAutoConnectNoSession = errorData?.source === "auto-connect" && (errorData?.error === "No valid session found" || errorData?.error === "No trusted connections available");
       if (isAutoConnectNoSession) {
         setErrors((prev) => ({ ...prev, connect: void 0 }));
       } else {
-        setErrors((prev) => ({ ...prev, connect: new Error(errorData.error || "Connection failed") }));
+        setErrors((prev) => ({
+          ...prev,
+          connect: new Error(errorData?.error || "Connection failed")
+        }));
       }
       setAddresses([]);
     };

package/dist/index.mjs

@@ -161,20 +161,14 @@ function useDiscoveredWallets() {
     try {
       setIsLoading(true);
       setError(null);
-      const initialWallets = sdk.getDiscoveredWallets();
-      if (initialWallets.length > 0) {
-        setWallets(initialWallets);
-        setIsLoading(false);
-      } else {
-        await sdk.discoverWallets();
-        const discoveredWallets = sdk.getDiscoveredWallets();
-        setWallets(discoveredWallets);
-        setIsLoading(false);
-      }
+      await sdk.discoverWallets();
+      const discoveredWallets = sdk.getDiscoveredWallets();
+      setWallets(discoveredWallets);
     } catch (err) {
       const error2 = err instanceof Error ? err : new Error("Failed to fetch discovered wallets");
       setError(error2);
       setWallets([]);
+    } finally {
       setIsLoading(false);
     }
   }, [sdk]);
@@ -269,7 +263,8 @@ function ConnectModalContent({
   const isConnectingState = baseConnect.isConnecting || isConnecting;
   const errorState = baseConnect.error ? baseConnect.error.message : error;
   const showDivider = !(allowedProviders.length === 1 && allowedProviders.includes("injected"));
-  const shouldShowOtherWalletsButton = discoveredWallets.length > 2;
+  const isInjectedOnly = allowedProviders.length === 1 && allowedProviders.includes("injected");
+  const shouldShowOtherWalletsButton = !isInjectedOnly && discoveredWallets.length > 2;
   const walletsToShowInline = shouldShowOtherWalletsButton ? [] : discoveredWallets;
   const connectWithAuthProvider = useCallback3(
     async (provider, walletId) => {
@@ -538,7 +533,7 @@ function ConnectModalContent({
             ] })
           }
         ),
-        allowedProviders.includes("injected") && (isExtensionInstalled.isInstalled || discoveredWallets.length > 0) && (!isMobile || isExtensionInstalled.isInstalled) && /* @__PURE__ */ jsxs(Fragment, { children: [
+        allowedProviders.includes("injected") && (isExtensionInstalled.isInstalled || discoveredWallets.length > 0) && /* @__PURE__ */ jsxs(Fragment, { children: [
           showDivider && /* @__PURE__ */ jsxs("div", { style: dividerStyle, children: [
             /* @__PURE__ */ jsx2("div", { style: dividerLineStyle }),
             /* @__PURE__ */ jsx2("span", { style: dividerTextStyle, children: "OR" }),
@@ -790,9 +785,10 @@ function PhantomProvider({ children, config, debugConfig, theme, appIcon, appNam
       try {
         setIsConnected(true);
         setIsConnecting(false);
-        setUser(data);
         const addrs = await sdk.getAddresses();
         setAddresses(addrs);
+        const normalizedUser = data ?? { addresses: addrs };
+        setUser(normalizedUser);
       } catch (err) {
         console.error("Error connecting:", err);
         try {
@@ -805,11 +801,14 @@ function PhantomProvider({ children, config, debugConfig, theme, appIcon, appNam
     const handleConnectError = (errorData) => {
       setIsConnecting(false);
       setIsConnected(false);
-      const isAutoConnectNoSession = errorData.source === "auto-connect" && (errorData.error === "No valid session found" || errorData.error === "No trusted connections available");
+      const isAutoConnectNoSession = errorData?.source === "auto-connect" && (errorData?.error === "No valid session found" || errorData?.error === "No trusted connections available");
       if (isAutoConnectNoSession) {
         setErrors((prev) => ({ ...prev, connect: void 0 }));
       } else {
-        setErrors((prev) => ({ ...prev, connect: new Error(errorData.error || "Connection failed") }));
+        setErrors((prev) => ({
+          ...prev,
+          connect: new Error(errorData?.error || "Connection failed")
+        }));
       }
       setAddresses([]);
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phantom/react-sdk",
-  "version": "1.0.0",
+  "version": "1.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/phantom/phantom-connect-sdk",
@@ -31,31 +31,31 @@
     "prettier": "prettier --write \"src/**/*.{ts,tsx}\""
   },
   "dependencies": {
-    "@phantom/browser-sdk": "^1.0.0",
-    "@phantom/chain-interfaces": "^1.0.0",
-    "@phantom/constants": "^1.0.0",
-    "@phantom/wallet-sdk-ui": "^1.0.0"
+    "@phantom/browser-sdk": "^1.0.3",
+    "@phantom/chain-interfaces": "^1.0.3",
+    "@phantom/constants": "^1.0.3",
+    "@phantom/wallet-sdk-ui": "^1.0.3"
   },
   "devDependencies": {
     "@testing-library/dom": "^10.4.0",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.0",
     "@types/jest": "^29.5.14",
-    "@types/react": "^19.1.2",
-    "@types/react-dom": "^19.1.2",
+    "@types/react": "^19.0.1",
+    "@types/react-dom": "^19.0.1",
     "eslint": "8.53.0",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "prettier": "^3.5.2",
-    "react": "19.0.0",
-    "react-dom": "19.0.0",
+    "react": "19.0.1",
+    "react-dom": "19.0.1",
     "rimraf": "^6.0.1",
     "ts-jest": "^29",
     "tsup": "^6.7.0",
     "typescript": "^5.0.4"
   },
   "peerDependencies": {
-    "react": ">=19.0.0"
+    "react": ">=19.0.1"
   },
   "publishConfig": {
     "directory": "_release/package"