@manahippo/aptos-wallet-adapter 0.1.19 → 0.1.22

package/src/WalletProviders/WalletProvider.tsx

@@ -1,5 +1,6 @@
 import { useLocalStorage } from '../hooks/useLocalStorage';
 import { FC, ReactNode, useCallback, useEffect, useRef, useState } from 'react';
+import { TransactionPayload } from 'aptos/dist/generated';
 import {
   WalletError,
   WalletNotConnectedError,
@@ -13,12 +14,10 @@ import {
   WalletReadyState
 } from '../WalletAdapters/BaseAdapter';
 import { Wallet, WalletContext } from './useWallet';
-import { TransactionPayload } from 'aptos/dist/generated';
 
 export interface WalletProviderProps {
   children: ReactNode;
   wallets: WalletAdapter[];
-  autoConnect?: boolean;
   onError?: (error: WalletError) => void;
   localStorageKey?: string;
 }
@@ -38,7 +37,6 @@ const initialState: {
 export const WalletProvider: FC<WalletProviderProps> = ({
   children,
   wallets: adapters,
-  autoConnect = false,
   onError,
   localStorageKey = 'walletName'
 }) => {
@@ -140,7 +138,6 @@ export const WalletProvider: FC<WalletProviderProps> = ({
         adapter.off('error', handleError);
       };
     }
-    return () => null;
   }, [adapter, handleConnect, handleDisconnect, handleError]);
 
   // When the adapter changes, disconnect the old one
@@ -243,7 +240,6 @@ export const WalletProvider: FC<WalletProviderProps> = ({
   return (
     <WalletContext.Provider
       value={{
-        autoConnect,
         wallets,
         wallet,
         account,
@@ -254,10 +250,7 @@ export const WalletProvider: FC<WalletProviderProps> = ({
         connect,
         disconnect,
         signAndSubmitTransaction,
-        // sendTransaction,
         signTransaction
-        // signAllTransactions,
-        // signMessage
       }}>
       {children}
     </WalletContext.Provider>

package/src/WalletProviders/useWallet.ts

@@ -1,7 +1,7 @@
 import {
   TransactionPayload,
-  PendingTransaction,
-  SubmitTransactionRequest
+  SubmitTransactionRequest,
+  HexEncodedBytes
 } from 'aptos/dist/generated';
 import { createContext, useContext } from 'react';
 import {
@@ -17,7 +17,7 @@ export interface Wallet {
 }
 
 export interface WalletContextState {
-  autoConnect: boolean;
+  // autoConnect: boolean;
   wallets: Wallet[];
   wallet: Wallet | null;
   account: AccountKeys | null;
@@ -27,19 +27,12 @@ export interface WalletContextState {
   select(walletName: WalletName): void;
   connect(walletName: string): Promise<void>;
   disconnect(): Promise<void>;
-  signAndSubmitTransaction(
-    transaction: TransactionPayload
-    // connection: Connection,
-    // options?: SendTransactionOptions
-  ): Promise<PendingTransaction>;
-
+  signAndSubmitTransaction(transaction: TransactionPayload): Promise<{ hash: HexEncodedBytes }>;
   signTransaction(transaction: TransactionPayload): Promise<SubmitTransactionRequest>;
-  // signAllTransactions: SignerWalletAdapterProps['signAllTransactions'] | undefined;
-  // signMessage: MessageSignerWalletAdapterProps['signMessage'] | undefined;
 }
 
 const DEFAULT_CONTEXT = {
-  autoConnect: false,
+  // autoConnect: false,
   connecting: false,
   connected: false,
   disconnecting: false

package/src/hooks/useLocalStorage.ts

@@ -1,15 +1,20 @@
 import { useCallback, useState } from 'react';
+import { useSSR } from './useSSR';
 
 export const useLocalStorage = () => {
+  const { isClient } = useSSR();
   const useLocalStorageState = <T>(
     key: string,
     defaultState: T,
     session?: boolean
   ): [T, (T: any) => void] => {
-    const storage = session ? sessionStorage : localStorage;
+    let storage: undefined | Storage;
+    if (isClient) {
+      storage = session ? sessionStorage : localStorage;
+    }
     const [state, setState] = useState(() => {
       try {
-        let storedState = storage.getItem(key);
+        let storedState = storage?.getItem(key);
         if (storedState) {
           return JSON.parse(storedState || '');
         }
@@ -25,9 +30,9 @@ export const useLocalStorage = () => {
       (newState: any) => {
         setState(newState);
         if (newState === null) {
-          storage.removeItem(key);
+          storage?.removeItem(key);
         } else {
-          storage.setItem(key, JSON.stringify(newState));
+          storage?.setItem(key, JSON.stringify(newState));
         }
       },
       [key, storage]

package/src/hooks/useSSR.ts

@@ -0,0 +1,15 @@
+import { useEffect, useState } from 'react';
+
+export const useSSR = () => {
+  const [isClient, setIsClient] = useState(false);
+
+  useEffect(() => {
+    if (typeof window !== 'undefined') {
+      setIsClient(true);
+    }
+  }, []);
+
+  return {
+    isClient
+  };
+};

package/src/utilities/util.ts

@@ -4,7 +4,7 @@ export const payloadV1ToV0 = (payload: TransactionPayload) => {
   const v1 = payload as TransactionPayload_ScriptFunctionPayload;
   return {
     type: 'script_function_payload',
-    function: `${v1.function.module.address}::${v1.function.module.name}::${v1.function.name}`,
+    function: v1.function,
     type_arguments: v1.type_arguments,
     arguments: v1.arguments
   };