@meshconnect/uwc-react 0.9.4 → 0.10.1

package/dist/providers/ConnectionProvider.d.ts

@@ -1,8 +1,16 @@
 import React from 'react';
 import { UniversalWalletConnector } from '@meshconnect/uwc-core';
 import type { Session, Network, WalletMetadata, WalletConnectConfig, TonConnectConfig, TronConnectorConfig } from '@meshconnect/uwc-types';
-interface ConnectionContextValue {
-    connector: UniversalWalletConnector;
+export interface ConnectionContextValue {
+    /**
+     * `null` when the provider is mounted without wallets. `@meshconnect/uwc-core`
+     * requires at least one wallet to construct a connector, so a wallet-less
+     * session (e.g. a CEX-only catalog) legitimately has none. Hooks treat a null
+     * connector as "no wallet session" and return inert values instead of
+     * throwing, so a host that mounts this provider for every session — wallet or
+     * not — does not crash.
+     */
+    connector: UniversalWalletConnector | null;
     session: Session;
     wallets: WalletMetadata[];
     networks: Network[];

package/dist/providers/ConnectionProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ConnectionProvider.d.ts","sourceRoot":"","sources":["../../src/providers/ConnectionProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA6C,MAAM,OAAO,CAAA;AACjE,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAA;AAChE,OAAO,KAAK,EACV,OAAO,EACP,OAAO,EACP,cAAc,EACd,mBAAmB,EACnB,gBAAgB,EAChB,mBAAmB,EACpB,MAAM,wBAAwB,CAAA;AAK/B,UAAU,sBAAsB;IAC9B,SAAS,EAAE,wBAAwB,CAAA;IACnC,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,EAAE,cAAc,EAAE,CAAA;IACzB,QAAQ,EAAE,OAAO,EAAE,CAAA;IACnB,OAAO,EAAE,OAAO,CAAA;CACjB;AAED,QAAA,MAAM,iBAAiB,8CAAqD,CAAA;AAE5E,UAAU,uBAAuB;IAC/B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IACzB,QAAQ,EAAE,OAAO,EAAE,CAAA;IACnB,OAAO,EAAE,cAAc,EAAE,CAAA;IACzB,sBAAsB,CAAC,EAAE,OAAO,CAAA;IAChC,mBAAmB,CAAC,EAAE,mBAAmB,CAAA;IACzC,gBAAgB,CAAC,EAAE,gBAAgB,CAAA;IACnC,mBAAmB,CAAC,EAAE,mBAAmB,CAAA;CAC1C;AAED,wBAAgB,kBAAkB,CAAC,EACjC,QAAQ,EACR,QAAQ,EACR,OAAO,EACP,sBAA8B,EAC9B,mBAAmB,EACnB,gBAAgB,EAChB,mBAAmB,EACpB,EAAE,uBAAuB,2CAuCzB;AAED,OAAO,EAAE,iBAAiB,EAAE,CAAA"}
+{"version":3,"file":"ConnectionProvider.d.ts","sourceRoot":"","sources":["../../src/providers/ConnectionProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA6C,MAAM,OAAO,CAAA;AACjE,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAA;AAChE,OAAO,KAAK,EACV,OAAO,EACP,OAAO,EACP,cAAc,EACd,mBAAmB,EACnB,gBAAgB,EAChB,mBAAmB,EACpB,MAAM,wBAAwB,CAAA;AAwB/B,MAAM,WAAW,sBAAsB;IACrC;;;;;;;OAOG;IACH,SAAS,EAAE,wBAAwB,GAAG,IAAI,CAAA;IAC1C,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,EAAE,cAAc,EAAE,CAAA;IACzB,QAAQ,EAAE,OAAO,EAAE,CAAA;IACnB,OAAO,EAAE,OAAO,CAAA;CACjB;AAED,QAAA,MAAM,iBAAiB,8CAAqD,CAAA;AAE5E,UAAU,uBAAuB;IAC/B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IACzB,QAAQ,EAAE,OAAO,EAAE,CAAA;IACnB,OAAO,EAAE,cAAc,EAAE,CAAA;IACzB,sBAAsB,CAAC,EAAE,OAAO,CAAA;IAChC,mBAAmB,CAAC,EAAE,mBAAmB,CAAA;IACzC,gBAAgB,CAAC,EAAE,gBAAgB,CAAA;IACnC,mBAAmB,CAAC,EAAE,mBAAmB,CAAA;CAC1C;AAED,wBAAgB,kBAAkB,CAAC,EACjC,QAAQ,EACR,QAAQ,EACR,OAAO,EACP,sBAA8B,EAC9B,mBAAmB,EACnB,gBAAgB,EAChB,mBAAmB,EACpB,EAAE,uBAAuB,2CAmDzB;AAED,OAAO,EAAE,iBAAiB,EAAE,CAAA"}

package/dist/providers/ConnectionProvider.js

@@ -3,15 +3,42 @@ import React, { createContext, useEffect, useState } from 'react';
 import { UniversalWalletConnector } from '@meshconnect/uwc-core';
 // Guard against double initialization
 let sharedConnector = null;
+/**
+ * Session served before any wallet is connected — and while the provider is
+ * mounted without wallets (a wallet-less session; see `connector` below). Every
+ * field is at its natural empty per the `Session` type, so the read-only hooks
+ * (`useSession`/`useNetworks`/`useWallets`) work unchanged and the sign/transfer
+ * hooks short-circuit on their existing `activeAddress` guard.
+ */
+const EMPTY_SESSION = {
+    connectionMode: null,
+    activeNetwork: null,
+    activeWalletCapabilities: null,
+    activeNetworkWalletCapabilities: null,
+    activeAddress: null,
+    publicKey: null,
+    availableNetworks: [],
+    activeWallet: null,
+    availableAddresses: []
+};
 const ConnectionContext = createContext(null);
 export function ConnectionProvider({ children, networks, wallets, usingIntegratedBrowser = false, walletConnectConfig, tonConnectConfig, tronConnectorConfig }) {
-    if (!sharedConnector) {
+    // Core rejects an empty wallet list, so only construct once there is at least
+    // one wallet. A wallet-less session keeps `connector` null; the effect below
+    // adopts the connector if wallets arrive later (async catalog population).
+    if (!sharedConnector && wallets.length > 0) {
         sharedConnector = new UniversalWalletConnector(networks, wallets, usingIntegratedBrowser, walletConnectConfig, tonConnectConfig, tronConnectorConfig);
     }
     const connector = sharedConnector;
-    const [session, setSession] = useState(() => connector.getSession());
-    const [isReady, setIsReady] = useState(() => connector.isReady());
+    const [session, setSession] = useState(() => connector?.getSession() ?? EMPTY_SESSION);
+    const [isReady, setIsReady] = useState(() => connector?.isReady() ?? false);
     useEffect(() => {
+        if (!connector)
+            return;
+        // Sync once on adoption — covers the case where the connector was created
+        // after the first render (wallets populated asynchronously).
+        setSession(connector.getSession());
+        setIsReady(connector.isReady());
         const unsubscribe = connector.subscribe(() => {
             setSession(connector.getSession());
             setIsReady(connector.isReady());
@@ -21,8 +48,8 @@ export function ConnectionProvider({ children, networks, wallets, usingIntegrate
     const value = {
         connector,
         session,
-        wallets: connector.getWallets(),
-        networks: connector.getNetworks(),
+        wallets: connector ? connector.getWallets() : wallets,
+        networks: connector ? connector.getNetworks() : networks,
         isReady
     };
     return (_jsx(ConnectionContext.Provider, { value: value, children: children }));

package/dist/providers/ConnectionProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"ConnectionProvider.js","sourceRoot":"","sources":["../../src/providers/ConnectionProvider.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,EAAE,aAAa,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AACjE,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAA;AAUhE,sCAAsC;AACtC,IAAI,eAAe,GAAoC,IAAI,CAAA;AAU3D,MAAM,iBAAiB,GAAG,aAAa,CAAgC,IAAI,CAAC,CAAA;AAY5E,MAAM,UAAU,kBAAkB,CAAC,EACjC,QAAQ,EACR,QAAQ,EACR,OAAO,EACP,sBAAsB,GAAG,KAAK,EAC9B,mBAAmB,EACnB,gBAAgB,EAChB,mBAAmB,EACK;IACxB,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,eAAe,GAAG,IAAI,wBAAwB,CAC5C,QAAQ,EACR,OAAO,EACP,sBAAsB,EACtB,mBAAmB,EACnB,gBAAgB,EAChB,mBAAmB,CACpB,CAAA;IACH,CAAC;IAED,MAAM,SAAS,GAAG,eAAe,CAAA;IAEjC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAU,GAAG,EAAE,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC,CAAA;IAC7E,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAA;IAEjE,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,WAAW,GAAG,SAAS,CAAC,SAAS,CAAC,GAAG,EAAE;YAC3C,UAAU,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC,CAAA;YAClC,UAAU,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAA;QACjC,CAAC,CAAC,CAAA;QAEF,OAAO,WAAW,CAAA;IACpB,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAA;IAEf,MAAM,KAAK,GAA2B;QACpC,SAAS;QACT,OAAO;QACP,OAAO,EAAE,SAAS,CAAC,UAAU,EAAE;QAC/B,QAAQ,EAAE,SAAS,CAAC,WAAW,EAAE;QACjC,OAAO;KACR,CAAA;IAED,OAAO,CACL,KAAC,iBAAiB,CAAC,QAAQ,IAAC,KAAK,EAAE,KAAK,YACrC,QAAQ,GACkB,CAC9B,CAAA;AACH,CAAC;AAED,OAAO,EAAE,iBAAiB,EAAE,CAAA"}
+{"version":3,"file":"ConnectionProvider.js","sourceRoot":"","sources":["../../src/providers/ConnectionProvider.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,EAAE,aAAa,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AACjE,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAA;AAUhE,sCAAsC;AACtC,IAAI,eAAe,GAAoC,IAAI,CAAA;AAE3D;;;;;;GAMG;AACH,MAAM,aAAa,GAAY;IAC7B,cAAc,EAAE,IAAI;IACpB,aAAa,EAAE,IAAI;IACnB,wBAAwB,EAAE,IAAI;IAC9B,+BAA+B,EAAE,IAAI;IACrC,aAAa,EAAE,IAAI;IACnB,SAAS,EAAE,IAAI;IACf,iBAAiB,EAAE,EAAE;IACrB,YAAY,EAAE,IAAI;IAClB,kBAAkB,EAAE,EAAE;CACvB,CAAA;AAkBD,MAAM,iBAAiB,GAAG,aAAa,CAAgC,IAAI,CAAC,CAAA;AAY5E,MAAM,UAAU,kBAAkB,CAAC,EACjC,QAAQ,EACR,QAAQ,EACR,OAAO,EACP,sBAAsB,GAAG,KAAK,EAC9B,mBAAmB,EACnB,gBAAgB,EAChB,mBAAmB,EACK;IACxB,8EAA8E;IAC9E,6EAA6E;IAC7E,2EAA2E;IAC3E,IAAI,CAAC,eAAe,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3C,eAAe,GAAG,IAAI,wBAAwB,CAC5C,QAAQ,EACR,OAAO,EACP,sBAAsB,EACtB,mBAAmB,EACnB,gBAAgB,EAChB,mBAAmB,CACpB,CAAA;IACH,CAAC;IAED,MAAM,SAAS,GAAG,eAAe,CAAA;IAEjC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CACpC,GAAG,EAAE,CAAC,SAAS,EAAE,UAAU,EAAE,IAAI,aAAa,CAC/C,CAAA;IACD,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,IAAI,KAAK,CAAC,CAAA;IAE3E,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,SAAS;YAAE,OAAM;QAEtB,0EAA0E;QAC1E,6DAA6D;QAC7D,UAAU,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC,CAAA;QAClC,UAAU,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAA;QAE/B,MAAM,WAAW,GAAG,SAAS,CAAC,SAAS,CAAC,GAAG,EAAE;YAC3C,UAAU,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC,CAAA;YAClC,UAAU,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAA;QACjC,CAAC,CAAC,CAAA;QAEF,OAAO,WAAW,CAAA;IACpB,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAA;IAEf,MAAM,KAAK,GAA2B;QACpC,SAAS;QACT,OAAO;QACP,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,OAAO;QACrD,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,QAAQ;QACxD,OAAO;KACR,CAAA;IAED,OAAO,CACL,KAAC,iBAAiB,CAAC,QAAQ,IAAC,KAAK,EAAE,KAAK,YACrC,QAAQ,GACkB,CAC9B,CAAA;AACH,CAAC;AAED,OAAO,EAAE,iBAAiB,EAAE,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meshconnect/uwc-react",
-  "version": "0.9.4",
+  "version": "0.10.1",
   "description": "React hooks and components for Universal Wallet Connector",
   "type": "module",
   "main": "dist/index.js",
@@ -16,7 +16,7 @@
     "src"
   ],
   "dependencies": {
-    "@meshconnect/uwc-core": "1.0.2",
+    "@meshconnect/uwc-core": "1.0.3",
     "@meshconnect/uwc-types": "0.16.1"
   },
   "peerDependencies": {

package/src/hooks/useConnection.ts

@@ -1,5 +1,5 @@
-import { useContext, useCallback, useState, useEffect } from 'react'
-import { ConnectionContext } from '../providers/ConnectionProvider'
+import { useCallback, useState, useEffect } from 'react'
+import { useConnectionContext } from './useConnectionContext'
 import type {
   NetworkId,
   UseConnectionReturn,
@@ -26,12 +26,7 @@ import type {
  * ```
  */
 export function useConnection(walletId: string): UseConnectionReturn {
-  const context = useContext(ConnectionContext)
-
-  if (!context) {
-    throw new Error('useConnection must be used within a ConnectionProvider')
-  }
-
+  const context = useConnectionContext('useConnection')
   const { connector, isReady } = context
 
   const [walletConnectLoading, setWalletConnectLoading] = useState(false)
@@ -52,6 +47,9 @@ export function useConnection(walletId: string): UseConnectionReturn {
 
   // Update connection URI and availability when they change
   useEffect(() => {
+    // No connector (wallet-less session): nothing to connect or track.
+    if (!connector) return
+
     const checkState = () => {
       const uri = connector.getConnectionURI()
 
@@ -89,6 +87,10 @@ export function useConnection(walletId: string): UseConnectionReturn {
 
   const connectWalletConnect = useCallback(
     async (networkId?: NetworkId) => {
+      if (!connector) {
+        throw new Error('No wallet connected')
+      }
+
       setWalletConnectLoading(true)
       setWalletConnectError(undefined)
       setWalletConnectURI(undefined)
@@ -123,6 +125,10 @@ export function useConnection(walletId: string): UseConnectionReturn {
 
   const connectInjected = useCallback(
     async (networkId?: NetworkId) => {
+      if (!connector) {
+        throw new Error('No wallet connected')
+      }
+
       setInjectedLoading(true)
       setInjectedError(undefined)
       try {
@@ -140,6 +146,10 @@ export function useConnection(walletId: string): UseConnectionReturn {
 
   const connectTonConnect = useCallback(
     async (networkId?: NetworkId) => {
+      if (!connector) {
+        throw new Error('No wallet connected')
+      }
+
       setTonConnectLoading(true)
       setTonConnectError(undefined)
       setTonConnectURI(undefined)

package/src/hooks/useConnectionContext.ts

@@ -0,0 +1,25 @@
+import { useContext } from 'react'
+import {
+  ConnectionContext,
+  type ConnectionContextValue
+} from '../providers/ConnectionProvider'
+
+/**
+ * Reads the connection context, throwing the canonical
+ * "must be used within a ConnectionProvider" error when the hook is used
+ * outside the provider tree. Centralizes the guard every hook needs so the
+ * check and its message live in one place.
+ *
+ * Note: a non-null context can still carry a `null` connector (a wallet-less
+ * session — see `ConnectionContextValue.connector`). Callers that need the
+ * connector must handle that case; this guard only covers "no provider".
+ *
+ * @param hookName - Name used in the error, e.g. `'useSession'`.
+ */
+export function useConnectionContext(hookName: string): ConnectionContextValue {
+  const context = useContext(ConnectionContext)
+  if (!context) {
+    throw new Error(`${hookName} must be used within a ConnectionProvider`)
+  }
+  return context
+}

package/src/hooks/useDetectedWallets.ts

@@ -1,24 +1,20 @@
-import { useContext, useEffect, useState } from 'react'
-import { ConnectionContext } from '../providers/ConnectionProvider'
+import { useEffect, useState } from 'react'
+import { useConnectionContext } from './useConnectionContext'
 import type {
   UseDetectedWalletsReturn,
   WalletMetadata
 } from '@meshconnect/uwc-types'
 
 export function useDetectedWallets(): UseDetectedWalletsReturn {
-  const context = useContext(ConnectionContext)
-
-  if (!context) {
-    throw new Error(
-      'useInjectedAvailableWallets must be used within a ConnectionProvider'
-    )
-  }
-
+  const context = useConnectionContext('useInjectedAvailableWallets')
   const { connector, wallets, isReady } = context
 
   const [detectedWallets, setDetectedWallets] = useState<WalletMetadata[]>([])
 
   useEffect(() => {
+    // No connector (wallet-less session): nothing can be detected.
+    if (!connector) return
+
     const checkState = () => {
       const newDetectedWallets = wallets.filter(wallet =>
         connector.isConnectionModeAvailable('injected', wallet.id)

package/src/hooks/useDisconnect.ts

@@ -1,5 +1,5 @@
-import { useContext, useCallback, useState } from 'react'
-import { ConnectionContext } from '../providers/ConnectionProvider'
+import { useCallback, useState } from 'react'
+import { useConnectionContext } from './useConnectionContext'
 
 interface UseDisconnectReturn {
   disconnect: () => Promise<void>
@@ -27,16 +27,14 @@ interface UseDisconnectReturn {
  * ```
  */
 export function useDisconnect(): UseDisconnectReturn {
-  const context = useContext(ConnectionContext)
-
-  if (!context) {
-    throw new Error('useDisconnect must be used within a ConnectionProvider')
-  }
-
+  const context = useConnectionContext('useDisconnect')
   const { connector } = context
   const [isLoading, setIsLoading] = useState(false)
 
   const disconnect = useCallback(async () => {
+    // No connector (wallet-less session) means nothing to disconnect.
+    if (!connector) return
+
     setIsLoading(true)
     try {
       await connector.disconnect()

package/src/hooks/useNetworks.ts

@@ -1,5 +1,4 @@
-import { useContext } from 'react'
-import { ConnectionContext } from '../providers/ConnectionProvider'
+import { useConnectionContext } from './useConnectionContext'
 import type { Network } from '@meshconnect/uwc-types'
 
 /**
@@ -16,11 +15,6 @@ import type { Network } from '@meshconnect/uwc-types'
  * ```
  */
 export function useNetworks(): Network[] {
-  const context = useContext(ConnectionContext)
-
-  if (!context) {
-    throw new Error('useNetworks must be used within a ConnectionProvider')
-  }
-
+  const context = useConnectionContext('useNetworks')
   return context.networks
 }

package/src/hooks/useSession.ts

@@ -1,5 +1,4 @@
-import { useContext } from 'react'
-import { ConnectionContext } from '../providers/ConnectionProvider'
+import { useConnectionContext } from './useConnectionContext'
 import type { UseSessionReturn } from '@meshconnect/uwc-types'
 
 /**
@@ -18,12 +17,7 @@ import type { UseSessionReturn } from '@meshconnect/uwc-types'
  * ```
  */
 export function useSession(): UseSessionReturn {
-  const context = useContext(ConnectionContext)
-
-  if (!context) {
-    throw new Error('useSession must be used within a ConnectionProvider')
-  }
-
+  const context = useConnectionContext('useSession')
   const { session } = context
 
   return {

package/src/hooks/useSignMessage.ts

@@ -1,5 +1,5 @@
-import { useContext, useCallback, useState } from 'react'
-import { ConnectionContext } from '../providers/ConnectionProvider'
+import { useCallback, useState } from 'react'
+import { useConnectionContext } from './useConnectionContext'
 import type {
   SignatureType,
   UseSignMessageReturn,
@@ -26,12 +26,7 @@ import type {
  * ```
  */
 export function useSignMessage(): UseSignMessageReturn {
-  const context = useContext(ConnectionContext)
-
-  if (!context) {
-    throw new Error('useSignMessage must be used within a ConnectionProvider')
-  }
-
+  const context = useConnectionContext('useSignMessage')
   const { connector, session } = context
   const [isLoading, setIsLoading] = useState(false)
   const [signature, setSignature] = useState<SignatureType | undefined>()
@@ -39,7 +34,7 @@ export function useSignMessage(): UseSignMessageReturn {
 
   const signMessage = useCallback(
     async (message: string): Promise<SignatureType> => {
-      if (!session.activeAddress) {
+      if (!connector || !session.activeAddress) {
         throw new Error('No wallet connected')
       }
 

package/src/hooks/useSignSolanaTransaction.ts

@@ -1,26 +1,19 @@
-import { useContext, useCallback, useState } from 'react'
-import { ConnectionContext } from '../providers/ConnectionProvider'
+import { useCallback, useState } from 'react'
+import { useConnectionContext } from './useConnectionContext'
 import type {
   UseSignSolanaTransactionReturn,
   WalletError
 } from '@meshconnect/uwc-types'
 
 export function useSignSolanaTransaction(): UseSignSolanaTransactionReturn {
-  const context = useContext(ConnectionContext)
-
-  if (!context) {
-    throw new Error(
-      'useSignSolanaTransaction must be used within a ConnectionProvider'
-    )
-  }
-
+  const context = useConnectionContext('useSignSolanaTransaction')
   const { connector, session } = context
   const [isLoading, setIsLoading] = useState(false)
   const [error, setError] = useState<WalletError | undefined>()
 
   const signSolanaTransaction = useCallback(
     async (serializedTx: Uint8Array): Promise<Uint8Array> => {
-      if (!session.activeAddress) {
+      if (!connector || !session.activeAddress) {
         throw new Error('No wallet connected')
       }
 

package/src/hooks/useSignTypedData.ts

@@ -1,5 +1,5 @@
-import { useContext, useCallback, useState } from 'react'
-import { ConnectionContext } from '../providers/ConnectionProvider'
+import { useCallback, useState } from 'react'
+import { useConnectionContext } from './useConnectionContext'
 import type {
   EIP712TypedData,
   UseSignTypedDataReturn,
@@ -30,12 +30,7 @@ import type {
  * ```
  */
 export function useSignTypedData(): UseSignTypedDataReturn {
-  const context = useContext(ConnectionContext)
-
-  if (!context) {
-    throw new Error('useSignTypedData must be used within a ConnectionProvider')
-  }
-
+  const context = useConnectionContext('useSignTypedData')
   const { connector, session } = context
   const [isLoading, setIsLoading] = useState(false)
   const [signature, setSignature] = useState<string | undefined>()
@@ -43,7 +38,7 @@ export function useSignTypedData(): UseSignTypedDataReturn {
 
   const signTypedData = useCallback(
     async (typedData: EIP712TypedData): Promise<string> => {
-      if (!session.activeAddress) {
+      if (!connector || !session.activeAddress) {
         throw new Error('No wallet connected')
       }
 

package/src/hooks/useSwitchNetwork.ts

@@ -1,5 +1,5 @@
-import { useContext, useCallback, useState, useEffect } from 'react'
-import { ConnectionContext } from '../providers/ConnectionProvider'
+import { useCallback, useState, useEffect } from 'react'
+import { useConnectionContext } from './useConnectionContext'
 import type {
   NetworkId,
   UseSwitchNetworkReturn,
@@ -32,12 +32,7 @@ import type {
  * ```
  */
 export function useSwitchNetwork(): UseSwitchNetworkReturn {
-  const context = useContext(ConnectionContext)
-
-  if (!context) {
-    throw new Error('useSwitchNetwork must be used within a ConnectionProvider')
-  }
-
+  const context = useConnectionContext('useSwitchNetwork')
   const { connector } = context
   const [isLoading, setIsLoading] = useState(false)
   const [isWaitingForUserApproval, setIsWaitingForUserApproval] =
@@ -46,6 +41,9 @@ export function useSwitchNetwork(): UseSwitchNetworkReturn {
 
   // Subscribe to loading state changes from the core
   useEffect(() => {
+    // No connector (wallet-less session): no switch state to track.
+    if (!connector) return
+
     const updateLoadingState = () => {
       const state = connector.getNetworkSwitchLoadingState()
       setIsLoading(state.isLoading)
@@ -63,6 +61,10 @@ export function useSwitchNetwork(): UseSwitchNetworkReturn {
 
   const switchNetwork = useCallback(
     async (networkId: NetworkId) => {
+      if (!connector) {
+        throw new Error('No wallet connected')
+      }
+
       setError(undefined)
       try {
         await connector.switchNetwork(networkId)

package/src/hooks/useTransaction.ts

@@ -1,5 +1,5 @@
-import { useContext, useCallback, useState } from 'react'
-import { ConnectionContext } from '../providers/ConnectionProvider'
+import { useCallback, useState } from 'react'
+import { useConnectionContext } from './useConnectionContext'
 import type {
   TransactionRequest,
   TransactionResult,
@@ -30,12 +30,7 @@ import type {
  * ```
  */
 export function useTransaction(): UseTransactionReturn {
-  const context = useContext(ConnectionContext)
-
-  if (!context) {
-    throw new Error('useTransaction must be used within a ConnectionProvider')
-  }
-
+  const context = useConnectionContext('useTransaction')
   const { connector, session } = context
   const [isLoading, setIsLoading] = useState(false)
   const [transactionResult, setTransactionResult] = useState<
@@ -45,7 +40,7 @@ export function useTransaction(): UseTransactionReturn {
 
   const sendTransaction = useCallback(
     async (request: TransactionRequest): Promise<TransactionResult> => {
-      if (!session.activeAddress) {
+      if (!connector || !session.activeAddress) {
         throw new Error('No wallet connected')
       }
 

package/src/hooks/useWallet.ts

@@ -1,5 +1,4 @@
-import { useContext } from 'react'
-import { ConnectionContext } from '../providers/ConnectionProvider'
+import { useConnectionContext } from './useConnectionContext'
 import type { WalletMetadata, UseWalletReturn } from '@meshconnect/uwc-types'
 import { WalletConnectorError } from '@meshconnect/uwc-types'
 
@@ -18,12 +17,7 @@ import { WalletConnectorError } from '@meshconnect/uwc-types'
  * }
  */
 export function useWallet(walletId: string): UseWalletReturn {
-  const context = useContext(ConnectionContext)
-
-  if (!context) {
-    throw new Error('useWallet must be used within a ConnectionProvider')
-  }
-
+  const context = useConnectionContext('useWallet')
   const selectedWallet = context.wallets.find(
     (wallet: WalletMetadata) => wallet.id === walletId
   )

package/src/hooks/useWalletCapabilities.ts

@@ -1,5 +1,5 @@
-import { useContext, useCallback, useState } from 'react'
-import { ConnectionContext } from '../providers/ConnectionProvider'
+import { useCallback, useState } from 'react'
+import { useConnectionContext } from './useConnectionContext'
 import type {
   UseWalletCapabilitiesReturn,
   WalletError
@@ -27,14 +27,7 @@ import type {
  * ```
  */
 export function useWalletCapabilities(): UseWalletCapabilitiesReturn {
-  const context = useContext(ConnectionContext)
-
-  if (!context) {
-    throw new Error(
-      'useWalletCapabilities must be used within a ConnectionProvider'
-    )
-  }
-
+  const context = useConnectionContext('useWalletCapabilities')
   const { connector, session } = context
 
   const [isLoading, setIsLoading] = useState(false)
@@ -42,8 +35,9 @@ export function useWalletCapabilities(): UseWalletCapabilitiesReturn {
 
   // Manual fetch function to be called from the app
   const fetchCapabilities = useCallback(async () => {
-    // If no active session or address, clear capabilities
-    if (!session?.activeAddress || !session?.connectionMode) {
+    // No connector (wallet-less session) or no active session/address: nothing
+    // to fetch.
+    if (!connector || !session?.activeAddress || !session?.connectionMode) {
       return
     }
 

package/src/hooks/useWallets.ts

@@ -1,5 +1,4 @@
-import { useContext } from 'react'
-import { ConnectionContext } from '../providers/ConnectionProvider'
+import { useConnectionContext } from './useConnectionContext'
 import type { WalletMetadata } from '@meshconnect/uwc-types'
 
 /**
@@ -16,11 +15,6 @@ import type { WalletMetadata } from '@meshconnect/uwc-types'
  * ```
  */
 export function useWallets(): WalletMetadata[] {
-  const context = useContext(ConnectionContext)
-
-  if (!context) {
-    throw new Error('useWallets must be used within a ConnectionProvider')
-  }
-
+  const context = useConnectionContext('useWallets')
   return context.wallets
 }

package/src/providers/ConnectionProvider.emptyWallets.test.tsx

@@ -0,0 +1,105 @@
+import { useContext, act } from 'react'
+import { describe, it, expect, beforeEach, vi } from 'vitest'
+import { createRoot } from 'react-dom/client'
+
+/**
+ * A wallet-less session (e.g. a CEX-only catalog) mounts the provider with an
+ * empty wallet list. `@meshconnect/uwc-core` rejects an empty wallet list, so
+ * the provider must NOT construct a connector — it serves a null connector and
+ * an empty session, and the hooks stay inert instead of crashing. This guards
+ * the exact regression where bumping core to a version that throws on empty
+ * wallets took down the whole widget for CEX-only sessions.
+ */
+describe('ConnectionProvider — wallet-less session', () => {
+  beforeEach(() => {
+    vi.resetModules()
+  })
+
+  it('does not construct a connector and exposes a null connector + empty session', async () => {
+    vi.doMock('@meshconnect/uwc-core', () => {
+      class UniversalWalletConnector {
+        static calls = 0
+        constructor() {
+          UniversalWalletConnector.calls++
+        }
+      }
+      return { UniversalWalletConnector }
+    })
+
+    const { ConnectionProvider, ConnectionContext } =
+      await import('./ConnectionProvider')
+    const { useSession } = await import('../hooks/useSession')
+    const { UniversalWalletConnector } = await import('@meshconnect/uwc-core')
+
+    let connector: unknown = 'unset'
+    let activeAddress: unknown = 'unset'
+    let availableNetworks: unknown = 'unset'
+
+    function Capture() {
+      const ctx = useContext(ConnectionContext)
+      connector = ctx?.connector
+      const session = useSession()
+      activeAddress = session.activeAddress
+      availableNetworks = session.availableNetworks
+      return null
+    }
+
+    const container = document.createElement('div')
+    document.body.appendChild(container)
+    const root = createRoot(container)
+
+    await act(async () => {
+      root.render(
+        <ConnectionProvider networks={[]} wallets={[]}>
+          <Capture />
+        </ConnectionProvider>
+      )
+    })
+
+    // Core was never constructed (its guard would have thrown on []).
+    // @ts-expect-error test-only property
+    expect(UniversalWalletConnector.calls).toBe(0)
+    expect(connector).toBeNull()
+    // Read-only session hooks return the empty session, not a crash.
+    expect(activeAddress).toBeNull()
+    expect(availableNetworks).toEqual([])
+
+    await act(async () => {
+      root.unmount()
+    })
+  })
+
+  it('keeps action hooks inert — switchNetwork rejects with "No wallet connected"', async () => {
+    const { ConnectionProvider } = await import('./ConnectionProvider')
+    const { useSwitchNetwork } = await import('../hooks/useSwitchNetwork')
+
+    let switchNetwork:
+      | ((networkId: `${string}:${string}`) => Promise<void>)
+      | undefined
+
+    function Capture() {
+      switchNetwork = useSwitchNetwork().switchNetwork
+      return null
+    }
+
+    const container = document.createElement('div')
+    document.body.appendChild(container)
+    const root = createRoot(container)
+
+    await act(async () => {
+      root.render(
+        <ConnectionProvider networks={[]} wallets={[]}>
+          <Capture />
+        </ConnectionProvider>
+      )
+    })
+
+    await expect(switchNetwork?.('eip155:1')).rejects.toThrow(
+      'No wallet connected'
+    )
+
+    await act(async () => {
+      root.unmount()
+    })
+  })
+})