From 5e8eb13bcff34f23385c27b451c8f46c79fc45ca Mon Sep 17 00:00:00 2001
From: CocoByte <nicolle.leclair@gmail.com>
Date: Mon, 6 Jan 2025 18:15:05 -0700
Subject: [PATCH 1/3] Slight refactor to remove code duplication.

---
 .../assets/src/js/getgov/table-members.js     | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/registrar/assets/src/js/getgov/table-members.js b/src/registrar/assets/src/js/getgov/table-members.js
index 0b311751d..871006a48 100644
--- a/src/registrar/assets/src/js/getgov/table-members.js
+++ b/src/registrar/assets/src/js/getgov/table-members.js
@@ -417,24 +417,21 @@ export class MembersTable extends BaseTable {
    * @param {string} submit_delete_url - `${member_type}-${member_id}/delete`
    * @param {HTMLElement} wrapper_element - The element to which the modal is appended
    */
-  static addMemberModal(num_domains, member_email, submit_delete_url, id, wrapper_element) {
-    let modalHeading = '';
-    let modalDescription = '';
+  static addMemberDeleteModal(num_domains, member_email, submit_delete_url, id, wrapper_element) {
 
-    if (num_domains == 0){
+    let modalHeading = ``;
+    let modalDescription = ``;
+
+    if (num_domains >= 0){
       modalHeading = `Are you sure you want to delete ${member_email}?`;
       modalDescription = `They will no longer be able to access this organization. 
       This action cannot be undone.`;
-    } else if (num_domains == 1) {
-      modalHeading = `Are you sure you want to delete ${member_email}?`;
-      modalDescription = `<b>${member_email}</b> currently manages ${num_domains} domain in the organization.
-      Removing them from the organization will remove all of their domains. They will no longer be able to
-      access this organization. This action cannot be undone.`;
-    } else if (num_domains > 1) {
-      modalHeading = `Are you sure you want to delete ${member_email}?`;
-      modalDescription = `<b>${member_email}</b> currently manages ${num_domains} domains in the organization.
-      Removing them from the organization will remove all of their domains. They will no longer be able to
-      access this organization. This action cannot be undone.`;
+      if (num_domains >= 1)
+      {
+        modalDescription = `<b>${member_email}</b> currently manages ${num_domains} domain${num_domains > 1 ? "s": ""} in the organization.
+        Removing them from the organization will remove all of their domains. They will no longer be able to
+        access this organization. This action cannot be undone.`;
+      }
     }
 
     const modalSubmit = `

From b25f18d0054659ac921ad75c1c3f19a2b2f6bb43 Mon Sep 17 00:00:00 2001
From: CocoByte <nicolle.leclair@gmail.com>
Date: Mon, 6 Jan 2025 18:15:29 -0700
Subject: [PATCH 2/3] Corrected string

---
 src/registrar/assets/src/js/getgov/table-members.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/assets/src/js/getgov/table-members.js b/src/registrar/assets/src/js/getgov/table-members.js
index 871006a48..ced1bcd5f 100644
--- a/src/registrar/assets/src/js/getgov/table-members.js
+++ b/src/registrar/assets/src/js/getgov/table-members.js
@@ -429,7 +429,7 @@ export class MembersTable extends BaseTable {
       if (num_domains >= 1)
       {
         modalDescription = `<b>${member_email}</b> currently manages ${num_domains} domain${num_domains > 1 ? "s": ""} in the organization.
-        Removing them from the organization will remove all of their domains. They will no longer be able to
+        Removing them from the organization will remove them from all of their domains. They will no longer be able to
         access this organization. This action cannot be undone.`;
       }
     }

From b28923ddf1bc9dbd1b132c4a078bd4ffd26a9013 Mon Sep 17 00:00:00 2001
From: CocoByte <nicolle.leclair@gmail.com>
Date: Mon, 6 Jan 2025 18:17:37 -0700
Subject: [PATCH 3/3] fix

---
 src/registrar/assets/src/js/getgov/table-members.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/assets/src/js/getgov/table-members.js b/src/registrar/assets/src/js/getgov/table-members.js
index ced1bcd5f..d7348441f 100644
--- a/src/registrar/assets/src/js/getgov/table-members.js
+++ b/src/registrar/assets/src/js/getgov/table-members.js
@@ -137,7 +137,7 @@ export class MembersTable extends BaseTable {
     }
     // This easter egg is only for fixtures that dont have names as we are displaying their emails
     // All prod users will have emails linked to their account
-    if (customTableOptions.needsAdditionalColumn) MembersTable.addMemberModal(num_domains, member.email || "Samwise Gamgee", member_delete_url, unique_id, row);
+    if (customTableOptions.needsAdditionalColumn) MembersTable.addMemberDeleteModal(num_domains, member.email || "Samwise Gamgee", member_delete_url, unique_id, row);
   }
 
   /**