From de165c7456a1c1019cd46427853e32a2bf0dd2a0 Mon Sep 17 00:00:00 2001
From: Aman Harwara <amanharwara@protonmail.com>
Date: Thu, 31 Aug 2023 21:10:34 +0530
Subject: [PATCH] chore: fix vault invite sender contact

---
 .../src/Domain/Contacts/ContactService.ts         |  4 ++++
 .../Domain/Contacts/ContactServiceInterface.ts    |  1 +
 .../Panes/Vaults/Invites/InviteItem.tsx           | 15 ++++++++-------
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/packages/services/src/Domain/Contacts/ContactService.ts b/packages/services/src/Domain/Contacts/ContactService.ts
index bbe15ab56..42d66585d 100644
--- a/packages/services/src/Domain/Contacts/ContactService.ts
+++ b/packages/services/src/Domain/Contacts/ContactService.ts
@@ -202,6 +202,10 @@ export class ContactService extends AbstractService<ContactServiceEvent> impleme
     return this.findContact(invite.user_uuid)
   }
 
+  findSenderContactForInvite(invite: SharedVaultInviteServerHash): TrustedContactInterface | undefined {
+    return this.findContact(invite.sender_uuid)
+  }
+
   getCollaborationIDForTrustedContact(contact: TrustedContactInterface): string {
     return this.buildCollaborationId({
       version: Version1CollaborationId,
diff --git a/packages/services/src/Domain/Contacts/ContactServiceInterface.ts b/packages/services/src/Domain/Contacts/ContactServiceInterface.ts
index ab3669853..5ac47198f 100644
--- a/packages/services/src/Domain/Contacts/ContactServiceInterface.ts
+++ b/packages/services/src/Domain/Contacts/ContactServiceInterface.ts
@@ -34,6 +34,7 @@ export interface ContactServiceInterface extends AbstractService<ContactServiceE
   findContact(userUuid: string): TrustedContactInterface | undefined
   findContactForServerUser(user: SharedVaultUserServerHash): TrustedContactInterface | undefined
   findContactForInvite(invite: SharedVaultInviteServerHash): TrustedContactInterface | undefined
+  findSenderContactForInvite(invite: SharedVaultInviteServerHash): TrustedContactInterface | undefined
 
   getItemSignatureStatus(item: DecryptedItemInterface): ItemSignatureValidationResult
 }
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Vaults/Invites/InviteItem.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Vaults/Invites/InviteItem.tsx
index 77008aaf3..a4681403b 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Vaults/Invites/InviteItem.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Vaults/Invites/InviteItem.tsx
@@ -30,9 +30,10 @@ const InviteItem = ({ inviteRecord }: Props) => {
   }, [application, inviteRecord])
 
   const closeAddContactModal = () => setIsAddContactModalOpen(false)
+
   const collaborationId = application.contacts.getCollaborationIDFromInvite(inviteRecord.invite)
 
-  const trustedContact = application.contacts.findContactForInvite(inviteRecord.invite)
+  const trustedContact = application.contacts.findSenderContactForInvite(inviteRecord.invite)
 
   return (
     <>
@@ -40,9 +41,9 @@ const InviteItem = ({ inviteRecord }: Props) => {
         <EditContactModal fromInvite={inviteRecord} onCloseDialog={closeAddContactModal} />
       </ModalOverlay>
 
-      <div className="flex gap-3.5 rounded-lg px-3.5 py-2.5 border border-border shadow">
+      <div className="flex gap-3.5 rounded-lg border border-border px-3.5 py-2.5 shadow">
         <Icon type="archive" size="custom" className="mt-1.5 h-5.5 w-5.5 flex-shrink-0" />
-        <div className="flex flex-col gap-2 py-1.5 overflow-hidden">
+        <div className="flex flex-col gap-2.5 overflow-hidden py-1.5">
           <div className="mr-auto overflow-hidden text-ellipsis text-sm">Vault Name: {inviteData.metadata.name}</div>
           {inviteData.metadata.description && (
             <div className="mr-auto overflow-hidden text-ellipsis text-sm">
@@ -52,15 +53,15 @@ const InviteItem = ({ inviteRecord }: Props) => {
           {trustedContact ? (
             <div className="flex items-center gap-1">
               <span className="overflow-hidden text-ellipsis text-sm">Trusted Sender: {trustedContact.name}</span>
-              <CheckmarkCircle className="!w-4 !h-4" />
+              <CheckmarkCircle className="!h-4 !w-4" />
             </div>
           ) : (
-            <div className="mr-auto text-sm w-full whitespace-pre-wrap break-words overflow-hidden">
-              Sender CollaborationID: <span className="text-xs font-mono">{collaborationId}</span>
+            <div className="mr-auto w-full overflow-hidden whitespace-pre-wrap break-words text-sm">
+              Sender CollaborationID: <span className="font-mono text-xs">{collaborationId}</span>
             </div>
           )}
 
-          <div className="mt-1.5">
+          <div className="">
             {isTrusted ? (
               <Button label="Accept Invite" className="text-xs" onClick={acceptInvite} />
             ) : (