@aptos-labs/wallet-adapter-react 8.0.0-xchaininit2.0 → 8.0.1

package/src/WalletProvider.tsx

@@ -26,6 +26,7 @@ import { WalletContext } from "./useWallet";
 export interface AptosWalletProviderProps {
   children: ReactNode;
   optInWallets?: ReadonlyArray<AvailableWallets>;
+  hideWallets?: ReadonlyArray<AvailableWallets>;
   autoConnect?:
     | boolean
     | ((core: WalletCore, adapter: AdapterWallet) => Promise<boolean>);
@@ -49,6 +50,7 @@ const initialState: {
 export const AptosWalletAdapterProvider: FC<AptosWalletProviderProps> = ({
   children,
   optInWallets,
+  hideWallets,
   autoConnect = false,
   dappConfig,
   disableTelemetry = false,
@@ -63,6 +65,9 @@ export const AptosWalletAdapterProvider: FC<AptosWalletProviderProps> = ({
   const [walletCore, setWalletCore] = useState<WalletCore>();
 
   const [wallets, setWallets] = useState<ReadonlyArray<AdapterWallet>>([]);
+  const [hiddenWallets, setHiddenWallets] = useState<
+    ReadonlyArray<AdapterWallet>
+  >([]);
   const [notDetectedWallets, setNotDetectedWallets] = useState<
     ReadonlyArray<AdapterNotDetectedWallet>
   >([]);
@@ -74,7 +79,8 @@ export const AptosWalletAdapterProvider: FC<AptosWalletProviderProps> = ({
     const walletCore = new WalletCore(
       optInWallets,
       dappConfig,
-      disableTelemetry
+      disableTelemetry,
+      hideWallets ? hideWallets : ["Petra Web"],
     );
     setWalletCore(walletCore);
   }, []);
@@ -82,6 +88,7 @@ export const AptosWalletAdapterProvider: FC<AptosWalletProviderProps> = ({
   // Update initial Wallets state once WalletCore has been initialized
   useEffect(() => {
     setWallets(walletCore?.wallets ?? []);
+    setHiddenWallets(walletCore?.hiddenWallets ?? []);
     setNotDetectedWallets(walletCore?.notDetectedWallets ?? []);
   }, [walletCore]);
 
@@ -107,7 +114,7 @@ export const AptosWalletAdapterProvider: FC<AptosWalletProviderProps> = ({
 
     // Make sure the wallet is installed
     const selectedWallet = walletCore.wallets.find(
-      (e) => e.name === walletName
+      (e) => e.name === walletName,
     ) as AdapterWallet | undefined;
     if (
       !selectedWallet ||
@@ -146,10 +153,8 @@ export const AptosWalletAdapterProvider: FC<AptosWalletProviderProps> = ({
   }, [autoConnect, wallets]);
 
   useEffect(() => {
-    // Only run if not already initialized or if you want to support network switching
-    // Note: derived-wallet-solana might not support "un-setting" listeners easily.
-    // If it's safe to call multiple times, this is fine.
-    // Usually, these setup functions are idempotent or replace previous listeners.
+    // Initialize cross-chain wallet support based on dappConfig flags.
+    // Dynamically imports the packages to avoid bundling them when not used.
     if (!derivationInitialized.current) {
       if (dappConfig?.crossChainWallets?.solana) {
         import("@aptos-labs/derived-wallet-solana").then(
@@ -157,7 +162,7 @@ export const AptosWalletAdapterProvider: FC<AptosWalletProviderProps> = ({
             setupAutomaticSolanaWalletDerivation({
               defaultNetwork: dappConfig?.network,
             });
-          }
+          },
         );
       }
       if (dappConfig?.crossChainWallets?.evm) {
@@ -166,7 +171,7 @@ export const AptosWalletAdapterProvider: FC<AptosWalletProviderProps> = ({
             setupAutomaticEthereumWalletDerivation({
               defaultNetwork: dappConfig?.network,
             });
-          }
+          },
         );
       }
       derivationInitialized.current = true;
@@ -214,7 +219,7 @@ export const AptosWalletAdapterProvider: FC<AptosWalletProviderProps> = ({
   };
 
   const signAndSubmitTransaction = async (
-    transaction: InputTransactionData
+    transaction: InputTransactionData,
   ): Promise<AptosSignAndSubmitTransactionOutput> => {
     try {
       if (!walletCore) {
@@ -254,7 +259,7 @@ export const AptosWalletAdapterProvider: FC<AptosWalletProviderProps> = ({
   };
 
   const submitTransaction = async (
-    transaction: InputSubmitTransactionData
+    transaction: InputSubmitTransactionData,
   ): Promise<PendingTransactionResponse> => {
     if (!walletCore) {
       throw new Error("WalletCore is not initialized");
@@ -268,7 +273,7 @@ export const AptosWalletAdapterProvider: FC<AptosWalletProviderProps> = ({
   };
 
   const signMessage = async (
-    message: AptosSignMessageInput
+    message: AptosSignMessageInput,
   ): Promise<AptosSignMessageOutput> => {
     if (!walletCore) {
       throw new Error("WalletCore is not initialized");
@@ -282,7 +287,7 @@ export const AptosWalletAdapterProvider: FC<AptosWalletProviderProps> = ({
   };
 
   const signMessageAndVerify = async (
-    message: AptosSignMessageInput
+    message: AptosSignMessageInput,
   ): Promise<boolean> => {
     if (!walletCore) {
       throw new Error("WalletCore is not initialized");
@@ -369,7 +374,7 @@ export const AptosWalletAdapterProvider: FC<AptosWalletProviderProps> = ({
     // Manage current wallet state by removing optional duplications
     // as new wallets are coming
     const existingWalletIndex = wallets.findIndex(
-      (wallet) => wallet.name == standardWallet.name
+      (wallet) => wallet.name == standardWallet.name,
     );
     if (existingWalletIndex !== -1) {
       // If wallet exists, replace it with the new wallet
@@ -384,13 +389,34 @@ export const AptosWalletAdapterProvider: FC<AptosWalletProviderProps> = ({
     }
   };
 
+  const handleStandardWalletsHiddenAdded = (
+    standardWallet: AdapterWallet,
+  ): void => {
+    // Manage hidden wallet state by removing optional duplications
+    // as new wallets are coming
+    const existingWalletIndex = hiddenWallets.findIndex(
+      (wallet) => wallet.name === standardWallet.name,
+    );
+    if (existingWalletIndex !== -1) {
+      // If wallet exists, replace it with the new wallet
+      setHiddenWallets((hiddenWallets) => [
+        ...hiddenWallets.slice(0, existingWalletIndex),
+        standardWallet,
+        ...hiddenWallets.slice(existingWalletIndex + 1),
+      ]);
+    } else {
+      // If wallet doesn't exist, add it to the array
+      setHiddenWallets((hiddenWallets) => [...hiddenWallets, standardWallet]);
+    }
+  };
+
   const handleStandardNotDetectedWalletsAdded = (
-    notDetectedWallet: AdapterNotDetectedWallet
+    notDetectedWallet: AdapterNotDetectedWallet,
   ): void => {
     // Manage current wallet state by removing optional duplications
     // as new wallets are coming
     const existingWalletIndex = wallets.findIndex(
-      (wallet) => wallet.name == notDetectedWallet.name
+      (wallet) => wallet.name == notDetectedWallet.name,
     );
     if (existingWalletIndex !== -1) {
       // If wallet exists, replace it with the new wallet
@@ -411,9 +437,13 @@ export const AptosWalletAdapterProvider: FC<AptosWalletProviderProps> = ({
     walletCore?.on("networkChange", handleNetworkChange);
     walletCore?.on("disconnect", handleDisconnect);
     walletCore?.on("standardWalletsAdded", handleStandardWalletsAdded);
+    walletCore?.on(
+      "standardWalletsHiddenAdded",
+      handleStandardWalletsHiddenAdded,
+    );
     walletCore?.on(
       "standardNotDetectedWalletAdded",
-      handleStandardNotDetectedWalletsAdded
+      handleStandardNotDetectedWalletsAdded,
     );
     return () => {
       walletCore?.off("connect", handleConnect);
@@ -421,9 +451,13 @@ export const AptosWalletAdapterProvider: FC<AptosWalletProviderProps> = ({
       walletCore?.off("networkChange", handleNetworkChange);
       walletCore?.off("disconnect", handleDisconnect);
       walletCore?.off("standardWalletsAdded", handleStandardWalletsAdded);
+      walletCore?.off(
+        "standardWalletsHiddenAdded",
+        handleStandardWalletsHiddenAdded,
+      );
       walletCore?.off(
         "standardNotDetectedWalletAdded",
-        handleStandardNotDetectedWalletsAdded
+        handleStandardNotDetectedWalletsAdded,
       );
     };
   }, [wallets, account]);
@@ -446,6 +480,7 @@ export const AptosWalletAdapterProvider: FC<AptosWalletProviderProps> = ({
         wallet,
         wallets,
         notDetectedWallets,
+        hiddenWallets,
         isLoading,
       }}
     >

package/src/components/WalletItem.tsx

@@ -3,6 +3,7 @@ import {
   AdapterWallet,
   WalletReadyState,
   isRedirectable,
+  shouldUseFallbackWallet,
 } from "@aptos-labs/wallet-adapter-core";
 import { Slot } from "@radix-ui/react-slot";
 import { createContext, forwardRef, useCallback, useContext } from "react";
@@ -35,16 +36,20 @@ const Root = forwardRef<HTMLDivElement, WalletItemProps>(
   ({ wallet, onConnect, className, asChild, children }, ref) => {
     const { connect } = useWallet();
 
-    const connectWallet = useCallback(() => {
-      connect(wallet.name);
-      onConnect?.();
-    }, [connect, wallet.name, onConnect]);
-
     const isWalletReady = wallet.readyState === WalletReadyState.Installed;
 
     const mobileSupport =
       "deeplinkProvider" in wallet && wallet.deeplinkProvider;
 
+    const connectWallet = useCallback(() => {
+      const connectionWallet = shouldUseFallbackWallet(wallet)
+        ? wallet.fallbackWallet
+        : wallet;
+      if (!connectionWallet) return;
+      connect(connectionWallet.name);
+      onConnect?.();
+    }, [wallet, connect, onConnect]);
+
     if (!isWalletReady && isRedirectable() && !mobileSupport) return null;
 
     const Component = asChild ? Slot : "div";

package/src/index.tsx

@@ -1,6 +1,4 @@
 export * from "@aptos-labs/wallet-adapter-core";
-export * from "@aptos-labs/derived-wallet-solana";
-export * from "@aptos-labs/derived-wallet-ethereum";
 export * from "./WalletProvider";
 export * from "./components/AboutAptosConnect";
 export * from "./components/AboutPetraWeb";

package/src/useWallet.tsx

@@ -47,6 +47,7 @@ export interface WalletContextState {
   ): Promise<PendingTransactionResponse>;
   wallet: AdapterWallet | null;
   wallets: ReadonlyArray<AdapterWallet>;
+  hiddenWallets: ReadonlyArray<AdapterWallet>;
   notDetectedWallets: ReadonlyArray<AdapterNotDetectedWallet>;
 }