Merge pull request #631 from precision-sustainable-ag/fix/confusing_l…

…abels Changed confusing labels #625
precision-sustainable-ag · Jun 17, 2024 · de9e7e9 · de9e7e9
2 parents 2a6a5ae + 1a8e86d
commit de9e7e9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/src/components/Legend/Legend.js b/src/components/Legend/Legend.js
@@ -1,6 +1,6 @@
 /*
   This file contains the CropLegendModal and it's styles
-  The CropLegendModal shows the color legend for the calendar view
+  The CropLegendModal shows the color legend for the calendar view (crop calendar)
 */
 
 import {

diff --git a/src/pages/CropSidebar/CropSidebar.js b/src/pages/CropSidebar/CropSidebar.js
@@ -1,7 +1,7 @@
 /* eslint-disable no-underscore-dangle */
 /*
   This file contains the CropSidebar and its styles
-  The CropSidebar is the sidebar which contains the filtering and calendar view components
+  The CropSidebar is the sidebar which contains the filtering and calendar view (crop calendar) components
 */
 
 import {
@@ -306,7 +306,7 @@ const CropSidebar = ({
           style={{ background: !comparisonView ? '#49a8ab' : '#e3f2f4' }}
           startIcon={<ListIcon style={{ fontSize: 'larger' }} />}
         >
-          LIST VIEW
+          CROP LIST
         </LightButton>
         <LightButton
           onClick={() => setComparisonView(true)}
@@ -335,15 +335,15 @@ const CropSidebar = ({
               style={{ background: !listView ? '#49a8ab' : '#e3f2f4' }}
               startIcon={<ListIcon style={{ fontSize: 'larger' }} />}
             >
-              LIST VIEW
+              CROP LIST
             </LightButton>
             <LightButton
               onClick={() => setListView(true)}
               color="secondary"
               style={{ background: listView ? '#49a8ab' : '#e3f2f4' }}
               startIcon={<CalendarToday style={{ fontSize: 'larger' }} />}
             >
-              CALENDAR VIEW
+              CROP CALENDAR
             </LightButton>
           </>
         )}

diff --git a/src/pages/Header/ToggleOptions/ToggleOptions.js b/src/pages/Header/ToggleOptions/ToggleOptions.js
@@ -96,7 +96,7 @@ const ToggleOptions = ({ pathname }) => {
             onClick={setMyCoverCropActivationFlag}
           >
             <Typography variant="body2" sx={{ fontWeight: 'bold' }}>
-              VIEW MY LIST
+              MY SELECTED CROPS
             </Typography>
           </Button>
         </Badge>

diff --git a/src/shared/ProgressButtonsInner.js b/src/shared/ProgressButtonsInner.js
@@ -44,7 +44,7 @@ const ProgressButtonsInner = ({
           maxHeight: '35px',
           minWidth: '70px',
           fontSize: '13px',
-          marginLeft: progressRedux === 4 ? '-25px' : '0px',
+          marginLeft: progressRedux === 4 ? '-75px' : '0px',
         }}
         onClick={() => changeProgress('decrement')}
         disabled={isDisabledBack}
@@ -80,14 +80,14 @@ const ProgressButtonsInner = ({
             style={{
               maxWidth: '90px',
               maxHeight: '35px',
-              minWidth: progressRedux === 4 ? '130px' : '70px',
+              minWidth: progressRedux === 4 ? 'max-content' : '70px',
               fontSize: '13px',
               marginLeft: '3%',
             }}
             onClick={() => (progressRedux === 4 ? setMyCoverCropActivationFlag() : changeProgress('increment'))}
             disabled={isDisabledNext || (progressRedux === 4 && selectedCropIdsRedux.length === 0)}
           >
-            {progressRedux === 4 ? 'VIEW MY LIST' : 'NEXT'}
+            {progressRedux === 4 ? 'MY SELECTED CROPS' : 'NEXT'}
           </LightButton>
         </Badge>
       )}