chore(app): creating aptos client according to wallet wip

Signed-off-by: Kaan Caglan <caglankaan@gmail.com>

Author: Caglankaan

typescript-sdk/src/aptos/client.ts

@@ -39,9 +39,9 @@ async function getAptosClient(
   parameters: AptosClientParameters & { authAccess: "key" }
 ): Promise<{ authAccess: "key"; aptos: Aptos; signer: AptosAccount }>
 
-// async function getAptosClient(
-//   parameters: AptosClientParameters & { authAccess: "wallet" }
-// ): Promise<{ authAccess: "wallet"; aptos: Aptos; signer: AptosBrowserWallet }>
+async function getAptosClient(
+  parameters: AptosClientParameters & { authAccess: "wallet" }
+): Promise<{ authAccess: "wallet"; aptos: Aptos; signer: AptosBrowserWallet }>
 
 async function getAptosClient(
   parameters: AptosClientParameters & { authAccess: AuthAccess }
@@ -66,19 +66,49 @@ async function getAptosClient(
     }
   }
 
+  // if (parameters.authAccess === "wallet") {
+  //   if (typeof parameters.transport !== "object") {
+  //     throw new Error("Invalid Aptos transport")
+  //   }
+  //   const networkInfo = await parameters.transport.getNetwork()
+  //   const network = networkInfo.name.toLowerCase() === "mainnet" ? Network.MAINNET : Network.TESTNET
+  //   const config = new AptosConfig({ fullnode: networkInfo.url, network })
+  //   return {
+  //     authAccess: "wallet",
+  //     aptos: new Aptos(config),
+  //     signer: parameters.transport as AptosBrowserWallet
+  //   }
+  // }
   if (parameters.authAccess === "wallet") {
     if (typeof parameters.transport !== "object") {
       throw new Error("Invalid Aptos transport")
     }
     const networkInfo = await parameters.transport.getNetwork()
-    const network = networkInfo.name.toLowerCase() === "mainnet" ? Network.MAINNET : Network.TESTNET
+    const network =
+      networkInfo.name.toLowerCase() === "mainnet" ? Network.MAINNET : Network.TESTNET
     const config = new AptosConfig({ fullnode: networkInfo.url, network })
+
+    // Get the connected account; this may require calling a dedicated method
+    const account = await parameters.transport.getAccount?.() ||
+      // Or retrieve from your store if you already connected:
+      { address: /* your stored account address */ "" }
+
+    if (!account.address) {
+      throw new Error("No account address found from the wallet")
+    }
+
+    // Create a signer by merging the wallet's methods with the account address.
+    const signer = Object.assign({}, parameters.transport, {
+      accountAddress: account.address
+    }) as AptosBrowserWallet
+
     return {
       authAccess: "wallet",
       aptos: new Aptos(config),
-      signer: parameters.transport as AptosBrowserWallet
+      signer: signer
     }
   }
+
   throw new Error("Invalid Aptos transport")
 }
 
@@ -105,7 +135,18 @@ export const createAptosClient = (clientParameters: AptosClientParameters) => {
     .extend(_ => ({
       // A helper to get the underlying Aptos client.
       // We default to "key" if an account was provided.
-      getAptosClient: async () => await getAptosClient({ ...clientParameters, authAccess: "key" })
+      getAptosClient: async () => {
+        console.info("clientParameters", clientParameters)
+        console.info("getAptosClient", getAptosClient)
+        // const authAccess = clientParameters.account ? "key" : "wallet"
+      
+        // return await getAptosClient({ ...clientParameters, authAccess })
+        if (clientParameters.account) {
+          return await getAptosClient({ ...clientParameters, authAccess: "key" })
+        } else {
+          return await getAptosClient({ ...clientParameters, authAccess: "wallet" })
+        }
+      }
       // clientParameters.account
       //   ? await getAptosClient({ ...clientParameters, authAccess: "key" })
       //   : await getAptosClient({ ...clientParameters, authAccess: "wallet" })