@aptos-labs/wallet-adapter-react 1.2.1 → 1.2.3

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @aptos-labs/wallet-adapter-react
 
+## 1.2.3
+
+### Patch Changes
+
+- dc98bf4: fix sendAndSubmitTransaction params
+- Updated dependencies [dc98bf4]
+  - @aptos-labs/wallet-adapter-core@2.3.3
+
+## 1.2.2
+
+### Patch Changes
+
+- 22ecf6a: Throw `wallet already connected` error when trying to connect to an already connected wallet
+- e4b06de: Await for wallet connect request before setting isLoading state
+- Updated dependencies [22ecf6a]
+  - @aptos-labs/wallet-adapter-core@2.3.2
+
 ## 1.2.1
 
 ### Patch Changes

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { AccountInfo, NetworkInfo, WalletName, WalletInfo, Wallet, SignMessagePayload, SignMessageResponse } from '@aptos-labs/wallet-adapter-core';
+import { AccountInfo, NetworkInfo, WalletName, WalletInfo, Wallet, TransactionOptions, SignMessagePayload, SignMessageResponse } from '@aptos-labs/wallet-adapter-core';
 export { NetworkName, Wallet, WalletName, WalletReadyState, isInAppBrowser, isMobile, isRedirectable } from '@aptos-labs/wallet-adapter-core';
 import { Types, TxnBuilderTypes } from 'aptos';
 import { ReactNode, FC } from 'react';
@@ -12,9 +12,9 @@ interface WalletContextState {
     disconnect(): void;
     wallet: WalletInfo | null;
     wallets: ReadonlyArray<Wallet>;
-    signAndSubmitTransaction<T extends Types.TransactionPayload, V>(transaction: T, options?: V): Promise<any>;
-    signAndSubmitBCSTransaction<T extends TxnBuilderTypes.TransactionPayload, V>(transaction: T, options?: V): Promise<any>;
-    signTransaction<T extends Types.TransactionPayload, V>(transaction: T, options?: V): Promise<any>;
+    signAndSubmitTransaction<T extends Types.TransactionPayload>(transaction: T, options?: TransactionOptions): Promise<any>;
+    signAndSubmitBCSTransaction<T extends TxnBuilderTypes.TransactionPayload>(transaction: T, options?: TransactionOptions): Promise<any>;
+    signTransaction<T extends Types.TransactionPayload>(transaction: T, options?: TransactionOptions): Promise<any>;
     signMessage(message: SignMessagePayload): Promise<SignMessageResponse | null>;
     signMessageAndVerify(message: SignMessagePayload): Promise<boolean>;
 }

package/dist/index.js

@@ -65,41 +65,44 @@ 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_core2.WalletCore(plugins), []);
-  const [wallets, setWallets] = (0, import_react2.useState)(walletCore.wallets);
-  const connect = (walletName) => {
+  const [wallets, setWallets] = (0, import_react2.useState)(
+    walletCore.wallets
+  );
+  const connect = async (walletName) => {
     try {
       setIsLoading(true);
-      walletCore.connect(walletName);
-    } catch (e) {
-      console.log("connect error", e);
+      await walletCore.connect(walletName);
+    } catch (error) {
+      console.log("connect error", error);
+      throw error;
     } finally {
       setIsLoading(false);
     }
   };
-  const disconnect = () => {
+  const disconnect = async () => {
     try {
-      walletCore.disconnect();
+      await walletCore.disconnect();
     } catch (e) {
       console.log("disconnect error", e);
     }
   };
-  const signAndSubmitTransaction = async (transaction) => {
+  const signAndSubmitTransaction = async (transaction, options) => {
     try {
-      return await walletCore.signAndSubmitTransaction(transaction);
+      return await walletCore.signAndSubmitTransaction(transaction, options);
     } catch (error) {
       throw error;
     }
   };
-  const signAndSubmitBCSTransaction = async (transaction) => {
+  const signAndSubmitBCSTransaction = async (transaction, options) => {
     try {
-      return await walletCore.signAndSubmitBCSTransaction(transaction);
+      return await walletCore.signAndSubmitBCSTransaction(transaction, options);
     } catch (error) {
       throw error;
     }
   };
-  const signTransaction = async (transaction) => {
+  const signTransaction = async (transaction, options) => {
     try {
-      return await walletCore.signTransaction(transaction);
+      return await walletCore.signTransaction(transaction, options);
     } catch (error) {
       throw error;
     }
@@ -122,6 +125,8 @@ var AptosWalletAdapterProvider = ({
     if (autoConnect) {
       if (localStorage.getItem("AptosWalletName")) {
         connect(localStorage.getItem("AptosWalletName"));
+      } else {
+        setIsLoading(false);
       }
     }
   }, wallets);

package/dist/index.mjs

@@ -44,41 +44,44 @@ var AptosWalletAdapterProvider = ({
   const [{ connected, account, network, wallet }, setState] = useState(initialState);
   const [isLoading, setIsLoading] = useState(true);
   const walletCore = useMemo(() => new WalletCore(plugins), []);
-  const [wallets, setWallets] = useState(walletCore.wallets);
-  const connect = (walletName) => {
+  const [wallets, setWallets] = useState(
+    walletCore.wallets
+  );
+  const connect = async (walletName) => {
     try {
       setIsLoading(true);
-      walletCore.connect(walletName);
-    } catch (e) {
-      console.log("connect error", e);
+      await walletCore.connect(walletName);
+    } catch (error) {
+      console.log("connect error", error);
+      throw error;
     } finally {
       setIsLoading(false);
     }
   };
-  const disconnect = () => {
+  const disconnect = async () => {
     try {
-      walletCore.disconnect();
+      await walletCore.disconnect();
     } catch (e) {
       console.log("disconnect error", e);
     }
   };
-  const signAndSubmitTransaction = async (transaction) => {
+  const signAndSubmitTransaction = async (transaction, options) => {
     try {
-      return await walletCore.signAndSubmitTransaction(transaction);
+      return await walletCore.signAndSubmitTransaction(transaction, options);
     } catch (error) {
       throw error;
     }
   };
-  const signAndSubmitBCSTransaction = async (transaction) => {
+  const signAndSubmitBCSTransaction = async (transaction, options) => {
     try {
-      return await walletCore.signAndSubmitBCSTransaction(transaction);
+      return await walletCore.signAndSubmitBCSTransaction(transaction, options);
     } catch (error) {
       throw error;
     }
   };
-  const signTransaction = async (transaction) => {
+  const signTransaction = async (transaction, options) => {
     try {
-      return await walletCore.signTransaction(transaction);
+      return await walletCore.signTransaction(transaction, options);
     } catch (error) {
       throw error;
     }
@@ -101,6 +104,8 @@ var AptosWalletAdapterProvider = ({
     if (autoConnect) {
       if (localStorage.getItem("AptosWalletName")) {
         connect(localStorage.getItem("AptosWalletName"));
+      } else {
+        setIsLoading(false);
       }
     }
   }, wallets);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aptos-labs/wallet-adapter-react",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "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": "2.3.1",
+    "@aptos-labs/wallet-adapter-core": "2.3.3",
     "aptos": "^1.3.17",
     "react": "^18"
   },

package/src/WalletProvider.tsx

@@ -14,6 +14,7 @@ import type {
   Wallet,
   WalletInfo,
   WalletName,
+  TransactionOptions,
 } from "@aptos-labs/wallet-adapter-core";
 import { WalletCore } from "@aptos-labs/wallet-adapter-core";
 
@@ -45,53 +46,63 @@ export const AptosWalletAdapterProvider: FC<AptosWalletProviderProps> = ({
   const [{ connected, account, network, wallet }, setState] =
     useState(initialState);
 
+  // a local state to track whether wallet connect request is loading
+  // https://github.com/aptos-labs/aptos-wallet-adapter/issues/94
   const [isLoading, setIsLoading] = useState<boolean>(true);
 
   const walletCore = useMemo(() => new WalletCore(plugins), []);
-  const [wallets, setWallets] = useState<ReadonlyArray<Wallet>>(walletCore.wallets);
+  const [wallets, setWallets] = useState<ReadonlyArray<Wallet>>(
+    walletCore.wallets
+  );
 
-  const connect = (walletName: WalletName) => {
+  const connect = async (walletName: WalletName) => {
     try {
       setIsLoading(true);
-      walletCore.connect(walletName);
-    } catch (e) {
-      console.log("connect error", e);
+      await walletCore.connect(walletName);
+    } catch (error: any) {
+      console.log("connect error", error);
+      throw error;
     } finally {
       setIsLoading(false);
     }
   };
 
-  const disconnect = () => {
+  const disconnect = async () => {
     try {
-      walletCore.disconnect();
+      await walletCore.disconnect();
     } catch (e) {
       console.log("disconnect error", e);
     }
   };
 
   const signAndSubmitTransaction = async (
-    transaction: Types.TransactionPayload
+    transaction: Types.TransactionPayload,
+    options?: TransactionOptions
   ) => {
     try {
-      return await walletCore.signAndSubmitTransaction(transaction);
+      return await walletCore.signAndSubmitTransaction(transaction, options);
     } catch (error: any) {
       throw error;
     }
   };
 
   const signAndSubmitBCSTransaction = async (
-    transaction: TxnBuilderTypes.TransactionPayload
+    transaction: TxnBuilderTypes.TransactionPayload,
+    options?: TransactionOptions
   ) => {
     try {
-      return await walletCore.signAndSubmitBCSTransaction(transaction);
+      return await walletCore.signAndSubmitBCSTransaction(transaction, options);
     } catch (error: any) {
       throw error;
     }
   };
 
-  const signTransaction = async (transaction: Types.TransactionPayload) => {
+  const signTransaction = async (
+    transaction: Types.TransactionPayload,
+    options?: TransactionOptions
+  ) => {
     try {
-      return await walletCore.signTransaction(transaction);
+      return await walletCore.signTransaction(transaction, options);
     } catch (error: any) {
       throw error;
     }
@@ -117,6 +128,9 @@ export const AptosWalletAdapterProvider: FC<AptosWalletProviderProps> = ({
     if (autoConnect) {
       if (localStorage.getItem("AptosWalletName")) {
         connect(localStorage.getItem("AptosWalletName") as WalletName);
+      } else {
+        // if we dont use autoconnect set the connect is loading to false
+        setIsLoading(false);
       }
     }
   }, wallets);

package/src/useWallet.tsx

@@ -11,6 +11,7 @@ import {
   isInAppBrowser,
   isRedirectable,
   isMobile,
+  TransactionOptions,
 } from "@aptos-labs/wallet-adapter-core";
 import { createContext, useContext } from "react";
 import { TxnBuilderTypes, Types } from "aptos";
@@ -33,17 +34,17 @@ export interface WalletContextState {
   disconnect(): void;
   wallet: WalletInfo | null;
   wallets: ReadonlyArray<Wallet>;
-  signAndSubmitTransaction<T extends Types.TransactionPayload, V>(
+  signAndSubmitTransaction<T extends Types.TransactionPayload>(
     transaction: T,
-    options?: V
+    options?: TransactionOptions
   ): Promise<any>;
-  signAndSubmitBCSTransaction<T extends TxnBuilderTypes.TransactionPayload, V>(
+  signAndSubmitBCSTransaction<T extends TxnBuilderTypes.TransactionPayload>(
     transaction: T,
-    options?: V
+    options?: TransactionOptions
   ): Promise<any>;
-  signTransaction<T extends Types.TransactionPayload, V>(
+  signTransaction<T extends Types.TransactionPayload>(
     transaction: T,
-    options?: V
+    options?: TransactionOptions
   ): Promise<any>;
   signMessage(message: SignMessagePayload): Promise<SignMessageResponse | null>;
   signMessageAndVerify(message: SignMessagePayload): Promise<boolean>;