Release 2.33.0

lang/t_ca.json

@@ -151,7 +151,6 @@
 	"page.project.preview_hint": "Aquesta és una previsualització del teu projecte.",
 	"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_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?",

lang/t_es.json

@@ -117,7 +117,6 @@
 	"page.project.preview_hint": "Esta es una vista previa de tu proyecto.",
 	"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_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?",

next-env.d.ts

@@ -2,4 +2,4 @@
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.
+// see https://nextjs.org/docs/pages/building-your-application/configuring/typescript for more information.

next.config.js

@@ -24,6 +24,7 @@ const moduleExports = withBundleAnalyzer({
 			{ protocol: 'https', port: '', hostname: 'images.unsplash.com' },
 			{ protocol: 'https', port: '', hostname: 'unicorn.mypinata.cloud' },
 			{ protocol: 'https', port: '', hostname: 'images.ctfassets.net' },
+			{ protocol: 'https', port: '', hostname: 'giveth.io' },
 			{
 				protocol: 'https',
 				port: '',

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "givethdapp",
-	"version": "2.32.2",
+	"version": "2.33.0",
 	"private": true,
 	"scripts": {
 		"build": "next build",
@@ -17,7 +17,7 @@
 		"@types/react-dom": "^18.0.6"
 	},
 	"dependencies": {
-		"@apollo/client": "^3.10.4",
+		"@apollo/client": "^3.11.8",
 		"@giveth/ui-design-system": "^1.11.36",
 		"@next/third-parties": "^14.2.5",
 		"@react-google-maps/api": "^2.19.3",
@@ -45,7 +45,8 @@
 		"graphql": "^16.8.1",
 		"lodash.isequal": "^4.5.0",
 		"lottie-react": "^2.4.0",
-		"next": "^14.2.3",
+		"mongodb": "6.9.0",
+		"next": "^14.2.13",
 		"nprogress": "^0.2.0",
 		"posthog-js": "^1.147.0",
 		"qrcode": "^1.5.3",
@@ -71,12 +72,13 @@
 		"styled-components": "^6.1.12",
 		"swiper": "^11.1.3",
 		"unsplash-js": "^7.0.19",
-		"viem": "^2.16.1",
-		"wagmi": "^2.12.10"
+		"viem": "^2.21.16",
+		"wagmi": "^2.12.16"
 	},
 	"devDependencies": {
 		"@babel/preset-typescript": "^7.23.3",
 		"@next/bundle-analyzer": "^14.1.0",
+		"@tanstack/react-query-devtools": "^5.58.0",
 		"@testing-library/cypress": "^10.0.1",
 		"@testing-library/jest-dom": "^6.4.2",
 		"@testing-library/react": "^14.2.1",

pages/api/donation-backup.js

@@ -1,8 +1,9 @@
 import { captureException } from '@sentry/nextjs';
 import { getNowUnixMS } from '@/helpers/time';
 import { SENTRY_URGENT } from '@/configuration';
+import { getMongoDB } from '@/lib/mongoDb/db';
 
-const handler = (req, res) => {
+const handler = async (req, res) => {
 	const { body, method, headers } = req;
 	const now = getNowUnixMS();
 	body.saveTimestamp = now;
@@ -13,46 +14,29 @@ const handler = (req, res) => {
 	}
 	try {
 		if (method === 'POST') {
-			fetch(process.env.MONGO_DONATION_URL, {
-				method: 'POST',
-				headers: {
-					'Content-Type': 'application/json',
-					'Access-Control-Request-Headers': '*',
-					'api-key': process.env.MONGO_DONATION_API_KEY,
-				},
-				body: JSON.stringify({
-					collection: process.env.MONGO_DONATION_COLLECTION,
-					database: process.env.MONGO_DONATION_DATABASE,
-					dataSource: process.env.MONGO_DONATION_DATA_SOURCE,
-					document: body,
-				}),
-			})
-				.then(response => response.json())
-				.then(data => {
-					console.log(data);
-					res.status(200).json({
-						message: 'Successfully saved',
-						id: data.insertedId,
-					});
-				})
-				.catch(error => {
-					captureException(
-						{
-							data: body,
-							authorization: headers.authorization,
-							error,
-						},
-						{
-							tags: {
-								section: SENTRY_URGENT,
-							},
-						},
-					);
-					res.status(200).json('Sent to sentry');
-				});
-			console.log('body', body);
+			const db = await getMongoDB();
+			const response = await db.collection('failed_donation').insertOne({
+				...body,
+			});
+			res.status(200).json({
+				message: 'Successfully saved',
+				id: response.insertedId,
+			});
 		}
 	} catch (error) {
+		console.log('Error in saving donation to DB', error);
+		captureException(
+			{
+				data: body,
+				authorization: headers.authorization,
+				error,
+			},
+			{
+				tags: {
+					section: SENTRY_URGENT,
+				},
+			},
+		);
 		res.status(500).json();
 	}
 };

pages/verification/[slug]/index.tsx

@@ -98,7 +98,7 @@ const VerificationRoute = () => {
 	return (
 		<VerificationProvider>
 			<Head>
-				<title>Verify a Project | Giveth</title>
+				<title>GIVbacks Eligibility Application | Giveth</title>
 			</Head>
 			<VerificationIndex />
 		</VerificationProvider>

src/apollo/apolloClient.ts

@@ -1,5 +1,10 @@
 import { useMemo } from 'react';
-import { ApolloClient, InMemoryCache, ApolloLink } from '@apollo/client';
+import {
+	ApolloClient,
+	InMemoryCache,
+	ApolloLink,
+	NormalizedCacheObject,
+} from '@apollo/client';
 import { RetryLink } from '@apollo/client/link/retry';
 import { setContext } from '@apollo/client/link/context';
 import { onError } from '@apollo/client/link/error';
@@ -14,20 +19,21 @@ import { signOut } from '@/features/user/user.thunks';
 import config from '@/configuration';
 import { setShowSignWithWallet } from '@/features/modal/modal.slice';
 
-let apolloClient: any;
+let apolloClient: ApolloClient<NormalizedCacheObject> | undefined;
 
 const ssrMode = isSSRMode;
 
 export const APOLLO_STATE_PROP_NAME = '__APOLLO_STATE__';
 
-const parseHeaders = (rawHeaders: any) => {
+// Parses headers into the Headers object
+const parseHeaders = (rawHeaders: string) => {
 	const headers = new Headers();
 	// Replace instances of \r\n and \n followed by at least one space or horizontal tab with a space
 	// https://tools.ietf.org/html/rfc7230#section-3.2
 	const preProcessedHeaders = rawHeaders.replace(/\r?\n[\t ]+/g, ' ');
-	preProcessedHeaders.split(/\r?\n/).forEach((line: any) => {
+	preProcessedHeaders.split(/\r?\n/).forEach((line: string) => {
 		const parts = line.split(':');
-		const key = parts.shift().trim();
+		const key = parts.shift()?.trim();
 		if (key) {
 			const value = parts.join(':').trim();
 			headers.append(key, value);
@@ -36,6 +42,7 @@ const parseHeaders = (rawHeaders: any) => {
 	return headers;
 };
 
+// Custom fetch logic with file upload handling
 const uploadFetch = (url: string, options: any) =>
 	new Promise((resolve, reject) => {
 		const xhr = new XMLHttpRequest();
@@ -49,8 +56,11 @@ const uploadFetch = (url: string, options: any) =>
 				'responseURL' in xhr
 					? xhr.responseURL
 					: opts.headers.get('X-Request-URL');
+			// TypeScript fix: Explicitly cast `xhr` to `XMLHttpRequest` to access responseText
 			const body =
-				'response' in xhr ? xhr.response : (xhr as any).responseText;
+				'response' in xhr
+					? xhr.response
+					: (xhr as XMLHttpRequest).responseText;
 			resolve(new Response(body, opts));
 		};
 		xhr.onerror = () => {
@@ -76,26 +86,30 @@ const uploadFetch = (url: string, options: any) =>
 		xhr.send(options.body);
 	});
 
-const customFetch = (uri: any, options: any) => {
+// Custom fetch function to determine when to use upload fetch or standard fetch
+const customFetch = (uri: string, options: any) => {
 	if (options.useUpload) {
 		return uploadFetch(uri, options);
 	}
 	return fetch(uri, options);
 };
 
-function createApolloClient() {
+// Creates the Apollo Client with the custom link setup
+function createApolloClient(): ApolloClient<NormalizedCacheObject> {
 	let userWalletAddress: string | null;
 	if (!ssrMode) {
 		userWalletAddress = localStorage.getItem(StorageLabel.USER);
 	}
 
 	const retryLink = new RetryLink();
 
+	// Custom link for handling file uploads
 	const httpLink = createUploadLink({
 		uri: config.BACKEND_LINK,
 		fetch: customFetch as any,
 	});
 
+	// Auth link to add Authorization and locale headers
 	const authLink = setContext((_, { headers }) => {
 		let locale: string | null = !ssrMode
 			? localStorage.getItem(StorageLabel.LOCALE)
@@ -117,12 +131,13 @@ function createApolloClient() {
 		};
 	});
 
+	// Error handling link
 	const errorLink = onError(({ graphQLErrors, networkError, operation }) => {
 		if (graphQLErrors) {
 			console.log('operation', operation);
 			graphQLErrors.forEach(err => {
 				console.error('err', JSON.stringify(err));
-				const { message, locations, path } = err;
+				const { message } = err;
 				if (message.toLowerCase().includes('authentication required')) {
 					console.log(Date.now(), 'sign out from graphQL');
 					//   removes token and user from store
@@ -190,7 +205,10 @@ function createApolloClient() {
 	});
 }
 
-export function initializeApollo(initialState = null) {
+// Initialize Apollo Client for SSR and client-side rendering
+export function initializeApollo(
+	initialState: any = null,
+): ApolloClient<NormalizedCacheObject> {
 	const _apolloClient = apolloClient ?? createApolloClient();
 
 	// If your page has Next.js data fetching methods that use Apollo Client, the initial state
@@ -202,7 +220,7 @@ export function initializeApollo(initialState = null) {
 		// Merge the existing cache into data passed from getStaticProps/getServerSideProps
 		const data = merge(initialState, existingCache, {
 			// combine arrays using object equality (like in sets)
-			arrayMerge: (destinationArray, sourceArray) => [
+			arrayMerge: (destinationArray: any[], sourceArray: any[]) => [
 				...sourceArray,
 				...destinationArray.filter(d =>
 					sourceArray.every(s => !isEqual(d, s)),
@@ -221,18 +239,24 @@ export function initializeApollo(initialState = null) {
 	return _apolloClient;
 }
 
-export function addApolloState(client: any, pageProps: any) {
+// Adds Apollo Client's state to pageProps
+export function addApolloState(
+	client: ApolloClient<NormalizedCacheObject>,
+	pageProps: any,
+) {
 	if (pageProps?.props) {
 		pageProps.props[APOLLO_STATE_PROP_NAME] = client.cache.extract();
 	}
 
 	return pageProps;
 }
 
+// Custom React hook to use Apollo Client
 export function useApollo(pageProps: any) {
 	const state = pageProps[APOLLO_STATE_PROP_NAME];
 
 	return useMemo(() => initializeApollo(state), [state]);
 }
 
-export const client = initializeApollo();
+// Export the client instance
+export const client: ApolloClient<NormalizedCacheObject> = initializeApollo();

src/apollo/gql/gqlProjects.ts

@@ -8,6 +8,7 @@ export const PROJECT_CORE_FIELDS = gql`
 		image
 		slug
 		verified
+		isGivbackEligible
 		totalDonations
 		qfRounds {
 			id
@@ -142,6 +143,7 @@ export const FETCH_PROJECT_BY_SLUG_DONATION = gql`
 			slug
 			descriptionSummary
 			verified
+			isGivbackEligible
 			totalDonations
 			sumDonationValueUsdForActiveQfRound
 			countUniqueDonorsForActiveQfRound
@@ -211,6 +213,7 @@ export const FETCH_PROJECT_BY_SLUG_SINGLE_PROJECT = gql`
 			image
 			slug
 			verified
+			isGivbackEligible
 			totalDonations
 			description
 			addresses {
@@ -595,6 +598,7 @@ export const ADD_RECIPIENT_ADDRESS_TO_PROJECT = gql`
 			listed
 			reviewStatus
 			verified
+			isGivbackEligible
 			slugHistory
 			creationDate
 			adminUserId
@@ -800,3 +804,9 @@ export const FETCH_RECURRING_DONATIONS_BY_DATE = gql`
 		}
 	}
 `;
+
+export const DELETE_DRAFT_PROJECT = gql`
+	mutation ($projectId: Float!) {
+		deleteDraftProject(projectId: $projectId)
+	}
+`;

src/apollo/types/gqlEnums.ts

@@ -21,6 +21,7 @@ export enum EProjectsSortBy {
 	INSTANT_BOOSTING = 'InstantBoosting',
 	ActiveQfRoundRaisedFunds = 'ActiveQfRoundRaisedFunds',
 	EstimatedMatching = 'EstimatedMatching',
+	BestMatch = 'BestMatch',
 }
 
 export enum EQFRoundsSortBy {

src/apollo/types/types.ts

@@ -48,6 +48,7 @@ export interface IProject {
 	impactLocation?: string;
 	qualityScore?: number;
 	verified?: boolean;
+	isGivbackEligible?: boolean;
 	verificationStatus?: EProjectVerificationStatus;
 	listed?: boolean | null;
 	categories: ICategory[];
@@ -88,6 +89,7 @@ export interface IProject {
 export enum EProjectsFilter {
 	ACCEPT_GIV = 'AcceptGiv',
 	VERIFIED = 'Verified',
+	IS_GIVBACK_ELIGIBLE = 'IsGivbackEligible',
 	BOOSTED_WITH_GIVPOWER = 'BoostedWithGivPower',
 	GIVING_BLOCK = 'GivingBlock',
 	Endaoment = 'Endaoment',
@@ -114,6 +116,7 @@ export enum ECampaignType {
 
 export enum ECampaignFilterField {
 	Verified = 'verified',
+	IsGivbackEligible = 'isGivbackEligible',
 	AcceptGiv = 'givingBlocksId',
 	GivingBlock = 'fromGivingBlock',
 	Endaoment = 'fromEndaoment',

src/components/DonateSocialBox.tsx

@@ -27,7 +27,7 @@ interface ISocialBox {
 const DonateSocialBox: FC<ISocialBox> = props => {
 	const [showModal, setShowModal] = useState<boolean>(false);
 	const { project, isDonateFooter } = props;
-	const { slug, verified } = project;
+	const { slug } = project;
 	const { isMobile } = useDetectDevice();
 	const { formatMessage } = useIntl();
 	const { isActive } = useProjectContext();