Refactor: Improve Solana wallet data handling and typing

Co-authored-by: prithvish <[email protected]>

Author: cursoragent

apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/page.tsx

@@ -89,12 +89,11 @@ export default async function TransactionsAnalyticsPage(props: {
         managementAccessToken,
         page: solanCurrentPage,
         limit: pageSize,
+        projectId: project.id,
       })
     : { data: { items: [], totalRecords: 0 }, error: null, success: true };
 
-  const solanaWallets = solanaAccounts.data?.items as
-    | SolanaWallet[]
-    | undefined;
+  const solanaWallets = solanaAccounts.data?.items;
 
   const initialData = await getTransactionAnalyticsSummary({
     clientId: project.publishableKey,
@@ -202,7 +201,7 @@ export default async function TransactionsAnalyticsPage(props: {
             teamSlug={params.team_slug}
             totalPages={Math.ceil(solanaAccounts.data.totalRecords / pageSize)}
             totalRecords={solanaAccounts.data.totalRecords}
-            wallets={solanaAccounts.data.items as SolanaWallet[]}
+            wallets={solanaAccounts.data.items}
           />
         )}
       </div>

apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/solana-wallets/lib/vault.client.ts

@@ -2,8 +2,9 @@
 
 import type { Project } from "@/api/project/projects";
 import { NEXT_PUBLIC_THIRDWEB_VAULT_URL } from "@/constants/public-envs";
+import type { SolanaWallet } from "../wallet-table/types";
 
-interface SolanaAccount {
+interface SolanaAccountResponse {
   publicKey: string;
   label: string;
   createdAt: string;
@@ -12,7 +13,7 @@ interface SolanaAccount {
 
 interface ListSolanaAccountsResponse {
   result: {
-    accounts: SolanaAccount[];
+    accounts: SolanaAccountResponse[];
     pagination: {
       totalCount: number;
       page: number;
@@ -25,15 +26,16 @@ export async function listSolanaAccounts(params: {
   managementAccessToken: string;
   page?: number;
   limit?: number;
+  projectId?: string;
 }): Promise<{
   data: {
-    items: SolanaAccount[];
+    items: SolanaWallet[];
     totalRecords: number;
   };
   error: Error | null;
   success: boolean;
 }> {
-  const { managementAccessToken, page = 1, limit = 100 } = params;
+  const { managementAccessToken, page = 1, limit = 100, projectId } = params;
 
   try {
     const url = new URL(`/v1/solana/accounts`, NEXT_PUBLIC_THIRDWEB_VAULT_URL);
@@ -55,9 +57,24 @@ export async function listSolanaAccounts(params: {
 
     const data = (await response.json()) as ListSolanaAccountsResponse;
 
+    // Transform the response to match SolanaWallet type
+    const wallets: SolanaWallet[] = data.result.accounts.map(
+      (account, index) => ({
+        id: `${account.publicKey}-${index}`, // Generate ID from publicKey
+        publicKey: account.publicKey,
+        metadata: {
+          type: "solana-wallet",
+          projectId: projectId || "",
+          label: account.label,
+        },
+        createdAt: account.createdAt,
+        updatedAt: account.updatedAt,
+      }),
+    );
+
     return {
       data: {
-        items: data.result.accounts,
+        items: wallets,
         totalRecords: data.result.pagination.totalCount,
       },
       error: null,
@@ -79,7 +96,7 @@ export async function createSolanaAccount(params: {
   managementAccessToken: string;
   label: string;
 }): Promise<{
-  data: SolanaAccount | null;
+  data: SolanaAccountResponse | null;
   error: Error | null;
   success: boolean;
 }> {
@@ -103,7 +120,7 @@ export async function createSolanaAccount(params: {
       );
     }
 
-    const data = (await response.json()) as { result: SolanaAccount };
+    const data = (await response.json()) as { result: SolanaAccountResponse };
 
     return {
       data: data.result,

apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/solana-wallets/wallet-table/wallet-table-ui.client.tsx

@@ -230,9 +230,8 @@ function SolanaWalletTableRow(props: {
   // Get the project Solana wallet public key
   const engineCloudService = project.services.find(
     (service: { name: string }) => service.name === "engineCloud",
-  );
-  const defaultWalletPublicKey =
-    engineCloudService?.projectSolanaWalletPublicKey;
+  ) as { projectSolanaWalletPublicKey?: string } | undefined;
+  const defaultWalletPublicKey = engineCloudService?.projectSolanaWalletPublicKey;
   const isDefaultWallet =
     defaultWalletPublicKey &&
     wallet.publicKey.toLowerCase() === defaultWalletPublicKey.toLowerCase();