Merge branch 'dev' into fix-APP-477-color-design-tweaks

web-components/src/components/organisms/ProjectFilters/ProjectFilters.tsx

@@ -1,12 +1,5 @@
 import { useState } from 'react';
-import {
-  Box,
-  ButtonBase,
-  Collapse,
-  Divider,
-  useMediaQuery,
-  useTheme,
-} from '@mui/material';
+import { Box, ButtonBase, Collapse, Divider } from '@mui/material';
 
 import TagFilter from './ProjectFilter.TagFilter';
 import CheckboxFilter from './ProjectFilters.CheckboxFilter';
@@ -46,8 +39,6 @@ export default function ProjectFilters({
   labels: ProjectFilterLabels;
   showResetButton?: boolean;
 }) {
-  const theme = useTheme();
-  const isXs = useMediaQuery(theme.breakpoints.down('sm'));
   const [isExpanded, setIsExpanded] = useState<Record<number, boolean>>({});
   const handleExpand = (index: number) => {
     setIsExpanded({ ...isExpanded, [index]: !isExpanded[index] });
@@ -77,7 +68,7 @@ export default function ProjectFilters({
                 // always show expanded for filter without hasCollapse
                 !filter.hasCollapse || (filter.hasCollapse && isExpanded[index])
               }
-              collapsedSize={isXs ? 110 : 110}
+              collapsedSize={filter.hasCollapse ? 110 : undefined}
             >
               {filter.displayType === 'tag' && (
                 <Box display="flex" flexWrap="wrap" gap={2} className="ml-1">

web-marketplace/src/hooks/projects/useProjectsWithOrders.ts

@@ -25,10 +25,7 @@ import { getAllSanityPrefinanceProjectsQuery } from 'lib/queries/react-query/san
 import { getProjectByIdQuery } from 'lib/queries/react-query/sanity/getProjectByIdQuery/getProjectByIdQuery';
 import { useWallet } from 'lib/wallet/wallet';
 
-import {
-  UNREGISTERED_PATH,
-  VOLUNTARY_MARKET,
-} from 'pages/Projects/AllProjects/AllProjects.constants';
+import { UNREGISTERED_PATH } from 'pages/Projects/AllProjects/AllProjects.constants';
 import { ProjectWithOrderData } from 'pages/Projects/AllProjects/AllProjects.types';
 import {
   sortPinnedProject,
@@ -252,7 +249,7 @@ export function useProjectsWithOrders({
   );
 
   // Merge on-chain and off-chain projects
-  const allProject: Array<NormalizeProject | ProjectWithOrderData> = useMemo(
+  const allProjects: Array<NormalizeProject | ProjectWithOrderData> = useMemo(
     () =>
       creditClassFilter?.[UNREGISTERED_PATH] || useOffChainProjects
         ? [...projectsWithMetadataFiltered, ...onlyOffChainProjects]
@@ -285,7 +282,7 @@ export function useProjectsWithOrders({
 
   const projectsFilteredByCreditClass = useMemo(
     () =>
-      allProject
+      allProjects
         .filter(project => {
           return creditClassFilterKeys.length === 0
             ? true
@@ -315,7 +312,7 @@ export function useProjectsWithOrders({
           return hasMarketType && hasEnvironmentType && hasRegion;
         }),
     [
-      allProject,
+      allProjects,
       creditClassFilterKeys,
       creditClassSelected,
       marketTypeSelected,
@@ -439,7 +436,8 @@ export function useProjectsWithOrders({
   );
 
   return {
-    allProjects: projectsWithOrderData,
+    allProjects,
+    allOnChainProjects: projectsWithOrderData,
     prefinanceProjects,
     haveOffChainProjects: onlyOffChainProjects.length > 0,
     prefinanceProjectsCount: prefinanceProjects.length,

web-marketplace/src/lib/i18n/locales/en.po

@@ -23,7 +23,7 @@ msgstr ""
 msgid "- see less"
 msgstr ""
 
-#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.tsx:57
+#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.tsx:51
 msgid "- See less"
 msgstr ""
 
@@ -148,7 +148,7 @@ msgstr ""
 msgid "+ see more"
 msgstr ""
 
-#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.tsx:56
+#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.tsx:50
 msgid "+ See more"
 msgstr ""
 
@@ -397,15 +397,15 @@ msgid "all profiles"
 msgstr ""
 
 #: src/components/organisms/RegistryLayout/RegistryLayout.config.tsx:46
-#: src/pages/Projects/Projects.tsx:100
+#: src/pages/Projects/Projects.tsx:101
 msgid "All projects"
 msgstr ""
 
 #: src/components/organisms/PostForm/PostForm.tsx:446
 msgid "All uploaded files and their location data will be hidden from public view."
 msgstr ""
 
-#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.utils.tsx:78
+#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.utils.tsx:96
 msgid "Amazon"
 msgstr ""
 
@@ -512,7 +512,7 @@ msgstr ""
 msgid "and"
 msgstr ""
 
-#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.utils.tsx:98
+#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.utils.tsx:116
 msgid "Andean"
 msgstr ""
 
@@ -859,7 +859,7 @@ msgstr ""
 msgid "card info"
 msgstr ""
 
-#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.utils.tsx:93
+#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.utils.tsx:111
 msgid "Caribbean"
 msgstr ""
 
@@ -1028,7 +1028,7 @@ msgstr ""
 msgid "Complete"
 msgstr ""
 
-#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.utils.tsx:127
+#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.utils.tsx:150
 msgid "Compliance"
 msgstr ""
 
@@ -1637,7 +1637,7 @@ msgid "Ecological Outcomes"
 msgstr ""
 
 #: src/lib/constants/shared.constants.tsx:104
-#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.utils.tsx:171
+#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.utils.tsx:233
 msgid "Ecosystem"
 msgstr ""
 
@@ -1866,7 +1866,7 @@ msgid "Files can still be shared privately via secret link."
 msgstr ""
 
 #: src/pages/Projects/AllProjects/AllProjects.constants.ts:8
-#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.tsx:54
+#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.tsx:48
 msgid "Filters"
 msgstr ""
 
@@ -1947,7 +1947,7 @@ msgstr ""
 msgid "Hectares"
 msgstr ""
 
-#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.utils.tsx:51
+#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.utils.tsx:58
 msgid "High andean forest"
 msgstr ""
 
@@ -2272,7 +2272,7 @@ msgstr ""
 msgid "Long-form project story"
 msgstr ""
 
-#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.utils.tsx:39
+#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.utils.tsx:46
 msgid "Low montane very humid forest"
 msgstr ""
 
@@ -2304,7 +2304,7 @@ msgstr ""
 msgid "Make the location data private"
 msgstr ""
 
-#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.utils.tsx:177
+#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.utils.tsx:239
 msgid "Market"
 msgstr ""
 
@@ -2633,11 +2633,15 @@ msgstr ""
 msgid "Organization Name"
 msgstr ""
 
-#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.utils.tsx:88
+#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.utils.tsx:106
 msgid "Orinoco"
 msgstr ""
 
-#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.utils.tsx:43
+#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.utils.tsx:66
+msgid "Orinoco savanna"
+msgstr ""
+
+#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.utils.tsx:50
 msgid "Orinoco savannah"
 msgstr ""
 
@@ -2657,7 +2661,7 @@ msgstr ""
 msgid "owner"
 msgstr ""
 
-#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.utils.tsx:83
+#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.utils.tsx:101
 msgid "Pacific"
 msgstr ""
 
@@ -2832,15 +2836,15 @@ msgid "prefinance"
 msgstr ""
 
 #: src/components/organisms/RegistryLayout/RegistryLayout.config.tsx:54
-#: src/pages/Projects/Projects.tsx:110
+#: src/pages/Projects/Projects.tsx:111
 msgid "Prefinance projects"
 msgstr ""
 
 #: src/lib/constants/shared.constants.tsx:211
 msgid "prefinance this project"
 msgstr ""
 
-#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.utils.tsx:35
+#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.utils.tsx:42
 msgid "Premontane humid forest"
 msgstr ""
 
@@ -3151,7 +3155,7 @@ msgstr ""
 msgid "Projects must have a duration of at least 20 years to ensure demonstrable and quantifiable results in biodiversity. Tebu promotes projects that last longer, ensuring long term ecological processes."
 msgstr ""
 
-#: src/pages/Projects/Projects.tsx:225
+#: src/pages/Projects/Projects.tsx:222
 msgid "projects tabs"
 msgstr ""
 
@@ -3262,7 +3266,7 @@ msgstr ""
 msgid "region"
 msgstr ""
 
-#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.utils.tsx:166
+#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.utils.tsx:228
 msgid "Region"
 msgstr ""
 
@@ -3310,7 +3314,7 @@ msgstr ""
 msgid "Resend email."
 msgstr ""
 
-#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.tsx:55
+#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.tsx:49
 msgid "Reset"
 msgstr ""
 
@@ -3427,7 +3431,7 @@ msgstr ""
 msgid "Review"
 msgstr ""
 
-#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.utils.tsx:47
+#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.utils.tsx:54
 msgid "Riparian forest"
 msgstr ""
 
@@ -3448,6 +3452,10 @@ msgstr ""
 msgid "sad bee"
 msgstr ""
 
+#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.utils.tsx:62
+msgid "Savanna"
+msgstr ""
+
 #: src/components/molecules/EditProjectPageFooter.tsx:86
 #: src/components/molecules/ProjectPageFooter.tsx:43
 #: src/components/organisms/EditProfileForm/EditProfileForm.constants.tsx:48
@@ -4194,15 +4202,19 @@ msgstr ""
 msgid "Transfer pending"
 msgstr ""
 
-#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.utils.tsx:31
+#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.utils.tsx:38
 msgid "Tropical dry forest"
 msgstr ""
 
-#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.utils.tsx:27
+#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.utils.tsx:26
+msgid "Tropical forest"
+msgstr ""
+
+#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.utils.tsx:34
 msgid "Tropical humid forest"
 msgstr ""
 
-#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.utils.tsx:23
+#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.utils.tsx:30
 msgid "Tropical very humid forest"
 msgstr ""
 
@@ -4475,7 +4487,7 @@ msgstr ""
 msgid "visit our homepage instead"
 msgstr ""
 
-#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.utils.tsx:114
+#: src/pages/Projects/AllProjects/AllProjects.ProjectFilterBody.utils.tsx:137
 msgid "Voluntary"
 msgstr ""