From 469a361feb9c57dee96524d0f293c7bdc2f39593 Mon Sep 17 00:00:00 2001
From: im-vedant <194vedantgutpa@gmail.com>
Date: Sun, 22 Dec 2024 01:32:53 +0530
Subject: [PATCH 01/28] feat: add script to check for code coverage disable
 statements

---
 .../workflows/code_coverage_disable_check.py  | 122 ++++++++++++++++++
 1 file changed, 122 insertions(+)
 create mode 100644 .github/workflows/code_coverage_disable_check.py

diff --git a/.github/workflows/code_coverage_disable_check.py b/.github/workflows/code_coverage_disable_check.py
new file mode 100644
index 0000000000..0c3541d2d6
--- /dev/null
+++ b/.github/workflows/code_coverage_disable_check.py
@@ -0,0 +1,122 @@
+"""Code Coverage Disable Checker Script.
+
+Methodology:
+
+    Recursively analyzes TypeScript files in the specified directories to ensure
+    they do not contain code coverage disable statements.
+
+    This script enforces proper code coverage practices in the project.
+
+NOTE:
+
+    This script complies with our python3 coding and documentation standards.
+    It complies with:
+
+        1) Pylint
+        2) Pydocstyle
+        3) Pycodestyle
+        4) Flake8
+
+"""
+
+import os
+import re
+import argparse
+import sys
+
+def has_code_coverage_disable(file_path):
+    """
+    Check if a TypeScript file contains code coverage disable statements.
+
+    Args:
+        file_path (str): Path to the TypeScript file.
+
+    Returns:
+        bool: True if code coverage disable statement is found, False otherwise.
+    """
+    code_coverage_disable_pattern = re.compile(r'(?://\s*istanbul\s+ignore(?:-next-line|-line)?|/\*\s*istanbul\s+ignore\s*(?:next|-line)\s*\*/)', re.IGNORECASE)
+    
+    try:
+        with open(file_path, 'r', encoding='utf-8') as file:
+            content = file.read()
+            return bool(code_coverage_disable_pattern.search(content))
+    except Exception as e:
+        print(f"Error reading file {file_path}: {e}")
+        return False
+
+def check_code_coverage(directories):
+    """
+    Recursively check TypeScript files for code coverage disable statements.
+
+    Args:
+        directories (list) : List of directories.
+
+    Returns:
+        bool: True if code coverage disable statement is found, False otherwise.
+    """
+    code_coverage_found = False
+
+    for directory in directories:
+        if not os.path.exists(directory):
+            print(f"Error: The specified directory '{directory}' does not exist.")
+            sys.exit(1)
+        for root, dirs, files in os.walk(directory):
+            for file_name in files:
+                if file_name.endswith('.tsx') and not file_name.endswith('.test.tsx'):
+                    file_path = os.path.join(root, file_name)
+                    if has_code_coverage_disable(file_path):
+                        print(f'File {file_path} contains code coverage disable statement.')
+                        code_coverage_found = True
+
+        setup_path = os.path.join(directory, 'setup.ts')
+        if os.path.exists(setup_path) and has_code_coverage_disable(setup_path):
+            print(f'Setup file {setup_path} contains code coverage disable statement.')
+            code_coverage_found = True
+
+    return code_coverage_found
+
+def arg_parser_resolver():
+    """Resolve the CLI arguments provided by the user.
+
+    Returns:
+        result: Parsed argument object
+    """
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        "--directory",
+        type=str,
+        nargs='+',
+        default=[os.getcwd()],
+        help="One or more directories to check for code coverage disable statements (default: current directory)."
+    )
+    return parser.parse_args()
+
+def main():
+    """
+    Execute the script's main functionality.
+
+    This function serves as the entry point for the script. It performs
+    the following tasks:
+    1. Validates and retrieves the directory to check from
+       command line arguments.
+    2. Recursively checks TypeScript files for code coverage disable statements.
+    3. Provides informative messages based on the analysis.
+    4. Exits with an error if code coverage disable statements are found.
+
+    Raises:
+        SystemExit: If an error occurs during execution.
+    """
+    args = arg_parser_resolver()
+    print("Directories to check: ", args.directory)
+    
+    # Check code coverage in the specified directory
+    code_coverage_found = check_code_coverage(args.directory)
+
+    if code_coverage_found:
+        print("Code coverage disable check failed. Exiting with error.")
+        sys.exit(1)
+
+    print("Code coverage disable check completed successfully.")
+
+if __name__ == "__main__":
+    main()

From cea12f105d36d56ab1e211d04ccd781e042436f9 Mon Sep 17 00:00:00 2001
From: im-vedant <194vedantgutpa@gmail.com>
Date: Sun, 22 Dec 2024 01:39:52 +0530
Subject: [PATCH 02/28] Add code coverage disable check to GitHub workflows

---
 .github/workflows/pull-request.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index fb6505324e..9bbd31d31d 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -187,6 +187,22 @@ jobs:
         run: |
           python .github/workflows/eslint_disable_check.py
 
+  Check-Code-Coverage-Disable:
+    name: Check for code coverage disable
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.9
+      
+      - name: Run Python script
+        run: |
+          python .github/workflows/code_coverage_disable_check.py
+
   Test-Application:
     name: Test Application
     runs-on: ubuntu-latest

From 6e68380f35e64d374bc3eb9907890817501d2a5e Mon Sep 17 00:00:00 2001
From: im-vedant <194vedantgutpa@gmail.com>
Date: Mon, 23 Dec 2024 01:37:45 +0530
Subject: [PATCH 03/28] Formatted code_coverage_disable_check.py to comply with
 all coding and documentation standards.

---
 .../workflows/code_coverage_disable_check.py  | 75 +++++++++++++------
 1 file changed, 54 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/code_coverage_disable_check.py b/.github/workflows/code_coverage_disable_check.py
index 0c3541d2d6..1cbbdfad44 100644
--- a/.github/workflows/code_coverage_disable_check.py
+++ b/.github/workflows/code_coverage_disable_check.py
@@ -2,13 +2,12 @@
 
 Methodology:
 
-    Recursively analyzes TypeScript files in the specified directories to ensure
-    they do not contain code coverage disable statements.
+    Recursively analyzes TypeScript files in the specified directories to
+    ensure they do not contain code coverage disable statements.
 
     This script enforces proper code coverage practices in the project.
 
 NOTE:
-
     This script complies with our python3 coding and documentation standards.
     It complies with:
 
@@ -16,6 +15,7 @@
         2) Pydocstyle
         3) Pycodestyle
         4) Flake8
+        5) Python Black
 
 """
 
@@ -24,6 +24,7 @@
 import argparse
 import sys
 
+
 def has_code_coverage_disable(file_path):
     """
     Check if a TypeScript file contains code coverage disable statements.
@@ -32,18 +33,30 @@ def has_code_coverage_disable(file_path):
         file_path (str): Path to the TypeScript file.
 
     Returns:
-        bool: True if code coverage disable statement is found, False otherwise.
+        bool: True if code coverage disable statement is found, False
+        otherwise.
     """
-    code_coverage_disable_pattern = re.compile(r'(?://\s*istanbul\s+ignore(?:-next-line|-line)?|/\*\s*istanbul\s+ignore\s*(?:next|-line)\s*\*/)', re.IGNORECASE)
-    
+    code_coverage_disable_pattern = re.compile(
+        r"""(?://\s*istanbul\s+ignore(?:-next-line|-line)?
+        |/\*\s*istanbul\s+ignore\s*(?:next|-line)\s*\*/)""",
+        re.IGNORECASE,
+    )
+
     try:
-        with open(file_path, 'r', encoding='utf-8') as file:
+        with open(file_path, "r", encoding="utf-8") as file:
             content = file.read()
             return bool(code_coverage_disable_pattern.search(content))
-    except Exception as e:
+    except FileNotFoundError:
+        print(f"File not found: {file_path}")
+        return False
+    except PermissionError:
+        print(f"Permission denied: {file_path}")
+        return False
+    except (IOError, OSError) as e:
         print(f"Error reading file {file_path}: {e}")
         return False
 
+
 def check_code_coverage(directories):
     """
     Recursively check TypeScript files for code coverage disable statements.
@@ -52,29 +65,46 @@ def check_code_coverage(directories):
         directories (list) : List of directories.
 
     Returns:
-        bool: True if code coverage disable statement is found, False otherwise.
+        bool: True if code coverage disable statement is found, False
+        otherwise.
     """
     code_coverage_found = False
 
     for directory in directories:
         if not os.path.exists(directory):
-            print(f"Error: The specified directory '{directory}' does not exist.")
+            print(
+                f"""Error: The specified directory '{directory}' does
+                not exist."""
+            )
             sys.exit(1)
-        for root, dirs, files in os.walk(directory):
+        for root, _, files in os.walk(directory):
             for file_name in files:
-                if file_name.endswith('.tsx') and not file_name.endswith('.test.tsx'):
+                if (
+                    file_name.endswith(".tsx")
+                    and not file_name.endswith(".test.tsx")
+                   ):
                     file_path = os.path.join(root, file_name)
                     if has_code_coverage_disable(file_path):
-                        print(f'File {file_path} contains code coverage disable statement.')
+                        print(
+                            f"""File {file_path} contains code coverage disable
+                            statement."""
+                        )
                         code_coverage_found = True
 
-        setup_path = os.path.join(directory, 'setup.ts')
-        if os.path.exists(setup_path) and has_code_coverage_disable(setup_path):
-            print(f'Setup file {setup_path} contains code coverage disable statement.')
+        setup_path = os.path.join(directory, "setup.ts")
+        if (
+            os.path.exists(setup_path)
+            and has_code_coverage_disable(setup_path)
+           ):
+            print(
+                f"""Setup file {setup_path} contains code coverage disable
+                statement."""
+            )
             code_coverage_found = True
 
     return code_coverage_found
 
+
 def arg_parser_resolver():
     """Resolve the CLI arguments provided by the user.
 
@@ -85,12 +115,14 @@ def arg_parser_resolver():
     parser.add_argument(
         "--directory",
         type=str,
-        nargs='+',
+        nargs="+",
         default=[os.getcwd()],
-        help="One or more directories to check for code coverage disable statements (default: current directory)."
+        help="""One or more directories to check for code coverage disable
+        statements (default: current directory).""",
     )
     return parser.parse_args()
 
+
 def main():
     """
     Execute the script's main functionality.
@@ -99,7 +131,8 @@ def main():
     the following tasks:
     1. Validates and retrieves the directory to check from
        command line arguments.
-    2. Recursively checks TypeScript files for code coverage disable statements.
+    2. Recursively checks TypeScript files for code coverage disable
+    statements.
     3. Provides informative messages based on the analysis.
     4. Exits with an error if code coverage disable statements are found.
 
@@ -107,8 +140,7 @@ def main():
         SystemExit: If an error occurs during execution.
     """
     args = arg_parser_resolver()
-    print("Directories to check: ", args.directory)
-    
+
     # Check code coverage in the specified directory
     code_coverage_found = check_code_coverage(args.directory)
 
@@ -118,5 +150,6 @@ def main():
 
     print("Code coverage disable check completed successfully.")
 
+
 if __name__ == "__main__":
     main()

From 679fc49fd9d4251ff8450f28d83ef3d477790858 Mon Sep 17 00:00:00 2001
From: im-vedant <194vedantgutpa@gmail.com>
Date: Mon, 23 Dec 2024 02:18:17 +0530
Subject: [PATCH 04/28] add functionality in eslint_disable_check.py to run for
 mutliple directories

---
 .github/workflows/eslint_disable_check.py | 87 +++++++++++++++--------
 1 file changed, 58 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/eslint_disable_check.py b/.github/workflows/eslint_disable_check.py
index 201b4462b8..bc17fe3b51 100644
--- a/.github/workflows/eslint_disable_check.py
+++ b/.github/workflows/eslint_disable_check.py
@@ -4,13 +4,12 @@
 
 Methodology:
 
-    Recursively analyzes TypeScript files in the 'src' directory and its subdirectories
-    as well as 'setup.ts' files to ensure they do not contain eslint-disable statements.
+    Recursively analyzes TypeScript files in the specified directory
+    to ensure they do not contain eslint-disable statements.
 
     This script enforces code quality practices in the project.
 
 NOTE:
-
     This script complies with our python3 coding and documentation standards.
     It complies with:
 
@@ -18,6 +17,7 @@
         2) Pydocstyle
         3) Pycodestyle
         4) Flake8
+        5) Python Black
 
 """
 
@@ -26,6 +26,7 @@
 import argparse
 import sys
 
+
 def has_eslint_disable(file_path):
     """
     Check if a TypeScript file contains eslint-disable statements.
@@ -36,43 +37,71 @@ def has_eslint_disable(file_path):
     Returns:
         bool: True if eslint-disable statement is found, False otherwise.
     """
-    eslint_disable_pattern = re.compile(r'//\s*eslint-disable(?:-next-line|-line)?', re.IGNORECASE)
-    
+    eslint_disable_pattern = re.compile(
+        r"""\/\/\s*eslint-disable(?:-next-line
+        |-line)?[^\n]*|\/\*\s*eslint-disable[^\*]*\*\/""",
+        re.IGNORECASE,
+    )
+
     try:
-        with open(file_path, 'r', encoding='utf-8') as file:
+        with open(file_path, "r", encoding="utf-8") as file:
             content = file.read()
             return bool(eslint_disable_pattern.search(content))
-    except Exception as e:
+    except FileNotFoundError:
+        print(f"File not found: {file_path}")
+        return False
+    except PermissionError:
+        print(f"Permission denied: {file_path}")
+        return False
+    except (IOError, OSError) as e:
         print(f"Error reading file {file_path}: {e}")
         return False
 
-def check_eslint(directory):
+
+def check_eslint(directories):
     """
-    Recursively check TypeScript files for eslint-disable statements in the 'src' directory.
+    Recursively check TypeScript files for eslint-disable statements.
 
     Args:
-        directory (str): Path to the directory.
+        directories (list): List of directories.
 
     Returns:
         bool: True if eslint-disable statement is found, False otherwise.
     """
     eslint_found = False
 
-    for root, dirs, files in os.walk(os.path.join(directory, 'src')):
-        for file_name in files:
-            if file_name.endswith('.tsx') and not file_name.endswith('.test.tsx'):
-                file_path = os.path.join(root, file_name)
-                if has_eslint_disable(file_path):
-                    print(f'File {file_path} contains eslint-disable statement.')
-                    eslint_found = True
-
-    setup_path = os.path.join(directory, 'setup.ts')
-    if os.path.exists(setup_path) and has_eslint_disable(setup_path):
-        print(f'Setup file {setup_path} contains eslint-disable statement.')
-        eslint_found = True
+    for directory in directories:
+        if not os.path.exists(directory):
+            print(
+                f"""Error: The specified directory '{directory}' does not
+                exist."""
+            )
+            sys.exit(1)
+        for root, _, files in os.walk(directory):
+            for file_name in files:
+                if (
+                    file_name.endswith(".tsx")
+                    and not file_name.endswith(".test.tsx")
+                   ):
+                    file_path = os.path.join(root, file_name)
+                    if has_eslint_disable(file_path):
+                        print(
+                            f"""File {file_path} contains eslint-disable
+                              statement."""
+                        )
+                        eslint_found = True
+
+        setup_path = os.path.join(directory, "setup.ts")
+        if os.path.exists(setup_path) and has_eslint_disable(setup_path):
+            print(
+                f"""Setup file {setup_path} contains eslint-disable
+                statement."""
+            )
+            eslint_found = True
 
     return eslint_found
 
+
 def arg_parser_resolver():
     """Resolve the CLI arguments provided by the user.
 
@@ -83,11 +112,14 @@ def arg_parser_resolver():
     parser.add_argument(
         "--directory",
         type=str,
-        default=os.getcwd(),
-        help="Path to the directory to check (default: current directory)"
+        nargs="+",
+        default=[os.getcwd()],
+        help="""One or more directories to check for eslint disable
+        statements (default: current directory).""",
     )
     return parser.parse_args()
 
+
 def main():
     """
     Execute the script's main functionality.
@@ -104,11 +136,7 @@ def main():
         SystemExit: If an error occurs during execution.
     """
     args = arg_parser_resolver()
-
-    if not os.path.exists(args.directory):
-        print(f"Error: The specified directory '{args.directory}' does not exist.")
-        sys.exit(1)
-
+    print(f"Checking directories: {args.directory}")
     # Check eslint in the specified directory
     eslint_found = check_eslint(args.directory)
 
@@ -118,5 +146,6 @@ def main():
 
     print("ESLint-disable check completed successfully.")
 
+
 if __name__ == "__main__":
     main()

From 01c430abdeba6471902884aa30ef738d0bd13af2 Mon Sep 17 00:00:00 2001
From: im-vedant <194vedantgutpa@gmail.com>
Date: Mon, 23 Dec 2024 02:21:31 +0530
Subject: [PATCH 05/28] removed unnecessary comment

---
 .github/workflows/eslint_disable_check.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/eslint_disable_check.py b/.github/workflows/eslint_disable_check.py
index bc17fe3b51..135b3c19c2 100644
--- a/.github/workflows/eslint_disable_check.py
+++ b/.github/workflows/eslint_disable_check.py
@@ -136,7 +136,6 @@ def main():
         SystemExit: If an error occurs during execution.
     """
     args = arg_parser_resolver()
-    print(f"Checking directories: {args.directory}")
     # Check eslint in the specified directory
     eslint_found = check_eslint(args.directory)
 

From b57503625856a2e5ab57fcdad9d8d8b690c91960 Mon Sep 17 00:00:00 2001
From: im-vedant <194vedantgutpa@gmail.com>
Date: Mon, 23 Dec 2024 04:45:32 +0530
Subject: [PATCH 06/28] excluded node_modules from eslint disable check

---
 .github/workflows/eslint_disable_check.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/eslint_disable_check.py b/.github/workflows/eslint_disable_check.py
index 135b3c19c2..78351d88d7 100644
--- a/.github/workflows/eslint_disable_check.py
+++ b/.github/workflows/eslint_disable_check.py
@@ -78,6 +78,8 @@ def check_eslint(directories):
             )
             sys.exit(1)
         for root, _, files in os.walk(directory):
+            if "node_modules" in root:
+                continue
             for file_name in files:
                 if (
                     file_name.endswith(".tsx")

From 62d423246c5820807ce23c170f386b22875b70fc Mon Sep 17 00:00:00 2001
From: im-vedant <194vedantgutpa@gmail.com>
Date: Wed, 25 Dec 2024 01:28:50 +0530
Subject: [PATCH 07/28] removed all eslint disable statements and code coverage
 disable statements

---
 .../AddOn/core/AddOnStore/AddOnStore.tsx      |  14 +--
 .../AddPeopleToTag/AddPeopleToTag.tsx         |  11 +-
 src/components/CheckIn/TableRow.tsx           |   8 +-
 src/components/EventCalendar/EventHeader.tsx  |   2 +-
 .../EventCalendar/YearlyEventCalender.tsx     |   2 +-
 .../EventListCard/EventListCardModals.tsx     |   9 +-
 .../EventAttendance/EventAttendance.tsx       |  18 +--
 .../EventAttendance/EventStatistics.tsx       |  45 +++----
 .../AddOnSpotAttendee.tsx                     |   1 -
 .../EventRegistrantsModal.tsx                 |  14 +--
 .../EventStats/Statistics/Feedback.tsx        |   3 +-
 src/components/HolidayCards/HolidayCard.tsx   |   1 -
 .../MemberDetail/EventsAttendedCardItem.tsx   |   1 -
 .../MemberDetail/customTableCell.tsx          |   4 +-
 .../MemberRequestCard/MemberRequestCard.tsx   |  33 ++---
 .../OrgAdminListCard/OrgAdminListCard.tsx     |   1 -
 .../OrgPeopleListCard/OrgPeopleListCard.tsx   |   3 +-
 src/components/OrgPostCard/OrgPostCard.tsx    | 118 ++++++++----------
 .../General/OrgUpdate/OrgUpdate.tsx           |   4 +-
 .../OrganizationScreen/OrganizationScreen.tsx |   3 +-
 src/components/Pagination/Pagination.tsx      |   5 +-
 .../ProfileDropdown/ProfileDropdown.tsx       |   5 +-
 .../CustomRecurrenceModal.tsx                 |   1 -
 .../RequestsTableItem/RequestsTableItem.tsx   |   6 +-
 src/components/TagActions/TagActions.tsx      |  10 +-
 src/components/TagActions/TagNode.tsx         |   6 +-
 .../UpdateSession/UpdateSession.tsx           |   1 -
 src/components/UserListCard/UserListCard.tsx  |   2 -
 .../UserPasswordUpdate/UserPasswordUpdate.tsx |   5 +-
 .../UserPortal/CommentCard/CommentCard.tsx    |   6 +-
 .../CreateDirectChat/CreateDirectChat.tsx     |   2 +-
 .../CreateGroupChat/CreateGroupChat.tsx       |   4 +-
 .../UserPortal/EventCard/EventCard.tsx        |   3 +-
 .../OrganizationCard/OrganizationCard.tsx     |   1 -
 .../OrganizationNavbar/OrganizationNavbar.tsx |   8 +-
 .../OrganizationSidebar.tsx                   |   4 +-
 .../UserPortal/PostCard/PostCard.tsx          |  10 +-
 .../UserPortal/Register/Register.tsx          |  14 +--
 .../StartPostModal/StartPostModal.tsx         |   3 +-
 .../UserPortal/UserNavbar/UserNavbar.tsx      |   3 +-
 src/components/Venues/VenueModal.tsx          |   7 +-
 src/screens/BlockUser/BlockUser.tsx           |   6 +-
 .../CommunityProfile/CommunityProfile.tsx     |   2 -
 .../EventManagement/EventManagement.tsx       |  13 +-
 .../VolunteerGroups/VolunteerGroupModal.tsx   |  50 ++++----
 .../Volunteers/VolunteerCreateModal.tsx       |   9 +-
 src/screens/ForgotPassword/ForgotPassword.tsx |   3 +-
 .../FundCampaignPledge/FundCampaignPledge.tsx |  10 +-
 .../FundCampaignPledge/PledgeModal.tsx        |  34 ++---
 src/screens/ManageTag/ManageTag.spec.tsx      |   2 -
 src/screens/ManageTag/ManageTag.tsx           |  30 ++---
 src/screens/MemberDetail/MemberDetail.tsx     |  23 ++--
 src/screens/OrgList/OrganizationModal.tsx     |   2 +-
 src/screens/OrgPost/OrgPost.tsx               |   3 +-
 src/screens/OrgSettings/OrgSettings.tsx       |   5 +-
 .../OrganizationActionItems/ItemModal.tsx     |   5 -
 .../OrganizationDashboard.tsx                 |  11 +-
 .../OrganizationEvents/OrganizationEvents.tsx |   9 +-
 .../CampaignModal.tsx                         |  17 ++-
 src/screens/OrganizationFunds/FundModal.tsx   |   1 -
 .../OrganizationPeople/OrganizationPeople.tsx |   3 +-
 .../OrganizationTags/OrganizationTags.tsx     |   8 +-
 .../OrganizationVenues/OrganizationVenues.tsx |   3 +-
 src/screens/Requests/Requests.tsx             |   2 +-
 src/screens/SubTags/SubTags.tsx               |  24 ++--
 .../UserPortal/Campaigns/PledgeModal.tsx      |  34 ++---
 src/screens/UserPortal/Chat/Chat.tsx          |  52 ++++++--
 src/screens/UserPortal/Donate/Donate.tsx      |  11 +-
 src/screens/UserPortal/Events/Events.tsx      |  11 +-
 .../Organizations/Organizations.tsx           |  16 +--
 src/screens/UserPortal/People/People.tsx      |  14 +--
 src/screens/UserPortal/Settings/Settings.tsx  |  31 ++---
 .../UpcomingEvents/UpcomingEvents.tsx         |  15 +--
 .../Volunteer/VolunteerManagement.tsx         |   5 +-
 src/screens/Users/Users.tsx                   |   9 +-
 src/utils/getOrganizationId.ts                |   1 -
 76 files changed, 344 insertions(+), 531 deletions(-)

diff --git a/src/components/AddOn/core/AddOnStore/AddOnStore.tsx b/src/components/AddOn/core/AddOnStore/AddOnStore.tsx
index 90a32d9bb3..f5e6e611bf 100644
--- a/src/components/AddOn/core/AddOnStore/AddOnStore.tsx
+++ b/src/components/AddOn/core/AddOnStore/AddOnStore.tsx
@@ -52,7 +52,6 @@ function addOnStore(): JSX.Element {
   /**
    * Fetches store plugins and updates the Redux store with the plugin data.
    */
-  /* istanbul ignore next */
   const getStorePlugins = async (): Promise<void> => {
     let plugins = await new PluginHelper().fetchStore();
     const installIds = (await new PluginHelper().fetchInstalled()).map(
@@ -68,7 +67,6 @@ function addOnStore(): JSX.Element {
   /**
    * Sets the list of installed plugins in the component's state.
    */
-  /* istanbul ignore next */
   const getInstalledPlugins: () => void = () => {
     setDataList(data?.getPlugins ?? []);
   };
@@ -80,7 +78,6 @@ function addOnStore(): JSX.Element {
    */
   const updateSelectedTab = (tab: string): void => {
     setIsStore(tab === 'available');
-    /* istanbul ignore next */
     if (tab === 'available') {
       getStorePlugins();
     } else {
@@ -111,7 +108,6 @@ function addOnStore(): JSX.Element {
   };
 
   // Show a loader while the data is being fetched
-  /* istanbul ignore next */
   if (loading) {
     return (
       <>
@@ -157,12 +153,10 @@ function addOnStore(): JSX.Element {
           </div>
           {!isStore && (
             <Dropdown
-              onSelect={
-                /* istanbul ignore next */
-                (e) =>
-                  filterChange(
-                    e as unknown as React.ChangeEvent<HTMLSelectElement>,
-                  )
+              onSelect={(e) =>
+                filterChange(
+                  e as unknown as React.ChangeEvent<HTMLSelectElement>,
+                )
               }
             >
               <Dropdown.Toggle
diff --git a/src/components/AddPeopleToTag/AddPeopleToTag.tsx b/src/components/AddPeopleToTag/AddPeopleToTag.tsx
index 51d21a6a1c..0415eddae6 100644
--- a/src/components/AddPeopleToTag/AddPeopleToTag.tsx
+++ b/src/components/AddPeopleToTag/AddPeopleToTag.tsx
@@ -106,7 +106,7 @@ const AddPeopleToTag: React.FC<InterfaceAddPeopleToTagProps> = ({
           };
         },
       ) => {
-        if (!fetchMoreResult) /* istanbul ignore next */ return prevResult;
+        if (!fetchMoreResult) return prevResult;
 
         return {
           getUsersToAssignTo: {
@@ -127,7 +127,7 @@ const AddPeopleToTag: React.FC<InterfaceAddPeopleToTagProps> = ({
   const userTagMembersToAssignTo =
     userTagsMembersToAssignToData?.getUsersToAssignTo.usersToAssignTo.edges.map(
       (edge) => edge.node,
-    ) ?? /* istanbul ignore next */ [];
+    ) ?? [];
 
   const handleAddOrRemoveMember = (member: InterfaceMemberData): void => {
     setAssignToMembers((prevMembers) => {
@@ -173,7 +173,7 @@ const AddPeopleToTag: React.FC<InterfaceAddPeopleToTagProps> = ({
         hideAddPeopleToTagModal();
         setAssignToMembers([]);
       }
-    } catch (error: unknown) /* istanbul ignore next */ {
+    } catch (error: unknown) {
       const errorMessage =
         error instanceof Error ? error.message : tErrors('unknownError');
       toast.error(errorMessage);
@@ -345,8 +345,7 @@ const AddPeopleToTag: React.FC<InterfaceAddPeopleToTagProps> = ({
                     next={loadMoreMembersToAssignTo}
                     hasMore={
                       userTagsMembersToAssignToData?.getUsersToAssignTo
-                        .usersToAssignTo.pageInfo.hasNextPage ??
-                      /* istanbul ignore next */ false
+                        .usersToAssignTo.pageInfo.hasNextPage ?? false
                     }
                     loader={<InfiniteScrollLoader />}
                     scrollableTarget="addPeopleToTagScrollableDiv"
@@ -357,7 +356,7 @@ const AddPeopleToTag: React.FC<InterfaceAddPeopleToTagProps> = ({
                       hideFooter={true}
                       getRowId={(row) => row.id}
                       slots={{
-                        noRowsOverlay: /* istanbul ignore next */ () => (
+                        noRowsOverlay: () => (
                           <Stack
                             height="100%"
                             alignItems="center"
diff --git a/src/components/CheckIn/TableRow.tsx b/src/components/CheckIn/TableRow.tsx
index b2bd6e11cb..a24935a710 100644
--- a/src/components/CheckIn/TableRow.tsx
+++ b/src/components/CheckIn/TableRow.tsx
@@ -72,13 +72,13 @@ export const TableRow = ({
       }
       inputs.push({ name: data.name.trim() });
       const pdf = await generate({ template: tagTemplate, inputs });
-      // istanbul ignore next
+
       const blob = new Blob([pdf.buffer], { type: 'application/pdf' });
-      // istanbul ignore next
+
       const url = URL.createObjectURL(blob);
-      // istanbul ignore next
+
       window.open(url);
-      // istanbul ignore next
+
       toast.success('PDF generated successfully!');
     } catch (error: unknown) {
       const errorMessage =
diff --git a/src/components/EventCalendar/EventHeader.tsx b/src/components/EventCalendar/EventHeader.tsx
index 08039796e2..b1dc24c55c 100644
--- a/src/components/EventCalendar/EventHeader.tsx
+++ b/src/components/EventCalendar/EventHeader.tsx
@@ -51,7 +51,7 @@ function eventHeader({
              *
              * @param e - The event object from the input change.
              */
-            /*istanbul ignore next*/
+
             onChange={(e) => setEventName(e.target.value)}
           />
           <Button
diff --git a/src/components/EventCalendar/YearlyEventCalender.tsx b/src/components/EventCalendar/YearlyEventCalender.tsx
index facf75038c..c035ac3320 100644
--- a/src/components/EventCalendar/YearlyEventCalender.tsx
+++ b/src/components/EventCalendar/YearlyEventCalender.tsx
@@ -140,7 +140,7 @@ const Calendar: React.FC<InterfaceCalendarProps> = ({
     const data: InterfaceEventListCardProps[] = [];
     if (userRole === Role.SUPERADMIN) return eventData;
     // Hard to test all the cases
-    /* istanbul ignore next */
+
     if (userRole === Role.ADMIN) {
       eventData?.forEach((event) => {
         if (event.isPublic) data.push(event);
diff --git a/src/components/EventListCard/EventListCardModals.tsx b/src/components/EventListCard/EventListCardModals.tsx
index 193890941c..7755da2a5a 100644
--- a/src/components/EventListCard/EventListCardModals.tsx
+++ b/src/components/EventListCard/EventListCardModals.tsx
@@ -292,7 +292,6 @@ function EventListCardModals({
         }
       }
     } catch (error: unknown) {
-      /* istanbul ignore next */
       errorHandler(t, error);
     }
   };
@@ -362,7 +361,6 @@ function EventListCardModals({
           hideViewModal();
         }
       } catch (error: unknown) {
-        /* istanbul ignore next */
         errorHandler(t, error);
       }
     }
@@ -491,9 +489,7 @@ function EventListCardModals({
                           recurrenceStartDate: date?.toDate(),
                           weekDays: [Days[date?.toDate().getDay()]],
                           weekDayOccurenceInMonth: weekDayOccurenceInMonth
-                            ? /* istanbul ignore next */ getWeekDayOccurenceInMonth(
-                                date?.toDate(),
-                              )
+                            ? getWeekDayOccurenceInMonth(date?.toDate())
                             : undefined,
                         });
                       }
@@ -531,8 +527,7 @@ function EventListCardModals({
                           endTime:
                             timeToDayJs(formState.endTime) < time
                               ? time?.format('HH:mm:ss')
-                              : /* istanbul ignore next */
-                                formState.endTime,
+                              : formState.endTime,
                         });
                       }
                     }}
diff --git a/src/components/EventManagement/EventAttendance/EventAttendance.tsx b/src/components/EventManagement/EventAttendance/EventAttendance.tsx
index 17f063f6b5..fe848dd40d 100644
--- a/src/components/EventManagement/EventAttendance/EventAttendance.tsx
+++ b/src/components/EventManagement/EventAttendance/EventAttendance.tsx
@@ -57,8 +57,7 @@ function EventAttendance(): JSX.Element {
       const nameB = `${b.firstName} ${b.lastName}`.toLowerCase();
       return sortOrder === 'ascending'
         ? nameA.localeCompare(nameB)
-        : /*istanbul ignore next*/
-          nameB.localeCompare(nameA);
+        : nameB.localeCompare(nameA);
     });
   };
 
@@ -71,8 +70,7 @@ function EventAttendance(): JSX.Element {
           const isSameYear = attendeeDate.getFullYear() === now.getFullYear();
           return filteringBy === 'This Month'
             ? isSameYear && attendeeDate.getMonth() === now.getMonth()
-            : /*istanbul ignore next*/
-              isSameYear;
+            : isSameYear;
         });
   };
 
@@ -141,7 +139,7 @@ function EventAttendance(): JSX.Element {
   }, [eventId, getEventAttendees]);
 
   if (loading) return <p>{t('loading')}</p>;
-  /*istanbul ignore next*/
+
   if (error) return <p>{error.message}</p>;
 
   return (
@@ -219,9 +217,8 @@ function EventAttendance(): JSX.Element {
                 <span className="ms-2">Sort</span>
               </>
             }
-            onSelect={
-              /*istanbul ignore next*/
-              (eventKey) => setSortOrder(eventKey as 'ascending' | 'descending')
+            onSelect={(eventKey) =>
+              setSortOrder(eventKey as 'ascending' | 'descending')
             }
           >
             <Dropdown.Item eventKey="ascending">Ascending</Dropdown.Item>
@@ -340,8 +337,7 @@ function EventAttendance(): JSX.Element {
                         <span className={styles.eventsAttended}>
                           {member.eventsAttended
                             ? member.eventsAttended.length
-                            : /*istanbul ignore next*/
-                              '0'}
+                            : '0'}
                         </span>
                       </TableCell>
                     </Tooltip>
@@ -350,9 +346,7 @@ function EventAttendance(): JSX.Element {
                       data-testid={`attendee-task-assigned-${index}`}
                     >
                       {member.tagsAssignedWith ? (
-                        /*istanbul ignore next*/
                         member.tagsAssignedWith.edges.map(
-                          /*istanbul ignore next*/
                           (
                             edge: { node: { name: string } },
                             tagIndex: number,
diff --git a/src/components/EventManagement/EventAttendance/EventStatistics.tsx b/src/components/EventManagement/EventAttendance/EventStatistics.tsx
index 686ad049fa..bf5fff7040 100644
--- a/src/components/EventManagement/EventAttendance/EventStatistics.tsx
+++ b/src/components/EventManagement/EventAttendance/EventStatistics.tsx
@@ -97,17 +97,15 @@ export const AttendanceStatisticsModal: React.FC<
     plugins: {
       tooltip: {
         callbacks: {
-          label:
-            /*istanbul ignore next*/
-            (context: TooltipItem<'line'>) => {
-              const label = context.dataset.label || '';
-              const value = context.parsed.y;
-              const isCurrentEvent =
-                paginatedRecurringEvents[context.dataIndex]._id === eventId;
-              return isCurrentEvent
-                ? `${label}: ${value} (Current Event)`
-                : `${label}: ${value}`;
-            },
+          label: (context: TooltipItem<'line'>) => {
+            const label = context.dataset.label || '';
+            const value = context.parsed.y;
+            const isCurrentEvent =
+              paginatedRecurringEvents[context.dataIndex]._id === eventId;
+            return isCurrentEvent
+              ? `${label}: ${value} (Current Event)`
+              : `${label}: ${value}`;
+          },
         },
       },
     },
@@ -214,23 +212,15 @@ export const AttendanceStatisticsModal: React.FC<
     [eventLabels, attendeeCounts, maleCounts, femaleCounts, otherCounts],
   );
 
-  const handlePreviousPage = useCallback(
-    /*istanbul ignore next*/
-    () => {
-      setCurrentPage((prevPage) => Math.max(prevPage - 1, 0));
-    },
-    [],
-  );
+  const handlePreviousPage = useCallback(() => {
+    setCurrentPage((prevPage) => Math.max(prevPage - 1, 0));
+  }, []);
 
-  const handleNextPage = useCallback(
-    /*istanbul ignore next*/
-    () => {
-      if (currentPage < totalPages - 1) {
-        setCurrentPage((prevPage) => prevPage + 1);
-      }
-    },
-    [currentPage, totalPages],
-  );
+  const handleNextPage = useCallback(() => {
+    if (currentPage < totalPages - 1) {
+      setCurrentPage((prevPage) => prevPage + 1);
+    }
+  }, [currentPage, totalPages]);
 
   const handleDateChange = useCallback((date: Date | null) => {
     if (date) {
@@ -268,7 +258,6 @@ export const AttendanceStatisticsModal: React.FC<
                 monthDiff < 0 ||
                 (monthDiff === 0 && today.getDate() < birthDate.getDate())
               ) {
-                /*istanbul ignore next*/
                 age--;
               }
               return age < 18;
diff --git a/src/components/EventRegistrantsModal/AddOnSpotAttendee.tsx b/src/components/EventRegistrantsModal/AddOnSpotAttendee.tsx
index 6de839ce04..79a9e76310 100644
--- a/src/components/EventRegistrantsModal/AddOnSpotAttendee.tsx
+++ b/src/components/EventRegistrantsModal/AddOnSpotAttendee.tsx
@@ -95,7 +95,6 @@ const AddOnSpotAttendee: React.FC<InterfaceAddOnSpotAttendeeProps> = ({
         handleClose();
       }
     } catch (error) {
-      /* istanbul ignore next */
       errorHandler(t, error as Error);
     } finally {
       setIsSubmitting(false);
diff --git a/src/components/EventRegistrantsModal/EventRegistrantsModal.tsx b/src/components/EventRegistrantsModal/EventRegistrantsModal.tsx
index d48d3b7439..82182d9660 100644
--- a/src/components/EventRegistrantsModal/EventRegistrantsModal.tsx
+++ b/src/components/EventRegistrantsModal/EventRegistrantsModal.tsx
@@ -129,16 +129,10 @@ export const EventRegistrantsModal = (props: ModalPropType): JSX.Element => {
       <Modal show={show} onHide={handleClose} backdrop="static" centered>
         <AddOnSpotAttendee
           show={open}
-          handleClose={
-            /*istanbul ignore next */
-            () => setOpen(false)
-          }
-          reloadMembers={
-            /*istanbul ignore next */
-            () => {
-              attendeesRefetch();
-            }
-          }
+          handleClose={() => setOpen(false)}
+          reloadMembers={() => {
+            attendeesRefetch();
+          }}
         />
         <Modal.Header closeButton className="bg-primary">
           <Modal.Title className="text-white">Event Registrants</Modal.Title>
diff --git a/src/components/EventStats/Statistics/Feedback.tsx b/src/components/EventStats/Statistics/Feedback.tsx
index a6a255828f..f0890cbd72 100644
--- a/src/components/EventStats/Statistics/Feedback.tsx
+++ b/src/components/EventStats/Statistics/Feedback.tsx
@@ -79,8 +79,7 @@ export const FeedbackStats = ({ data }: ModalPropType): JSX.Element => {
               series={[
                 {
                   data: chartData,
-                  arcLabel: /* istanbul ignore next */ (item) =>
-                    `${item.id} (${item.value})`,
+                  arcLabel: (item) => `${item.id} (${item.value})`,
                   innerRadius: 30,
                   outerRadius: 120,
                   paddingAngle: 2,
diff --git a/src/components/HolidayCards/HolidayCard.tsx b/src/components/HolidayCards/HolidayCard.tsx
index 56ac86405d..2760a1469c 100644
--- a/src/components/HolidayCards/HolidayCard.tsx
+++ b/src/components/HolidayCards/HolidayCard.tsx
@@ -13,7 +13,6 @@ interface InterfaceHolidayList {
  * @returns JSX element representing a card with the holiday name.
  */
 const HolidayCard = (props: InterfaceHolidayList): JSX.Element => {
-  /*istanbul ignore next*/
   return <div className={styles.card}>{props?.holidayName}</div>;
 };
 
diff --git a/src/components/MemberDetail/EventsAttendedCardItem.tsx b/src/components/MemberDetail/EventsAttendedCardItem.tsx
index cfed19e4dd..7c4290f8da 100644
--- a/src/components/MemberDetail/EventsAttendedCardItem.tsx
+++ b/src/components/MemberDetail/EventsAttendedCardItem.tsx
@@ -42,7 +42,6 @@ const EventAttendedCard = (props: InterfaceCardItem): JSX.Element => {
                   </div>
                 </>
               ) : (
-                /*istanbul ignore next*/
                 <div className="fs-6 fw-normal">Date N/A</div>
               )}
             </div>
diff --git a/src/components/MemberDetail/customTableCell.tsx b/src/components/MemberDetail/customTableCell.tsx
index b8cc2bdd98..6c0851de77 100644
--- a/src/components/MemberDetail/customTableCell.tsx
+++ b/src/components/MemberDetail/customTableCell.tsx
@@ -29,7 +29,7 @@ export const CustomTableCell: React.FC<{ eventId: string }> = ({ eventId }) => {
         </TableCell>
       </TableRow>
     );
-  /*istanbul ignore next*/
+
   if (error) {
     return (
       <TableRow data-testid="error-state">
@@ -40,7 +40,7 @@ export const CustomTableCell: React.FC<{ eventId: string }> = ({ eventId }) => {
     );
   }
   const event = data?.event;
-  /*istanbul ignore next*/
+
   if (!event) {
     return (
       <TableRow data-testid="no-event-state">
diff --git a/src/components/MemberRequestCard/MemberRequestCard.tsx b/src/components/MemberRequestCard/MemberRequestCard.tsx
index c45b698506..c3d8108cf0 100644
--- a/src/components/MemberRequestCard/MemberRequestCard.tsx
+++ b/src/components/MemberRequestCard/MemberRequestCard.tsx
@@ -28,9 +28,14 @@ interface InterfaceMemberRequestCardProps {
  * @param props - Properties for the member request card.
  * @returns JSX element for member request card.
  */
-function MemberRequestCard(
-  props: InterfaceMemberRequestCardProps,
-): JSX.Element {
+function MemberRequestCard({
+  id,
+  memberName,
+  memberLocation,
+  joinDate,
+  memberImage,
+  email,
+}: InterfaceMemberRequestCardProps): JSX.Element {
   const [acceptMutation] = useMutation(ACCEPT_ORGANIZATION_REQUEST_MUTATION);
   const [rejectMutation] = useMutation(REJECT_ORGANIZATION_REQUEST_MUTATION);
 
@@ -47,18 +52,16 @@ function MemberRequestCard(
     try {
       await acceptMutation({
         variables: {
-          id: props.id,
+          id: id,
         },
       });
 
-      /* istanbul ignore next */
       toast.success(t('memberAdded') as string);
-      /* istanbul ignore next */
+
       setTimeout(() => {
         window.location.reload();
       }, 2000);
     } catch (error: unknown) {
-      /* istanbul ignore next */
       errorHandler(t, error);
     }
   };
@@ -73,14 +76,12 @@ function MemberRequestCard(
       try {
         await rejectMutation({
           variables: {
-            userid: props.id,
+            userid: id,
           },
         });
 
-        /* istanbul ignore next */
         window.location.reload();
       } catch (error: unknown) {
-        /* istanbul ignore next */
         errorHandler(t, error);
       }
     }
@@ -90,9 +91,9 @@ function MemberRequestCard(
     <>
       <div className={styles.peoplelistdiv}>
         <Row className={styles.memberlist}>
-          {props.memberImage ? (
+          {memberImage ? (
             <img
-              src={props.memberImage}
+              src={memberImage}
               className={styles.alignimg}
               alt="userImage"
             />
@@ -106,14 +107,14 @@ function MemberRequestCard(
           <Col className={styles.singledetails}>
             <div className={styles.singledetails_data_left}>
               <p className={styles.membername}>
-                {props.memberName ? <>{props.memberName}</> : <>Dogs Care</>}
+                {memberName ? <>{memberName}</> : <>Dogs Care</>}
               </p>
-              <p className={styles.memberfont}>{props.memberLocation}</p>
-              <p className={styles.memberfontcreated}>{props.email}</p>
+              <p className={styles.memberfont}>{memberLocation}</p>
+              <p className={styles.memberfontcreated}>{email}</p>
             </div>
             <div className={styles.singledetails_data_right}>
               <p className={styles.memberfont}>
-                {tCommon('joined')}: <span>{props.joinDate}</span>
+                {tCommon('joined')}: <span>{joinDate}</span>
               </p>
               <Button
                 className={styles.memberfontcreatedbtn}
diff --git a/src/components/OrgAdminListCard/OrgAdminListCard.tsx b/src/components/OrgAdminListCard/OrgAdminListCard.tsx
index f8fc454823..2efd90a0b9 100644
--- a/src/components/OrgAdminListCard/OrgAdminListCard.tsx
+++ b/src/components/OrgAdminListCard/OrgAdminListCard.tsx
@@ -50,7 +50,6 @@ function orgAdminListCard(props: InterfaceOrgPeopleListCardProps): JSX.Element {
         }, 2000);
       }
     } catch (error: unknown) {
-      /* istanbul ignore next */
       errorHandler(t, error);
     }
   };
diff --git a/src/components/OrgPeopleListCard/OrgPeopleListCard.tsx b/src/components/OrgPeopleListCard/OrgPeopleListCard.tsx
index dca72b84e7..14c5e80cf6 100644
--- a/src/components/OrgPeopleListCard/OrgPeopleListCard.tsx
+++ b/src/components/OrgPeopleListCard/OrgPeopleListCard.tsx
@@ -56,7 +56,7 @@ function orgPeopleListCard(
         },
       });
       // If the mutation is successful, show a success message and reload the page
-      /* istanbul ignore next */
+
       if (data) {
         toast.success(t('memberRemoved') as string);
         setTimeout(() => {
@@ -64,7 +64,6 @@ function orgPeopleListCard(
         }, 2000);
       }
     } catch (error: unknown) {
-      /* istanbul ignore next */
       errorHandler(t, error);
     }
   };
diff --git a/src/components/OrgPostCard/OrgPostCard.tsx b/src/components/OrgPostCard/OrgPostCard.tsx
index b7cc419d12..87e3479ff5 100644
--- a/src/components/OrgPostCard/OrgPostCard.tsx
+++ b/src/components/OrgPostCard/OrgPostCard.tsx
@@ -25,13 +25,16 @@ interface InterfaceOrgPostCardProps {
   postVideo: string | null;
   pinned: boolean;
 }
-export default function OrgPostCard(
-  props: InterfaceOrgPostCardProps,
-): JSX.Element {
-  const {
-    postID, // Destructure the key prop from props
-    // ...rest // Spread the rest of the props
-  } = props;
+export default function OrgPostCard({
+  postID,
+  id,
+  postTitle,
+  postInfo,
+  postAuthor,
+  postPhoto,
+  postVideo,
+  pinned,
+}: InterfaceOrgPostCardProps): JSX.Element {
   const [postformState, setPostFormState] = useState<InterfacePostForm>({
     posttitle: '',
     postinfo: '',
@@ -66,13 +69,11 @@ export default function OrgPostCard(
       }
     } catch (error: unknown) {
       if (error instanceof Error) {
-        /* istanbul ignore next */
         errorHandler(t, error);
       }
     }
   };
   const toggleShowEditModal = (): void => {
-    const { postTitle, postInfo, postPhoto, postVideo, pinned } = props;
     setPostFormState({
       posttitle: postTitle,
       postinfo: postInfo,
@@ -133,7 +134,6 @@ export default function OrgPostCard(
     }
   }
   function handleEditModal(): void {
-    const { postPhoto, postVideo } = props;
     setModalVisible(false);
     setMenuVisible(false);
     setShowEditModal(true);
@@ -150,11 +150,11 @@ export default function OrgPostCard(
   }
   useEffect(() => {
     setPostFormState({
-      posttitle: props.postTitle,
-      postinfo: props.postInfo,
-      postphoto: props.postPhoto,
-      postvideo: props.postVideo,
-      pinned: props.pinned,
+      posttitle: postTitle,
+      postinfo: postInfo,
+      postphoto: postPhoto,
+      postvideo: postVideo,
+      pinned: pinned,
     });
   }, []);
   const { t } = useTranslation('translation', {
@@ -167,7 +167,7 @@ export default function OrgPostCard(
     try {
       const { data } = await deletePostMutation({
         variables: {
-          id: props.id,
+          id: id,
         },
       });
       if (data) {
@@ -197,7 +197,7 @@ export default function OrgPostCard(
     try {
       const { data } = await updatePostMutation({
         variables: {
-          id: props.id,
+          id: id,
           title: postformState.posttitle,
           text: postformState.postinfo,
           ...(postPhotoUpdated && {
@@ -232,7 +232,7 @@ export default function OrgPostCard(
           onClick={handleCardClick}
           data-testid="cardStructure"
         >
-          {props.postVideo && (
+          {postVideo && (
             <Card
               className={styles.card}
               data-testid="cardVid"
@@ -247,10 +247,10 @@ export default function OrgPostCard(
                 loop={true}
                 playsInline
               >
-                <source src={props?.postVideo} type="video/mp4" />
+                <source src={postVideo} type="video/mp4" />
               </video>
               <Card.Body>
-                {props.pinned && (
+                {pinned && (
                   <PushPin
                     color="success"
                     fontSize="large"
@@ -259,37 +259,33 @@ export default function OrgPostCard(
                   />
                 )}
                 <Card.Title className={styles.title} data-testid="card-title">
-                  {props.postTitle}
+                  {postTitle}
                 </Card.Title>
                 <Card.Text className={styles.text} data-testid="card-text">
-                  {props.postInfo}
+                  {postInfo}
                 </Card.Text>
-                <Card.Link data-testid="card-authour">
-                  {props.postAuthor}
-                </Card.Link>
+                <Card.Link data-testid="card-authour">{postAuthor}</Card.Link>
               </Card.Body>
             </Card>
           )}
-          {props.postPhoto ? (
+          {postPhoto ? (
             <Card className={styles.card}>
               <Card.Img
                 className={styles.postimage}
                 variant="top"
-                src={props.postPhoto}
+                src={postPhoto}
                 alt="image"
               />
               <Card.Body>
-                {props.pinned && (
+                {pinned && (
                   <PushPin color="success" fontSize="large" className="fs-5" />
                 )}
-                <Card.Title className={styles.title}>
-                  {props.postTitle}
-                </Card.Title>
-                <Card.Text className={styles.text}>{props.postInfo}</Card.Text>
-                <Card.Link>{props.postAuthor}</Card.Link>
+                <Card.Title className={styles.title}>{postTitle}</Card.Title>
+                <Card.Text className={styles.text}>{postInfo}</Card.Text>
+                <Card.Link>{postAuthor}</Card.Link>
               </Card.Body>
             </Card>
-          ) : !props.postVideo ? (
+          ) : !postVideo ? (
             <span>
               <Card className={styles.card}>
                 <Card.Img
@@ -299,24 +295,20 @@ export default function OrgPostCard(
                   className={styles.nopostimage}
                 />
                 <Card.Body>
-                  {props.pinned && (
+                  {pinned && (
                     <PushPin
                       color="success"
                       fontSize="large"
                       className="fs-5"
                     />
                   )}
-                  <Card.Title className={styles.title}>
-                    {props.postTitle}
-                  </Card.Title>
+                  <Card.Title className={styles.title}>{postTitle}</Card.Title>
                   <Card.Text className={styles.text}>
-                    {props.postInfo && props.postInfo.length > 20
-                      ? props.postInfo.substring(0, 20) + '...'
-                      : props.postInfo}
+                    {postInfo && postInfo.length > 20
+                      ? postInfo.substring(0, 20) + '...'
+                      : postInfo}
                   </Card.Text>{' '}
-                  <Card.Link className={styles.author}>
-                    {props.postAuthor}
-                  </Card.Link>
+                  <Card.Link className={styles.author}>{postAuthor}</Card.Link>
                 </Card.Body>
               </Card>
             </span>
@@ -327,19 +319,19 @@ export default function OrgPostCard(
         {modalVisible && (
           <div className={styles.modal} data-testid={'imagepreviewmodal'}>
             <div className={styles.modalContent}>
-              {props.postPhoto && (
+              {postPhoto && (
                 <div className={styles.modalImage}>
-                  <img src={props.postPhoto} alt="Post Image" />
+                  <img src={postPhoto} alt="Post Image" />
                 </div>
               )}
-              {props.postVideo && (
+              {postVideo && (
                 <div className={styles.modalImage}>
                   <video controls autoPlay loop muted>
-                    <source src={props?.postVideo} type="video/mp4" />
+                    <source src={postVideo} type="video/mp4" />
                   </video>
                 </div>
               )}
-              {!props.postPhoto && !props.postVideo && (
+              {!postPhoto && !postVideo && (
                 <div className={styles.modalImage}>
                   {' '}
                   <img src={AboutImg} alt="Post Image" />
@@ -347,23 +339,23 @@ export default function OrgPostCard(
               )}
               <div className={styles.modalInfo}>
                 <p>
-                  {t('author')}:<span> {props.postAuthor}</span>
+                  {t('author')}:<span> {postAuthor}</span>
                 </p>
                 <div className={styles.infodiv}>
                   {togglePost === 'Read more' ? (
                     <p data-testid="toggleContent">
-                      {props.postInfo.length > 43
-                        ? props.postInfo.substring(0, 40) + '...'
-                        : props.postInfo}
+                      {postInfo.length > 43
+                        ? postInfo.substring(0, 40) + '...'
+                        : postInfo}
                     </p>
                   ) : (
-                    <p data-testid="toggleContent">{props.postInfo}</p>
+                    <p data-testid="toggleContent">{postInfo}</p>
                   )}
                   <button
                     role="toggleBtn"
                     data-testid="toggleBtn"
                     className={`${
-                      props.postInfo.length > 43
+                      postInfo.length > 43
                         ? styles.toggleClickBtn
                         : styles.toggleClickBtnNone
                     }`}
@@ -396,7 +388,7 @@ export default function OrgPostCard(
               <ul className={styles.menuOptions}>
                 <li
                   data-toggle="modal"
-                  data-target={`#editPostModal${props.id}`}
+                  data-target={`#editPostModal${id}`}
                   onClick={handleEditModal}
                   data-testid="editPostModalBtn"
                 >
@@ -404,7 +396,7 @@ export default function OrgPostCard(
                 </li>
                 <li
                   data-toggle="modal"
-                  data-target={`#deletePostModal${props.id}`}
+                  data-target={`#deletePostModal${id}`}
                   onClick={handleDeleteModal}
                   data-testid="deletePostModalBtn"
                 >
@@ -412,11 +404,9 @@ export default function OrgPostCard(
                 </li>
                 <li
                   data-testid="pinpostBtn"
-                  onClick={(): Promise<void> =>
-                    togglePostPin(props.id, props.pinned)
-                  }
+                  onClick={(): Promise<void> => togglePostPin(id, pinned)}
                 >
-                  {!props.pinned ? 'Pin post' : 'Unpin post'}
+                  {!pinned ? 'Pin post' : 'Unpin post'}
                 </li>
                 <li
                   className={styles.list}
@@ -494,7 +484,7 @@ export default function OrgPostCard(
               data-testid="updateText"
               required
             />
-            {!props.postPhoto && (
+            {!postPhoto && (
               <>
                 <Form.Label htmlFor="postPhoto">{t('image')}</Form.Label>
                 <Form.Control
@@ -522,7 +512,7 @@ export default function OrgPostCard(
                     }
                   }}
                 />
-                {props.postPhoto && (
+                {postPhoto && (
                   <>
                     {postformState.postphoto && (
                       <div className={styles.preview}>
@@ -543,7 +533,7 @@ export default function OrgPostCard(
                 )}
               </>
             )}
-            {!props.postVideo && (
+            {!postVideo && (
               <>
                 <Form.Label htmlFor="postvideo">{t('video')}</Form.Label>
                 <Form.Control
diff --git a/src/components/OrgSettings/General/OrgUpdate/OrgUpdate.tsx b/src/components/OrgSettings/General/OrgUpdate/OrgUpdate.tsx
index 6e0be28a56..171fc75a74 100644
--- a/src/components/OrgSettings/General/OrgUpdate/OrgUpdate.tsx
+++ b/src/components/OrgSettings/General/OrgUpdate/OrgUpdate.tsx
@@ -141,7 +141,7 @@ function orgUpdate(props: InterfaceOrgUpdateProps): JSX.Element {
           file: formState.orgImage,
         },
       });
-      // istanbul ignore next
+
       if (data) {
         refetch({ id: orgId });
         toast.success(t('successfulUpdated') as string);
@@ -333,7 +333,7 @@ function orgUpdate(props: InterfaceOrgUpdateProps): JSX.Element {
             onChange={async (e: React.ChangeEvent): Promise<void> => {
               const target = e.target as HTMLInputElement;
               const file = target.files && target.files[0];
-              /* istanbul ignore else */
+
               if (file)
                 setFormState({
                   ...formState,
diff --git a/src/components/OrganizationScreen/OrganizationScreen.tsx b/src/components/OrganizationScreen/OrganizationScreen.tsx
index 85fb6ee181..d4e795fbd7 100644
--- a/src/components/OrganizationScreen/OrganizationScreen.tsx
+++ b/src/components/OrganizationScreen/OrganizationScreen.tsx
@@ -51,7 +51,6 @@ const OrganizationScreen = (): JSX.Element => {
 
   // If no organization ID is found, navigate back to the home page
   if (!orgId) {
-    /*istanbul ignore next*/
     return <Navigate to={'/'} replace />;
   }
 
@@ -78,7 +77,7 @@ const OrganizationScreen = (): JSX.Element => {
       const event = eventsData.eventsByOrganization.find(
         (e: InterfaceEvent) => e._id === eventId,
       );
-      /*istanbul ignore next*/
+
       if (!event) {
         console.warn(`Event with id ${eventId} not found`);
         setEventName(null);
diff --git a/src/components/Pagination/Pagination.tsx b/src/components/Pagination/Pagination.tsx
index 637492a289..d04c539a80 100644
--- a/src/components/Pagination/Pagination.tsx
+++ b/src/components/Pagination/Pagination.tsx
@@ -37,7 +37,7 @@ function pagination(props: InterfaceTablePaginationActionsProps): JSX.Element {
    *
    * @param event - The click event.
    */
-  /* istanbul ignore next */
+
   const handleFirstPageButtonClick = (
     event: React.MouseEvent<HTMLButtonElement>,
   ): void => {
@@ -63,7 +63,6 @@ function pagination(props: InterfaceTablePaginationActionsProps): JSX.Element {
    * @param event - The click event.
    */
 
-  /* istanbul ignore next */
   const handleNextButtonClick = (
     event: React.MouseEvent<HTMLButtonElement>,
   ): void => {
@@ -76,7 +75,7 @@ function pagination(props: InterfaceTablePaginationActionsProps): JSX.Element {
    *
    * @param event - The click event.
    */
-  /* istanbul ignore next */
+
   const handleLastPageButtonClick = (
     event: React.MouseEvent<HTMLButtonElement>,
   ): void => {
diff --git a/src/components/ProfileDropdown/ProfileDropdown.tsx b/src/components/ProfileDropdown/ProfileDropdown.tsx
index 059e5b910a..94a195829c 100644
--- a/src/components/ProfileDropdown/ProfileDropdown.tsx
+++ b/src/components/ProfileDropdown/ProfileDropdown.tsx
@@ -43,7 +43,6 @@ const profileDropdown = (): JSX.Element => {
     try {
       await revokeRefreshToken();
     } catch (error) {
-      /*istanbul ignore next*/
       console.error('Error revoking refresh token:', error);
     }
     localStorage.clear();
@@ -54,8 +53,7 @@ const profileDropdown = (): JSX.Element => {
   const fullName = `${firstName} ${lastName}`;
   const displayedName =
     fullName.length > MAX_NAME_LENGTH
-      ? /*istanbul ignore next*/
-        fullName.substring(0, MAX_NAME_LENGTH - 3) + '...'
+      ? fullName.substring(0, MAX_NAME_LENGTH - 3) + '...'
       : fullName;
 
   return (
@@ -63,7 +61,6 @@ const profileDropdown = (): JSX.Element => {
       <div className={styles.profileContainer}>
         <div className={styles.imageContainer}>
           {userImage && userImage !== 'null' ? (
-            /*istanbul ignore next*/
             <img
               src={userImage}
               alt={`profile picture`}
diff --git a/src/components/RecurrenceOptions/CustomRecurrenceModal.tsx b/src/components/RecurrenceOptions/CustomRecurrenceModal.tsx
index deb1a03dab..ab08f30eda 100644
--- a/src/components/RecurrenceOptions/CustomRecurrenceModal.tsx
+++ b/src/components/RecurrenceOptions/CustomRecurrenceModal.tsx
@@ -374,7 +374,6 @@ const CustomRecurrenceModal: React.FC<InterfaceCustomRecurrenceModalProps> = ({
                             recurrenceEndDate ?? dayjs().add(1, 'month'),
                           )}
                           onChange={(date: Dayjs | null): void => {
-                            /* istanbul ignore next */
                             if (date) {
                               setRecurrenceRuleState({
                                 ...recurrenceRuleState,
diff --git a/src/components/RequestsTableItem/RequestsTableItem.tsx b/src/components/RequestsTableItem/RequestsTableItem.tsx
index 07feb5d289..f764bedcc8 100644
--- a/src/components/RequestsTableItem/RequestsTableItem.tsx
+++ b/src/components/RequestsTableItem/RequestsTableItem.tsx
@@ -65,13 +65,12 @@ const RequestsTableItem = (props: Props): JSX.Element => {
           id: membershipRequestId,
         },
       });
-      /* istanbul ignore next */
+
       if (data) {
         toast.success(t('acceptedSuccessfully') as string);
         resetAndRefetch();
       }
     } catch (error: unknown) {
-      /* istanbul ignore next */
       errorHandler(t, error);
     }
   };
@@ -93,13 +92,12 @@ const RequestsTableItem = (props: Props): JSX.Element => {
           id: membershipRequestId,
         },
       });
-      /* istanbul ignore next */
+
       if (data) {
         toast.success(t('rejectedSuccessfully') as string);
         resetAndRefetch();
       }
     } catch (error: unknown) {
-      /* istanbul ignore next */
       errorHandler(t, error);
     }
   };
diff --git a/src/components/TagActions/TagActions.tsx b/src/components/TagActions/TagActions.tsx
index 083341372f..881e62cae2 100644
--- a/src/components/TagActions/TagActions.tsx
+++ b/src/components/TagActions/TagActions.tsx
@@ -82,7 +82,7 @@ const TagActions: React.FC<InterfaceTagActionsProps> = ({
           };
         },
       ) => {
-        if (!fetchMoreResult) /* istanbul ignore next */ return prevResult;
+        if (!fetchMoreResult) return prevResult;
 
         return {
           organizations: [
@@ -106,7 +106,7 @@ const TagActions: React.FC<InterfaceTagActionsProps> = ({
   const userTagsList =
     orgUserTagsData?.organizations[0]?.userTags.edges.map(
       (edge) => edge.node,
-    ) ?? /* istanbul ignore next */ [];
+    ) ?? [];
 
   // tags that we have selected to assigned
   const [selectedTags, setSelectedTags] = useState<InterfaceTagData[]>([]);
@@ -129,7 +129,7 @@ const TagActions: React.FC<InterfaceTagActionsProps> = ({
   useEffect(() => {
     const newCheckedTags = new Set(checkedTags);
     const newAncestorTagsDataMap = new Map(ancestorTagsDataMap);
-    /* istanbul ignore next */
+
     addAncestorTagsData.forEach(
       (ancestorTag: InterfaceUserTagsAncestorData) => {
         const prevAncestorTagValue = ancestorTagsDataMap.get(ancestorTag._id);
@@ -148,7 +148,7 @@ const TagActions: React.FC<InterfaceTagActionsProps> = ({
   useEffect(() => {
     const newCheckedTags = new Set(checkedTags);
     const newAncestorTagsDataMap = new Map(ancestorTagsDataMap);
-    /* istanbul ignore next */
+
     removeAncestorTagsData.forEach(
       (ancestorTag: InterfaceUserTagsAncestorData) => {
         const prevAncestorTagValue = ancestorTagsDataMap.get(ancestorTag._id);
@@ -178,7 +178,6 @@ const TagActions: React.FC<InterfaceTagActionsProps> = ({
 
   const deSelectTag = (tag: InterfaceTagData): void => {
     if (!selectedTags.some((selectedTag) => selectedTag._id === tag._id)) {
-      /* istanbul ignore next */
       return;
     }
 
@@ -240,7 +239,6 @@ const TagActions: React.FC<InterfaceTagActionsProps> = ({
         hideTagActionsModal();
       }
     } catch (error: unknown) {
-      /* istanbul ignore next */
       if (error instanceof Error) {
         toast.error(error.message);
       }
diff --git a/src/components/TagActions/TagNode.tsx b/src/components/TagActions/TagNode.tsx
index 4a085ecaf9..6b32b2ac65 100644
--- a/src/components/TagActions/TagNode.tsx
+++ b/src/components/TagActions/TagNode.tsx
@@ -61,7 +61,7 @@ const TagNode: React.FC<InterfaceTagNodeProps> = ({
           fetchMoreResult?: { getChildTags: InterfaceQueryUserTagChildTags };
         },
       ) => {
-        if (!fetchMoreResult) /* istanbul ignore next */ return prevResult;
+        if (!fetchMoreResult) return prevResult;
 
         return {
           getChildTags: {
@@ -93,8 +93,7 @@ const TagNode: React.FC<InterfaceTagNodeProps> = ({
   }
 
   const subTagsList =
-    subTagsData?.getChildTags.childTags.edges.map((edge) => edge.node) ??
-    /* istanbul ignore next */ [];
+    subTagsData?.getChildTags.childTags.edges.map((edge) => edge.node) ?? [];
 
   const handleTagClick = (): void => {
     setExpanded(!expanded);
@@ -172,7 +171,6 @@ const TagNode: React.FC<InterfaceTagNodeProps> = ({
               next={loadMoreSubTags}
               hasMore={
                 subTagsData?.getChildTags.childTags.pageInfo.hasNextPage ??
-                /* istanbul ignore next */
                 false
               }
               loader={<InfiniteScrollLoader />}
diff --git a/src/components/UpdateSession/UpdateSession.tsx b/src/components/UpdateSession/UpdateSession.tsx
index f49970ebaa..112b69d368 100644
--- a/src/components/UpdateSession/UpdateSession.tsx
+++ b/src/components/UpdateSession/UpdateSession.tsx
@@ -113,7 +113,6 @@ const UpdateTimeout: React.FC<TestInterfaceUpdateTimeoutProps> = ({
       toast.success(t('profileChangedMsg'));
       setCommunityTimeout(timeout);
     } catch (error: unknown) {
-      /* istanbul ignore next */
       errorHandler(t, error as Error);
     }
   };
diff --git a/src/components/UserListCard/UserListCard.tsx b/src/components/UserListCard/UserListCard.tsx
index 76ad110ea1..d5e4dcee3f 100644
--- a/src/components/UserListCard/UserListCard.tsx
+++ b/src/components/UserListCard/UserListCard.tsx
@@ -45,7 +45,6 @@ function userListCard(props: InterfaceUserListCardProps): JSX.Element {
         },
       });
 
-      /* istanbul ignore next */
       if (data) {
         toast.success(t('addedAsAdmin') as string);
         setTimeout(() => {
@@ -53,7 +52,6 @@ function userListCard(props: InterfaceUserListCardProps): JSX.Element {
         }, 2000);
       }
     } catch (error: unknown) {
-      /* istanbul ignore next */
       errorHandler(t, error);
     }
   };
diff --git a/src/components/UserPasswordUpdate/UserPasswordUpdate.tsx b/src/components/UserPasswordUpdate/UserPasswordUpdate.tsx
index 1ea75811c1..a336a9c46b 100644
--- a/src/components/UserPasswordUpdate/UserPasswordUpdate.tsx
+++ b/src/components/UserPasswordUpdate/UserPasswordUpdate.tsx
@@ -62,7 +62,7 @@ const UserUpdate: React.FC<
           confirmNewPassword: formState.confirmNewPassword,
         },
       });
-      /* istanbul ignore next */
+
       if (data) {
         toast.success(
           tCommon('updatedSuccessfully', { item: 'Password' }) as string,
@@ -72,7 +72,6 @@ const UserUpdate: React.FC<
         }, 2000);
       }
     } catch (error: unknown) {
-      /* istanbul ignore next */
       if (error instanceof Error) {
         toast.error(error.toString());
       }
@@ -83,7 +82,7 @@ const UserUpdate: React.FC<
    * Handles canceling the update process.
    * It reloads the page to reset any changes.
    */
-  /* istanbul ignore next */
+
   const cancelUpdate = (): void => {
     window.location.reload();
   };
diff --git a/src/components/UserPortal/CommentCard/CommentCard.tsx b/src/components/UserPortal/CommentCard/CommentCard.tsx
index 9e8c46d241..a225794aa7 100644
--- a/src/components/UserPortal/CommentCard/CommentCard.tsx
+++ b/src/components/UserPortal/CommentCard/CommentCard.tsx
@@ -84,14 +84,13 @@ function commentCard(props: InterfaceCommentCardProps): JSX.Element {
             commentId: props.id,
           },
         });
-        /* istanbul ignore next */
+
         if (data) {
           setLikes((likes) => likes - 1);
           setIsLikedByUser(false);
           props.handleDislikeComment(props.id);
         }
       } catch (error: unknown) {
-        /* istanbul ignore next */
         toast.error(error as string);
       }
     } else {
@@ -101,14 +100,13 @@ function commentCard(props: InterfaceCommentCardProps): JSX.Element {
             commentId: props.id,
           },
         });
-        /* istanbul ignore next */
+
         if (data) {
           setLikes((likes) => likes + 1);
           setIsLikedByUser(true);
           props.handleLikeComment(props.id);
         }
       } catch (error: unknown) {
-        /* istanbul ignore next */
         toast.error(error as string);
       }
     }
diff --git a/src/components/UserPortal/CreateDirectChat/CreateDirectChat.tsx b/src/components/UserPortal/CreateDirectChat/CreateDirectChat.tsx
index 24c853fcdd..7d67a8839d 100644
--- a/src/components/UserPortal/CreateDirectChat/CreateDirectChat.tsx
+++ b/src/components/UserPortal/CreateDirectChat/CreateDirectChat.tsx
@@ -94,7 +94,7 @@ export default function createDirectChatModal({
 
   const handleUserModalSearchChange = (e: React.FormEvent): void => {
     e.preventDefault();
-    /* istanbul ignore next */
+
     const [firstName, lastName] = userName.split(' ');
 
     const newFilterData = {
diff --git a/src/components/UserPortal/CreateGroupChat/CreateGroupChat.tsx b/src/components/UserPortal/CreateGroupChat/CreateGroupChat.tsx
index e293675a03..e648b94e50 100644
--- a/src/components/UserPortal/CreateGroupChat/CreateGroupChat.tsx
+++ b/src/components/UserPortal/CreateGroupChat/CreateGroupChat.tsx
@@ -108,7 +108,7 @@ export default function CreateGroupChat({
     setAddUserModalisOpen(true);
   }
 
-  const toggleAddUserModal = /* istanbul ignore next */ (): void =>
+  const toggleAddUserModal = (): void =>
     setAddUserModalisOpen(!addUserModalisOpen);
 
   const handleChange = (event: SelectChangeEvent<string>): void => {
@@ -162,7 +162,7 @@ export default function CreateGroupChat({
 
   const handleUserModalSearchChange = (e: React.FormEvent): void => {
     e.preventDefault();
-    /* istanbul ignore next */
+
     const [firstName, lastName] = userName.split(' ');
 
     const newFilterData = {
diff --git a/src/components/UserPortal/EventCard/EventCard.tsx b/src/components/UserPortal/EventCard/EventCard.tsx
index e93138ce42..aea3dea0ef 100644
--- a/src/components/UserPortal/EventCard/EventCard.tsx
+++ b/src/components/UserPortal/EventCard/EventCard.tsx
@@ -96,13 +96,12 @@ function eventCard(props: InterfaceEventCardProps): JSX.Element {
             eventId: props.id,
           },
         });
-        /* istanbul ignore next */
+
         if (data) {
           setIsRegistered(true);
           toast.success(`Successfully registered for ${props.title}`);
         }
       } catch (error: unknown) {
-        /* istanbul ignore next */
         toast.error(error as string);
       }
     }
diff --git a/src/components/UserPortal/OrganizationCard/OrganizationCard.tsx b/src/components/UserPortal/OrganizationCard/OrganizationCard.tsx
index e1c2c23beb..b468f84a22 100644
--- a/src/components/UserPortal/OrganizationCard/OrganizationCard.tsx
+++ b/src/components/UserPortal/OrganizationCard/OrganizationCard.tsx
@@ -121,7 +121,6 @@ function organizationCard(props: InterfaceOrganizationCardProps): JSX.Element {
       }
       refetch();
     } catch (error: unknown) {
-      /* istanbul ignore next */
       if (error instanceof Error) {
         if (error.message === 'User is already a member') {
           toast.error(t('AlreadyJoined') as string);
diff --git a/src/components/UserPortal/OrganizationNavbar/OrganizationNavbar.tsx b/src/components/UserPortal/OrganizationNavbar/OrganizationNavbar.tsx
index 34022fcfcf..e0baa5e30c 100644
--- a/src/components/UserPortal/OrganizationNavbar/OrganizationNavbar.tsx
+++ b/src/components/UserPortal/OrganizationNavbar/OrganizationNavbar.tsx
@@ -62,7 +62,6 @@ function organizationNavbar(props: InterfaceNavbarProps): JSX.Element {
   });
 
   const [currentLanguageCode, setCurrentLanguageCode] = React.useState(
-    /* istanbul ignore next */
     cookies.get('i18next') || 'en',
   );
 
@@ -71,7 +70,7 @@ function organizationNavbar(props: InterfaceNavbarProps): JSX.Element {
   /**
    * Handles user logout by clearing local storage and redirecting to the home page.
    */
-  /* istanbul ignore next */
+
   const handleLogout = (): void => {
     localStorage.clear();
     window.location.replace('/');
@@ -174,10 +173,7 @@ function organizationNavbar(props: InterfaceNavbarProps): JSX.Element {
             <Nav className="me-auto flex-grow-1 pe-3 pt-1" variant="dark">
               <Nav.Link
                 active={props.currentPage === 'home'}
-                onClick={
-                  /* istanbul ignore next */
-                  (): void => navigate(homeLink)
-                }
+                onClick={(): void => navigate(homeLink)}
               >
                 {t('home')}
               </Nav.Link>
diff --git a/src/components/UserPortal/OrganizationSidebar/OrganizationSidebar.tsx b/src/components/UserPortal/OrganizationSidebar/OrganizationSidebar.tsx
index 796d30d568..cb3ce547cd 100644
--- a/src/components/UserPortal/OrganizationSidebar/OrganizationSidebar.tsx
+++ b/src/components/UserPortal/OrganizationSidebar/OrganizationSidebar.tsx
@@ -80,7 +80,7 @@ export default function organizationSidebar(): JSX.Element {
    *
    * Sets the members state with the data from the query.
    */
-  /* istanbul ignore next */
+
   useEffect(() => {
     if (memberData) {
       setMembers(memberData.organizationsMemberConnection.edges);
@@ -92,7 +92,7 @@ export default function organizationSidebar(): JSX.Element {
    *
    * Sets the events state with the data from the query.
    */
-  /* istanbul ignore next */
+
   useEffect(() => {
     if (eventsData) {
       setEvents(eventsData.eventsByOrganizationConnection);
diff --git a/src/components/UserPortal/PostCard/PostCard.tsx b/src/components/UserPortal/PostCard/PostCard.tsx
index f8fcdaebca..e29564018d 100644
--- a/src/components/UserPortal/PostCard/PostCard.tsx
+++ b/src/components/UserPortal/PostCard/PostCard.tsx
@@ -121,13 +121,12 @@ export default function postCard(props: InterfacePostCard): JSX.Element {
             postId: props.id,
           },
         });
-        /* istanbul ignore next */
+
         if (data) {
           setLikes((likes) => likes - 1);
           setIsLikedByUser(false);
         }
       } catch (error: unknown) {
-        /* istanbul ignore next */
         toast.error(error as string);
       }
     } else {
@@ -137,13 +136,12 @@ export default function postCard(props: InterfacePostCard): JSX.Element {
             postId: props.id,
           },
         });
-        /* istanbul ignore next */
+
         if (data) {
           setLikes((likes) => likes + 1);
           setIsLikedByUser(true);
         }
       } catch (error: unknown) {
-        /* istanbul ignore next */
         toast.error(error as string);
       }
     }
@@ -205,7 +203,6 @@ export default function postCard(props: InterfacePostCard): JSX.Element {
         },
       });
 
-      /* istanbul ignore next */
       if (createEventData) {
         setCommentInput('');
         setNumComments((numComments) => numComments + 1);
@@ -228,7 +225,6 @@ export default function postCard(props: InterfacePostCard): JSX.Element {
         setComments([...comments, newComment]);
       }
     } catch (error: unknown) {
-      /* istanbul ignore next */
       errorHandler(t, error);
     }
   };
@@ -247,7 +243,6 @@ export default function postCard(props: InterfacePostCard): JSX.Element {
       toggleEditPost();
       toast.success(tCommon('updatedSuccessfully', { item: 'Post' }) as string);
     } catch (error: unknown) {
-      /* istanbul ignore next */
       errorHandler(t, error);
     }
   };
@@ -264,7 +259,6 @@ export default function postCard(props: InterfacePostCard): JSX.Element {
       props.fetchPosts(); // Refresh the posts
       toast.success('Successfully deleted the Post.');
     } catch (error: unknown) {
-      /* istanbul ignore next */
       errorHandler(t, error);
     }
   };
diff --git a/src/components/UserPortal/Register/Register.tsx b/src/components/UserPortal/Register/Register.tsx
index 11a810c955..9c12929bf4 100644
--- a/src/components/UserPortal/Register/Register.tsx
+++ b/src/components/UserPortal/Register/Register.tsx
@@ -76,7 +76,7 @@ export default function register(props: InterfaceRegisterProps): JSX.Element {
         toast.success(t('afterRegister') as string); // Success message
 
         // Reset form fields
-        /* istanbul ignore next */
+
         setRegisterVariables({
           firstName: '',
           lastName: '',
@@ -86,7 +86,7 @@ export default function register(props: InterfaceRegisterProps): JSX.Element {
         });
       } catch (error: unknown) {
         // Handle any errors during registration
-        /* istanbul ignore next */
+
         errorHandler(t, error);
       }
     }
@@ -96,7 +96,7 @@ export default function register(props: InterfaceRegisterProps): JSX.Element {
    * Updates the state with the first name input value.
    * @param e - Change event from the input element
    */
-  /* istanbul ignore next */
+
   const handleFirstName = (e: ChangeEvent<HTMLInputElement>): void => {
     const firstName = e.target.value;
     setRegisterVariables({ ...registerVariables, firstName });
@@ -106,7 +106,7 @@ export default function register(props: InterfaceRegisterProps): JSX.Element {
    * Updates the state with the last name input value.
    * @param e - Change event from the input element
    */
-  /* istanbul ignore next */
+
   const handleLastName = (e: ChangeEvent<HTMLInputElement>): void => {
     const lastName = e.target.value;
     setRegisterVariables({ ...registerVariables, lastName });
@@ -116,7 +116,7 @@ export default function register(props: InterfaceRegisterProps): JSX.Element {
    * Updates the state with the email input value.
    * @param e - Change event from the input element
    */
-  /* istanbul ignore next */
+
   const handleEmailChange = (e: ChangeEvent<HTMLInputElement>): void => {
     const email = e.target.value;
     setRegisterVariables({ ...registerVariables, email });
@@ -126,7 +126,7 @@ export default function register(props: InterfaceRegisterProps): JSX.Element {
    * Updates the state with the password input value.
    * @param e - Change event from the input element
    */
-  /* istanbul ignore next */
+
   const handlePasswordChange = (e: ChangeEvent<HTMLInputElement>): void => {
     const password = e.target.value;
 
@@ -137,7 +137,7 @@ export default function register(props: InterfaceRegisterProps): JSX.Element {
    * Updates the state with the confirm password input value.
    * @param e - Change event from the input element
    */
-  /* istanbul ignore next */
+
   const handleConfirmPasswordChange = (
     e: ChangeEvent<HTMLInputElement>,
   ): void => {
diff --git a/src/components/UserPortal/StartPostModal/StartPostModal.tsx b/src/components/UserPortal/StartPostModal/StartPostModal.tsx
index d48b8425fa..05dccb0203 100644
--- a/src/components/UserPortal/StartPostModal/StartPostModal.tsx
+++ b/src/components/UserPortal/StartPostModal/StartPostModal.tsx
@@ -90,7 +90,7 @@ const startPostModal = ({
           file: img,
         },
       });
-      /* istanbul ignore next */
+
       if (data) {
         toast.dismiss();
         toast.success(t('postNowVisibleInFeed') as string);
@@ -98,7 +98,6 @@ const startPostModal = ({
         handleHide();
       }
     } catch (error: unknown) {
-      /* istanbul ignore next */
       errorHandler(t, error);
     }
   };
diff --git a/src/components/UserPortal/UserNavbar/UserNavbar.tsx b/src/components/UserPortal/UserNavbar/UserNavbar.tsx
index 4160b00aad..6e90d0d4fc 100644
--- a/src/components/UserPortal/UserNavbar/UserNavbar.tsx
+++ b/src/components/UserPortal/UserNavbar/UserNavbar.tsx
@@ -41,7 +41,6 @@ function userNavbar(): JSX.Element {
 
   // State for managing the current language code
   const [currentLanguageCode, setCurrentLanguageCode] = React.useState(
-    /* istanbul ignore next */
     cookies.get('i18next') || 'en',
   );
 
@@ -52,7 +51,7 @@ function userNavbar(): JSX.Element {
    * Handles user logout by revoking the refresh token and clearing local storage.
    * Redirects to the home page after logout.
    */
-  /* istanbul ignore next */
+
   const handleLogout = (): void => {
     revokeRefreshToken();
     localStorage.clear();
diff --git a/src/components/Venues/VenueModal.tsx b/src/components/Venues/VenueModal.tsx
index 1d0fbe0af4..540fae9614 100644
--- a/src/components/Venues/VenueModal.tsx
+++ b/src/components/Venues/VenueModal.tsx
@@ -98,7 +98,7 @@ const VenueModal = ({
           ...(edit && { id: venueData?._id }),
         },
       });
-      /* istanbul ignore next */
+
       if (data) {
         toast.success(
           edit ? (t('venueUpdated') as string) : (t('venueAdded') as string),
@@ -114,7 +114,6 @@ const VenueModal = ({
         setVenueImage(false);
       }
     } catch (error) {
-      /* istanbul ignore next */
       errorHandler(t, error);
     }
   }, [
@@ -136,7 +135,7 @@ const VenueModal = ({
   const clearImageInput = useCallback(() => {
     setFormState((prevState) => ({ ...prevState, imageURL: '' }));
     setVenueImage(false);
-    /* istanbul ignore next */
+
     if (fileInputRef.current) {
       fileInputRef.current.value = '';
     }
@@ -236,7 +235,7 @@ const VenueModal = ({
               }));
               setVenueImage(true);
               const file = e.target.files?.[0];
-              /* istanbul ignore next */
+
               if (file) {
                 setFormState({
                   ...formState,
diff --git a/src/screens/BlockUser/BlockUser.tsx b/src/screens/BlockUser/BlockUser.tsx
index 8e69e5ec2a..3dc40c3c2b 100644
--- a/src/screens/BlockUser/BlockUser.tsx
+++ b/src/screens/BlockUser/BlockUser.tsx
@@ -104,13 +104,12 @@ const Requests = (): JSX.Element => {
             orgId: currentUrl,
           },
         });
-        /* istanbul ignore next */
+
         if (data) {
           toast.success(t('blockedSuccessfully') as string);
           memberRefetch();
         }
       } catch (error: unknown) {
-        /* istanbul ignore next */
         errorHandler(t, error);
       }
     },
@@ -127,13 +126,12 @@ const Requests = (): JSX.Element => {
             orgId: currentUrl,
           },
         });
-        /* istanbul ignore next */
+
         if (data) {
           toast.success(t('Un-BlockedSuccessfully') as string);
           memberRefetch();
         }
       } catch (error: unknown) {
-        /* istanbul ignore next */
         errorHandler(t, error);
       }
     },
diff --git a/src/screens/CommunityProfile/CommunityProfile.tsx b/src/screens/CommunityProfile/CommunityProfile.tsx
index 05f328ced0..349069f9bc 100644
--- a/src/screens/CommunityProfile/CommunityProfile.tsx
+++ b/src/screens/CommunityProfile/CommunityProfile.tsx
@@ -150,7 +150,6 @@ const CommunityProfile = (): JSX.Element => {
       });
       toast.success(t('profileChangedMsg') as string);
     } catch (error: unknown) {
-      /* istanbul ignore next */
       errorHandler(t, error as Error);
     }
   };
@@ -183,7 +182,6 @@ const CommunityProfile = (): JSX.Element => {
       });
       toast.success(t(`resetData`) as string);
     } catch (error: unknown) {
-      /* istanbul ignore next */
       errorHandler(t, error as Error);
     }
   };
diff --git a/src/screens/EventManagement/EventManagement.tsx b/src/screens/EventManagement/EventManagement.tsx
index 2e5cdbd419..a80ead8999 100644
--- a/src/screens/EventManagement/EventManagement.tsx
+++ b/src/screens/EventManagement/EventManagement.tsx
@@ -99,7 +99,7 @@ const EventManagement = (): JSX.Element => {
   // Determine user role based on local storage
   const superAdmin = getItem('SuperAdmin');
   const adminFor = getItem('AdminFor');
-  /*istanbul ignore next*/
+
   const userRole = superAdmin
     ? 'SUPERADMIN'
     : adminFor?.length > 0
@@ -108,7 +108,7 @@ const EventManagement = (): JSX.Element => {
 
   // Extract event and organization IDs from URL parameters
   const { eventId, orgId } = useParams();
-  /*istanbul ignore next*/
+
   if (!eventId || !orgId) {
     // Redirect if event ID or organization ID is missing
     return <Navigate to={'/orglist'} />;
@@ -158,7 +158,6 @@ const EventManagement = (): JSX.Element => {
   };
 
   const handleBack = (): void => {
-    /*istanbul ignore next*/
     if (userRole === 'USER') {
       navigate(`/user/events/${orgId}`);
     } else {
@@ -202,10 +201,7 @@ const EventManagement = (): JSX.Element => {
               {eventDashboardTabs.map(({ value, icon }, index) => (
                 <Dropdown.Item
                   key={index}
-                  onClick={
-                    /* istanbul ignore next */
-                    () => setTab(value)
-                  }
+                  onClick={() => setTab(value)}
                   className={`d-flex gap-2 ${tab === value ? 'text-secondary' : ''}`}
                 >
                   {icon} {t(value)}
@@ -269,9 +265,8 @@ const EventManagement = (): JSX.Element => {
                 <h2>Statistics</h2>
               </div>
             );
-          /*istanbul ignore next*/
+
           default:
-            /*istanbul ignore next*/
             return null;
         }
       })()}
diff --git a/src/screens/EventVolunteers/VolunteerGroups/VolunteerGroupModal.tsx b/src/screens/EventVolunteers/VolunteerGroups/VolunteerGroupModal.tsx
index e36ecaa0bd..e332eee46a 100644
--- a/src/screens/EventVolunteers/VolunteerGroups/VolunteerGroupModal.tsx
+++ b/src/screens/EventVolunteers/VolunteerGroups/VolunteerGroupModal.tsx
@@ -246,26 +246,23 @@ const VolunteerGroupModal: React.FC<InterfaceVolunteerGroupModal> = ({
               getOptionLabel={(member: InterfaceUserInfo): string =>
                 `${member.firstName} ${member.lastName}`
               }
-              onChange={
-                /*istanbul ignore next*/
-                (_, newLeader): void => {
-                  if (newLeader) {
-                    setFormState({
-                      ...formState,
-                      leader: newLeader,
-                      volunteerUsers: [...volunteerUsers, newLeader],
-                    });
-                  } else {
-                    setFormState({
-                      ...formState,
-                      leader: null,
-                      volunteerUsers: volunteerUsers.filter(
-                        (user) => user._id !== leader?._id,
-                      ),
-                    });
-                  }
+              onChange={(_, newLeader): void => {
+                if (newLeader) {
+                  setFormState({
+                    ...formState,
+                    leader: newLeader,
+                    volunteerUsers: [...volunteerUsers, newLeader],
+                  });
+                } else {
+                  setFormState({
+                    ...formState,
+                    leader: null,
+                    volunteerUsers: volunteerUsers.filter(
+                      (user) => user._id !== leader?._id,
+                    ),
+                  });
                 }
-              }
+              }}
               renderInput={(params) => (
                 <TextField {...params} label="Leader *" />
               )}
@@ -287,15 +284,12 @@ const VolunteerGroupModal: React.FC<InterfaceVolunteerGroupModal> = ({
                 `${member.firstName} ${member.lastName}`
               }
               disabled={mode === 'edit'}
-              onChange={
-                /*istanbul ignore next*/
-                (_, newUsers): void => {
-                  setFormState({
-                    ...formState,
-                    volunteerUsers: newUsers,
-                  });
-                }
-              }
+              onChange={(_, newUsers): void => {
+                setFormState({
+                  ...formState,
+                  volunteerUsers: newUsers,
+                });
+              }}
               renderInput={(params) => (
                 <TextField {...params} label="Invite Volunteers *" />
               )}
diff --git a/src/screens/EventVolunteers/Volunteers/VolunteerCreateModal.tsx b/src/screens/EventVolunteers/Volunteers/VolunteerCreateModal.tsx
index dee45376db..7b5a38b404 100644
--- a/src/screens/EventVolunteers/Volunteers/VolunteerCreateModal.tsx
+++ b/src/screens/EventVolunteers/Volunteers/VolunteerCreateModal.tsx
@@ -126,12 +126,9 @@ const VolunteerCreateModal: React.FC<InterfaceVolunteerCreateModal> = ({
               getOptionLabel={(member: InterfaceUserInfo): string =>
                 `${member.firstName} ${member.lastName}`
               }
-              onChange={
-                /*istanbul ignore next*/
-                (_, newVolunteer): void => {
-                  setUserId(newVolunteer?._id ?? '');
-                }
-              }
+              onChange={(_, newVolunteer): void => {
+                setUserId(newVolunteer?._id ?? '');
+              }}
               renderInput={(params) => <TextField {...params} label="Member" />}
             />
           </Form.Group>
diff --git a/src/screens/ForgotPassword/ForgotPassword.tsx b/src/screens/ForgotPassword/ForgotPassword.tsx
index 663960572b..1794229d48 100644
--- a/src/screens/ForgotPassword/ForgotPassword.tsx
+++ b/src/screens/ForgotPassword/ForgotPassword.tsx
@@ -135,7 +135,6 @@ const ForgotPassword = (): JSX.Element => {
         },
       });
 
-      /* istanbul ignore next */
       if (data) {
         toast.success(t('passwordChanges') as string);
         setShowEnterEmail(true);
@@ -147,7 +146,7 @@ const ForgotPassword = (): JSX.Element => {
       }
     } catch (error: unknown) {
       setShowEnterEmail(true);
-      /* istanbul ignore next */
+
       errorHandler(t, error);
     }
   };
diff --git a/src/screens/FundCampaignPledge/FundCampaignPledge.tsx b/src/screens/FundCampaignPledge/FundCampaignPledge.tsx
index 8942265eea..aa7ab838c3 100644
--- a/src/screens/FundCampaignPledge/FundCampaignPledge.tsx
+++ b/src/screens/FundCampaignPledge/FundCampaignPledge.tsx
@@ -389,10 +389,7 @@ const fundCampaignPledge = (): JSX.Element => {
           underline="hover"
           color="inherit"
           component="button"
-          onClick={
-            /* istanbul ignore next */
-            () => history.go(-2)
-          }
+          onClick={() => history.go(-2)}
         >
           {fundName}
         </Link>
@@ -400,10 +397,7 @@ const fundCampaignPledge = (): JSX.Element => {
           underline="hover"
           color="inherit"
           component="button"
-          onClick={
-            /* istanbul ignore next */
-            () => history.back()
-          }
+          onClick={() => history.back()}
         >
           {campaignInfo?.name}
         </Link>
diff --git a/src/screens/FundCampaignPledge/PledgeModal.tsx b/src/screens/FundCampaignPledge/PledgeModal.tsx
index 04b8aae7da..3edc19eb28 100644
--- a/src/screens/FundCampaignPledge/PledgeModal.tsx
+++ b/src/screens/FundCampaignPledge/PledgeModal.tsx
@@ -111,7 +111,6 @@ const PledgeModal: React.FC<InterfacePledgeModal> = ({
 
   useEffect(() => {
     if (memberData) {
-      /*istanbul ignore next*/
       setPledgers(memberData.organizations[0].members);
     }
   }, [memberData]);
@@ -124,7 +123,6 @@ const PledgeModal: React.FC<InterfacePledgeModal> = ({
     pledgeEndDate,
   } = formState;
 
-  /*istanbul ignore next*/
   const updatePledgeHandler = useCallback(
     async (e: ChangeEvent<HTMLFormElement>): Promise<void> => {
       e.preventDefault();
@@ -194,7 +192,6 @@ const PledgeModal: React.FC<InterfacePledgeModal> = ({
         });
         hide();
       } catch (error: unknown) {
-        /*istanbul ignore next*/
         toast.error((error as Error).message);
       }
     },
@@ -238,15 +235,12 @@ const PledgeModal: React.FC<InterfacePledgeModal> = ({
               getOptionLabel={(member: InterfaceUserInfo): string =>
                 `${member.firstName} ${member.lastName}`
               }
-              onChange={
-                /*istanbul ignore next*/
-                (_, newPledgers): void => {
-                  setFormState({
-                    ...formState,
-                    pledgeUsers: newPledgers,
-                  });
-                }
-              }
+              onChange={(_, newPledgers): void => {
+                setFormState({
+                  ...formState,
+                  pledgeUsers: newPledgers,
+                });
+              }}
               renderInput={(params) => (
                 <TextField {...params} label="Pledgers" />
               )}
@@ -266,7 +260,6 @@ const PledgeModal: React.FC<InterfacePledgeModal> = ({
                     pledgeStartDate: date.toDate(),
                     pledgeEndDate:
                       pledgeEndDate &&
-                      /*istanbul ignore next*/
                       (pledgeEndDate < date?.toDate()
                         ? date.toDate()
                         : pledgeEndDate),
@@ -305,15 +298,12 @@ const PledgeModal: React.FC<InterfacePledgeModal> = ({
                 value={pledgeCurrency}
                 label={t('currency')}
                 data-testid="currencySelect"
-                onChange={
-                  /*istanbul ignore next*/
-                  (e) => {
-                    setFormState({
-                      ...formState,
-                      pledgeCurrency: e.target.value,
-                    });
-                  }
-                }
+                onChange={(e) => {
+                  setFormState({
+                    ...formState,
+                    pledgeCurrency: e.target.value,
+                  });
+                }}
               >
                 {currencyOptions.map((currency) => (
                   <MenuItem key={currency.label} value={currency.value}>
diff --git a/src/screens/ManageTag/ManageTag.spec.tsx b/src/screens/ManageTag/ManageTag.spec.tsx
index 5d86ed3c17..a473aea70f 100644
--- a/src/screens/ManageTag/ManageTag.spec.tsx
+++ b/src/screens/ManageTag/ManageTag.spec.tsx
@@ -50,7 +50,6 @@ vi.mock('react-toastify', () => ({
   },
 }));
 
-/* eslint-disable @typescript-eslint/no-var-requires, @typescript-eslint/no-require-imports */
 vi.mock('../../components/AddPeopleToTag/AddPeopleToTag', async () => {
   return await import('./ManageTagMockComponents/MockAddPeopleToTag');
 });
@@ -58,7 +57,6 @@ vi.mock('../../components/AddPeopleToTag/AddPeopleToTag', async () => {
 vi.mock('../../components/TagActions/TagActions', async () => {
   return await import('./ManageTagMockComponents/MockTagActions');
 });
-/* eslint-enable @typescript-eslint/no-var-requires, @typescript-eslint/no-require-imports */
 
 const renderManageTag = (link: ApolloLink): RenderResult => {
   return render(
diff --git a/src/screens/ManageTag/ManageTag.tsx b/src/screens/ManageTag/ManageTag.tsx
index 7eb6a3221d..6a016bb9cd 100644
--- a/src/screens/ManageTag/ManageTag.tsx
+++ b/src/screens/ManageTag/ManageTag.tsx
@@ -132,7 +132,6 @@ function ManageTag(): JSX.Element {
           };
         },
       ) => {
-        /* istanbul ignore next -- @preserve */
         if (!fetchMoreResult) return prevResult;
 
         return {
@@ -175,7 +174,6 @@ function ManageTag(): JSX.Element {
       toggleUnassignUserTagModal();
       toast.success(t('successfullyUnassigned') as string);
     } catch (error: unknown) {
-      /* istanbul ignore next -- @preserve */
       if (error instanceof Error) {
         toast.error(error.message);
       }
@@ -210,14 +208,12 @@ function ManageTag(): JSX.Element {
         },
       });
 
-      /* istanbul ignore else -- @preserve */
       if (data) {
         toast.success(t('tagUpdationSuccess'));
         userTagAssignedMembersRefetch();
         setEditUserTagModalIsOpen(false);
       }
     } catch (error: unknown) {
-      /* istanbul ignore next -- @preserve */
       if (error instanceof Error) {
         toast.error(error.message);
       }
@@ -237,7 +233,6 @@ function ManageTag(): JSX.Element {
       toggleRemoveUserTagModal();
       toast.success(t('tagRemovalSuccess') as string);
     } catch (error: unknown) {
-      /* istanbul ignore next -- @preserve */
       if (error instanceof Error) {
         toast.error(error.message);
       }
@@ -260,7 +255,7 @@ function ManageTag(): JSX.Element {
   const userTagAssignedMembers =
     userTagAssignedMembersData?.getAssignedUsers.usersAssignedTo.edges.map(
       (edge) => edge.node,
-    ) ?? /* istanbul ignore next -- @preserve */ [];
+    ) ?? [];
 
   // get the ancestorTags array and push the current tag in it
   // used for the tag breadcrumbs
@@ -454,7 +449,6 @@ function ManageTag(): JSX.Element {
                     >
                       {tag.name}
                       {orgUserTagAncestors.length - 1 !== index && (
-                        /* istanbul ignore next -- @preserve */
                         <i className={'mx-2 fa fa-caret-right'} />
                       )}
                     </div>
@@ -470,8 +464,7 @@ function ManageTag(): JSX.Element {
                     next={loadMoreAssignedMembers}
                     hasMore={
                       userTagAssignedMembersData?.getAssignedUsers
-                        .usersAssignedTo.pageInfo.hasNextPage ??
-                      /* istanbul ignore next -- @preserve */ false
+                        .usersAssignedTo.pageInfo.hasNextPage ?? false
                     }
                     loader={<InfiniteScrollLoader />}
                     scrollableTarget="manageTagScrollableDiv"
@@ -482,16 +475,15 @@ function ManageTag(): JSX.Element {
                       hideFooter={true}
                       getRowId={(row) => row.id}
                       slots={{
-                        noRowsOverlay:
-                          /* istanbul ignore next -- @preserve */ () => (
-                            <Stack
-                              height="100%"
-                              alignItems="center"
-                              justifyContent="center"
-                            >
-                              {t('noAssignedMembersFound')}
-                            </Stack>
-                          ),
+                        noRowsOverlay: () => (
+                          <Stack
+                            height="100%"
+                            alignItems="center"
+                            justifyContent="center"
+                          >
+                            {t('noAssignedMembersFound')}
+                          </Stack>
+                        ),
                       }}
                       sx={dataGridStyle}
                       getRowClassName={() => `${styles.rowBackgrounds}`}
diff --git a/src/screens/MemberDetail/MemberDetail.tsx b/src/screens/MemberDetail/MemberDetail.tsx
index cd552c80a0..effd0341e8 100644
--- a/src/screens/MemberDetail/MemberDetail.tsx
+++ b/src/screens/MemberDetail/MemberDetail.tsx
@@ -95,7 +95,6 @@ const MemberDetail: React.FC<MemberDetailProps> = ({ id }): JSX.Element => {
     }
   };
 
-  /*istanbul ignore next*/
   const handleEditIconClick = (): void => {
     fileInputRef.current?.click();
   };
@@ -143,19 +142,16 @@ const MemberDetail: React.FC<MemberDetailProps> = ({ id }): JSX.Element => {
   const tagsAssigned =
     userData?.user?.tagsAssignedWith.edges.map(
       (edge: { node: InterfaceTagData; cursor: string }) => edge.node,
-    ) ?? /* istanbul ignore next */ [];
+    ) ?? [];
 
   const loadMoreAssignedTags = (): void => {
     fetchMoreAssignedTags({
       variables: {
         first: TAGS_QUERY_DATA_CHUNK_SIZE,
-        after:
-          user?.user?.user?.tagsAssignedWith?.pageInfo?.endCursor ??
-          /* istanbul ignore next */
-          null,
+        after: user?.user?.user?.tagsAssignedWith?.pageInfo?.endCursor ?? null,
       },
       updateQuery: (prevResult, { fetchMoreResult }) => {
-        if (!fetchMoreResult) /* istanbul ignore next */ return prevResult;
+        if (!fetchMoreResult) return prevResult;
 
         return {
           user: {
@@ -193,7 +189,6 @@ const MemberDetail: React.FC<MemberDetailProps> = ({ id }): JSX.Element => {
       toggleUnassignUserTagModal();
       toast.success(t('successfullyUnassigned'));
     } catch (error: unknown) {
-      /* istanbul ignore next */
       if (error instanceof Error) {
         toast.error(error.message);
       }
@@ -211,7 +206,7 @@ const MemberDetail: React.FC<MemberDetailProps> = ({ id }): JSX.Element => {
     e: React.ChangeEvent<HTMLInputElement | HTMLSelectElement>,
   ): Promise<void> => {
     const { name, value } = e.target;
-    /*istanbul ignore next*/
+
     if (
       name === 'photo' &&
       'files' in e.target &&
@@ -251,7 +246,7 @@ const MemberDetail: React.FC<MemberDetailProps> = ({ id }): JSX.Element => {
             ...formState,
           },
         });
-        /* istanbul ignore next */
+
         if (data) {
           setisUpdated(false);
           if (getItem('id') === currentUrl) {
@@ -268,14 +263,12 @@ const MemberDetail: React.FC<MemberDetailProps> = ({ id }): JSX.Element => {
         }
       }
     } catch (error: unknown) {
-      /* istanbul ignore next */
       if (error instanceof Error) {
         errorHandler(t, error);
       }
     }
   };
   const resetChanges = (): void => {
-    /*istanbul ignore next*/
     setFormState({
       firstName: userData?.user?.firstName || '',
       lastName: userData?.user?.lastName || '',
@@ -351,9 +344,8 @@ const MemberDetail: React.FC<MemberDetailProps> = ({ id }): JSX.Element => {
                       role="button"
                       aria-label="Edit profile picture"
                       tabIndex={0}
-                      onKeyDown={
-                        /*istanbul ignore next*/
-                        (e) => e.key === 'Enter' && handleEditIconClick()
+                      onKeyDown={(e) =>
+                        e.key === 'Enter' && handleEditIconClick()
                       }
                     />
                   </div>
@@ -633,7 +625,6 @@ const MemberDetail: React.FC<MemberDetailProps> = ({ id }): JSX.Element => {
                   next={loadMoreAssignedTags}
                   hasMore={
                     userData?.user?.tagsAssignedWith.pageInfo.hasNextPage ??
-                    /* istanbul ignore next */
                     false
                   }
                   loader={<InfiniteScrollLoader />}
diff --git a/src/screens/OrgList/OrganizationModal.tsx b/src/screens/OrgList/OrganizationModal.tsx
index fb3589d1e5..1f2306fe96 100644
--- a/src/screens/OrgList/OrganizationModal.tsx
+++ b/src/screens/OrgList/OrganizationModal.tsx
@@ -278,7 +278,7 @@ const OrganizationModal: React.FC<InterfaceOrganizationModalProps> = ({
             onChange={async (e: React.ChangeEvent): Promise<void> => {
               const target = e.target as HTMLInputElement;
               const file = target.files && target.files[0];
-              /* istanbul ignore else */
+
               if (file)
                 setFormState({
                   ...formState,
diff --git a/src/screens/OrgPost/OrgPost.tsx b/src/screens/OrgPost/OrgPost.tsx
index e9cb4d4ca2..850d8cf9ed 100644
--- a/src/screens/OrgPost/OrgPost.tsx
+++ b/src/screens/OrgPost/OrgPost.tsx
@@ -168,7 +168,6 @@ function orgPost(): JSX.Element {
         },
       });
 
-      /* istanbul ignore next */
       if (data) {
         toast.success(t('postCreatedSuccess') as string);
         refetch();
@@ -274,7 +273,7 @@ function orgPost(): JSX.Element {
     if (a.pinned === b.pinned) {
       return 0;
     }
-    /* istanbul ignore next */
+
     if (a.pinned) {
       return -1;
     }
diff --git a/src/screens/OrgSettings/OrgSettings.tsx b/src/screens/OrgSettings/OrgSettings.tsx
index c7b01138ae..916bd04dff 100644
--- a/src/screens/OrgSettings/OrgSettings.tsx
+++ b/src/screens/OrgSettings/OrgSettings.tsx
@@ -81,10 +81,7 @@ function OrgSettings(): JSX.Element {
               {settingtabs.map((setting, index) => (
                 <Dropdown.Item
                   key={index}
-                  onClick={
-                    /* istanbul ignore next */
-                    () => setTab(setting)
-                  }
+                  onClick={() => setTab(setting)}
                   className={tab === setting ? 'text-secondary' : ''}
                 >
                   {t(setting)}
diff --git a/src/screens/OrganizationActionItems/ItemModal.tsx b/src/screens/OrganizationActionItems/ItemModal.tsx
index b7555af121..b59662c81f 100644
--- a/src/screens/OrganizationActionItems/ItemModal.tsx
+++ b/src/screens/OrganizationActionItems/ItemModal.tsx
@@ -404,7 +404,6 @@ const ItemModal: FC<InterfaceItemModalProps> = ({
                 item.name
               }
               onChange={(_, newCategory): void => {
-                /* istanbul ignore next */
                 handleFormChange(
                   'actionItemCategoryId',
                   newCategory?._id ?? '',
@@ -507,7 +506,6 @@ const ItemModal: FC<InterfaceItemModalProps> = ({
                       `${volunteer.user.firstName} ${volunteer.user.lastName}`
                     }
                     onChange={(_, newAssignee): void => {
-                      /* istanbul ignore next */
                       handleFormChange('assigneeId', newAssignee?._id ?? '');
                       setAssignee(newAssignee);
                     }}
@@ -531,7 +529,6 @@ const ItemModal: FC<InterfaceItemModalProps> = ({
                       group: InterfaceVolunteerGroupInfo,
                     ): string => `${group.name}`}
                     onChange={(_, newAssignee): void => {
-                      /* istanbul ignore next */
                       handleFormChange('assigneeId', newAssignee?._id ?? '');
                       setAssigneeGroup(newAssignee);
                     }}
@@ -559,7 +556,6 @@ const ItemModal: FC<InterfaceItemModalProps> = ({
                       `${member.firstName} ${member.lastName}`
                     }
                     onChange={(_, newAssignee): void => {
-                      /* istanbul ignore next */
                       handleFormChange('assigneeId', newAssignee?._id ?? '');
                       setAssigneeUser(newAssignee);
                     }}
@@ -578,7 +574,6 @@ const ItemModal: FC<InterfaceItemModalProps> = ({
                   className={styles.noOutline}
                   value={dayjs(dueDate)}
                   onChange={(date: Dayjs | null): void => {
-                    /* istanbul ignore next */
                     if (date) handleFormChange('dueDate', date.toDate());
                   }}
                 />
diff --git a/src/screens/OrganizationDashboard/OrganizationDashboard.tsx b/src/screens/OrganizationDashboard/OrganizationDashboard.tsx
index abc712289c..ccd4794ecc 100644
--- a/src/screens/OrganizationDashboard/OrganizationDashboard.tsx
+++ b/src/screens/OrganizationDashboard/OrganizationDashboard.tsx
@@ -210,12 +210,9 @@ function OrganizationDashboard(): JSX.Element {
                 sm={4}
                 role="button"
                 className="mb-4"
-                onClick={
-                  /*istanbul ignore next*/
-                  (): void => {
-                    navigate(peopleLink);
-                  }
-                }
+                onClick={(): void => {
+                  navigate(peopleLink);
+                }}
               >
                 <DashBoardCard
                   count={data?.organizations[0].admins?.length}
@@ -347,12 +344,10 @@ function OrganizationDashboard(): JSX.Element {
                       return <CardItemLoading key={`postLoading_${index}`} />;
                     })
                   ) : postData?.organizations[0].posts.totalCount == 0 ? (
-                    /* eslint-disable */
                     <div className={styles.emptyContainer}>
                       <h6>{t('noPostsPresent')}</h6>
                     </div>
                   ) : (
-                    /* eslint-enable */
                     postData?.organizations[0].posts.edges
                       .slice(0, 5)
                       .map((edge) => {
diff --git a/src/screens/OrganizationEvents/OrganizationEvents.tsx b/src/screens/OrganizationEvents/OrganizationEvents.tsx
index 12abb3e74a..aca8ca6d24 100644
--- a/src/screens/OrganizationEvents/OrganizationEvents.tsx
+++ b/src/screens/OrganizationEvents/OrganizationEvents.tsx
@@ -101,7 +101,6 @@ function organizationEvents(): JSX.Element {
     setCreateEventmodalisOpen(false);
   };
   const handleChangeView = (item: string | null): void => {
-    /*istanbul ignore next*/
     if (item) {
       setViewType(item as ViewType);
     }
@@ -221,7 +220,6 @@ function organizationEvents(): JSX.Element {
           setEndDate(new Date());
         }
       } catch (error: unknown) {
-        /* istanbul ignore next */
         if (error instanceof Error) {
           console.log(error.message);
           errorHandler(t, error);
@@ -384,18 +382,14 @@ function organizationEvents(): JSX.Element {
                     className={styles.datebox}
                     timeSteps={{ hours: 1, minutes: 1, seconds: 1 }}
                     value={timeToDayJs(formState.startTime)}
-                    /*istanbul ignore next*/
                     onChange={(time): void => {
                       if (time) {
                         setFormState({
                           ...formState,
                           startTime: time?.format('HH:mm:ss'),
                           endTime:
-                            /*istanbul ignore next*/
                             timeToDayJs(formState.endTime) < time
-                              ? /* istanbul ignore next */ time?.format(
-                                  'HH:mm:ss',
-                                )
+                              ? time?.format('HH:mm:ss')
                               : formState.endTime,
                         });
                       }
@@ -408,7 +402,6 @@ function organizationEvents(): JSX.Element {
                     label={tCommon('endTime')}
                     className={styles.datebox}
                     timeSteps={{ hours: 1, minutes: 1, seconds: 1 }}
-                    /*istanbul ignore next*/
                     value={timeToDayJs(formState.endTime)}
                     onChange={(time): void => {
                       if (time) {
diff --git a/src/screens/OrganizationFundCampaign/CampaignModal.tsx b/src/screens/OrganizationFundCampaign/CampaignModal.tsx
index 63d1e8de3a..e2d9333395 100644
--- a/src/screens/OrganizationFundCampaign/CampaignModal.tsx
+++ b/src/screens/OrganizationFundCampaign/CampaignModal.tsx
@@ -127,7 +127,7 @@ const CampaignModal: React.FC<InterfaceCampaignModal> = ({
    * @param e - The form event.
    * @returns Promise<void>
    */
-  /*istanbul ignore next*/
+
   const updateCampaignHandler = async (
     e: ChangeEvent<HTMLFormElement>,
   ): Promise<void> => {
@@ -263,15 +263,12 @@ const CampaignModal: React.FC<InterfaceCampaignModal> = ({
                   value={campaignCurrency}
                   label={t('currency')}
                   data-testid="currencySelect"
-                  onChange={
-                    /*istanbul ignore next*/
-                    (e) => {
-                      setFormState({
-                        ...formState,
-                        campaignCurrency: e.target.value,
-                      });
-                    }
-                  }
+                  onChange={(e) => {
+                    setFormState({
+                      ...formState,
+                      campaignCurrency: e.target.value,
+                    });
+                  }}
                 >
                   {currencyOptions.map((currency) => (
                     <MenuItem key={currency.label} value={currency.value}>
diff --git a/src/screens/OrganizationFunds/FundModal.tsx b/src/screens/OrganizationFunds/FundModal.tsx
index b33270b30f..a11da16f46 100644
--- a/src/screens/OrganizationFunds/FundModal.tsx
+++ b/src/screens/OrganizationFunds/FundModal.tsx
@@ -115,7 +115,6 @@ const FundModal: React.FC<InterfaceFundModal> = ({
     }
   };
 
-  /*istanbul ignore next*/
   const updateFundHandler = async (
     e: ChangeEvent<HTMLFormElement>,
   ): Promise<void> => {
diff --git a/src/screens/OrganizationPeople/OrganizationPeople.tsx b/src/screens/OrganizationPeople/OrganizationPeople.tsx
index 36efdba63c..6f606e8055 100644
--- a/src/screens/OrganizationPeople/OrganizationPeople.tsx
+++ b/src/screens/OrganizationPeople/OrganizationPeople.tsx
@@ -125,7 +125,6 @@ function organizationPeople(): JSX.Element {
     }
   }, [state, adminData]);
 
-  /* istanbul ignore next */
   if (memberError || usersError || adminError) {
     const error = memberError ?? usersError ?? adminError;
     toast.error(error?.message);
@@ -140,7 +139,7 @@ function organizationPeople(): JSX.Element {
 
   const handleFullNameSearchChange = (e: React.FormEvent): void => {
     e.preventDefault();
-    /* istanbul ignore next */
+
     const [firstName, lastName] = userName.split(' ');
     const newFilterData = {
       firstName_contains: firstName || '',
diff --git a/src/screens/OrganizationTags/OrganizationTags.tsx b/src/screens/OrganizationTags/OrganizationTags.tsx
index c88ca7b821..41eb449cdf 100644
--- a/src/screens/OrganizationTags/OrganizationTags.tsx
+++ b/src/screens/OrganizationTags/OrganizationTags.tsx
@@ -84,7 +84,6 @@ function OrganizationTags(): JSX.Element {
         first: TAGS_QUERY_DATA_CHUNK_SIZE,
         after:
           orgUserTagsData?.organizations?.[0]?.userTags?.pageInfo?.endCursor ??
-          /* istanbul ignore next */
           null,
       },
       updateQuery: (
@@ -97,7 +96,7 @@ function OrganizationTags(): JSX.Element {
           };
         },
       ) => {
-        if (!fetchMoreResult) /* istanbul ignore next */ return prevResult;
+        if (!fetchMoreResult) return prevResult;
 
         return {
           organizations: [
@@ -148,7 +147,6 @@ function OrganizationTags(): JSX.Element {
         setCreateTagModalIsOpen(false);
       }
     } catch (error: unknown) {
-      /* istanbul ignore next */
       if (error instanceof Error) {
         toast.error(error.message);
       }
@@ -380,7 +378,7 @@ function OrganizationTags(): JSX.Element {
                   next={loadMoreUserTags}
                   hasMore={
                     orgUserTagsData?.organizations?.[0]?.userTags?.pageInfo
-                      ?.hasNextPage ?? /* istanbul ignore next */ false
+                      ?.hasNextPage ?? false
                   }
                   loader={<InfiniteScrollLoader />}
                   scrollableTarget="orgUserTagsScrollableDiv"
@@ -391,7 +389,7 @@ function OrganizationTags(): JSX.Element {
                     hideFooter={true}
                     getRowId={(row) => row.id}
                     slots={{
-                      noRowsOverlay: /* istanbul ignore next */ () => (
+                      noRowsOverlay: () => (
                         <Stack
                           height="100%"
                           alignItems="center"
diff --git a/src/screens/OrganizationVenues/OrganizationVenues.tsx b/src/screens/OrganizationVenues/OrganizationVenues.tsx
index b3afda9685..80d9ffb7ff 100644
--- a/src/screens/OrganizationVenues/OrganizationVenues.tsx
+++ b/src/screens/OrganizationVenues/OrganizationVenues.tsx
@@ -78,7 +78,6 @@ function organizationVenues(): JSX.Element {
       });
       venueRefetch();
     } catch (error) {
-      /* istanbul ignore next */
       errorHandler(t, error);
     }
   };
@@ -128,7 +127,7 @@ function organizationVenues(): JSX.Element {
   };
 
   // Error handling for venue data fetch
-  /* istanbul ignore next */
+
   if (venueError) {
     errorHandler(t, venueError);
   }
diff --git a/src/screens/Requests/Requests.tsx b/src/screens/Requests/Requests.tsx
index b078b2cbc0..f4fb673c7a 100644
--- a/src/screens/Requests/Requests.tsx
+++ b/src/screens/Requests/Requests.tsx
@@ -180,7 +180,7 @@ const Requests = (): JSX.Element => {
   /**
    * Loads more requests when scrolling to the bottom of the page.
    */
-  /* istanbul ignore next */
+
   const loadMoreRequests = (): void => {
     setIsLoadingMore(true);
     fetchMore({
diff --git a/src/screens/SubTags/SubTags.tsx b/src/screens/SubTags/SubTags.tsx
index 6a20e875ec..f3aff01dd8 100644
--- a/src/screens/SubTags/SubTags.tsx
+++ b/src/screens/SubTags/SubTags.tsx
@@ -93,7 +93,6 @@ function SubTags(): JSX.Element {
           fetchMoreResult?: { getChildTags: InterfaceQueryUserTagChildTags };
         },
       ) => {
-        /* istanbul ignore next -- @preserve */
         if (!fetchMoreResult) return prevResult;
 
         return {
@@ -127,7 +126,6 @@ function SubTags(): JSX.Element {
         },
       });
 
-      /* istanbul ignore next -- @preserve */
       if (data) {
         toast.success(t('tagCreationSuccess') as string);
         subTagsRefetch();
@@ -135,7 +133,6 @@ function SubTags(): JSX.Element {
         setAddSubTagModalIsOpen(false);
       }
     } catch (error: unknown) {
-      /* istanbul ignore next -- @preserve */
       if (error instanceof Error) {
         toast.error(error.message);
       }
@@ -156,7 +153,6 @@ function SubTags(): JSX.Element {
   }
 
   const subTagsList =
-    /* istanbul ignore next -- @preserve */
     subTagsData?.getChildTags.childTags.edges.map((edge) => edge.node) ?? [];
 
   const parentTagName = subTagsData?.getChildTags.name;
@@ -395,7 +391,6 @@ function SubTags(): JSX.Element {
                   next={loadMoreSubTags}
                   hasMore={
                     subTagsData?.getChildTags.childTags.pageInfo.hasNextPage ??
-                    /* istanbul ignore next -- @preserve */
                     false
                   }
                   loader={<InfiniteScrollLoader />}
@@ -407,16 +402,15 @@ function SubTags(): JSX.Element {
                     hideFooter={true}
                     getRowId={(row) => row.id}
                     slots={{
-                      noRowsOverlay:
-                        /* istanbul ignore next -- @preserve */ () => (
-                          <Stack
-                            height="100%"
-                            alignItems="center"
-                            justifyContent="center"
-                          >
-                            {t('noTagsFound')}
-                          </Stack>
-                        ),
+                      noRowsOverlay: () => (
+                        <Stack
+                          height="100%"
+                          alignItems="center"
+                          justifyContent="center"
+                        >
+                          {t('noTagsFound')}
+                        </Stack>
+                      ),
                     }}
                     sx={dataGridStyle}
                     getRowClassName={() => `${styles.rowBackground}`}
diff --git a/src/screens/UserPortal/Campaigns/PledgeModal.tsx b/src/screens/UserPortal/Campaigns/PledgeModal.tsx
index 44cc82401b..b0bb284050 100644
--- a/src/screens/UserPortal/Campaigns/PledgeModal.tsx
+++ b/src/screens/UserPortal/Campaigns/PledgeModal.tsx
@@ -133,7 +133,7 @@ const PledgeModal: React.FC<InterfacePledgeModal> = ({
    * @param e - The form submission event.
    * @returns A promise that resolves when the pledge is successfully updated.
    */
-  /*istanbul ignore next*/
+
   const updatePledgeHandler = useCallback(
     async (e: ChangeEvent<HTMLFormElement>): Promise<void> => {
       e.preventDefault();
@@ -209,7 +209,6 @@ const PledgeModal: React.FC<InterfacePledgeModal> = ({
         });
         hide();
       } catch (error: unknown) {
-        /*istanbul ignore next*/
         toast.error((error as Error).message);
       }
     },
@@ -255,15 +254,12 @@ const PledgeModal: React.FC<InterfacePledgeModal> = ({
               getOptionLabel={(member: InterfaceUserInfo): string =>
                 `${member.firstName} ${member.lastName}`
               }
-              onChange={
-                /*istanbul ignore next*/
-                (_, newPledgers): void => {
-                  setFormState({
-                    ...formState,
-                    pledgeUsers: newPledgers,
-                  });
-                }
-              }
+              onChange={(_, newPledgers): void => {
+                setFormState({
+                  ...formState,
+                  pledgeUsers: newPledgers,
+                });
+              }}
               renderInput={(params) => (
                 <TextField {...params} label="Pledgers" />
               )}
@@ -283,7 +279,6 @@ const PledgeModal: React.FC<InterfacePledgeModal> = ({
                     pledgeStartDate: date.toDate(),
                     pledgeEndDate:
                       pledgeEndDate &&
-                      /*istanbul ignore next*/
                       (pledgeEndDate < date?.toDate()
                         ? date.toDate()
                         : pledgeEndDate),
@@ -322,15 +317,12 @@ const PledgeModal: React.FC<InterfacePledgeModal> = ({
                 value={pledgeCurrency}
                 label={t('currency')}
                 data-testid="currencySelect"
-                onChange={
-                  /*istanbul ignore next*/
-                  (e) => {
-                    setFormState({
-                      ...formState,
-                      pledgeCurrency: e.target.value,
-                    });
-                  }
-                }
+                onChange={(e) => {
+                  setFormState({
+                    ...formState,
+                    pledgeCurrency: e.target.value,
+                  });
+                }}
               >
                 {currencyOptions.map((currency) => (
                   <MenuItem key={currency.label} value={currency.value}>
diff --git a/src/screens/UserPortal/Chat/Chat.tsx b/src/screens/UserPortal/Chat/Chat.tsx
index 441ce7d4ba..5679e7f4c8 100644
--- a/src/screens/UserPortal/Chat/Chat.tsx
+++ b/src/screens/UserPortal/Chat/Chat.tsx
@@ -1,8 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import { useQuery } from '@apollo/client';
-import { useTranslation } from 'react-i18next';
 import { Button, Dropdown } from 'react-bootstrap';
-import { SearchOutlined, Search } from '@mui/icons-material';
 import HourglassBottomIcon from '@mui/icons-material/HourglassBottom';
 import ContactCard from 'components/UserPortal/ContactCard/ContactCard';
 import ChatRoom from 'components/UserPortal/ChatRoom/ChatRoom';
@@ -48,15 +46,45 @@ interface InterfaceContactCardProps {
  *
  * @returns  The rendered `chat` component.
  */
+type DirectMessage = {
+  _id: string;
+  createdAt: Date;
+  sender: {
+    _id: string;
+    firstName: string;
+    lastName: string;
+    image: string;
+  };
+  messageContent: string;
+};
+type Chat = {
+  _id: string;
+  isGroup: boolean;
+  name: string;
+  image: string;
+  messages: DirectMessage[];
+  organization: {
+    _id: string;
+    name: string;
+  };
+  creator: {
+    _id: string;
+    firstName: string;
+    lastName: string;
+    email: string;
+  };
+  users: {
+    _id: string;
+    firstName: string;
+    lastName: string;
+    email: string;
+    image: string;
+  }[];
+};
 export default function chat(): JSX.Element {
-  const { t } = useTranslation('translation', {
-    keyPrefix: 'chat',
-  });
-  const { t: tCommon } = useTranslation('common');
-
   const [hideDrawer, setHideDrawer] = useState<boolean | null>(null);
-  const [chats, setChats] = useState<any>([]);
-  const [selectedContact, setSelectedContact] = useState('');
+  const [chats, setChats] = useState<Chat[]>([]);
+  const [selectedContact, setSelectedContact] = useState<string>('');
   const { getItem } = useLocalStorage();
   const userId = getItem('userId');
 
@@ -81,7 +109,7 @@ export default function chat(): JSX.Element {
     setCreateDirectChatModalisOpen(true);
   }
 
-  const toggleCreateDirectChatModal = /* istanbul ignore next */ (): void =>
+  const toggleCreateDirectChatModal = (): void =>
     setCreateDirectChatModalisOpen(!createDirectChatModalisOpen);
 
   const [createGroupChatModalisOpen, setCreateGroupChatModalisOpen] =
@@ -91,7 +119,7 @@ export default function chat(): JSX.Element {
     setCreateGroupChatModalisOpen(true);
   }
 
-  const toggleCreateGroupChatModal = /* istanbul ignore next */ (): void => {
+  const toggleCreateGroupChatModal = (): void => {
     setCreateGroupChatModalisOpen(!createGroupChatModalisOpen);
   };
 
@@ -196,7 +224,7 @@ export default function chat(): JSX.Element {
                   className={styles.contactCardContainer}
                 >
                   {!!chats.length &&
-                    chats.map((chat: any) => {
+                    chats.map((chat: Chat) => {
                       const cardProps: InterfaceContactCardProps = {
                         id: chat._id,
                         title: !chat.isGroup
diff --git a/src/screens/UserPortal/Donate/Donate.tsx b/src/screens/UserPortal/Donate/Donate.tsx
index c6e6d918d5..dc7499a112 100644
--- a/src/screens/UserPortal/Donate/Donate.tsx
+++ b/src/screens/UserPortal/Donate/Donate.tsx
@@ -97,7 +97,6 @@ export default function donate(): JSX.Element {
 
   const [donate] = useMutation(DONATE_TO_ORGANIZATION);
 
-  /* istanbul ignore next */
   const handleChangePage = (
     _event: React.MouseEvent<HTMLButtonElement> | null,
     newPage: number,
@@ -105,7 +104,6 @@ export default function donate(): JSX.Element {
     setPage(newPage);
   };
 
-  /* istanbul ignore next */
   const handleChangeRowsPerPage = (
     event: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>,
   ): void => {
@@ -164,7 +162,6 @@ export default function donate(): JSX.Element {
       refetch();
       toast.success(t(`success`) as string);
     } catch (error: unknown) {
-      /* istanbul ignore next */
       errorHandler(t, error);
     }
   };
@@ -270,8 +267,7 @@ export default function donate(): JSX.Element {
                             page * rowsPerPage,
                             page * rowsPerPage + rowsPerPage,
                           )
-                        : /* istanbul ignore next */
-                          donations
+                        : donations
                       ).map((donation: InterfaceDonation, index) => {
                         const cardProps: InterfaceDonationCardProps = {
                           name: donation.nameOfUser,
@@ -297,10 +293,7 @@ export default function donate(): JSX.Element {
                 <tbody>
                   <tr>
                     <PaginationList
-                      count={
-                        /* istanbul ignore next */
-                        donations ? donations.length : 0
-                      }
+                      count={donations ? donations.length : 0}
                       rowsPerPage={rowsPerPage}
                       page={page}
                       onPageChange={handleChangePage}
diff --git a/src/screens/UserPortal/Events/Events.tsx b/src/screens/UserPortal/Events/Events.tsx
index d3fabf9469..b72edeea70 100644
--- a/src/screens/UserPortal/Events/Events.tsx
+++ b/src/screens/UserPortal/Events/Events.tsx
@@ -120,7 +120,6 @@ export default function events(): JSX.Element {
         },
       });
 
-      /* istanbul ignore next */
       if (createEventData) {
         toast.success(t('eventCreated') as string);
         refetch();
@@ -134,7 +133,6 @@ export default function events(): JSX.Element {
       }
       setCreateEventmodalisOpen(false);
     } catch (error: unknown) {
-      /* istanbul ignore next */
       errorHandler(t, error);
     }
   };
@@ -144,7 +142,7 @@ export default function events(): JSX.Element {
    *
    * @returns Void.
    */
-  /* istanbul ignore next */
+
   const toggleCreateEventModal = (): void =>
     setCreateEventmodalisOpen(!createEventModal);
 
@@ -185,7 +183,7 @@ export default function events(): JSX.Element {
   };
 
   // Update the list of events when the data from the query changes
-  /* istanbul ignore next */
+
   React.useEffect(() => {
     if (data) {
       setEvents(data.eventsByOrganizationConnection);
@@ -197,7 +195,7 @@ export default function events(): JSX.Element {
    *
    * @returns Void.
    */
-  /* istanbul ignore next */
+
   const showInviteModal = (): void => {
     setCreateEventmodalisOpen(true);
   };
@@ -208,9 +206,8 @@ export default function events(): JSX.Element {
    * @param item - The view type to set, or null to reset.
    * @returns Void.
    */
-  /* istanbul ignore next */
+
   const handleChangeView = (item: string | null): void => {
-    /*istanbul ignore next*/
     if (item) {
       setViewType(item as ViewType);
     }
diff --git a/src/screens/UserPortal/Organizations/Organizations.tsx b/src/screens/UserPortal/Organizations/Organizations.tsx
index 59f5500d02..50b9cfcbeb 100644
--- a/src/screens/UserPortal/Organizations/Organizations.tsx
+++ b/src/screens/UserPortal/Organizations/Organizations.tsx
@@ -139,7 +139,7 @@ export default function organizations(): JSX.Element {
    * @param _event - The event triggering the page change.
    * @param  newPage - The new page number.
    */
-  /* istanbul ignore next */
+
   const handleChangePage = (
     _event: React.MouseEvent<HTMLButtonElement> | null,
     newPage: number,
@@ -152,7 +152,7 @@ export default function organizations(): JSX.Element {
    *
    * @param  event - The event triggering the change.
    */
-  /* istanbul ignore next */
+
   const handleChangeRowsPerPage = (
     event: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>,
   ): void => {
@@ -202,7 +202,7 @@ export default function organizations(): JSX.Element {
   /**
    * Updates the list of organizations based on query results and selected mode.
    */
-  /* istanbul ignore next */
+
   useEffect(() => {
     if (data) {
       const organizations = data.organizationsConnection.map(
@@ -231,7 +231,7 @@ export default function organizations(): JSX.Element {
   /**
    * Updates the list of organizations based on the selected mode and query results.
    */
-  /* istanbul ignore next */
+
   useEffect(() => {
     if (mode === 0) {
       if (data) {
@@ -379,8 +379,7 @@ export default function organizations(): JSX.Element {
                           page * rowsPerPage,
                           page * rowsPerPage + rowsPerPage,
                         )
-                      : /* istanbul ignore next */
-                        organizations
+                      : organizations
                     ).map((organization: InterfaceOrganization, index) => {
                       const cardProps: InterfaceOrganizationCardProps = {
                         name: organization.name,
@@ -408,10 +407,7 @@ export default function organizations(): JSX.Element {
               <tbody>
                 <tr>
                   <PaginationList
-                    count={
-                      /* istanbul ignore next */
-                      organizations ? organizations.length : 0
-                    }
+                    count={organizations ? organizations.length : 0}
                     rowsPerPage={rowsPerPage}
                     page={page}
                     onPageChange={handleChangePage}
diff --git a/src/screens/UserPortal/People/People.tsx b/src/screens/UserPortal/People/People.tsx
index 4904e75b20..e54b469488 100644
--- a/src/screens/UserPortal/People/People.tsx
+++ b/src/screens/UserPortal/People/People.tsx
@@ -79,7 +79,7 @@ export default function people(): JSX.Element {
    * Handles page change in pagination.
    *
    */
-  /* istanbul ignore next */
+
   const handleChangePage = (
     _event: React.MouseEvent<HTMLButtonElement> | null,
     newPage: number,
@@ -91,7 +91,7 @@ export default function people(): JSX.Element {
    * Handles change in the number of rows per page.
    *
    */
-  /* istanbul ignore next */
+
   const handleChangeRowsPerPage = (
     event: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>,
   ): void => {
@@ -143,7 +143,7 @@ export default function people(): JSX.Element {
   /**
    * Updates the list of members based on the selected filter mode.
    */
-  /* istanbul ignore next */
+
   useEffect(() => {
     if (mode == 0) {
       if (data) {
@@ -233,8 +233,7 @@ export default function people(): JSX.Element {
                           page * rowsPerPage,
                           page * rowsPerPage + rowsPerPage,
                         )
-                      : /* istanbul ignore next */
-                        members
+                      : members
                     ).map((member: InterfaceMember, index) => {
                       const name = `${member.firstName} ${member.lastName}`;
 
@@ -258,10 +257,7 @@ export default function people(): JSX.Element {
               <tbody>
                 <tr>
                   <PaginationList
-                    count={
-                      /* istanbul ignore next */
-                      members ? members.length : 0
-                    }
+                    count={members ? members.length : 0}
                     rowsPerPage={rowsPerPage}
                     page={page}
                     onPageChange={handleChangePage}
diff --git a/src/screens/UserPortal/Settings/Settings.tsx b/src/screens/UserPortal/Settings/Settings.tsx
index cc222468fc..404332dc5e 100644
--- a/src/screens/UserPortal/Settings/Settings.tsx
+++ b/src/screens/UserPortal/Settings/Settings.tsx
@@ -92,7 +92,6 @@ export default function settings(): JSX.Element {
    * and reloads the page on success.
    */
 
-  /*istanbul ignore next*/
   const handleUpdateUserDetails = async (): Promise<void> => {
     try {
       let updatedUserDetails = { ...userDetails };
@@ -102,7 +101,7 @@ export default function settings(): JSX.Element {
       const { data } = await updateUserDetails({
         variables: updatedUserDetails,
       });
-      /* istanbul ignore next */
+
       if (data) {
         toast.success(
           tCommon('updatedSuccessfully', { item: 'Profile' }) as string,
@@ -114,7 +113,6 @@ export default function settings(): JSX.Element {
         setItem('name', userFullName);
       }
     } catch (error: unknown) {
-      /*istanbul ignore next*/
       errorHandler(t, error);
     }
   };
@@ -148,7 +146,7 @@ export default function settings(): JSX.Element {
    */
   const handleResetChanges = (): void => {
     setisUpdated(false);
-    /* istanbul ignore next */
+
     if (data) {
       const {
         firstName,
@@ -182,7 +180,6 @@ export default function settings(): JSX.Element {
   };
 
   useEffect(() => {
-    /* istanbul ignore next */
     if (data) {
       const {
         firstName,
@@ -304,9 +301,8 @@ export default function settings(): JSX.Element {
                             role="button"
                             aria-label="Edit profile picture"
                             tabIndex={0}
-                            onKeyDown={
-                              /*istanbul ignore next*/
-                              (e) => e.key === 'Enter' && handleImageUpload()
+                            onKeyDown={(e) =>
+                              e.key === 'Enter' && handleImageUpload()
                             }
                           />
                         </div>
@@ -320,18 +316,15 @@ export default function settings(): JSX.Element {
                         data-testid="fileInput"
                         multiple={false}
                         ref={fileInputRef}
-                        onChange={
-                          /* istanbul ignore next */
-                          async (
-                            e: React.ChangeEvent<HTMLInputElement>,
-                          ): Promise<void> => {
-                            const file = e.target?.files?.[0];
-                            if (file) {
-                              const image = await convertToBase64(file);
-                              setUserDetails({ ...userDetails, image });
-                            }
+                        onChange={async (
+                          e: React.ChangeEvent<HTMLInputElement>,
+                        ): Promise<void> => {
+                          const file = e.target?.files?.[0];
+                          if (file) {
+                            const image = await convertToBase64(file);
+                            setUserDetails({ ...userDetails, image });
                           }
-                        }
+                        }}
                         style={{ display: 'none' }}
                       />
                     </Col>
diff --git a/src/screens/UserPortal/Volunteer/UpcomingEvents/UpcomingEvents.tsx b/src/screens/UserPortal/Volunteer/UpcomingEvents/UpcomingEvents.tsx
index bd61ca97e0..fc75ee0718 100644
--- a/src/screens/UserPortal/Volunteer/UpcomingEvents/UpcomingEvents.tsx
+++ b/src/screens/UserPortal/Volunteer/UpcomingEvents/UpcomingEvents.tsx
@@ -272,15 +272,12 @@ const UpcomingEvents = (): JSX.Element => {
                 </div>
               </AccordionSummary>
               <AccordionDetails className="d-flex gap-3 flex-column">
-                {
-                  /*istanbul ignore next*/
-                  description && (
-                    <div className="d-flex gap-3">
-                      <span>Description: </span>
-                      <span>{description}</span>
-                    </div>
-                  )
-                }
+                {description && (
+                  <div className="d-flex gap-3">
+                    <span>Description: </span>
+                    <span>{description}</span>
+                  </div>
+                )}
                 {volunteerGroups && volunteerGroups.length > 0 && (
                   <Form.Group>
                     <Form.Label
diff --git a/src/screens/UserPortal/Volunteer/VolunteerManagement.tsx b/src/screens/UserPortal/Volunteer/VolunteerManagement.tsx
index 87be9d7adc..fd90584d62 100644
--- a/src/screens/UserPortal/Volunteer/VolunteerManagement.tsx
+++ b/src/screens/UserPortal/Volunteer/VolunteerManagement.tsx
@@ -151,10 +151,7 @@ const VolunteerManagement = (): JSX.Element => {
               {volunteerDashboardTabs.map(({ value, icon }, index) => (
                 <Dropdown.Item
                   key={index}
-                  onClick={
-                    /* istanbul ignore next */
-                    () => setTab(value)
-                  }
+                  onClick={() => setTab(value)}
                   className={`d-flex gap-2 ${tab === value && 'text-secondary'}`}
                 >
                   {icon} {t(value)}
diff --git a/src/screens/Users/Users.tsx b/src/screens/Users/Users.tsx
index b046679a00..e847e8c1fe 100644
--- a/src/screens/Users/Users.tsx
+++ b/src/screens/Users/Users.tsx
@@ -196,7 +196,7 @@ const Users = (): JSX.Element => {
     const inputValue = inputElement?.value || '';
     handleSearch(inputValue);
   };
-  /* istanbul ignore next */
+
   const resetAndRefetch = (): void => {
     refetchUsers({
       first: perPageResult,
@@ -207,7 +207,7 @@ const Users = (): JSX.Element => {
     });
     setHasMore(true);
   };
-  /* istanbul ignore next */
+
   const loadMoreUsers = (): void => {
     setIsLoadingMore(true);
     fetchMore({
@@ -440,10 +440,7 @@ const Users = (): JSX.Element => {
             />
           )}
           <InfiniteScroll
-            dataLength={
-              /* istanbul ignore next */
-              displayedUsers.length ?? 0
-            }
+            dataLength={displayedUsers.length ?? 0}
             next={loadMoreUsers}
             loader={
               <TableLoader
diff --git a/src/utils/getOrganizationId.ts b/src/utils/getOrganizationId.ts
index 0a7c283e39..e82b86e1b0 100644
--- a/src/utils/getOrganizationId.ts
+++ b/src/utils/getOrganizationId.ts
@@ -1,4 +1,3 @@
-/* istanbul ignore next */
 const getOrganizationId = (url: string): string => {
   const id = url?.split('=')[1];
 

From 1e7ea138dc0fe46d9bfe3932809fb75f619bd159 Mon Sep 17 00:00:00 2001
From: im-vedant <194vedantgutpa@gmail.com>
Date: Wed, 25 Dec 2024 04:33:04 +0530
Subject: [PATCH 08/28] Revert "excluded node_modules from eslint disable
 check"

This reverts commit b57503625856a2e5ab57fcdad9d8d8b690c91960.
---
 .github/workflows/eslint_disable_check.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/eslint_disable_check.py b/.github/workflows/eslint_disable_check.py
index 78351d88d7..135b3c19c2 100644
--- a/.github/workflows/eslint_disable_check.py
+++ b/.github/workflows/eslint_disable_check.py
@@ -78,8 +78,6 @@ def check_eslint(directories):
             )
             sys.exit(1)
         for root, _, files in os.walk(directory):
-            if "node_modules" in root:
-                continue
             for file_name in files:
                 if (
                     file_name.endswith(".tsx")

From e841044f014afba5a2eecead7f06226d21887569 Mon Sep 17 00:00:00 2001
From: im-vedant <194vedantgutpa@gmail.com>
Date: Wed, 25 Dec 2024 04:41:54 +0530
Subject: [PATCH 09/28] Revert "removed all eslint disable statements and code
 coverage disable statements"

This reverts commit 62d423246c5820807ce23c170f386b22875b70fc.
---
 .../AddOn/core/AddOnStore/AddOnStore.tsx      |  14 ++-
 .../AddPeopleToTag/AddPeopleToTag.tsx         |  11 +-
 src/components/CheckIn/TableRow.tsx           |   8 +-
 src/components/EventCalendar/EventHeader.tsx  |   2 +-
 .../EventCalendar/YearlyEventCalender.tsx     |   2 +-
 .../EventListCard/EventListCardModals.tsx     |   9 +-
 .../EventAttendance/EventAttendance.tsx       |  18 ++-
 .../EventAttendance/EventStatistics.tsx       |  45 ++++---
 .../AddOnSpotAttendee.tsx                     |   1 +
 .../EventRegistrantsModal.tsx                 |  14 ++-
 .../EventStats/Statistics/Feedback.tsx        |   3 +-
 src/components/HolidayCards/HolidayCard.tsx   |   1 +
 .../MemberDetail/EventsAttendedCardItem.tsx   |   1 +
 .../MemberDetail/customTableCell.tsx          |   4 +-
 .../MemberRequestCard/MemberRequestCard.tsx   |  33 +++--
 .../OrgAdminListCard/OrgAdminListCard.tsx     |   1 +
 .../OrgPeopleListCard/OrgPeopleListCard.tsx   |   3 +-
 src/components/OrgPostCard/OrgPostCard.tsx    | 118 ++++++++++--------
 .../General/OrgUpdate/OrgUpdate.tsx           |   4 +-
 .../OrganizationScreen/OrganizationScreen.tsx |   3 +-
 src/components/Pagination/Pagination.tsx      |   5 +-
 .../ProfileDropdown/ProfileDropdown.tsx       |   5 +-
 .../CustomRecurrenceModal.tsx                 |   1 +
 .../RequestsTableItem/RequestsTableItem.tsx   |   6 +-
 src/components/TagActions/TagActions.tsx      |  10 +-
 src/components/TagActions/TagNode.tsx         |   6 +-
 .../UpdateSession/UpdateSession.tsx           |   1 +
 src/components/UserListCard/UserListCard.tsx  |   2 +
 .../UserPasswordUpdate/UserPasswordUpdate.tsx |   5 +-
 .../UserPortal/CommentCard/CommentCard.tsx    |   6 +-
 .../CreateDirectChat/CreateDirectChat.tsx     |   2 +-
 .../CreateGroupChat/CreateGroupChat.tsx       |   4 +-
 .../UserPortal/EventCard/EventCard.tsx        |   3 +-
 .../OrganizationCard/OrganizationCard.tsx     |   1 +
 .../OrganizationNavbar/OrganizationNavbar.tsx |   8 +-
 .../OrganizationSidebar.tsx                   |   4 +-
 .../UserPortal/PostCard/PostCard.tsx          |  10 +-
 .../UserPortal/Register/Register.tsx          |  14 +--
 .../StartPostModal/StartPostModal.tsx         |   3 +-
 .../UserPortal/UserNavbar/UserNavbar.tsx      |   3 +-
 src/components/Venues/VenueModal.tsx          |   7 +-
 src/screens/BlockUser/BlockUser.tsx           |   6 +-
 .../CommunityProfile/CommunityProfile.tsx     |   2 +
 .../EventManagement/EventManagement.tsx       |  13 +-
 .../VolunteerGroups/VolunteerGroupModal.tsx   |  50 ++++----
 .../Volunteers/VolunteerCreateModal.tsx       |   9 +-
 src/screens/ForgotPassword/ForgotPassword.tsx |   3 +-
 .../FundCampaignPledge/FundCampaignPledge.tsx |  10 +-
 .../FundCampaignPledge/PledgeModal.tsx        |  34 +++--
 src/screens/ManageTag/ManageTag.spec.tsx      |   2 +
 src/screens/ManageTag/ManageTag.tsx           |  30 +++--
 src/screens/MemberDetail/MemberDetail.tsx     |  23 ++--
 src/screens/OrgList/OrganizationModal.tsx     |   2 +-
 src/screens/OrgPost/OrgPost.tsx               |   3 +-
 src/screens/OrgSettings/OrgSettings.tsx       |   5 +-
 .../OrganizationActionItems/ItemModal.tsx     |   5 +
 .../OrganizationDashboard.tsx                 |  11 +-
 .../OrganizationEvents/OrganizationEvents.tsx |   9 +-
 .../CampaignModal.tsx                         |  17 +--
 src/screens/OrganizationFunds/FundModal.tsx   |   1 +
 .../OrganizationPeople/OrganizationPeople.tsx |   3 +-
 .../OrganizationTags/OrganizationTags.tsx     |   8 +-
 .../OrganizationVenues/OrganizationVenues.tsx |   3 +-
 src/screens/Requests/Requests.tsx             |   2 +-
 src/screens/SubTags/SubTags.tsx               |  24 ++--
 .../UserPortal/Campaigns/PledgeModal.tsx      |  34 +++--
 src/screens/UserPortal/Chat/Chat.tsx          |  52 ++------
 src/screens/UserPortal/Donate/Donate.tsx      |  11 +-
 src/screens/UserPortal/Events/Events.tsx      |  11 +-
 .../Organizations/Organizations.tsx           |  16 ++-
 src/screens/UserPortal/People/People.tsx      |  14 ++-
 src/screens/UserPortal/Settings/Settings.tsx  |  31 +++--
 .../UpcomingEvents/UpcomingEvents.tsx         |  15 ++-
 .../Volunteer/VolunteerManagement.tsx         |   5 +-
 src/screens/Users/Users.tsx                   |   9 +-
 src/utils/getOrganizationId.ts                |   1 +
 76 files changed, 531 insertions(+), 344 deletions(-)

diff --git a/src/components/AddOn/core/AddOnStore/AddOnStore.tsx b/src/components/AddOn/core/AddOnStore/AddOnStore.tsx
index f5e6e611bf..90a32d9bb3 100644
--- a/src/components/AddOn/core/AddOnStore/AddOnStore.tsx
+++ b/src/components/AddOn/core/AddOnStore/AddOnStore.tsx
@@ -52,6 +52,7 @@ function addOnStore(): JSX.Element {
   /**
    * Fetches store plugins and updates the Redux store with the plugin data.
    */
+  /* istanbul ignore next */
   const getStorePlugins = async (): Promise<void> => {
     let plugins = await new PluginHelper().fetchStore();
     const installIds = (await new PluginHelper().fetchInstalled()).map(
@@ -67,6 +68,7 @@ function addOnStore(): JSX.Element {
   /**
    * Sets the list of installed plugins in the component's state.
    */
+  /* istanbul ignore next */
   const getInstalledPlugins: () => void = () => {
     setDataList(data?.getPlugins ?? []);
   };
@@ -78,6 +80,7 @@ function addOnStore(): JSX.Element {
    */
   const updateSelectedTab = (tab: string): void => {
     setIsStore(tab === 'available');
+    /* istanbul ignore next */
     if (tab === 'available') {
       getStorePlugins();
     } else {
@@ -108,6 +111,7 @@ function addOnStore(): JSX.Element {
   };
 
   // Show a loader while the data is being fetched
+  /* istanbul ignore next */
   if (loading) {
     return (
       <>
@@ -153,10 +157,12 @@ function addOnStore(): JSX.Element {
           </div>
           {!isStore && (
             <Dropdown
-              onSelect={(e) =>
-                filterChange(
-                  e as unknown as React.ChangeEvent<HTMLSelectElement>,
-                )
+              onSelect={
+                /* istanbul ignore next */
+                (e) =>
+                  filterChange(
+                    e as unknown as React.ChangeEvent<HTMLSelectElement>,
+                  )
               }
             >
               <Dropdown.Toggle
diff --git a/src/components/AddPeopleToTag/AddPeopleToTag.tsx b/src/components/AddPeopleToTag/AddPeopleToTag.tsx
index 0415eddae6..51d21a6a1c 100644
--- a/src/components/AddPeopleToTag/AddPeopleToTag.tsx
+++ b/src/components/AddPeopleToTag/AddPeopleToTag.tsx
@@ -106,7 +106,7 @@ const AddPeopleToTag: React.FC<InterfaceAddPeopleToTagProps> = ({
           };
         },
       ) => {
-        if (!fetchMoreResult) return prevResult;
+        if (!fetchMoreResult) /* istanbul ignore next */ return prevResult;
 
         return {
           getUsersToAssignTo: {
@@ -127,7 +127,7 @@ const AddPeopleToTag: React.FC<InterfaceAddPeopleToTagProps> = ({
   const userTagMembersToAssignTo =
     userTagsMembersToAssignToData?.getUsersToAssignTo.usersToAssignTo.edges.map(
       (edge) => edge.node,
-    ) ?? [];
+    ) ?? /* istanbul ignore next */ [];
 
   const handleAddOrRemoveMember = (member: InterfaceMemberData): void => {
     setAssignToMembers((prevMembers) => {
@@ -173,7 +173,7 @@ const AddPeopleToTag: React.FC<InterfaceAddPeopleToTagProps> = ({
         hideAddPeopleToTagModal();
         setAssignToMembers([]);
       }
-    } catch (error: unknown) {
+    } catch (error: unknown) /* istanbul ignore next */ {
       const errorMessage =
         error instanceof Error ? error.message : tErrors('unknownError');
       toast.error(errorMessage);
@@ -345,7 +345,8 @@ const AddPeopleToTag: React.FC<InterfaceAddPeopleToTagProps> = ({
                     next={loadMoreMembersToAssignTo}
                     hasMore={
                       userTagsMembersToAssignToData?.getUsersToAssignTo
-                        .usersToAssignTo.pageInfo.hasNextPage ?? false
+                        .usersToAssignTo.pageInfo.hasNextPage ??
+                      /* istanbul ignore next */ false
                     }
                     loader={<InfiniteScrollLoader />}
                     scrollableTarget="addPeopleToTagScrollableDiv"
@@ -356,7 +357,7 @@ const AddPeopleToTag: React.FC<InterfaceAddPeopleToTagProps> = ({
                       hideFooter={true}
                       getRowId={(row) => row.id}
                       slots={{
-                        noRowsOverlay: () => (
+                        noRowsOverlay: /* istanbul ignore next */ () => (
                           <Stack
                             height="100%"
                             alignItems="center"
diff --git a/src/components/CheckIn/TableRow.tsx b/src/components/CheckIn/TableRow.tsx
index a24935a710..b2bd6e11cb 100644
--- a/src/components/CheckIn/TableRow.tsx
+++ b/src/components/CheckIn/TableRow.tsx
@@ -72,13 +72,13 @@ export const TableRow = ({
       }
       inputs.push({ name: data.name.trim() });
       const pdf = await generate({ template: tagTemplate, inputs });
-
+      // istanbul ignore next
       const blob = new Blob([pdf.buffer], { type: 'application/pdf' });
-
+      // istanbul ignore next
       const url = URL.createObjectURL(blob);
-
+      // istanbul ignore next
       window.open(url);
-
+      // istanbul ignore next
       toast.success('PDF generated successfully!');
     } catch (error: unknown) {
       const errorMessage =
diff --git a/src/components/EventCalendar/EventHeader.tsx b/src/components/EventCalendar/EventHeader.tsx
index b1dc24c55c..08039796e2 100644
--- a/src/components/EventCalendar/EventHeader.tsx
+++ b/src/components/EventCalendar/EventHeader.tsx
@@ -51,7 +51,7 @@ function eventHeader({
              *
              * @param e - The event object from the input change.
              */
-
+            /*istanbul ignore next*/
             onChange={(e) => setEventName(e.target.value)}
           />
           <Button
diff --git a/src/components/EventCalendar/YearlyEventCalender.tsx b/src/components/EventCalendar/YearlyEventCalender.tsx
index c035ac3320..facf75038c 100644
--- a/src/components/EventCalendar/YearlyEventCalender.tsx
+++ b/src/components/EventCalendar/YearlyEventCalender.tsx
@@ -140,7 +140,7 @@ const Calendar: React.FC<InterfaceCalendarProps> = ({
     const data: InterfaceEventListCardProps[] = [];
     if (userRole === Role.SUPERADMIN) return eventData;
     // Hard to test all the cases
-
+    /* istanbul ignore next */
     if (userRole === Role.ADMIN) {
       eventData?.forEach((event) => {
         if (event.isPublic) data.push(event);
diff --git a/src/components/EventListCard/EventListCardModals.tsx b/src/components/EventListCard/EventListCardModals.tsx
index 7755da2a5a..193890941c 100644
--- a/src/components/EventListCard/EventListCardModals.tsx
+++ b/src/components/EventListCard/EventListCardModals.tsx
@@ -292,6 +292,7 @@ function EventListCardModals({
         }
       }
     } catch (error: unknown) {
+      /* istanbul ignore next */
       errorHandler(t, error);
     }
   };
@@ -361,6 +362,7 @@ function EventListCardModals({
           hideViewModal();
         }
       } catch (error: unknown) {
+        /* istanbul ignore next */
         errorHandler(t, error);
       }
     }
@@ -489,7 +491,9 @@ function EventListCardModals({
                           recurrenceStartDate: date?.toDate(),
                           weekDays: [Days[date?.toDate().getDay()]],
                           weekDayOccurenceInMonth: weekDayOccurenceInMonth
-                            ? getWeekDayOccurenceInMonth(date?.toDate())
+                            ? /* istanbul ignore next */ getWeekDayOccurenceInMonth(
+                                date?.toDate(),
+                              )
                             : undefined,
                         });
                       }
@@ -527,7 +531,8 @@ function EventListCardModals({
                           endTime:
                             timeToDayJs(formState.endTime) < time
                               ? time?.format('HH:mm:ss')
-                              : formState.endTime,
+                              : /* istanbul ignore next */
+                                formState.endTime,
                         });
                       }
                     }}
diff --git a/src/components/EventManagement/EventAttendance/EventAttendance.tsx b/src/components/EventManagement/EventAttendance/EventAttendance.tsx
index fe848dd40d..17f063f6b5 100644
--- a/src/components/EventManagement/EventAttendance/EventAttendance.tsx
+++ b/src/components/EventManagement/EventAttendance/EventAttendance.tsx
@@ -57,7 +57,8 @@ function EventAttendance(): JSX.Element {
       const nameB = `${b.firstName} ${b.lastName}`.toLowerCase();
       return sortOrder === 'ascending'
         ? nameA.localeCompare(nameB)
-        : nameB.localeCompare(nameA);
+        : /*istanbul ignore next*/
+          nameB.localeCompare(nameA);
     });
   };
 
@@ -70,7 +71,8 @@ function EventAttendance(): JSX.Element {
           const isSameYear = attendeeDate.getFullYear() === now.getFullYear();
           return filteringBy === 'This Month'
             ? isSameYear && attendeeDate.getMonth() === now.getMonth()
-            : isSameYear;
+            : /*istanbul ignore next*/
+              isSameYear;
         });
   };
 
@@ -139,7 +141,7 @@ function EventAttendance(): JSX.Element {
   }, [eventId, getEventAttendees]);
 
   if (loading) return <p>{t('loading')}</p>;
-
+  /*istanbul ignore next*/
   if (error) return <p>{error.message}</p>;
 
   return (
@@ -217,8 +219,9 @@ function EventAttendance(): JSX.Element {
                 <span className="ms-2">Sort</span>
               </>
             }
-            onSelect={(eventKey) =>
-              setSortOrder(eventKey as 'ascending' | 'descending')
+            onSelect={
+              /*istanbul ignore next*/
+              (eventKey) => setSortOrder(eventKey as 'ascending' | 'descending')
             }
           >
             <Dropdown.Item eventKey="ascending">Ascending</Dropdown.Item>
@@ -337,7 +340,8 @@ function EventAttendance(): JSX.Element {
                         <span className={styles.eventsAttended}>
                           {member.eventsAttended
                             ? member.eventsAttended.length
-                            : '0'}
+                            : /*istanbul ignore next*/
+                              '0'}
                         </span>
                       </TableCell>
                     </Tooltip>
@@ -346,7 +350,9 @@ function EventAttendance(): JSX.Element {
                       data-testid={`attendee-task-assigned-${index}`}
                     >
                       {member.tagsAssignedWith ? (
+                        /*istanbul ignore next*/
                         member.tagsAssignedWith.edges.map(
+                          /*istanbul ignore next*/
                           (
                             edge: { node: { name: string } },
                             tagIndex: number,
diff --git a/src/components/EventManagement/EventAttendance/EventStatistics.tsx b/src/components/EventManagement/EventAttendance/EventStatistics.tsx
index bf5fff7040..686ad049fa 100644
--- a/src/components/EventManagement/EventAttendance/EventStatistics.tsx
+++ b/src/components/EventManagement/EventAttendance/EventStatistics.tsx
@@ -97,15 +97,17 @@ export const AttendanceStatisticsModal: React.FC<
     plugins: {
       tooltip: {
         callbacks: {
-          label: (context: TooltipItem<'line'>) => {
-            const label = context.dataset.label || '';
-            const value = context.parsed.y;
-            const isCurrentEvent =
-              paginatedRecurringEvents[context.dataIndex]._id === eventId;
-            return isCurrentEvent
-              ? `${label}: ${value} (Current Event)`
-              : `${label}: ${value}`;
-          },
+          label:
+            /*istanbul ignore next*/
+            (context: TooltipItem<'line'>) => {
+              const label = context.dataset.label || '';
+              const value = context.parsed.y;
+              const isCurrentEvent =
+                paginatedRecurringEvents[context.dataIndex]._id === eventId;
+              return isCurrentEvent
+                ? `${label}: ${value} (Current Event)`
+                : `${label}: ${value}`;
+            },
         },
       },
     },
@@ -212,15 +214,23 @@ export const AttendanceStatisticsModal: React.FC<
     [eventLabels, attendeeCounts, maleCounts, femaleCounts, otherCounts],
   );
 
-  const handlePreviousPage = useCallback(() => {
-    setCurrentPage((prevPage) => Math.max(prevPage - 1, 0));
-  }, []);
+  const handlePreviousPage = useCallback(
+    /*istanbul ignore next*/
+    () => {
+      setCurrentPage((prevPage) => Math.max(prevPage - 1, 0));
+    },
+    [],
+  );
 
-  const handleNextPage = useCallback(() => {
-    if (currentPage < totalPages - 1) {
-      setCurrentPage((prevPage) => prevPage + 1);
-    }
-  }, [currentPage, totalPages]);
+  const handleNextPage = useCallback(
+    /*istanbul ignore next*/
+    () => {
+      if (currentPage < totalPages - 1) {
+        setCurrentPage((prevPage) => prevPage + 1);
+      }
+    },
+    [currentPage, totalPages],
+  );
 
   const handleDateChange = useCallback((date: Date | null) => {
     if (date) {
@@ -258,6 +268,7 @@ export const AttendanceStatisticsModal: React.FC<
                 monthDiff < 0 ||
                 (monthDiff === 0 && today.getDate() < birthDate.getDate())
               ) {
+                /*istanbul ignore next*/
                 age--;
               }
               return age < 18;
diff --git a/src/components/EventRegistrantsModal/AddOnSpotAttendee.tsx b/src/components/EventRegistrantsModal/AddOnSpotAttendee.tsx
index 79a9e76310..6de839ce04 100644
--- a/src/components/EventRegistrantsModal/AddOnSpotAttendee.tsx
+++ b/src/components/EventRegistrantsModal/AddOnSpotAttendee.tsx
@@ -95,6 +95,7 @@ const AddOnSpotAttendee: React.FC<InterfaceAddOnSpotAttendeeProps> = ({
         handleClose();
       }
     } catch (error) {
+      /* istanbul ignore next */
       errorHandler(t, error as Error);
     } finally {
       setIsSubmitting(false);
diff --git a/src/components/EventRegistrantsModal/EventRegistrantsModal.tsx b/src/components/EventRegistrantsModal/EventRegistrantsModal.tsx
index 82182d9660..d48d3b7439 100644
--- a/src/components/EventRegistrantsModal/EventRegistrantsModal.tsx
+++ b/src/components/EventRegistrantsModal/EventRegistrantsModal.tsx
@@ -129,10 +129,16 @@ export const EventRegistrantsModal = (props: ModalPropType): JSX.Element => {
       <Modal show={show} onHide={handleClose} backdrop="static" centered>
         <AddOnSpotAttendee
           show={open}
-          handleClose={() => setOpen(false)}
-          reloadMembers={() => {
-            attendeesRefetch();
-          }}
+          handleClose={
+            /*istanbul ignore next */
+            () => setOpen(false)
+          }
+          reloadMembers={
+            /*istanbul ignore next */
+            () => {
+              attendeesRefetch();
+            }
+          }
         />
         <Modal.Header closeButton className="bg-primary">
           <Modal.Title className="text-white">Event Registrants</Modal.Title>
diff --git a/src/components/EventStats/Statistics/Feedback.tsx b/src/components/EventStats/Statistics/Feedback.tsx
index f0890cbd72..a6a255828f 100644
--- a/src/components/EventStats/Statistics/Feedback.tsx
+++ b/src/components/EventStats/Statistics/Feedback.tsx
@@ -79,7 +79,8 @@ export const FeedbackStats = ({ data }: ModalPropType): JSX.Element => {
               series={[
                 {
                   data: chartData,
-                  arcLabel: (item) => `${item.id} (${item.value})`,
+                  arcLabel: /* istanbul ignore next */ (item) =>
+                    `${item.id} (${item.value})`,
                   innerRadius: 30,
                   outerRadius: 120,
                   paddingAngle: 2,
diff --git a/src/components/HolidayCards/HolidayCard.tsx b/src/components/HolidayCards/HolidayCard.tsx
index 2760a1469c..56ac86405d 100644
--- a/src/components/HolidayCards/HolidayCard.tsx
+++ b/src/components/HolidayCards/HolidayCard.tsx
@@ -13,6 +13,7 @@ interface InterfaceHolidayList {
  * @returns JSX element representing a card with the holiday name.
  */
 const HolidayCard = (props: InterfaceHolidayList): JSX.Element => {
+  /*istanbul ignore next*/
   return <div className={styles.card}>{props?.holidayName}</div>;
 };
 
diff --git a/src/components/MemberDetail/EventsAttendedCardItem.tsx b/src/components/MemberDetail/EventsAttendedCardItem.tsx
index 7c4290f8da..cfed19e4dd 100644
--- a/src/components/MemberDetail/EventsAttendedCardItem.tsx
+++ b/src/components/MemberDetail/EventsAttendedCardItem.tsx
@@ -42,6 +42,7 @@ const EventAttendedCard = (props: InterfaceCardItem): JSX.Element => {
                   </div>
                 </>
               ) : (
+                /*istanbul ignore next*/
                 <div className="fs-6 fw-normal">Date N/A</div>
               )}
             </div>
diff --git a/src/components/MemberDetail/customTableCell.tsx b/src/components/MemberDetail/customTableCell.tsx
index 6c0851de77..b8cc2bdd98 100644
--- a/src/components/MemberDetail/customTableCell.tsx
+++ b/src/components/MemberDetail/customTableCell.tsx
@@ -29,7 +29,7 @@ export const CustomTableCell: React.FC<{ eventId: string }> = ({ eventId }) => {
         </TableCell>
       </TableRow>
     );
-
+  /*istanbul ignore next*/
   if (error) {
     return (
       <TableRow data-testid="error-state">
@@ -40,7 +40,7 @@ export const CustomTableCell: React.FC<{ eventId: string }> = ({ eventId }) => {
     );
   }
   const event = data?.event;
-
+  /*istanbul ignore next*/
   if (!event) {
     return (
       <TableRow data-testid="no-event-state">
diff --git a/src/components/MemberRequestCard/MemberRequestCard.tsx b/src/components/MemberRequestCard/MemberRequestCard.tsx
index c3d8108cf0..c45b698506 100644
--- a/src/components/MemberRequestCard/MemberRequestCard.tsx
+++ b/src/components/MemberRequestCard/MemberRequestCard.tsx
@@ -28,14 +28,9 @@ interface InterfaceMemberRequestCardProps {
  * @param props - Properties for the member request card.
  * @returns JSX element for member request card.
  */
-function MemberRequestCard({
-  id,
-  memberName,
-  memberLocation,
-  joinDate,
-  memberImage,
-  email,
-}: InterfaceMemberRequestCardProps): JSX.Element {
+function MemberRequestCard(
+  props: InterfaceMemberRequestCardProps,
+): JSX.Element {
   const [acceptMutation] = useMutation(ACCEPT_ORGANIZATION_REQUEST_MUTATION);
   const [rejectMutation] = useMutation(REJECT_ORGANIZATION_REQUEST_MUTATION);
 
@@ -52,16 +47,18 @@ function MemberRequestCard({
     try {
       await acceptMutation({
         variables: {
-          id: id,
+          id: props.id,
         },
       });
 
+      /* istanbul ignore next */
       toast.success(t('memberAdded') as string);
-
+      /* istanbul ignore next */
       setTimeout(() => {
         window.location.reload();
       }, 2000);
     } catch (error: unknown) {
+      /* istanbul ignore next */
       errorHandler(t, error);
     }
   };
@@ -76,12 +73,14 @@ function MemberRequestCard({
       try {
         await rejectMutation({
           variables: {
-            userid: id,
+            userid: props.id,
           },
         });
 
+        /* istanbul ignore next */
         window.location.reload();
       } catch (error: unknown) {
+        /* istanbul ignore next */
         errorHandler(t, error);
       }
     }
@@ -91,9 +90,9 @@ function MemberRequestCard({
     <>
       <div className={styles.peoplelistdiv}>
         <Row className={styles.memberlist}>
-          {memberImage ? (
+          {props.memberImage ? (
             <img
-              src={memberImage}
+              src={props.memberImage}
               className={styles.alignimg}
               alt="userImage"
             />
@@ -107,14 +106,14 @@ function MemberRequestCard({
           <Col className={styles.singledetails}>
             <div className={styles.singledetails_data_left}>
               <p className={styles.membername}>
-                {memberName ? <>{memberName}</> : <>Dogs Care</>}
+                {props.memberName ? <>{props.memberName}</> : <>Dogs Care</>}
               </p>
-              <p className={styles.memberfont}>{memberLocation}</p>
-              <p className={styles.memberfontcreated}>{email}</p>
+              <p className={styles.memberfont}>{props.memberLocation}</p>
+              <p className={styles.memberfontcreated}>{props.email}</p>
             </div>
             <div className={styles.singledetails_data_right}>
               <p className={styles.memberfont}>
-                {tCommon('joined')}: <span>{joinDate}</span>
+                {tCommon('joined')}: <span>{props.joinDate}</span>
               </p>
               <Button
                 className={styles.memberfontcreatedbtn}
diff --git a/src/components/OrgAdminListCard/OrgAdminListCard.tsx b/src/components/OrgAdminListCard/OrgAdminListCard.tsx
index 2efd90a0b9..f8fc454823 100644
--- a/src/components/OrgAdminListCard/OrgAdminListCard.tsx
+++ b/src/components/OrgAdminListCard/OrgAdminListCard.tsx
@@ -50,6 +50,7 @@ function orgAdminListCard(props: InterfaceOrgPeopleListCardProps): JSX.Element {
         }, 2000);
       }
     } catch (error: unknown) {
+      /* istanbul ignore next */
       errorHandler(t, error);
     }
   };
diff --git a/src/components/OrgPeopleListCard/OrgPeopleListCard.tsx b/src/components/OrgPeopleListCard/OrgPeopleListCard.tsx
index 14c5e80cf6..dca72b84e7 100644
--- a/src/components/OrgPeopleListCard/OrgPeopleListCard.tsx
+++ b/src/components/OrgPeopleListCard/OrgPeopleListCard.tsx
@@ -56,7 +56,7 @@ function orgPeopleListCard(
         },
       });
       // If the mutation is successful, show a success message and reload the page
-
+      /* istanbul ignore next */
       if (data) {
         toast.success(t('memberRemoved') as string);
         setTimeout(() => {
@@ -64,6 +64,7 @@ function orgPeopleListCard(
         }, 2000);
       }
     } catch (error: unknown) {
+      /* istanbul ignore next */
       errorHandler(t, error);
     }
   };
diff --git a/src/components/OrgPostCard/OrgPostCard.tsx b/src/components/OrgPostCard/OrgPostCard.tsx
index 87e3479ff5..b7cc419d12 100644
--- a/src/components/OrgPostCard/OrgPostCard.tsx
+++ b/src/components/OrgPostCard/OrgPostCard.tsx
@@ -25,16 +25,13 @@ interface InterfaceOrgPostCardProps {
   postVideo: string | null;
   pinned: boolean;
 }
-export default function OrgPostCard({
-  postID,
-  id,
-  postTitle,
-  postInfo,
-  postAuthor,
-  postPhoto,
-  postVideo,
-  pinned,
-}: InterfaceOrgPostCardProps): JSX.Element {
+export default function OrgPostCard(
+  props: InterfaceOrgPostCardProps,
+): JSX.Element {
+  const {
+    postID, // Destructure the key prop from props
+    // ...rest // Spread the rest of the props
+  } = props;
   const [postformState, setPostFormState] = useState<InterfacePostForm>({
     posttitle: '',
     postinfo: '',
@@ -69,11 +66,13 @@ export default function OrgPostCard({
       }
     } catch (error: unknown) {
       if (error instanceof Error) {
+        /* istanbul ignore next */
         errorHandler(t, error);
       }
     }
   };
   const toggleShowEditModal = (): void => {
+    const { postTitle, postInfo, postPhoto, postVideo, pinned } = props;
     setPostFormState({
       posttitle: postTitle,
       postinfo: postInfo,
@@ -134,6 +133,7 @@ export default function OrgPostCard({
     }
   }
   function handleEditModal(): void {
+    const { postPhoto, postVideo } = props;
     setModalVisible(false);
     setMenuVisible(false);
     setShowEditModal(true);
@@ -150,11 +150,11 @@ export default function OrgPostCard({
   }
   useEffect(() => {
     setPostFormState({
-      posttitle: postTitle,
-      postinfo: postInfo,
-      postphoto: postPhoto,
-      postvideo: postVideo,
-      pinned: pinned,
+      posttitle: props.postTitle,
+      postinfo: props.postInfo,
+      postphoto: props.postPhoto,
+      postvideo: props.postVideo,
+      pinned: props.pinned,
     });
   }, []);
   const { t } = useTranslation('translation', {
@@ -167,7 +167,7 @@ export default function OrgPostCard({
     try {
       const { data } = await deletePostMutation({
         variables: {
-          id: id,
+          id: props.id,
         },
       });
       if (data) {
@@ -197,7 +197,7 @@ export default function OrgPostCard({
     try {
       const { data } = await updatePostMutation({
         variables: {
-          id: id,
+          id: props.id,
           title: postformState.posttitle,
           text: postformState.postinfo,
           ...(postPhotoUpdated && {
@@ -232,7 +232,7 @@ export default function OrgPostCard({
           onClick={handleCardClick}
           data-testid="cardStructure"
         >
-          {postVideo && (
+          {props.postVideo && (
             <Card
               className={styles.card}
               data-testid="cardVid"
@@ -247,10 +247,10 @@ export default function OrgPostCard({
                 loop={true}
                 playsInline
               >
-                <source src={postVideo} type="video/mp4" />
+                <source src={props?.postVideo} type="video/mp4" />
               </video>
               <Card.Body>
-                {pinned && (
+                {props.pinned && (
                   <PushPin
                     color="success"
                     fontSize="large"
@@ -259,33 +259,37 @@ export default function OrgPostCard({
                   />
                 )}
                 <Card.Title className={styles.title} data-testid="card-title">
-                  {postTitle}
+                  {props.postTitle}
                 </Card.Title>
                 <Card.Text className={styles.text} data-testid="card-text">
-                  {postInfo}
+                  {props.postInfo}
                 </Card.Text>
-                <Card.Link data-testid="card-authour">{postAuthor}</Card.Link>
+                <Card.Link data-testid="card-authour">
+                  {props.postAuthor}
+                </Card.Link>
               </Card.Body>
             </Card>
           )}
-          {postPhoto ? (
+          {props.postPhoto ? (
             <Card className={styles.card}>
               <Card.Img
                 className={styles.postimage}
                 variant="top"
-                src={postPhoto}
+                src={props.postPhoto}
                 alt="image"
               />
               <Card.Body>
-                {pinned && (
+                {props.pinned && (
                   <PushPin color="success" fontSize="large" className="fs-5" />
                 )}
-                <Card.Title className={styles.title}>{postTitle}</Card.Title>
-                <Card.Text className={styles.text}>{postInfo}</Card.Text>
-                <Card.Link>{postAuthor}</Card.Link>
+                <Card.Title className={styles.title}>
+                  {props.postTitle}
+                </Card.Title>
+                <Card.Text className={styles.text}>{props.postInfo}</Card.Text>
+                <Card.Link>{props.postAuthor}</Card.Link>
               </Card.Body>
             </Card>
-          ) : !postVideo ? (
+          ) : !props.postVideo ? (
             <span>
               <Card className={styles.card}>
                 <Card.Img
@@ -295,20 +299,24 @@ export default function OrgPostCard({
                   className={styles.nopostimage}
                 />
                 <Card.Body>
-                  {pinned && (
+                  {props.pinned && (
                     <PushPin
                       color="success"
                       fontSize="large"
                       className="fs-5"
                     />
                   )}
-                  <Card.Title className={styles.title}>{postTitle}</Card.Title>
+                  <Card.Title className={styles.title}>
+                    {props.postTitle}
+                  </Card.Title>
                   <Card.Text className={styles.text}>
-                    {postInfo && postInfo.length > 20
-                      ? postInfo.substring(0, 20) + '...'
-                      : postInfo}
+                    {props.postInfo && props.postInfo.length > 20
+                      ? props.postInfo.substring(0, 20) + '...'
+                      : props.postInfo}
                   </Card.Text>{' '}
-                  <Card.Link className={styles.author}>{postAuthor}</Card.Link>
+                  <Card.Link className={styles.author}>
+                    {props.postAuthor}
+                  </Card.Link>
                 </Card.Body>
               </Card>
             </span>
@@ -319,19 +327,19 @@ export default function OrgPostCard({
         {modalVisible && (
           <div className={styles.modal} data-testid={'imagepreviewmodal'}>
             <div className={styles.modalContent}>
-              {postPhoto && (
+              {props.postPhoto && (
                 <div className={styles.modalImage}>
-                  <img src={postPhoto} alt="Post Image" />
+                  <img src={props.postPhoto} alt="Post Image" />
                 </div>
               )}
-              {postVideo && (
+              {props.postVideo && (
                 <div className={styles.modalImage}>
                   <video controls autoPlay loop muted>
-                    <source src={postVideo} type="video/mp4" />
+                    <source src={props?.postVideo} type="video/mp4" />
                   </video>
                 </div>
               )}
-              {!postPhoto && !postVideo && (
+              {!props.postPhoto && !props.postVideo && (
                 <div className={styles.modalImage}>
                   {' '}
                   <img src={AboutImg} alt="Post Image" />
@@ -339,23 +347,23 @@ export default function OrgPostCard({
               )}
               <div className={styles.modalInfo}>
                 <p>
-                  {t('author')}:<span> {postAuthor}</span>
+                  {t('author')}:<span> {props.postAuthor}</span>
                 </p>
                 <div className={styles.infodiv}>
                   {togglePost === 'Read more' ? (
                     <p data-testid="toggleContent">
-                      {postInfo.length > 43
-                        ? postInfo.substring(0, 40) + '...'
-                        : postInfo}
+                      {props.postInfo.length > 43
+                        ? props.postInfo.substring(0, 40) + '...'
+                        : props.postInfo}
                     </p>
                   ) : (
-                    <p data-testid="toggleContent">{postInfo}</p>
+                    <p data-testid="toggleContent">{props.postInfo}</p>
                   )}
                   <button
                     role="toggleBtn"
                     data-testid="toggleBtn"
                     className={`${
-                      postInfo.length > 43
+                      props.postInfo.length > 43
                         ? styles.toggleClickBtn
                         : styles.toggleClickBtnNone
                     }`}
@@ -388,7 +396,7 @@ export default function OrgPostCard({
               <ul className={styles.menuOptions}>
                 <li
                   data-toggle="modal"
-                  data-target={`#editPostModal${id}`}
+                  data-target={`#editPostModal${props.id}`}
                   onClick={handleEditModal}
                   data-testid="editPostModalBtn"
                 >
@@ -396,7 +404,7 @@ export default function OrgPostCard({
                 </li>
                 <li
                   data-toggle="modal"
-                  data-target={`#deletePostModal${id}`}
+                  data-target={`#deletePostModal${props.id}`}
                   onClick={handleDeleteModal}
                   data-testid="deletePostModalBtn"
                 >
@@ -404,9 +412,11 @@ export default function OrgPostCard({
                 </li>
                 <li
                   data-testid="pinpostBtn"
-                  onClick={(): Promise<void> => togglePostPin(id, pinned)}
+                  onClick={(): Promise<void> =>
+                    togglePostPin(props.id, props.pinned)
+                  }
                 >
-                  {!pinned ? 'Pin post' : 'Unpin post'}
+                  {!props.pinned ? 'Pin post' : 'Unpin post'}
                 </li>
                 <li
                   className={styles.list}
@@ -484,7 +494,7 @@ export default function OrgPostCard({
               data-testid="updateText"
               required
             />
-            {!postPhoto && (
+            {!props.postPhoto && (
               <>
                 <Form.Label htmlFor="postPhoto">{t('image')}</Form.Label>
                 <Form.Control
@@ -512,7 +522,7 @@ export default function OrgPostCard({
                     }
                   }}
                 />
-                {postPhoto && (
+                {props.postPhoto && (
                   <>
                     {postformState.postphoto && (
                       <div className={styles.preview}>
@@ -533,7 +543,7 @@ export default function OrgPostCard({
                 )}
               </>
             )}
-            {!postVideo && (
+            {!props.postVideo && (
               <>
                 <Form.Label htmlFor="postvideo">{t('video')}</Form.Label>
                 <Form.Control
diff --git a/src/components/OrgSettings/General/OrgUpdate/OrgUpdate.tsx b/src/components/OrgSettings/General/OrgUpdate/OrgUpdate.tsx
index 171fc75a74..6e0be28a56 100644
--- a/src/components/OrgSettings/General/OrgUpdate/OrgUpdate.tsx
+++ b/src/components/OrgSettings/General/OrgUpdate/OrgUpdate.tsx
@@ -141,7 +141,7 @@ function orgUpdate(props: InterfaceOrgUpdateProps): JSX.Element {
           file: formState.orgImage,
         },
       });
-
+      // istanbul ignore next
       if (data) {
         refetch({ id: orgId });
         toast.success(t('successfulUpdated') as string);
@@ -333,7 +333,7 @@ function orgUpdate(props: InterfaceOrgUpdateProps): JSX.Element {
             onChange={async (e: React.ChangeEvent): Promise<void> => {
               const target = e.target as HTMLInputElement;
               const file = target.files && target.files[0];
-
+              /* istanbul ignore else */
               if (file)
                 setFormState({
                   ...formState,
diff --git a/src/components/OrganizationScreen/OrganizationScreen.tsx b/src/components/OrganizationScreen/OrganizationScreen.tsx
index d4e795fbd7..85fb6ee181 100644
--- a/src/components/OrganizationScreen/OrganizationScreen.tsx
+++ b/src/components/OrganizationScreen/OrganizationScreen.tsx
@@ -51,6 +51,7 @@ const OrganizationScreen = (): JSX.Element => {
 
   // If no organization ID is found, navigate back to the home page
   if (!orgId) {
+    /*istanbul ignore next*/
     return <Navigate to={'/'} replace />;
   }
 
@@ -77,7 +78,7 @@ const OrganizationScreen = (): JSX.Element => {
       const event = eventsData.eventsByOrganization.find(
         (e: InterfaceEvent) => e._id === eventId,
       );
-
+      /*istanbul ignore next*/
       if (!event) {
         console.warn(`Event with id ${eventId} not found`);
         setEventName(null);
diff --git a/src/components/Pagination/Pagination.tsx b/src/components/Pagination/Pagination.tsx
index d04c539a80..637492a289 100644
--- a/src/components/Pagination/Pagination.tsx
+++ b/src/components/Pagination/Pagination.tsx
@@ -37,7 +37,7 @@ function pagination(props: InterfaceTablePaginationActionsProps): JSX.Element {
    *
    * @param event - The click event.
    */
-
+  /* istanbul ignore next */
   const handleFirstPageButtonClick = (
     event: React.MouseEvent<HTMLButtonElement>,
   ): void => {
@@ -63,6 +63,7 @@ function pagination(props: InterfaceTablePaginationActionsProps): JSX.Element {
    * @param event - The click event.
    */
 
+  /* istanbul ignore next */
   const handleNextButtonClick = (
     event: React.MouseEvent<HTMLButtonElement>,
   ): void => {
@@ -75,7 +76,7 @@ function pagination(props: InterfaceTablePaginationActionsProps): JSX.Element {
    *
    * @param event - The click event.
    */
-
+  /* istanbul ignore next */
   const handleLastPageButtonClick = (
     event: React.MouseEvent<HTMLButtonElement>,
   ): void => {
diff --git a/src/components/ProfileDropdown/ProfileDropdown.tsx b/src/components/ProfileDropdown/ProfileDropdown.tsx
index 94a195829c..059e5b910a 100644
--- a/src/components/ProfileDropdown/ProfileDropdown.tsx
+++ b/src/components/ProfileDropdown/ProfileDropdown.tsx
@@ -43,6 +43,7 @@ const profileDropdown = (): JSX.Element => {
     try {
       await revokeRefreshToken();
     } catch (error) {
+      /*istanbul ignore next*/
       console.error('Error revoking refresh token:', error);
     }
     localStorage.clear();
@@ -53,7 +54,8 @@ const profileDropdown = (): JSX.Element => {
   const fullName = `${firstName} ${lastName}`;
   const displayedName =
     fullName.length > MAX_NAME_LENGTH
-      ? fullName.substring(0, MAX_NAME_LENGTH - 3) + '...'
+      ? /*istanbul ignore next*/
+        fullName.substring(0, MAX_NAME_LENGTH - 3) + '...'
       : fullName;
 
   return (
@@ -61,6 +63,7 @@ const profileDropdown = (): JSX.Element => {
       <div className={styles.profileContainer}>
         <div className={styles.imageContainer}>
           {userImage && userImage !== 'null' ? (
+            /*istanbul ignore next*/
             <img
               src={userImage}
               alt={`profile picture`}
diff --git a/src/components/RecurrenceOptions/CustomRecurrenceModal.tsx b/src/components/RecurrenceOptions/CustomRecurrenceModal.tsx
index ab08f30eda..deb1a03dab 100644
--- a/src/components/RecurrenceOptions/CustomRecurrenceModal.tsx
+++ b/src/components/RecurrenceOptions/CustomRecurrenceModal.tsx
@@ -374,6 +374,7 @@ const CustomRecurrenceModal: React.FC<InterfaceCustomRecurrenceModalProps> = ({
                             recurrenceEndDate ?? dayjs().add(1, 'month'),
                           )}
                           onChange={(date: Dayjs | null): void => {
+                            /* istanbul ignore next */
                             if (date) {
                               setRecurrenceRuleState({
                                 ...recurrenceRuleState,
diff --git a/src/components/RequestsTableItem/RequestsTableItem.tsx b/src/components/RequestsTableItem/RequestsTableItem.tsx
index f764bedcc8..07feb5d289 100644
--- a/src/components/RequestsTableItem/RequestsTableItem.tsx
+++ b/src/components/RequestsTableItem/RequestsTableItem.tsx
@@ -65,12 +65,13 @@ const RequestsTableItem = (props: Props): JSX.Element => {
           id: membershipRequestId,
         },
       });
-
+      /* istanbul ignore next */
       if (data) {
         toast.success(t('acceptedSuccessfully') as string);
         resetAndRefetch();
       }
     } catch (error: unknown) {
+      /* istanbul ignore next */
       errorHandler(t, error);
     }
   };
@@ -92,12 +93,13 @@ const RequestsTableItem = (props: Props): JSX.Element => {
           id: membershipRequestId,
         },
       });
-
+      /* istanbul ignore next */
       if (data) {
         toast.success(t('rejectedSuccessfully') as string);
         resetAndRefetch();
       }
     } catch (error: unknown) {
+      /* istanbul ignore next */
       errorHandler(t, error);
     }
   };
diff --git a/src/components/TagActions/TagActions.tsx b/src/components/TagActions/TagActions.tsx
index 881e62cae2..083341372f 100644
--- a/src/components/TagActions/TagActions.tsx
+++ b/src/components/TagActions/TagActions.tsx
@@ -82,7 +82,7 @@ const TagActions: React.FC<InterfaceTagActionsProps> = ({
           };
         },
       ) => {
-        if (!fetchMoreResult) return prevResult;
+        if (!fetchMoreResult) /* istanbul ignore next */ return prevResult;
 
         return {
           organizations: [
@@ -106,7 +106,7 @@ const TagActions: React.FC<InterfaceTagActionsProps> = ({
   const userTagsList =
     orgUserTagsData?.organizations[0]?.userTags.edges.map(
       (edge) => edge.node,
-    ) ?? [];
+    ) ?? /* istanbul ignore next */ [];
 
   // tags that we have selected to assigned
   const [selectedTags, setSelectedTags] = useState<InterfaceTagData[]>([]);
@@ -129,7 +129,7 @@ const TagActions: React.FC<InterfaceTagActionsProps> = ({
   useEffect(() => {
     const newCheckedTags = new Set(checkedTags);
     const newAncestorTagsDataMap = new Map(ancestorTagsDataMap);
-
+    /* istanbul ignore next */
     addAncestorTagsData.forEach(
       (ancestorTag: InterfaceUserTagsAncestorData) => {
         const prevAncestorTagValue = ancestorTagsDataMap.get(ancestorTag._id);
@@ -148,7 +148,7 @@ const TagActions: React.FC<InterfaceTagActionsProps> = ({
   useEffect(() => {
     const newCheckedTags = new Set(checkedTags);
     const newAncestorTagsDataMap = new Map(ancestorTagsDataMap);
-
+    /* istanbul ignore next */
     removeAncestorTagsData.forEach(
       (ancestorTag: InterfaceUserTagsAncestorData) => {
         const prevAncestorTagValue = ancestorTagsDataMap.get(ancestorTag._id);
@@ -178,6 +178,7 @@ const TagActions: React.FC<InterfaceTagActionsProps> = ({
 
   const deSelectTag = (tag: InterfaceTagData): void => {
     if (!selectedTags.some((selectedTag) => selectedTag._id === tag._id)) {
+      /* istanbul ignore next */
       return;
     }
 
@@ -239,6 +240,7 @@ const TagActions: React.FC<InterfaceTagActionsProps> = ({
         hideTagActionsModal();
       }
     } catch (error: unknown) {
+      /* istanbul ignore next */
       if (error instanceof Error) {
         toast.error(error.message);
       }
diff --git a/src/components/TagActions/TagNode.tsx b/src/components/TagActions/TagNode.tsx
index 6b32b2ac65..4a085ecaf9 100644
--- a/src/components/TagActions/TagNode.tsx
+++ b/src/components/TagActions/TagNode.tsx
@@ -61,7 +61,7 @@ const TagNode: React.FC<InterfaceTagNodeProps> = ({
           fetchMoreResult?: { getChildTags: InterfaceQueryUserTagChildTags };
         },
       ) => {
-        if (!fetchMoreResult) return prevResult;
+        if (!fetchMoreResult) /* istanbul ignore next */ return prevResult;
 
         return {
           getChildTags: {
@@ -93,7 +93,8 @@ const TagNode: React.FC<InterfaceTagNodeProps> = ({
   }
 
   const subTagsList =
-    subTagsData?.getChildTags.childTags.edges.map((edge) => edge.node) ?? [];
+    subTagsData?.getChildTags.childTags.edges.map((edge) => edge.node) ??
+    /* istanbul ignore next */ [];
 
   const handleTagClick = (): void => {
     setExpanded(!expanded);
@@ -171,6 +172,7 @@ const TagNode: React.FC<InterfaceTagNodeProps> = ({
               next={loadMoreSubTags}
               hasMore={
                 subTagsData?.getChildTags.childTags.pageInfo.hasNextPage ??
+                /* istanbul ignore next */
                 false
               }
               loader={<InfiniteScrollLoader />}
diff --git a/src/components/UpdateSession/UpdateSession.tsx b/src/components/UpdateSession/UpdateSession.tsx
index 112b69d368..f49970ebaa 100644
--- a/src/components/UpdateSession/UpdateSession.tsx
+++ b/src/components/UpdateSession/UpdateSession.tsx
@@ -113,6 +113,7 @@ const UpdateTimeout: React.FC<TestInterfaceUpdateTimeoutProps> = ({
       toast.success(t('profileChangedMsg'));
       setCommunityTimeout(timeout);
     } catch (error: unknown) {
+      /* istanbul ignore next */
       errorHandler(t, error as Error);
     }
   };
diff --git a/src/components/UserListCard/UserListCard.tsx b/src/components/UserListCard/UserListCard.tsx
index d5e4dcee3f..76ad110ea1 100644
--- a/src/components/UserListCard/UserListCard.tsx
+++ b/src/components/UserListCard/UserListCard.tsx
@@ -45,6 +45,7 @@ function userListCard(props: InterfaceUserListCardProps): JSX.Element {
         },
       });
 
+      /* istanbul ignore next */
       if (data) {
         toast.success(t('addedAsAdmin') as string);
         setTimeout(() => {
@@ -52,6 +53,7 @@ function userListCard(props: InterfaceUserListCardProps): JSX.Element {
         }, 2000);
       }
     } catch (error: unknown) {
+      /* istanbul ignore next */
       errorHandler(t, error);
     }
   };
diff --git a/src/components/UserPasswordUpdate/UserPasswordUpdate.tsx b/src/components/UserPasswordUpdate/UserPasswordUpdate.tsx
index a336a9c46b..1ea75811c1 100644
--- a/src/components/UserPasswordUpdate/UserPasswordUpdate.tsx
+++ b/src/components/UserPasswordUpdate/UserPasswordUpdate.tsx
@@ -62,7 +62,7 @@ const UserUpdate: React.FC<
           confirmNewPassword: formState.confirmNewPassword,
         },
       });
-
+      /* istanbul ignore next */
       if (data) {
         toast.success(
           tCommon('updatedSuccessfully', { item: 'Password' }) as string,
@@ -72,6 +72,7 @@ const UserUpdate: React.FC<
         }, 2000);
       }
     } catch (error: unknown) {
+      /* istanbul ignore next */
       if (error instanceof Error) {
         toast.error(error.toString());
       }
@@ -82,7 +83,7 @@ const UserUpdate: React.FC<
    * Handles canceling the update process.
    * It reloads the page to reset any changes.
    */
-
+  /* istanbul ignore next */
   const cancelUpdate = (): void => {
     window.location.reload();
   };
diff --git a/src/components/UserPortal/CommentCard/CommentCard.tsx b/src/components/UserPortal/CommentCard/CommentCard.tsx
index a225794aa7..9e8c46d241 100644
--- a/src/components/UserPortal/CommentCard/CommentCard.tsx
+++ b/src/components/UserPortal/CommentCard/CommentCard.tsx
@@ -84,13 +84,14 @@ function commentCard(props: InterfaceCommentCardProps): JSX.Element {
             commentId: props.id,
           },
         });
-
+        /* istanbul ignore next */
         if (data) {
           setLikes((likes) => likes - 1);
           setIsLikedByUser(false);
           props.handleDislikeComment(props.id);
         }
       } catch (error: unknown) {
+        /* istanbul ignore next */
         toast.error(error as string);
       }
     } else {
@@ -100,13 +101,14 @@ function commentCard(props: InterfaceCommentCardProps): JSX.Element {
             commentId: props.id,
           },
         });
-
+        /* istanbul ignore next */
         if (data) {
           setLikes((likes) => likes + 1);
           setIsLikedByUser(true);
           props.handleLikeComment(props.id);
         }
       } catch (error: unknown) {
+        /* istanbul ignore next */
         toast.error(error as string);
       }
     }
diff --git a/src/components/UserPortal/CreateDirectChat/CreateDirectChat.tsx b/src/components/UserPortal/CreateDirectChat/CreateDirectChat.tsx
index 7d67a8839d..24c853fcdd 100644
--- a/src/components/UserPortal/CreateDirectChat/CreateDirectChat.tsx
+++ b/src/components/UserPortal/CreateDirectChat/CreateDirectChat.tsx
@@ -94,7 +94,7 @@ export default function createDirectChatModal({
 
   const handleUserModalSearchChange = (e: React.FormEvent): void => {
     e.preventDefault();
-
+    /* istanbul ignore next */
     const [firstName, lastName] = userName.split(' ');
 
     const newFilterData = {
diff --git a/src/components/UserPortal/CreateGroupChat/CreateGroupChat.tsx b/src/components/UserPortal/CreateGroupChat/CreateGroupChat.tsx
index e648b94e50..e293675a03 100644
--- a/src/components/UserPortal/CreateGroupChat/CreateGroupChat.tsx
+++ b/src/components/UserPortal/CreateGroupChat/CreateGroupChat.tsx
@@ -108,7 +108,7 @@ export default function CreateGroupChat({
     setAddUserModalisOpen(true);
   }
 
-  const toggleAddUserModal = (): void =>
+  const toggleAddUserModal = /* istanbul ignore next */ (): void =>
     setAddUserModalisOpen(!addUserModalisOpen);
 
   const handleChange = (event: SelectChangeEvent<string>): void => {
@@ -162,7 +162,7 @@ export default function CreateGroupChat({
 
   const handleUserModalSearchChange = (e: React.FormEvent): void => {
     e.preventDefault();
-
+    /* istanbul ignore next */
     const [firstName, lastName] = userName.split(' ');
 
     const newFilterData = {
diff --git a/src/components/UserPortal/EventCard/EventCard.tsx b/src/components/UserPortal/EventCard/EventCard.tsx
index aea3dea0ef..e93138ce42 100644
--- a/src/components/UserPortal/EventCard/EventCard.tsx
+++ b/src/components/UserPortal/EventCard/EventCard.tsx
@@ -96,12 +96,13 @@ function eventCard(props: InterfaceEventCardProps): JSX.Element {
             eventId: props.id,
           },
         });
-
+        /* istanbul ignore next */
         if (data) {
           setIsRegistered(true);
           toast.success(`Successfully registered for ${props.title}`);
         }
       } catch (error: unknown) {
+        /* istanbul ignore next */
         toast.error(error as string);
       }
     }
diff --git a/src/components/UserPortal/OrganizationCard/OrganizationCard.tsx b/src/components/UserPortal/OrganizationCard/OrganizationCard.tsx
index b468f84a22..e1c2c23beb 100644
--- a/src/components/UserPortal/OrganizationCard/OrganizationCard.tsx
+++ b/src/components/UserPortal/OrganizationCard/OrganizationCard.tsx
@@ -121,6 +121,7 @@ function organizationCard(props: InterfaceOrganizationCardProps): JSX.Element {
       }
       refetch();
     } catch (error: unknown) {
+      /* istanbul ignore next */
       if (error instanceof Error) {
         if (error.message === 'User is already a member') {
           toast.error(t('AlreadyJoined') as string);
diff --git a/src/components/UserPortal/OrganizationNavbar/OrganizationNavbar.tsx b/src/components/UserPortal/OrganizationNavbar/OrganizationNavbar.tsx
index e0baa5e30c..34022fcfcf 100644
--- a/src/components/UserPortal/OrganizationNavbar/OrganizationNavbar.tsx
+++ b/src/components/UserPortal/OrganizationNavbar/OrganizationNavbar.tsx
@@ -62,6 +62,7 @@ function organizationNavbar(props: InterfaceNavbarProps): JSX.Element {
   });
 
   const [currentLanguageCode, setCurrentLanguageCode] = React.useState(
+    /* istanbul ignore next */
     cookies.get('i18next') || 'en',
   );
 
@@ -70,7 +71,7 @@ function organizationNavbar(props: InterfaceNavbarProps): JSX.Element {
   /**
    * Handles user logout by clearing local storage and redirecting to the home page.
    */
-
+  /* istanbul ignore next */
   const handleLogout = (): void => {
     localStorage.clear();
     window.location.replace('/');
@@ -173,7 +174,10 @@ function organizationNavbar(props: InterfaceNavbarProps): JSX.Element {
             <Nav className="me-auto flex-grow-1 pe-3 pt-1" variant="dark">
               <Nav.Link
                 active={props.currentPage === 'home'}
-                onClick={(): void => navigate(homeLink)}
+                onClick={
+                  /* istanbul ignore next */
+                  (): void => navigate(homeLink)
+                }
               >
                 {t('home')}
               </Nav.Link>
diff --git a/src/components/UserPortal/OrganizationSidebar/OrganizationSidebar.tsx b/src/components/UserPortal/OrganizationSidebar/OrganizationSidebar.tsx
index cb3ce547cd..796d30d568 100644
--- a/src/components/UserPortal/OrganizationSidebar/OrganizationSidebar.tsx
+++ b/src/components/UserPortal/OrganizationSidebar/OrganizationSidebar.tsx
@@ -80,7 +80,7 @@ export default function organizationSidebar(): JSX.Element {
    *
    * Sets the members state with the data from the query.
    */
-
+  /* istanbul ignore next */
   useEffect(() => {
     if (memberData) {
       setMembers(memberData.organizationsMemberConnection.edges);
@@ -92,7 +92,7 @@ export default function organizationSidebar(): JSX.Element {
    *
    * Sets the events state with the data from the query.
    */
-
+  /* istanbul ignore next */
   useEffect(() => {
     if (eventsData) {
       setEvents(eventsData.eventsByOrganizationConnection);
diff --git a/src/components/UserPortal/PostCard/PostCard.tsx b/src/components/UserPortal/PostCard/PostCard.tsx
index e29564018d..f8fcdaebca 100644
--- a/src/components/UserPortal/PostCard/PostCard.tsx
+++ b/src/components/UserPortal/PostCard/PostCard.tsx
@@ -121,12 +121,13 @@ export default function postCard(props: InterfacePostCard): JSX.Element {
             postId: props.id,
           },
         });
-
+        /* istanbul ignore next */
         if (data) {
           setLikes((likes) => likes - 1);
           setIsLikedByUser(false);
         }
       } catch (error: unknown) {
+        /* istanbul ignore next */
         toast.error(error as string);
       }
     } else {
@@ -136,12 +137,13 @@ export default function postCard(props: InterfacePostCard): JSX.Element {
             postId: props.id,
           },
         });
-
+        /* istanbul ignore next */
         if (data) {
           setLikes((likes) => likes + 1);
           setIsLikedByUser(true);
         }
       } catch (error: unknown) {
+        /* istanbul ignore next */
         toast.error(error as string);
       }
     }
@@ -203,6 +205,7 @@ export default function postCard(props: InterfacePostCard): JSX.Element {
         },
       });
 
+      /* istanbul ignore next */
       if (createEventData) {
         setCommentInput('');
         setNumComments((numComments) => numComments + 1);
@@ -225,6 +228,7 @@ export default function postCard(props: InterfacePostCard): JSX.Element {
         setComments([...comments, newComment]);
       }
     } catch (error: unknown) {
+      /* istanbul ignore next */
       errorHandler(t, error);
     }
   };
@@ -243,6 +247,7 @@ export default function postCard(props: InterfacePostCard): JSX.Element {
       toggleEditPost();
       toast.success(tCommon('updatedSuccessfully', { item: 'Post' }) as string);
     } catch (error: unknown) {
+      /* istanbul ignore next */
       errorHandler(t, error);
     }
   };
@@ -259,6 +264,7 @@ export default function postCard(props: InterfacePostCard): JSX.Element {
       props.fetchPosts(); // Refresh the posts
       toast.success('Successfully deleted the Post.');
     } catch (error: unknown) {
+      /* istanbul ignore next */
       errorHandler(t, error);
     }
   };
diff --git a/src/components/UserPortal/Register/Register.tsx b/src/components/UserPortal/Register/Register.tsx
index 9c12929bf4..11a810c955 100644
--- a/src/components/UserPortal/Register/Register.tsx
+++ b/src/components/UserPortal/Register/Register.tsx
@@ -76,7 +76,7 @@ export default function register(props: InterfaceRegisterProps): JSX.Element {
         toast.success(t('afterRegister') as string); // Success message
 
         // Reset form fields
-
+        /* istanbul ignore next */
         setRegisterVariables({
           firstName: '',
           lastName: '',
@@ -86,7 +86,7 @@ export default function register(props: InterfaceRegisterProps): JSX.Element {
         });
       } catch (error: unknown) {
         // Handle any errors during registration
-
+        /* istanbul ignore next */
         errorHandler(t, error);
       }
     }
@@ -96,7 +96,7 @@ export default function register(props: InterfaceRegisterProps): JSX.Element {
    * Updates the state with the first name input value.
    * @param e - Change event from the input element
    */
-
+  /* istanbul ignore next */
   const handleFirstName = (e: ChangeEvent<HTMLInputElement>): void => {
     const firstName = e.target.value;
     setRegisterVariables({ ...registerVariables, firstName });
@@ -106,7 +106,7 @@ export default function register(props: InterfaceRegisterProps): JSX.Element {
    * Updates the state with the last name input value.
    * @param e - Change event from the input element
    */
-
+  /* istanbul ignore next */
   const handleLastName = (e: ChangeEvent<HTMLInputElement>): void => {
     const lastName = e.target.value;
     setRegisterVariables({ ...registerVariables, lastName });
@@ -116,7 +116,7 @@ export default function register(props: InterfaceRegisterProps): JSX.Element {
    * Updates the state with the email input value.
    * @param e - Change event from the input element
    */
-
+  /* istanbul ignore next */
   const handleEmailChange = (e: ChangeEvent<HTMLInputElement>): void => {
     const email = e.target.value;
     setRegisterVariables({ ...registerVariables, email });
@@ -126,7 +126,7 @@ export default function register(props: InterfaceRegisterProps): JSX.Element {
    * Updates the state with the password input value.
    * @param e - Change event from the input element
    */
-
+  /* istanbul ignore next */
   const handlePasswordChange = (e: ChangeEvent<HTMLInputElement>): void => {
     const password = e.target.value;
 
@@ -137,7 +137,7 @@ export default function register(props: InterfaceRegisterProps): JSX.Element {
    * Updates the state with the confirm password input value.
    * @param e - Change event from the input element
    */
-
+  /* istanbul ignore next */
   const handleConfirmPasswordChange = (
     e: ChangeEvent<HTMLInputElement>,
   ): void => {
diff --git a/src/components/UserPortal/StartPostModal/StartPostModal.tsx b/src/components/UserPortal/StartPostModal/StartPostModal.tsx
index 05dccb0203..d48b8425fa 100644
--- a/src/components/UserPortal/StartPostModal/StartPostModal.tsx
+++ b/src/components/UserPortal/StartPostModal/StartPostModal.tsx
@@ -90,7 +90,7 @@ const startPostModal = ({
           file: img,
         },
       });
-
+      /* istanbul ignore next */
       if (data) {
         toast.dismiss();
         toast.success(t('postNowVisibleInFeed') as string);
@@ -98,6 +98,7 @@ const startPostModal = ({
         handleHide();
       }
     } catch (error: unknown) {
+      /* istanbul ignore next */
       errorHandler(t, error);
     }
   };
diff --git a/src/components/UserPortal/UserNavbar/UserNavbar.tsx b/src/components/UserPortal/UserNavbar/UserNavbar.tsx
index 6e90d0d4fc..4160b00aad 100644
--- a/src/components/UserPortal/UserNavbar/UserNavbar.tsx
+++ b/src/components/UserPortal/UserNavbar/UserNavbar.tsx
@@ -41,6 +41,7 @@ function userNavbar(): JSX.Element {
 
   // State for managing the current language code
   const [currentLanguageCode, setCurrentLanguageCode] = React.useState(
+    /* istanbul ignore next */
     cookies.get('i18next') || 'en',
   );
 
@@ -51,7 +52,7 @@ function userNavbar(): JSX.Element {
    * Handles user logout by revoking the refresh token and clearing local storage.
    * Redirects to the home page after logout.
    */
-
+  /* istanbul ignore next */
   const handleLogout = (): void => {
     revokeRefreshToken();
     localStorage.clear();
diff --git a/src/components/Venues/VenueModal.tsx b/src/components/Venues/VenueModal.tsx
index 540fae9614..1d0fbe0af4 100644
--- a/src/components/Venues/VenueModal.tsx
+++ b/src/components/Venues/VenueModal.tsx
@@ -98,7 +98,7 @@ const VenueModal = ({
           ...(edit && { id: venueData?._id }),
         },
       });
-
+      /* istanbul ignore next */
       if (data) {
         toast.success(
           edit ? (t('venueUpdated') as string) : (t('venueAdded') as string),
@@ -114,6 +114,7 @@ const VenueModal = ({
         setVenueImage(false);
       }
     } catch (error) {
+      /* istanbul ignore next */
       errorHandler(t, error);
     }
   }, [
@@ -135,7 +136,7 @@ const VenueModal = ({
   const clearImageInput = useCallback(() => {
     setFormState((prevState) => ({ ...prevState, imageURL: '' }));
     setVenueImage(false);
-
+    /* istanbul ignore next */
     if (fileInputRef.current) {
       fileInputRef.current.value = '';
     }
@@ -235,7 +236,7 @@ const VenueModal = ({
               }));
               setVenueImage(true);
               const file = e.target.files?.[0];
-
+              /* istanbul ignore next */
               if (file) {
                 setFormState({
                   ...formState,
diff --git a/src/screens/BlockUser/BlockUser.tsx b/src/screens/BlockUser/BlockUser.tsx
index 3dc40c3c2b..8e69e5ec2a 100644
--- a/src/screens/BlockUser/BlockUser.tsx
+++ b/src/screens/BlockUser/BlockUser.tsx
@@ -104,12 +104,13 @@ const Requests = (): JSX.Element => {
             orgId: currentUrl,
           },
         });
-
+        /* istanbul ignore next */
         if (data) {
           toast.success(t('blockedSuccessfully') as string);
           memberRefetch();
         }
       } catch (error: unknown) {
+        /* istanbul ignore next */
         errorHandler(t, error);
       }
     },
@@ -126,12 +127,13 @@ const Requests = (): JSX.Element => {
             orgId: currentUrl,
           },
         });
-
+        /* istanbul ignore next */
         if (data) {
           toast.success(t('Un-BlockedSuccessfully') as string);
           memberRefetch();
         }
       } catch (error: unknown) {
+        /* istanbul ignore next */
         errorHandler(t, error);
       }
     },
diff --git a/src/screens/CommunityProfile/CommunityProfile.tsx b/src/screens/CommunityProfile/CommunityProfile.tsx
index 349069f9bc..05f328ced0 100644
--- a/src/screens/CommunityProfile/CommunityProfile.tsx
+++ b/src/screens/CommunityProfile/CommunityProfile.tsx
@@ -150,6 +150,7 @@ const CommunityProfile = (): JSX.Element => {
       });
       toast.success(t('profileChangedMsg') as string);
     } catch (error: unknown) {
+      /* istanbul ignore next */
       errorHandler(t, error as Error);
     }
   };
@@ -182,6 +183,7 @@ const CommunityProfile = (): JSX.Element => {
       });
       toast.success(t(`resetData`) as string);
     } catch (error: unknown) {
+      /* istanbul ignore next */
       errorHandler(t, error as Error);
     }
   };
diff --git a/src/screens/EventManagement/EventManagement.tsx b/src/screens/EventManagement/EventManagement.tsx
index a80ead8999..2e5cdbd419 100644
--- a/src/screens/EventManagement/EventManagement.tsx
+++ b/src/screens/EventManagement/EventManagement.tsx
@@ -99,7 +99,7 @@ const EventManagement = (): JSX.Element => {
   // Determine user role based on local storage
   const superAdmin = getItem('SuperAdmin');
   const adminFor = getItem('AdminFor');
-
+  /*istanbul ignore next*/
   const userRole = superAdmin
     ? 'SUPERADMIN'
     : adminFor?.length > 0
@@ -108,7 +108,7 @@ const EventManagement = (): JSX.Element => {
 
   // Extract event and organization IDs from URL parameters
   const { eventId, orgId } = useParams();
-
+  /*istanbul ignore next*/
   if (!eventId || !orgId) {
     // Redirect if event ID or organization ID is missing
     return <Navigate to={'/orglist'} />;
@@ -158,6 +158,7 @@ const EventManagement = (): JSX.Element => {
   };
 
   const handleBack = (): void => {
+    /*istanbul ignore next*/
     if (userRole === 'USER') {
       navigate(`/user/events/${orgId}`);
     } else {
@@ -201,7 +202,10 @@ const EventManagement = (): JSX.Element => {
               {eventDashboardTabs.map(({ value, icon }, index) => (
                 <Dropdown.Item
                   key={index}
-                  onClick={() => setTab(value)}
+                  onClick={
+                    /* istanbul ignore next */
+                    () => setTab(value)
+                  }
                   className={`d-flex gap-2 ${tab === value ? 'text-secondary' : ''}`}
                 >
                   {icon} {t(value)}
@@ -265,8 +269,9 @@ const EventManagement = (): JSX.Element => {
                 <h2>Statistics</h2>
               </div>
             );
-
+          /*istanbul ignore next*/
           default:
+            /*istanbul ignore next*/
             return null;
         }
       })()}
diff --git a/src/screens/EventVolunteers/VolunteerGroups/VolunteerGroupModal.tsx b/src/screens/EventVolunteers/VolunteerGroups/VolunteerGroupModal.tsx
index e332eee46a..e36ecaa0bd 100644
--- a/src/screens/EventVolunteers/VolunteerGroups/VolunteerGroupModal.tsx
+++ b/src/screens/EventVolunteers/VolunteerGroups/VolunteerGroupModal.tsx
@@ -246,23 +246,26 @@ const VolunteerGroupModal: React.FC<InterfaceVolunteerGroupModal> = ({
               getOptionLabel={(member: InterfaceUserInfo): string =>
                 `${member.firstName} ${member.lastName}`
               }
-              onChange={(_, newLeader): void => {
-                if (newLeader) {
-                  setFormState({
-                    ...formState,
-                    leader: newLeader,
-                    volunteerUsers: [...volunteerUsers, newLeader],
-                  });
-                } else {
-                  setFormState({
-                    ...formState,
-                    leader: null,
-                    volunteerUsers: volunteerUsers.filter(
-                      (user) => user._id !== leader?._id,
-                    ),
-                  });
+              onChange={
+                /*istanbul ignore next*/
+                (_, newLeader): void => {
+                  if (newLeader) {
+                    setFormState({
+                      ...formState,
+                      leader: newLeader,
+                      volunteerUsers: [...volunteerUsers, newLeader],
+                    });
+                  } else {
+                    setFormState({
+                      ...formState,
+                      leader: null,
+                      volunteerUsers: volunteerUsers.filter(
+                        (user) => user._id !== leader?._id,
+                      ),
+                    });
+                  }
                 }
-              }}
+              }
               renderInput={(params) => (
                 <TextField {...params} label="Leader *" />
               )}
@@ -284,12 +287,15 @@ const VolunteerGroupModal: React.FC<InterfaceVolunteerGroupModal> = ({
                 `${member.firstName} ${member.lastName}`
               }
               disabled={mode === 'edit'}
-              onChange={(_, newUsers): void => {
-                setFormState({
-                  ...formState,
-                  volunteerUsers: newUsers,
-                });
-              }}
+              onChange={
+                /*istanbul ignore next*/
+                (_, newUsers): void => {
+                  setFormState({
+                    ...formState,
+                    volunteerUsers: newUsers,
+                  });
+                }
+              }
               renderInput={(params) => (
                 <TextField {...params} label="Invite Volunteers *" />
               )}
diff --git a/src/screens/EventVolunteers/Volunteers/VolunteerCreateModal.tsx b/src/screens/EventVolunteers/Volunteers/VolunteerCreateModal.tsx
index 7b5a38b404..dee45376db 100644
--- a/src/screens/EventVolunteers/Volunteers/VolunteerCreateModal.tsx
+++ b/src/screens/EventVolunteers/Volunteers/VolunteerCreateModal.tsx
@@ -126,9 +126,12 @@ const VolunteerCreateModal: React.FC<InterfaceVolunteerCreateModal> = ({
               getOptionLabel={(member: InterfaceUserInfo): string =>
                 `${member.firstName} ${member.lastName}`
               }
-              onChange={(_, newVolunteer): void => {
-                setUserId(newVolunteer?._id ?? '');
-              }}
+              onChange={
+                /*istanbul ignore next*/
+                (_, newVolunteer): void => {
+                  setUserId(newVolunteer?._id ?? '');
+                }
+              }
               renderInput={(params) => <TextField {...params} label="Member" />}
             />
           </Form.Group>
diff --git a/src/screens/ForgotPassword/ForgotPassword.tsx b/src/screens/ForgotPassword/ForgotPassword.tsx
index 1794229d48..663960572b 100644
--- a/src/screens/ForgotPassword/ForgotPassword.tsx
+++ b/src/screens/ForgotPassword/ForgotPassword.tsx
@@ -135,6 +135,7 @@ const ForgotPassword = (): JSX.Element => {
         },
       });
 
+      /* istanbul ignore next */
       if (data) {
         toast.success(t('passwordChanges') as string);
         setShowEnterEmail(true);
@@ -146,7 +147,7 @@ const ForgotPassword = (): JSX.Element => {
       }
     } catch (error: unknown) {
       setShowEnterEmail(true);
-
+      /* istanbul ignore next */
       errorHandler(t, error);
     }
   };
diff --git a/src/screens/FundCampaignPledge/FundCampaignPledge.tsx b/src/screens/FundCampaignPledge/FundCampaignPledge.tsx
index aa7ab838c3..8942265eea 100644
--- a/src/screens/FundCampaignPledge/FundCampaignPledge.tsx
+++ b/src/screens/FundCampaignPledge/FundCampaignPledge.tsx
@@ -389,7 +389,10 @@ const fundCampaignPledge = (): JSX.Element => {
           underline="hover"
           color="inherit"
           component="button"
-          onClick={() => history.go(-2)}
+          onClick={
+            /* istanbul ignore next */
+            () => history.go(-2)
+          }
         >
           {fundName}
         </Link>
@@ -397,7 +400,10 @@ const fundCampaignPledge = (): JSX.Element => {
           underline="hover"
           color="inherit"
           component="button"
-          onClick={() => history.back()}
+          onClick={
+            /* istanbul ignore next */
+            () => history.back()
+          }
         >
           {campaignInfo?.name}
         </Link>
diff --git a/src/screens/FundCampaignPledge/PledgeModal.tsx b/src/screens/FundCampaignPledge/PledgeModal.tsx
index 3edc19eb28..04b8aae7da 100644
--- a/src/screens/FundCampaignPledge/PledgeModal.tsx
+++ b/src/screens/FundCampaignPledge/PledgeModal.tsx
@@ -111,6 +111,7 @@ const PledgeModal: React.FC<InterfacePledgeModal> = ({
 
   useEffect(() => {
     if (memberData) {
+      /*istanbul ignore next*/
       setPledgers(memberData.organizations[0].members);
     }
   }, [memberData]);
@@ -123,6 +124,7 @@ const PledgeModal: React.FC<InterfacePledgeModal> = ({
     pledgeEndDate,
   } = formState;
 
+  /*istanbul ignore next*/
   const updatePledgeHandler = useCallback(
     async (e: ChangeEvent<HTMLFormElement>): Promise<void> => {
       e.preventDefault();
@@ -192,6 +194,7 @@ const PledgeModal: React.FC<InterfacePledgeModal> = ({
         });
         hide();
       } catch (error: unknown) {
+        /*istanbul ignore next*/
         toast.error((error as Error).message);
       }
     },
@@ -235,12 +238,15 @@ const PledgeModal: React.FC<InterfacePledgeModal> = ({
               getOptionLabel={(member: InterfaceUserInfo): string =>
                 `${member.firstName} ${member.lastName}`
               }
-              onChange={(_, newPledgers): void => {
-                setFormState({
-                  ...formState,
-                  pledgeUsers: newPledgers,
-                });
-              }}
+              onChange={
+                /*istanbul ignore next*/
+                (_, newPledgers): void => {
+                  setFormState({
+                    ...formState,
+                    pledgeUsers: newPledgers,
+                  });
+                }
+              }
               renderInput={(params) => (
                 <TextField {...params} label="Pledgers" />
               )}
@@ -260,6 +266,7 @@ const PledgeModal: React.FC<InterfacePledgeModal> = ({
                     pledgeStartDate: date.toDate(),
                     pledgeEndDate:
                       pledgeEndDate &&
+                      /*istanbul ignore next*/
                       (pledgeEndDate < date?.toDate()
                         ? date.toDate()
                         : pledgeEndDate),
@@ -298,12 +305,15 @@ const PledgeModal: React.FC<InterfacePledgeModal> = ({
                 value={pledgeCurrency}
                 label={t('currency')}
                 data-testid="currencySelect"
-                onChange={(e) => {
-                  setFormState({
-                    ...formState,
-                    pledgeCurrency: e.target.value,
-                  });
-                }}
+                onChange={
+                  /*istanbul ignore next*/
+                  (e) => {
+                    setFormState({
+                      ...formState,
+                      pledgeCurrency: e.target.value,
+                    });
+                  }
+                }
               >
                 {currencyOptions.map((currency) => (
                   <MenuItem key={currency.label} value={currency.value}>
diff --git a/src/screens/ManageTag/ManageTag.spec.tsx b/src/screens/ManageTag/ManageTag.spec.tsx
index a473aea70f..5d86ed3c17 100644
--- a/src/screens/ManageTag/ManageTag.spec.tsx
+++ b/src/screens/ManageTag/ManageTag.spec.tsx
@@ -50,6 +50,7 @@ vi.mock('react-toastify', () => ({
   },
 }));
 
+/* eslint-disable @typescript-eslint/no-var-requires, @typescript-eslint/no-require-imports */
 vi.mock('../../components/AddPeopleToTag/AddPeopleToTag', async () => {
   return await import('./ManageTagMockComponents/MockAddPeopleToTag');
 });
@@ -57,6 +58,7 @@ vi.mock('../../components/AddPeopleToTag/AddPeopleToTag', async () => {
 vi.mock('../../components/TagActions/TagActions', async () => {
   return await import('./ManageTagMockComponents/MockTagActions');
 });
+/* eslint-enable @typescript-eslint/no-var-requires, @typescript-eslint/no-require-imports */
 
 const renderManageTag = (link: ApolloLink): RenderResult => {
   return render(
diff --git a/src/screens/ManageTag/ManageTag.tsx b/src/screens/ManageTag/ManageTag.tsx
index 6a016bb9cd..7eb6a3221d 100644
--- a/src/screens/ManageTag/ManageTag.tsx
+++ b/src/screens/ManageTag/ManageTag.tsx
@@ -132,6 +132,7 @@ function ManageTag(): JSX.Element {
           };
         },
       ) => {
+        /* istanbul ignore next -- @preserve */
         if (!fetchMoreResult) return prevResult;
 
         return {
@@ -174,6 +175,7 @@ function ManageTag(): JSX.Element {
       toggleUnassignUserTagModal();
       toast.success(t('successfullyUnassigned') as string);
     } catch (error: unknown) {
+      /* istanbul ignore next -- @preserve */
       if (error instanceof Error) {
         toast.error(error.message);
       }
@@ -208,12 +210,14 @@ function ManageTag(): JSX.Element {
         },
       });
 
+      /* istanbul ignore else -- @preserve */
       if (data) {
         toast.success(t('tagUpdationSuccess'));
         userTagAssignedMembersRefetch();
         setEditUserTagModalIsOpen(false);
       }
     } catch (error: unknown) {
+      /* istanbul ignore next -- @preserve */
       if (error instanceof Error) {
         toast.error(error.message);
       }
@@ -233,6 +237,7 @@ function ManageTag(): JSX.Element {
       toggleRemoveUserTagModal();
       toast.success(t('tagRemovalSuccess') as string);
     } catch (error: unknown) {
+      /* istanbul ignore next -- @preserve */
       if (error instanceof Error) {
         toast.error(error.message);
       }
@@ -255,7 +260,7 @@ function ManageTag(): JSX.Element {
   const userTagAssignedMembers =
     userTagAssignedMembersData?.getAssignedUsers.usersAssignedTo.edges.map(
       (edge) => edge.node,
-    ) ?? [];
+    ) ?? /* istanbul ignore next -- @preserve */ [];
 
   // get the ancestorTags array and push the current tag in it
   // used for the tag breadcrumbs
@@ -449,6 +454,7 @@ function ManageTag(): JSX.Element {
                     >
                       {tag.name}
                       {orgUserTagAncestors.length - 1 !== index && (
+                        /* istanbul ignore next -- @preserve */
                         <i className={'mx-2 fa fa-caret-right'} />
                       )}
                     </div>
@@ -464,7 +470,8 @@ function ManageTag(): JSX.Element {
                     next={loadMoreAssignedMembers}
                     hasMore={
                       userTagAssignedMembersData?.getAssignedUsers
-                        .usersAssignedTo.pageInfo.hasNextPage ?? false
+                        .usersAssignedTo.pageInfo.hasNextPage ??
+                      /* istanbul ignore next -- @preserve */ false
                     }
                     loader={<InfiniteScrollLoader />}
                     scrollableTarget="manageTagScrollableDiv"
@@ -475,15 +482,16 @@ function ManageTag(): JSX.Element {
                       hideFooter={true}
                       getRowId={(row) => row.id}
                       slots={{
-                        noRowsOverlay: () => (
-                          <Stack
-                            height="100%"
-                            alignItems="center"
-                            justifyContent="center"
-                          >
-                            {t('noAssignedMembersFound')}
-                          </Stack>
-                        ),
+                        noRowsOverlay:
+                          /* istanbul ignore next -- @preserve */ () => (
+                            <Stack
+                              height="100%"
+                              alignItems="center"
+                              justifyContent="center"
+                            >
+                              {t('noAssignedMembersFound')}
+                            </Stack>
+                          ),
                       }}
                       sx={dataGridStyle}
                       getRowClassName={() => `${styles.rowBackgrounds}`}
diff --git a/src/screens/MemberDetail/MemberDetail.tsx b/src/screens/MemberDetail/MemberDetail.tsx
index effd0341e8..cd552c80a0 100644
--- a/src/screens/MemberDetail/MemberDetail.tsx
+++ b/src/screens/MemberDetail/MemberDetail.tsx
@@ -95,6 +95,7 @@ const MemberDetail: React.FC<MemberDetailProps> = ({ id }): JSX.Element => {
     }
   };
 
+  /*istanbul ignore next*/
   const handleEditIconClick = (): void => {
     fileInputRef.current?.click();
   };
@@ -142,16 +143,19 @@ const MemberDetail: React.FC<MemberDetailProps> = ({ id }): JSX.Element => {
   const tagsAssigned =
     userData?.user?.tagsAssignedWith.edges.map(
       (edge: { node: InterfaceTagData; cursor: string }) => edge.node,
-    ) ?? [];
+    ) ?? /* istanbul ignore next */ [];
 
   const loadMoreAssignedTags = (): void => {
     fetchMoreAssignedTags({
       variables: {
         first: TAGS_QUERY_DATA_CHUNK_SIZE,
-        after: user?.user?.user?.tagsAssignedWith?.pageInfo?.endCursor ?? null,
+        after:
+          user?.user?.user?.tagsAssignedWith?.pageInfo?.endCursor ??
+          /* istanbul ignore next */
+          null,
       },
       updateQuery: (prevResult, { fetchMoreResult }) => {
-        if (!fetchMoreResult) return prevResult;
+        if (!fetchMoreResult) /* istanbul ignore next */ return prevResult;
 
         return {
           user: {
@@ -189,6 +193,7 @@ const MemberDetail: React.FC<MemberDetailProps> = ({ id }): JSX.Element => {
       toggleUnassignUserTagModal();
       toast.success(t('successfullyUnassigned'));
     } catch (error: unknown) {
+      /* istanbul ignore next */
       if (error instanceof Error) {
         toast.error(error.message);
       }
@@ -206,7 +211,7 @@ const MemberDetail: React.FC<MemberDetailProps> = ({ id }): JSX.Element => {
     e: React.ChangeEvent<HTMLInputElement | HTMLSelectElement>,
   ): Promise<void> => {
     const { name, value } = e.target;
-
+    /*istanbul ignore next*/
     if (
       name === 'photo' &&
       'files' in e.target &&
@@ -246,7 +251,7 @@ const MemberDetail: React.FC<MemberDetailProps> = ({ id }): JSX.Element => {
             ...formState,
           },
         });
-
+        /* istanbul ignore next */
         if (data) {
           setisUpdated(false);
           if (getItem('id') === currentUrl) {
@@ -263,12 +268,14 @@ const MemberDetail: React.FC<MemberDetailProps> = ({ id }): JSX.Element => {
         }
       }
     } catch (error: unknown) {
+      /* istanbul ignore next */
       if (error instanceof Error) {
         errorHandler(t, error);
       }
     }
   };
   const resetChanges = (): void => {
+    /*istanbul ignore next*/
     setFormState({
       firstName: userData?.user?.firstName || '',
       lastName: userData?.user?.lastName || '',
@@ -344,8 +351,9 @@ const MemberDetail: React.FC<MemberDetailProps> = ({ id }): JSX.Element => {
                       role="button"
                       aria-label="Edit profile picture"
                       tabIndex={0}
-                      onKeyDown={(e) =>
-                        e.key === 'Enter' && handleEditIconClick()
+                      onKeyDown={
+                        /*istanbul ignore next*/
+                        (e) => e.key === 'Enter' && handleEditIconClick()
                       }
                     />
                   </div>
@@ -625,6 +633,7 @@ const MemberDetail: React.FC<MemberDetailProps> = ({ id }): JSX.Element => {
                   next={loadMoreAssignedTags}
                   hasMore={
                     userData?.user?.tagsAssignedWith.pageInfo.hasNextPage ??
+                    /* istanbul ignore next */
                     false
                   }
                   loader={<InfiniteScrollLoader />}
diff --git a/src/screens/OrgList/OrganizationModal.tsx b/src/screens/OrgList/OrganizationModal.tsx
index 1f2306fe96..fb3589d1e5 100644
--- a/src/screens/OrgList/OrganizationModal.tsx
+++ b/src/screens/OrgList/OrganizationModal.tsx
@@ -278,7 +278,7 @@ const OrganizationModal: React.FC<InterfaceOrganizationModalProps> = ({
             onChange={async (e: React.ChangeEvent): Promise<void> => {
               const target = e.target as HTMLInputElement;
               const file = target.files && target.files[0];
-
+              /* istanbul ignore else */
               if (file)
                 setFormState({
                   ...formState,
diff --git a/src/screens/OrgPost/OrgPost.tsx b/src/screens/OrgPost/OrgPost.tsx
index 850d8cf9ed..e9cb4d4ca2 100644
--- a/src/screens/OrgPost/OrgPost.tsx
+++ b/src/screens/OrgPost/OrgPost.tsx
@@ -168,6 +168,7 @@ function orgPost(): JSX.Element {
         },
       });
 
+      /* istanbul ignore next */
       if (data) {
         toast.success(t('postCreatedSuccess') as string);
         refetch();
@@ -273,7 +274,7 @@ function orgPost(): JSX.Element {
     if (a.pinned === b.pinned) {
       return 0;
     }
-
+    /* istanbul ignore next */
     if (a.pinned) {
       return -1;
     }
diff --git a/src/screens/OrgSettings/OrgSettings.tsx b/src/screens/OrgSettings/OrgSettings.tsx
index 916bd04dff..c7b01138ae 100644
--- a/src/screens/OrgSettings/OrgSettings.tsx
+++ b/src/screens/OrgSettings/OrgSettings.tsx
@@ -81,7 +81,10 @@ function OrgSettings(): JSX.Element {
               {settingtabs.map((setting, index) => (
                 <Dropdown.Item
                   key={index}
-                  onClick={() => setTab(setting)}
+                  onClick={
+                    /* istanbul ignore next */
+                    () => setTab(setting)
+                  }
                   className={tab === setting ? 'text-secondary' : ''}
                 >
                   {t(setting)}
diff --git a/src/screens/OrganizationActionItems/ItemModal.tsx b/src/screens/OrganizationActionItems/ItemModal.tsx
index b59662c81f..b7555af121 100644
--- a/src/screens/OrganizationActionItems/ItemModal.tsx
+++ b/src/screens/OrganizationActionItems/ItemModal.tsx
@@ -404,6 +404,7 @@ const ItemModal: FC<InterfaceItemModalProps> = ({
                 item.name
               }
               onChange={(_, newCategory): void => {
+                /* istanbul ignore next */
                 handleFormChange(
                   'actionItemCategoryId',
                   newCategory?._id ?? '',
@@ -506,6 +507,7 @@ const ItemModal: FC<InterfaceItemModalProps> = ({
                       `${volunteer.user.firstName} ${volunteer.user.lastName}`
                     }
                     onChange={(_, newAssignee): void => {
+                      /* istanbul ignore next */
                       handleFormChange('assigneeId', newAssignee?._id ?? '');
                       setAssignee(newAssignee);
                     }}
@@ -529,6 +531,7 @@ const ItemModal: FC<InterfaceItemModalProps> = ({
                       group: InterfaceVolunteerGroupInfo,
                     ): string => `${group.name}`}
                     onChange={(_, newAssignee): void => {
+                      /* istanbul ignore next */
                       handleFormChange('assigneeId', newAssignee?._id ?? '');
                       setAssigneeGroup(newAssignee);
                     }}
@@ -556,6 +559,7 @@ const ItemModal: FC<InterfaceItemModalProps> = ({
                       `${member.firstName} ${member.lastName}`
                     }
                     onChange={(_, newAssignee): void => {
+                      /* istanbul ignore next */
                       handleFormChange('assigneeId', newAssignee?._id ?? '');
                       setAssigneeUser(newAssignee);
                     }}
@@ -574,6 +578,7 @@ const ItemModal: FC<InterfaceItemModalProps> = ({
                   className={styles.noOutline}
                   value={dayjs(dueDate)}
                   onChange={(date: Dayjs | null): void => {
+                    /* istanbul ignore next */
                     if (date) handleFormChange('dueDate', date.toDate());
                   }}
                 />
diff --git a/src/screens/OrganizationDashboard/OrganizationDashboard.tsx b/src/screens/OrganizationDashboard/OrganizationDashboard.tsx
index ccd4794ecc..abc712289c 100644
--- a/src/screens/OrganizationDashboard/OrganizationDashboard.tsx
+++ b/src/screens/OrganizationDashboard/OrganizationDashboard.tsx
@@ -210,9 +210,12 @@ function OrganizationDashboard(): JSX.Element {
                 sm={4}
                 role="button"
                 className="mb-4"
-                onClick={(): void => {
-                  navigate(peopleLink);
-                }}
+                onClick={
+                  /*istanbul ignore next*/
+                  (): void => {
+                    navigate(peopleLink);
+                  }
+                }
               >
                 <DashBoardCard
                   count={data?.organizations[0].admins?.length}
@@ -344,10 +347,12 @@ function OrganizationDashboard(): JSX.Element {
                       return <CardItemLoading key={`postLoading_${index}`} />;
                     })
                   ) : postData?.organizations[0].posts.totalCount == 0 ? (
+                    /* eslint-disable */
                     <div className={styles.emptyContainer}>
                       <h6>{t('noPostsPresent')}</h6>
                     </div>
                   ) : (
+                    /* eslint-enable */
                     postData?.organizations[0].posts.edges
                       .slice(0, 5)
                       .map((edge) => {
diff --git a/src/screens/OrganizationEvents/OrganizationEvents.tsx b/src/screens/OrganizationEvents/OrganizationEvents.tsx
index aca8ca6d24..12abb3e74a 100644
--- a/src/screens/OrganizationEvents/OrganizationEvents.tsx
+++ b/src/screens/OrganizationEvents/OrganizationEvents.tsx
@@ -101,6 +101,7 @@ function organizationEvents(): JSX.Element {
     setCreateEventmodalisOpen(false);
   };
   const handleChangeView = (item: string | null): void => {
+    /*istanbul ignore next*/
     if (item) {
       setViewType(item as ViewType);
     }
@@ -220,6 +221,7 @@ function organizationEvents(): JSX.Element {
           setEndDate(new Date());
         }
       } catch (error: unknown) {
+        /* istanbul ignore next */
         if (error instanceof Error) {
           console.log(error.message);
           errorHandler(t, error);
@@ -382,14 +384,18 @@ function organizationEvents(): JSX.Element {
                     className={styles.datebox}
                     timeSteps={{ hours: 1, minutes: 1, seconds: 1 }}
                     value={timeToDayJs(formState.startTime)}
+                    /*istanbul ignore next*/
                     onChange={(time): void => {
                       if (time) {
                         setFormState({
                           ...formState,
                           startTime: time?.format('HH:mm:ss'),
                           endTime:
+                            /*istanbul ignore next*/
                             timeToDayJs(formState.endTime) < time
-                              ? time?.format('HH:mm:ss')
+                              ? /* istanbul ignore next */ time?.format(
+                                  'HH:mm:ss',
+                                )
                               : formState.endTime,
                         });
                       }
@@ -402,6 +408,7 @@ function organizationEvents(): JSX.Element {
                     label={tCommon('endTime')}
                     className={styles.datebox}
                     timeSteps={{ hours: 1, minutes: 1, seconds: 1 }}
+                    /*istanbul ignore next*/
                     value={timeToDayJs(formState.endTime)}
                     onChange={(time): void => {
                       if (time) {
diff --git a/src/screens/OrganizationFundCampaign/CampaignModal.tsx b/src/screens/OrganizationFundCampaign/CampaignModal.tsx
index e2d9333395..63d1e8de3a 100644
--- a/src/screens/OrganizationFundCampaign/CampaignModal.tsx
+++ b/src/screens/OrganizationFundCampaign/CampaignModal.tsx
@@ -127,7 +127,7 @@ const CampaignModal: React.FC<InterfaceCampaignModal> = ({
    * @param e - The form event.
    * @returns Promise<void>
    */
-
+  /*istanbul ignore next*/
   const updateCampaignHandler = async (
     e: ChangeEvent<HTMLFormElement>,
   ): Promise<void> => {
@@ -263,12 +263,15 @@ const CampaignModal: React.FC<InterfaceCampaignModal> = ({
                   value={campaignCurrency}
                   label={t('currency')}
                   data-testid="currencySelect"
-                  onChange={(e) => {
-                    setFormState({
-                      ...formState,
-                      campaignCurrency: e.target.value,
-                    });
-                  }}
+                  onChange={
+                    /*istanbul ignore next*/
+                    (e) => {
+                      setFormState({
+                        ...formState,
+                        campaignCurrency: e.target.value,
+                      });
+                    }
+                  }
                 >
                   {currencyOptions.map((currency) => (
                     <MenuItem key={currency.label} value={currency.value}>
diff --git a/src/screens/OrganizationFunds/FundModal.tsx b/src/screens/OrganizationFunds/FundModal.tsx
index a11da16f46..b33270b30f 100644
--- a/src/screens/OrganizationFunds/FundModal.tsx
+++ b/src/screens/OrganizationFunds/FundModal.tsx
@@ -115,6 +115,7 @@ const FundModal: React.FC<InterfaceFundModal> = ({
     }
   };
 
+  /*istanbul ignore next*/
   const updateFundHandler = async (
     e: ChangeEvent<HTMLFormElement>,
   ): Promise<void> => {
diff --git a/src/screens/OrganizationPeople/OrganizationPeople.tsx b/src/screens/OrganizationPeople/OrganizationPeople.tsx
index 6f606e8055..36efdba63c 100644
--- a/src/screens/OrganizationPeople/OrganizationPeople.tsx
+++ b/src/screens/OrganizationPeople/OrganizationPeople.tsx
@@ -125,6 +125,7 @@ function organizationPeople(): JSX.Element {
     }
   }, [state, adminData]);
 
+  /* istanbul ignore next */
   if (memberError || usersError || adminError) {
     const error = memberError ?? usersError ?? adminError;
     toast.error(error?.message);
@@ -139,7 +140,7 @@ function organizationPeople(): JSX.Element {
 
   const handleFullNameSearchChange = (e: React.FormEvent): void => {
     e.preventDefault();
-
+    /* istanbul ignore next */
     const [firstName, lastName] = userName.split(' ');
     const newFilterData = {
       firstName_contains: firstName || '',
diff --git a/src/screens/OrganizationTags/OrganizationTags.tsx b/src/screens/OrganizationTags/OrganizationTags.tsx
index 41eb449cdf..c88ca7b821 100644
--- a/src/screens/OrganizationTags/OrganizationTags.tsx
+++ b/src/screens/OrganizationTags/OrganizationTags.tsx
@@ -84,6 +84,7 @@ function OrganizationTags(): JSX.Element {
         first: TAGS_QUERY_DATA_CHUNK_SIZE,
         after:
           orgUserTagsData?.organizations?.[0]?.userTags?.pageInfo?.endCursor ??
+          /* istanbul ignore next */
           null,
       },
       updateQuery: (
@@ -96,7 +97,7 @@ function OrganizationTags(): JSX.Element {
           };
         },
       ) => {
-        if (!fetchMoreResult) return prevResult;
+        if (!fetchMoreResult) /* istanbul ignore next */ return prevResult;
 
         return {
           organizations: [
@@ -147,6 +148,7 @@ function OrganizationTags(): JSX.Element {
         setCreateTagModalIsOpen(false);
       }
     } catch (error: unknown) {
+      /* istanbul ignore next */
       if (error instanceof Error) {
         toast.error(error.message);
       }
@@ -378,7 +380,7 @@ function OrganizationTags(): JSX.Element {
                   next={loadMoreUserTags}
                   hasMore={
                     orgUserTagsData?.organizations?.[0]?.userTags?.pageInfo
-                      ?.hasNextPage ?? false
+                      ?.hasNextPage ?? /* istanbul ignore next */ false
                   }
                   loader={<InfiniteScrollLoader />}
                   scrollableTarget="orgUserTagsScrollableDiv"
@@ -389,7 +391,7 @@ function OrganizationTags(): JSX.Element {
                     hideFooter={true}
                     getRowId={(row) => row.id}
                     slots={{
-                      noRowsOverlay: () => (
+                      noRowsOverlay: /* istanbul ignore next */ () => (
                         <Stack
                           height="100%"
                           alignItems="center"
diff --git a/src/screens/OrganizationVenues/OrganizationVenues.tsx b/src/screens/OrganizationVenues/OrganizationVenues.tsx
index 80d9ffb7ff..b3afda9685 100644
--- a/src/screens/OrganizationVenues/OrganizationVenues.tsx
+++ b/src/screens/OrganizationVenues/OrganizationVenues.tsx
@@ -78,6 +78,7 @@ function organizationVenues(): JSX.Element {
       });
       venueRefetch();
     } catch (error) {
+      /* istanbul ignore next */
       errorHandler(t, error);
     }
   };
@@ -127,7 +128,7 @@ function organizationVenues(): JSX.Element {
   };
 
   // Error handling for venue data fetch
-
+  /* istanbul ignore next */
   if (venueError) {
     errorHandler(t, venueError);
   }
diff --git a/src/screens/Requests/Requests.tsx b/src/screens/Requests/Requests.tsx
index f4fb673c7a..b078b2cbc0 100644
--- a/src/screens/Requests/Requests.tsx
+++ b/src/screens/Requests/Requests.tsx
@@ -180,7 +180,7 @@ const Requests = (): JSX.Element => {
   /**
    * Loads more requests when scrolling to the bottom of the page.
    */
-
+  /* istanbul ignore next */
   const loadMoreRequests = (): void => {
     setIsLoadingMore(true);
     fetchMore({
diff --git a/src/screens/SubTags/SubTags.tsx b/src/screens/SubTags/SubTags.tsx
index f3aff01dd8..6a20e875ec 100644
--- a/src/screens/SubTags/SubTags.tsx
+++ b/src/screens/SubTags/SubTags.tsx
@@ -93,6 +93,7 @@ function SubTags(): JSX.Element {
           fetchMoreResult?: { getChildTags: InterfaceQueryUserTagChildTags };
         },
       ) => {
+        /* istanbul ignore next -- @preserve */
         if (!fetchMoreResult) return prevResult;
 
         return {
@@ -126,6 +127,7 @@ function SubTags(): JSX.Element {
         },
       });
 
+      /* istanbul ignore next -- @preserve */
       if (data) {
         toast.success(t('tagCreationSuccess') as string);
         subTagsRefetch();
@@ -133,6 +135,7 @@ function SubTags(): JSX.Element {
         setAddSubTagModalIsOpen(false);
       }
     } catch (error: unknown) {
+      /* istanbul ignore next -- @preserve */
       if (error instanceof Error) {
         toast.error(error.message);
       }
@@ -153,6 +156,7 @@ function SubTags(): JSX.Element {
   }
 
   const subTagsList =
+    /* istanbul ignore next -- @preserve */
     subTagsData?.getChildTags.childTags.edges.map((edge) => edge.node) ?? [];
 
   const parentTagName = subTagsData?.getChildTags.name;
@@ -391,6 +395,7 @@ function SubTags(): JSX.Element {
                   next={loadMoreSubTags}
                   hasMore={
                     subTagsData?.getChildTags.childTags.pageInfo.hasNextPage ??
+                    /* istanbul ignore next -- @preserve */
                     false
                   }
                   loader={<InfiniteScrollLoader />}
@@ -402,15 +407,16 @@ function SubTags(): JSX.Element {
                     hideFooter={true}
                     getRowId={(row) => row.id}
                     slots={{
-                      noRowsOverlay: () => (
-                        <Stack
-                          height="100%"
-                          alignItems="center"
-                          justifyContent="center"
-                        >
-                          {t('noTagsFound')}
-                        </Stack>
-                      ),
+                      noRowsOverlay:
+                        /* istanbul ignore next -- @preserve */ () => (
+                          <Stack
+                            height="100%"
+                            alignItems="center"
+                            justifyContent="center"
+                          >
+                            {t('noTagsFound')}
+                          </Stack>
+                        ),
                     }}
                     sx={dataGridStyle}
                     getRowClassName={() => `${styles.rowBackground}`}
diff --git a/src/screens/UserPortal/Campaigns/PledgeModal.tsx b/src/screens/UserPortal/Campaigns/PledgeModal.tsx
index b0bb284050..44cc82401b 100644
--- a/src/screens/UserPortal/Campaigns/PledgeModal.tsx
+++ b/src/screens/UserPortal/Campaigns/PledgeModal.tsx
@@ -133,7 +133,7 @@ const PledgeModal: React.FC<InterfacePledgeModal> = ({
    * @param e - The form submission event.
    * @returns A promise that resolves when the pledge is successfully updated.
    */
-
+  /*istanbul ignore next*/
   const updatePledgeHandler = useCallback(
     async (e: ChangeEvent<HTMLFormElement>): Promise<void> => {
       e.preventDefault();
@@ -209,6 +209,7 @@ const PledgeModal: React.FC<InterfacePledgeModal> = ({
         });
         hide();
       } catch (error: unknown) {
+        /*istanbul ignore next*/
         toast.error((error as Error).message);
       }
     },
@@ -254,12 +255,15 @@ const PledgeModal: React.FC<InterfacePledgeModal> = ({
               getOptionLabel={(member: InterfaceUserInfo): string =>
                 `${member.firstName} ${member.lastName}`
               }
-              onChange={(_, newPledgers): void => {
-                setFormState({
-                  ...formState,
-                  pledgeUsers: newPledgers,
-                });
-              }}
+              onChange={
+                /*istanbul ignore next*/
+                (_, newPledgers): void => {
+                  setFormState({
+                    ...formState,
+                    pledgeUsers: newPledgers,
+                  });
+                }
+              }
               renderInput={(params) => (
                 <TextField {...params} label="Pledgers" />
               )}
@@ -279,6 +283,7 @@ const PledgeModal: React.FC<InterfacePledgeModal> = ({
                     pledgeStartDate: date.toDate(),
                     pledgeEndDate:
                       pledgeEndDate &&
+                      /*istanbul ignore next*/
                       (pledgeEndDate < date?.toDate()
                         ? date.toDate()
                         : pledgeEndDate),
@@ -317,12 +322,15 @@ const PledgeModal: React.FC<InterfacePledgeModal> = ({
                 value={pledgeCurrency}
                 label={t('currency')}
                 data-testid="currencySelect"
-                onChange={(e) => {
-                  setFormState({
-                    ...formState,
-                    pledgeCurrency: e.target.value,
-                  });
-                }}
+                onChange={
+                  /*istanbul ignore next*/
+                  (e) => {
+                    setFormState({
+                      ...formState,
+                      pledgeCurrency: e.target.value,
+                    });
+                  }
+                }
               >
                 {currencyOptions.map((currency) => (
                   <MenuItem key={currency.label} value={currency.value}>
diff --git a/src/screens/UserPortal/Chat/Chat.tsx b/src/screens/UserPortal/Chat/Chat.tsx
index 5679e7f4c8..441ce7d4ba 100644
--- a/src/screens/UserPortal/Chat/Chat.tsx
+++ b/src/screens/UserPortal/Chat/Chat.tsx
@@ -1,6 +1,8 @@
 import React, { useEffect, useState } from 'react';
 import { useQuery } from '@apollo/client';
+import { useTranslation } from 'react-i18next';
 import { Button, Dropdown } from 'react-bootstrap';
+import { SearchOutlined, Search } from '@mui/icons-material';
 import HourglassBottomIcon from '@mui/icons-material/HourglassBottom';
 import ContactCard from 'components/UserPortal/ContactCard/ContactCard';
 import ChatRoom from 'components/UserPortal/ChatRoom/ChatRoom';
@@ -46,45 +48,15 @@ interface InterfaceContactCardProps {
  *
  * @returns  The rendered `chat` component.
  */
-type DirectMessage = {
-  _id: string;
-  createdAt: Date;
-  sender: {
-    _id: string;
-    firstName: string;
-    lastName: string;
-    image: string;
-  };
-  messageContent: string;
-};
-type Chat = {
-  _id: string;
-  isGroup: boolean;
-  name: string;
-  image: string;
-  messages: DirectMessage[];
-  organization: {
-    _id: string;
-    name: string;
-  };
-  creator: {
-    _id: string;
-    firstName: string;
-    lastName: string;
-    email: string;
-  };
-  users: {
-    _id: string;
-    firstName: string;
-    lastName: string;
-    email: string;
-    image: string;
-  }[];
-};
 export default function chat(): JSX.Element {
+  const { t } = useTranslation('translation', {
+    keyPrefix: 'chat',
+  });
+  const { t: tCommon } = useTranslation('common');
+
   const [hideDrawer, setHideDrawer] = useState<boolean | null>(null);
-  const [chats, setChats] = useState<Chat[]>([]);
-  const [selectedContact, setSelectedContact] = useState<string>('');
+  const [chats, setChats] = useState<any>([]);
+  const [selectedContact, setSelectedContact] = useState('');
   const { getItem } = useLocalStorage();
   const userId = getItem('userId');
 
@@ -109,7 +81,7 @@ export default function chat(): JSX.Element {
     setCreateDirectChatModalisOpen(true);
   }
 
-  const toggleCreateDirectChatModal = (): void =>
+  const toggleCreateDirectChatModal = /* istanbul ignore next */ (): void =>
     setCreateDirectChatModalisOpen(!createDirectChatModalisOpen);
 
   const [createGroupChatModalisOpen, setCreateGroupChatModalisOpen] =
@@ -119,7 +91,7 @@ export default function chat(): JSX.Element {
     setCreateGroupChatModalisOpen(true);
   }
 
-  const toggleCreateGroupChatModal = (): void => {
+  const toggleCreateGroupChatModal = /* istanbul ignore next */ (): void => {
     setCreateGroupChatModalisOpen(!createGroupChatModalisOpen);
   };
 
@@ -224,7 +196,7 @@ export default function chat(): JSX.Element {
                   className={styles.contactCardContainer}
                 >
                   {!!chats.length &&
-                    chats.map((chat: Chat) => {
+                    chats.map((chat: any) => {
                       const cardProps: InterfaceContactCardProps = {
                         id: chat._id,
                         title: !chat.isGroup
diff --git a/src/screens/UserPortal/Donate/Donate.tsx b/src/screens/UserPortal/Donate/Donate.tsx
index dc7499a112..c6e6d918d5 100644
--- a/src/screens/UserPortal/Donate/Donate.tsx
+++ b/src/screens/UserPortal/Donate/Donate.tsx
@@ -97,6 +97,7 @@ export default function donate(): JSX.Element {
 
   const [donate] = useMutation(DONATE_TO_ORGANIZATION);
 
+  /* istanbul ignore next */
   const handleChangePage = (
     _event: React.MouseEvent<HTMLButtonElement> | null,
     newPage: number,
@@ -104,6 +105,7 @@ export default function donate(): JSX.Element {
     setPage(newPage);
   };
 
+  /* istanbul ignore next */
   const handleChangeRowsPerPage = (
     event: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>,
   ): void => {
@@ -162,6 +164,7 @@ export default function donate(): JSX.Element {
       refetch();
       toast.success(t(`success`) as string);
     } catch (error: unknown) {
+      /* istanbul ignore next */
       errorHandler(t, error);
     }
   };
@@ -267,7 +270,8 @@ export default function donate(): JSX.Element {
                             page * rowsPerPage,
                             page * rowsPerPage + rowsPerPage,
                           )
-                        : donations
+                        : /* istanbul ignore next */
+                          donations
                       ).map((donation: InterfaceDonation, index) => {
                         const cardProps: InterfaceDonationCardProps = {
                           name: donation.nameOfUser,
@@ -293,7 +297,10 @@ export default function donate(): JSX.Element {
                 <tbody>
                   <tr>
                     <PaginationList
-                      count={donations ? donations.length : 0}
+                      count={
+                        /* istanbul ignore next */
+                        donations ? donations.length : 0
+                      }
                       rowsPerPage={rowsPerPage}
                       page={page}
                       onPageChange={handleChangePage}
diff --git a/src/screens/UserPortal/Events/Events.tsx b/src/screens/UserPortal/Events/Events.tsx
index b72edeea70..d3fabf9469 100644
--- a/src/screens/UserPortal/Events/Events.tsx
+++ b/src/screens/UserPortal/Events/Events.tsx
@@ -120,6 +120,7 @@ export default function events(): JSX.Element {
         },
       });
 
+      /* istanbul ignore next */
       if (createEventData) {
         toast.success(t('eventCreated') as string);
         refetch();
@@ -133,6 +134,7 @@ export default function events(): JSX.Element {
       }
       setCreateEventmodalisOpen(false);
     } catch (error: unknown) {
+      /* istanbul ignore next */
       errorHandler(t, error);
     }
   };
@@ -142,7 +144,7 @@ export default function events(): JSX.Element {
    *
    * @returns Void.
    */
-
+  /* istanbul ignore next */
   const toggleCreateEventModal = (): void =>
     setCreateEventmodalisOpen(!createEventModal);
 
@@ -183,7 +185,7 @@ export default function events(): JSX.Element {
   };
 
   // Update the list of events when the data from the query changes
-
+  /* istanbul ignore next */
   React.useEffect(() => {
     if (data) {
       setEvents(data.eventsByOrganizationConnection);
@@ -195,7 +197,7 @@ export default function events(): JSX.Element {
    *
    * @returns Void.
    */
-
+  /* istanbul ignore next */
   const showInviteModal = (): void => {
     setCreateEventmodalisOpen(true);
   };
@@ -206,8 +208,9 @@ export default function events(): JSX.Element {
    * @param item - The view type to set, or null to reset.
    * @returns Void.
    */
-
+  /* istanbul ignore next */
   const handleChangeView = (item: string | null): void => {
+    /*istanbul ignore next*/
     if (item) {
       setViewType(item as ViewType);
     }
diff --git a/src/screens/UserPortal/Organizations/Organizations.tsx b/src/screens/UserPortal/Organizations/Organizations.tsx
index 50b9cfcbeb..59f5500d02 100644
--- a/src/screens/UserPortal/Organizations/Organizations.tsx
+++ b/src/screens/UserPortal/Organizations/Organizations.tsx
@@ -139,7 +139,7 @@ export default function organizations(): JSX.Element {
    * @param _event - The event triggering the page change.
    * @param  newPage - The new page number.
    */
-
+  /* istanbul ignore next */
   const handleChangePage = (
     _event: React.MouseEvent<HTMLButtonElement> | null,
     newPage: number,
@@ -152,7 +152,7 @@ export default function organizations(): JSX.Element {
    *
    * @param  event - The event triggering the change.
    */
-
+  /* istanbul ignore next */
   const handleChangeRowsPerPage = (
     event: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>,
   ): void => {
@@ -202,7 +202,7 @@ export default function organizations(): JSX.Element {
   /**
    * Updates the list of organizations based on query results and selected mode.
    */
-
+  /* istanbul ignore next */
   useEffect(() => {
     if (data) {
       const organizations = data.organizationsConnection.map(
@@ -231,7 +231,7 @@ export default function organizations(): JSX.Element {
   /**
    * Updates the list of organizations based on the selected mode and query results.
    */
-
+  /* istanbul ignore next */
   useEffect(() => {
     if (mode === 0) {
       if (data) {
@@ -379,7 +379,8 @@ export default function organizations(): JSX.Element {
                           page * rowsPerPage,
                           page * rowsPerPage + rowsPerPage,
                         )
-                      : organizations
+                      : /* istanbul ignore next */
+                        organizations
                     ).map((organization: InterfaceOrganization, index) => {
                       const cardProps: InterfaceOrganizationCardProps = {
                         name: organization.name,
@@ -407,7 +408,10 @@ export default function organizations(): JSX.Element {
               <tbody>
                 <tr>
                   <PaginationList
-                    count={organizations ? organizations.length : 0}
+                    count={
+                      /* istanbul ignore next */
+                      organizations ? organizations.length : 0
+                    }
                     rowsPerPage={rowsPerPage}
                     page={page}
                     onPageChange={handleChangePage}
diff --git a/src/screens/UserPortal/People/People.tsx b/src/screens/UserPortal/People/People.tsx
index e54b469488..4904e75b20 100644
--- a/src/screens/UserPortal/People/People.tsx
+++ b/src/screens/UserPortal/People/People.tsx
@@ -79,7 +79,7 @@ export default function people(): JSX.Element {
    * Handles page change in pagination.
    *
    */
-
+  /* istanbul ignore next */
   const handleChangePage = (
     _event: React.MouseEvent<HTMLButtonElement> | null,
     newPage: number,
@@ -91,7 +91,7 @@ export default function people(): JSX.Element {
    * Handles change in the number of rows per page.
    *
    */
-
+  /* istanbul ignore next */
   const handleChangeRowsPerPage = (
     event: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>,
   ): void => {
@@ -143,7 +143,7 @@ export default function people(): JSX.Element {
   /**
    * Updates the list of members based on the selected filter mode.
    */
-
+  /* istanbul ignore next */
   useEffect(() => {
     if (mode == 0) {
       if (data) {
@@ -233,7 +233,8 @@ export default function people(): JSX.Element {
                           page * rowsPerPage,
                           page * rowsPerPage + rowsPerPage,
                         )
-                      : members
+                      : /* istanbul ignore next */
+                        members
                     ).map((member: InterfaceMember, index) => {
                       const name = `${member.firstName} ${member.lastName}`;
 
@@ -257,7 +258,10 @@ export default function people(): JSX.Element {
               <tbody>
                 <tr>
                   <PaginationList
-                    count={members ? members.length : 0}
+                    count={
+                      /* istanbul ignore next */
+                      members ? members.length : 0
+                    }
                     rowsPerPage={rowsPerPage}
                     page={page}
                     onPageChange={handleChangePage}
diff --git a/src/screens/UserPortal/Settings/Settings.tsx b/src/screens/UserPortal/Settings/Settings.tsx
index 404332dc5e..cc222468fc 100644
--- a/src/screens/UserPortal/Settings/Settings.tsx
+++ b/src/screens/UserPortal/Settings/Settings.tsx
@@ -92,6 +92,7 @@ export default function settings(): JSX.Element {
    * and reloads the page on success.
    */
 
+  /*istanbul ignore next*/
   const handleUpdateUserDetails = async (): Promise<void> => {
     try {
       let updatedUserDetails = { ...userDetails };
@@ -101,7 +102,7 @@ export default function settings(): JSX.Element {
       const { data } = await updateUserDetails({
         variables: updatedUserDetails,
       });
-
+      /* istanbul ignore next */
       if (data) {
         toast.success(
           tCommon('updatedSuccessfully', { item: 'Profile' }) as string,
@@ -113,6 +114,7 @@ export default function settings(): JSX.Element {
         setItem('name', userFullName);
       }
     } catch (error: unknown) {
+      /*istanbul ignore next*/
       errorHandler(t, error);
     }
   };
@@ -146,7 +148,7 @@ export default function settings(): JSX.Element {
    */
   const handleResetChanges = (): void => {
     setisUpdated(false);
-
+    /* istanbul ignore next */
     if (data) {
       const {
         firstName,
@@ -180,6 +182,7 @@ export default function settings(): JSX.Element {
   };
 
   useEffect(() => {
+    /* istanbul ignore next */
     if (data) {
       const {
         firstName,
@@ -301,8 +304,9 @@ export default function settings(): JSX.Element {
                             role="button"
                             aria-label="Edit profile picture"
                             tabIndex={0}
-                            onKeyDown={(e) =>
-                              e.key === 'Enter' && handleImageUpload()
+                            onKeyDown={
+                              /*istanbul ignore next*/
+                              (e) => e.key === 'Enter' && handleImageUpload()
                             }
                           />
                         </div>
@@ -316,15 +320,18 @@ export default function settings(): JSX.Element {
                         data-testid="fileInput"
                         multiple={false}
                         ref={fileInputRef}
-                        onChange={async (
-                          e: React.ChangeEvent<HTMLInputElement>,
-                        ): Promise<void> => {
-                          const file = e.target?.files?.[0];
-                          if (file) {
-                            const image = await convertToBase64(file);
-                            setUserDetails({ ...userDetails, image });
+                        onChange={
+                          /* istanbul ignore next */
+                          async (
+                            e: React.ChangeEvent<HTMLInputElement>,
+                          ): Promise<void> => {
+                            const file = e.target?.files?.[0];
+                            if (file) {
+                              const image = await convertToBase64(file);
+                              setUserDetails({ ...userDetails, image });
+                            }
                           }
-                        }}
+                        }
                         style={{ display: 'none' }}
                       />
                     </Col>
diff --git a/src/screens/UserPortal/Volunteer/UpcomingEvents/UpcomingEvents.tsx b/src/screens/UserPortal/Volunteer/UpcomingEvents/UpcomingEvents.tsx
index fc75ee0718..bd61ca97e0 100644
--- a/src/screens/UserPortal/Volunteer/UpcomingEvents/UpcomingEvents.tsx
+++ b/src/screens/UserPortal/Volunteer/UpcomingEvents/UpcomingEvents.tsx
@@ -272,12 +272,15 @@ const UpcomingEvents = (): JSX.Element => {
                 </div>
               </AccordionSummary>
               <AccordionDetails className="d-flex gap-3 flex-column">
-                {description && (
-                  <div className="d-flex gap-3">
-                    <span>Description: </span>
-                    <span>{description}</span>
-                  </div>
-                )}
+                {
+                  /*istanbul ignore next*/
+                  description && (
+                    <div className="d-flex gap-3">
+                      <span>Description: </span>
+                      <span>{description}</span>
+                    </div>
+                  )
+                }
                 {volunteerGroups && volunteerGroups.length > 0 && (
                   <Form.Group>
                     <Form.Label
diff --git a/src/screens/UserPortal/Volunteer/VolunteerManagement.tsx b/src/screens/UserPortal/Volunteer/VolunteerManagement.tsx
index fd90584d62..87be9d7adc 100644
--- a/src/screens/UserPortal/Volunteer/VolunteerManagement.tsx
+++ b/src/screens/UserPortal/Volunteer/VolunteerManagement.tsx
@@ -151,7 +151,10 @@ const VolunteerManagement = (): JSX.Element => {
               {volunteerDashboardTabs.map(({ value, icon }, index) => (
                 <Dropdown.Item
                   key={index}
-                  onClick={() => setTab(value)}
+                  onClick={
+                    /* istanbul ignore next */
+                    () => setTab(value)
+                  }
                   className={`d-flex gap-2 ${tab === value && 'text-secondary'}`}
                 >
                   {icon} {t(value)}
diff --git a/src/screens/Users/Users.tsx b/src/screens/Users/Users.tsx
index e847e8c1fe..b046679a00 100644
--- a/src/screens/Users/Users.tsx
+++ b/src/screens/Users/Users.tsx
@@ -196,7 +196,7 @@ const Users = (): JSX.Element => {
     const inputValue = inputElement?.value || '';
     handleSearch(inputValue);
   };
-
+  /* istanbul ignore next */
   const resetAndRefetch = (): void => {
     refetchUsers({
       first: perPageResult,
@@ -207,7 +207,7 @@ const Users = (): JSX.Element => {
     });
     setHasMore(true);
   };
-
+  /* istanbul ignore next */
   const loadMoreUsers = (): void => {
     setIsLoadingMore(true);
     fetchMore({
@@ -440,7 +440,10 @@ const Users = (): JSX.Element => {
             />
           )}
           <InfiniteScroll
-            dataLength={displayedUsers.length ?? 0}
+            dataLength={
+              /* istanbul ignore next */
+              displayedUsers.length ?? 0
+            }
             next={loadMoreUsers}
             loader={
               <TableLoader
diff --git a/src/utils/getOrganizationId.ts b/src/utils/getOrganizationId.ts
index e82b86e1b0..0a7c283e39 100644
--- a/src/utils/getOrganizationId.ts
+++ b/src/utils/getOrganizationId.ts
@@ -1,3 +1,4 @@
+/* istanbul ignore next */
 const getOrganizationId = (url: string): string => {
   const id = url?.split('=')[1];
 

From 793b317031fc522b8e5e576bdf84efebdff2ee9f Mon Sep 17 00:00:00 2001
From: im-vedant <194vedantgutpa@gmail.com>
Date: Wed, 25 Dec 2024 04:44:27 +0530
Subject: [PATCH 10/28] excluded node_modules from eslint disable check

---
 .github/workflows/eslint_disable_check.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/eslint_disable_check.py b/.github/workflows/eslint_disable_check.py
index 135b3c19c2..78351d88d7 100644
--- a/.github/workflows/eslint_disable_check.py
+++ b/.github/workflows/eslint_disable_check.py
@@ -78,6 +78,8 @@ def check_eslint(directories):
             )
             sys.exit(1)
         for root, _, files in os.walk(directory):
+            if "node_modules" in root:
+                continue
             for file_name in files:
                 if (
                     file_name.endswith(".tsx")

From 063f1de7ab83160eb8fe3de283b6d156fd26f150 Mon Sep 17 00:00:00 2001
From: im-vedant <194vedantgutpa@gmail.com>
Date: Wed, 25 Dec 2024 05:41:47 +0530
Subject: [PATCH 11/28] code-coverage check runs for only changed files

---
 .github/workflows/pull-request.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 9bbd31d31d..ff8d7e6cbe 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -200,8 +200,11 @@ jobs:
           python-version: 3.9
       
       - name: Run Python script
+        if: steps.changed-files.outputs.only_changed != 'true'
+        env: 
+          CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
         run: |
-          python .github/workflows/code_coverage_disable_check.py
+          python .github/workflows/code_coverage_disable_check.py --directory ${CHANGED_FILES}
 
   Test-Application:
     name: Test Application

From e385ba67e790d029a708530cc202c1cba33c523d Mon Sep 17 00:00:00 2001
From: im-vedant <194vedantgutpa@gmail.com>
Date: Wed, 25 Dec 2024 05:50:31 +0530
Subject: [PATCH 12/28] add tj-actions

---
 .github/workflows/pull-request.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index ff8d7e6cbe..2dd7b75106 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -178,6 +178,10 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      - name: Get changed files
+        id: changed-files
+        uses: tj-actions/changed-files@v45
+
       - name: Set up Python
         uses: actions/setup-python@v5
         with:

From dcce07368fad376eded8da3287222b8c93dc2339 Mon Sep 17 00:00:00 2001
From: im-vedant <194vedantgutpa@gmail.com>
Date: Wed, 25 Dec 2024 05:53:01 +0530
Subject: [PATCH 13/28] add tj actions in check code coverage job

---
 .github/workflows/pull-request.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 2dd7b75106..811620276a 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -178,10 +178,6 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Get changed files
-        id: changed-files
-        uses: tj-actions/changed-files@v45
-
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
@@ -198,6 +194,10 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      - name: Get changed files
+        id: changed-files
+        uses: tj-actions/changed-files@v45
+
       - name: Set up Python
         uses: actions/setup-python@v5
         with:

From f974bbfa0c0b6500bfddd8d5cd7331844da6d24b Mon Sep 17 00:00:00 2001
From: im-vedant <194vedantgutpa@gmail.com>
Date: Thu, 26 Dec 2024 21:59:04 +0530
Subject: [PATCH 14/28] Fix GitHub Actions workflow to identify and pass
 nearest changed directories to Python script

---
 .../workflows/code_coverage_disable_check.py  |  2 +
 .github/workflows/pull-request.yml            | 51 +++++++++++++++----
 src/App.tsx                                   |  2 +
 3 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/code_coverage_disable_check.py b/.github/workflows/code_coverage_disable_check.py
index 1cbbdfad44..f386c07a3e 100644
--- a/.github/workflows/code_coverage_disable_check.py
+++ b/.github/workflows/code_coverage_disable_check.py
@@ -140,6 +140,8 @@ def main():
         SystemExit: If an error occurs during execution.
     """
     args = arg_parser_resolver()
+    
+    print(args.directory)
 
     # Check code coverage in the specified directory
     code_coverage_found = check_code_coverage(args.directory)
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 811620276a..c95668f07b 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -198,17 +198,46 @@ jobs:
         id: changed-files
         uses: tj-actions/changed-files@v45
 
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: 3.9
-      
-      - name: Run Python script
-        if: steps.changed-files.outputs.only_changed != 'true'
-        env: 
-          CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
-        run: |
-          python .github/workflows/code_coverage_disable_check.py --directory ${CHANGED_FILES}
+      - name: Identify nearest changed directories
+        id: nearest_dirs
+      run: |
+        # Initialize an empty string to store the nearest directories
+        nearest_dirs=""
+
+        # Loop through each changed file to extract the nearest directory
+        for file in ${{ steps.changed-files.outputs.files }}
+        do
+          # Get the directory from the file path
+          folder=$(dirname "$file")
+
+          # Get the first level directory (top-level folder)
+          first_folder=$(echo $folder | cut -d'/' -f1)
+
+          # Add the folder to the nearest_dirs string if not already present
+          if [[ ! " $nearest_dirs " =~ " $first_folder " ]]; then
+            if [ -z "$nearest_dirs" ]; then
+              nearest_dirs="$first_folder"
+            else
+              nearest_dirs="$nearest_dirs,$first_folder"
+            fi
+          fi
+        done
+        
+        # Output the nearest changed directories
+        echo "Nearest changed directories: $nearest_dirs"
+
+        # Set the nearest directories as a GitHub environment variable
+        echo "NEAREST_DIRS=$nearest_dirs" >> $GITHUB_ENV
+
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: 3.9
+
+    - name: Run Python script
+      run: |
+        # Access the nearest_dirs environment variable
+        python .github/workflows/code_coverage_disable_check.py --directory $NEAREST_DIRS
 
   Test-Application:
     name: Test Application
diff --git a/src/App.tsx b/src/App.tsx
index 4d2ca76010..d9d6db2606 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -70,7 +70,9 @@ const { setItem } = useLocalStorage();
  *
  * @returns  The rendered routes and components of the application.
  */
+// eslint-disable
 
+// istanbul ignore next
 function app(): JSX.Element {
   /*const { updatePluginLinks, updateInstalled } = bindActionCreators(
     actionCreators,

From 74670346cb745143207dc44598fc9848f8fe6e7f Mon Sep 17 00:00:00 2001
From: im-vedant <194vedantgutpa@gmail.com>
Date: Thu, 26 Dec 2024 22:03:34 +0530
Subject: [PATCH 15/28] syntax correction

---
 .github/workflows/pull-request.yml | 68 +++++++++++++++---------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index c95668f07b..027849f83f 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -200,44 +200,44 @@ jobs:
 
       - name: Identify nearest changed directories
         id: nearest_dirs
-      run: |
-        # Initialize an empty string to store the nearest directories
-        nearest_dirs=""
-
-        # Loop through each changed file to extract the nearest directory
-        for file in ${{ steps.changed-files.outputs.files }}
-        do
-          # Get the directory from the file path
-          folder=$(dirname "$file")
-
-          # Get the first level directory (top-level folder)
-          first_folder=$(echo $folder | cut -d'/' -f1)
-
-          # Add the folder to the nearest_dirs string if not already present
-          if [[ ! " $nearest_dirs " =~ " $first_folder " ]]; then
-            if [ -z "$nearest_dirs" ]; then
-              nearest_dirs="$first_folder"
-            else
-              nearest_dirs="$nearest_dirs,$first_folder"
+        run: |
+          # Initialize an empty string to store the nearest directories
+          nearest_dirs=""
+
+          # Loop through each changed file to extract the nearest directory
+          for file in ${{ steps.changed-files.outputs.files }}
+          do
+            # Get the directory from the file path
+            folder=$(dirname "$file")
+
+            # Get the first level directory (top-level folder)
+            first_folder=$(echo $folder | cut -d'/' -f1)
+
+            # Add the folder to the nearest_dirs string if not already present
+            if [[ ! " $nearest_dirs " =~ " $first_folder " ]]; then
+              if [ -z "$nearest_dirs" ]; then
+                nearest_dirs="$first_folder"
+              else
+                nearest_dirs="$nearest_dirs,$first_folder"
+              fi
             fi
-          fi
-        done
-        
-        # Output the nearest changed directories
-        echo "Nearest changed directories: $nearest_dirs"
+          done
+          
+          # Output the nearest changed directories
+          echo "Nearest changed directories: $nearest_dirs"
 
-        # Set the nearest directories as a GitHub environment variable
-        echo "NEAREST_DIRS=$nearest_dirs" >> $GITHUB_ENV
+          # Set the nearest directories as a GitHub environment variable
+          echo "NEAREST_DIRS=$nearest_dirs" >> $GITHUB_ENV
 
-    - name: Set up Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: 3.9
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.9
 
-    - name: Run Python script
-      run: |
-        # Access the nearest_dirs environment variable
-        python .github/workflows/code_coverage_disable_check.py --directory $NEAREST_DIRS
+      - name: Run Python script
+        run: |
+          # Access the nearest_dirs environment variable
+          python .github/workflows/code_coverage_disable_check.py --directory $NEAREST_DIRS
 
   Test-Application:
     name: Test Application

From 9dfacc7b19148c36d901b0aaddbd5af95bde0c01 Mon Sep 17 00:00:00 2001
From: im-vedant <194vedantgutpa@gmail.com>
Date: Thu, 26 Dec 2024 22:22:14 +0530
Subject: [PATCH 16/28] minor fix

---
 .github/workflows/pull-request.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 027849f83f..f6be939503 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -205,7 +205,7 @@ jobs:
           nearest_dirs=""
 
           # Loop through each changed file to extract the nearest directory
-          for file in ${{ steps.changed-files.outputs.files }}
+          for file in ${{ steps.changed-files.outputs.all_changed_files }}
           do
             # Get the directory from the file path
             folder=$(dirname "$file")

From 57fa9a3bccb224ae29a00dfd4e303e0c551f6b63 Mon Sep 17 00:00:00 2001
From: im-vedant <194vedantgutpa@gmail.com>
Date: Thu, 26 Dec 2024 22:26:10 +0530
Subject: [PATCH 17/28] minor fix

---
 .github/workflows/pull-request.yml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index f6be939503..377be5212e 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -207,18 +207,15 @@ jobs:
           # Loop through each changed file to extract the nearest directory
           for file in ${{ steps.changed-files.outputs.all_changed_files }}
           do
-            # Get the directory from the file path
+            # Get the full directory from the file path
             folder=$(dirname "$file")
 
-            # Get the first level directory (top-level folder)
-            first_folder=$(echo $folder | cut -d'/' -f1)
-
             # Add the folder to the nearest_dirs string if not already present
-            if [[ ! " $nearest_dirs " =~ " $first_folder " ]]; then
+            if [[ ! " $nearest_dirs " =~ " $folder " ]]; then
               if [ -z "$nearest_dirs" ]; then
-                nearest_dirs="$first_folder"
+                nearest_dirs="$folder"
               else
-                nearest_dirs="$nearest_dirs,$first_folder"
+                nearest_dirs="$nearest_dirs,$folder"
               fi
             fi
           done

From 17aebf5dc227a9344b14d429a72c5fa2b8235db0 Mon Sep 17 00:00:00 2001
From: im-vedant <194vedantgutpa@gmail.com>
Date: Thu, 26 Dec 2024 22:30:40 +0530
Subject: [PATCH 18/28] minor fix

---
 .github/workflows/pull-request.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 377be5212e..b483b14215 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -209,13 +209,13 @@ jobs:
           do
             # Get the full directory from the file path
             folder=$(dirname "$file")
-
+            full_path="$repo_root/$folder"
             # Add the folder to the nearest_dirs string if not already present
-            if [[ ! " $nearest_dirs " =~ " $folder " ]]; then
+            if [[ ! " $nearest_dirs " =~ " $full_path " ]]; then
               if [ -z "$nearest_dirs" ]; then
-                nearest_dirs="$folder"
+                nearest_dirs="$full_path"
               else
-                nearest_dirs="$nearest_dirs,$folder"
+                nearest_dirs="$nearest_dirs,$full_path"
               fi
             fi
           done

From 5b83566220a1dbf08fb24cbbdc3332d4cd971030 Mon Sep 17 00:00:00 2001
From: im-vedant <194vedantgutpa@gmail.com>
Date: Thu, 26 Dec 2024 22:34:10 +0530
Subject: [PATCH 19/28] added repo root

---
 .github/workflows/pull-request.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index b483b14215..c1fe52c334 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -204,6 +204,8 @@ jobs:
           # Initialize an empty string to store the nearest directories
           nearest_dirs=""
 
+          repo_root=$(pwd)
+
           # Loop through each changed file to extract the nearest directory
           for file in ${{ steps.changed-files.outputs.all_changed_files }}
           do

From 624feb95122282fbf020e6c4f388f95e5a814895 Mon Sep 17 00:00:00 2001
From: im-vedant <194vedantgutpa@gmail.com>
Date: Thu, 26 Dec 2024 22:40:35 +0530
Subject: [PATCH 20/28] fix error

---
 .github/workflows/pull-request.yml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index c1fe52c334..64be781b6f 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -201,32 +201,32 @@ jobs:
       - name: Identify nearest changed directories
         id: nearest_dirs
         run: |
-          # Initialize an empty string to store the nearest directories
-          nearest_dirs=""
+          # Initialize an empty array to store the nearest directories
+          declare -a nearest_dirs=()
 
+          # Get the absolute path of the repository root (where the script is running)
           repo_root=$(pwd)
 
           # Loop through each changed file to extract the nearest directory
-          for file in ${{ steps.changed-files.outputs.all_changed_files }}
+          for file in ${{ steps.changed-files.outputs.files }}
           do
-            # Get the full directory from the file path
+            # Get the directory from the file path
             folder=$(dirname "$file")
+
+            # Get the full absolute path of the folder by combining repo_root with the folder
             full_path="$repo_root/$folder"
-            # Add the folder to the nearest_dirs string if not already present
-            if [[ ! " $nearest_dirs " =~ " $full_path " ]]; then
-              if [ -z "$nearest_dirs" ]; then
-                nearest_dirs="$full_path"
-              else
-                nearest_dirs="$nearest_dirs,$full_path"
-              fi
+
+            # Add the folder to the nearest_dirs array if not already present
+            if [[ ! " ${nearest_dirs[@]} " =~ " $full_path " ]]; then
+              nearest_dirs+=("$full_path")
             fi
           done
-          
+
           # Output the nearest changed directories
-          echo "Nearest changed directories: $nearest_dirs"
+          echo "Nearest changed directories: ${nearest_dirs[@]}"
 
-          # Set the nearest directories as a GitHub environment variable
-          echo "NEAREST_DIRS=$nearest_dirs" >> $GITHUB_ENV
+          # Set the nearest directories as a GitHub environment variable (comma-separated for easy use in other steps)
+          echo "NEAREST_DIRS=${nearest_dirs[@]}" >> $GITHUB_ENV
 
       - name: Set up Python
         uses: actions/setup-python@v5

From ffe620d10142828ede4da7bca8fe712f875c518b Mon Sep 17 00:00:00 2001
From: im-vedant <194vedantgutpa@gmail.com>
Date: Thu, 26 Dec 2024 22:43:43 +0530
Subject: [PATCH 21/28] fix error

---
 .github/workflows/pull-request.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 64be781b6f..eb1919666e 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -208,7 +208,7 @@ jobs:
           repo_root=$(pwd)
 
           # Loop through each changed file to extract the nearest directory
-          for file in ${{ steps.changed-files.outputs.files }}
+          for file in ${{ steps.changed-files.outputs.all_changed_files }}
           do
             # Get the directory from the file path
             folder=$(dirname "$file")

From 9e5460c8abb69dba7b721f56a998af9de0fc8122 Mon Sep 17 00:00:00 2001
From: im-vedant <194vedantgutpa@gmail.com>
Date: Thu, 26 Dec 2024 23:14:10 +0530
Subject: [PATCH 22/28] added support for checking .ts files for eslint-disable
 statements

---
 .github/workflows/eslint_disable_check.py | 77 +++++++++++------------
 .github/workflows/pull-request.yml        | 39 ++----------
 src/setupTests.ts                         |  2 +-
 3 files changed, 45 insertions(+), 73 deletions(-)

diff --git a/.github/workflows/eslint_disable_check.py b/.github/workflows/eslint_disable_check.py
index 78351d88d7..5b824a76fb 100644
--- a/.github/workflows/eslint_disable_check.py
+++ b/.github/workflows/eslint_disable_check.py
@@ -1,11 +1,11 @@
 #!/usr/bin/env python3
-# -*- coding: UTF-8 -*-
+# -*- coding: UTF-8 -*- 
 """ESLint Checker Script.
 
 Methodology:
 
     Recursively analyzes TypeScript files in the specified directory
-    to ensure they do not contain eslint-disable statements.
+    or checks specific files directly to ensure they do not contain eslint-disable statements.
 
     This script enforces code quality practices in the project.
 
@@ -20,7 +20,6 @@
         5) Python Black
 
 """
-
 import os
 import re
 import argparse
@@ -58,48 +57,36 @@ def has_eslint_disable(file_path):
         return False
 
 
-def check_eslint(directories):
+def check_eslint(files_or_directories):
     """
-    Recursively check TypeScript files for eslint-disable statements.
+    Check TypeScript files for eslint-disable statements.
 
     Args:
-        directories (list): List of directories.
+        files_or_directories (list): List of files or directories to check.
 
     Returns:
         bool: True if eslint-disable statement is found, False otherwise.
     """
     eslint_found = False
 
-    for directory in directories:
-        if not os.path.exists(directory):
-            print(
-                f"""Error: The specified directory '{directory}' does not
-                exist."""
-            )
-            sys.exit(1)
-        for root, _, files in os.walk(directory):
-            if "node_modules" in root:
-                continue
-            for file_name in files:
-                if (
-                    file_name.endswith(".tsx")
-                    and not file_name.endswith(".test.tsx")
-                   ):
-                    file_path = os.path.join(root, file_name)
-                    if has_eslint_disable(file_path):
-                        print(
-                            f"""File {file_path} contains eslint-disable
-                              statement."""
-                        )
-                        eslint_found = True
-
-        setup_path = os.path.join(directory, "setup.ts")
-        if os.path.exists(setup_path) and has_eslint_disable(setup_path):
-            print(
-                f"""Setup file {setup_path} contains eslint-disable
-                statement."""
-            )
-            eslint_found = True
+    for item in files_or_directories:
+        if os.path.isfile(item):
+            # If it's a file, directly check it
+            if item.endswith(".ts") or item.endswith(".tsx"):
+                if has_eslint_disable(item):
+                    print(f"File {item} contains eslint-disable statement.")
+                    eslint_found = True
+        elif os.path.isdir(item):
+            # If it's a directory, walk through it and check all .ts and .tsx files
+            for root, _, files in os.walk(item):
+                if "node_modules" in root:
+                    continue
+                for file_name in files:
+                    if file_name.endswith(".ts") or file_name.endswith(".tsx"):
+                        file_path = os.path.join(root, file_name)
+                        if has_eslint_disable(file_path):
+                            print(f"File {file_path} contains eslint-disable statement.")
+                            eslint_found = True
 
     return eslint_found
 
@@ -111,6 +98,14 @@ def arg_parser_resolver():
         result: Parsed argument object
     """
     parser = argparse.ArgumentParser()
+    parser.add_argument(
+        "--files",
+        type=str,
+        nargs="+",
+        default=[],
+        help="""List of files to check for eslint disable
+        statements (default: None).""",
+    )
     parser.add_argument(
         "--directory",
         type=str,
@@ -128,7 +123,7 @@ def main():
 
     This function serves as the entry point for the script. It performs
     the following tasks:
-    1. Validates and retrieves the directory to check from
+    1. Validates and retrieves the files and directories to check from
        command line arguments.
     2. Recursively checks TypeScript files for eslint-disable statements.
     3. Provides informative messages based on the analysis.
@@ -138,8 +133,12 @@ def main():
         SystemExit: If an error occurs during execution.
     """
     args = arg_parser_resolver()
-    # Check eslint in the specified directory
-    eslint_found = check_eslint(args.directory)
+
+    # Determine whether to check files or directories based on the arguments
+    files_or_directories = args.files if args.files else args.directory
+    print(files_or_directories)
+    # Check eslint in the specified files or directories
+    eslint_found = check_eslint(files_or_directories)
 
     if eslint_found:
         print("ESLint-disable check failed. Exiting with error.")
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index eb1919666e..caf2be7265 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -178,6 +178,10 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      - name: Get changed files
+        id: changed-files
+        uses: tj-actions/changed-files@v45
+
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
@@ -185,7 +189,7 @@ jobs:
 
       - name: Run Python script
         run: |
-          python .github/workflows/eslint_disable_check.py
+          python .github/workflows/eslint_disable_check.py --files ${{ steps.changed-files.outputs.all_changed_files }}
 
   Check-Code-Coverage-Disable:
     name: Check for code coverage disable
@@ -198,36 +202,6 @@ jobs:
         id: changed-files
         uses: tj-actions/changed-files@v45
 
-      - name: Identify nearest changed directories
-        id: nearest_dirs
-        run: |
-          # Initialize an empty array to store the nearest directories
-          declare -a nearest_dirs=()
-
-          # Get the absolute path of the repository root (where the script is running)
-          repo_root=$(pwd)
-
-          # Loop through each changed file to extract the nearest directory
-          for file in ${{ steps.changed-files.outputs.all_changed_files }}
-          do
-            # Get the directory from the file path
-            folder=$(dirname "$file")
-
-            # Get the full absolute path of the folder by combining repo_root with the folder
-            full_path="$repo_root/$folder"
-
-            # Add the folder to the nearest_dirs array if not already present
-            if [[ ! " ${nearest_dirs[@]} " =~ " $full_path " ]]; then
-              nearest_dirs+=("$full_path")
-            fi
-          done
-
-          # Output the nearest changed directories
-          echo "Nearest changed directories: ${nearest_dirs[@]}"
-
-          # Set the nearest directories as a GitHub environment variable (comma-separated for easy use in other steps)
-          echo "NEAREST_DIRS=${nearest_dirs[@]}" >> $GITHUB_ENV
-
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
@@ -235,8 +209,7 @@ jobs:
 
       - name: Run Python script
         run: |
-          # Access the nearest_dirs environment variable
-          python .github/workflows/code_coverage_disable_check.py --directory $NEAREST_DIRS
+          python .github/workflows/code_coverage_disable_check.py 
 
   Test-Application:
     name: Test Application
diff --git a/src/setupTests.ts b/src/setupTests.ts
index d204b3ddc9..37ad9f43c6 100644
--- a/src/setupTests.ts
+++ b/src/setupTests.ts
@@ -3,7 +3,7 @@
 // expect(element).toHaveTextContent(/react/i)
 // learn more: https://github.com/testing-library/jest-dom
 import '@testing-library/jest-dom';
-
+// eslint-disable
 global.fetch = jest.fn();
 
 import { format } from 'util';

From 8712ed0dab73605b53be653a88f000f27061926f Mon Sep 17 00:00:00 2001
From: im-vedant <194vedantgutpa@gmail.com>
Date: Fri, 27 Dec 2024 00:34:50 +0530
Subject: [PATCH 23/28] added support for checking .ts files for code coverage
 disable statements

---
 .../workflows/code_coverage_disable_check.py  | 90 +++++++++----------
 .github/workflows/pull-request.yml            |  4 +-
 2 files changed, 46 insertions(+), 48 deletions(-)

diff --git a/.github/workflows/code_coverage_disable_check.py b/.github/workflows/code_coverage_disable_check.py
index f386c07a3e..5d939475ff 100644
--- a/.github/workflows/code_coverage_disable_check.py
+++ b/.github/workflows/code_coverage_disable_check.py
@@ -2,8 +2,8 @@
 
 Methodology:
 
-    Recursively analyzes TypeScript files in the specified directories to
-    ensure they do not contain code coverage disable statements.
+    Recursively analyzes TypeScript files in the specified directories or checks specific files
+    to ensure they do not contain code coverage disable statements.
 
     This script enforces proper code coverage practices in the project.
 
@@ -37,11 +37,9 @@ def has_code_coverage_disable(file_path):
         otherwise.
     """
     code_coverage_disable_pattern = re.compile(
-        r"""(?://\s*istanbul\s+ignore(?:-next-line|-line)?
-        |/\*\s*istanbul\s+ignore\s*(?:next|-line)\s*\*/)""",
+        r"""//?\s*istanbul\s+ignore(?:\s+(?:next|-line))?[^\n]*|/\*\s*istanbul\s+ignore\s+(?:next|-line)\s*\*/""",
         re.IGNORECASE,
     )
-
     try:
         with open(file_path, "r", encoding="utf-8") as file:
             content = file.read()
@@ -57,12 +55,12 @@ def has_code_coverage_disable(file_path):
         return False
 
 
-def check_code_coverage(directories):
+def check_code_coverage(files_or_dirs):
     """
-    Recursively check TypeScript files for code coverage disable statements.
+    Check TypeScript files for code coverage disable statements. 
 
     Args:
-        directories (list) : List of directories.
+        files_or_dirs (list): List of files or directories to check.
 
     Returns:
         bool: True if code coverage disable statement is found, False
@@ -70,37 +68,30 @@ def check_code_coverage(directories):
     """
     code_coverage_found = False
 
-    for directory in directories:
-        if not os.path.exists(directory):
-            print(
-                f"""Error: The specified directory '{directory}' does
-                not exist."""
-            )
-            sys.exit(1)
-        for root, _, files in os.walk(directory):
-            for file_name in files:
-                if (
-                    file_name.endswith(".tsx")
-                    and not file_name.endswith(".test.tsx")
-                   ):
-                    file_path = os.path.join(root, file_name)
-                    if has_code_coverage_disable(file_path):
-                        print(
-                            f"""File {file_path} contains code coverage disable
-                            statement."""
-                        )
-                        code_coverage_found = True
-
-        setup_path = os.path.join(directory, "setup.ts")
-        if (
-            os.path.exists(setup_path)
-            and has_code_coverage_disable(setup_path)
-           ):
-            print(
-                f"""Setup file {setup_path} contains code coverage disable
-                statement."""
-            )
-            code_coverage_found = True
+    for item in files_or_dirs:
+        if os.path.isdir(item):
+            # If it's a directory, recursively walk through the files in it
+            for root, _, files in os.walk(item):
+                if "node_modules" in root:
+                    continue
+                for file_name in files:
+                    if (
+                        file_name.endswith(".tsx")
+                        or file_name.endswith(".ts")
+                    ):
+                        file_path = os.path.join(root, file_name)
+                        if has_code_coverage_disable(file_path):
+                            print(f"File {file_path} contains code coverage disable statement.")
+                            code_coverage_found = True
+        elif os.path.isfile(item):
+            # If it's a file, check it directly
+            if (
+                item.endswith(".tsx")
+                or item.endswith(".ts")
+            ) :
+                if has_code_coverage_disable(item):
+                    print(f"File {item} contains code coverage disable statement.")
+                    code_coverage_found = True
 
     return code_coverage_found
 
@@ -120,6 +111,14 @@ def arg_parser_resolver():
         help="""One or more directories to check for code coverage disable
         statements (default: current directory).""",
     )
+    parser.add_argument(
+        "--files",
+        type=str,
+        nargs="+",
+        default=[],
+        help="""One or more files to check directly for code coverage disable
+        statements (default: check directories).""",
+    )
     return parser.parse_args()
 
 
@@ -129,10 +128,9 @@ def main():
 
     This function serves as the entry point for the script. It performs
     the following tasks:
-    1. Validates and retrieves the directory to check from
+    1. Validates and retrieves the files or directories to check from
        command line arguments.
-    2. Recursively checks TypeScript files for code coverage disable
-    statements.
+    2. Checks files or directories for code coverage disable statements.
     3. Provides informative messages based on the analysis.
     4. Exits with an error if code coverage disable statements are found.
 
@@ -141,10 +139,10 @@ def main():
     """
     args = arg_parser_resolver()
     
-    print(args.directory)
-
-    # Check code coverage in the specified directory
-    code_coverage_found = check_code_coverage(args.directory)
+    files_or_dirs = args.files if args.files else args.directory
+    print(files_or_dirs)
+    # Check code coverage in the specified files or directories
+    code_coverage_found = check_code_coverage(files_or_dirs)
 
     if code_coverage_found:
         print("Code coverage disable check failed. Exiting with error.")
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index caf2be7265..2fc2c2207b 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -209,12 +209,12 @@ jobs:
 
       - name: Run Python script
         run: |
-          python .github/workflows/code_coverage_disable_check.py 
+          python .github/workflows/code_coverage_disable_check.py --files ${{ steps.changed-files.outputs.all_changed_files }} 
 
   Test-Application:
     name: Test Application
     runs-on: ubuntu-latest
-    needs: [Code-Quality-Checks, Check-ESlint-Disable]
+    needs: [Code-Quality-Checks, Check-ESlint-Disable,Check-Code-Coverage-Disable]
     steps:
       - name: Checkout the Repository
         uses: actions/checkout@v4

From 5b4f689b49e92c14df32093a9257399a454073ea Mon Sep 17 00:00:00 2001
From: im-vedant <194vedantgutpa@gmail.com>
Date: Fri, 27 Dec 2024 00:42:43 +0530
Subject: [PATCH 24/28] minor change

---
 .github/workflows/code_coverage_disable_check.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/code_coverage_disable_check.py b/.github/workflows/code_coverage_disable_check.py
index 5d939475ff..d6333f212f 100644
--- a/.github/workflows/code_coverage_disable_check.py
+++ b/.github/workflows/code_coverage_disable_check.py
@@ -88,6 +88,11 @@ def check_code_coverage(files_or_dirs):
             if (
                 item.endswith(".tsx")
                 or item.endswith(".ts")
+                and not file_name.endswith(".test.tsx")
+                and not file_name.endswith(".test.ts")
+                and not file_name.endswith(".spec.tsx")
+                and not file_name.endswith(".spec.ts")
+
             ) :
                 if has_code_coverage_disable(item):
                     print(f"File {item} contains code coverage disable statement.")

From b88a4c17fe6989b3801015b1e8f3815dbafb50f6 Mon Sep 17 00:00:00 2001
From: im-vedant <194vedantgutpa@gmail.com>
Date: Sat, 28 Dec 2024 23:06:55 +0530
Subject: [PATCH 25/28] Remove test files and ensured that python files follow
 coding standards

---
 .../workflows/code_coverage_disable_check.py  | 26 +++++++++----------
 .github/workflows/eslint_disable_check.py     | 14 ++++++----
 src/App.tsx                                   |  2 --
 src/setupTests.ts                             |  1 -
 4 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/code_coverage_disable_check.py b/.github/workflows/code_coverage_disable_check.py
index d6333f212f..b6a0cb4f7c 100644
--- a/.github/workflows/code_coverage_disable_check.py
+++ b/.github/workflows/code_coverage_disable_check.py
@@ -2,7 +2,8 @@
 
 Methodology:
 
-    Recursively analyzes TypeScript files in the specified directories or checks specific files
+    Recursively analyzes TypeScript files in the specified directories or
+    checks specific files
     to ensure they do not contain code coverage disable statements.
 
     This script enforces proper code coverage practices in the project.
@@ -37,7 +38,8 @@ def has_code_coverage_disable(file_path):
         otherwise.
     """
     code_coverage_disable_pattern = re.compile(
-        r"""//?\s*istanbul\s+ignore(?:\s+(?:next|-line))?[^\n]*|/\*\s*istanbul\s+ignore\s+(?:next|-line)\s*\*/""",
+        r"""//?\s*istanbul\s+ignore(?:\s+(?:next|-line))?[^\n]*|
+        /\*\s*istanbul\s+ignore\s+(?:next|-line)\s*\*/""",
         re.IGNORECASE,
     )
     try:
@@ -57,7 +59,7 @@ def has_code_coverage_disable(file_path):
 
 def check_code_coverage(files_or_dirs):
     """
-    Check TypeScript files for code coverage disable statements. 
+    Check TypeScript files for code coverage disable statements.
 
     Args:
         files_or_dirs (list): List of files or directories to check.
@@ -75,13 +77,13 @@ def check_code_coverage(files_or_dirs):
                 if "node_modules" in root:
                     continue
                 for file_name in files:
-                    if (
-                        file_name.endswith(".tsx")
-                        or file_name.endswith(".ts")
-                    ):
+                    if file_name.endswith(".tsx") or file_name.endswith(".ts"):
                         file_path = os.path.join(root, file_name)
                         if has_code_coverage_disable(file_path):
-                            print(f"File {file_path} contains code coverage disable statement.")
+                            print(
+                                f"""File {file_path} contains code coverage
+                                disable statement."""
+                            )
                             code_coverage_found = True
         elif os.path.isfile(item):
             # If it's a file, check it directly
@@ -92,10 +94,10 @@ def check_code_coverage(files_or_dirs):
                 and not file_name.endswith(".test.ts")
                 and not file_name.endswith(".spec.tsx")
                 and not file_name.endswith(".spec.ts")
-
-            ) :
+            ):
                 if has_code_coverage_disable(item):
-                    print(f"File {item} contains code coverage disable statement.")
+                    print(f"""File {item} contains code coverage disable
+                          statement.""")
                     code_coverage_found = True
 
     return code_coverage_found
@@ -143,9 +145,7 @@ def main():
         SystemExit: If an error occurs during execution.
     """
     args = arg_parser_resolver()
-    
     files_or_dirs = args.files if args.files else args.directory
-    print(files_or_dirs)
     # Check code coverage in the specified files or directories
     code_coverage_found = check_code_coverage(files_or_dirs)
 
diff --git a/.github/workflows/eslint_disable_check.py b/.github/workflows/eslint_disable_check.py
index 5b824a76fb..ee17fcb220 100644
--- a/.github/workflows/eslint_disable_check.py
+++ b/.github/workflows/eslint_disable_check.py
@@ -1,11 +1,12 @@
 #!/usr/bin/env python3
-# -*- coding: UTF-8 -*- 
+# -*- coding: UTF-8 -*-
 """ESLint Checker Script.
 
 Methodology:
 
     Recursively analyzes TypeScript files in the specified directory
-    or checks specific files directly to ensure they do not contain eslint-disable statements.
+    or checks specific files directly to ensure they do not contain
+    eslint-disable statements.
 
     This script enforces code quality practices in the project.
 
@@ -77,7 +78,8 @@ def check_eslint(files_or_directories):
                     print(f"File {item} contains eslint-disable statement.")
                     eslint_found = True
         elif os.path.isdir(item):
-            # If it's a directory, walk through it and check all .ts and .tsx files
+            # If it's a directory, walk through it and check all
+            # .ts and .tsx files
             for root, _, files in os.walk(item):
                 if "node_modules" in root:
                     continue
@@ -85,7 +87,10 @@ def check_eslint(files_or_directories):
                     if file_name.endswith(".ts") or file_name.endswith(".tsx"):
                         file_path = os.path.join(root, file_name)
                         if has_eslint_disable(file_path):
-                            print(f"File {file_path} contains eslint-disable statement.")
+                            print(
+                                f"""File {file_path} contains eslint-disable
+                                statement."""
+                            )
                             eslint_found = True
 
     return eslint_found
@@ -136,7 +141,6 @@ def main():
 
     # Determine whether to check files or directories based on the arguments
     files_or_directories = args.files if args.files else args.directory
-    print(files_or_directories)
     # Check eslint in the specified files or directories
     eslint_found = check_eslint(files_or_directories)
 
diff --git a/src/App.tsx b/src/App.tsx
index d9d6db2606..4d2ca76010 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -70,9 +70,7 @@ const { setItem } = useLocalStorage();
  *
  * @returns  The rendered routes and components of the application.
  */
-// eslint-disable
 
-// istanbul ignore next
 function app(): JSX.Element {
   /*const { updatePluginLinks, updateInstalled } = bindActionCreators(
     actionCreators,
diff --git a/src/setupTests.ts b/src/setupTests.ts
index 37ad9f43c6..19c34e040a 100644
--- a/src/setupTests.ts
+++ b/src/setupTests.ts
@@ -3,7 +3,6 @@
 // expect(element).toHaveTextContent(/react/i)
 // learn more: https://github.com/testing-library/jest-dom
 import '@testing-library/jest-dom';
-// eslint-disable
 global.fetch = jest.fn();
 
 import { format } from 'util';

From 20f095ea7deeb72020087e571e51b270a9c69419 Mon Sep 17 00:00:00 2001
From: im-vedant <194vedantgutpa@gmail.com>
Date: Sat, 28 Dec 2024 23:12:40 +0530
Subject: [PATCH 26/28] fixes bug

---
 .../workflows/code_coverage_disable_check.py  | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/code_coverage_disable_check.py b/.github/workflows/code_coverage_disable_check.py
index b6a0cb4f7c..d0af8dffd6 100644
--- a/.github/workflows/code_coverage_disable_check.py
+++ b/.github/workflows/code_coverage_disable_check.py
@@ -77,7 +77,14 @@ def check_code_coverage(files_or_dirs):
                 if "node_modules" in root:
                     continue
                 for file_name in files:
-                    if file_name.endswith(".tsx") or file_name.endswith(".ts"):
+                    if (
+                        item.endswith(".tsx")
+                        or item.endswith(".ts")
+                        and not file_name.endswith(".test.tsx")
+                        and not file_name.endswith(".test.ts")
+                        and not file_name.endswith(".spec.tsx")
+                        and not file_name.endswith(".spec.ts")
+                    ):
                         file_path = os.path.join(root, file_name)
                         if has_code_coverage_disable(file_path):
                             print(
@@ -90,14 +97,16 @@ def check_code_coverage(files_or_dirs):
             if (
                 item.endswith(".tsx")
                 or item.endswith(".ts")
-                and not file_name.endswith(".test.tsx")
-                and not file_name.endswith(".test.ts")
-                and not file_name.endswith(".spec.tsx")
-                and not file_name.endswith(".spec.ts")
+                and not item.endswith(".test.tsx")
+                and not item.endswith(".test.ts")
+                and not item.endswith(".spec.tsx")
+                and not item.endswith(".spec.ts")
             ):
                 if has_code_coverage_disable(item):
-                    print(f"""File {item} contains code coverage disable
-                          statement.""")
+                    print(
+                        f"""File {item} contains code coverage disable
+                          statement."""
+                    )
                     code_coverage_found = True
 
     return code_coverage_found

From 7976d2e2d4a472228b4318163df661dee3082bea Mon Sep 17 00:00:00 2001
From: im-vedant <194vedantgutpa@gmail.com>
Date: Sat, 28 Dec 2024 23:14:35 +0530
Subject: [PATCH 27/28] fix error

---
 .github/workflows/code_coverage_disable_check.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/code_coverage_disable_check.py b/.github/workflows/code_coverage_disable_check.py
index d0af8dffd6..4a4fd756d0 100644
--- a/.github/workflows/code_coverage_disable_check.py
+++ b/.github/workflows/code_coverage_disable_check.py
@@ -78,8 +78,8 @@ def check_code_coverage(files_or_dirs):
                     continue
                 for file_name in files:
                     if (
-                        item.endswith(".tsx")
-                        or item.endswith(".ts")
+                        file_name.endswith(".tsx")
+                        or file_name.endswith(".ts")
                         and not file_name.endswith(".test.tsx")
                         and not file_name.endswith(".test.ts")
                         and not file_name.endswith(".spec.tsx")

From d5afe351f32da398b6266cb5d9a7e19bb5c5e908 Mon Sep 17 00:00:00 2001
From: im-vedant <194vedantgutpa@gmail.com>
Date: Sat, 28 Dec 2024 23:18:51 +0530
Subject: [PATCH 28/28] removed eslint disable command from check for linting
 errors in modified files step

---
 .github/workflows/pull-request.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index acdc3ecbd0..4708e39869 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -59,7 +59,7 @@ jobs:
         if: steps.changed-files.outputs.only_changed != 'true'
         env: 
           CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
-        run: npx eslint ${CHANGED_FILES} && python .github/workflows/eslint_disable_check.py
+        run: npx eslint ${CHANGED_FILES}
         
       - name: Check for TSDoc comments
         run: npm run check-tsdoc # Run the TSDoc check script