From 582ed85389b1acd34dfe3beb3c597cd85a654024 Mon Sep 17 00:00:00 2001
From: Rudra <rudra21ultra@gmail.com>
Date: Mon, 15 Jul 2024 13:17:43 +0530
Subject: [PATCH 1/2] ui bugs

---
 .../src/GlobalDatasources/GlobalDataSourcesPage/index.jsx | 8 +++++++-
 .../ManageGroupPermissionResourcesV2/ChangeRoleModal.jsx  | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/frontend/src/GlobalDatasources/GlobalDataSourcesPage/index.jsx b/frontend/src/GlobalDatasources/GlobalDataSourcesPage/index.jsx
index eee3adcd2c..7553b93926 100644
--- a/frontend/src/GlobalDatasources/GlobalDataSourcesPage/index.jsx
+++ b/frontend/src/GlobalDatasources/GlobalDataSourcesPage/index.jsx
@@ -305,7 +305,13 @@ export const GlobalDataSourcesPage = ({ darkMode = false, updateSelectedDatasour
         onClick={() => createDataSource(item)}
         data-cy={`${item.title.toLowerCase().replace(/\s+/g, '-')}-add-button`}
       >
-        <SolidIcon name="plus" fill={darkMode ? '#3E63DD' : '#3E63DD'} width={18} viewBox="0 0 25 25" />
+        <SolidIcon
+          name="plus"
+          fill={darkMode ? '#3E63DD' : '#3E63DD'}
+          width={18}
+          viewBox="0 0 25 25"
+          style={{ marginTop: '7px' }}
+        />
         <span className="ml-2">Add</span>
       </ButtonSolid>
     );
diff --git a/frontend/src/ManageGroupPermissionResourcesV2/ChangeRoleModal.jsx b/frontend/src/ManageGroupPermissionResourcesV2/ChangeRoleModal.jsx
index 29da3bf6e7..6e67ddfaef 100644
--- a/frontend/src/ManageGroupPermissionResourcesV2/ChangeRoleModal.jsx
+++ b/frontend/src/ManageGroupPermissionResourcesV2/ChangeRoleModal.jsx
@@ -50,7 +50,7 @@ function ChangeRoleModal({
     <ModalBase
       title={renderUserChangeTitle(autoRoleChangeMessageType)}
       handleConfirm={handleConfirmation}
-      confirmBtnProps={{ title: 'Continue' }}
+      confirmBtnProps={{ title: 'Continue', tooltipMessage: false }}
       show={showAutoRoleChangeModal}
       handleClose={handleAutoRoleChangeModalClose}
       darkMode={darkMode}

From e98dfe9c88bb167724d6d896d520b133e7ca28d1 Mon Sep 17 00:00:00 2001
From: Rudra <rudra21ultra@gmail.com>
Date: Mon, 15 Jul 2024 16:59:40 +0530
Subject: [PATCH 2/2] plus svg fix

---
 .../src/GlobalDatasources/GlobalDataSourcesPage/index.jsx | 8 +-------
 frontend/src/_ui/Icon/solidIcons/Plus.jsx                 | 4 ++--
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/frontend/src/GlobalDatasources/GlobalDataSourcesPage/index.jsx b/frontend/src/GlobalDatasources/GlobalDataSourcesPage/index.jsx
index 7553b93926..eee3adcd2c 100644
--- a/frontend/src/GlobalDatasources/GlobalDataSourcesPage/index.jsx
+++ b/frontend/src/GlobalDatasources/GlobalDataSourcesPage/index.jsx
@@ -305,13 +305,7 @@ export const GlobalDataSourcesPage = ({ darkMode = false, updateSelectedDatasour
         onClick={() => createDataSource(item)}
         data-cy={`${item.title.toLowerCase().replace(/\s+/g, '-')}-add-button`}
       >
-        <SolidIcon
-          name="plus"
-          fill={darkMode ? '#3E63DD' : '#3E63DD'}
-          width={18}
-          viewBox="0 0 25 25"
-          style={{ marginTop: '7px' }}
-        />
+        <SolidIcon name="plus" fill={darkMode ? '#3E63DD' : '#3E63DD'} width={18} viewBox="0 0 25 25" />
         <span className="ml-2">Add</span>
       </ButtonSolid>
     );
diff --git a/frontend/src/_ui/Icon/solidIcons/Plus.jsx b/frontend/src/_ui/Icon/solidIcons/Plus.jsx
index acdcf3e31f..25d506d2a3 100644
--- a/frontend/src/_ui/Icon/solidIcons/Plus.jsx
+++ b/frontend/src/_ui/Icon/solidIcons/Plus.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-const Plus = ({ fill = '#C1C8CD', width = '14', className = '', viewBox = '0 0 14 14', style, dataCy }) => (
+const Plus = ({ fill = '#C1C8CD', width = '25', className = '', viewBox = '0 0 25 25', dataCy = '', style }) => (
   <svg
     width={width}
     height={width}
@@ -14,7 +14,7 @@ const Plus = ({ fill = '#C1C8CD', width = '14', className = '', viewBox = '0 0 1
     <path
       fillRule="evenodd"
       clipRule="evenodd"
-      d="M7.83335 2C7.83335 1.53976 7.46025 1.16667 7.00002 1.16667C6.53979 1.16667 6.16669 1.53976 6.16669 2V6.16667H2.00002C1.53978 6.16667 1.16669 6.53977 1.16669 7C1.16669 7.46023 1.53978 7.83333 2.00002 7.83333H6.16669V12C6.16669 12.4602 6.53979 12.8333 7.00002 12.8333C7.46025 12.8333 7.83335 12.4602 7.83335 12V7.83333H12C12.4603 7.83333 12.8334 7.46023 12.8334 7C12.8334 6.53977 12.4603 6.16667 12 6.16667H7.83335V2Z"
+      d="M12 5C12.5523 5 13 5.44772 13 6V12H19C19.5523 12 20 12.4477 20 13C20 13.5523 19.5523 14 19 14H13V20C13 20.5523 12.5523 21 12 21C11.4477 21 11 20.5523 11 20V14H5C4.44772 14 4 13.5523 4 13C4 12.4477 4.44772 12 5 12H11V6C11 5.44772 11.4477 5 12 5Z"
       fill={fill}
     />
   </svg>