rename address to accounts

Author: arch1995

demo/vite-react-app-solana/src/components/Main.tsx

@@ -1,28 +1,24 @@
-import { WALLET_CONNECTORS } from "@web3auth/modal";
-import styles from "../styles/Home.module.css";
 import { useWeb3Auth, useWeb3AuthConnect, useWeb3AuthDisconnect } from "@web3auth/modal/react";
-import {  useSignMessage } from "@web3auth/modal/react/solana";
+import { useSignMessage } from "@web3auth/modal/react/solana";
+
+import styles from "../styles/Home.module.css";
 
 const Main = () => {
-  const {
-    provider,
-    isInitialized,
-  } = useWeb3Auth();
+  const { provider, isInitialized } = useWeb3Auth();
   const { connect } = useWeb3AuthConnect();
   const { disconnect } = useWeb3AuthDisconnect();
   const { data: signedMessageData, signMessage } = useSignMessage();
 
-
   const loggedInView = (
     <>
-        <div style={{ marginTop: "16px", marginBottom: "16px" }}>
-          <p>Provider Actions</p>
-          {/* Sign Message */}
-          <button onClick={() => signMessage("Hello, world!")} className={styles.card}>
-            Sign Message
-          </button>
-          {signedMessageData && <textarea disabled rows={5} value={signedMessageData} style={{ width: "100%" }} />}
-        </div>
+      <div style={{ marginTop: "16px", marginBottom: "16px" }}>
+        <p>Provider Actions</p>
+        {/* Sign Message */}
+        <button onClick={() => signMessage("Hello, world!")} className={styles.card}>
+          Sign Message
+        </button>
+        {signedMessageData && <textarea disabled rows={5} value={signedMessageData} style={{ width: "100%" }} />}
+      </div>
 
       <button onClick={() => disconnect()} className={styles.card}>
         Log Out

packages/modal/src/react/solana/hooks/index.ts

@@ -1,3 +1,4 @@
 export * from "./useSignAndSendTransaction";
 export * from "./useSignMessage";
 export * from "./useSignTransaction";
+export * from "./useSolanaWallet";

packages/modal/src/react/solana/hooks/useSignMessage.ts

@@ -11,7 +11,7 @@ export type IUseSignMessage = {
 };
 
 export const useSignMessage = (): IUseSignMessage => {
-  const { solanaWallet, address } = useSolanaWallet();
+  const { solanaWallet, accounts } = useSolanaWallet();
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState<Web3AuthError | null>(null);
   const [data, setData] = useState<string | null>(null);
@@ -22,7 +22,7 @@ export const useSignMessage = (): IUseSignMessage => {
       setError(null);
       try {
         if (!solanaWallet) throw new Error("Solana wallet not found");
-        const signature = await solanaWallet.signMessage(message, from ?? address[0]);
+        const signature = await solanaWallet.signMessage(message, from ?? accounts?.[0]);
         setData(signature);
         return signature;
       } catch (error) {
@@ -31,7 +31,7 @@ export const useSignMessage = (): IUseSignMessage => {
         setLoading(false);
       }
     },
-    [solanaWallet, address]
+    [solanaWallet, accounts]
   );
 
   return { loading, error, data, signMessage };

packages/modal/src/react/solana/hooks/useSolanaWallet.ts

@@ -4,13 +4,13 @@ import { useEffect, useMemo, useState } from "react";
 import { useWeb3Auth } from "../../hooks/useWeb3Auth";
 
 export type IUseSolanaWallet = {
-  address: string[] | null;
+  accounts: string[] | null;
   solanaWallet: SolanaWallet | null;
 };
 
 export const useSolanaWallet = (): IUseSolanaWallet => {
   const { provider } = useWeb3Auth();
-  const [address, setAddress] = useState<string[] | null>(null);
+  const [accounts, setAccounts] = useState<string[] | null>(null);
 
   const solanaWallet = useMemo(() => {
     if (!provider) return null;
@@ -22,12 +22,12 @@ export const useSolanaWallet = (): IUseSolanaWallet => {
       if (!solanaWallet) return;
       const accounts = await solanaWallet.requestAccounts();
       if (accounts?.length > 0) {
-        setAddress(accounts);
+        setAccounts(accounts);
       }
     };
 
     if (solanaWallet) fetchAccounts();
   }, [solanaWallet]);
 
-  return { solanaWallet, address };
+  return { solanaWallet, accounts };
 };

packages/no-modal/src/react/solana/hooks/index.ts

@@ -1,3 +1,4 @@
 export * from "./useSignAndSendTransaction";
 export * from "./useSignMessage";
 export * from "./useSignTransaction";
+export * from "./useSolanaWallet";

packages/no-modal/src/react/solana/hooks/useSignMessage.ts

@@ -12,7 +12,7 @@ export type IUseSignMessage = {
 };
 
 export const useSignMessage = (): IUseSignMessage => {
-  const { solanaWallet, address } = useSolanaWallet();
+  const { solanaWallet, accounts } = useSolanaWallet();
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState<Web3AuthError | null>(null);
   const [data, setData] = useState<string | null>(null);
@@ -23,7 +23,7 @@ export const useSignMessage = (): IUseSignMessage => {
       setError(null);
       try {
         if (!solanaWallet) throw new Error("Solana wallet not found");
-        const signature = await solanaWallet.signMessage(message, from ?? address[0]);
+        const signature = await solanaWallet.signMessage(message, from ?? accounts?.[0]);
         setData(signature);
         return signature;
       } catch (error) {
@@ -32,7 +32,7 @@ export const useSignMessage = (): IUseSignMessage => {
         setLoading(false);
       }
     },
-    [solanaWallet, address]
+    [solanaWallet, accounts]
   );
 
   return { loading, error, data, signMessage };

packages/no-modal/src/react/solana/hooks/useSolanaWallet.ts

@@ -5,13 +5,13 @@ import { SolanaWallet } from "@/core/solana-provider";
 import { useWeb3Auth } from "../../hooks/useWeb3Auth";
 
 export type IUseSolanaWallet = {
-  address: string[] | null;
+  accounts: string[] | null;
   solanaWallet: SolanaWallet | null;
 };
 
 export const useSolanaWallet = (): IUseSolanaWallet => {
   const { provider } = useWeb3Auth();
-  const [address, setAddress] = useState<string[] | null>(null);
+  const [accounts, setAccounts] = useState<string[] | null>(null);
 
   const solanaWallet = useMemo(() => {
     if (!provider) return null;
@@ -23,12 +23,12 @@ export const useSolanaWallet = (): IUseSolanaWallet => {
       if (!solanaWallet) return;
       const accounts = await solanaWallet.requestAccounts();
       if (accounts?.length > 0) {
-        setAddress(accounts);
+        setAccounts(accounts);
       }
     };
 
     if (solanaWallet) fetchAccounts();
   }, [solanaWallet]);
 
-  return { solanaWallet, address };
+  return { solanaWallet, accounts };
 };