From f5f2f381e9f0eb2650425bf25c3d9c11dacf9afa Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Thu, 5 Sep 2024 01:17:23 +0530
Subject: [PATCH 1/4] fix: Invite Member page ui fixes

---
 .../src/components/Settings/InviteMemberPage.vue   | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/Settings/InviteMemberPage.vue b/frontend/src/components/Settings/InviteMemberPage.vue
index 8914ea76..17135012 100644
--- a/frontend/src/components/Settings/InviteMemberPage.vue
+++ b/frontend/src/components/Settings/InviteMemberPage.vue
@@ -4,6 +4,9 @@
       {{ __('Send Invites To') }}
     </h2>
     <div class="flex-1 overflow-y-auto">
+      <label class="block text-xs text-gray-600 mb-1.5">
+        {{ __('Invite by email') }}
+      </label>
       <MultiValueInput
         v-model="invitees"
         :validate="validateEmail"
@@ -26,17 +29,17 @@
       <ErrorMessage class="mt-2" v-if="error" :message="error" />
       <template v-if="pendingInvitations.data?.length && !invitees.length">
         <div
-          class="mt-4 flex items-center justify-between border-b py-2 text-base text-gray-600"
+          class="mt-6 flex items-center justify-between py-4 text-base font-semibold"
         >
-          <div class="w-4/5">{{ __('Pending Invites') }}</div>
+          <div>{{ __('Pending Invites') }}</div>
         </div>
-        <ul class="divide-y overflow-auto">
+        <ul class="flex flex-col gap-1">
           <li
-            class="flex items-center justify-between py-2"
+            class="flex items-center justify-between px-2 py-1 rounded-lg bg-gray-50"
             v-for="user in pendingInvitations.data"
             :key="user.name"
           >
-            <div class="w-4/5 text-base">
+            <div class="text-base">
               <span class="text-gray-900">
                 {{ user.email }}
               </span>
@@ -46,6 +49,7 @@
               <Tooltip text="Delete Invitation">
                 <Button
                   icon="x"
+                  variant="ghost"
                   :loading="
                     pendingInvitations.delete.loading &&
                     pendingInvitations.delete.params.name === user.name

From 3ef9258b29bc4fbb8a849c798bed03c74c7bcf9e Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Thu, 5 Sep 2024 01:27:14 +0530
Subject: [PATCH 2/4] fix: Removed subject & fixed line height

---
 frontend/src/components/Activities/EmailArea.vue | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/Activities/EmailArea.vue b/frontend/src/components/Activities/EmailArea.vue
index 55bdc946..37fb8a6c 100644
--- a/frontend/src/components/Activities/EmailArea.vue
+++ b/frontend/src/components/Activities/EmailArea.vue
@@ -51,7 +51,8 @@
         </div>
       </div>
     </div>
-    <div class="flex flex-col gap-1 text-base text-gray-800">
+    <div class="flex flex-col gap-1 text-base leading-5 text-gray-800">
+      <div>{{ activity.data.subject }}</div>
       <div>
         <span class="mr-1 text-gray-600"> {{ __('To') }}: </span>
         <span>{{ activity.data.recipients }}</span>
@@ -66,12 +67,8 @@
         </span>
         <span v-if="activity.data.bcc">{{ activity.data.bcc }}</span>
       </div>
-      <div>
-        <span class="mr-1 text-gray-600"> {{ __('Subject') }}: </span>
-        <span>{{ activity.data.subject }}</span>
-      </div>
     </div>
-    <div class="border-0 border-t my-3.5 border-gray-200" />
+    <div class="border-0 border-t mt-3 mb-1 border-gray-200" />
     <EmailContent :content="activity.data.content" />
     <div v-if="activity.data?.attachments?.length" class="flex flex-wrap gap-2">
       <AttachmentItem

From ff68bacd9fb39ef335d2b09dd44e4ffe990f1a54 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Thu, 5 Sep 2024 01:42:27 +0530
Subject: [PATCH 3/4] fix: keep same subject on reply or reply all

---
 frontend/src/components/Activities/EmailArea.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frontend/src/components/Activities/EmailArea.vue b/frontend/src/components/Activities/EmailArea.vue
index 37fb8a6c..d42db18c 100644
--- a/frontend/src/components/Activities/EmailArea.vue
+++ b/frontend/src/components/Activities/EmailArea.vue
@@ -105,6 +105,8 @@ function reply(email, reply_all = false) {
 
   if (!email.subject.startsWith('Re:')) {
     editor.subject = `Re: ${email.subject}`
+  } else {
+    editor.subject = email.subject
   }
 
   if (reply_all) {

From 76ceada850d5d49b3a4b51307005964dddd18501 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 6 Sep 2024 11:45:24 +0530
Subject: [PATCH 4/4] fix: Set as primary option is visible for primary contact

---
 frontend/src/pages/Deal.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/pages/Deal.vue b/frontend/src/pages/Deal.vue
index a4032085..5743a818 100644
--- a/frontend/src/pages/Deal.vue
+++ b/frontend/src/pages/Deal.vue
@@ -212,7 +212,7 @@
                             />
                           </div>
                           <div class="flex items-center">
-                            <Dropdown :options="contactOptions(contact.name)">
+                            <Dropdown :options="contactOptions(contact)">
                               <Button
                                 icon="more-horizontal"
                                 class="text-gray-600"
@@ -567,9 +567,9 @@ const _contact = ref({})
 function contactOptions(contact) {
   let options = [
     {
-      label: __('Delete'),
+      label: __('Remove'),
       icon: 'trash-2',
-      onClick: () => removeContact(contact),
+      onClick: () => removeContact(contact.name),
     },
   ]