Merge branch 'main' into develop

lang/ca.json

@@ -684,7 +684,7 @@
 	"label.an_exploit_has_removed_available_rewards": "Una vulnerabilitat ha eliminat les recompenses disponibles d'aquesta pool. Si us plau, consulta",
 	"label.this_forum_post": "aquest post del fòrum",
 	"label.for_details": "per a més detalls.",
-	"label.harvest_your_rewards_and_remove_your_funds": "Recol·liu les vostres recompenses i moveu els vostres fons a una altra granja per seguir guanyant.",
+	"label.harvest_your_rewards_and_remove_your_funds": "Encara pots recollir les teves recompenses i desapostar les teves tokens.",
 	"label.staking_giv_in_this_pool_allows_to_support_verified_projects": "Posar GIV en staking dins d'aquesta piscina us permet suportar projectes verificats amb GIVpower i us atorga poder de vot en Giveth DAO (gGIV), a més del APR.",
 	"label.your_cummulative_apr_including_both_rewards": "El vostre APR acumulat, incloent totes les recompenses obtingudes a través de les taxes i les afegides automàticament a la vostra posició,",
 	"label.and_rewards_earned_in_giv": "i les recompenses obtingudes en GIV del staking de la vostra LP,",

lang/en.json

@@ -728,7 +728,7 @@
 	"label.an_exploit_has_removed_available_rewards": "An exploit has removed available rewards from this pool. Please refer to",
 	"label.this_forum_post": "this forum post",
 	"label.for_details": "for details.",
-	"label.harvest_your_rewards_and_remove_your_funds": "Harvest your rewards and move your funds to another farm to keep earning.",
+	"label.harvest_your_rewards_and_remove_your_funds": "You can still harvest your rewards and unstake your tokens.",
 	"label.got_it": "Got it",
 	"label.staking_giv_in_this_pool_allows_to_support_verified_projects": "Staking GIV in this pool allows you to support verified projects with GIVpower & grants you voting power in Giveth DAO (gGIV), in addition to the APR.",
 	"label.your_cummulative_apr_including_both_rewards": "Your cumulative APR including both rewards earned as fees & added automatically to your position",

lang/es.json

@@ -729,7 +729,7 @@
 	"label.an_exploit_has_removed_available_rewards": "Un explot ha removido las recompensas disponibles de este pool. Por favor refiérase a",
 	"label.this_forum_post": "este post del foro",
 	"label.for_details": "para detalles.",
-	"label.harvest_your_rewards_and_remove_your_funds": "Cosecha tus recompensas y traslada tus fondos a otra granja para seguir ganando.",
+	"label.harvest_your_rewards_and_remove_your_funds": "Aun puedes recibir tus recompensas y hacer unstake de tus tokens",
 	"label.got_it": "Entendido",
 	"label.staking_giv_in_this_pool_allows_to_support_verified_projects": "Poner GIV en staking dentro de este pool te permite apoyar proyectos verificados con GIVpower y te otorga poder de voto en Giveth DAO (gGIV), además del APR.",
 	"label.your_cummulative_apr_including_both_rewards": "Tu APR acumulado incluyendo recompensas obtenidas de los fees y aquellos añadidos automáticamente a tu posición",

package.json

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

src/config/development.ts

@@ -203,6 +203,7 @@ const config: EnvConfig = {
 				unit: 'LP',
 				regenStreamType: StreamType.FOX,
 				farmStartTimeMS: 1646306818206,
+				farmEndTimeMS: 1681850831420,
 				introCard: {
 					title: 'ShapeShift DAO',
 					description:

src/config/production.ts

@@ -313,6 +313,7 @@ const config: EnvConfig = {
 				unit: 'LP',
 				regenStreamType: StreamType.FOX,
 				farmStartTimeMS: 1666026660000,
+				farmEndTimeMS: 1681850831420,
 				introCard: {
 					title: 'ShapeShift DAO',
 					description: