Merge pull request #1289 from Shelf-nu/fix-bug-rendering-team-users-page

fix: bug rendering team users page
Shelf-nu · Aug 30, 2024 · 8bfcf75 · 8bfcf75
2 parents ac75876 + 74220fb
commit 8bfcf75
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/modules/settings/service.server.ts b/app/modules/settings/service.server.ts
@@ -164,7 +164,7 @@ export async function getPaginatedAndFilterableSettingUsers({
         role: organizationRolesMap[um.roles[0]],
         userId: um.user.id,
         sso: um.user.sso,
-        custodies: um.user.teamMembers[0]._count.custodies,
+        custodies: um?.user?.teamMembers?.[0]?._count?.custodies || 0,
       }));
 
     /**

diff --git a/app/routes/_layout+/admin-dashboard+/$userId.tsx b/app/routes/_layout+/admin-dashboard+/$userId.tsx
@@ -6,7 +6,7 @@ import {
   type CustomTierLimit,
 } from "@prisma/client";
 import type { ActionFunctionArgs, LoaderFunctionArgs } from "@remix-run/node";
-import { json, redirect } from "@remix-run/node";
+import { json } from "@remix-run/node";
 import { useLoaderData, Link, useFetcher } from "@remix-run/react";
 
 import { z } from "zod";