Issue #PS-657 fix:ALL screen UI matach with figma

tekdi · Jun 2, 2024 · f97c17f · f97c17f
2 parents 8577ca1 + 87521cf
commit f97c17f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/components/DateRangePopup.tsx b/src/components/DateRangePopup.tsx
@@ -82,6 +82,9 @@ const DateRangePopup: React.FC<CustomSelectModalProps> = ({
     if (index === 4) {
       toggleCalendarModal();
     }
+    if (index === 4) {
+      toggleCalendarModal();
+    }
   };
 
   const onApply = () => {
@@ -91,6 +94,7 @@ const DateRangePopup: React.FC<CustomSelectModalProps> = ({
     console.log(toDate, fromDate);
     onDateRangeSelected({ fromDate, toDate });
     toggleModal();
+    toggleModal();
   };
 
   const getDateRange = (index: number | null) => {
@@ -147,6 +151,7 @@ const DateRangePopup: React.FC<CustomSelectModalProps> = ({
       toDate,
     };
   };
+
   const handleCalendarDateChange = (date: Date | [Date, Date] | null) => {
     if (Array.isArray(date)) {
       setDateRangeArray(date);

diff --git a/src/components/LearnerAttendanceStatsListView.tsx b/src/components/LearnerAttendanceStatsListView.tsx
@@ -125,7 +125,7 @@ const StudentsStatsList: React.FC<StudentsStatsListProps> = ({
       <Stack>
         <Box
           height="60px"
-          borderTop={`1px solid  #D0C5B4`}
+          borderTop={`1px solid  ${theme.palette.warning['A100']}`}
           margin="0px"
           alignItems={'center'}
           // padding="1rem"

diff --git a/src/components/LearnerListHeader.tsx b/src/components/LearnerListHeader.tsx
@@ -17,7 +17,7 @@ const LearnerListHeader: React.FC<LearListHeaderProps> = ({
     <Stack>
       {numberOfColumns == 3 ? (
         <Box
-          borderBottom={`1px solid #D0C5B4`}
+          borderBottom={`1px solid ${theme.palette.warning['A100']}`}
           margin="0"
           alignItems={'center'}
           bgcolor={'#E6E6E6'}
@@ -56,7 +56,7 @@ const LearnerListHeader: React.FC<LearListHeaderProps> = ({
         </Box>
       ) : (
         <Box
-          borderBottom={`1px solid #E6E6E6`}
+          borderBottom={`1px solid ${theme.palette.warning['A100']}`}
           margin="0"
           alignItems={'center'}
           bgcolor={'#E6E6E6'}