Merge pull request #2686 from Giveth/Release-2.15.6

Release 2.15.6

lang/ca.json

@@ -974,10 +974,7 @@
 	"label.stake_giv_on_gnosis_chain": "Fes stake de GIV a Gnosis Chain",
 	"label.giv_staking_is_available_on_gnosis_chain": "El staking de GIV està disponible a Gnosis Chain. Si us plau, traslladeu el vostre GIV a Gnosis Chain, després canvieu de xarxa i feu stake per obtenir recompenses.",
 	"label.please_note_it_will_take_few_minutes_for_your_giv_to_bridge": "Si us plau, tingueu en compte que trigarà uns minuts perquè el vostre GIV es transfereixi.",
-	"label.accepts_giv": "Accepta GIV",
 	"label.if_you_already_bridged_your_giv_please_switch_network": "Si ja heu transferit el vostre GIV, si us plau canvieu de xarxa per fer staking del GIVpower!",
-	"label.boosted_with_giv_power": "Boostejat amb GIVpower",
-	"label.from_giving_block": "De Giving Block",
 	"label.accepts_funds_on_chain": "Aceptan finançament en {chainName}",
 	"label.rank": "Classificació",
 	"label.newest": "Més nou",

lang/en.json

@@ -1047,9 +1047,6 @@
 	"label.giv_staking_is_available_on_gnosis_chain": "GIV staking is available on Gnosis Chain. Please bridge your GIV to Gnosis Chain, then switch network and stake to earn rewards.",
 	"label.please_note_it_will_take_few_minutes_for_your_giv_to_bridge": "Please note, it will take a few minutes for your GIV to bridge.",
 	"label.if_you_already_bridged_your_giv_please_switch_network": "If you already bridged your GIV, please switch network to stake for GIVpower!",
-	"label.accepts_giv": "Accepts GIV",
-	"label.boosted_with_giv_power": "Boosted with GIVpower",
-	"label.from_giving_block": "From Giving Block",
 	"label.accepts_funds_on_chain": "Accepts Funds on {chainName}",
 	"label.rank": "Rank",
 	"label.newest": "Newest",

lang/es.json

@@ -1055,9 +1055,6 @@
 	"label.giv_staking_is_available_on_gnosis_chain": "Staking de GIV esta disponible en Gnosis Chain. Por favor transfiere tu GIV a Gnosis Chain, luego cambia tu red y haz stake para recibir recompensas.",
 	"label.please_note_it_will_take_few_minutes_for_your_giv_to_bridge": "Por favor ten en cuenta que tomará unos minutos para que tu GIV se transfiera.",
 	"label.if_you_already_bridged_your_giv_please_switch_network": "Si ya transferiste tu GIV, por favor cambia la red para hacer stake del GIVpower!",
-	"label.accepts_giv": "Aceptan GIV",
-	"label.boosted_with_giv_power": "Boosted con GIVpower",
-	"label.from_giving_block": "De Giving Block",
 	"label.accepts_funds_on_chain": "Aceptan financiación en {chainName}",
 	"label.rank": "Clasificación",
 	"label.newest": "Más nuevo",

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "givethdapp",
-	"version": "2.15.5",
+	"version": "2.15.6",
 	"private": true,
 	"scripts": {
 		"build": "next build",

src/apollo/types/types.ts

@@ -73,6 +73,7 @@ export enum EProjectsFilter {
 	VERIFIED = 'Verified',
 	BOOSTED_WITH_GIVPOWER = 'BoostedWithGivPower',
 	GIVING_BLOCK = 'GivingBlock',
+	ACCEPT_FUND_ON_MAINNET = 'AcceptFundOnMainnet',
 	ACCEPT_FUND_ON_GNOSIS = 'AcceptFundOnGnosis',
 	ACCEPT_FUND_ON_POLYGON = 'AcceptFundOnPolygon',
 	ACCEPT_FUND_ON_CELO = 'AcceptFundOnCelo',
@@ -91,6 +92,7 @@ export enum ECampaignFilterField {
 	AcceptGiv = 'givingBlocksId',
 	GivingBlock = 'fromGivingBlock',
 	BoostedWithGivPower = 'boostedWithGivPower',
+	AcceptFundOnMainnet = 'acceptFundOnMainnet',
 	AcceptFundOnGnosis = 'acceptFundOnGnosis',
 	AcceptFundOnPolygon = 'acceptFundOnPolygon',
 	AcceptFundOnCelo = 'acceptFundOnCelo',

src/components/menu/FilterMenu.tsx

@@ -33,21 +33,16 @@ export const FilterMenu = forwardRef<HTMLDivElement, IFilterMenuProps>(
 		const router = useRouter();
 
 		const projectFeatures = [
-			{
-				label: formatMessage({ id: 'label.accepts_giv' }),
-				value: EProjectsFilter.ACCEPT_GIV,
-			},
 			{
 				label: formatMessage({ id: 'label.verified' }),
 				value: EProjectsFilter.VERIFIED,
 			},
 			{
-				label: formatMessage({ id: 'label.boosted_with_giv_power' }),
-				value: EProjectsFilter.BOOSTED_WITH_GIVPOWER,
-			},
-			{
-				label: formatMessage({ id: 'label.from_giving_block' }),
-				value: EProjectsFilter.GIVING_BLOCK,
+				label: formatMessage(
+					{ id: 'label.accepts_funds_on_chain' },
+					{ chainName: 'Mainnet' },
+				),
+				value: EProjectsFilter.ACCEPT_FUND_ON_MAINNET,
 			},
 			{
 				label: formatMessage(

src/helpers/url.tsx

@@ -36,6 +36,12 @@ export function campaignLinkGenerator(campaign: ICampaign) {
 						EProjectsFilter.BOOSTED_WITH_GIVPOWER,
 					);
 					break;
+				case ECampaignFilterField.AcceptFundOnMainnet:
+					params.append(
+						'filter',
+						EProjectsFilter.ACCEPT_FUND_ON_MAINNET,
+					);
+					break;
 				case ECampaignFilterField.AcceptFundOnGnosis:
 					params.append(
 						'filter',