Giveth · RamRamez · Sep 25, 2024 · Aug 29, 2024 · Aug 29, 2024 · Aug 29, 2024
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ This is a [Next.js](https://nextjs.org/) project bootstrapped with [`create-next
 
 ## Getting Started
 
-First, set these envirnment variables in `env.local` file
+First, set these envirnment variables in `env.local` file.
 
 ```
 NEXT_PUBLIC_ENV=

diff --git a/lang/ca.json b/lang/ca.json
diff --git a/lang/en.json b/lang/en.json
diff --git a/lang/es.json b/lang/es.json
diff --git a/lang/t_ca.json b/lang/t_ca.json
@@ -153,12 +153,10 @@
 	"project.givback_toast.description.non_verified_owner": "Pots demostrar que el teu projecte està proporcionant un bé públic? La verificació et dóna accés a una gran quantitat de beneficis com recompenses per a donants, major visibilitat i formes addicionals d'obtenir fons!",
 	"project.givback_toast.description.non_verified_public": "Actualment, els GIVbacks només es concedeixen per donacions fetes a projectes verificats. La teva contribució encara és important, encara que no generi GIVbacks!",
 	"project.givback_toast.description.verified_owner": "Impulsa el teu projecte per augmentar el seu percentatge de recompenses i fer-lo més visible a la pàgina de projectes!",
-	"project.givback_toast.description.verified_owner.note": "Com a propietari d'aquest projecte, no obtindràs GIV per donar-hi.",
 	"project.givback_toast.description.verified_public": "Els donants de projectes verificats són recompensats amb GIV. Impulsa aquest projecte per augmentar el seu percentatge de recompenses i fer-lo més visible a la pàgina de projectes!",
 	"project.givback_toast.title.non_verified_owner": "Porta el teu projecte al següent nivell amb la Verificació!",
 	"project.givback_toast.title.non_verified_public": "Per què no hi ha GIVbacks?",
 	"project.givback_toast.title.verified_owner_1": "Els donants són recompensats amb fins a ",
-	"project.givback_toast.title.verified_owner_2": " del valor de la donació!",
 	"project.givback_toast.title.verified_public_1": "Obtén recompenses amb fins a ",
 	"project.givback_toast.title.verified_public_2": " del valor de la teva donació!",
 	"refi": "Refi",

diff --git a/lang/t_es.json b/lang/t_es.json
@@ -119,12 +119,10 @@
 	"project.givback_toast.description.non_verified_owner": "¿Puedes demostrar que tu proyecto está proporcionando un bien público? ¡La verificación te da acceso a una gran cantidad de beneficios como recompensas para los donantes, mayor visibilidad y formas adicionales de recaudar fondos!",
 	"project.givback_toast.description.non_verified_public": "Los GIVbacks se otorgan actualmente solo por donaciones realizadas a proyectos verificados. ¡Tu contribución sigue siendo importante, incluso si no genera GIVbacks!",
 	"project.givback_toast.description.verified_owner": "¡Impulsa tu proyecto para aumentar su porcentaje de recompensas y hacerlo más visible en la página de proyectos!",
-	"project.givback_toast.description.verified_owner.note": "Como propietario de este proyecto, no obtendrás GIV por donar a él.",
 	"project.givback_toast.description.verified_public": "Los donantes a proyectos verificados son recompensados con GIV. ¡Impulsa este proyecto para aumentar su porcentaje de recompensas y hacerlo más visible en la página de proyectos!",
 	"project.givback_toast.title.non_verified_owner": "¡Lleva tu proyecto al siguiente nivel con la Verificación!",
 	"project.givback_toast.title.non_verified_public": "¿Por qué no hay GIVbacks?",
 	"project.givback_toast.title.verified_owner_1": "Los donantes son recompensados con hasta ",
-	"project.givback_toast.title.verified_owner_2": " del valor de la donación!",
 	"project.givback_toast.title.verified_public_1": "Obtén recompensas de hasta ",
 	"project.givback_toast.title.verified_public_2": " del valor de tu donación!",
 	"refi": "Refi",

diff --git a/next.config.js b/next.config.js
@@ -7,10 +7,8 @@ const { withSentryConfig } = require('@sentry/nextjs');
 const withBundleAnalyzer = require('@next/bundle-analyzer')({
 	enabled: process.env.ANALYZE === 'true',
 });
-var pjson = require('./package.json');
-const generateRobotsTxt = require('./scripts/generate-robots-txt');
 
-const isProduction = process.env.NEXT_PUBLIC_ENV === 'production';
+const generateRobotsTxt = require('./scripts/generate-robots-txt');
 
 const defaultLocale = 'en';
 const locales = ['ca', 'en', 'es'];

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "givethdapp",
-	"version": "2.30.0",
+	"version": "2.31.1",
 	"private": true,
 	"scripts": {
 		"build": "next build",
@@ -18,7 +18,7 @@
 	},
 	"dependencies": {
 		"@apollo/client": "^3.10.4",
-		"@giveth/ui-design-system": "^1.11.34",
+		"@giveth/ui-design-system": "^1.11.35",
 		"@next/third-parties": "^14.2.5",
 		"@react-google-maps/api": "^2.19.3",
 		"@reduxjs/toolkit": "^2.2.4",
@@ -35,7 +35,7 @@
 		"@tanstack/react-query": "^5.45.1",
 		"@vercel/speed-insights": "^1.0.9",
 		"@web3auth/sign-in-with-solana": "^3.0.0",
-		"@web3modal/wagmi": "^5.0.7",
+		"@web3modal/wagmi": "^5.1.7",
 		"apollo-upload-client": "^18.0.1",
 		"base58": "^2.0.1",
 		"bignumber.js": "^9.1.2",
@@ -72,7 +72,7 @@
 		"swiper": "^11.1.3",
 		"unsplash-js": "^7.0.19",
 		"viem": "^2.16.1",
-		"wagmi": "^2.11.3"
+		"wagmi": "^2.12.10"
 	},
 	"devDependencies": {
 		"@babel/preset-typescript": "^7.23.3",

diff --git a/pages/landings/ethdenver.tsx b/pages/landings/ethdenver.tsx
@@ -2,8 +2,6 @@ import Head from 'next/head';
 import { GetStaticProps } from 'next';
 import { FC } from 'react';
 import EthDenverView from '@/components/views/landings/EthDenver';
-import { FETCH_CAMPAIGN_BY_SLUG } from '@/apollo/gql/gqlCampaign';
-import { client } from '@/apollo/apolloClient';
 import { ICampaign } from '@/apollo/types/types';
 
 export interface IEthDenverProps {
@@ -23,18 +21,22 @@ const EthDenverRoute: FC<IEthDenverProps> = ({ campaign }) => {
 
 export const getStaticProps: GetStaticProps = async () => {
 	try {
-		const { data } = await client.query({
-			query: FETCH_CAMPAIGN_BY_SLUG,
-			variables: {
-				slug: 'ethDenver',
-			},
-			fetchPolicy: 'no-cache',
-		});
+		//The campaign in not active
+		// const { data } = await client.query({
+		// 	query: FETCH_CAMPAIGN_BY_SLUG,
+		// 	variables: {
+		// 		slug: 'ethDenver',
+		// 	},
+		// 	fetchPolicy: 'no-cache',
+		// });
+		// return {
+		// 	props: {
+		// 		campaign: data.findCampaignBySlug,
+		// 	},
+		// 	revalidate: 600,
+		// };
 		return {
-			props: {
-				campaign: data.findCampaignBySlug,
-			},
-			revalidate: 600,
+			props: {},
 		};
 	} catch (error) {
 		return {

diff --git a/pages/test2.tsx b/pages/test2.tsx
@@ -31,8 +31,6 @@ const YourApp = () => {
 		})),
 	});
 
-	console.log('subgraphValues', subgraphValues);
-
 	// Solana wallet hooks
 	const {
 		publicKey,

diff --git a/public/images/banners/qf-round/giv-palooza.svg b/public/images/banners/qf-round/giv-palooza.svg
diff --git a/public/images/logo/stellar.svg b/public/images/logo/stellar.svg
diff --git a/src/apollo/apolloClient.ts b/src/apollo/apolloClient.ts
@@ -1,7 +1,6 @@
 import { useMemo } from 'react';
 import { ApolloClient, InMemoryCache, ApolloLink } from '@apollo/client';
 import { RetryLink } from '@apollo/client/link/retry';
-
 import { setContext } from '@apollo/client/link/context';
 import { onError } from '@apollo/client/link/error';
 import gql from 'graphql-tag';
@@ -95,7 +94,7 @@ function createApolloClient() {
 	const httpLink = createUploadLink({
 		uri: config.BACKEND_LINK,
 		fetch: customFetch as any,
-	}) as unknown as ApolloLink;
+	});
 
 	const authLink = setContext((_, { headers }) => {
 		let locale: string | null = !ssrMode
@@ -149,9 +148,12 @@ function createApolloClient() {
 		}
 	});
 
+	// Combine all links using ApolloLink.from to fix terminating link error
+	const link = ApolloLink.from([errorLink, authLink, retryLink, httpLink]);
+
 	return new ApolloClient({
 		ssrMode,
-		link: errorLink.concat(authLink.concat(httpLink.concat(retryLink))),
+		link: link,
 		cache: new InMemoryCache({
 			addTypename: false,
 		}),
@@ -161,7 +163,6 @@ function createApolloClient() {
 			},
 			query: {
 				fetchPolicy: 'cache-first',
-				// nextFetchPolicy: 'cache-first',
 			},
 		},
 		typeDefs: gql`

diff --git a/src/apollo/gql/gqlGivbacks.ts b/src/apollo/gql/gqlGivbacks.ts
@@ -0,0 +1,12 @@
+import { gql } from '@apollo/client';
+
+export const FETCH_ALLOCATED_GIVBACKS = gql`
+	query allocatedGivbacks($refreshCache: Boolean) {
+		allocatedGivbacks(refreshCache: $refreshCache) {
+			usdValueSentAmountInPowerRound
+			allocatedGivTokens
+			givPrice
+			date
+		}
+	}
+`;
diff --git a/src/apollo/gql/gqlProjects.ts b/src/apollo/gql/gqlProjects.ts
@@ -493,7 +493,7 @@ export const UPLOAD_IMAGE = gql`
 export const WALLET_ADDRESS_IS_VALID = gql`
 	query WalletAddressIsValid(
 		$address: String!
-		$chainType: String
+		$chainType: ChainType
 		$memo: String
 	) {
 		walletAddressIsValid(

diff --git a/src/components/GIVeconomyPages/GIVbacks.tsx b/src/components/GIVeconomyPages/GIVbacks.tsx
@@ -19,8 +19,6 @@ import {
 	GIVbackRewardCard,
 	GBSubtitle,
 	GBTitle,
-	GbDataBlock,
-	GbButton,
 	GIVBackCard,
 	RoundSection,
 	RoundTitle,
@@ -46,6 +44,8 @@ import links from '@/lib/constants/links';
 import Routes from '@/lib/constants/Routes';
 import { SubgraphDataHelper } from '@/lib/subgraph/subgraphDataHelper';
 import { fetchSubgraphData } from '@/services/subgraph.service';
+import { FETCH_ALLOCATED_GIVBACKS } from '@/apollo/gql/gqlGivbacks';
+import { client } from '@/apollo/apolloClient';
 
 export const TabGIVbacksTop = () => {
 	const { formatMessage } = useIntl();
@@ -107,14 +107,6 @@ export const TabGIVbacksTop = () => {
 								actionCb={() => {
 									setShowHarvestModal(true);
 								}}
-								subButtonLabel={
-									givbackLiquidPart === 0n
-										? formatMessage({
-												id: 'label.why_dont_i_have_givbacks',
-											})
-										: undefined
-								}
-								subButtonCb={() => setShowGivBackExplain(true)}
 								network={chain?.id}
 								targetNetworks={[
 									{
@@ -157,6 +149,27 @@ export const TabGIVbacksBottom = () => {
 	const [round, setRound] = useState(0);
 	const [roundStarTime, setRoundStarTime] = useState(new Date());
 	const [roundEndTime, setRoundEndTime] = useState(new Date());
+	// Define an interface for the type of givbackAllocations
+	interface GivbackAllocations {
+		usdValueSentAmountInPowerRound: number;
+		allocatedGivTokens: number;
+		givPrice: number;
+		date: string;
+	}
+	const [givbackAllocations, setGivbackAllocations] =
+		useState<GivbackAllocations | null>(null);
+
+	useEffect(() => {
+		async function fetchAllocatedGivbacks() {
+			const { data } = await client.query({
+				query: FETCH_ALLOCATED_GIVBACKS,
+				fetchPolicy: 'network-only',
+			});
+			setGivbackAllocations(data?.allocatedGivbacks);
+		}
+		fetchAllocatedGivbacks();
+	}, []);
+
 	const { givTokenDistroHelper, isLoaded } = useGIVTokenDistroHelper();
 	useEffect(() => {
 		if (
@@ -185,51 +198,6 @@ export const TabGIVbacksBottom = () => {
 	return (
 		<GIVbacksBottomContainer>
 			<Container>
-				<Row>
-					<Col xs={12} sm={6}>
-						<GbDataBlock
-							title={formatMessage({ id: 'label.donor_rewards' })}
-							button={
-								<Link href={Routes.AllProjects}>
-									<GbButton
-										label={formatMessage({
-											id: 'label.donate_to_earn_giv',
-										})}
-										linkType='secondary'
-										size='large'
-									/>
-								</Link>
-							}
-						>
-							{formatMessage({
-								id: 'label.when_you_donate_to_Verified_projects',
-							})}
-						</GbDataBlock>
-					</Col>
-					<Col xs={12} sm={6}>
-						<GbDataBlock
-							title={formatMessage({
-								id: 'label.project_verification',
-							})}
-							button={
-								<GbButton
-									isExternal
-									label={formatMessage({
-										id: 'label.verify_your_project',
-									})}
-									linkType='secondary'
-									size='large'
-									href={links.VERIFICATION_DOCS}
-									target='_blank'
-								/>
-							}
-						>
-							{formatMessage({
-								id: 'label.great_projects_make_the_giveconomy_thrive',
-							})}
-						</GbDataBlock>
-					</Col>
-				</Row>
 				<GIVBackCard>
 					<Row>
 						<Col xs={12} md={8}>
@@ -303,9 +271,10 @@ export const TabGIVbacksBottom = () => {
 										</P>
 										<GivAllocated>
 											<NoWrap>
-												{formatMessage({
-													id: 'label.one_million_giv',
-												})}
+												{givbackAllocations &&
+												givbackAllocations.allocatedGivTokens
+													? `${givbackAllocations.allocatedGivTokens} GIV`
+													: 'TBD'}
 											</NoWrap>
 										</GivAllocated>
 									</RoundInfoTallRow>

diff --git a/src/components/GIVeconomyPages/GIVpower.tsx b/src/components/GIVeconomyPages/GIVpower.tsx
@@ -1,7 +1,6 @@
 import Image from 'next/image';
 import {
 	brandColors,
-	H3,
 	H4,
 	IconRocketInSpace32,
 	QuoteText,
@@ -22,9 +21,6 @@ import {
 	GIVpowerTopContainer,
 	Title,
 	Subtitle,
-	LearnMoreButton,
-	HeadingSectionContainer,
-	HeadingTextContainer,
 	FeaturesCardContainer,
 	FeaturesCardHeading,
 	FeaturesCardSubheading,
@@ -62,7 +58,6 @@ import GivStake from '../../../public/images/giv_stake.svg';
 import Routes from '@/lib/constants/Routes';
 import config from '@/configuration';
 import { formatWeiHelper } from '@/helpers/number';
-import links from '@/lib/constants/links';
 import { getTotalGIVpower } from '@/helpers/givpower';
 import { useGeneralWallet } from '@/providers/generalWalletProvider';
 import { ChainType } from '@/types/config';
@@ -218,28 +213,6 @@ export function TabPowerBottom() {
 	return (
 		<>
 			<GIVpowerContainer>
-				<H3 weight={700}>
-					{formatMessage({
-						id: 'label.boost_projects_with_givpower',
-					})}
-				</H3>
-				<br />
-				<HeadingSectionContainer>
-					<HeadingTextContainer>
-						<QuoteText size='small'>
-							{formatMessage({
-								id: 'label.use_your_givpower_to_boost_verified_projects',
-							})}
-						</QuoteText>
-					</HeadingTextContainer>
-					<LearnMoreButton
-						isExternal
-						label={formatMessage({ id: 'label.learn_more' })}
-						target='_blank'
-						href={links.GIVPOWER_DOC}
-						size='large'
-					/>
-				</HeadingSectionContainer>
 				<FeaturesCardContainer>
 					<FeaturesCardHeading weight={700}>
 						{formatMessage({ id: 'label.how_does_givpower_work' })}
@@ -342,6 +315,7 @@ export function TabPowerBottom() {
 							<BenefitsCardHeading weight={700}>
 								{formatMessage({ id: 'label.for_givers' })}
 							</BenefitsCardHeading>
+							<br /> {/* Adding a line break here */}
 							<BenefitsCardContainer>
 								<BenefitsCardTextContainer>
 									<QuoteText size='small'>
@@ -374,6 +348,7 @@ export function TabPowerBottom() {
 							<BenefitsCardHeading weight={700}>
 								{formatMessage({ id: 'label.for_projects' })}
 							</BenefitsCardHeading>
+							<br /> {/* Adding a line break here */}
 							<BenefitsCardTextContainer>
 								<QuoteText size='small'>
 									{formatMessage({