From bc1c5345317f1aa99a81223af54e5cb07bc1c337 Mon Sep 17 00:00:00 2001
From: Rahul Chougule <rahul.chougule@flairlabs.com>
Date: Sat, 28 Dec 2024 10:05:49 +0530
Subject: [PATCH 1/7] changed green to blue

---
 src/style/app.module.css | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/style/app.module.css b/src/style/app.module.css
index 6be00d217a..10b9725c50 100644
--- a/src/style/app.module.css
+++ b/src/style/app.module.css
@@ -30,6 +30,7 @@
   --tablerow-bg-color: #eff1f7;
   --row-background: var(--bs-white, white);
   --font-size-header: 16px;
+  --bg-blue: #afffe8;
 }
 .fonts {
   color: #707070;
@@ -117,7 +118,7 @@
   font-size: 20px;
   margin-bottom: 30px;
   padding-bottom: 5px;
-  border-bottom: 3px solid #31bb6b;
+  border-bottom: 3px solid var(--bg-blue);
   width: 15%;
 }
 
@@ -127,7 +128,7 @@
   font-size: 18px;
   margin-bottom: 20px;
   padding-bottom: 5px;
-  border-bottom: 3px solid #31bb6b;
+  border-bottom: 3px solid var(--bg-blue);
   width: 60%;
 }
 
@@ -610,7 +611,7 @@ hr {
 .pageNotFound h1.head {
   font-size: 250px;
   font-weight: 900;
-  color: #31bb6b;
+  color: var(--bg-blue);
   letter-spacing: 25px;
   margin: 10px 0 0 0;
 }
@@ -690,7 +691,7 @@ hr {
 
 .inputFieldPledge {
   background-color: var(--bs-white);
-  box-shadow: 0 1px 1px #31bb6b;
+  box-shadow: 0 1px 1px var(--bg-blue);
 }
 
 .dropdownPledge {
@@ -856,7 +857,7 @@ hr {
 }
 
 .toggleBtnPledge:hover {
-  color: #31bb6b !important;
+  color: var(--bg-blue) !important;
 }
 
 .card {
@@ -1007,7 +1008,7 @@ hr {
 }
 
 .customcell {
-  background-color: #31bb6b !important;
+  background-color: var(--bg-blue) !important;
   color: var(--bs-white) !important;
   font-size: medium !important;
   font-weight: 500 !important;
@@ -1033,7 +1034,7 @@ hr {
 }
 
 .table-body > .table-row:nth-child(2n) {
-  background: #afffe8 !important;
+  background: var(--bg-blue) !important;
 }
 
 .organizationFundCampaignContainer {
@@ -1469,7 +1470,7 @@ hr {
 }
 
 .toggleBtn:hover {
-  color: #31bb6b !important;
+  color: var(--bg-blue) !important;
 }
 
 input[type='radio']:checked + label {
@@ -1580,10 +1581,10 @@ input[type='radio']:checked + label:hover {
 
 .dropdowns {
   background-color: var(--bs-white);
-  border: 1px solid #31bb6b;
+  border: 1px solid var(--dropdown-border-color);
   position: relative;
   display: inline-block;
-  color: #31bb6b;
+  color: black;
 }
 
 .chipIcon {
@@ -1682,6 +1683,7 @@ input[type='radio']:checked + label:hover {
   border: 0.5px solid var(--brown-color);
 }
 .searchButtonOrgList {
+  background-color: var(--bg-blue);
   position: absolute;
   z-index: 10;
   bottom: 0;
@@ -3219,7 +3221,7 @@ button[data-testid='createPostBtn'] {
     display: flex !important;
     align-items: center;
     background-color: transparent;
-    color: #31bb6b;
+    color: var(--bg-blue);
   }
 
   .entryaction .spinner-grow {

From 771a2024fb6f6a6fc119550d1a238e5766accf0b Mon Sep 17 00:00:00 2001
From: rahul <chouguler310@gmail.com>
Date: Thu, 2 Jan 2025 21:14:39 +0530
Subject: [PATCH 2/7] updated funds section

---
 src/assets/css/app.css                        |   2 +-
 .../OrgListCard/OrgListCard.module.css        |   4 +
 .../FundCampaignPledge/FundCampaignPledge.tsx |  19 ++-
 .../FundCampaignPledge/PledgeModal.tsx        |   2 +-
 src/screens/OrgList/OrgList.tsx               |   5 +-
 .../CampaignModal.tsx                         |   2 +-
 .../OrganizationFundCampagins.tsx             | 139 +++++++++---------
 src/screens/OrganizationFunds/FundModal.tsx   |   6 +-
 .../OrganizationFunds/OrganizationFunds.tsx   |  20 +--
 src/style/app.module.css                      |  72 ++++++++-
 10 files changed, 168 insertions(+), 103 deletions(-)

diff --git a/src/assets/css/app.css b/src/assets/css/app.css
index b3a8613975..e80ea147e1 100644
--- a/src/assets/css/app.css
+++ b/src/assets/css/app.css
@@ -5644,7 +5644,7 @@ fieldset:disabled .btn {
   --bs-progress-border-radius: var(--bs-border-radius);
   --bs-progress-box-shadow: var(--bs-box-shadow-inset);
   --bs-progress-bar-color: #fff;
-  --bs-progress-bar-bg: #31bb6b;
+  --bs-progress-bar-bg: #286fe0;
   --bs-progress-bar-transition: width 0.6s ease;
   display: flex;
   height: var(--bs-progress-height);
diff --git a/src/components/OrgListCard/OrgListCard.module.css b/src/components/OrgListCard/OrgListCard.module.css
index f242b39f01..292456f310 100644
--- a/src/components/OrgListCard/OrgListCard.module.css
+++ b/src/components/OrgListCard/OrgListCard.module.css
@@ -60,6 +60,10 @@
   border: 1px solid var(--dropdown-border-color);
 }
 
+.manageBtn:hover {
+  border: 1px solid var(--dropdown-border-color) !important;
+}
+
 .orgName {
   text-overflow: ellipsis;
   white-space: nowrap;
diff --git a/src/screens/FundCampaignPledge/FundCampaignPledge.tsx b/src/screens/FundCampaignPledge/FundCampaignPledge.tsx
index 8942265eea..9c5a0860ea 100644
--- a/src/screens/FundCampaignPledge/FundCampaignPledge.tsx
+++ b/src/screens/FundCampaignPledge/FundCampaignPledge.tsx
@@ -356,7 +356,7 @@ const fundCampaignPledge = (): JSX.Element => {
             <Button
               variant="success"
               size="sm"
-              className="me-2 rounded"
+              className={`me-2 ${styles.editButton}`}
               data-testid="editPledgeBtn"
               onClick={() =>
                 handleOpenModal(params.row as InterfacePledgeInfo, 'edit')
@@ -429,7 +429,10 @@ const fundCampaignPledge = (): JSX.Element => {
                 name="btnradio"
                 id="pledgedRadio"
                 checked={progressIndicator === 'pledged'}
-                onChange={() => setProgressIndicator('pledged')}
+                onChange={() => {
+                  setProgressIndicator('pledged');
+                  console.log(progressIndicator);
+                }}
               />
               <label
                 className={`btn btn-outline-primary ${styles.toggleBtnPledge}`}
@@ -440,7 +443,7 @@ const fundCampaignPledge = (): JSX.Element => {
 
               <input
                 type="radio"
-                className={`btn-check`}
+                className={`btn-check ${styles.toggleBtnPledge}`}
                 name="btnradio"
                 id="raisedRadio"
                 onChange={() => setProgressIndicator('raised')}
@@ -462,6 +465,8 @@ const fundCampaignPledge = (): JSX.Element => {
               max={campaignInfo?.goal}
               style={{ height: '1.5rem', fontSize: '0.9rem' }}
               data-testid="progressBar"
+              className={`${styles.progressBar}`}
+              // variant='info'
             />
             <div className={styles.endpoints}>
               <div className={styles.start}>$0</div>
@@ -471,20 +476,20 @@ const fundCampaignPledge = (): JSX.Element => {
         </div>
       </div>
       <div className={`${styles.btnsContainerPledge} gap-4 flex-wrap`}>
-        <div className={`${styles.inputPledge} mb-1`}>
+        <div className={`${styles.input} mb-1`}>
           <Form.Control
             type="name"
             placeholder={t('searchPledger')}
             autoComplete="off"
             required
-            className={styles.inputFieldPledge}
+            className={styles.inputField}
             value={searchTerm}
             onChange={(e) => setSearchTerm(e.target.value)}
             data-testid="searchPledger"
           />
           <Button
             tabIndex={-1}
-            className={`position-absolute z-10 bottom-0 end-0  d-flex justify-content-center align-items-center`}
+            className={`${styles.searchButton}`}
             data-testid="searchBtn"
           >
             <Search />
@@ -533,7 +538,7 @@ const fundCampaignPledge = (): JSX.Element => {
           <div>
             <Button
               variant="success"
-              className={styles.orgFundCampaignButton}
+              className={styles.dropdown}
               disabled={endDate < new Date()}
               onClick={() => handleOpenModal(null, 'create')}
               data-testid="addPledgeBtn"
diff --git a/src/screens/FundCampaignPledge/PledgeModal.tsx b/src/screens/FundCampaignPledge/PledgeModal.tsx
index 04b8aae7da..2c2212ddde 100644
--- a/src/screens/FundCampaignPledge/PledgeModal.tsx
+++ b/src/screens/FundCampaignPledge/PledgeModal.tsx
@@ -343,7 +343,7 @@ const PledgeModal: React.FC<InterfacePledgeModal> = ({
           {/* Button to submit the pledge form */}
           <Button
             type="submit"
-            className={styles.greenregbtnPledge}
+            className={styles.addButton}
             data-testid="submitPledgeBtn"
           >
             {t(mode === 'edit' ? 'updatePledge' : 'createPledge')}
diff --git a/src/screens/OrgList/OrgList.tsx b/src/screens/OrgList/OrgList.tsx
index 2d53425d2e..379ebca4f0 100644
--- a/src/screens/OrgList/OrgList.tsx
+++ b/src/screens/OrgList/OrgList.tsx
@@ -336,7 +336,7 @@ function orgList(): JSX.Element {
           <Form.Control
             type="name"
             id="searchOrgname"
-            className={'bg-white'}
+            className={styles.inputField}
             placeholder={tCommon('searchByName')}
             data-testid="searchByName"
             autoComplete="off"
@@ -346,7 +346,7 @@ function orgList(): JSX.Element {
           <Button
             tabIndex={-1}
             // className={`position-absolute z-10 bottom-0 end-0 h-100 d-flex justify-content-center align-items-center`}
-            className={styles.searchButtonOrgList}
+            className={styles.searchButton}
             onClick={handleSearchByBtnClick}
             data-testid="searchBtn"
           >
@@ -366,6 +366,7 @@ function orgList(): JSX.Element {
                   sortingState.option === '' ? 'outline-success' : 'success'
                 }
                 data-testid="sortOrgs"
+                className={styles.dropdown}
               >
                 <SortIcon className={'me-1'} />
                 {sortingState.selectedOption}
diff --git a/src/screens/OrganizationFundCampaign/CampaignModal.tsx b/src/screens/OrganizationFundCampaign/CampaignModal.tsx
index 6706b80ee5..f0b944bd2b 100644
--- a/src/screens/OrganizationFundCampaign/CampaignModal.tsx
+++ b/src/screens/OrganizationFundCampaign/CampaignModal.tsx
@@ -301,7 +301,7 @@ const CampaignModal: React.FC<InterfaceCampaignModal> = ({
             {/* Button to create the campaign */}
             <Button
               type="submit"
-              className={styles.greenregbtnOrganizationFundCampaign}
+              className={styles.addButton}
               data-testid="submitCampaignBtn"
             >
               {t(mode === 'edit' ? 'updateCampaign' : 'createCampaign')}
diff --git a/src/screens/OrganizationFundCampaign/OrganizationFundCampagins.tsx b/src/screens/OrganizationFundCampaign/OrganizationFundCampagins.tsx
index 8a5455c663..f00cd30c29 100644
--- a/src/screens/OrganizationFundCampaign/OrganizationFundCampagins.tsx
+++ b/src/screens/OrganizationFundCampaign/OrganizationFundCampagins.tsx
@@ -283,7 +283,7 @@ const orgFundCampaign = (): JSX.Element => {
             <Button
               variant="success"
               size="sm"
-              className="me-2 rounded"
+              className={styles.editButton}
               data-testid="editCampaignBtn"
               onClick={() =>
                 handleOpenModal(
@@ -312,7 +312,7 @@ const orgFundCampaign = (): JSX.Element => {
           <Button
             variant="outline-success"
             size="sm"
-            className="rounded"
+            className={styles.editButton}
             data-testid="viewBtn"
             onClick={() => handleClick(params.row.campaign._id as string)}
           >
@@ -339,76 +339,75 @@ const orgFundCampaign = (): JSX.Element => {
         <Typography color="text.primary">{t('title')}</Typography>
       </Breadcrumbs>
 
-      <div className={styles.btnsContainerOrganizationFundCampaign}>
-        <div className={styles.inputOrganizationFundCampaign}>
-          <Form.Control
-            type="name"
-            placeholder={tCommon('searchByName')}
-            autoComplete="off"
-            required
-            className={styles.inputFieldOrganizationFundCampaign}
-            value={searchTerm}
-            onChange={(e) => setSearchTerm(e.target.value)}
-            data-testid="searchFullName"
-          />
-          <Button
-            className="position-absolute z-10 bottom-0 end-0  d-flex justify-content-center align-items-center"
-            data-testid="searchBtn"
-          >
-            <Search />
-          </Button>
-        </div>
-        <div className={styles.btnsBbtnsBlockOrganizationFundCampaignlock}>
-          <div className="d-flex justify-space-between">
-            <Dropdown>
-              <Dropdown.Toggle
+      <div className={styles.head}>
+        <div className={`${styles.btnsContainer} gap-4 flex-wrap`}>
+          <div className={`${styles.input} mb-1`}>
+            <Form.Control
+              type="name"
+              placeholder={tCommon('searchByName')}
+              autoComplete="off"
+              required
+              className={styles.inputField}
+              value={searchTerm}
+              onChange={(e) => setSearchTerm(e.target.value)}
+              data-testid="searchFullName"
+            />
+            <Button className={styles.searchButton} data-testid="searchBtn">
+              <Search />
+            </Button>
+          </div>
+          <div className="d-flex gap-4 mb-1">
+            <div className={'d-flex justify-space-between align-items-center'}>
+              <Dropdown>
+                <Dropdown.Toggle
+                  variant="success"
+                  id="dropdown-basic"
+                  className={styles.dropdown}
+                  data-testid="filter"
+                >
+                  <Sort className={'me-1'} />
+                  {tCommon('sort')}
+                </Dropdown.Toggle>
+                <Dropdown.Menu>
+                  <Dropdown.Item
+                    onClick={() => setSortBy('fundingGoal_ASC')}
+                    data-testid="fundingGoal_ASC"
+                  >
+                    {t('lowestGoal')}
+                  </Dropdown.Item>
+                  <Dropdown.Item
+                    onClick={() => setSortBy('fundingGoal_DESC')}
+                    data-testid="fundingGoal_DESC"
+                  >
+                    {t('highestGoal')}
+                  </Dropdown.Item>
+                  <Dropdown.Item
+                    onClick={() => setSortBy('endDate_DESC')}
+                    data-testid="endDate_DESC"
+                  >
+                    {t('latestEndDate')}
+                  </Dropdown.Item>
+                  <Dropdown.Item
+                    onClick={() => setSortBy('endDate_ASC')}
+                    data-testid="endDate_ASC"
+                  >
+                    {t('earliestEndDate')}
+                  </Dropdown.Item>
+                </Dropdown.Menu>
+              </Dropdown>
+            </div>
+            <div className="">
+              <Button
                 variant="success"
-                id="dropdown-basic"
-                className={styles.dropdownOrganizationFundCampaign}
-                data-testid="filter"
+                className={styles.createButton}
+                onClick={() => handleOpenModal(null, 'create')}
+                data-testid="addCampaignBtn"
+                disabled={isArchived}
               >
-                <Sort className={'me-1'} />
-                {tCommon('sort')}
-              </Dropdown.Toggle>
-              <Dropdown.Menu>
-                <Dropdown.Item
-                  onClick={() => setSortBy('fundingGoal_ASC')}
-                  data-testid="fundingGoal_ASC"
-                >
-                  {t('lowestGoal')}
-                </Dropdown.Item>
-                <Dropdown.Item
-                  onClick={() => setSortBy('fundingGoal_DESC')}
-                  data-testid="fundingGoal_DESC"
-                >
-                  {t('highestGoal')}
-                </Dropdown.Item>
-                <Dropdown.Item
-                  onClick={() => setSortBy('endDate_DESC')}
-                  data-testid="endDate_DESC"
-                >
-                  {t('latestEndDate')}
-                </Dropdown.Item>
-                <Dropdown.Item
-                  onClick={() => setSortBy('endDate_ASC')}
-                  data-testid="endDate_ASC"
-                >
-                  {t('earliestEndDate')}
-                </Dropdown.Item>
-              </Dropdown.Menu>
-            </Dropdown>
-          </div>
-          <div>
-            <Button
-              variant="success"
-              className={styles.orgFundCampaignButton}
-              onClick={() => handleOpenModal(null, 'create')}
-              data-testid="addCampaignBtn"
-              disabled={isArchived}
-            >
-              <i className={'fa fa-plus me-2'} />
-              {t('addCampaign')}
-            </Button>
+                <i className={'fa fa-plus me-2'} />
+                {t('addCampaign')}
+              </Button>
+            </div>
           </div>
         </div>
       </div>
diff --git a/src/screens/OrganizationFunds/FundModal.tsx b/src/screens/OrganizationFunds/FundModal.tsx
index b33270b30f..42806f7a30 100644
--- a/src/screens/OrganizationFunds/FundModal.tsx
+++ b/src/screens/OrganizationFunds/FundModal.tsx
@@ -228,7 +228,7 @@ const FundModal: React.FC<InterfaceFundModal> = ({
                   type="checkbox"
                   checked={formState.taxDeductible}
                   data-testid="setTaxDeductibleSwitch"
-                  className="ms-2"
+                  className={`ms-2 ${styles.switch}`}
                   onChange={() =>
                     setFormState({
                       ...formState,
@@ -241,7 +241,7 @@ const FundModal: React.FC<InterfaceFundModal> = ({
                 <label>{t('default')} </label>
                 <Form.Switch
                   type="checkbox"
-                  className="ms-2"
+                  className={`ms-2 ${styles.switch}`}
                   data-testid="setDefaultSwitch"
                   checked={formState.isDefault}
                   onChange={() =>
@@ -259,7 +259,7 @@ const FundModal: React.FC<InterfaceFundModal> = ({
                     type="checkbox"
                     checked={formState.isArchived}
                     data-testid="archivedSwitch"
-                    className="ms-2"
+                    className={`ms-2 ${styles.switch}`}
                     onChange={() =>
                       setFormState({
                         ...formState,
diff --git a/src/screens/OrganizationFunds/OrganizationFunds.tsx b/src/screens/OrganizationFunds/OrganizationFunds.tsx
index ec9409fbe0..efd936fca6 100644
--- a/src/screens/OrganizationFunds/OrganizationFunds.tsx
+++ b/src/screens/OrganizationFunds/OrganizationFunds.tsx
@@ -160,7 +160,7 @@ const organizationFunds = (): JSX.Element => {
       minWidth: 100,
       align: 'center',
       headerAlign: 'center',
-      headerClassName: `${styles.tableHeaders}`,
+      headerClassName: `${styles.tableHeader}`,
       sortable: false,
       renderCell: (params: GridCellParams) => {
         return <div>{params.row.id}</div>;
@@ -174,11 +174,11 @@ const organizationFunds = (): JSX.Element => {
       minWidth: 100,
       headerAlign: 'center',
       sortable: false,
-      headerClassName: `${styles.tableHeaders}`,
+      headerClassName: `${styles.tableHeader}`,
       renderCell: (params: GridCellParams) => {
         return (
           <div
-            className="d-flex justify-content-center fw-bold"
+            className={`d-flex justify-content-center fw-bold ${styles.subtleBlueGrey}`}
             data-testid="fundName"
             onClick={() => handleClick(params.row._id as string)}
           >
@@ -195,7 +195,7 @@ const organizationFunds = (): JSX.Element => {
       minWidth: 100,
       headerAlign: 'center',
       sortable: false,
-      headerClassName: `${styles.tableHeaders}`,
+      headerClassName: `${styles.tableHeader}`,
       renderCell: (params: GridCellParams) => {
         return params.row.creator.firstName + ' ' + params.row.creator.lastName;
       },
@@ -207,7 +207,7 @@ const organizationFunds = (): JSX.Element => {
       minWidth: 100,
       headerAlign: 'center',
       sortable: false,
-      headerClassName: `${styles.tableHeaders}`,
+      headerClassName: `${styles.tableHeader}`,
       flex: 2,
       renderCell: (params: GridCellParams) => {
         return (
@@ -225,7 +225,7 @@ const organizationFunds = (): JSX.Element => {
       minWidth: 100,
       headerAlign: 'center',
       sortable: false,
-      headerClassName: `${styles.tableHeaders}`,
+      headerClassName: `${styles.tableHeader}`,
       renderCell: (params: GridCellParams) => {
         return params.row.isArchived ? 'Archived' : 'Active';
       },
@@ -238,7 +238,7 @@ const organizationFunds = (): JSX.Element => {
       minWidth: 100,
       headerAlign: 'center',
       sortable: false,
-      headerClassName: `${styles.tableHeaders}`,
+      headerClassName: `${styles.tableHeader}`,
       renderCell: (params: GridCellParams) => {
         return (
           <>
@@ -266,7 +266,7 @@ const organizationFunds = (): JSX.Element => {
       minWidth: 100,
       headerAlign: 'center',
       sortable: false,
-      headerClassName: `${styles.tableHeaders}`,
+      headerClassName: `${styles.tableHeader}`,
       renderCell: (params: GridCellParams) => {
         return (
           <Button
@@ -292,7 +292,7 @@ const organizationFunds = (): JSX.Element => {
             placeholder={tCommon('searchByName')}
             autoComplete="off"
             required
-            className={styles.inputFields}
+            className={styles.inputField}
             value={searchTerm}
             onChange={(e) => setSearchTerm(e.target.value)}
             data-testid="searchByName"
@@ -312,7 +312,7 @@ const organizationFunds = (): JSX.Element => {
               <Dropdown.Toggle
                 variant="success"
                 id="dropdown-basic"
-                className={styles.dropdowns}
+                className={styles.dropdown}
                 data-testid="filter"
               >
                 <Sort className={'me-1'} />
diff --git a/src/style/app.module.css b/src/style/app.module.css
index 62338314ad..46ee28974c 100644
--- a/src/style/app.module.css
+++ b/src/style/app.module.css
@@ -97,7 +97,7 @@
   --grey-bg-color-dark: #707070;
   --dropdown-border-color: #cccccc;
   --primary-border-solid: 1px solid var(--dropdown-border-color);
-  --bg-blue: #afffe8;
+  --bg-blue: #a8c7fa;
 }
 .fonts {
   color: var(--grey-bg-color-dark);
@@ -273,7 +273,7 @@
   margin-bottom: 10px;
 }
 
-.dropdown:is(:hover, :focus, :active, :focus-visible, .show) {
+.dropdown:is(:hover, :focus, :active, :focus-visible, .show, :disabled) {
   background-color: transparent !important;
   border: 1px solid var(--brown-color);
   color: var(--brown-color) !important;
@@ -283,6 +283,12 @@
   outline: 2px solid var(--highlight-color, var(--search-button-bg));
 }
 
+/* .dropdown:disabled {
+  background-color: transparent !important;
+  border: 1px solid var(--brown-color);
+  color: var(--brown-color) !important;
+} */
+
 .dropdownItem {
   background-color: var(--bs-white) !important;
   color: var(--brown-color) !important;
@@ -439,6 +445,8 @@
 
 .searchButton:active {
   transform: scale(0.95);
+  background-color: var(--search-button-hover-bg, #286fe0) !important;
+  border-color: transparent !important;
 }
 
 .addButton {
@@ -447,8 +455,8 @@
   border-color: var(--grey-bg-color);
 }
 
-.addButton:hover {
-  background-color: var(--light-blue-color);
+.addButton:is(:hover, :active, :focus) {
+  background-color: #286fe0 !important;
   border-color: var(--search-button-border);
 }
 
@@ -502,6 +510,22 @@
   font-size: var(--font-size-header);
 }
 
+.editButton {
+  background-color: var(--bs-primary);
+  color: var(--bs-white);
+  border-color: var(--grey-bg-color);
+}
+
+.editButton:hover {
+  background-color: var(--subtle-blue-grey);
+  border-color: var(--search-button-border);
+}
+
+.editButton:focus,
+.editButton:active {
+  background-color: var(--bs-primary) !important;
+}
+
 .errorContainer {
   min-height: 100vh;
 }
@@ -655,6 +679,17 @@ hr {
   display: flex;
   justify-content: center;
   align-items: center;
+  /* background-color: var(--search-button-bg); */
+}
+
+.switch input {
+  /* box-shadow: 0 0 0.1rem 0.2rem var(--bg-blue); */
+}
+
+.switch input:checked {
+  background-color: #286fe0;
+  border: var(--bs-primary);
+  box-shadow: 0 0 0.1rem 0.2rem var(--bg-blue);
 }
 
 .pageNotFound {
@@ -724,10 +759,11 @@ hr {
 .greenregbtnPledge {
   margin-top: 15px;
   border: 1px solid var(--bs-gray-300);
+  border-color: var(--grey-bg-color);
   box-shadow: 0 2px 2px var(--grey-border-box-color);
   padding: 10px 10px;
   border-radius: 5px;
-  background-color: var(--bs-primary);
+  background-color: var(--search-button-bg);
   width: 100%;
   font-size: 16px;
   color: var(--bs-white);
@@ -863,6 +899,10 @@ hr {
   gap: 0.3rem;
 }
 
+.progressBar .bg-info {
+  background-color: #286fe0 !important;
+}
+
 .endpoints {
   display: flex;
   position: relative;
@@ -924,9 +964,19 @@ hr {
   display: flex;
   justify-content: center;
   align-items: center;
+  border-color: var(--grey-border-box-color);
+}
+
+.toggleBtnPledge:is(:focus, :active, :checked) + label {
+  color: black !important;
+  border-color: black !important;
 }
 
-.toggleBtnPledge:hover {
+.toggleBtnPledge:not(:checked) + label {
+  color: var(--subtle-blue-grey-hover) !important;
+}
+
+.toggleBtnPledge:is(:hover) + label {
   color: var(--bg-blue) !important;
 }
 
@@ -1215,11 +1265,12 @@ hr {
 .greenregbtnOrganizationFundCampaign {
   margin: 1rem 0 0;
   margin-top: 15px;
-  border: 1px solid var(--bs-gray-300);
+  /* border: 1px solid var(--search-button-bg); */
+  border-color: var(--grey-bg-color);
   box-shadow: 0 2px 2px var(--grey-border-box-color);
   padding: 10px 10px;
   border-radius: 5px;
-  background-color: var(--bs-primary);
+  background-color: var(--search-button-bg);
   width: 100%;
   font-size: 16px;
   color: var(--bs-white);
@@ -1232,6 +1283,11 @@ hr {
   flex: 1;
 }
 
+.greenregbtnOrganizationFundCampaign:hover {
+  background-color: #286fe0;
+  border-color: var(--grey-bg-color);
+}
+
 .goalButtonOrganizationFundCampaign {
   border: 1px solid var(--grey-border-box-color) !important;
   color: var(--grey-bg-color-dark) !important;

From fa19b90150f09fd828655e1add289df3056db5dd Mon Sep 17 00:00:00 2001
From: rahul <chouguler310@gmail.com>
Date: Sun, 5 Jan 2025 01:18:26 +0530
Subject: [PATCH 3/7] people section css updated

---
 src/assets/css/app.css                        |  4 +-
 .../OrgPeopleListCard/OrgPeopleListCard.tsx   |  2 +-
 .../FundCampaignPledge/FundCampaignPledge.tsx |  2 -
 src/screens/OrganizationPeople/AddMember.tsx  | 16 ++----
 src/style/app.module.css                      | 55 +++++++++++++++++--
 5 files changed, 59 insertions(+), 20 deletions(-)

diff --git a/src/assets/css/app.css b/src/assets/css/app.css
index e80ea147e1..64d1a22ef9 100644
--- a/src/assets/css/app.css
+++ b/src/assets/css/app.css
@@ -3900,7 +3900,7 @@ fieldset:disabled .btn {
   --bs-dropdown-link-hover-color: var(--bs-body-color);
   --bs-dropdown-link-hover-bg: var(--bs-tertiary-bg);
   --bs-dropdown-link-active-color: #fff;
-  --bs-dropdown-link-active-bg: #31bb6b;
+  --bs-dropdown-link-active-bg: #a8c7fa;
   --bs-dropdown-link-disabled-color: var(--bs-tertiary-color);
   --bs-dropdown-item-padding-x: 1rem;
   --bs-dropdown-item-padding-y: 0.25rem;
@@ -5644,7 +5644,7 @@ fieldset:disabled .btn {
   --bs-progress-border-radius: var(--bs-border-radius);
   --bs-progress-box-shadow: var(--bs-box-shadow-inset);
   --bs-progress-bar-color: #fff;
-  --bs-progress-bar-bg: #286fe0;
+  --bs-progress-bar-bg: #0056b3;
   --bs-progress-bar-transition: width 0.6s ease;
   display: flex;
   height: var(--bs-progress-height);
diff --git a/src/components/OrgPeopleListCard/OrgPeopleListCard.tsx b/src/components/OrgPeopleListCard/OrgPeopleListCard.tsx
index 8a028227f1..5533658432 100644
--- a/src/components/OrgPeopleListCard/OrgPeopleListCard.tsx
+++ b/src/components/OrgPeopleListCard/OrgPeopleListCard.tsx
@@ -95,7 +95,7 @@ function orgPeopleListCard(
           {/* Button to confirm the removal action */}
           <Button
             type="button"
-            className={styles.yesButton}
+            className={styles.regularBtn}
             onClick={removeMember}
             data-testid="removeMemberBtn"
           >
diff --git a/src/screens/FundCampaignPledge/FundCampaignPledge.tsx b/src/screens/FundCampaignPledge/FundCampaignPledge.tsx
index 9c5a0860ea..7f5d8f66d3 100644
--- a/src/screens/FundCampaignPledge/FundCampaignPledge.tsx
+++ b/src/screens/FundCampaignPledge/FundCampaignPledge.tsx
@@ -431,7 +431,6 @@ const fundCampaignPledge = (): JSX.Element => {
                 checked={progressIndicator === 'pledged'}
                 onChange={() => {
                   setProgressIndicator('pledged');
-                  console.log(progressIndicator);
                 }}
               />
               <label
@@ -466,7 +465,6 @@ const fundCampaignPledge = (): JSX.Element => {
               style={{ height: '1.5rem', fontSize: '0.9rem' }}
               data-testid="progressBar"
               className={`${styles.progressBar}`}
-              // variant='info'
             />
             <div className={styles.endpoints}>
               <div className={styles.start}>$0</div>
diff --git a/src/screens/OrganizationPeople/AddMember.tsx b/src/screens/OrganizationPeople/AddMember.tsx
index c7987b738d..26a3604762 100644
--- a/src/screens/OrganizationPeople/AddMember.tsx
+++ b/src/screens/OrganizationPeople/AddMember.tsx
@@ -544,35 +544,29 @@ function AddMember(): JSX.Element {
               />
             </InputGroup>
           </div>
+        </Modal.Body>
+        <Modal.Footer>
           <div className={styles.createUserActionBtns}>
             <Button
-              className={`${styles.borderNone}`}
+              className={`${styles.removeButton}`}
               variant="danger"
               onClick={closeCreateNewUserModal}
               data-testid="closeBtn"
-              style={{
-                backgroundColor: 'var(--delete-button-bg)',
-                color: 'var(--delete-button-color)',
-              }}
             >
               <Close className={styles.closeButton} />
               {translateOrgPeople('cancel')}
             </Button>
             <Button
-              className={`${styles.colorPrimary} ${styles.borderNone}`}
+              className={`${styles.addButton}`}
               variant="success"
               onClick={handleCreateUser}
               data-testid="createBtn"
-              style={{
-                backgroundColor: 'var(--search-button-bg)',
-                border: '1px solid var(--dropdown-border-color)',
-              }}
             >
               <Check className={styles.searchIcon} />
               {translateOrgPeople('create')}
             </Button>
           </div>
-        </Modal.Body>
+        </Modal.Footer>
       </Modal>
     </>
   );
diff --git a/src/style/app.module.css b/src/style/app.module.css
index 46ee28974c..e47cab329a 100644
--- a/src/style/app.module.css
+++ b/src/style/app.module.css
@@ -273,7 +273,15 @@
   margin-bottom: 10px;
 }
 
-.dropdown:is(:hover, :focus, :active, :focus-visible, .show, :disabled) {
+.dropdown:is(
+    :hover,
+    :focus,
+    :active,
+    :focus-visible,
+    .show,
+    :disabled,
+    :checked
+  ) {
   background-color: transparent !important;
   border: 1px solid var(--brown-color);
   color: var(--brown-color) !important;
@@ -281,6 +289,13 @@
 
 .dropdown:is(:focus, :focus-visible) {
   outline: 2px solid var(--highlight-color, var(--search-button-bg));
+  border: 1px solid var(--brown-color);
+}
+
+.dropdown:not(:focus) {
+  background-color: var(--bs-white);
+  border: 1px solid var(--brown-color);
+  color: var(--brown-color) !important;
 }
 
 /* .dropdown:disabled {
@@ -376,6 +391,11 @@
   gap: 8px;
 }
 
+.deleteButton:is(:hover, :active) {
+  background-color: var(--delete-button-color) !important;
+  color: white;
+}
+
 .actionItemDeleteButton {
   background-color: var(--delete-button-bg);
   color: var(--delete-button-color);
@@ -411,7 +431,11 @@
   margin-top: 10px;
   margin-bottom: 10px;
   background-color: var(--bs-white);
-  box-shadow: 0 1px 1px var(--input-shadow-color);
+  /* box-shadow: 0 1px 1px var(--input-shadow-color); */
+}
+
+.inputField:focus {
+  box-shadow: 0 0 0 0.25rem var(--search-button-bg);
 }
 
 .inputFieldModal {
@@ -460,11 +484,34 @@
   border-color: var(--search-button-border);
 }
 
+.removeButton {
+  margin-bottom: 10px;
+  background-color: var(--delete-button-bg);
+  color: var(--delete-button-color);
+  margin-right: 10px;
+}
+
+.removeButton:is(:hover, :active, :focus) {
+  background-color: var(--delete-button-color) !important;
+  border-color: var(--delete-button-color);
+  color: white;
+}
+
 .yesButton {
   background-color: var(--search-button-bg);
   border-color: var(--search-button-border);
 }
 
+.regularBtn {
+  background-color: var(--search-button-bg);
+  border-color: var(--search-button-border);
+}
+
+.regularBtn:is(:hover, :active) {
+  background-color: #286fe0 !important;
+  border-color: var(--search-button-border) !important;
+}
+
 .searchIcon {
   color: var(--brown-color);
 }
@@ -899,9 +946,9 @@ hr {
   gap: 0.3rem;
 }
 
-.progressBar .bg-info {
+/* .progressBar .bg-info {
   background-color: #286fe0 !important;
-}
+} */
 
 .endpoints {
   display: flex;

From 8090392afc6f2455e22558b631d494a89b6b8e8b Mon Sep 17 00:00:00 2001
From: rahul <chouguler310@gmail.com>
Date: Tue, 7 Jan 2025 00:33:23 +0530
Subject: [PATCH 4/7] updated Tags section

---
 .../AddPeopleToTag/AddPeopleToTag.module.css  | 54 -------------------
 .../AddPeopleToTag/AddPeopleToTag.tsx         | 18 ++++---
 .../TagActions/TagActions.module.css          | 42 ---------------
 src/components/TagActions/TagActions.tsx      | 15 ++++--
 src/components/TagActions/TagNode.tsx         |  2 +-
 src/screens/ManageTag/EditUserTagModal.tsx    | 13 +++--
 src/screens/ManageTag/ManageTag.tsx           | 14 ++---
 src/screens/ManageTag/RemoveUserTagModal.tsx  |  7 +--
 .../ManageTag/UnassignUserTagModal.tsx        |  8 +--
 .../OrganizationTags/OrganizationTags.tsx     |  8 +--
 src/screens/SubTags/SubTags.tsx               |  8 +--
 src/style/app.module.css                      | 41 +++++++++++++-
 src/utils/organizationTagsUtils.ts            |  6 +++
 13 files changed, 103 insertions(+), 133 deletions(-)
 delete mode 100644 src/components/AddPeopleToTag/AddPeopleToTag.module.css
 delete mode 100644 src/components/TagActions/TagActions.module.css

diff --git a/src/components/AddPeopleToTag/AddPeopleToTag.module.css b/src/components/AddPeopleToTag/AddPeopleToTag.module.css
deleted file mode 100644
index 5dd04ffed5..0000000000
--- a/src/components/AddPeopleToTag/AddPeopleToTag.module.css
+++ /dev/null
@@ -1,54 +0,0 @@
-.errorContainer {
-  min-height: 100vh;
-}
-
-.errorMessage {
-  margin-top: 25%;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  flex-direction: column;
-}
-
-.errorIcon {
-  transform: scale(1.5);
-  color: var(--bs-danger);
-  margin-bottom: 1rem;
-}
-
-.tableHeader {
-  background-color: var(--bs-primary);
-  color: var(--bs-white);
-  font-size: 1rem;
-}
-
-.rowBackground {
-  background-color: var(--bs-white);
-  max-height: 120px;
-}
-
-.scrollContainer {
-  height: 100px;
-  overflow-y: auto;
-  margin-bottom: 1rem;
-}
-
-.memberBadge {
-  display: flex;
-  align-items: center;
-  padding: 5px 10px;
-  border-radius: 12px;
-  box-shadow: 0 1px 3px var(--bs-gray-400);
-  max-width: calc(100% - 2rem);
-}
-
-.removeFilterIcon {
-  cursor: pointer;
-}
-
-.loadingDiv {
-  min-height: 300px;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
diff --git a/src/components/AddPeopleToTag/AddPeopleToTag.tsx b/src/components/AddPeopleToTag/AddPeopleToTag.tsx
index 51d21a6a1c..450051794c 100644
--- a/src/components/AddPeopleToTag/AddPeopleToTag.tsx
+++ b/src/components/AddPeopleToTag/AddPeopleToTag.tsx
@@ -7,7 +7,7 @@ import React, { useEffect, useState } from 'react';
 import { Modal, Form, Button } from 'react-bootstrap';
 import { useParams } from 'react-router-dom';
 import type { InterfaceQueryUserTagsMembersToAssignTo } from 'utils/interfaces';
-import styles from './AddPeopleToTag.module.css';
+import styles from '../../style/app.module.css';
 import type { InterfaceTagUsersToAssignToQuery } from 'utils/organizationTagsUtils';
 import {
   TAGS_QUERY_DATA_CHUNK_SIZE,
@@ -244,7 +244,10 @@ const AddPeopleToTag: React.FC<InterfaceAddPeopleToTagProps> = ({
             data-testid={
               isToBeAssigned ? 'deselectMemberBtn' : 'selectMemberBtn'
             }
-            variant={!isToBeAssigned ? 'primary' : 'danger'}
+            // variant={!isToBeAssigned ? 'primary' : 'danger'}
+            className={
+              !isToBeAssigned ? styles.editButton : `btn btn-danger btn-sm`
+            }
           >
             {isToBeAssigned ? 'x' : '+'}
           </Button>
@@ -263,7 +266,7 @@ const AddPeopleToTag: React.FC<InterfaceAddPeopleToTagProps> = ({
         centered
       >
         <Modal.Header
-          className="bg-primary"
+          className={`bg-primary ${styles.modalHeader}`}
           data-testid="modalOrganizationHeader"
           closeButton
         >
@@ -301,7 +304,7 @@ const AddPeopleToTag: React.FC<InterfaceAddPeopleToTagProps> = ({
                 <Form.Control
                   type="text"
                   id="firstName"
-                  className="bg-light"
+                  className={`bg-light ${styles.inputField}`}
                   placeholder={tCommon('firstName')}
                   onChange={(e) =>
                     setMemberToAssignToSearchFirstName(e.target.value.trim())
@@ -315,7 +318,7 @@ const AddPeopleToTag: React.FC<InterfaceAddPeopleToTagProps> = ({
                 <Form.Control
                   type="text"
                   id="lastName"
-                  className="bg-light"
+                  className={`bg-light ${styles.inputField}`}
                   placeholder={tCommon('lastName')}
                   onChange={(e) =>
                     setMemberToAssignToSearchLastName(e.target.value.trim())
@@ -396,16 +399,17 @@ const AddPeopleToTag: React.FC<InterfaceAddPeopleToTagProps> = ({
           <Modal.Footer>
             <Button
               onClick={hideAddPeopleToTagModal}
-              variant="outline-secondary"
+              variant="outline-danger"
               data-testid="closeAddPeopleToTagModal"
+              className={styles.removeButton}
             >
               {tCommon('cancel')}
             </Button>
             <Button
               type="submit"
               disabled={addPeopleToTagLoading}
-              variant="primary"
               data-testid="assignPeopleBtn"
+              className={styles.addButton}
             >
               {t('assign')}
             </Button>
diff --git a/src/components/TagActions/TagActions.module.css b/src/components/TagActions/TagActions.module.css
deleted file mode 100644
index 079dffea65..0000000000
--- a/src/components/TagActions/TagActions.module.css
+++ /dev/null
@@ -1,42 +0,0 @@
-.errorContainer {
-  min-height: 100vh;
-}
-
-.errorMessage {
-  margin-top: 25%;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  flex-direction: column;
-}
-
-.errorIcon {
-  transform: scale(1.5);
-  color: var(--bs-danger);
-  margin-bottom: 1rem;
-}
-
-.scrollContainer {
-  height: 100px;
-  overflow-y: auto;
-}
-
-.tagBadge {
-  display: flex;
-  align-items: center;
-  padding: 5px 10px;
-  border-radius: 12px;
-  box-shadow: 0 1px 3px var(--bs-gray-400);
-  max-width: calc(100% - 2rem);
-}
-
-.removeFilterIcon {
-  cursor: pointer;
-}
-
-.loadingDiv {
-  min-height: 300px;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
diff --git a/src/components/TagActions/TagActions.tsx b/src/components/TagActions/TagActions.tsx
index 083341372f..f7ffef8d38 100644
--- a/src/components/TagActions/TagActions.tsx
+++ b/src/components/TagActions/TagActions.tsx
@@ -7,7 +7,7 @@ import type {
   InterfaceQueryOrganizationUserTags,
   InterfaceTagData,
 } from 'utils/interfaces';
-import styles from './TagActions.module.css';
+import styles from '../../style/app.module.css';
 import { ORGANIZATION_USER_TAGS_LIST } from 'GraphQl/Queries/OrganizationQueries';
 import {
   ASSIGN_TO_TAGS,
@@ -270,7 +270,7 @@ const TagActions: React.FC<InterfaceTagActionsProps> = ({
         centered
       >
         <Modal.Header
-          className="bg-primary"
+          className={styles.modalHeader}
           data-testid="modalOrganizationHeader"
           closeButton
         >
@@ -312,7 +312,7 @@ const TagActions: React.FC<InterfaceTagActionsProps> = ({
               <Form.Control
                 type="text"
                 id="userName"
-                className="bg-light"
+                className={styles.inputField}
                 placeholder={tCommon('searchByName')}
                 onChange={(e) => setTagSearchName(e.target.value.trim())}
                 data-testid="searchByName"
@@ -388,13 +388,18 @@ const TagActions: React.FC<InterfaceTagActionsProps> = ({
 
           <Modal.Footer>
             <Button
-              variant="secondary"
+              className={`btn btn-danger ${styles.removeButton}`}
               onClick={(): void => hideTagActionsModal()}
               data-testid="closeTagActionsModalBtn"
             >
               {tCommon('cancel')}
             </Button>
-            <Button type="submit" value="add" data-testid="tagActionSubmitBtn">
+            <Button
+              type="submit"
+              value="add"
+              data-testid="tagActionSubmitBtn"
+              className={`btn ${styles.addButton}`}
+            >
               {tagActionType === 'assignToTags' ? t('assign') : t('remove')}
             </Button>
           </Modal.Footer>
diff --git a/src/components/TagActions/TagNode.tsx b/src/components/TagActions/TagNode.tsx
index fc41ef4066..05e3564a9b 100644
--- a/src/components/TagActions/TagNode.tsx
+++ b/src/components/TagActions/TagNode.tsx
@@ -7,7 +7,7 @@ import type {
 } from 'utils/interfaces';
 import type { InterfaceOrganizationSubTagsQuery } from 'utils/organizationTagsUtils';
 import { TAGS_QUERY_DATA_CHUNK_SIZE } from 'utils/organizationTagsUtils';
-import styles from './TagActions.module.css';
+import styles from '../../style/app.module.css';
 import InfiniteScroll from 'react-infinite-scroll-component';
 import InfiniteScrollLoader from 'components/InfiniteScrollLoader/InfiniteScrollLoader';
 import { WarningAmberRounded } from '@mui/icons-material';
diff --git a/src/screens/ManageTag/EditUserTagModal.tsx b/src/screens/ManageTag/EditUserTagModal.tsx
index 5fa8ae2771..f75c19cbb8 100644
--- a/src/screens/ManageTag/EditUserTagModal.tsx
+++ b/src/screens/ManageTag/EditUserTagModal.tsx
@@ -2,6 +2,7 @@ import type { TFunction } from 'i18next';
 import type { FormEvent } from 'react';
 import React from 'react';
 import { Button, Form, Modal } from 'react-bootstrap';
+import styles from '../../style/app.module.css';
 
 /**
  * Edit UserTag Modal component for the Manage Tag screen.
@@ -37,7 +38,7 @@ const EditUserTagModal: React.FC<InterfaceEditUserTagModalProps> = ({
         centered
       >
         <Modal.Header
-          className="bg-primary"
+          className={styles.modalHeader}
           data-testid="modalOrganizationHeader"
           closeButton
         >
@@ -56,7 +57,7 @@ const EditUserTagModal: React.FC<InterfaceEditUserTagModalProps> = ({
             <Form.Control
               type="text"
               id="tagName"
-              className="mb-3"
+              className={`mb-3 ${styles.inputField}`}
               placeholder={t('tagNamePlaceholder')}
               data-testid="tagNameInput"
               autoComplete="off"
@@ -73,10 +74,16 @@ const EditUserTagModal: React.FC<InterfaceEditUserTagModalProps> = ({
               variant="secondary"
               onClick={(): void => hideEditUserTagModal()}
               data-testid="closeEditTagModalBtn"
+              className={styles.removeButton}
             >
               {tCommon('cancel')}
             </Button>
-            <Button type="submit" value="invite" data-testid="editTagSubmitBtn">
+            <Button
+              type="submit"
+              value="invite"
+              data-testid="editTagSubmitBtn"
+              className={styles.addButton}
+            >
               {tCommon('edit')}
             </Button>
           </Modal.Footer>
diff --git a/src/screens/ManageTag/ManageTag.tsx b/src/screens/ManageTag/ManageTag.tsx
index 38466f6f11..d2af763dae 100644
--- a/src/screens/ManageTag/ManageTag.tsx
+++ b/src/screens/ManageTag/ManageTag.tsx
@@ -292,7 +292,7 @@ function ManageTag(): JSX.Element {
       minWidth: 100,
       align: 'center',
       headerAlign: 'center',
-      headerClassName: `${styles.tableHeaders}`,
+      headerClassName: `${styles.tableHeader}`,
       sortable: false,
       renderCell: (params: GridCellParams) => {
         return <div>{params.row.id}</div>;
@@ -304,7 +304,7 @@ function ManageTag(): JSX.Element {
       flex: 2,
       minWidth: 100,
       sortable: false,
-      headerClassName: `${styles.tableHeaders}`,
+      headerClassName: `${styles.tableHeader}`,
       renderCell: (params: GridCellParams) => {
         return (
           <div data-testid="memberName">
@@ -321,7 +321,7 @@ function ManageTag(): JSX.Element {
       minWidth: 100,
       headerAlign: 'center',
       sortable: false,
-      headerClassName: `${styles.tableHeaders}`,
+      headerClassName: `${styles.tableHeader}`,
       renderCell: (params: GridCellParams) => {
         return (
           <div>
@@ -330,7 +330,9 @@ function ManageTag(): JSX.Element {
               state={{ id: params.row._id }}
               data-testid="viewProfileBtn"
             >
-              <div className="btn btn-sm btn-primary me-3">
+              <div
+                className={`btn btn-sm btn-primary me-3 ${styles.editButton}`}
+              >
                 {t('viewProfile')}
               </div>
             </Link>
@@ -519,7 +521,7 @@ function ManageTag(): JSX.Element {
                       setTagActionType('assignToTags');
                       showTagActionsModal();
                     }}
-                    className="my-2 btn btn-primary btn-sm w-75"
+                    className={`my-2 btn btn-primary btn-sm w-75 ${styles.editButton}`}
                     data-testid="assignToTags"
                   >
                     {t('assignToTags')}
@@ -543,7 +545,7 @@ function ManageTag(): JSX.Element {
                   />
                   <div
                     onClick={showEditUserTagModal}
-                    className="mt-1 mb-2 btn btn-primary btn-sm w-75"
+                    className={`mt-1 mb-2 btn btn-primary btn-sm w-75 ${styles.editButton}`}
                     data-testid="editUserTag"
                   >
                     {tCommon('edit')}
diff --git a/src/screens/ManageTag/RemoveUserTagModal.tsx b/src/screens/ManageTag/RemoveUserTagModal.tsx
index dc000f443c..91ba0b38aa 100644
--- a/src/screens/ManageTag/RemoveUserTagModal.tsx
+++ b/src/screens/ManageTag/RemoveUserTagModal.tsx
@@ -1,6 +1,7 @@
 import type { TFunction } from 'i18next';
 import React from 'react';
 import { Button, Modal } from 'react-bootstrap';
+import styles from '../../style/app.module.css';
 
 /**
  * Remove UserTag Modal component for the Manage Tag screen.
@@ -33,7 +34,7 @@ const RemoveUserTagModal: React.FC<InterfaceRemoveUserTagModalProps> = ({
         keyboard={false}
         centered
       >
-        <Modal.Header closeButton className="bg-primary">
+        <Modal.Header closeButton className={styles.modalHeader}>
           <Modal.Title className="text-white" id="removeUserTag">
             {t('removeUserTag')}
           </Modal.Title>
@@ -44,7 +45,7 @@ const RemoveUserTagModal: React.FC<InterfaceRemoveUserTagModalProps> = ({
         <Modal.Footer>
           <Button
             type="button"
-            className="btn btn-danger"
+            className={`btn btn-danger ${styles.removeButton}`}
             data-dismiss="modal"
             role="button"
             aria-label={tCommon('no')}
@@ -55,7 +56,7 @@ const RemoveUserTagModal: React.FC<InterfaceRemoveUserTagModalProps> = ({
           </Button>
           <Button
             type="button"
-            className="btn btn-success"
+            className={`btn ${styles.addButton}`}
             role="button"
             aria-label={tCommon('yes')}
             onClick={handleRemoveUserTag}
diff --git a/src/screens/ManageTag/UnassignUserTagModal.tsx b/src/screens/ManageTag/UnassignUserTagModal.tsx
index 9d926790c3..d5448667d1 100644
--- a/src/screens/ManageTag/UnassignUserTagModal.tsx
+++ b/src/screens/ManageTag/UnassignUserTagModal.tsx
@@ -1,7 +1,7 @@
 import type { TFunction } from 'i18next';
 import React from 'react';
 import { Button, Modal } from 'react-bootstrap';
-
+import styles from '../../style/app.module.css';
 /**
  * Unassign UserTag Modal component for the Manage Tag screen.
  */
@@ -35,7 +35,7 @@ const UnassignUserTagModal: React.FC<InterfaceUnassignUserTagModalProps> = ({
       >
         <Modal.Header
           closeButton
-          className="bg-primary"
+          className={styles.modalHeader}
           aria-label={t('closeModal')}
         >
           <Modal.Title className="text-white" id={`unassignTag`}>
@@ -46,7 +46,7 @@ const UnassignUserTagModal: React.FC<InterfaceUnassignUserTagModalProps> = ({
         <Modal.Footer>
           <Button
             type="button"
-            className="btn btn-danger"
+            className={`btn btn-danger ${styles.removeButton}`}
             data-dismiss="modal"
             onClick={toggleUnassignUserTagModal}
             data-testid="unassignTagModalCloseBtn"
@@ -56,7 +56,7 @@ const UnassignUserTagModal: React.FC<InterfaceUnassignUserTagModalProps> = ({
           </Button>
           <Button
             type="button"
-            className="btn btn-success"
+            className={`btn ${styles.addButton}`}
             onClick={async (e) => {
               const btn = e.currentTarget;
               btn.disabled = true;
diff --git a/src/screens/OrganizationTags/OrganizationTags.tsx b/src/screens/OrganizationTags/OrganizationTags.tsx
index 558eb4eaf8..3c732b0c6b 100644
--- a/src/screens/OrganizationTags/OrganizationTags.tsx
+++ b/src/screens/OrganizationTags/OrganizationTags.tsx
@@ -285,7 +285,7 @@ function OrganizationTags(): JSX.Element {
             variant="outline-primary"
             onClick={() => redirectToManageTag(params.row._id)}
             data-testid="manageTagBtn"
-            className={styles.addButton}
+            className={styles.editButton}
           >
             {t('manageTag')}
           </Button>
@@ -407,6 +407,7 @@ function OrganizationTags(): JSX.Element {
                       '& .MuiDataGrid-row': {
                         backgroundColor: 'var(--tablerow-bg-color)',
                         '&:focus-within': {
+                          outline: '2px solid #000',
                           outlineOffset: '-2px',
                         },
                       },
@@ -419,6 +420,7 @@ function OrganizationTags(): JSX.Element {
                         boxShadow: '0 0 0 1px rgba(0, 0, 0, 0.1)',
                       },
                       '& .MuiDataGrid-cell:focus': {
+                        outline: '2px solid #000',
                         outlineOffset: '-2px',
                       },
                     }}
@@ -460,7 +462,7 @@ function OrganizationTags(): JSX.Element {
             <Form.Control
               type="name"
               id="orgname"
-              className="mb-3"
+              className={`mb-3 ${styles.inputField}`}
               placeholder={t('tagNamePlaceholder')}
               data-testid="tagNameInput"
               autoComplete="off"
@@ -477,7 +479,7 @@ function OrganizationTags(): JSX.Element {
               variant="secondary"
               onClick={(): void => hideCreateTagModal()}
               data-testid="closeCreateTagModal"
-              className={styles.closeButton}
+              className={styles.removeButton}
             >
               {tCommon('cancel')}
             </Button>
diff --git a/src/screens/SubTags/SubTags.tsx b/src/screens/SubTags/SubTags.tsx
index 6a20e875ec..e0763997e3 100644
--- a/src/screens/SubTags/SubTags.tsx
+++ b/src/screens/SubTags/SubTags.tsx
@@ -266,9 +266,9 @@ function SubTags(): JSX.Element {
         return (
           <Button
             size="sm"
-            variant="outline-primary"
             onClick={() => redirectToManageTag(params.row._id)}
             data-testid="manageTagBtn"
+            className={styles.editButton}
           >
             {t('manageTag')}
           </Button>
@@ -445,7 +445,7 @@ function SubTags(): JSX.Element {
         centered
       >
         <Modal.Header
-          className={styles.tableHeader}
+          className={styles.modalHeader}
           data-testid="tagHeader"
           closeButton
         >
@@ -457,7 +457,7 @@ function SubTags(): JSX.Element {
             <Form.Control
               type="name"
               id="tagname"
-              className="mb-3"
+              className={`mb-3 ${styles.inputField}`}
               placeholder={t('tagNamePlaceholder')}
               data-testid="modalTitle"
               autoComplete="off"
@@ -474,7 +474,7 @@ function SubTags(): JSX.Element {
               variant="secondary"
               onClick={(): void => hideAddSubTagModal()}
               data-testid="addSubTagModalCloseBtn"
-              className={styles.closeButton}
+              className={styles.removeButton}
             >
               {tCommon('cancel')}
             </Button>
diff --git a/src/style/app.module.css b/src/style/app.module.css
index 981ff08b1e..5580f21ab2 100644
--- a/src/style/app.module.css
+++ b/src/style/app.module.css
@@ -491,6 +491,11 @@
   border-color: var(--search-button-border);
 }
 
+.addButton:not(:hover, :active, :focus) {
+  background-color: #286fe0 !important;
+  border-color: var(--search-button-border);
+}
+
 .removeButton {
   margin-bottom: 10px;
   background-color: var(--delete-button-bg);
@@ -558,6 +563,37 @@
   overflow-y: auto;
 }
 
+.scrollContainer {
+  height: 100px;
+  overflow-y: auto;
+  margin-bottom: 1rem;
+}
+
+.memberBadge {
+  display: flex;
+  align-items: center;
+  padding: 5px 10px;
+  border-radius: 12px;
+  box-shadow: 0 1px 3px var(--bs-gray-400);
+  max-width: calc(100% - 2rem);
+}
+
+.loadingDiv {
+  min-height: 300px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.tagBadge {
+  display: flex;
+  align-items: center;
+  padding: 5px 10px;
+  border-radius: 12px;
+  box-shadow: 0 1px 3px var(--bs-gray-400);
+  max-width: calc(100% - 2rem);
+}
+
 .tableHeader {
   background-color: var(--table-head-bg);
   color: var(--table-header-color);
@@ -630,6 +666,7 @@
   scrollbar-color: var(--bs-gray-400) var(--bs-white);
   max-height: calc(100vh - 18rem);
   overflow: auto;
+  margin-top: 20px !important;
 }
 
 .tagsBreadCrumbs:hover {
@@ -737,7 +774,7 @@ hr {
 }
 
 .switch input {
-  /* box-shadow: 0 0 0.1rem 0.2rem var(--bg-blue); */
+  box-shadow: 0 0 0.1rem 0.2rem var(--bg-blue);
 }
 
 .switch input:checked {
@@ -1650,6 +1687,8 @@ hr {
 .modalHeader {
   border: none;
   padding-bottom: 0;
+  background-color: var(--bs-primary) !important;
+  padding: 1rem 1rem;
 }
 
 .label {
diff --git a/src/utils/organizationTagsUtils.ts b/src/utils/organizationTagsUtils.ts
index 56654a3abb..9105a5629e 100644
--- a/src/utils/organizationTagsUtils.ts
+++ b/src/utils/organizationTagsUtils.ts
@@ -18,9 +18,11 @@ export const dataGridStyle = {
   },
   '& .MuiDataGrid-row:hover': {
     backgroundColor: 'transparent',
+    boxShadow: '0 0 0 1px rgba(0, 0, 0, 0.1)',
   },
   '& .MuiDataGrid-row.Mui-hovered': {
     backgroundColor: 'transparent',
+    boxShadow: '0 0 0 1px rgba(0, 0, 0, 0.1)',
   },
   '& .MuiDataGrid-root': {
     borderRadius: '0.1rem',
@@ -36,6 +38,10 @@ export const dataGridStyle = {
   '& .MuiDataGrid-virtualScrollerContent': {
     marginTop: 6.5,
   },
+  '& .MuiDataGrid-cell:focus': {
+    outline: '2px solid #000',
+    outlineOffset: '-2px',
+  },
 };
 
 // the data chunk size for tag related queries

From 851e246acc2c3caa7fb8def9209036279cf901c6 Mon Sep 17 00:00:00 2001
From: rahul <chouguler310@gmail.com>
Date: Sat, 11 Jan 2025 21:15:10 +0530
Subject: [PATCH 5/7] venues, action items, advertisments, plugins sections
 updated

---
 .../AddOn/core/AddOnEntry/AddOnEntry.tsx      |   6 +-
 .../AdvertisementEntry.module.css             |  79 --------
 .../AdvertisementEntry/AdvertisementEntry.tsx |  13 +-
 .../AdvertisementRegister.tsx                 |  12 +-
 .../EventCalendar/EventCalendar.tsx           |   2 +-
 src/components/EventCalendar/EventHeader.tsx  |   2 +-
 .../EventListCard/EventListCardModals.tsx     |  38 ++--
 .../OrgPostCard/DeletePostModal.tsx           |   4 +-
 src/components/OrgPostCard/OrgPostCard.tsx    |  17 +-
 src/components/Venues/VenueCard.tsx           |   4 +-
 src/components/Venues/VenueModal.tsx          |   4 +
 src/screens/BlockUser/BlockUser.tsx           |  20 ++-
 src/screens/OrgPost/OrgPost.tsx               |  10 +-
 .../ItemUpdateStatusModal.tsx                 |  13 +-
 .../OrganizationEvents/OrganizationEvents.tsx |  14 +-
 .../OrganizationFundCampagins.tsx             |  68 +++----
 src/style/app.module.css                      | 168 +++++++++++++-----
 17 files changed, 260 insertions(+), 214 deletions(-)
 delete mode 100644 src/components/Advertisements/core/AdvertisementEntry/AdvertisementEntry.module.css

diff --git a/src/components/AddOn/core/AddOnEntry/AddOnEntry.tsx b/src/components/AddOn/core/AddOnEntry/AddOnEntry.tsx
index 0d317266d9..9c9a822e22 100644
--- a/src/components/AddOn/core/AddOnEntry/AddOnEntry.tsx
+++ b/src/components/AddOn/core/AddOnEntry/AddOnEntry.tsx
@@ -113,7 +113,11 @@ function addOnEntry({
           </Card.Subtitle>
           <Card.Text>{description}</Card.Text>
           <Button
-            className={styles.entryaction}
+            className={
+              uninstalledOrgs.includes(currentOrg)
+                ? styles.addButton
+                : `btn btn-danger ${styles.removeButton}`
+            }
             variant="primary"
             // disabled={buttonLoading || !configurable}
             disabled={buttonLoading}
diff --git a/src/components/Advertisements/core/AdvertisementEntry/AdvertisementEntry.module.css b/src/components/Advertisements/core/AdvertisementEntry/AdvertisementEntry.module.css
deleted file mode 100644
index e4f244807f..0000000000
--- a/src/components/Advertisements/core/AdvertisementEntry/AdvertisementEntry.module.css
+++ /dev/null
@@ -1,79 +0,0 @@
-.entrytoggle {
-  margin: 24px 24px 0 auto;
-  width: fit-content;
-}
-
-.entryaction {
-  display: flex !important;
-}
-
-.entryaction i {
-  margin-right: 8px;
-  margin-top: 4px;
-}
-
-.entryaction .spinner-grow {
-  height: 1rem;
-  width: 1rem;
-  margin-right: 8px;
-}
-
-.admedia {
-  object-fit: cover;
-  height: 16rem;
-}
-
-.buttons {
-  display: flex;
-  justify-content: flex-end;
-}
-
-.card {
-  width: 28rem;
-}
-
-.dropdownButton {
-  background-color: transparent;
-  color: #000;
-  border: none;
-  cursor: pointer;
-  display: flex;
-  width: 100%;
-  justify-content: flex-end;
-  padding: 8px 10px;
-}
-
-.dropdownContainer {
-  position: relative;
-  display: inline-block;
-}
-
-.dropdownmenu {
-  display: none;
-  position: absolute;
-  z-index: 1;
-  background-color: white;
-  width: 120px;
-  box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2);
-  padding: 5px 0;
-  margin: 0;
-  list-style-type: none;
-  right: 0;
-  top: 100%;
-}
-
-.dropdownmenu li {
-  cursor: pointer;
-  padding: 8px 16px;
-  text-decoration: none;
-  display: block;
-  color: #333;
-}
-
-.dropdownmenu li:hover {
-  background-color: #f1f1f1;
-}
-
-.dropdownContainer:hover .dropdownmenu {
-  display: block;
-}
diff --git a/src/components/Advertisements/core/AdvertisementEntry/AdvertisementEntry.tsx b/src/components/Advertisements/core/AdvertisementEntry/AdvertisementEntry.tsx
index 7656f1f0cf..dca9adb45a 100644
--- a/src/components/Advertisements/core/AdvertisementEntry/AdvertisementEntry.tsx
+++ b/src/components/Advertisements/core/AdvertisementEntry/AdvertisementEntry.tsx
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
-import styles from './AdvertisementEntry.module.css';
+import styles from '../../../../style/app.module.css';
 import { Button, Card, Col, Row, Spinner, Modal } from 'react-bootstrap';
 import { DELETE_ADVERTISEMENT_BY_ID } from 'GraphQl/Mutations/mutations';
 import { useMutation } from '@apollo/client';
@@ -99,7 +99,7 @@ function AdvertisementEntry({
       <Row data-testid="AdEntry" xs={1} md={2} className="g-4">
         {Array.from({ length: 1 }).map((_, idx) => (
           <Col key={idx}>
-            <Card className={styles.card}>
+            <Card className={styles.addCard}>
               <div className={styles.dropdownContainer}>
                 <button
                   className={styles.dropdownButton}
@@ -163,7 +163,7 @@ function AdvertisementEntry({
                 </Card.Subtitle>
                 <div className={styles.buttons}>
                   <Button
-                    className={styles.entryaction}
+                    className={`${styles.entryaction} ${styles.addButton}`}
                     variant="primary"
                     disabled={buttonLoading}
                     data-testid="AddOnEntry_btn_install"
@@ -189,12 +189,15 @@ function AdvertisementEntry({
                     {t('deleteAdvertisementMsg')}
                   </Modal.Body>
                   <Modal.Footer>
-                    <Button variant="danger" onClick={toggleShowDeleteModal}>
+                    <Button
+                      className={`btn btn-danger ${styles.removeButton}`}
+                      onClick={toggleShowDeleteModal}
+                    >
                       {tCommon('no')}
                     </Button>
                     <Button
                       type="button"
-                      className="btn btn-success"
+                      className={`btn ${styles.addButton}`}
                       onClick={(): void => {
                         onDelete();
                       }}
diff --git a/src/components/Advertisements/core/AdvertisementRegister/AdvertisementRegister.tsx b/src/components/Advertisements/core/AdvertisementRegister/AdvertisementRegister.tsx
index e329ce6855..24290d7b13 100644
--- a/src/components/Advertisements/core/AdvertisementRegister/AdvertisementRegister.tsx
+++ b/src/components/Advertisements/core/AdvertisementRegister/AdvertisementRegister.tsx
@@ -249,7 +249,7 @@ function advertisementRegister({
     <>
       {formStatus === 'register' ? (
         <Button
-          className={styles.modalbtn}
+          className={styles.dropdown}
           variant="primary"
           onClick={handleShow}
           data-testid="createAdvertisement"
@@ -286,6 +286,7 @@ function advertisementRegister({
                     name: e.target.value,
                   });
                 }}
+                className={styles.inputField}
               />
             </Form.Group>
             <Form.Group className="mb-3">
@@ -312,6 +313,7 @@ function advertisementRegister({
                     });
                   }
                 }}
+                className={styles.inputField}
               />
               {formState.advertisementMedia && (
                 <div
@@ -367,6 +369,7 @@ function advertisementRegister({
                     type: e.target.value,
                   });
                 }}
+                className={styles.inputField}
               >
                 <option value="POPUP">Popup Ad</option>
                 <option value="BANNER">Banner Ad </option>
@@ -385,6 +388,7 @@ function advertisementRegister({
                     startDate: new Date(e.target.value),
                   });
                 }}
+                className={styles.inputField}
               />
             </Form.Group>
 
@@ -400,6 +404,7 @@ function advertisementRegister({
                     endDate: new Date(e.target.value),
                   });
                 }}
+                className={styles.inputField}
               />
             </Form.Group>
           </Form>
@@ -408,14 +413,13 @@ function advertisementRegister({
           <Button
             variant="secondary"
             onClick={handleClose}
-            className={styles.closeButtonAdvertisementRegister}
+            className={`btn btn-danger ${styles.removeButton}`}
             data-testid="addonclose"
           >
             {tCommon('close')}
           </Button>
           {formStatus === 'register' ? (
             <Button
-              variant="primary"
               onClick={handleRegister}
               data-testid="addonregister"
               className={styles.addButton}
@@ -424,9 +428,9 @@ function advertisementRegister({
             </Button>
           ) : (
             <Button
-              variant="primary"
               onClick={handleUpdate}
               data-testid="addonupdate"
+              className={styles.addButton}
             >
               {tCommon('saveChanges')}
             </Button>
diff --git a/src/components/EventCalendar/EventCalendar.tsx b/src/components/EventCalendar/EventCalendar.tsx
index c9048eb552..397df845fb 100644
--- a/src/components/EventCalendar/EventCalendar.tsx
+++ b/src/components/EventCalendar/EventCalendar.tsx
@@ -549,7 +549,7 @@ const Calendar: React.FC<InterfaceCalendarProps> = ({
           </Button>
           <div>
             <Button
-              className={styles.btn__today}
+              className={styles.editButton}
               onClick={handleTodayButton}
               data-testid="today"
             >
diff --git a/src/components/EventCalendar/EventHeader.tsx b/src/components/EventCalendar/EventHeader.tsx
index 9201e8b696..1acbb8acfa 100644
--- a/src/components/EventCalendar/EventHeader.tsx
+++ b/src/components/EventCalendar/EventHeader.tsx
@@ -90,7 +90,7 @@ function eventHeader({
           />
           <Button
             variant="success"
-            className={styles.createButtonEventHeader}
+            className={styles.dropdown}
             onClick={showInviteModal}
             data-testid="createEventModalBtn"
           >
diff --git a/src/components/EventListCard/EventListCardModals.tsx b/src/components/EventListCard/EventListCardModals.tsx
index 6f93c709fd..3bcdf38df8 100644
--- a/src/components/EventListCard/EventListCardModals.tsx
+++ b/src/components/EventListCard/EventListCardModals.tsx
@@ -407,7 +407,7 @@ function EventListCardModals({
             <Form.Control
               type="title"
               id="eventitle"
-              className="mb-3"
+              className={`mb-3 ${styles.inputField}`}
               autoComplete="off"
               data-testid="updateTitle"
               required
@@ -433,7 +433,7 @@ function EventListCardModals({
             <Form.Control
               type="eventdescrip"
               id="eventdescrip"
-              className="mb-3"
+              className={`mb-3 ${styles.inputField}`}
               autoComplete="off"
               data-testid="updateDescription"
               required
@@ -459,7 +459,7 @@ function EventListCardModals({
             <Form.Control
               type="text"
               id="eventLocation"
-              className="mb-3"
+              className={`mb-3 ${styles.inputField}`}
               autoComplete="off"
               data-testid="updateLocation"
               required
@@ -568,6 +568,7 @@ function EventListCardModals({
                     id="allday"
                     type="checkbox"
                     data-testid="updateAllDay"
+                    className={styles.switch}
                     checked={alldaychecked}
                     onChange={(): void => {
                       setAllDayChecked(!alldaychecked);
@@ -584,6 +585,7 @@ function EventListCardModals({
                     id="recurring"
                     type="checkbox"
                     data-testid="updateRecurring"
+                    className={styles.switch}
                     checked={recurringchecked}
                     onChange={(): void => {
                       setRecurringChecked(!recurringchecked);
@@ -602,6 +604,7 @@ function EventListCardModals({
                     id="ispublic"
                     type="checkbox"
                     data-testid="updateIsPublic"
+                    className={styles.switch}
                     checked={publicchecked}
                     onChange={(): void => {
                       setPublicChecked(!publicchecked);
@@ -618,6 +621,7 @@ function EventListCardModals({
                     id="registrable"
                     type="checkbox"
                     data-testid="updateRegistrable"
+                    className={styles.switch}
                     checked={registrablechecked}
                     onChange={(): void => {
                       setRegistrableChecked(!registrablechecked);
@@ -651,7 +655,7 @@ function EventListCardModals({
               variant="success"
               onClick={openEventDashboard}
               data-testid="showEventDashboardBtn"
-              className={styles.icon}
+              className={styles.addButton}
             >
               {' '}
               Show Event Dashboard{' '}
@@ -661,7 +665,7 @@ function EventListCardModals({
             eventListCardProps.creator?._id === userId) && (
             <Button
               variant="success"
-              className={styles.icon}
+              className={styles.addButton}
               data-testid="updateEventBtn"
               onClick={handleEventUpdate}
             >
@@ -673,7 +677,7 @@ function EventListCardModals({
             <Button
               variant="danger"
               data-testid="deleteEventModalBtn"
-              className={styles.icon}
+              className={styles.removeButton}
               onClick={toggleDeleteModal}
             >
               {t('deleteEvent')}
@@ -682,16 +686,12 @@ function EventListCardModals({
           {eventListCardProps.userRole === Role.USER &&
             !(eventListCardProps.creator?._id === userId) &&
             (isRegistered ? (
-              <Button
-                className={styles.customButton}
-                variant="success"
-                disabled
-              >
+              <Button className={styles.addButton} variant="success" disabled>
                 {t('alreadyRegistered')}
               </Button>
             ) : (
               <Button
-                className={styles.customButton}
+                className={styles.addButton}
                 variant="success"
                 onClick={registerEventHandler}
                 data-testid="registerEventBtn"
@@ -712,7 +712,7 @@ function EventListCardModals({
         keyboard={false}
         centered
       >
-        <Modal.Header closeButton className="bg-primary">
+        <Modal.Header closeButton className={`${styles.modalHeader}`}>
           <Modal.Title
             className="text-white"
             id={`recurringEventUpdateOptionsLabel${eventListCardProps.id}`}
@@ -737,6 +737,7 @@ function EventListCardModals({
                   }
                   defaultChecked={option === recurringEventUpdateType}
                   data-testid={`update-${option}`}
+                  className={styles.switch}
                 />
               </div>
             ))}
@@ -745,7 +746,7 @@ function EventListCardModals({
         <Modal.Footer>
           <Button
             type="button"
-            className="btn btn-danger"
+            className={`btn btn-danger ${styles.removeButton}`}
             data-dismiss="modal"
             onClick={toggleRecurringEventUpdateModal}
             data-testid="eventUpdateOptionsModalCloseBtn"
@@ -754,7 +755,7 @@ function EventListCardModals({
           </Button>
           <Button
             type="button"
-            className="btn btn-success"
+            className={`btn ${styles.addButton}`}
             onClick={updateEventHandler}
             data-testid="recurringEventUpdateOptionSubmitBtn"
           >
@@ -773,7 +774,7 @@ function EventListCardModals({
         keyboard={false}
         centered
       >
-        <Modal.Header closeButton className="bg-primary">
+        <Modal.Header closeButton className={`${styles.modalHeader}`}>
           <Modal.Title
             className="text-white"
             id={`deleteEventModalLabel${eventListCardProps.id}`}
@@ -801,6 +802,7 @@ function EventListCardModals({
                       }
                       defaultChecked={option === recurringEventDeleteType}
                       data-testid={`delete-${option}`}
+                      className={styles.switch}
                     />
                   </div>
                 ))}
@@ -811,7 +813,7 @@ function EventListCardModals({
         <Modal.Footer>
           <Button
             type="button"
-            className="btn btn-danger"
+            className={`btn btn-danger ${styles.removeButton}`}
             data-dismiss="modal"
             onClick={toggleDeleteModal}
             data-testid="eventDeleteModalCloseBtn"
@@ -820,7 +822,7 @@ function EventListCardModals({
           </Button>
           <Button
             type="button"
-            className="btn btn-success"
+            className={`btn ${styles.addButton}`}
             onClick={deleteEventHandler}
             data-testid="deleteEventBtn"
           >
diff --git a/src/components/OrgPostCard/DeletePostModal.tsx b/src/components/OrgPostCard/DeletePostModal.tsx
index 67f301ba72..7ed025de50 100644
--- a/src/components/OrgPostCard/DeletePostModal.tsx
+++ b/src/components/OrgPostCard/DeletePostModal.tsx
@@ -1,6 +1,7 @@
 import React, { type FC } from 'react';
 import { Modal, Button } from 'react-bootstrap';
 import { useTranslation } from 'react-i18next';
+import styles from '../../style/app.module.css';
 
 /**
  * A modal component that confirms a post delete operation.
@@ -46,12 +47,13 @@ const DeletePostModal: FC<InterfaceDeletePostModalProps> = ({
           variant="danger"
           onClick={onHide}
           data-testid="deleteModalNoBtn"
+          className={styles.removeButton}
         >
           {tCommon('no')}
         </Button>
         <Button
           type="button"
-          className="btn btn-success"
+          className={`btn ${styles.addButton}`}
           onClick={handleConfirmDelete}
           data-testid="deletePostBtn"
         >
diff --git a/src/components/OrgPostCard/OrgPostCard.tsx b/src/components/OrgPostCard/OrgPostCard.tsx
index 5bc9ca1407..d0d8dc85ac 100644
--- a/src/components/OrgPostCard/OrgPostCard.tsx
+++ b/src/components/OrgPostCard/OrgPostCard.tsx
@@ -445,7 +445,7 @@ export default function OrgPostCard(
         centered
       >
         <Modal.Header
-          className="bg-primary"
+          className={styles.modalHeader}
           data-testid="modalOrganizationHeader"
           closeButton
         >
@@ -462,7 +462,7 @@ export default function OrgPostCard(
               onChange={handleInputEvent}
               data-testid="updateTitle"
               required
-              className="mb-3"
+              className={`mb-3 ${styles.inputField}`}
               placeholder={t('postTitle1')}
               autoComplete="off"
             />
@@ -470,7 +470,7 @@ export default function OrgPostCard(
             <Form.Control
               type="descrip"
               id="descrip"
-              className="mb-3"
+              className={`mb-3 ${styles.inputField}`}
               name="postinfo"
               value={postformState.postinfo}
               placeholder={t('information1')}
@@ -506,6 +506,7 @@ export default function OrgPostCard(
                       });
                     }
                   }}
+                  className={`mb-3 ${styles.inputField}`}
                 />
                 {postPhoto && (
                   <>
@@ -557,6 +558,7 @@ export default function OrgPostCard(
                       });
                     }
                   }}
+                  className={`mb-3 ${styles.inputField}`}
                 />
                 {postformState.postvideo && (
                   <div className={styles.previewOrgPostCard}>
@@ -578,14 +580,19 @@ export default function OrgPostCard(
           </Modal.Body>
           <Modal.Footer>
             <Button
-              variant="secondary"
+              className={styles.removeButton}
               onClick={toggleShowEditModal}
               data-testid="closeOrganizationModal"
               type="button"
             >
               {tCommon('close')}
             </Button>
-            <Button type="submit" value="invite" data-testid="updatePostBtn">
+            <Button
+              type="submit"
+              value="invite"
+              data-testid="updatePostBtn"
+              className={styles.addButton}
+            >
               {t('updatePost')}
             </Button>
           </Modal.Footer>
diff --git a/src/components/Venues/VenueCard.tsx b/src/components/Venues/VenueCard.tsx
index 43da734bd6..557a5c77e4 100644
--- a/src/components/Venues/VenueCard.tsx
+++ b/src/components/Venues/VenueCard.tsx
@@ -85,22 +85,22 @@ const VenueCard = ({
           <div className="d-flex justify-content-end gap-2 mb-2 me-3">
             {/* Edit button */}
             <Button
-              variant="outline-secondary"
               size="sm"
               onClick={() => {
                 showEditVenueModal(venueItem);
               }}
               data-testid={`updateVenueBtn${index + 1}`}
+              className={`btn ${styles.addButton}`}
             >
               <i className="fa fa-pen me-1"></i>
               <span>{tCommon('edit')}</span>
             </Button>
             {/* Delete button */}
             <Button
-              variant="outline-danger"
               size="sm"
               data-testid={`deleteVenueBtn${index + 1}`}
               onClick={() => handleDelete(venueItem._id)}
+              className={`btn btn-danger ${styles.removeButton}`}
             >
               <i className="fa fa-trash me-2"></i>
               <span>{tCommon('delete')}</span>
diff --git a/src/components/Venues/VenueModal.tsx b/src/components/Venues/VenueModal.tsx
index 73aa0e49c5..97ae66c78e 100644
--- a/src/components/Venues/VenueModal.tsx
+++ b/src/components/Venues/VenueModal.tsx
@@ -181,6 +181,7 @@ const VenueModal = ({
                 name: e.target.value,
               });
             }}
+            className={styles.inputField}
           />
           <label htmlFor="venuedescrip">{tCommon('description')}</label>
           <Form.Control
@@ -198,6 +199,7 @@ const VenueModal = ({
                 description: e.target.value,
               });
             }}
+            className={styles.inputField}
           />
           <label htmlFor="venuecapacity">{t('capacity')}</label>
           <Form.Control
@@ -213,6 +215,7 @@ const VenueModal = ({
                 capacity: e.target.value,
               });
             }}
+            className={styles.inputField}
           />
           <Form.Label htmlFor="venueImg">{t('image')}</Form.Label>
           <Form.Control
@@ -240,6 +243,7 @@ const VenueModal = ({
                 });
               }
             }}
+            className={styles.inputField}
           />
           {venueImage && (
             <div className={styles.previewVenueModal}>
diff --git a/src/screens/BlockUser/BlockUser.tsx b/src/screens/BlockUser/BlockUser.tsx
index b7bee8fbfa..3da2bf8b8e 100644
--- a/src/screens/BlockUser/BlockUser.tsx
+++ b/src/screens/BlockUser/BlockUser.tsx
@@ -185,13 +185,13 @@ const Requests = (): JSX.Element => {
     <>
       <div>
         {/* Buttons Container */}
-        <div className={styles.btnsContainerBlockAndUnblock}>
-          <div className={styles.inputContainerBlockAndUnblock}>
-            <div className={styles.inputBlockAndUnblock}>
+        <div className={styles.head}>
+          <div className={styles.btnsContainer}>
+            <div className={styles.input}>
               <Form.Control
                 type="name"
                 id="searchBlockedUsers"
-                className="bg-white"
+                className={styles.inputField}
                 placeholder={
                   searchByFirstName
                     ? t('searchByFirstName')
@@ -206,16 +206,16 @@ const Requests = (): JSX.Element => {
               />
               <Button
                 tabIndex={-1}
-                className={styles.search}
+                className={styles.searchButton}
                 onClick={handleSearchByBtnClick}
                 data-testid="searchBtn"
               >
                 <Search />
               </Button>
             </div>
-          </div>
-          <div className={styles.btnsBlockBlockAndUnblock}>
-            <div className={styles.largeBtnsWrapper}>
+            {/* <div className={styles.btnsBlockBlockAndUnblock}> */}
+            {/* <div className={styles.largeBtnsWrapper}> */}
+            <div className={styles.btnsBlock}>
               <SortingButton
                 title={t('sortOrganizations')}
                 sortingOptions={[
@@ -231,7 +231,9 @@ const Requests = (): JSX.Element => {
                 dataTestIdPrefix="userFilter"
                 className={`${styles.createButton} mt-2`}
               />
+            </div>
 
+            <div className={styles.btnsBlock}>
               <SortingButton
                 title={t('sortByName')}
                 sortingOptions={[
@@ -251,6 +253,8 @@ const Requests = (): JSX.Element => {
               />
             </div>
           </div>
+          {/* </div> */}
+          {/* </div> */}
         </div>
         {/* Table */}
         {loadingMembers === false &&
diff --git a/src/screens/OrgPost/OrgPost.tsx b/src/screens/OrgPost/OrgPost.tsx
index 8ccdb47692..5bf11f5aba 100644
--- a/src/screens/OrgPost/OrgPost.tsx
+++ b/src/screens/OrgPost/OrgPost.tsx
@@ -413,7 +413,7 @@ function orgPost(): JSX.Element {
             <Form.Control
               type="name"
               id="orgname"
-              className="mb-3"
+              className={`mb-3 ${styles.inputField}`}
               placeholder={t('postTitle1')}
               data-testid="modalTitle"
               autoComplete="off"
@@ -430,7 +430,7 @@ function orgPost(): JSX.Element {
             <Form.Control
               type="descrip"
               id="descrip"
-              className="mb-3"
+              className={`mb-3 ${styles.inputField}`}
               placeholder={t('information1')}
               data-testid="modalinfo"
               autoComplete="off"
@@ -455,6 +455,7 @@ function orgPost(): JSX.Element {
               multiple={false}
               onChange={handleAddMediaChange}
               data-testid="addMediaField"
+              className={`mb-3 ${styles.inputField}`}
             />
 
             {postformState.addMedia && file && (
@@ -506,13 +507,14 @@ function orgPost(): JSX.Element {
                   pinPost: !postformState.pinPost,
                 })
               }
+              className={styles.switch}
             />
           </Modal.Body>
 
           <Modal.Footer>
             <Button
               variant="secondary"
-              className={styles.closeButtonOrgPost}
+              className={styles.removeButton}
               onClick={(): void => hideInviteModal()}
               data-testid="closeOrganizationModal"
             >
@@ -522,7 +524,7 @@ function orgPost(): JSX.Element {
               type="submit"
               value="invite"
               data-testid="createPostBtn"
-              className={`${styles.addButtonOrgPost} mt-2`}
+              className={`${styles.addButton} mt-2`}
             >
               {t('addPost')}
             </Button>
diff --git a/src/screens/OrganizationActionItems/ItemUpdateStatusModal.tsx b/src/screens/OrganizationActionItems/ItemUpdateStatusModal.tsx
index 640fdde032..099a897435 100644
--- a/src/screens/OrganizationActionItems/ItemUpdateStatusModal.tsx
+++ b/src/screens/OrganizationActionItems/ItemUpdateStatusModal.tsx
@@ -113,17 +113,24 @@ const ItemUpdateStatusModal: FC<InterfaceItemUpdateStatusModalProps> = ({
 
           {isCompleted ? (
             <div className="d-flex gap-3 justify-content-end">
-              <Button type="submit" variant="primary" data-testid="yesBtn">
+              <Button
+                type="submit"
+                className={styles.addButton}
+                data-testid="yesBtn"
+              >
                 {tCommon('yes')}
               </Button>
-              <Button variant="secondary" onClick={hide}>
+              <Button
+                className={`btn btn-danger ${styles.removeButton}`}
+                onClick={hide}
+              >
                 {tCommon('no')}
               </Button>
             </div>
           ) : (
             <Button
               type="submit"
-              className={styles.addButton}
+              className={`${styles.addButton}`}
               data-testid="createBtn"
             >
               {t('markCompletion')}
diff --git a/src/screens/OrganizationEvents/OrganizationEvents.tsx b/src/screens/OrganizationEvents/OrganizationEvents.tsx
index 08c5576159..d07631b64e 100644
--- a/src/screens/OrganizationEvents/OrganizationEvents.tsx
+++ b/src/screens/OrganizationEvents/OrganizationEvents.tsx
@@ -302,6 +302,7 @@ function organizationEvents(): JSX.Element {
               autoComplete="off"
               required
               value={formState.title}
+              className={styles.inputField}
               onChange={(e): void => {
                 setFormState({
                   ...formState,
@@ -317,6 +318,7 @@ function organizationEvents(): JSX.Element {
               autoComplete="off"
               required
               value={formState.eventdescrip}
+              className={styles.inputField}
               onChange={(e): void => {
                 setFormState({
                   ...formState,
@@ -424,7 +426,7 @@ function organizationEvents(): JSX.Element {
               <div className={styles.dispflexOrganizationEvents}>
                 <label htmlFor="allday">{t('allDay')}?</label>
                 <Form.Switch
-                  className="me-4"
+                  className={`me-4 ${styles.switch}`}
                   id="allday"
                   type="checkbox"
                   checked={alldaychecked}
@@ -435,7 +437,7 @@ function organizationEvents(): JSX.Element {
               <div className={styles.dispflexOrganizationEvents}>
                 <label htmlFor="ispublic">{t('isPublic')}?</label>
                 <Form.Switch
-                  className="me-4"
+                  className={`me-4 ${styles.switch}`}
                   id="ispublic"
                   type="checkbox"
                   data-testid="ispublicCheck"
@@ -448,7 +450,7 @@ function organizationEvents(): JSX.Element {
               <div className={styles.dispflexOrganizationEvents}>
                 <label htmlFor="recurring">{t('recurringEvent')}?</label>
                 <Form.Switch
-                  className="me-4"
+                  className={`me-4 ${styles.switch}`}
                   id="recurring"
                   type="checkbox"
                   data-testid="recurringCheck"
@@ -461,7 +463,7 @@ function organizationEvents(): JSX.Element {
               <div className={styles.dispflexOrganizationEvents}>
                 <label htmlFor="registrable">{t('isRegistrable')}?</label>
                 <Form.Switch
-                  className="me-4"
+                  className={`me-4 ${styles.switch}`}
                   id="registrable"
                   type="checkbox"
                   data-testid="registrableCheck"
@@ -476,7 +478,7 @@ function organizationEvents(): JSX.Element {
               <div className={styles.dispflex}>
                 <label htmlFor="createChat">{t('createChat')}?</label>
                 <Form.Switch
-                  className="me-4"
+                  className={`me-4 ${styles.switch}`}
                   id="chat"
                   type="checkbox"
                   data-testid="createChat"
@@ -500,7 +502,7 @@ function organizationEvents(): JSX.Element {
 
             <Button
               type="submit"
-              className={styles.createButtonOrganizationEvents}
+              className={styles.addButton}
               value="createevent"
               data-testid="createEventBtn"
             >
diff --git a/src/screens/OrganizationFundCampaign/OrganizationFundCampagins.tsx b/src/screens/OrganizationFundCampaign/OrganizationFundCampagins.tsx
index 0550a25a5b..c4d85a0eef 100644
--- a/src/screens/OrganizationFundCampaign/OrganizationFundCampagins.tsx
+++ b/src/screens/OrganizationFundCampaign/OrganizationFundCampagins.tsx
@@ -360,41 +360,41 @@ const orgFundCampaign = (): JSX.Element => {
               <Search />
             </Button>
           </div>
-          <div className={styles.btnsBbtnsBlockOrganizationFundCampaignlock}>
-            <div className="d-flex justify-space-between">
-              <SortingButton
-                sortingOptions={[
-                  { label: t('lowestGoal'), value: 'fundingGoal_ASC' },
-                  { label: t('highestGoal'), value: 'fundingGoal_DESC' },
-                  { label: t('latestEndDate'), value: 'endDate_DESC' },
-                  { label: t('earliestEndDate'), value: 'endDate_ASC' },
-                ]}
-                onSortChange={(value) =>
-                  setSortBy(
-                    value as
-                      | 'fundingGoal_ASC'
-                      | 'fundingGoal_DESC'
-                      | 'endDate_ASC'
-                      | 'endDate_DESC',
-                  )
-                }
-                dataTestIdPrefix="filter"
-                buttonLabel={tCommon('sort')}
-              />
-            </div>
-            <div>
-              <Button
-                variant="success"
-                className={styles.dropdown}
-                onClick={() => handleOpenModal(null, 'create')}
-                data-testid="addCampaignBtn"
-                disabled={isArchived}
-              >
-                <i className={'fa fa-plus me-2'} />
-                {t('addCampaign')}
-              </Button>
-            </div>
+          {/* <div className={styles.btnsBbtnsBlockOrganizationFundCampaignlock}> */}
+          <div className={styles.btnsBlock}>
+            <SortingButton
+              sortingOptions={[
+                { label: t('lowestGoal'), value: 'fundingGoal_ASC' },
+                { label: t('highestGoal'), value: 'fundingGoal_DESC' },
+                { label: t('latestEndDate'), value: 'endDate_DESC' },
+                { label: t('earliestEndDate'), value: 'endDate_ASC' },
+              ]}
+              onSortChange={(value) =>
+                setSortBy(
+                  value as
+                    | 'fundingGoal_ASC'
+                    | 'fundingGoal_DESC'
+                    | 'endDate_ASC'
+                    | 'endDate_DESC',
+                )
+              }
+              dataTestIdPrefix="filter"
+              buttonLabel={tCommon('sort')}
+            />
+          </div>
+          <div className={styles.btnsBlock}>
+            <Button
+              variant="success"
+              className={styles.dropdown}
+              onClick={() => handleOpenModal(null, 'create')}
+              data-testid="addCampaignBtn"
+              disabled={isArchived}
+            >
+              <i className={'fa fa-plus me-2'} />
+              {t('addCampaign')}
+            </Button>
           </div>
+          {/* </div> */}
         </div>
       </Row>
 
diff --git a/src/style/app.module.css b/src/style/app.module.css
index 9c1a168a01..dfba774886 100644
--- a/src/style/app.module.css
+++ b/src/style/app.module.css
@@ -55,7 +55,7 @@
   --tablerow-bg: #eff1f7;
   --date-picker-bg: #f2f2f2;
   --table-bg-color: var(--grey-bg-color);
-  --tablerow-bg-color: var(--dropdown-hover-color);
+  --tablerow-bg-color: #ffffff;
   --row-background: var(--bs-white, var(--bs-white));
   --modal-background: rgba(0, 0, 0, 0.7);
 
@@ -91,17 +91,16 @@
   --bs-gray-400: #9ca3af;
   --bs-gray-300: #d1d5db;
   --toggle-button-bg: #1e4e8c;
-
-  --table-head-bg: var(--blue-subtle, var(--blue-color));
+  --table-head-bg: #eaebef;
   --table-head-color: var(--bs-white, var(--white-color));
-
-  --table-header-color: var(--bs-white, var(--bs-gray-300));
+  --table-header-color: #000000;
   --input-area-color: #f1f3f6;
   --date-picker-background: #f2f2f2;
   --grey-bg-color-dark: #707070;
   --dropdown-border-color: #cccccc;
   --primary-border-solid: 1px solid var(--dropdown-border-color);
-  --bg-blue: #a8c7fa;
+  --light-blue: #a8c7fa;
+  --dark-blue: #1778f2;
   --card-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
 
   /* breakpoints */
@@ -196,7 +195,7 @@
   font-size: 20px;
   margin-bottom: 30px;
   padding-bottom: 5px;
-  border-bottom: 3px solid var(--bg-blue);
+  border-bottom: 3px solid var(--light-blue);
   width: 15%;
 }
 
@@ -206,7 +205,7 @@
   font-size: 18px;
   margin-bottom: 20px;
   padding-bottom: 5px;
-  border-bottom: 3px solid var(--bg-blue);
+  border-bottom: 3px solid var(--light-blue);
   width: 60%;
 }
 
@@ -442,11 +441,11 @@
   margin-top: 10px;
   margin-bottom: 10px;
   background-color: var(--bs-white);
-  /* box-shadow: 0 1px 1px var(--input-shadow-color); */
+  box-shadow: 0 1px 1px var(--input-shadow-color);
 }
 
 .inputField:focus {
-  box-shadow: 0 0 0 0.25rem var(--search-button-bg);
+  box-shadow: 0 0 0 0.25rem var(--light-blue);
 }
 
 .inputFieldModal {
@@ -486,17 +485,12 @@
 
 .addButton {
   margin-bottom: 10px;
-  background-color: var(--search-button-bg);
+  background-color: var(--light-blue);
   border-color: var(--grey-bg-color);
 }
 
-.addButton:is(:hover, :active, :focus) {
-  background-color: #286fe0 !important;
-  border-color: var(--search-button-border);
-}
-
-.addButton:not(:hover, :active, :focus) {
-  background-color: #286fe0 !important;
+.addButton:is(:hover, :active) {
+  background-color: var(--dark-blue) !important;
   border-color: var(--search-button-border);
 }
 
@@ -605,21 +599,18 @@
 }
 
 .editButton {
-  background-color: var(--bs-primary);
-  color: var(--bs-white);
+  background-color: var(--light-blue);
+  color: var(--brown-color);
   border-color: var(--grey-bg-color);
+  --bs-btn-active-bg: var(--dark-blue);
+  --bs-btn-active-border-color: var(--grey-bg-color);
 }
 
-.editButton:hover {
-  background-color: var(--subtle-blue-grey);
+.editButton:is(:hover, :active) {
+  background-color: var(--dark-blue);
   border-color: var(--search-button-border);
 }
 
-.editButton:focus,
-.editButton:active {
-  background-color: var(--bs-primary) !important;
-}
-
 .errorContainer {
   min-height: 100vh;
 }
@@ -778,13 +769,14 @@ hr {
 }
 
 .switch input {
-  box-shadow: 0 0 0.1rem 0.2rem var(--bg-blue);
+  /* box-shadow: 0 0 0.1rem 0.2rem var(--light-blue); */
+  --bs-form-switch-bg: transparent;
 }
 
 .switch input:checked {
-  background-color: #286fe0;
-  border: var(--bs-primary);
-  box-shadow: 0 0 0.1rem 0.2rem var(--bg-blue);
+  background-color: var(--dark-blue);
+  border-color: var(--dark-blue);
+  box-shadow: 0 0 0.1rem 0.2rem var(--light-blue);
 }
 
 .pageNotFound {
@@ -811,7 +803,7 @@ hr {
 .pageNotFound h1.head {
   font-size: 250px;
   font-weight: 900;
-  color: var(--bg-blue);
+  color: var(--light-blue);
   letter-spacing: 25px;
   margin: 10px 0 0 0;
 }
@@ -892,7 +884,7 @@ hr {
 
 .inputFieldPledge {
   background-color: var(--bs-white);
-  box-shadow: 0 1px 1px var(--bg-blue);
+  box-shadow: 0 1px 1px var(--light-blue);
 }
 
 .dropdownPledge {
@@ -1072,7 +1064,7 @@ hr {
 }
 
 .toggleBtnPledge:is(:hover) + label {
-  color: var(--bg-blue) !important;
+  color: var(--light-blue) !important;
 }
 
 .card {
@@ -1323,7 +1315,7 @@ hr {
 }
 
 .customcell {
-  background-color: var(--bg-blue) !important;
+  background-color: var(--light-blue) !important;
   color: var(--bs-white) !important;
   font-size: medium !important;
   font-weight: 500 !important;
@@ -1349,7 +1341,7 @@ hr {
 }
 
 .table-body > .table-row:nth-child(2n) {
-  background: var(--bg-blue) !important;
+  background: var(--light-blue) !important;
 }
 
 .organizationFundCampaignContainer {
@@ -1716,8 +1708,13 @@ hr {
 .modalHeader {
   border: none;
   padding-bottom: 0;
-  background-color: var(--bs-primary) !important;
+  background-color: var(--white-color) !important;
   padding: 1rem 1rem;
+  color: #000000;
+}
+
+.modalHeader div {
+  color: #000000 !important;
 }
 
 .label {
@@ -1814,7 +1811,7 @@ hr {
 }
 
 .toggleBtn:hover {
-  color: var(--bg-blue) !important;
+  color: var(--light-blue) !important;
 }
 
 input[type='radio']:checked + label {
@@ -1941,12 +1938,19 @@ input[type='radio']:checked + label:hover {
 
 .active {
   background-color: var(--status-active-bg);
+  color: var(--light-blue) !important;
+  border-color: var(--light-blue) !important;
 }
 
 .pending {
   background-color: var(--status-pending-bg);
-  color: var(--status-pending-text);
-  border-color: var(--status-pending-border);
+  color: var(--light-blue) !important;
+  border-color: var(--light-blue) !important;
+}
+
+.checkboxButton input:checked {
+  background-color: var(--dark-blue);
+  border-color: var(--dark-blue);
 }
 
 /* Modals */
@@ -2027,7 +2031,7 @@ input[type='radio']:checked + label:hover {
   border: 0.5px solid var(--brown-color);
 }
 .searchButtonOrgList {
-  background-color: var(--bg-blue);
+  background-color: var(--light-blue);
   position: absolute;
   z-index: 10;
   bottom: 0;
@@ -3565,7 +3569,7 @@ button[data-testid='createPostBtn'] {
     display: flex !important;
     align-items: center;
     background-color: transparent;
-    color: var(--bg-blue);
+    color: var(--light-blue);
   }
 
   .entryaction .spinner-grow {
@@ -3575,6 +3579,86 @@ button[data-testid='createPostBtn'] {
   }
 }
 
+.entrytoggle {
+  margin: 24px 24px 0 auto;
+  width: fit-content;
+}
+
+.entryaction {
+  display: flex !important;
+}
+
+.entryaction i {
+  margin-right: 8px;
+  margin-top: 4px;
+}
+
+.entryaction .spinner-grow {
+  height: 1rem;
+  width: 1rem;
+  margin-right: 8px;
+}
+
+.admedia {
+  object-fit: cover;
+  height: 16rem;
+}
+
+.buttons {
+  display: flex;
+  justify-content: flex-end;
+}
+
+.addCard {
+  width: 28rem;
+}
+
+.dropdownButton {
+  background-color: transparent;
+  color: #000;
+  border: none;
+  cursor: pointer;
+  display: flex;
+  width: 100%;
+  justify-content: flex-end;
+  padding: 8px 10px;
+}
+
+.dropdownContainer {
+  position: relative;
+  display: inline-block;
+}
+
+.dropdownmenu {
+  display: none;
+  position: absolute;
+  z-index: 1;
+  background-color: white;
+  width: 120px;
+  box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2);
+  padding: 5px 0;
+  margin: 0;
+  list-style-type: none;
+  right: 0;
+  top: 100%;
+}
+
+.dropdownmenu li {
+  cursor: pointer;
+  padding: 8px 16px;
+  text-decoration: none;
+  display: block;
+  color: #333;
+}
+
+.dropdownmenu li:hover {
+  background-color: #f1f1f1;
+}
+
+.dropdownContainer:hover .dropdownmenu {
+  display: block;
+}
+
 .leftDrawer {
   width: calc(300px + 2rem);
   position: fixed;

From 43c922070425c61799b50c1545031ffd61c0a9a3 Mon Sep 17 00:00:00 2001
From: rahul <chouguler310@gmail.com>
Date: Sun, 12 Jan 2025 01:10:24 +0530
Subject: [PATCH 6/7] fixed code coverage test

---
 .../AddPeopleToTag/AddPeopleToTag.tsx         | 11 +++---
 src/components/EventCalendar/EventHeader.tsx  |  2 +-
 src/components/TagActions/TagActions.tsx      | 10 +++---
 src/components/TagActions/TagNode.tsx         |  6 ++--
 .../FundCampaignPledge/FundCampaignPledge.tsx | 10 ++----
 .../FundCampaignPledge/PledgeModal.tsx        | 34 +++++++------------
 src/screens/ManageTag/ManageTag.tsx           | 29 ++++++----------
 src/screens/OrgPost/OrgPost.tsx               |  3 +-
 .../CampaignModal.tsx                         | 17 ++++------
 src/screens/OrganizationFunds/FundModal.tsx   |  1 -
 .../OrganizationTags/OrganizationTags.tsx     |  8 ++---
 src/screens/SubTags/SubTags.tsx               | 24 +++++--------
 12 files changed, 57 insertions(+), 98 deletions(-)

diff --git a/src/components/AddPeopleToTag/AddPeopleToTag.tsx b/src/components/AddPeopleToTag/AddPeopleToTag.tsx
index 450051794c..29eeb4a56c 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);
@@ -348,8 +348,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"
@@ -360,7 +359,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/EventCalendar/EventHeader.tsx b/src/components/EventCalendar/EventHeader.tsx
index 1acbb8acfa..6fe1814969 100644
--- a/src/components/EventCalendar/EventHeader.tsx
+++ b/src/components/EventCalendar/EventHeader.tsx
@@ -52,7 +52,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/TagActions/TagActions.tsx b/src/components/TagActions/TagActions.tsx
index f7ffef8d38..f237c70212 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 05e3564a9b..22173e7834 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);
@@ -173,7 +172,6 @@ const TagNode: React.FC<InterfaceTagNodeProps> = ({
               next={loadMoreSubTags}
               hasMore={
                 subTagsData?.getChildTags.childTags.pageInfo.hasNextPage ??
-                /* istanbul ignore next */
                 false
               }
               loader={<InfiniteScrollLoader />}
diff --git a/src/screens/FundCampaignPledge/FundCampaignPledge.tsx b/src/screens/FundCampaignPledge/FundCampaignPledge.tsx
index c28082341d..68ecfeaced 100644
--- a/src/screens/FundCampaignPledge/FundCampaignPledge.tsx
+++ b/src/screens/FundCampaignPledge/FundCampaignPledge.tsx
@@ -392,10 +392,7 @@ const fundCampaignPledge = (): JSX.Element => {
           underline="hover"
           color="inherit"
           component="button"
-          onClick={
-            /* istanbul ignore next */
-            () => history.go(-2)
-          }
+          onClick={() => history.go(-2)}
         >
           {fundName}
         </Link>
@@ -403,10 +400,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 2c2212ddde..a93d2c8f1d 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.tsx b/src/screens/ManageTag/ManageTag.tsx
index cfd6229c16..43af7c346d 100644
--- a/src/screens/ManageTag/ManageTag.tsx
+++ b/src/screens/ManageTag/ManageTag.tsx
@@ -131,7 +131,6 @@ function ManageTag(): JSX.Element {
           };
         },
       ) => {
-        /* istanbul ignore next -- @preserve */
         if (!fetchMoreResult) return prevResult;
 
         return {
@@ -174,7 +173,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);
       }
@@ -216,7 +214,6 @@ function ManageTag(): JSX.Element {
         setEditUserTagModalIsOpen(false);
       }
     } catch (error: unknown) {
-      /* istanbul ignore next -- @preserve */
       if (error instanceof Error) {
         toast.error(error.message);
       }
@@ -236,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);
       }
@@ -259,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
@@ -438,7 +434,6 @@ function ManageTag(): JSX.Element {
                     >
                       {tag.name}
                       {orgUserTagAncestors.length - 1 !== index && (
-                        /* istanbul ignore next -- @preserve */
                         <i className={'mx-2 fa fa-caret-right'} />
                       )}
                     </div>
@@ -454,8 +449,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"
@@ -466,16 +460,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/OrgPost/OrgPost.tsx b/src/screens/OrgPost/OrgPost.tsx
index 5bf11f5aba..62a58f0e1a 100644
--- a/src/screens/OrgPost/OrgPost.tsx
+++ b/src/screens/OrgPost/OrgPost.tsx
@@ -167,7 +167,6 @@ function orgPost(): JSX.Element {
         },
       });
 
-      /* istanbul ignore next */
       if (data) {
         toast.success(t('postCreatedSuccess') as string);
         refetch();
@@ -273,7 +272,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/OrganizationFundCampaign/CampaignModal.tsx b/src/screens/OrganizationFundCampaign/CampaignModal.tsx
index f0b944bd2b..a57c6e707a 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 42806f7a30..ab02902c2f 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/OrganizationTags/OrganizationTags.tsx b/src/screens/OrganizationTags/OrganizationTags.tsx
index 83ff0c019a..39a2a26032 100644
--- a/src/screens/OrganizationTags/OrganizationTags.tsx
+++ b/src/screens/OrganizationTags/OrganizationTags.tsx
@@ -82,7 +82,6 @@ function OrganizationTags(): JSX.Element {
         first: TAGS_QUERY_DATA_CHUNK_SIZE,
         after:
           orgUserTagsData?.organizations?.[0]?.userTags?.pageInfo?.endCursor ??
-          /* istanbul ignore next */
           null,
       },
       updateQuery: (
@@ -95,7 +94,7 @@ function OrganizationTags(): JSX.Element {
           };
         },
       ) => {
-        if (!fetchMoreResult) /* istanbul ignore next */ return prevResult;
+        if (!fetchMoreResult) return prevResult;
 
         return {
           organizations: [
@@ -146,7 +145,6 @@ function OrganizationTags(): JSX.Element {
         setCreateTagModalIsOpen(false);
       }
     } catch (error: unknown) {
-      /* istanbul ignore next */
       if (error instanceof Error) {
         toast.error(error.message);
       }
@@ -366,7 +364,7 @@ function OrganizationTags(): JSX.Element {
                   next={loadMoreUserTags}
                   hasMore={
                     orgUserTagsData?.organizations?.[0]?.userTags?.pageInfo
-                      ?.hasNextPage ?? /* istanbul ignore next */ false
+                      ?.hasNextPage ?? false
                   }
                   loader={<InfiniteScrollLoader />}
                   scrollableTarget="orgUserTagsScrollableDiv"
@@ -377,7 +375,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/SubTags/SubTags.tsx b/src/screens/SubTags/SubTags.tsx
index 17cea1008a..cb2f7ba053 100644
--- a/src/screens/SubTags/SubTags.tsx
+++ b/src/screens/SubTags/SubTags.tsx
@@ -92,7 +92,6 @@ function SubTags(): JSX.Element {
           fetchMoreResult?: { getChildTags: InterfaceQueryUserTagChildTags };
         },
       ) => {
-        /* istanbul ignore next -- @preserve */
         if (!fetchMoreResult) return prevResult;
 
         return {
@@ -126,7 +125,6 @@ function SubTags(): JSX.Element {
         },
       });
 
-      /* istanbul ignore next -- @preserve */
       if (data) {
         toast.success(t('tagCreationSuccess') as string);
         subTagsRefetch();
@@ -134,7 +132,6 @@ function SubTags(): JSX.Element {
         setAddSubTagModalIsOpen(false);
       }
     } catch (error: unknown) {
-      /* istanbul ignore next -- @preserve */
       if (error instanceof Error) {
         toast.error(error.message);
       }
@@ -155,7 +152,6 @@ function SubTags(): JSX.Element {
   }
 
   const subTagsList =
-    /* istanbul ignore next -- @preserve */
     subTagsData?.getChildTags.childTags.edges.map((edge) => edge.node) ?? [];
 
   const parentTagName = subTagsData?.getChildTags.name;
@@ -373,7 +369,6 @@ function SubTags(): JSX.Element {
                   next={loadMoreSubTags}
                   hasMore={
                     subTagsData?.getChildTags.childTags.pageInfo.hasNextPage ??
-                    /* istanbul ignore next -- @preserve */
                     false
                   }
                   loader={<InfiniteScrollLoader />}
@@ -385,16 +380,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}`}

From b5e6d4fc847c6e44d7cd38348887ba727611b733 Mon Sep 17 00:00:00 2001
From: rahul <chouguler310@gmail.com>
Date: Sun, 12 Jan 2025 01:19:02 +0530
Subject: [PATCH 7/7] fixed code coverage test

---
 src/screens/ManageTag/ManageTag.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/screens/ManageTag/ManageTag.tsx b/src/screens/ManageTag/ManageTag.tsx
index 43af7c346d..b0748a9bf3 100644
--- a/src/screens/ManageTag/ManageTag.tsx
+++ b/src/screens/ManageTag/ManageTag.tsx
@@ -207,7 +207,6 @@ function ManageTag(): JSX.Element {
         },
       });
 
-      /* istanbul ignore else -- @preserve */
       if (data) {
         toast.success(t('tagUpdationSuccess'));
         userTagAssignedMembersRefetch();