Add teamId support for embedded wallet user queries

Co-authored-by: joaquim.verges <[email protected]>

Author: cursoragent

apps/dashboard/src/@/hooks/useEmbeddedWallets.ts

@@ -8,11 +8,13 @@ const fetchAccountList = ({
   jwt,
   clientId,
   ecosystemSlug,
+  teamId,
   pageNumber,
 }: {
   jwt: string;
   clientId?: string;
   ecosystemSlug?: string;
+  teamId: string;
   pageNumber: number;
 }) => {
   return async () => {
@@ -31,6 +33,7 @@ const fetchAccountList = ({
       headers: {
         Authorization: `Bearer ${jwt}`,
         "Content-Type": "application/json",
+        "x-team-id": teamId,
         ...(clientId && { "x-client-id": clientId }),
       },
       method: "GET",
@@ -49,17 +52,19 @@ const fetchAccountList = ({
 export function useEmbeddedWallets(params: {
   clientId?: string;
   ecosystemSlug?: string;
+  teamId: string;
   page: number;
   authToken: string;
 }) {
-  const { clientId, ecosystemSlug, page, authToken } = params;
+  const { clientId, ecosystemSlug, teamId, page, authToken } = params;
   const address = useActiveAccount()?.address;
 
   return useQuery({
     enabled: !!address && !!(clientId || ecosystemSlug),
     queryFn: fetchAccountList({
       clientId,
       ecosystemSlug,
+      teamId,
       jwt: authToken,
       pageNumber: page,
     }),
@@ -78,7 +83,7 @@ export function useAllEmbeddedWallets(params: { authToken: string }) {
   const address = useActiveAccount()?.address;
 
   return useMutation({
-    mutationFn: async ({ clientId, ecosystemSlug }: { clientId?: string; ecosystemSlug?: string }) => {
+    mutationFn: async ({ clientId, ecosystemSlug, teamId }: { clientId?: string; ecosystemSlug?: string; teamId: string }) => {
       const responses: WalletUser[] = [];
       let page = 1;
 
@@ -89,6 +94,7 @@ export function useAllEmbeddedWallets(params: { authToken: string }) {
           queryFn: fetchAccountList({
             clientId,
             ecosystemSlug,
+            teamId,
             jwt: authToken,
             pageNumber: page,
           }),

apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/users/page.tsx

@@ -36,6 +36,7 @@ export default async function EcosystemUsersPage(props: {
       authToken={authToken}
       client={client}
       ecosystemSlug={ecosystem.slug}
+      teamId={team.id}
     />
   );
 }

apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/wallets/users/components/index.tsx

@@ -41,6 +41,7 @@ const columnHelper = createColumnHelper<WalletUser>();
 export function InAppWalletUsersPageContent(props: {
   authToken: string;
   client: ThirdwebClient;
+  teamId: string;
 } & (
   | { projectClientId: string; ecosystemSlug?: never }
   | { ecosystemSlug: string; projectClientId?: never }
@@ -122,6 +123,7 @@ export function InAppWalletUsersPageContent(props: {
     authToken: props.authToken,
     clientId: props.projectClientId,
     ecosystemSlug: props.ecosystemSlug,
+    teamId: props.teamId,
     page: activePage,
   });
   const wallets = walletsQuery?.data?.users || [];
@@ -137,6 +139,7 @@ export function InAppWalletUsersPageContent(props: {
         props.authToken,
         props.projectClientId,
         props.ecosystemSlug,
+        props.teamId,
         searchType,
         query
       );
@@ -163,6 +166,7 @@ export function InAppWalletUsersPageContent(props: {
     const usersWallets = await getAllEmbeddedWallets({
       clientId: props.projectClientId,
       ecosystemSlug: props.ecosystemSlug,
+      teamId: props.teamId,
     });
     const csv = Papa.unparse(
       usersWallets.map((row) => {

apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/wallets/users/components/searchUsers.ts

@@ -6,6 +6,7 @@ export async function searchUsers(
   authToken: string,
   clientId: string | undefined,
   ecosystemSlug: string | undefined,
+  teamId: string,
   searchType: SearchType,
   query: string,
 ): Promise<WalletUser[]> {
@@ -38,6 +39,7 @@ export async function searchUsers(
     headers: {
       Authorization: `Bearer ${authToken}`,
       "Content-Type": "application/json",
+      "x-team-id": teamId,
       ...(clientId && { "x-client-id": clientId }),
     },
     method: "GET",

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

@@ -34,6 +34,7 @@ export default async function Page(props: {
       authToken={authToken}
       client={client}
       projectClientId={project.publishableKey}
+      teamId={project.teamId}
     />
   );
 }