Merge pull request #4061 from Giveth/release-2.24.0

Release 2.24.0

.eslintrc

@@ -4,7 +4,7 @@
 	"extends": [
 		"next/core-web-vitals",
 		"plugin:@next/next/recommended",
-		"plugin:prettier/recommended"
+		"plugin:prettier/recommended",
 	],
 	"rules": {
 		"react/no-unescaped-entities": "warn",
@@ -17,9 +17,9 @@
 					["internal", "parent", "sibling"],
 					"index",
 					"object",
-					"type"
-				]
-			}
+					"type",
+				],
+			},
 		],
 		"unused-imports/no-unused-imports": "error",
 		"unused-imports/no-unused-vars": [
@@ -28,20 +28,21 @@
 				"vars": "all",
 				"varsIgnorePattern": "^_",
 				"args": "after-used",
-				"argsIgnorePattern": "^_"
-			}
+				"argsIgnorePattern": "^_",
+			},
 		],
 		"prettier/prettier": [
 			"error",
 			{
-				"endOfLine": "auto"
-			}
+				"endOfLine": "auto",
+			},
 		],
-		"import/named": "error"
+		"import/named": "error",
+		"import/no-duplicates": ["error", { "considerQueryString": true }],
 	},
 	"settings": {
 		"import/resolver": {
-			"typescript": {}
-		}
-	}
+			"typescript": {},
+		},
+	},
 }

.gitignore

@@ -38,6 +38,7 @@ yarn-error.log*
 
 # Visual Studio Code
 .vscode
+commit.sh
 
 # Sentry
 .sentryclirc

lang/nt_ca.json

@@ -182,6 +182,5 @@
 	"projects_other_desc": " ",
 	"refi": "Refi",
 	"testfilter": "testfilter",
-	"tooltip.donation.matching": "This estimation is based on the donations made so far this quadratic funding round and is not considering fraud analysis. Actual matching amount vary.",
-	"tooltip.donation.matching_polygon": "Aquesta estimació representa els fons coincidents que rebria aquest projecte si la ronda es tanqués ara, ignorant l'anàlisi del frau i el procés d'assignació especial per als 100 millors de Jokerace."
+	"tooltip.donation.matching": "This estimation is based on the donations made so far this quadratic funding round and is not considering fraud analysis. Actual matching amount vary."
 }

lang/nt_es.json

@@ -149,6 +149,5 @@
 	"refi": "Refi",
 	"testfilter": "testfilter",
 	"tooltip.donation.matching": "This estimation is based on the donations made so far this quadratic funding round and is not considering fraud analysis. Actual matching amount vary.",
-	"tooltip.donation.matching_polygon": "Esta estimación representa los fondos de contrapartida que recibiría este proyecto si la ronda se cerrara ahora, ignorando el análisis de fraude y el proceso de asignación especial para los 100 mejores de Jokerace.",
 	"ubi": "UBI"
 }

lang/t_ca.json

@@ -171,5 +171,4 @@
 	"refi": "Refi",
 	"testfilter": "testfilter",
 	"tooltip.donation.matching": "Aquesta estimació es basa en les donacions fetes fins ara aquesta ronda de finançament quadràtic i no està considerant l'anàlisi de frau. La quantitat real de coincidència pot variar.",
-	"tooltip.donation.matching_polygon": "Aquesta estimació representa els fons coincidents que rebria aquest projecte si la ronda es tanqués ara, ignorant l'anàlisi del frau i el procés d'assignació especial per als 100 millors de Jokerace."
 }

lang/t_es.json

@@ -137,6 +137,5 @@
 	"refi": "Refi",
 	"testfilter": "testfilter",
 	"tooltip.donation.matching": "Esta estimación se basa en las donaciones realizadas hasta ahora en esta ronda de financiación cuadrática y no está considerando el análisis de fraude. La cantidad de igualación real puede variar.",
-	"tooltip.donation.matching_polygon": "Esta estimación representa los fondos de contrapartida que recibiría este proyecto si la ronda se cerrara ahora, ignorando el análisis de fraude y el proceso de asignación especial para los 100 mejores de Jokerace.",
 	"ubi": "RBI"
 }

next.config.js

@@ -62,6 +62,11 @@ const moduleExports = withBundleAnalyzer({
 	},
 	redirects: () => {
 		return [
+			{
+				source: '/user',
+				destination: '/account',
+				permanent: true,
+			},
 			{
 				source: '/donate',
 				destination: '/projects',

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "givethdapp",
-	"version": "2.23.3",
+	"version": "2.24.0",
 	"private": true,
 	"scripts": {
 		"build": "next build",
@@ -18,7 +18,7 @@
 	},
 	"dependencies": {
 		"@apollo/client": "^3.9.3",
-		"@giveth/ui-design-system": "^1.11.20",
+		"@giveth/ui-design-system": "^1.11.27",
 		"@reduxjs/toolkit": "^2.1.0",
 		"@safe-global/api-kit": "^2.1.0",
 		"@segment/snippet": "^4.15.3",
@@ -50,9 +50,9 @@
 		"quill-emoji": "^0.2.0",
 		"quill-image-resize-module": "^3.0.0",
 		"quill-magic-url": "^4.2.0",
+		"rc-scrollbars": "^1.1.6",
 		"rc-slider": "^10.5.0",
 		"react": "^18.2.0",
-		"react-custom-scrollbars": "^4.2.1",
 		"react-datepicker": "^6.1.0",
 		"react-dom": "^18.2.0",
 		"react-dropzone": "^14.2.3",
@@ -70,52 +70,53 @@
 		"styled-components": "^6.1.8",
 		"swiper": "^11.0.6",
 		"unsplash-js": "^7.0.19",
-		"viem": "^2.7.8",
+		"viem": "^2.7.18",
 		"wagmi": "^2.5.7"
 	},
 	"devDependencies": {
-		"@next/bundle-analyzer": "^12.1.4",
-		"@testing-library/cypress": "^8.0.3",
-		"@testing-library/jest-dom": "^5.16.4",
-		"@testing-library/react": "^13.3.0",
+		"@babel/preset-typescript": "^7.23.3",
+		"@next/bundle-analyzer": "^14.1.0",
+		"@testing-library/cypress": "^10.0.1",
+		"@testing-library/jest-dom": "^6.4.2",
+		"@testing-library/react": "^14.2.1",
 		"@types/apollo-upload-client": "^18.0.0",
 		"@types/axios": "^0.14.0",
-		"@types/extract-files": "^8.1.3",
-		"@types/jest": "^28.1.4",
-		"@types/jest-axe": "^3.5.4",
-		"@types/lodash.isequal": "^4.5.5",
-		"@types/node": "^18.11.18",
-		"@types/nprogress": "^0.2.0",
-		"@types/react": "^18.0.28",
-		"@types/react-custom-scrollbars": "^4.0.9",
-		"@types/react-datepicker": "^4.4.1",
-		"@types/react-dom": "^18.0.11",
-		"@types/react-html-parser": "^2.0.2",
-		"@types/react-modal": "^3.13.1",
-		"@types/react-places-autocomplete": "^7.2.9",
-		"@typescript-eslint/eslint-plugin": "^6.7.2",
-		"@typescript-eslint/parser": "^6.7.2",
+		"@types/extract-files": "^13.0.1",
+		"@types/jest": "^29.5.12",
+		"@types/jest-axe": "^3.5.9",
+		"@types/lodash.isequal": "^4.5.8",
+		"@types/node": "^20.11.20",
+		"@types/nprogress": "^0.2.3",
+		"@types/react": "^18.2.58",
+		"@types/react-custom-scrollbars": "^4.0.13",
+		"@types/react-datepicker": "^6.0.1",
+		"@types/react-dom": "^18.2.19",
+		"@types/react-html-parser": "^2.0.6",
+		"@types/react-modal": "^3.16.3",
+		"@types/react-places-autocomplete": "^7.2.14",
+		"@typescript-eslint/eslint-plugin": "^7.0.2",
+		"@typescript-eslint/parser": "^7.0.2",
 		"babel-plugin-styled-components": "^2.1.4",
-		"cypress": "^10.6.0",
-		"eslint": "^8.49.0",
-		"eslint-config-next": "^13.5.1",
-		"eslint-config-prettier": "^9.0.0",
+		"cypress": "^13.6.6",
+		"eslint": "^8.57.0",
+		"eslint-config-next": "^14.1.0",
+		"eslint-config-prettier": "^9.1.0",
 		"eslint-import-resolver-jest": "^3.0.2",
-		"eslint-import-resolver-typescript": "^3.6.0",
-		"eslint-plugin-cypress": "^2.14.0",
-		"eslint-plugin-import": "^2.28.1",
-		"eslint-plugin-prettier": "^5.0.1",
-		"eslint-plugin-unused-imports": "^3.0.0",
-		"jest": "^28.1.2",
-		"jest-axe": "^6.0.0",
-		"jest-canvas-mock": "^2.4.0",
-		"jest-environment-jsdom": "^28.1.2",
-		"jest-extended": "^3.0.2",
-		"jest-watch-typeahead": "^2.0.0",
-		"msw": "^0.49.2",
-		"prettier": "^3.0.3",
+		"eslint-import-resolver-typescript": "^3.6.1",
+		"eslint-plugin-cypress": "^2.15.1",
+		"eslint-plugin-import": "^2.29.1",
+		"eslint-plugin-prettier": "^5.1.3",
+		"eslint-plugin-unused-imports": "^3.1.0",
+		"jest": "^29.7.0",
+		"jest-axe": "^8.0.0",
+		"jest-canvas-mock": "^2.5.2",
+		"jest-environment-jsdom": "^29.7.0",
+		"jest-extended": "^4.0.2",
+		"jest-watch-typeahead": "^2.2.2",
+		"msw": "^2.2.1",
+		"prettier": "^3.2.5",
 		"test-data-bot": "^0.8.0",
-		"ts-jest": "^28.0.5",
-		"typescript": "^5.2.2"
+		"ts-jest": "^29.1.2",
+		"typescript": "^5.3.3"
 	}
 }

pages/_app.tsx

@@ -11,6 +11,7 @@ import { useRouter } from 'next/router';
 import { Provider as ReduxProvider } from 'react-redux';
 import { SpeedInsights } from '@vercel/speed-insights/next';
 import Script from 'next/script';
+import { loadErrorMessages, loadDevMessages } from '@apollo/client/dev';
 import { WagmiProvider } from 'wagmi';
 import { projectId, wagmiConfig } from '@/wagmiConfigs';
 import { useApollo } from '@/apollo/apolloClient';
@@ -37,11 +38,16 @@ import {
 import { GeneralWalletProvider } from '@/providers/generalWalletProvider';
 import GIVeconomyTab from '@/components/GIVeconomyTab';
 import { zIndex } from '@/lib/constants/constants';
-import configuration from '@/configuration';
+import configuration, { isProduction } from '@/configuration';
 import MaintenanceIndex from '@/components/views/Errors/MaintenanceIndex';
 import { SolanaProvider } from '@/providers/solanaWalletProvider';
 import type { AppProps } from 'next/app';
-import '../styles/globals.css';
+
+if (!isProduction) {
+	// Adds messages only in a dev environment
+	loadDevMessages();
+	loadErrorMessages();
+}
 
 declare global {
 	interface Window {
@@ -76,8 +82,6 @@ function renderSnippet() {
 	return snippet.min(opts);
 }
 
-const isProduction = process.env.NEXT_PUBLIC_ENV === 'production';
-
 const RenderComponent = ({ Component, pageProps }: any) => {
 	useSafeAutoConnect();
 	return <Component {...pageProps} />;

pages/landings/givbacks.tsx

@@ -1,4 +1,4 @@
-import { FC } from 'react';
+import { type FC } from 'react';
 import Head from 'next/head';
 import GIVBacksIndex from '@/components/views/landings/GIVBacks';
 

pages/test1.tsx

@@ -1,11 +1,10 @@
 import styled from 'styled-components';
 import { GetServerSideProps } from 'next';
-import { IconHelpFilled16 } from '@giveth/ui-design-system';
+import { IconHelpFilled16, Container } from '@giveth/ui-design-system';
 import { FC, useEffect, useRef, useState } from 'react';
 import dynamic from 'next/dynamic';
 import { useRouter } from 'next/router';
 
-import { Container } from '@giveth/ui-design-system';
 import { gToast, ToastType } from '@/components/toasts';
 import { FlowRateTooltip } from '@/components/GIVeconomyPages/GIVstream.sc';
 import { IconWithTooltip } from '@/components/IconWithToolTip';

pages/test2.tsx

@@ -11,7 +11,7 @@ const YourApp = () => {
 		<div>
 			<w3m-button />
 			<div>
-				<button onClick={() => {}}>Test Button1</button>
+				<button onClick={() => {}}>Test Button</button>
 			</div>
 			{failedModalType && (
 				<FailedDonation