From 0461b5a764f8919392dd226f812220d05bd6ae5e Mon Sep 17 00:00:00 2001
From: Fred KISSIE <fredkiss3@gmail.com>
Date: Mon, 23 Mar 2026 21:09:49 +0100
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20finish=20users=20table?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/[orgId]/settings/access/users/page.tsx | 9 ++++++++-
 src/components/UsersTable.tsx                  | 5 ++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/app/[orgId]/settings/access/users/page.tsx b/src/app/[orgId]/settings/access/users/page.tsx
index 5297e747e..d44082b13 100644
--- a/src/app/[orgId]/settings/access/users/page.tsx
+++ b/src/app/[orgId]/settings/access/users/page.tsx
@@ -107,7 +107,14 @@ export default async function UsersPage(props: UsersPageProps) {
             />
             <UserProvider user={user!}>
                 <OrgProvider org={org}>
-                    <UsersTable users={userRows} />
+                    <UsersTable
+                        users={userRows}
+                        rowCount={pagination.total}
+                        pagination={{
+                            pageIndex: pagination.page - 1,
+                            pageSize: pagination.pageSize
+                        }}
+                    />
                 </OrgProvider>
             </UserProvider>
         </>
diff --git a/src/components/UsersTable.tsx b/src/components/UsersTable.tsx
index c6a02ab69..ee376f8ba 100644
--- a/src/components/UsersTable.tsx
+++ b/src/components/UsersTable.tsx
@@ -68,12 +68,11 @@ export default function UsersTable({
     const [selectedUser, setSelectedUser] = useState<UserRow | null>(null);
     const router = useRouter();
     const api = createApiClient(useEnvContext());
-    const { user, updateUser } = useUserContext();
+    const { user } = useUserContext();
     const { org } = useOrgContext();
     const t = useTranslations();
     const [isNavigatingToAddPage, startNavigation] = useTransition();
     const [isRefreshing, startTransition] = useTransition();
-    const pathname = usePathname();
     const {
         navigate: filter,
         isNavigating: isFiltering,
@@ -332,7 +331,7 @@ export default function UsersTable({
                     );
                 }}
                 onRefresh={refreshData}
-                isRefreshing={isRefreshing}
+                isRefreshing={isRefreshing || isFiltering}
             />
         </>
     );