From 2484c2147af4fc56b081fa7f2f6ae85d8e17dbd8 Mon Sep 17 00:00:00 2001
From: Aman Harwara <amanharwara@protonmail.com>
Date: Tue, 8 Aug 2023 01:08:54 +0530
Subject: [PATCH] chore: vaults ui improvements

---
 .../Panes/Vaults/Contacts/ContactItem.tsx      |  2 +-
 .../Panes/Vaults/Vaults/VaultItem.tsx          | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Vaults/Contacts/ContactItem.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Vaults/Contacts/ContactItem.tsx
index d26ffe019..1b2620575 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Vaults/Contacts/ContactItem.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Vaults/Contacts/ContactItem.tsx
@@ -44,7 +44,7 @@ const ContactItem = ({ contact }: Props) => {
 
           <div className="mt-2.5 flex flex-row">
             <Button label="Edit" className={'mr-3 text-xs'} onClick={() => setIsContactModalOpen(true)} />
-            <Button label="Delete" className={'mr-3 text-xs'} onClick={deleteContact} />
+            {!contact.isMe && <Button label="Delete" className={'mr-3 text-xs'} onClick={deleteContact} />}
           </div>
         </div>
       </div>
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Vaults/Vaults/VaultItem.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Vaults/Vaults/VaultItem.tsx
index 62ae84063..0b82a43a8 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Vaults/Vaults/VaultItem.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Vaults/Vaults/VaultItem.tsx
@@ -109,29 +109,29 @@ const VaultItem = ({ vault }: Props) => {
 
       <div className="flex flex-row gap-3.5 rounded-lg px-3.5 py-2.5 border border-border shadow">
         <Icon type="safe-square" size="custom" className="mt-2.5 h-5.5 w-5.5 flex-shrink-0" />
-        <div className="flex flex-col gap-2 py-1.5">
+        <div className="flex flex-col gap-1.5 py-1.5">
           <span className="mr-auto overflow-hidden text-ellipsis text-base font-bold">{vault.name}</span>
-          <span className="mr-auto overflow-hidden text-ellipsis text-sm">{vault.description}</span>
+          {vault.description && (
+            <span className="mr-auto overflow-hidden text-ellipsis text-sm">{vault.description}</span>
+          )}
           <span className="mr-auto overflow-hidden text-ellipsis text-sm">Vault ID: {vault.systemIdentifier}</span>
 
           <div className="mt-2 flex w-full flex-row justify-between">
             <div className="flex flex-row">
-              <Button label="Edit" className={'mr-3 text-xs'} onClick={openEditModal} />
-              {isAdmin && (
-                <Button colorStyle="danger" label="Delete" className={'mr-3 text-xs'} onClick={deleteVault} />
-              )}
+              <Button label="Edit" className="mr-3 text-xs" onClick={openEditModal} />
+              {isAdmin && <Button colorStyle="danger" label="Delete" className="mr-3 text-xs" onClick={deleteVault} />}
               {!isAdmin && vault.isSharedVaultListing() && (
-                <Button label="Leave Vault" className={'mr-3 text-xs'} onClick={leaveVault} />
+                <Button label="Leave Vault" className="mr-3 text-xs" onClick={leaveVault} />
               )}
             </div>
             <div className="flex flex-row">
               {vault.isSharedVaultListing() ? (
-                <Button label="Invite Contacts" className={'mr-3 text-xs'} onClick={openInviteModal} />
+                <Button label="Invite Contacts" className="mr-3 text-xs" onClick={openInviteModal} />
               ) : (
                 <Button
                   colorStyle="info"
                   label="Enable Collaboration"
-                  className={'mr-3 text-xs'}
+                  className="mr-3 text-xs"
                   onClick={convertToSharedVault}
                 />
               )}