npm - @txnlab/use-wallet-solid - Versions diffs - 4.0.0-beta.4 → 4.0.0-beta.5 - Mend

@txnlab/use-wallet-solid 4.0.0-beta.4 → 4.0.0-beta.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/dist/dev.cjs CHANGED Viewed

@@ -2,7 +2,7 @@
 var solidStore = require('@tanstack/solid-store');
 var algosdk = require('algosdk');
-var useWallet$1 = require('@txnlab/use-wallet');
+var useWallet = require('@txnlab/use-wallet');
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
@@ -10,9 +10,9 @@ var algosdk__default = /*#__PURE__*/_interopDefault(algosdk);
 // ../../node_modules/.pnpm/solid-js@1.9.3/node_modules/solid-js/dist/solid.js
 var sharedConfig = {
-  context: void 0,
-  registry: void 0,
-  effects: void 0,
+  context: undefined,
+  registry: undefined,
+  effects: undefined,
   done: false,
   getContextId() {
     return getContextId(this.context.count);
@@ -63,7 +63,7 @@ function createSignal(value, options) {
     value,
     observers: null,
     observerSlots: null,
-    comparator: options.equals || void 0
+    comparator: options.equals || undefined
   };
   const setter = (value2) => {
     if (typeof value2 === "function") {
@@ -91,7 +91,7 @@ function createMemo(fn, value, options) {
   const c = createComputation(fn, value, true, 0);
   c.observers = null;
   c.observerSlots = null;
-  c.comparator = options.equals || void 0;
+  c.comparator = options.equals || undefined;
   if (Scheduler && Transition && Transition.running) {
     c.tState = STALE;
     Updates.push(c);
@@ -143,7 +143,7 @@ function startTransition(fn) {
     }
     runUpdates(fn);
     Listener = Owner = null;
-    return t ? t.done : void 0;
+    return t ? t.done : undefined;
   });
 }
 var [transPending, setTransPending] = /* @__PURE__ */ createSignal(false);
@@ -157,7 +157,7 @@ function createContext(defaultValue, options) {
 }
 function useContext(context) {
   let value;
-  return Owner && Owner.context && (value = Owner.context[context.id]) !== void 0 ? value : context.defaultValue;
+  return Owner && Owner.context && (value = Owner.context[context.id]) !== undefined ? value : context.defaultValue;
 }
 function children(fn) {
   const children2 = createMemo(fn);
@@ -266,7 +266,7 @@ function runComputation(node, value, time) {
       if (Transition && Transition.running) {
         node.tState = STALE;
         node.tOwned && node.tOwned.forEach(cleanNode);
-        node.tOwned = void 0;
+        node.tOwned = undefined;
       } else {
         node.state = STALE;
         node.owned && node.owned.forEach(cleanNode);
@@ -318,7 +318,7 @@ function createComputation(fn, init, pure, state = STALE, options) {
     }
   }
   if (ExternalSourceConfig && c.fn) {
-    const [track, trigger] = createSignal(void 0, {
+    const [track, trigger] = createSignal(undefined, {
       equals: false
     });
     const ordinary = ExternalSourceConfig.factory(c.fn, trigger);
@@ -583,7 +583,7 @@ function createProvider(id, options) {
         };
         return children(() => props.children);
       }),
-      void 0
+      undefined
     );
     return res;
   };
@@ -664,21 +664,13 @@ exports.useWalletManager = () => {
   }
   return manager();
 };
-function useWallet() {
+exports.useNetwork = () => {
   const manager = createMemo(() => exports.useWalletManager());
-  const algodClient = solidStore.useStore(manager().store, (state) => state.algodClient);
-  const walletStore = solidStore.useStore(manager().store, (state) => state.wallets);
-  const walletState = (walletId) => walletStore()[walletId] || null;
-  const activeWalletId = solidStore.useStore(manager().store, (state) => state.activeWallet);
-  const activeWallet = () => manager().getWallet(activeWalletId()) || null;
-  const activeWalletState = () => walletState(activeWalletId());
-  const activeWalletAccounts = () => activeWalletState()?.accounts ?? null;
-  const activeWalletAddresses = () => activeWalletAccounts()?.map((account) => account.address) ?? null;
-  const activeAccount = () => activeWalletState()?.activeAccount ?? null;
-  const activeAddress = () => activeAccount()?.address ?? null;
-  const isWalletActive = (walletId) => walletId === activeWalletId();
-  const isWalletConnected = (walletId) => !!walletState(walletId)?.accounts.length || false;
   const activeNetwork = solidStore.useStore(manager().store, (state) => state.activeNetwork);
+  const activeNetworkConfig = () => {
+    const store = solidStore.useStore(manager().store);
+    return store().networkConfig[activeNetwork()];
+  };
   const setActiveNetwork = async (networkId) => {
     if (networkId === activeNetwork()) {
       return;
@@ -686,17 +678,18 @@ function useWallet() {
     if (!manager().networkConfig[networkId]) {
       throw new Error(`Network "${networkId}" not found in network configuration`);
     }
-    console.info(`[Solid] Creating Algodv2 client for ${networkId}...`);
+    console.info(`[Solid] Creating new Algodv2 client...`);
     const {
       algod
     } = manager().networkConfig[networkId];
     const {
-      token,
+      token = "",
       baseServer,
-      port,
-      headers
+      port = "",
+      headers = {}
     } = algod;
     const newClient = new algosdk__default.default.Algodv2(token, baseServer, port, headers);
+    await manager().setActiveNetwork(networkId);
     manager().store.setState((state) => ({
       ...state,
       activeNetwork: networkId,
@@ -704,6 +697,71 @@ function useWallet() {
     }));
     console.info(`[Solid] \u2705 Active network set to ${networkId}.`);
   };
+  const updateAlgodConfig = (networkId, config) => {
+    manager().updateAlgodConfig(networkId, config);
+    if (networkId === activeNetwork()) {
+      console.info(`[Solid] Creating new Algodv2 client...`);
+      const {
+        algod
+      } = manager().networkConfig[networkId];
+      const {
+        token = "",
+        baseServer,
+        port = "",
+        headers = {}
+      } = algod;
+      const newClient = new algosdk__default.default.Algodv2(token, baseServer, port, headers);
+      manager().store.setState((state) => ({
+        ...state,
+        algodClient: newClient
+      }));
+    }
+  };
+  const resetNetworkConfig = (networkId) => {
+    manager().resetNetworkConfig(networkId);
+    if (networkId === activeNetwork()) {
+      console.info(`[Solid] Creating new Algodv2 client...`);
+      const {
+        algod
+      } = manager().networkConfig[networkId];
+      const {
+        token = "",
+        baseServer,
+        port = "",
+        headers = {}
+      } = algod;
+      const newClient = new algosdk__default.default.Algodv2(token, baseServer, port, headers);
+      manager().store.setState((state) => ({
+        ...state,
+        algodClient: newClient
+      }));
+    }
+  };
+  return {
+    activeNetwork,
+    networkConfig: () => manager().networkConfig,
+    activeNetworkConfig,
+    setActiveNetwork,
+    updateAlgodConfig,
+    resetNetworkConfig
+  };
+};
+exports.useWallet = () => {
+  const manager = createMemo(() => exports.useWalletManager());
+  const managerStatus = solidStore.useStore(manager().store, (state) => state.managerStatus);
+  const isReady = createMemo(() => managerStatus() === "ready");
+  const algodClient = solidStore.useStore(manager().store, (state) => state.algodClient);
+  const walletStore = solidStore.useStore(manager().store, (state) => state.wallets);
+  const walletState = (walletId) => walletStore()[walletId] || null;
+  const activeWalletId = solidStore.useStore(manager().store, (state) => state.activeWallet);
+  const activeWallet = () => manager().getWallet(activeWalletId()) || null;
+  const activeWalletState = () => walletState(activeWalletId());
+  const activeWalletAccounts = () => activeWalletState()?.accounts ?? null;
+  const activeWalletAddresses = () => activeWalletAccounts()?.map((account) => account.address) ?? null;
+  const activeAccount = () => activeWalletState()?.activeAccount ?? null;
+  const activeAddress = () => activeAccount()?.address ?? null;
+  const isWalletActive = (walletId) => walletId === activeWalletId();
+  const isWalletConnected = (walletId) => !!walletState(walletId)?.accounts.length || false;
   const signTransactions = (txnGroup, indexesToSign) => {
     const wallet = activeWallet();
     if (!wallet) {
@@ -719,29 +777,27 @@ function useWallet() {
     return wallet.transactionSigner(txnGroup, indexesToSign);
   };
   return {
-    activeWalletId,
-    walletStore,
+    wallets: manager().wallets,
+    isReady,
     algodClient,
-    activeNetwork,
     activeWallet,
     activeWalletAccounts,
     activeWalletAddresses,
     activeWalletState,
     activeAccount,
     activeAddress,
+    activeWalletId,
+    walletStore,
     isWalletActive,
     isWalletConnected,
-    setActiveNetwork,
     signTransactions,
-    transactionSigner,
-    wallets: manager().wallets
+    transactionSigner
   };
-}
+};
-exports.useWallet = useWallet;
-Object.keys(useWallet$1).forEach(function (k) {
+Object.keys(useWallet).forEach(function (k) {
   if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
     enumerable: true,
-    get: function () { return useWallet$1[k]; }
+    get: function () { return useWallet[k]; }
   });
 });

package/dist/dev.js CHANGED Viewed

@@ -4,9 +4,9 @@ export * from '@txnlab/use-wallet';
 // ../../node_modules/.pnpm/solid-js@1.9.3/node_modules/solid-js/dist/solid.js
 var sharedConfig = {
-  context: void 0,
-  registry: void 0,
-  effects: void 0,
+  context: undefined,
+  registry: undefined,
+  effects: undefined,
   done: false,
   getContextId() {
     return getContextId(this.context.count);
@@ -57,7 +57,7 @@ function createSignal(value, options) {
     value,
     observers: null,
     observerSlots: null,
-    comparator: options.equals || void 0
+    comparator: options.equals || undefined
   };
   const setter = (value2) => {
     if (typeof value2 === "function") {
@@ -85,7 +85,7 @@ function createMemo(fn, value, options) {
   const c = createComputation(fn, value, true, 0);
   c.observers = null;
   c.observerSlots = null;
-  c.comparator = options.equals || void 0;
+  c.comparator = options.equals || undefined;
   if (Scheduler && Transition && Transition.running) {
     c.tState = STALE;
     Updates.push(c);
@@ -137,7 +137,7 @@ function startTransition(fn) {
     }
     runUpdates(fn);
     Listener = Owner = null;
-    return t ? t.done : void 0;
+    return t ? t.done : undefined;
   });
 }
 var [transPending, setTransPending] = /* @__PURE__ */ createSignal(false);
@@ -151,7 +151,7 @@ function createContext(defaultValue, options) {
 }
 function useContext(context) {
   let value;
-  return Owner && Owner.context && (value = Owner.context[context.id]) !== void 0 ? value : context.defaultValue;
+  return Owner && Owner.context && (value = Owner.context[context.id]) !== undefined ? value : context.defaultValue;
 }
 function children(fn) {
   const children2 = createMemo(fn);
@@ -260,7 +260,7 @@ function runComputation(node, value, time) {
       if (Transition && Transition.running) {
         node.tState = STALE;
         node.tOwned && node.tOwned.forEach(cleanNode);
-        node.tOwned = void 0;
+        node.tOwned = undefined;
       } else {
         node.state = STALE;
         node.owned && node.owned.forEach(cleanNode);
@@ -312,7 +312,7 @@ function createComputation(fn, init, pure, state = STALE, options) {
     }
   }
   if (ExternalSourceConfig && c.fn) {
-    const [track, trigger] = createSignal(void 0, {
+    const [track, trigger] = createSignal(undefined, {
       equals: false
     });
     const ordinary = ExternalSourceConfig.factory(c.fn, trigger);
@@ -577,7 +577,7 @@ function createProvider(id, options) {
         };
         return children(() => props.children);
       }),
-      void 0
+      undefined
     );
     return res;
   };
@@ -658,21 +658,13 @@ var useWalletManager = () => {
   }
   return manager();
 };
-function useWallet() {
+var useNetwork = () => {
   const manager = createMemo(() => useWalletManager());
-  const algodClient = useStore(manager().store, (state) => state.algodClient);
-  const walletStore = useStore(manager().store, (state) => state.wallets);
-  const walletState = (walletId) => walletStore()[walletId] || null;
-  const activeWalletId = useStore(manager().store, (state) => state.activeWallet);
-  const activeWallet = () => manager().getWallet(activeWalletId()) || null;
-  const activeWalletState = () => walletState(activeWalletId());
-  const activeWalletAccounts = () => activeWalletState()?.accounts ?? null;
-  const activeWalletAddresses = () => activeWalletAccounts()?.map((account) => account.address) ?? null;
-  const activeAccount = () => activeWalletState()?.activeAccount ?? null;
-  const activeAddress = () => activeAccount()?.address ?? null;
-  const isWalletActive = (walletId) => walletId === activeWalletId();
-  const isWalletConnected = (walletId) => !!walletState(walletId)?.accounts.length || false;
   const activeNetwork = useStore(manager().store, (state) => state.activeNetwork);
+  const activeNetworkConfig = () => {
+    const store = useStore(manager().store);
+    return store().networkConfig[activeNetwork()];
+  };
   const setActiveNetwork = async (networkId) => {
     if (networkId === activeNetwork()) {
       return;
@@ -680,17 +672,18 @@ function useWallet() {
     if (!manager().networkConfig[networkId]) {
       throw new Error(`Network "${networkId}" not found in network configuration`);
     }
-    console.info(`[Solid] Creating Algodv2 client for ${networkId}...`);
+    console.info(`[Solid] Creating new Algodv2 client...`);
     const {
       algod
     } = manager().networkConfig[networkId];
     const {
-      token,
+      token = "",
       baseServer,
-      port,
-      headers
+      port = "",
+      headers = {}
     } = algod;
     const newClient = new algosdk.Algodv2(token, baseServer, port, headers);
+    await manager().setActiveNetwork(networkId);
     manager().store.setState((state) => ({
       ...state,
       activeNetwork: networkId,
@@ -698,6 +691,71 @@ function useWallet() {
     }));
     console.info(`[Solid] \u2705 Active network set to ${networkId}.`);
   };
+  const updateAlgodConfig = (networkId, config) => {
+    manager().updateAlgodConfig(networkId, config);
+    if (networkId === activeNetwork()) {
+      console.info(`[Solid] Creating new Algodv2 client...`);
+      const {
+        algod
+      } = manager().networkConfig[networkId];
+      const {
+        token = "",
+        baseServer,
+        port = "",
+        headers = {}
+      } = algod;
+      const newClient = new algosdk.Algodv2(token, baseServer, port, headers);
+      manager().store.setState((state) => ({
+        ...state,
+        algodClient: newClient
+      }));
+    }
+  };
+  const resetNetworkConfig = (networkId) => {
+    manager().resetNetworkConfig(networkId);
+    if (networkId === activeNetwork()) {
+      console.info(`[Solid] Creating new Algodv2 client...`);
+      const {
+        algod
+      } = manager().networkConfig[networkId];
+      const {
+        token = "",
+        baseServer,
+        port = "",
+        headers = {}
+      } = algod;
+      const newClient = new algosdk.Algodv2(token, baseServer, port, headers);
+      manager().store.setState((state) => ({
+        ...state,
+        algodClient: newClient
+      }));
+    }
+  };
+  return {
+    activeNetwork,
+    networkConfig: () => manager().networkConfig,
+    activeNetworkConfig,
+    setActiveNetwork,
+    updateAlgodConfig,
+    resetNetworkConfig
+  };
+};
+var useWallet = () => {
+  const manager = createMemo(() => useWalletManager());
+  const managerStatus = useStore(manager().store, (state) => state.managerStatus);
+  const isReady = createMemo(() => managerStatus() === "ready");
+  const algodClient = useStore(manager().store, (state) => state.algodClient);
+  const walletStore = useStore(manager().store, (state) => state.wallets);
+  const walletState = (walletId) => walletStore()[walletId] || null;
+  const activeWalletId = useStore(manager().store, (state) => state.activeWallet);
+  const activeWallet = () => manager().getWallet(activeWalletId()) || null;
+  const activeWalletState = () => walletState(activeWalletId());
+  const activeWalletAccounts = () => activeWalletState()?.accounts ?? null;
+  const activeWalletAddresses = () => activeWalletAccounts()?.map((account) => account.address) ?? null;
+  const activeAccount = () => activeWalletState()?.activeAccount ?? null;
+  const activeAddress = () => activeAccount()?.address ?? null;
+  const isWalletActive = (walletId) => walletId === activeWalletId();
+  const isWalletConnected = (walletId) => !!walletState(walletId)?.accounts.length || false;
   const signTransactions = (txnGroup, indexesToSign) => {
     const wallet = activeWallet();
     if (!wallet) {
@@ -713,23 +771,22 @@ function useWallet() {
     return wallet.transactionSigner(txnGroup, indexesToSign);
   };
   return {
-    activeWalletId,
-    walletStore,
+    wallets: manager().wallets,
+    isReady,
     algodClient,
-    activeNetwork,
     activeWallet,
     activeWalletAccounts,
     activeWalletAddresses,
     activeWalletState,
     activeAccount,
     activeAddress,
+    activeWalletId,
+    walletStore,
     isWalletActive,
     isWalletConnected,
-    setActiveNetwork,
     signTransactions,
-    transactionSigner,
-    wallets: manager().wallets
+    transactionSigner
   };
-}
+};
-export { WalletProvider, useWallet, useWalletManager };
+export { WalletProvider, useNetwork, useWallet, useWalletManager };

package/dist/dev.jsx CHANGED Viewed

@@ -601,21 +601,13 @@ var useWalletManager = () => {
   }
   return manager();
 };
-function useWallet() {
+var useNetwork = () => {
   const manager = createMemo(() => useWalletManager());
-  const algodClient = useStore(manager().store, (state) => state.algodClient);
-  const walletStore = useStore(manager().store, (state) => state.wallets);
-  const walletState = (walletId) => walletStore()[walletId] || null;
-  const activeWalletId = useStore(manager().store, (state) => state.activeWallet);
-  const activeWallet = () => manager().getWallet(activeWalletId()) || null;
-  const activeWalletState = () => walletState(activeWalletId());
-  const activeWalletAccounts = () => activeWalletState()?.accounts ?? null;
-  const activeWalletAddresses = () => activeWalletAccounts()?.map((account) => account.address) ?? null;
-  const activeAccount = () => activeWalletState()?.activeAccount ?? null;
-  const activeAddress = () => activeAccount()?.address ?? null;
-  const isWalletActive = (walletId) => walletId === activeWalletId();
-  const isWalletConnected = (walletId) => !!walletState(walletId)?.accounts.length || false;
   const activeNetwork = useStore(manager().store, (state) => state.activeNetwork);
+  const activeNetworkConfig = () => {
+    const store = useStore(manager().store);
+    return store().networkConfig[activeNetwork()];
+  };
   const setActiveNetwork = async (networkId) => {
     if (networkId === activeNetwork()) {
       return;
@@ -623,10 +615,11 @@ function useWallet() {
     if (!manager().networkConfig[networkId]) {
       throw new Error(`Network "${networkId}" not found in network configuration`);
     }
-    console.info(`[Solid] Creating Algodv2 client for ${networkId}...`);
+    console.info(`[Solid] Creating new Algodv2 client...`);
     const { algod } = manager().networkConfig[networkId];
-    const { token, baseServer, port, headers } = algod;
+    const { token = "", baseServer, port = "", headers = {} } = algod;
     const newClient = new algosdk.Algodv2(token, baseServer, port, headers);
+    await manager().setActiveNetwork(networkId);
     manager().store.setState((state) => ({
       ...state,
       activeNetwork: networkId,
@@ -634,6 +627,57 @@ function useWallet() {
     }));
     console.info(`[Solid] \u2705 Active network set to ${networkId}.`);
   };
+  const updateAlgodConfig = (networkId, config) => {
+    manager().updateAlgodConfig(networkId, config);
+    if (networkId === activeNetwork()) {
+      console.info(`[Solid] Creating new Algodv2 client...`);
+      const { algod } = manager().networkConfig[networkId];
+      const { token = "", baseServer, port = "", headers = {} } = algod;
+      const newClient = new algosdk.Algodv2(token, baseServer, port, headers);
+      manager().store.setState((state) => ({
+        ...state,
+        algodClient: newClient
+      }));
+    }
+  };
+  const resetNetworkConfig = (networkId) => {
+    manager().resetNetworkConfig(networkId);
+    if (networkId === activeNetwork()) {
+      console.info(`[Solid] Creating new Algodv2 client...`);
+      const { algod } = manager().networkConfig[networkId];
+      const { token = "", baseServer, port = "", headers = {} } = algod;
+      const newClient = new algosdk.Algodv2(token, baseServer, port, headers);
+      manager().store.setState((state) => ({
+        ...state,
+        algodClient: newClient
+      }));
+    }
+  };
+  return {
+    activeNetwork,
+    networkConfig: () => manager().networkConfig,
+    activeNetworkConfig,
+    setActiveNetwork,
+    updateAlgodConfig,
+    resetNetworkConfig
+  };
+};
+var useWallet = () => {
+  const manager = createMemo(() => useWalletManager());
+  const managerStatus = useStore(manager().store, (state) => state.managerStatus);
+  const isReady = createMemo(() => managerStatus() === "ready");
+  const algodClient = useStore(manager().store, (state) => state.algodClient);
+  const walletStore = useStore(manager().store, (state) => state.wallets);
+  const walletState = (walletId) => walletStore()[walletId] || null;
+  const activeWalletId = useStore(manager().store, (state) => state.activeWallet);
+  const activeWallet = () => manager().getWallet(activeWalletId()) || null;
+  const activeWalletState = () => walletState(activeWalletId());
+  const activeWalletAccounts = () => activeWalletState()?.accounts ?? null;
+  const activeWalletAddresses = () => activeWalletAccounts()?.map((account) => account.address) ?? null;
+  const activeAccount = () => activeWalletState()?.activeAccount ?? null;
+  const activeAddress = () => activeAccount()?.address ?? null;
+  const isWalletActive = (walletId) => walletId === activeWalletId();
+  const isWalletConnected = (walletId) => !!walletState(walletId)?.accounts.length || false;
   const signTransactions = (txnGroup, indexesToSign) => {
     const wallet = activeWallet();
     if (!wallet) {
@@ -649,26 +693,26 @@ function useWallet() {
     return wallet.transactionSigner(txnGroup, indexesToSign);
   };
   return {
-    activeWalletId,
-    walletStore,
+    wallets: manager().wallets,
+    isReady,
     algodClient,
-    activeNetwork,
     activeWallet,
     activeWalletAccounts,
     activeWalletAddresses,
     activeWalletState,
     activeAccount,
     activeAddress,
+    activeWalletId,
+    walletStore,
     isWalletActive,
     isWalletConnected,
-    setActiveNetwork,
     signTransactions,
-    transactionSigner,
-    wallets: manager().wallets
+    transactionSigner
   };
-}
+};
 export {
   WalletProvider,
+  useNetwork,
   useWallet,
   useWalletManager
 };

package/dist/index.cjs CHANGED Viewed

@@ -2,7 +2,7 @@
 var solidStore = require('@tanstack/solid-store');
 var algosdk = require('algosdk');
-var useWallet$1 = require('@txnlab/use-wallet');
+var useWallet = require('@txnlab/use-wallet');
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
@@ -10,9 +10,9 @@ var algosdk__default = /*#__PURE__*/_interopDefault(algosdk);
 // ../../node_modules/.pnpm/solid-js@1.9.3/node_modules/solid-js/dist/solid.js
 var sharedConfig = {
-  context: void 0,
-  registry: void 0,
-  effects: void 0,
+  context: undefined,
+  registry: undefined,
+  effects: undefined,
   done: false,
   getContextId() {
     return getContextId(this.context.count);
@@ -63,7 +63,7 @@ function createSignal(value, options) {
     value,
     observers: null,
     observerSlots: null,
-    comparator: options.equals || void 0
+    comparator: options.equals || undefined
   };
   const setter = (value2) => {
     if (typeof value2 === "function") {
@@ -91,7 +91,7 @@ function createMemo(fn, value, options) {
   const c = createComputation(fn, value, true, 0);
   c.observers = null;
   c.observerSlots = null;
-  c.comparator = options.equals || void 0;
+  c.comparator = options.equals || undefined;
   if (Scheduler && Transition && Transition.running) {
     c.tState = STALE;
     Updates.push(c);
@@ -143,7 +143,7 @@ function startTransition(fn) {
     }
     runUpdates(fn);
     Listener = Owner = null;
-    return t ? t.done : void 0;
+    return t ? t.done : undefined;
   });
 }
 var [transPending, setTransPending] = /* @__PURE__ */ createSignal(false);
@@ -157,7 +157,7 @@ function createContext(defaultValue, options) {
 }
 function useContext(context) {
   let value;
-  return Owner && Owner.context && (value = Owner.context[context.id]) !== void 0 ? value : context.defaultValue;
+  return Owner && Owner.context && (value = Owner.context[context.id]) !== undefined ? value : context.defaultValue;
 }
 function children(fn) {
   const children2 = createMemo(fn);
@@ -266,7 +266,7 @@ function runComputation(node, value, time) {
       if (Transition && Transition.running) {
         node.tState = STALE;
         node.tOwned && node.tOwned.forEach(cleanNode);
-        node.tOwned = void 0;
+        node.tOwned = undefined;
       } else {
         node.state = STALE;
         node.owned && node.owned.forEach(cleanNode);
@@ -318,7 +318,7 @@ function createComputation(fn, init, pure, state = STALE, options) {
     }
   }
   if (ExternalSourceConfig && c.fn) {
-    const [track, trigger] = createSignal(void 0, {
+    const [track, trigger] = createSignal(undefined, {
       equals: false
     });
     const ordinary = ExternalSourceConfig.factory(c.fn, trigger);
@@ -583,7 +583,7 @@ function createProvider(id, options) {
         };
         return children(() => props.children);
       }),
-      void 0
+      undefined
     );
     return res;
   };
@@ -663,21 +663,13 @@ exports.useWalletManager = () => {
   }
   return manager();
 };
-function useWallet() {
+exports.useNetwork = () => {
   const manager = createMemo(() => exports.useWalletManager());
-  const algodClient = solidStore.useStore(manager().store, (state) => state.algodClient);
-  const walletStore = solidStore.useStore(manager().store, (state) => state.wallets);
-  const walletState = (walletId) => walletStore()[walletId] || null;
-  const activeWalletId = solidStore.useStore(manager().store, (state) => state.activeWallet);
-  const activeWallet = () => manager().getWallet(activeWalletId()) || null;
-  const activeWalletState = () => walletState(activeWalletId());
-  const activeWalletAccounts = () => activeWalletState()?.accounts ?? null;
-  const activeWalletAddresses = () => activeWalletAccounts()?.map((account) => account.address) ?? null;
-  const activeAccount = () => activeWalletState()?.activeAccount ?? null;
-  const activeAddress = () => activeAccount()?.address ?? null;
-  const isWalletActive = (walletId) => walletId === activeWalletId();
-  const isWalletConnected = (walletId) => !!walletState(walletId)?.accounts.length || false;
   const activeNetwork = solidStore.useStore(manager().store, (state) => state.activeNetwork);
+  const activeNetworkConfig = () => {
+    const store = solidStore.useStore(manager().store);
+    return store().networkConfig[activeNetwork()];
+  };
   const setActiveNetwork = async (networkId) => {
     if (networkId === activeNetwork()) {
       return;
@@ -689,18 +681,82 @@ function useWallet() {
       algod
     } = manager().networkConfig[networkId];
     const {
-      token,
+      token = "",
       baseServer,
-      port,
-      headers
+      port = "",
+      headers = {}
     } = algod;
     const newClient = new algosdk__default.default.Algodv2(token, baseServer, port, headers);
+    await manager().setActiveNetwork(networkId);
     manager().store.setState((state) => ({
       ...state,
       activeNetwork: networkId,
       algodClient: newClient
     }));
   };
+  const updateAlgodConfig = (networkId, config) => {
+    manager().updateAlgodConfig(networkId, config);
+    if (networkId === activeNetwork()) {
+      const {
+        algod
+      } = manager().networkConfig[networkId];
+      const {
+        token = "",
+        baseServer,
+        port = "",
+        headers = {}
+      } = algod;
+      const newClient = new algosdk__default.default.Algodv2(token, baseServer, port, headers);
+      manager().store.setState((state) => ({
+        ...state,
+        algodClient: newClient
+      }));
+    }
+  };
+  const resetNetworkConfig = (networkId) => {
+    manager().resetNetworkConfig(networkId);
+    if (networkId === activeNetwork()) {
+      const {
+        algod
+      } = manager().networkConfig[networkId];
+      const {
+        token = "",
+        baseServer,
+        port = "",
+        headers = {}
+      } = algod;
+      const newClient = new algosdk__default.default.Algodv2(token, baseServer, port, headers);
+      manager().store.setState((state) => ({
+        ...state,
+        algodClient: newClient
+      }));
+    }
+  };
+  return {
+    activeNetwork,
+    networkConfig: () => manager().networkConfig,
+    activeNetworkConfig,
+    setActiveNetwork,
+    updateAlgodConfig,
+    resetNetworkConfig
+  };
+};
+exports.useWallet = () => {
+  const manager = createMemo(() => exports.useWalletManager());
+  const managerStatus = solidStore.useStore(manager().store, (state) => state.managerStatus);
+  const isReady = createMemo(() => managerStatus() === "ready");
+  const algodClient = solidStore.useStore(manager().store, (state) => state.algodClient);
+  const walletStore = solidStore.useStore(manager().store, (state) => state.wallets);
+  const walletState = (walletId) => walletStore()[walletId] || null;
+  const activeWalletId = solidStore.useStore(manager().store, (state) => state.activeWallet);
+  const activeWallet = () => manager().getWallet(activeWalletId()) || null;
+  const activeWalletState = () => walletState(activeWalletId());
+  const activeWalletAccounts = () => activeWalletState()?.accounts ?? null;
+  const activeWalletAddresses = () => activeWalletAccounts()?.map((account) => account.address) ?? null;
+  const activeAccount = () => activeWalletState()?.activeAccount ?? null;
+  const activeAddress = () => activeAccount()?.address ?? null;
+  const isWalletActive = (walletId) => walletId === activeWalletId();
+  const isWalletConnected = (walletId) => !!walletState(walletId)?.accounts.length || false;
   const signTransactions = (txnGroup, indexesToSign) => {
     const wallet = activeWallet();
     if (!wallet) {
@@ -716,29 +772,27 @@ function useWallet() {
     return wallet.transactionSigner(txnGroup, indexesToSign);
   };
   return {
-    activeWalletId,
-    walletStore,
+    wallets: manager().wallets,
+    isReady,
     algodClient,
-    activeNetwork,
     activeWallet,
     activeWalletAccounts,
     activeWalletAddresses,
     activeWalletState,
     activeAccount,
     activeAddress,
+    activeWalletId,
+    walletStore,
     isWalletActive,
     isWalletConnected,
-    setActiveNetwork,
     signTransactions,
-    transactionSigner,
-    wallets: manager().wallets
+    transactionSigner
   };
-}
+};
-exports.useWallet = useWallet;
-Object.keys(useWallet$1).forEach(function (k) {
+Object.keys(useWallet).forEach(function (k) {
   if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
     enumerable: true,
-    get: function () { return useWallet$1[k]; }
+    get: function () { return useWallet[k]; }
   });
 });

package/dist/index.d.cts CHANGED Viewed

@@ -1,5 +1,5 @@
 import * as _txnlab_use_wallet from '@txnlab/use-wallet';
-import { WalletManager, WalletMetadata, WalletAccount, WalletId, WalletState } from '@txnlab/use-wallet';
+import { WalletManager, NetworkId, AlgodConfig, WalletMetadata, WalletAccount, WalletState, WalletId } from '@txnlab/use-wallet';
 export * from '@txnlab/use-wallet';
 import * as solid_js from 'solid-js';
 import { JSX } from 'solid-js';
@@ -11,6 +11,14 @@ interface WalletProviderProps {
 }
 declare const WalletProvider: (props: WalletProviderProps) => JSX.Element;
 declare const useWalletManager: () => WalletManager;
+declare const useNetwork: () => {
+    activeNetwork: solid_js.Accessor<string>;
+    networkConfig: () => Record<string, _txnlab_use_wallet.NetworkConfig>;
+    activeNetworkConfig: () => _txnlab_use_wallet.NetworkConfig;
+    setActiveNetwork: (networkId: NetworkId | string) => Promise<void>;
+    updateAlgodConfig: (networkId: string, config: Partial<AlgodConfig>) => void;
+    resetNetworkConfig: (networkId: string) => void;
+};
 interface Wallet {
     id: () => string;
     metadata: () => WalletMetadata;
@@ -23,23 +31,22 @@ interface Wallet {
     setActive: () => void;
     setActiveAccount: (address: string) => void;
 }
-declare function useWallet(): {
-    activeWalletId: solid_js.Accessor<WalletId | null>;
-    walletStore: solid_js.Accessor<Partial<Record<WalletId, WalletState>>>;
+declare const useWallet: () => {
+    wallets: _txnlab_use_wallet.BaseWallet[];
+    isReady: solid_js.Accessor<boolean>;
     algodClient: solid_js.Accessor<algosdk.Algodv2>;
-    activeNetwork: solid_js.Accessor<string>;
     activeWallet: () => _txnlab_use_wallet.BaseWallet | null;
     activeWalletAccounts: () => WalletAccount[] | null;
     activeWalletAddresses: () => string[] | null;
     activeWalletState: () => WalletState | null;
     activeAccount: () => WalletAccount | null;
     activeAddress: () => string | null;
+    activeWalletId: solid_js.Accessor<WalletId | null>;
+    walletStore: solid_js.Accessor<Partial<Record<WalletId, WalletState>>>;
     isWalletActive: (walletId: WalletId) => boolean;
     isWalletConnected: (walletId: WalletId) => boolean;
-    setActiveNetwork: (networkId: string) => Promise<void>;
     signTransactions: <T extends algosdk.Transaction[] | Uint8Array[]>(txnGroup: T | T[], indexesToSign?: number[]) => Promise<(Uint8Array | null)[]>;
     transactionSigner: (txnGroup: algosdk.Transaction[], indexesToSign: number[]) => Promise<Uint8Array[]>;
-    wallets: _txnlab_use_wallet.BaseWallet[];
 };
-export { type Wallet, WalletProvider, useWallet, useWalletManager };
+export { type Wallet, WalletProvider, useNetwork, useWallet, useWalletManager };

package/dist/index.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import * as _txnlab_use_wallet from '@txnlab/use-wallet';
-import { WalletManager, WalletMetadata, WalletAccount, WalletId, WalletState } from '@txnlab/use-wallet';
+import { WalletManager, NetworkId, AlgodConfig, WalletMetadata, WalletAccount, WalletState, WalletId } from '@txnlab/use-wallet';
 export * from '@txnlab/use-wallet';
 import * as solid_js from 'solid-js';
 import { JSX } from 'solid-js';
@@ -11,6 +11,14 @@ interface WalletProviderProps {
 }
 declare const WalletProvider: (props: WalletProviderProps) => JSX.Element;
 declare const useWalletManager: () => WalletManager;
+declare const useNetwork: () => {
+    activeNetwork: solid_js.Accessor<string>;
+    networkConfig: () => Record<string, _txnlab_use_wallet.NetworkConfig>;
+    activeNetworkConfig: () => _txnlab_use_wallet.NetworkConfig;
+    setActiveNetwork: (networkId: NetworkId | string) => Promise<void>;
+    updateAlgodConfig: (networkId: string, config: Partial<AlgodConfig>) => void;
+    resetNetworkConfig: (networkId: string) => void;
+};
 interface Wallet {
     id: () => string;
     metadata: () => WalletMetadata;
@@ -23,23 +31,22 @@ interface Wallet {
     setActive: () => void;
     setActiveAccount: (address: string) => void;
 }
-declare function useWallet(): {
-    activeWalletId: solid_js.Accessor<WalletId | null>;
-    walletStore: solid_js.Accessor<Partial<Record<WalletId, WalletState>>>;
+declare const useWallet: () => {
+    wallets: _txnlab_use_wallet.BaseWallet[];
+    isReady: solid_js.Accessor<boolean>;
     algodClient: solid_js.Accessor<algosdk.Algodv2>;
-    activeNetwork: solid_js.Accessor<string>;
     activeWallet: () => _txnlab_use_wallet.BaseWallet | null;
     activeWalletAccounts: () => WalletAccount[] | null;
     activeWalletAddresses: () => string[] | null;
     activeWalletState: () => WalletState | null;
     activeAccount: () => WalletAccount | null;
     activeAddress: () => string | null;
+    activeWalletId: solid_js.Accessor<WalletId | null>;
+    walletStore: solid_js.Accessor<Partial<Record<WalletId, WalletState>>>;
     isWalletActive: (walletId: WalletId) => boolean;
     isWalletConnected: (walletId: WalletId) => boolean;
-    setActiveNetwork: (networkId: string) => Promise<void>;
     signTransactions: <T extends algosdk.Transaction[] | Uint8Array[]>(txnGroup: T | T[], indexesToSign?: number[]) => Promise<(Uint8Array | null)[]>;
     transactionSigner: (txnGroup: algosdk.Transaction[], indexesToSign: number[]) => Promise<Uint8Array[]>;
-    wallets: _txnlab_use_wallet.BaseWallet[];
 };
-export { type Wallet, WalletProvider, useWallet, useWalletManager };
+export { type Wallet, WalletProvider, useNetwork, useWallet, useWalletManager };

package/dist/index.js CHANGED Viewed

@@ -4,9 +4,9 @@ export * from '@txnlab/use-wallet';
 // ../../node_modules/.pnpm/solid-js@1.9.3/node_modules/solid-js/dist/solid.js
 var sharedConfig = {
-  context: void 0,
-  registry: void 0,
-  effects: void 0,
+  context: undefined,
+  registry: undefined,
+  effects: undefined,
   done: false,
   getContextId() {
     return getContextId(this.context.count);
@@ -57,7 +57,7 @@ function createSignal(value, options) {
     value,
     observers: null,
     observerSlots: null,
-    comparator: options.equals || void 0
+    comparator: options.equals || undefined
   };
   const setter = (value2) => {
     if (typeof value2 === "function") {
@@ -85,7 +85,7 @@ function createMemo(fn, value, options) {
   const c = createComputation(fn, value, true, 0);
   c.observers = null;
   c.observerSlots = null;
-  c.comparator = options.equals || void 0;
+  c.comparator = options.equals || undefined;
   if (Scheduler && Transition && Transition.running) {
     c.tState = STALE;
     Updates.push(c);
@@ -137,7 +137,7 @@ function startTransition(fn) {
     }
     runUpdates(fn);
     Listener = Owner = null;
-    return t ? t.done : void 0;
+    return t ? t.done : undefined;
   });
 }
 var [transPending, setTransPending] = /* @__PURE__ */ createSignal(false);
@@ -151,7 +151,7 @@ function createContext(defaultValue, options) {
 }
 function useContext(context) {
   let value;
-  return Owner && Owner.context && (value = Owner.context[context.id]) !== void 0 ? value : context.defaultValue;
+  return Owner && Owner.context && (value = Owner.context[context.id]) !== undefined ? value : context.defaultValue;
 }
 function children(fn) {
   const children2 = createMemo(fn);
@@ -260,7 +260,7 @@ function runComputation(node, value, time) {
       if (Transition && Transition.running) {
         node.tState = STALE;
         node.tOwned && node.tOwned.forEach(cleanNode);
-        node.tOwned = void 0;
+        node.tOwned = undefined;
       } else {
         node.state = STALE;
         node.owned && node.owned.forEach(cleanNode);
@@ -312,7 +312,7 @@ function createComputation(fn, init, pure, state = STALE, options) {
     }
   }
   if (ExternalSourceConfig && c.fn) {
-    const [track, trigger] = createSignal(void 0, {
+    const [track, trigger] = createSignal(undefined, {
       equals: false
     });
     const ordinary = ExternalSourceConfig.factory(c.fn, trigger);
@@ -577,7 +577,7 @@ function createProvider(id, options) {
         };
         return children(() => props.children);
       }),
-      void 0
+      undefined
     );
     return res;
   };
@@ -657,21 +657,13 @@ var useWalletManager = () => {
   }
   return manager();
 };
-function useWallet() {
+var useNetwork = () => {
   const manager = createMemo(() => useWalletManager());
-  const algodClient = useStore(manager().store, (state) => state.algodClient);
-  const walletStore = useStore(manager().store, (state) => state.wallets);
-  const walletState = (walletId) => walletStore()[walletId] || null;
-  const activeWalletId = useStore(manager().store, (state) => state.activeWallet);
-  const activeWallet = () => manager().getWallet(activeWalletId()) || null;
-  const activeWalletState = () => walletState(activeWalletId());
-  const activeWalletAccounts = () => activeWalletState()?.accounts ?? null;
-  const activeWalletAddresses = () => activeWalletAccounts()?.map((account) => account.address) ?? null;
-  const activeAccount = () => activeWalletState()?.activeAccount ?? null;
-  const activeAddress = () => activeAccount()?.address ?? null;
-  const isWalletActive = (walletId) => walletId === activeWalletId();
-  const isWalletConnected = (walletId) => !!walletState(walletId)?.accounts.length || false;
   const activeNetwork = useStore(manager().store, (state) => state.activeNetwork);
+  const activeNetworkConfig = () => {
+    const store = useStore(manager().store);
+    return store().networkConfig[activeNetwork()];
+  };
   const setActiveNetwork = async (networkId) => {
     if (networkId === activeNetwork()) {
       return;
@@ -683,18 +675,82 @@ function useWallet() {
       algod
     } = manager().networkConfig[networkId];
     const {
-      token,
+      token = "",
       baseServer,
-      port,
-      headers
+      port = "",
+      headers = {}
     } = algod;
     const newClient = new algosdk.Algodv2(token, baseServer, port, headers);
+    await manager().setActiveNetwork(networkId);
     manager().store.setState((state) => ({
       ...state,
       activeNetwork: networkId,
       algodClient: newClient
     }));
   };
+  const updateAlgodConfig = (networkId, config) => {
+    manager().updateAlgodConfig(networkId, config);
+    if (networkId === activeNetwork()) {
+      const {
+        algod
+      } = manager().networkConfig[networkId];
+      const {
+        token = "",
+        baseServer,
+        port = "",
+        headers = {}
+      } = algod;
+      const newClient = new algosdk.Algodv2(token, baseServer, port, headers);
+      manager().store.setState((state) => ({
+        ...state,
+        algodClient: newClient
+      }));
+    }
+  };
+  const resetNetworkConfig = (networkId) => {
+    manager().resetNetworkConfig(networkId);
+    if (networkId === activeNetwork()) {
+      const {
+        algod
+      } = manager().networkConfig[networkId];
+      const {
+        token = "",
+        baseServer,
+        port = "",
+        headers = {}
+      } = algod;
+      const newClient = new algosdk.Algodv2(token, baseServer, port, headers);
+      manager().store.setState((state) => ({
+        ...state,
+        algodClient: newClient
+      }));
+    }
+  };
+  return {
+    activeNetwork,
+    networkConfig: () => manager().networkConfig,
+    activeNetworkConfig,
+    setActiveNetwork,
+    updateAlgodConfig,
+    resetNetworkConfig
+  };
+};
+var useWallet = () => {
+  const manager = createMemo(() => useWalletManager());
+  const managerStatus = useStore(manager().store, (state) => state.managerStatus);
+  const isReady = createMemo(() => managerStatus() === "ready");
+  const algodClient = useStore(manager().store, (state) => state.algodClient);
+  const walletStore = useStore(manager().store, (state) => state.wallets);
+  const walletState = (walletId) => walletStore()[walletId] || null;
+  const activeWalletId = useStore(manager().store, (state) => state.activeWallet);
+  const activeWallet = () => manager().getWallet(activeWalletId()) || null;
+  const activeWalletState = () => walletState(activeWalletId());
+  const activeWalletAccounts = () => activeWalletState()?.accounts ?? null;
+  const activeWalletAddresses = () => activeWalletAccounts()?.map((account) => account.address) ?? null;
+  const activeAccount = () => activeWalletState()?.activeAccount ?? null;
+  const activeAddress = () => activeAccount()?.address ?? null;
+  const isWalletActive = (walletId) => walletId === activeWalletId();
+  const isWalletConnected = (walletId) => !!walletState(walletId)?.accounts.length || false;
   const signTransactions = (txnGroup, indexesToSign) => {
     const wallet = activeWallet();
     if (!wallet) {
@@ -710,23 +766,22 @@ function useWallet() {
     return wallet.transactionSigner(txnGroup, indexesToSign);
   };
   return {
-    activeWalletId,
-    walletStore,
+    wallets: manager().wallets,
+    isReady,
     algodClient,
-    activeNetwork,
     activeWallet,
     activeWalletAccounts,
     activeWalletAddresses,
     activeWalletState,
     activeAccount,
     activeAddress,
+    activeWalletId,
+    walletStore,
     isWalletActive,
     isWalletConnected,
-    setActiveNetwork,
     signTransactions,
-    transactionSigner,
-    wallets: manager().wallets
+    transactionSigner
   };
-}
+};
-export { WalletProvider, useWallet, useWalletManager };
+export { WalletProvider, useNetwork, useWallet, useWalletManager };

package/dist/index.jsx CHANGED Viewed

@@ -600,21 +600,13 @@ var useWalletManager = () => {
   }
   return manager();
 };
-function useWallet() {
+var useNetwork = () => {
   const manager = createMemo(() => useWalletManager());
-  const algodClient = useStore(manager().store, (state) => state.algodClient);
-  const walletStore = useStore(manager().store, (state) => state.wallets);
-  const walletState = (walletId) => walletStore()[walletId] || null;
-  const activeWalletId = useStore(manager().store, (state) => state.activeWallet);
-  const activeWallet = () => manager().getWallet(activeWalletId()) || null;
-  const activeWalletState = () => walletState(activeWalletId());
-  const activeWalletAccounts = () => activeWalletState()?.accounts ?? null;
-  const activeWalletAddresses = () => activeWalletAccounts()?.map((account) => account.address) ?? null;
-  const activeAccount = () => activeWalletState()?.activeAccount ?? null;
-  const activeAddress = () => activeAccount()?.address ?? null;
-  const isWalletActive = (walletId) => walletId === activeWalletId();
-  const isWalletConnected = (walletId) => !!walletState(walletId)?.accounts.length || false;
   const activeNetwork = useStore(manager().store, (state) => state.activeNetwork);
+  const activeNetworkConfig = () => {
+    const store = useStore(manager().store);
+    return store().networkConfig[activeNetwork()];
+  };
   const setActiveNetwork = async (networkId) => {
     if (networkId === activeNetwork()) {
       return;
@@ -623,14 +615,64 @@ function useWallet() {
       throw new Error(`Network "${networkId}" not found in network configuration`);
     }
     const { algod } = manager().networkConfig[networkId];
-    const { token, baseServer, port, headers } = algod;
+    const { token = "", baseServer, port = "", headers = {} } = algod;
     const newClient = new algosdk.Algodv2(token, baseServer, port, headers);
+    await manager().setActiveNetwork(networkId);
     manager().store.setState((state) => ({
       ...state,
       activeNetwork: networkId,
       algodClient: newClient
     }));
   };
+  const updateAlgodConfig = (networkId, config) => {
+    manager().updateAlgodConfig(networkId, config);
+    if (networkId === activeNetwork()) {
+      const { algod } = manager().networkConfig[networkId];
+      const { token = "", baseServer, port = "", headers = {} } = algod;
+      const newClient = new algosdk.Algodv2(token, baseServer, port, headers);
+      manager().store.setState((state) => ({
+        ...state,
+        algodClient: newClient
+      }));
+    }
+  };
+  const resetNetworkConfig = (networkId) => {
+    manager().resetNetworkConfig(networkId);
+    if (networkId === activeNetwork()) {
+      const { algod } = manager().networkConfig[networkId];
+      const { token = "", baseServer, port = "", headers = {} } = algod;
+      const newClient = new algosdk.Algodv2(token, baseServer, port, headers);
+      manager().store.setState((state) => ({
+        ...state,
+        algodClient: newClient
+      }));
+    }
+  };
+  return {
+    activeNetwork,
+    networkConfig: () => manager().networkConfig,
+    activeNetworkConfig,
+    setActiveNetwork,
+    updateAlgodConfig,
+    resetNetworkConfig
+  };
+};
+var useWallet = () => {
+  const manager = createMemo(() => useWalletManager());
+  const managerStatus = useStore(manager().store, (state) => state.managerStatus);
+  const isReady = createMemo(() => managerStatus() === "ready");
+  const algodClient = useStore(manager().store, (state) => state.algodClient);
+  const walletStore = useStore(manager().store, (state) => state.wallets);
+  const walletState = (walletId) => walletStore()[walletId] || null;
+  const activeWalletId = useStore(manager().store, (state) => state.activeWallet);
+  const activeWallet = () => manager().getWallet(activeWalletId()) || null;
+  const activeWalletState = () => walletState(activeWalletId());
+  const activeWalletAccounts = () => activeWalletState()?.accounts ?? null;
+  const activeWalletAddresses = () => activeWalletAccounts()?.map((account) => account.address) ?? null;
+  const activeAccount = () => activeWalletState()?.activeAccount ?? null;
+  const activeAddress = () => activeAccount()?.address ?? null;
+  const isWalletActive = (walletId) => walletId === activeWalletId();
+  const isWalletConnected = (walletId) => !!walletState(walletId)?.accounts.length || false;
   const signTransactions = (txnGroup, indexesToSign) => {
     const wallet = activeWallet();
     if (!wallet) {
@@ -646,26 +688,26 @@ function useWallet() {
     return wallet.transactionSigner(txnGroup, indexesToSign);
   };
   return {
-    activeWalletId,
-    walletStore,
+    wallets: manager().wallets,
+    isReady,
     algodClient,
-    activeNetwork,
     activeWallet,
     activeWalletAccounts,
     activeWalletAddresses,
     activeWalletState,
     activeAccount,
     activeAddress,
+    activeWalletId,
+    walletStore,
     isWalletActive,
     isWalletConnected,
-    setActiveNetwork,
     signTransactions,
-    transactionSigner,
-    wallets: manager().wallets
+    transactionSigner
   };
-}
+};
 export {
   WalletProvider,
+  useNetwork,
   useWallet,
   useWalletManager
 };

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@txnlab/use-wallet-solid",
-  "version": "4.0.0-beta.4",
+  "version": "4.0.0-beta.5",
   "description": "Solid.js library for integrating Algorand wallets into decentralized applications",
   "author": "Doug Richar <drichar@gmail.com>",
   "license": "MIT",
@@ -53,8 +53,8 @@
     "dist"
   ],
   "dependencies": {
-    "@tanstack/solid-store": "0.6.0",
-    "@txnlab/use-wallet": "4.0.0-beta.4"
+    "@tanstack/solid-store": "0.7.0",
+    "@txnlab/use-wallet": "4.0.0-beta.5"
   },
   "devDependencies": {
     "@solidjs/testing-library": "0.8.10",
@@ -62,17 +62,17 @@
     "solid-js": "1.9.3",
     "tsup": "8.3.5",
     "tsup-preset-solid": "2.2.0",
-    "typescript": "5.6.3"
+    "typescript": "5.7.2"
   },
   "peerDependencies": {
     "@blockshake/defly-connect": "^1.2.1",
-    "@magic-ext/algorand": "^23.18.0",
+    "@magic-ext/algorand": "^23.20.0",
     "@perawallet/connect": "^1.4.1",
     "@walletconnect/modal": "^2.7.0",
-    "@walletconnect/sign-client": "^2.17.2",
+    "@walletconnect/sign-client": "^2.17.3",
     "algosdk": "^3.0.0",
     "lute-connect": "^1.4.1",
-    "magic-sdk": "^28.19.0"
+    "magic-sdk": "^28.21.0"
   },
   "peerDependenciesMeta": {
     "@blockshake/defly-connect": {