Merge pull request #1849 from Giveth/release-2.5.0

Release 2.5.0

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,9 +1,9 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: BUG
-labels: bug
-assignees: MoeNick
+title: ''
+labels: ''
+assignees: ''
 
 ---
 

.github/ISSUE_TEMPLATE/resource_request.md

@@ -0,0 +1,23 @@
+---
+name: Resource request
+about: For developers requesting resources from devops (for internal use only)
+title: 'RR - '
+labels: 'devops'
+assignees: 'geleeroyale, mhmdksh'
+
+---
+
+**Main purpose of deployment**
+I.e. staging environment for feature X
+
+**Special requirements**
+- [ ] Service interacts with the blockchain via on-machine stored private key
+- [ ] Port **XXXX** needs to be open
+
+**Estimated specs**
+OS: Ubuntu LTS @latest
+RAM: 1GB
+DATA: 1GB/month
+
+**Access**
+Who needs access to the resource (people and other services)

.github/ISSUE_TEMPLATE/test-report---boosting-.md

@@ -0,0 +1,52 @@
+---
+name: 'Test report - Boosting '
+about: Create a report to help us improve testting
+title: 'GIVpower Boosting | '
+labels: GIVeconomy, GIVPower
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**This happens on which Boosting Section?**
+- [ ] Project's Card - GIVpower Rank
+- [ ] Project's GIVpower ranking
+- [ ] Single Project Public View | Boost Button
+- [ ]  Single Project's owner view | Boost Button
+- [ ]  Single Project's View | Givpower tab (Hall of fame, Total Boosted) 
+- [ ] Boost Modal for a specific project
+- [ ] Boost Succeeded
+- [ ] My Account | Boosting Tab: list of boosted projects
+- [ ] My Account | Delete a Boosted Projects
+- [ ] My Account | Edit boosting allocations
+- [ ] My Account | Success editing allocations
+- [ ] My Account | Success editing allocations. 
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

lang/index.ts

@@ -0,0 +1,4 @@
+import en from './en.json';
+import es from './es.json';
+
+export { en, es };

next.config.js

@@ -49,6 +49,11 @@ const moduleExports = withBundleAnalyzer({
 		}
 		return config;
 	},
+	i18n: {
+		locales: ['en', 'es'],
+		defaultLocale: 'en',
+		localeDetection: false,
+	},
 });
 
 const sentryWebpackPluginOptions = {

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "givethdapp",
-	"version": "2.4.12",
+	"version": "2.5.0",
 	"private": true,
 	"scripts": {
 		"build": "next build",
@@ -21,7 +21,7 @@
 		"@ethersproject/contracts": "^5.5.0",
 		"@ethersproject/providers": "^5.5.0",
 		"@ethersproject/units": "^5.5.0",
-		"@giveth/ui-design-system": "^1.8.26",
+		"@giveth/ui-design-system": "^1.9.1",
 		"@gnosis.pm/safe-apps-web3-react": "^1.5.0",
 		"@reduxjs/toolkit": "^1.8.1",
 		"@segment/snippet": "^4.15.3",
@@ -56,6 +56,7 @@
 		"react-google-maps": "^9.4.5",
 		"react-hook-form": "^7.32.2",
 		"react-hot-toast": "^2.1.1",
+		"react-intl": "^6.2.1",
 		"react-lottie": "^1.2.3",
 		"react-places-autocomplete": "^7.3.0",
 		"react-quill": "^2.0.0",

pages/_app.tsx

@@ -1,5 +1,6 @@
 import React, { useEffect } from 'react';
 import Head from 'next/head';
+import { IntlProvider } from 'react-intl';
 import { Toaster } from 'react-hot-toast';
 import { Web3ReactProvider } from '@web3-react/core';
 import { ApolloProvider } from '@apollo/client';
@@ -14,6 +15,7 @@ import { HeaderWrapper } from '@/components/Header/HeaderWrapper';
 import { FooterWrapper } from '@/components/Footer/FooterWrapper';
 
 import '../styles/globals.css';
+import { en, es } from '../lang';
 import { store } from '@/features/store';
 import SubgraphController from '@/components/controller/subgraph.ctrl';
 import UserController from '@/components/controller/user.ctrl';
@@ -31,6 +33,12 @@ declare global {
 
 const DEFAULT_WRITE_KEY = 'MHK95b7o6FRNHt0ZZJU9bNGUT5MNCEyB';
 
+type IntlMessageKeys = keyof typeof en;
+const messages = {
+	en,
+	es,
+};
+
 function renderSnippet() {
 	const opts = {
 		apiKey:
@@ -53,6 +61,7 @@ function getLibrary(provider: ExternalProvider) {
 
 function MyApp({ Component, pageProps }: AppProps) {
 	const router = useRouter();
+	const locale = router ? router.locale : 'en';
 	const apolloClient = useApollo(pageProps);
 
 	useEffect(() => {
@@ -88,32 +97,40 @@ function MyApp({ Component, pageProps }: AppProps) {
 				/>
 			</Head>
 			<Provider store={store}>
-				<ApolloProvider client={apolloClient}>
-					<Web3ReactProvider getLibrary={getLibrary}>
-						<GeneralController />
-						<PriceController />
-						<SubgraphController />
-						<UserController />
-						<HeaderWrapper />
-						{pageProps.errorStatus ? (
-							<ErrorsIndex statusCode={pageProps.errorStatus} />
-						) : (
-							<Component {...pageProps} />
-						)}
-						{process.env.NEXT_PUBLIC_ENV === 'production' && (
-							<Script
-								id='segment-script'
-								strategy='afterInteractive'
-								dangerouslySetInnerHTML={{
-									__html: renderSnippet(),
-								}}
-							/>
-						)}
+				<IntlProvider
+					locale={locale!}
+					messages={messages[locale as keyof typeof messages]}
+					defaultLocale='en'
+				>
+					<ApolloProvider client={apolloClient}>
+						<Web3ReactProvider getLibrary={getLibrary}>
+							<GeneralController />
+							<PriceController />
+							<SubgraphController />
+							<UserController />
+							<HeaderWrapper />
+							{pageProps.errorStatus ? (
+								<ErrorsIndex
+									statusCode={pageProps.errorStatus}
+								/>
+							) : (
+								<Component {...pageProps} />
+							)}
+							{process.env.NEXT_PUBLIC_ENV === 'production' && (
+								<Script
+									id='segment-script'
+									strategy='afterInteractive'
+									dangerouslySetInnerHTML={{
+										__html: renderSnippet(),
+									}}
+								/>
+							)}
 
-						<FooterWrapper />
-						<ModalController />
-					</Web3ReactProvider>
-				</ApolloProvider>
+							<FooterWrapper />
+							<ModalController />
+						</Web3ReactProvider>
+					</ApolloProvider>
+				</IntlProvider>
 			</Provider>
 
 			<Toaster containerStyle={{ top: '80px' }} />

pages/donate/[slug].tsx

@@ -1,20 +1,28 @@
-import React from 'react';
+import React, { FC } from 'react';
 import Head from 'next/head';
 import dynamic from 'next/dynamic';
-
 import { captureException } from '@sentry/nextjs';
-import { IProjectBySlug } from '@/apollo/types/types';
-import { FETCH_PROJECT_BY_SLUG } from '@/apollo/gql/gqlProjects';
+
+import { IDonationProject } from '@/apollo/types/types';
+import {
+	FETCH_GIVETH_PROJECT_BY_ID,
+	FETCH_PROJECT_BY_SLUG,
+} from '@/apollo/gql/gqlProjects';
 import { client } from '@/apollo/apolloClient';
 import { ProjectMeta } from '@/components/Metatag';
 import { transformGraphQLErrorsToStatusCode } from '@/helpers/requests';
+import config from '@/configuration';
 
 const DonateIndex = dynamic(
 	() => import('@/components/views/donate/DonateIndex'),
 	{ ssr: false },
 );
 
-const DonateRoute = (props: IProjectBySlug) => {
+export interface IDonateRouteProps {
+	project: IDonationProject;
+}
+
+const DonateRoute: FC<IDonateRouteProps> = props => {
 	return (
 		<>
 			<Head>
@@ -35,7 +43,16 @@ export async function getServerSideProps(props: { query: { slug: string } }) {
 			variables: { slug },
 			fetchPolicy: 'no-cache',
 		});
-		const project = data.projectBySlug;
+		const { data: givethProjectData } = await client.query({
+			query: FETCH_GIVETH_PROJECT_BY_ID,
+			variables: { id: config.GIVETH_PROJECT_ID },
+			fetchPolicy: 'no-cache',
+		});
+
+		const project = {
+			...data.projectBySlug,
+			givethAddresses: givethProjectData.projectById.addresses,
+		};
 		return {
 			props: {
 				project,

pages/test1.tsx

@@ -1,7 +1,7 @@
 import styled from 'styled-components';
 import { GetServerSideProps } from 'next';
 import { useWeb3React } from '@web3-react/core';
-import { IconHelp } from '@giveth/ui-design-system';
+import { IconHelpFilled16 } from '@giveth/ui-design-system';
 import { gToast, ToastType } from '@/components/toasts';
 import { useAppDispatch } from '@/features/hooks';
 import { fetchXDaiInfoAsync } from '@/features/subgraph/subgraph.thunks';
@@ -49,9 +49,9 @@ const TestRoute = () => {
 			<TestContainer>
 				this is test page.
 				<IconWithTooltip
-					icon={<IconHelp size={16} />}
-					direction='top'
-					align='left'
+					icon={<IconHelpFilled16 />}
+					direction='right'
+					align='top'
 				>
 					<FlowRateTooltip>
 						The rate at which you receive liquid GIV from your
@@ -82,7 +82,7 @@ const TestRoute = () => {
 				<div>
 					--------------------------------------------
 					<IconWithTooltip
-						icon={<IconHelp size={16} />}
+						icon={<IconHelpFilled16 />}
 						direction='right'
 						align='bottom'
 					>

src/apollo/gql/gqlProjects.ts

@@ -356,6 +356,19 @@ export const FETCH_PROJECT_BY_ID = gql`
 	}
 `;
 
+export const FETCH_GIVETH_PROJECT_BY_ID = gql`
+	query ProjectById($id: Float!) {
+		projectById(id: $id) {
+			addresses {
+				address
+				isRecipient
+				networkId
+			}
+			slug
+		}
+	}
+`;
+
 export const FETCH_PROJECT_REACTION_BY_ID = gql`
 	query ProjectById($id: Float!, $connectedWalletUserId: Int) {
 		projectById(id: $id, connectedWalletUserId: $connectedWalletUserId) {

src/apollo/gql/gqlVerification.ts

@@ -39,6 +39,9 @@ const gqlRes = `{
 		foundationDate
 		achievedMilestones
 		achievedMilestonesProofs
+		problem
+		plans
+		impact
 	}
 	managingFunds {
 		description

src/apollo/types/gqlTypes.ts

@@ -3,6 +3,7 @@ import {
 	IDonation,
 	IProject,
 	IProjectUpdate,
+	IWalletAddress,
 	IWalletDonation,
 } from './types';
 
@@ -85,3 +86,12 @@ export interface IProjectAcceptedToken {
 	isGivbackEligible?: boolean;
 	order: number;
 }
+
+export interface IFetchGivethProjectGQL {
+	data: {
+		projectById: {
+			slug: string;
+			addresses: IWalletAddress[];
+		};
+	};
+}