@txnlab/use-wallet 2.2.0 → 2.3.1

package/dist/cjs/src/context/WalletContext.d.ts

@@ -0,0 +1,8 @@
+import React from 'react';
+import type { SupportedProviders } from '../types/providers';
+export declare const useWalletContext: () => SupportedProviders | null;
+export interface WalletProviderProps {
+    children: React.ReactNode;
+    value: SupportedProviders | null;
+}
+export declare const WalletProvider: ({ children, value }: WalletProviderProps) => React.JSX.Element;

package/dist/cjs/src/index.d.ts

@@ -1,5 +1,5 @@
 export { reconnectProviders, encodeNFDTransactionsArray } from './utils';
-export { WalletProvider } from './store';
+export { WalletProvider } from './context/WalletContext';
 export * from './constants';
 export * from './types';
 export * from './clients';

package/dist/cjs/src/store/index.d.ts

@@ -1,3 +1,2 @@
 export * from './state/walletStore';
 export * from './state/debugStore';
-export { default as WalletProvider } from './state/clientStore';

package/dist/esm/index.js

@@ -1360,9 +1360,6 @@ const useDebugStore = create((set) => ({
     setDebug: (debug) => set({ debug })
 }));
 
-const ClientContext = createContext(null);
-var clientStore = ClientContext.Provider;
-
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const debugLog = (...args) => {
     const { debug } = useDebugStore.getState();
@@ -2633,13 +2630,23 @@ class KMDWalletClient extends BaseClient {
                 return;
             }
             // Not to be signed by our signer, skip it
-            else if (!connectedAccounts.includes(this.algosdk.encodeAddress(dtxn.snd))) {
-                return;
+            else {
+                const senderAddress = this.algosdk.encodeAddress(dtxn.snd);
+                const rekeyAddress = dtxn.rekey ? this.algosdk.encodeAddress(dtxn.rekey) : null;
+                const isSignerConnected = rekeyAddress
+                    ? connectedAccounts.includes(rekeyAddress) && connectedAccounts.includes(senderAddress)
+                    : connectedAccounts.includes(senderAddress);
+                if (!isSignerConnected) {
+                    return;
+                }
             }
             // overwrite with an empty blob
             signedTxns[idx] = new Uint8Array();
             const txn = this.algosdk.Transaction.from_obj_for_encoding(dtxn);
-            signingPromises.push(this.#client.signTransaction(token, pw, txn));
+            const promise = txn.reKeyTo
+                ? this.#client.signTransactionWithSpecificPublicKey(token, pw, txn, txn.reKeyTo.publicKey)
+                : this.#client.signTransaction(token, pw, txn);
+            signingPromises.push(promise);
         });
         const signingResults = await Promise.all(signingPromises);
         // Restore the newly signed txns in the correct order
@@ -2929,6 +2936,18 @@ function encodeNFDTransactionsArray(transactionsArray) {
     });
 }
 
+const WalletContext = createContext(null);
+const useWalletContext = () => {
+    const context = useContext(WalletContext);
+    if (context === undefined) {
+        throw new Error('useWallet must be used within the WalletProvider');
+    }
+    return context;
+};
+const WalletProvider = ({ children, value }) => {
+    return require$$0.createElement(WalletContext.Provider, { value: value }, children);
+};
+
 function shallow(objA, objB) {
   if (Object.is(objA, objB)) {
     return true;
@@ -2967,19 +2986,11 @@ function shallow(objA, objB) {
   }
   return true;
 }
-var shallow$1 = (objA, objB) => {
-  if ((import.meta.env ? import.meta.env.MODE : void 0) !== "production") {
-    console.warn(
-      "[DEPRECATED] Default export is deprecated. Instead use `import { shallow } from 'zustand/shallow'`."
-    );
-  }
-  return shallow(objA, objB);
-};
 
 function useWallet() {
     const [providers, setProviders] = useState(null);
-    const clients = useContext(ClientContext);
-    const { activeAccount, accounts: connectedAccounts, setActiveAccount: _setActiveAccount, addAccounts } = useHydratedWalletStore(walletStoreSelector, shallow$1);
+    const clients = useWalletContext();
+    const { activeAccount, accounts: connectedAccounts, setActiveAccount: _setActiveAccount, addAccounts } = useHydratedWalletStore(walletStoreSelector, shallow);
     const getAccountsByProvider = (id) => {
         return connectedAccounts.filter((account) => account.providerId === id);
     };
@@ -3182,4 +3193,4 @@ function useInitializeProviders({ providers, nodeConfig, algosdkStatic, debug =
     return walletProviders;
 }
 
-export { DEFAULT_NETWORK, DEFAULT_NODE_BASEURL, DEFAULT_NODE_PORT, DEFAULT_NODE_TOKEN, PROVIDER_ID, clientStore as WalletProvider, AlgoSignerClient as algosigner, CustomWalletClient as custom, DeflyWalletClient as defly, encodeNFDTransactionsArray, ExodusClient as exodus, KMDWalletClient as kmd, MnemonicWalletClient as mnemonic, MyAlgoWalletClient as myalgo, PeraWalletClient as pera, reconnectProviders, useInitializeProviders, useWallet, WalletConnectClient as walletconnect };
+export { DEFAULT_NETWORK, DEFAULT_NODE_BASEURL, DEFAULT_NODE_PORT, DEFAULT_NODE_TOKEN, PROVIDER_ID, WalletProvider, AlgoSignerClient as algosigner, CustomWalletClient as custom, DeflyWalletClient as defly, encodeNFDTransactionsArray, ExodusClient as exodus, KMDWalletClient as kmd, MnemonicWalletClient as mnemonic, MyAlgoWalletClient as myalgo, PeraWalletClient as pera, reconnectProviders, useInitializeProviders, useWallet, WalletConnectClient as walletconnect };

package/dist/esm/src/context/WalletContext.d.ts

@@ -0,0 +1,8 @@
+import React from 'react';
+import type { SupportedProviders } from '../types/providers';
+export declare const useWalletContext: () => SupportedProviders | null;
+export interface WalletProviderProps {
+    children: React.ReactNode;
+    value: SupportedProviders | null;
+}
+export declare const WalletProvider: ({ children, value }: WalletProviderProps) => React.JSX.Element;

package/dist/esm/src/index.d.ts

@@ -1,5 +1,5 @@
 export { reconnectProviders, encodeNFDTransactionsArray } from './utils';
-export { WalletProvider } from './store';
+export { WalletProvider } from './context/WalletContext';
 export * from './constants';
 export * from './types';
 export * from './clients';

package/dist/esm/src/store/index.d.ts

@@ -1,3 +1,2 @@
 export * from './state/walletStore';
 export * from './state/debugStore';
-export { default as WalletProvider } from './state/clientStore';

package/dist/index.d.ts

@@ -4,7 +4,7 @@ import { DeflyWalletConnect } from '@blockshake/defly-connect';
 import { DaffiWalletConnect } from '@daffiwallet/connect';
 import MyAlgoConnect from '@randlabs/myalgo-connect';
 import { WalletConnectModalSignOptions, WalletConnectModalSign } from '@walletconnect/modal-sign-html';
-import * as react from 'react';
+import React from 'react';
 import * as zustand_middleware from 'zustand/middleware';
 import * as immer_dist_internal from 'immer/dist/internal';
 import * as zustand from 'zustand';
@@ -116,7 +116,7 @@ type AccountInfo = {
     'auth-addr'?: string;
     assets?: Asset[];
 };
-type WalletProvider = {
+type WalletProvider$1 = {
     id: PROVIDER_ID;
     name: string;
     icon: string;
@@ -125,7 +125,7 @@ type WalletProvider = {
 type ExtendValues<Type> = {
     [Property in keyof Type]: Type[Property] | null;
 };
-type Wallet = ExtendValues<WalletProvider> & {
+type Wallet = ExtendValues<WalletProvider$1> & {
     accounts: Account[];
 };
 type Metadata = {
@@ -402,33 +402,11 @@ declare const reconnectProviders: (providers: SupportedProviders) => Promise<voi
 type NFDTransactionsArray = ['u' | 's', string][];
 declare function encodeNFDTransactionsArray(transactionsArray: NFDTransactionsArray): Uint8Array[];
 
-type WalletStore = {
-    accounts: Account[];
-    activeAccount: Account | null | undefined;
-    setActiveAccount: (account: Account) => void;
-    clearActiveAccount: (id: PROVIDER_ID) => void;
-    addAccounts: (accounts: Account[]) => void;
-    removeAccounts: (providerId: PROVIDER_ID) => void;
-};
-declare const useWalletStore: zustand.UseBoundStore<Omit<Omit<Omit<zustand.StoreApi<WalletStore>, "setState"> & {
-    setState(nextStateOrUpdater: WalletStore | Partial<WalletStore> | ((state: immer_dist_internal.WritableDraft<WalletStore>) => void), shouldReplace?: boolean | undefined): void;
-}, "persist"> & {
-    persist: {
-        setOptions: (options: Partial<zustand_middleware.PersistOptions<WalletStore, WalletStore>>) => void;
-        clearStorage: () => void;
-        rehydrate: () => void | Promise<void>;
-        hasHydrated: () => boolean;
-        onHydrate: (fn: (state: WalletStore) => void) => () => void;
-        onFinishHydration: (fn: (state: WalletStore) => void) => () => void;
-        getOptions: () => Partial<zustand_middleware.PersistOptions<WalletStore, WalletStore>>;
-    };
-}, "setState"> & {
-    setState<A extends string | {
-        type: unknown;
-    }>(nextStateOrUpdater: WalletStore | Partial<WalletStore> | ((state: immer_dist_internal.WritableDraft<WalletStore>) => void), shouldReplace?: boolean | undefined, action?: A | undefined): void;
-}>;
-
-declare const _default: react.Provider<Partial<Record<PROVIDER_ID, BaseClient | null>> | null>;
+interface WalletProviderProps {
+    children: React.ReactNode;
+    value: SupportedProviders | null;
+}
+declare const WalletProvider: ({ children, value }: WalletProviderProps) => React.JSX.Element;
 
 declare class PeraWalletClient extends BaseClient {
     #private;
@@ -542,6 +520,32 @@ declare class ExodusClient extends BaseClient {
     signTransactions(connectedAccounts: string[], txnGroups: Uint8Array[] | Uint8Array[][], indexesToSign?: number[], returnGroup?: boolean): Promise<Uint8Array[]>;
 }
 
+type WalletStore = {
+    accounts: Account[];
+    activeAccount: Account | null | undefined;
+    setActiveAccount: (account: Account) => void;
+    clearActiveAccount: (id: PROVIDER_ID) => void;
+    addAccounts: (accounts: Account[]) => void;
+    removeAccounts: (providerId: PROVIDER_ID) => void;
+};
+declare const useWalletStore: zustand.UseBoundStore<Omit<Omit<Omit<zustand.StoreApi<WalletStore>, "setState"> & {
+    setState(nextStateOrUpdater: WalletStore | Partial<WalletStore> | ((state: immer_dist_internal.WritableDraft<WalletStore>) => void), shouldReplace?: boolean | undefined): void;
+}, "persist"> & {
+    persist: {
+        setOptions: (options: Partial<zustand_middleware.PersistOptions<WalletStore, WalletStore>>) => void;
+        clearStorage: () => void;
+        rehydrate: () => void | Promise<void>;
+        hasHydrated: () => boolean;
+        onHydrate: (fn: (state: WalletStore) => void) => () => void;
+        onFinishHydration: (fn: (state: WalletStore) => void) => () => void;
+        getOptions: () => Partial<zustand_middleware.PersistOptions<WalletStore, WalletStore>>;
+    };
+}, "setState"> & {
+    setState<A extends string | {
+        type: unknown;
+    }>(nextStateOrUpdater: WalletStore | Partial<WalletStore> | ((state: immer_dist_internal.WritableDraft<WalletStore>) => void), shouldReplace?: boolean | undefined, action?: A | undefined): void;
+}>;
+
 type GenesisId = 'betanet-v1.0' | 'testnet-v1.0' | 'mainnet-v1.0' | string;
 type EnableParams = {
     genesisID?: GenesisId;
@@ -755,4 +759,4 @@ interface InitializeProvidersOptions {
 }
 declare function useInitializeProviders({ providers, nodeConfig, algosdkStatic, debug }: InitializeProvidersOptions): Partial<Record<PROVIDER_ID, BaseClient | null>> | null;
 
-export { Account, AccountInfo, AlgodClientOptions, Asset, ClientOptions, CommonInitParams, ConfirmedTxn, CustomProvider, DEFAULT_NETWORK, DEFAULT_NODE_BASEURL, DEFAULT_NODE_PORT, DEFAULT_NODE_TOKEN, DecodedSignedTransaction, DecodedTransaction, InitParams, Metadata, Network, NodeConfig, PROVIDER_ID, Provider, ProviderConfig, ProviderConfigMapping, ProvidersArray, PublicNetwork, RawTxnResponse, SupportedProviders, TransactionsArray, Txn, TxnInfo, TxnType, Wallet, WalletClient, _default as WalletProvider, AlgoSignerClient as algosigner, CustomWalletClient as custom, DeflyWalletClient as defly, encodeNFDTransactionsArray, ExodusClient as exodus, KMDWalletClient as kmd, MnemonicWalletClient as mnemonic, MyAlgoWalletClient as myalgo, PeraWalletClient as pera, reconnectProviders, useInitializeProviders, useWallet, WalletConnectClient as walletconnect };
+export { Account, AccountInfo, AlgodClientOptions, Asset, ClientOptions, CommonInitParams, ConfirmedTxn, CustomProvider, DEFAULT_NETWORK, DEFAULT_NODE_BASEURL, DEFAULT_NODE_PORT, DEFAULT_NODE_TOKEN, DecodedSignedTransaction, DecodedTransaction, InitParams, Metadata, Network, NodeConfig, PROVIDER_ID, Provider, ProviderConfig, ProviderConfigMapping, ProvidersArray, PublicNetwork, RawTxnResponse, SupportedProviders, TransactionsArray, Txn, TxnInfo, TxnType, Wallet, WalletClient, WalletProvider, AlgoSignerClient as algosigner, CustomWalletClient as custom, DeflyWalletClient as defly, encodeNFDTransactionsArray, ExodusClient as exodus, KMDWalletClient as kmd, MnemonicWalletClient as mnemonic, MyAlgoWalletClient as myalgo, PeraWalletClient as pera, reconnectProviders, useInitializeProviders, useWallet, WalletConnectClient as walletconnect };

package/package.json

@@ -12,7 +12,7 @@
     "url": "https://github.com/txnlab/use-wallet/issues"
   },
   "homepage": "https://txnlab.github.io/use-wallet",
-  "version": "2.2.0",
+  "version": "2.3.1",
   "description": "React hooks for using Algorand compatible wallets in dApps.",
   "scripts": {
     "dev": "yarn storybook",

package/dist/cjs/src/store/state/clientStore.d.ts

@@ -1,5 +0,0 @@
-/// <reference types="react" />
-declare const ClientContext: import("react").Context<Partial<Record<import("../..").PROVIDER_ID, import("../../clients/base/base").default | null>> | null>;
-export { ClientContext };
-declare const _default: import("react").Provider<Partial<Record<import("../..").PROVIDER_ID, import("../../clients/base/base").default | null>> | null>;
-export default _default;

package/dist/cjs/src/testUtils/createWrapper.d.ts

@@ -1,6 +0,0 @@
-import React, { ComponentType, ReactNode } from 'react';
-interface CreatedWrapperProps {
-    children: ReactNode;
-}
-export declare function createWrapper<P>(Wrapper: ComponentType<P>, props: P): React.FC<CreatedWrapperProps>;
-export {};

package/dist/esm/src/store/state/clientStore.d.ts

@@ -1,5 +0,0 @@
-/// <reference types="react" />
-declare const ClientContext: import("react").Context<Partial<Record<import("../..").PROVIDER_ID, import("../../clients/base/base").default | null>> | null>;
-export { ClientContext };
-declare const _default: import("react").Provider<Partial<Record<import("../..").PROVIDER_ID, import("../../clients/base/base").default | null>> | null>;
-export default _default;

package/dist/esm/src/testUtils/createWrapper.d.ts

@@ -1,6 +0,0 @@
-import React, { ComponentType, ReactNode } from 'react';
-interface CreatedWrapperProps {
-    children: ReactNode;
-}
-export declare function createWrapper<P>(Wrapper: ComponentType<P>, props: P): React.FC<CreatedWrapperProps>;
-export {};