From 0ec52c9d82a1fb9ec056c973b1d0f52dad01e423 Mon Sep 17 00:00:00 2001
From: sachinkadam <sachinkadamsk01@gmail.com>
Date: Mon, 22 Jul 2024 22:38:22 +0530
Subject: [PATCH 1/2] #1181 | Fix UI for offline dashboard view

---
 src/formDesigner/components/Dashboard/CreateEditDashboard.js | 1 +
 src/formDesigner/components/Dashboard/SelectCardsView.js     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/formDesigner/components/Dashboard/CreateEditDashboard.js b/src/formDesigner/components/Dashboard/CreateEditDashboard.js
index 820aba7ac..f54a5fe72 100644
--- a/src/formDesigner/components/Dashboard/CreateEditDashboard.js
+++ b/src/formDesigner/components/Dashboard/CreateEditDashboard.js
@@ -122,6 +122,7 @@ const CreateEditDashboard = ({ edit, history, operationalModules, getOperational
         {getErrorByKey(error, "EMPTY_NAME")}
         <p />
         <AvniTextField
+          style={{ width: "12em" }}
           multiline
           id="description"
           label="Dashboard Description"
diff --git a/src/formDesigner/components/Dashboard/SelectCardsView.js b/src/formDesigner/components/Dashboard/SelectCardsView.js
index dcfda8711..cb073ff5f 100644
--- a/src/formDesigner/components/Dashboard/SelectCardsView.js
+++ b/src/formDesigner/components/Dashboard/SelectCardsView.js
@@ -29,7 +29,7 @@ export const SelectCardsView = ({ dashboardSection, addCards }) => {
   return (
     <div>
       <Grid container spacing={2}>
-        <Grid item xs={10}>
+        <Grid item xs={10} style={{ zIndex: 2 }}>
           <Select
             name="addCard"
             ref={cardSelectRef}

From 4d5c6afbb52419eba66e6f76cda9c5ae160a34a7 Mon Sep 17 00:00:00 2001
From: sachinkadam <sachinkadamsk01@gmail.com>
Date: Mon, 22 Jul 2024 23:51:22 +0530
Subject: [PATCH 2/2] #1280 | In show mode display the name of the sync setting
 in users show page

---
 src/adminApp/user.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/adminApp/user.js b/src/adminApp/user.js
index e350bf2cf..91d7bc079 100644
--- a/src/adminApp/user.js
+++ b/src/adminApp/user.js
@@ -171,11 +171,12 @@ const SubjectTypeSyncAttributeShow = ({ subjectType, syncConceptValueMap, ...pro
 const ConceptSyncAttributeShow = ({ subjectType, syncConceptValueMap, syncAttributeName, ...props }) => {
   const syncSettings = get(props.record, ["syncSettings", subjectType.name], {});
   const conceptUUID = get(syncSettings, [syncAttributeName]);
+  const syncConceptName = subjectType[syncAttributeName].name;
   if (isEmpty(conceptUUID)) return null;
 
   return (
     <div>
-      <span style={{ color: "rgba(0, 0, 0, 0.54)", fontSize: "12px", marginRight: 10 }}>{startCase(syncAttributeName)}</span>
+      <span style={{ color: "rgba(0, 0, 0, 0.54)", fontSize: "12px", marginRight: 10 }}>{startCase(syncConceptName)}</span>
       {map(get(syncSettings, `${syncAttributeName}Values`, []), value => (
         <Chip style={{ margin: "0.2em" }} label={syncConceptValueMap.get(value) || value} key={value} />
       ))}