@aptos-labs/wallet-adapter-react 2.1.8 → 2.2.1

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @aptos-labs/wallet-adapter-react
 
+## 2.2.1
+
+### Patch Changes
+
+- Updated dependencies [4127cfb]
+  - @aptos-labs/wallet-adapter-core@3.8.0
+
+## 2.2.0
+
+### Minor Changes
+
+- 4d6e2f6: Add AIP-62 wallet standard support
+
+### Patch Changes
+
+- Updated dependencies [4d6e2f6]
+  - @aptos-labs/wallet-adapter-core@3.7.0
+
 ## 2.1.8
 
 ### Patch Changes

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { AccountInfo, NetworkInfo, WalletName, WalletInfo, Wallet, InputTransactionData, AnyRawTransaction, Types, InputGenerateTransactionOptions, AccountAuthenticator, InputSubmitTransactionData, PendingTransactionResponse, SignMessagePayload, SignMessageResponse } from '@aptos-labs/wallet-adapter-core';
-export { InputTransactionData, NetworkName, Wallet, WalletName, WalletReadyState, isInAppBrowser, isMobile, isRedirectable } from '@aptos-labs/wallet-adapter-core';
+export { AccountInfo, InputTransactionData, NetworkInfo, NetworkName, Wallet, WalletInfo, WalletName, WalletReadyState, isInAppBrowser, isMobile, isRedirectable } from '@aptos-labs/wallet-adapter-core';
 import { ReactNode, FC } from 'react';
 
 interface WalletContextState {
@@ -10,7 +10,7 @@ interface WalletContextState {
     connect(walletName: WalletName): void;
     disconnect(): void;
     wallet: WalletInfo | null;
-    wallets: ReadonlyArray<Wallet>;
+    wallets?: ReadonlyArray<Wallet>;
     signAndSubmitTransaction(transaction: InputTransactionData): Promise<any>;
     signTransaction(transactionOrPayload: AnyRawTransaction | Types.TransactionPayload, asFeePayer?: boolean, options?: InputGenerateTransactionOptions): Promise<AccountAuthenticator>;
     submitTransaction(transaction: InputSubmitTransactionData): Promise<PendingTransactionResponse>;
@@ -21,7 +21,7 @@ declare function useWallet(): WalletContextState;
 
 interface AptosWalletProviderProps {
     children: ReactNode;
-    plugins: ReadonlyArray<Wallet>;
+    plugins?: ReadonlyArray<Wallet>;
     autoConnect?: boolean;
     onError?: (error: any) => void;
 }

package/dist/index.js

@@ -64,7 +64,7 @@ var AptosWalletAdapterProvider = ({
 }) => {
   const [{ connected, account, network, wallet }, setState] = (0, import_react2.useState)(initialState);
   const [isLoading, setIsLoading] = (0, import_react2.useState)(true);
-  const walletCore = (0, import_react2.useMemo)(() => new import_wallet_adapter_core.WalletCore(plugins), []);
+  const walletCore = (0, import_react2.useMemo)(() => new import_wallet_adapter_core.WalletCore(plugins != null ? plugins : []), []);
   const [wallets, setWallets] = (0, import_react2.useState)(
     walletCore.wallets
   );
@@ -73,7 +73,6 @@ var AptosWalletAdapterProvider = ({
       setIsLoading(true);
       await walletCore.connect(walletName);
     } catch (error) {
-      console.log("connect error", error);
       if (onError)
         onError(error);
       return Promise.reject(error);
@@ -137,7 +136,7 @@ var AptosWalletAdapterProvider = ({
   };
   (0, import_react2.useEffect)(() => {
     if (autoConnect) {
-      if (localStorage.getItem("AptosWalletName")) {
+      if (localStorage.getItem("AptosWalletName") && !connected) {
         connect(localStorage.getItem("AptosWalletName"));
       } else {
         setIsLoading(false);
@@ -149,7 +148,7 @@ var AptosWalletAdapterProvider = ({
       walletCore.onAccountChange();
       walletCore.onNetworkChange();
     }
-  }, [...wallets, connected]);
+  }, [connected]);
   const handleConnect = () => {
     setState((state) => {
       return {
@@ -198,8 +197,23 @@ var AptosWalletAdapterProvider = ({
       };
     });
   }, [connected]);
-  const handleReadyStateChange = (wallet2) => {
-    setWallets((wallets2) => [...wallets2]);
+  const handleReadyStateChange = (updatedWallet) => {
+    const updatedWallets = wallets == null ? void 0 : wallets.map((wallet2) => {
+      if (wallet2.name === updatedWallet.name) {
+        return { ...wallet2, readyState: updatedWallet.readyState };
+      }
+      return wallet2;
+    });
+    setWallets(updatedWallets);
+  };
+  const handleStandardWalletsAdded = (standardWallet) => {
+    const updatedWallets = wallets == null ? void 0 : wallets.map((wallet2) => {
+      if (wallet2.name === standardWallet.name) {
+        return { ...standardWallet };
+      }
+      return wallet2;
+    });
+    setWallets(updatedWallets);
   };
   (0, import_react2.useEffect)(() => {
     walletCore.on("connect", handleConnect);
@@ -207,14 +221,16 @@ var AptosWalletAdapterProvider = ({
     walletCore.on("accountChange", handleAccountChange);
     walletCore.on("networkChange", handleNetworkChange);
     walletCore.on("readyStateChange", handleReadyStateChange);
+    walletCore.on("standardWalletsAdded", handleStandardWalletsAdded);
     return () => {
       walletCore.off("connect", handleConnect);
       walletCore.off("disconnect", handleDisconnect);
       walletCore.off("accountChange", handleAccountChange);
       walletCore.off("networkChange", handleNetworkChange);
       walletCore.off("readyStateChange", handleReadyStateChange);
+      walletCore.off("standardWalletsAdded", handleStandardWalletsAdded);
     };
-  }, [...wallets, connected]);
+  }, [wallets, connected]);
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(WalletContext.Provider, {
     value: {
       connect,

package/dist/index.mjs

@@ -37,7 +37,7 @@ var AptosWalletAdapterProvider = ({
 }) => {
   const [{ connected, account, network, wallet }, setState] = useState(initialState);
   const [isLoading, setIsLoading] = useState(true);
-  const walletCore = useMemo(() => new WalletCore(plugins), []);
+  const walletCore = useMemo(() => new WalletCore(plugins != null ? plugins : []), []);
   const [wallets, setWallets] = useState(
     walletCore.wallets
   );
@@ -46,7 +46,6 @@ var AptosWalletAdapterProvider = ({
       setIsLoading(true);
       await walletCore.connect(walletName);
     } catch (error) {
-      console.log("connect error", error);
       if (onError)
         onError(error);
       return Promise.reject(error);
@@ -110,7 +109,7 @@ var AptosWalletAdapterProvider = ({
   };
   useEffect(() => {
     if (autoConnect) {
-      if (localStorage.getItem("AptosWalletName")) {
+      if (localStorage.getItem("AptosWalletName") && !connected) {
         connect(localStorage.getItem("AptosWalletName"));
       } else {
         setIsLoading(false);
@@ -122,7 +121,7 @@ var AptosWalletAdapterProvider = ({
       walletCore.onAccountChange();
       walletCore.onNetworkChange();
     }
-  }, [...wallets, connected]);
+  }, [connected]);
   const handleConnect = () => {
     setState((state) => {
       return {
@@ -171,8 +170,23 @@ var AptosWalletAdapterProvider = ({
       };
     });
   }, [connected]);
-  const handleReadyStateChange = (wallet2) => {
-    setWallets((wallets2) => [...wallets2]);
+  const handleReadyStateChange = (updatedWallet) => {
+    const updatedWallets = wallets == null ? void 0 : wallets.map((wallet2) => {
+      if (wallet2.name === updatedWallet.name) {
+        return { ...wallet2, readyState: updatedWallet.readyState };
+      }
+      return wallet2;
+    });
+    setWallets(updatedWallets);
+  };
+  const handleStandardWalletsAdded = (standardWallet) => {
+    const updatedWallets = wallets == null ? void 0 : wallets.map((wallet2) => {
+      if (wallet2.name === standardWallet.name) {
+        return { ...standardWallet };
+      }
+      return wallet2;
+    });
+    setWallets(updatedWallets);
   };
   useEffect(() => {
     walletCore.on("connect", handleConnect);
@@ -180,14 +194,16 @@ var AptosWalletAdapterProvider = ({
     walletCore.on("accountChange", handleAccountChange);
     walletCore.on("networkChange", handleNetworkChange);
     walletCore.on("readyStateChange", handleReadyStateChange);
+    walletCore.on("standardWalletsAdded", handleStandardWalletsAdded);
     return () => {
       walletCore.off("connect", handleConnect);
       walletCore.off("disconnect", handleDisconnect);
       walletCore.off("accountChange", handleAccountChange);
       walletCore.off("networkChange", handleNetworkChange);
       walletCore.off("readyStateChange", handleReadyStateChange);
+      walletCore.off("standardWalletsAdded", handleStandardWalletsAdded);
     };
-  }, [...wallets, connected]);
+  }, [wallets, connected]);
   return /* @__PURE__ */ jsx(WalletContext.Provider, {
     value: {
       connect,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aptos-labs/wallet-adapter-react",
-  "version": "2.1.8",
+  "version": "2.2.1",
   "description": "Aptos Wallet Adapter React Provider",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -37,7 +37,7 @@
     "@aptos-labs/wallet-adapter-tsconfig": "0.0.0"
   },
   "dependencies": {
-    "@aptos-labs/wallet-adapter-core": "3.6.0"
+    "@aptos-labs/wallet-adapter-core": "3.8.0"
   },
   "peerDependencies": {
     "react": "^18"

package/src/WalletProvider.tsx

@@ -27,7 +27,7 @@ import { WalletCore } from "@aptos-labs/wallet-adapter-core";
 
 export interface AptosWalletProviderProps {
   children: ReactNode;
-  plugins: ReadonlyArray<Wallet>;
+  plugins?: ReadonlyArray<Wallet>;
   autoConnect?: boolean;
   onError?: (error: any) => void;
 }
@@ -57,7 +57,7 @@ export const AptosWalletAdapterProvider: FC<AptosWalletProviderProps> = ({
   // https://github.com/aptos-labs/aptos-wallet-adapter/issues/94
   const [isLoading, setIsLoading] = useState<boolean>(true);
 
-  const walletCore = useMemo(() => new WalletCore(plugins), []);
+  const walletCore = useMemo(() => new WalletCore(plugins ?? []), []);
   const [wallets, setWallets] = useState<ReadonlyArray<Wallet>>(
     walletCore.wallets
   );
@@ -67,7 +67,6 @@ export const AptosWalletAdapterProvider: FC<AptosWalletProviderProps> = ({
       setIsLoading(true);
       await walletCore.connect(walletName);
     } catch (error: any) {
-      console.log("connect error", error);
       if (onError) onError(error);
       return Promise.reject(error);
     } finally {
@@ -143,7 +142,7 @@ export const AptosWalletAdapterProvider: FC<AptosWalletProviderProps> = ({
 
   useEffect(() => {
     if (autoConnect) {
-      if (localStorage.getItem("AptosWalletName")) {
+      if (localStorage.getItem("AptosWalletName") && !connected) {
         connect(localStorage.getItem("AptosWalletName") as WalletName);
       } else {
         // if we dont use autoconnect set the connect is loading to false
@@ -157,7 +156,7 @@ export const AptosWalletAdapterProvider: FC<AptosWalletProviderProps> = ({
       walletCore.onAccountChange();
       walletCore.onNetworkChange();
     }
-  }, [...wallets, connected]);
+  }, [connected]);
 
   // Handle the adapter's connect event
   const handleConnect = () => {
@@ -210,11 +209,28 @@ export const AptosWalletAdapterProvider: FC<AptosWalletProviderProps> = ({
     });
   }, [connected]);
 
-  // Whenever the readyState of any supported wallet changes we produce a new wallets state array
-  // which in turn causes consumers of the `useWallet` hook to re-render.
-  // See https://github.com/aptos-labs/aptos-wallet-adapter/pull/129#issuecomment-1519026572 for reasoning.
-  const handleReadyStateChange = (wallet: Wallet) => {
-    setWallets((wallets) => [...wallets]);
+  const handleReadyStateChange = (updatedWallet: Wallet) => {
+    // Create a new array with updated values
+    const updatedWallets = wallets?.map((wallet) => {
+      if (wallet.name === updatedWallet.name) {
+        // Return a new object with updated value
+        return { ...wallet, readyState: updatedWallet.readyState };
+      }
+      return wallet;
+    });
+    setWallets(updatedWallets);
+  };
+
+  const handleStandardWalletsAdded = (standardWallet: Wallet) => {
+    // Manage current wallet state by removing optional duplications
+    // as new wallets are coming
+    const updatedWallets = wallets?.map((wallet) => {
+      if (wallet.name === standardWallet.name) {
+        return { ...standardWallet };
+      }
+      return wallet;
+    });
+    setWallets(updatedWallets);
   };
 
   useEffect(() => {
@@ -223,14 +239,16 @@ export const AptosWalletAdapterProvider: FC<AptosWalletProviderProps> = ({
     walletCore.on("accountChange", handleAccountChange);
     walletCore.on("networkChange", handleNetworkChange);
     walletCore.on("readyStateChange", handleReadyStateChange);
+    walletCore.on("standardWalletsAdded", handleStandardWalletsAdded);
     return () => {
       walletCore.off("connect", handleConnect);
       walletCore.off("disconnect", handleDisconnect);
       walletCore.off("accountChange", handleAccountChange);
       walletCore.off("networkChange", handleNetworkChange);
       walletCore.off("readyStateChange", handleReadyStateChange);
+      walletCore.off("standardWalletsAdded", handleStandardWalletsAdded);
     };
-  }, [...wallets, connected]);
+  }, [wallets, connected]);
 
   return (
     <WalletContext.Provider

package/src/index.tsx

@@ -3,6 +3,9 @@ export { useWallet } from "./useWallet";
 export * from "./WalletProvider";
 export type {
   Wallet,
+  AccountInfo,
+  NetworkInfo,
+  WalletInfo,
   WalletName,
   InputTransactionData,
 } from "@aptos-labs/wallet-adapter-core";

package/src/useWallet.tsx

@@ -24,7 +24,7 @@ export interface WalletContextState {
   connect(walletName: WalletName): void;
   disconnect(): void;
   wallet: WalletInfo | null;
-  wallets: ReadonlyArray<Wallet>;
+  wallets?: ReadonlyArray<Wallet>;
   signAndSubmitTransaction(transaction: InputTransactionData): Promise<any>;
   signTransaction(
     transactionOrPayload: AnyRawTransaction | Types.TransactionPayload,