From f9472d753d9cc6409c97003aeb4b598ee2923214 Mon Sep 17 00:00:00 2001
From: = <akhilmhdh@gmail.com>
Date: Wed, 8 Oct 2025 00:52:20 +0530
Subject: [PATCH] feat: more fixes

---
 .../project-membership-dal.ts                 | 21 ++-----------------
 .../MembersTab/components/AddMemberModal.tsx  |  8 +++----
 2 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/backend/src/services/project-membership/project-membership-dal.ts b/backend/src/services/project-membership/project-membership-dal.ts
index 6b1f192e7..693c08af7 100644
--- a/backend/src/services/project-membership/project-membership-dal.ts
+++ b/backend/src/services/project-membership/project-membership-dal.ts
@@ -224,11 +224,6 @@ export const projectMembershipDALFactory = (db: TDbClient) => {
         .join(TableName.Users, `${TableName.Membership}.actorUserId`, `${TableName.Users}.id`)
         .where(`${TableName.Users}.id`, userId)
         .where(`${TableName.Project}.orgId`, orgId)
-        .join<TUserEncryptionKeys>(
-          TableName.UserEncryptionKey,
-          `${TableName.UserEncryptionKey}.userId`,
-          `${TableName.Users}.id`
-        )
         .join(TableName.MembershipRole, `${TableName.MembershipRole}.membershipId`, `${TableName.Membership}.id`)
         .leftJoin(TableName.Role, `${TableName.MembershipRole}.customRoleId`, `${TableName.Role}.id`)
         .select(
@@ -236,7 +231,6 @@ export const projectMembershipDALFactory = (db: TDbClient) => {
           db.ref("isGhost").withSchema(TableName.Users),
           db.ref("username").withSchema(TableName.Users),
           db.ref("email").withSchema(TableName.Users),
-          db.ref("publicKey").withSchema(TableName.UserEncryptionKey),
           db.ref("firstName").withSchema(TableName.Users),
           db.ref("lastName").withSchema(TableName.Users),
           db.ref("id").withSchema(TableName.Users).as("userId"),
@@ -258,22 +252,11 @@ export const projectMembershipDALFactory = (db: TDbClient) => {
 
       const members = sqlNestRelationships({
         data: docs,
-        parentMapper: ({
-          email,
-          firstName,
-          username,
-          lastName,
-          publicKey,
-          isGhost,
-          id,
-          projectId,
-          projectName,
-          projectType
-        }) => ({
+        parentMapper: ({ email, firstName, username, lastName, isGhost, id, projectId, projectName, projectType }) => ({
           id,
           userId,
           projectId,
-          user: { email, username, firstName, lastName, id: userId, publicKey, isGhost },
+          user: { email, username, firstName, lastName, id: userId, isGhost, publicKey: "" },
           project: {
             id: projectId,
             name: projectName,
diff --git a/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/AddMemberModal.tsx b/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/AddMemberModal.tsx
index cd9d76779..3477440fe 100644
--- a/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/AddMemberModal.tsx
+++ b/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/AddMemberModal.tsx
@@ -121,14 +121,14 @@ export const AddMemberModal = ({ popUp, handlePopUpToggle }: Props) => {
           .map((member) => {
             if (!member) return null;
 
-            if (member.user.email) {
-              return member.user.email;
-            }
-
             if (member.user.username) {
               return member.user.username;
             }
 
+            if (member.user.email) {
+              return member.user.email;
+            }
+
             return null;
           })
           .filter(Boolean) as string[];