Merge pull request #2530 from Giveth/release-2.14.8

Release 2.14.8

.vscode/settings.json

@@ -5,16 +5,17 @@
 		"GIVback",
 		"GIVBACKS",
 		"GIVeconomy",
-		"GIVgarden",
 		"giveth",
 		"GIVfarm",
 		"GIVfrens",
+		"GIVgarden",
 		"GIVpower",
 		"GIVstream",
 		"HONEYSWAP",
 		"IGIVpower",
 		"merkle",
 		"Notif",
+		"Subline",
 		"SUSHISWAP",
 		"swiper",
 		"texty",

README.md

@@ -1,3 +1,9 @@
+# The Giveth DApp
+
+### Build status:
+- Develop - [![build-develop](https://github.com/Giveth/giveth-dapps-v2/actions/workflows/Build.yml/badge.svg?branch=develop)](https://github.com/Giveth/giveth-dapps-v2/actions/workflows/Build.yml)
+- Main - [![build-main](https://github.com/Giveth/giveth-dapps-v2/actions/workflows/Build.yml/badge.svg?branch=main)](https://github.com/Giveth/giveth-dapps-v2/actions/workflows/Build.yml)
+--------------
 This is a [Next.js](https://nextjs.org/) project bootstrapped with [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app).
 
 ## Getting Started

lang/en.json

@@ -549,7 +549,7 @@
 	"label.select_an_image_from_our_gallery": "Select an image from our gallery.",
 	"label.remove": "Remove",
 	"label.receiving_address": "Receiving address",
-	"label.address": "{chainName} address",
+	"label.chain_address": "{chainName} address",
 	"label.receiving_address_on": "Receiving address on {chainName}",
 	"label.my_wallet_address": "My Wallet Address",
 	"label.resolved_as": "Resolves as ",
@@ -1096,6 +1096,7 @@
 	"label.all_notifications_related_to_giveconomy": "All notifications related to GIVeconomy",
 	"art-and-culture_desc": "Support arts & culture projects with a focus on artwork,design, NFT's, and culture building.",
 	"art-and-culture": "Art & Culture",
+	"other": "Other",
 	"community": "Community",
 	"community_desc": "Support community projects with a focus on grassroots initiatives, housing, inclusion, social services, water & santitation, family & children and more.",
 	"economic-and-infrastructure": "Economics & Infrastructure",
@@ -1243,5 +1244,8 @@
 	"component.pfp_eligibility_modal.content.success": "You are eligible to mint your Giver early! Thanks for supporting Giveth",
 	"label.duration_ago": "{duration} ago",
 	"label.an_equivalent_of_up_to_40%": "An equivalent of up to 40% of the donation amount in GIV tokens!",
-	"label.read_more_on_our_docs": "Read more on our docs"
+	"label.read_more_on_our_docs": "Read more on our docs",
+	"label.recipient_addresses": "recipient addresses",
+	"label.add_new_address": "Add new address",
+	"label.manage_addresses": "Manage addresses"
 }

lang/es.json

@@ -547,7 +547,7 @@
 	"label.select_an_image_from_our_gallery": "Escoge una imagen de nuestra galería.",
 	"label.remove": "Eliminar",
 	"label.receiving_address": "Dirección receptora",
-	"label.address": "Dirección de {chainName}",
+	"label.chain_address": "Dirección de {chainName}",
 	"label.receiving_address_on": "Dirección receptora en {chainName}",
 	"label.my_wallet_address": "Mi dirección de la billetera",
 	"label.resolved_as": "Resuelto como ",
@@ -1105,6 +1105,7 @@
 	"label.giveconomy_activities": "Actividades en GIVeconomy",
 	"label.all_notifications_related_to_giveconomy": "Todas las notificaciones relacionadas a GIVeconomy",
 	"art-and-culture": "Arte & Cultura",
+	"other": "Otro",
 	"art-and-culture_desc": "Apoya proyectos de arte & cultura enfocados en diseño, NFT, y construcción cultural.",
 	"community": "Comunidad",
 	"economic-and-infrastructure": "Economia & Infraestructura",
@@ -1253,5 +1254,8 @@
 	"component.pfp_eligibility_modal.content.not_eligible": "La billetera que conectaste no esta en nuestra lista para hacer minting adelantado. Si piensas que fue un error, contacta a nuestro equipo. Revisa nuestra documentación para más detalle en elegibilidad, o regresa cuando el mint público inicie el dia 24 de Marzo, 2023 a las 16:00 UTC.",
 	"label.duration_ago": "hace {duration}",
 	"label.an_equivalent_of_up_to_40%": "Un equivalente de hasta 40% del monto de la donación en GIV tokens!",
-	"label.read_more_on_our_docs": "Aprende más en nuestra doc"
+	"label.read_more_on_our_docs": "Aprende más en nuestra doc",
+	"label.recipient_addresses": "",
+	"label.add_new_address": "",
+	"label.manage_addresses": ""
 }

package.json

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

pages/test1.tsx

@@ -32,7 +32,7 @@ const TestRoute = () => {
 	);
 };
 
-//This comment is for testing
+//This comment is for testing1
 
 const TestIndex = () => {
 	// const xDaiValues = useSelector(

src/components/Badge.tsx

@@ -0,0 +1,69 @@
+import {
+	neutralColors,
+	semanticColors,
+	SublineBold,
+} from '@giveth/ui-design-system';
+import React, { FC } from 'react';
+import styled from 'styled-components';
+
+export enum EBadgeStatus {
+	DEFAULT,
+	WARNING,
+	ERROR,
+	SUCCESS,
+}
+
+interface IBadge {
+	label: string;
+	status: EBadgeStatus;
+	showBullet?: boolean;
+	className?: string;
+}
+
+const badgeStatusToColor = (status: EBadgeStatus) => {
+	switch (status) {
+		case EBadgeStatus.DEFAULT:
+			return neutralColors.gray;
+		case EBadgeStatus.WARNING:
+			return semanticColors.golden;
+		case EBadgeStatus.ERROR:
+			return semanticColors.punch;
+		case EBadgeStatus.SUCCESS:
+			return semanticColors.jade;
+		default:
+			return neutralColors.gray;
+	}
+};
+
+export const Badge: FC<IBadge> = ({ label, status, showBullet, className }) => {
+	return (
+		<BadgeContainer
+			className={className}
+			mainColor={badgeStatusToColor(status)}
+		>
+			{showBullet && <BulletPoint>&bull;</BulletPoint>}
+			<SublineBold>{label}</SublineBold>
+		</BadgeContainer>
+	);
+};
+
+interface IBadgeContainer {
+	mainColor: any;
+}
+
+export const BadgeContainer = styled.span<IBadgeContainer>`
+	display: flex;
+	align-items: center;
+	color: ${props => props.mainColor[700]} !important;
+	background: ${props => props.mainColor[100]};
+	border: 2px solid ${props => props.mainColor[300]};
+	border-radius: 50px;
+	padding: 2px 8px;
+	height: 24px;
+`;
+
+const BulletPoint = styled.div`
+	font-size: 18px;
+	margin-right: 4px;
+	padding: 0;
+`;

src/components/NetworkLogo.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
+import config from '@/configuration';
 import { IconEthereum } from '@/components/Icons/Eth';
 import { IconGnosisChain } from '@/components/Icons/GnosisChain';
 import { IconPolygon } from '@/components/Icons/Polygon';
-import config from '@/configuration';
-import { IconOptimism } from './Icons/Optimism';
+import { IconCelo } from './Icons/Celo';
 
 const NetworkLogo = (props: { chainId?: number; logoSize?: number }) => {
 	const { chainId, logoSize } = props;
@@ -13,10 +13,10 @@ const NetworkLogo = (props: { chainId?: number; logoSize?: number }) => {
 		return <IconGnosisChain size={logoSize} />;
 	} else if (chainId === config.POLYGON_NETWORK_NUMBER) {
 		return <IconPolygon size={logoSize} />;
-	} else if (chainId === config.OPTIMISM_NETWORK_NUMBER) {
-		return <IconOptimism size={logoSize} />;
-		//TODO:Celo } else if (chainId === config.CELO_NETWORK_NUMBER) {
-		// 	return <IconCelo size={logoSize} />;
+		//TODO: Uncomment Optimism } else if (chainId === config.OPTIMISM_NETWORK_NUMBER) {
+		// 	return <IconOptimism size={logoSize} />;
+	} else if (chainId === config.CELO_NETWORK_NUMBER) {
+		return <IconCelo size={logoSize} />;
 	} else return null;
 };
 

src/components/VerificationBadge.tsx

@@ -1,7 +1,6 @@
 import { FC } from 'react';
-import { semanticColors } from '@giveth/ui-design-system';
 import { EVerificationStatus } from '@/apollo/types/types';
-import { Badge } from './styled-components/Badge';
+import { Badge, EBadgeStatus } from './Badge';
 
 interface IProps {
 	status?: EVerificationStatus;
@@ -10,23 +9,23 @@ interface IProps {
 
 const VerificationBadge: FC<IProps> = ({ status, simplified }) => {
 	if (!status || status === EVerificationStatus.DRAFT) return null;
-	let title, color;
+	let label, badgeStatus;
 	switch (status) {
 		case EVerificationStatus.REJECTED:
-			title = simplified ? 'Rejected' : 'Verification rejected';
-			color = semanticColors.punch;
+			label = simplified ? 'Rejected' : 'Verification rejected';
+			badgeStatus = EBadgeStatus.ERROR;
 			break;
 		case EVerificationStatus.SUBMITTED:
-			title = simplified ? 'Request sent' : 'Verification request sent';
-			color = semanticColors.golden;
+			label = simplified ? 'Request sent' : 'Verification request sent';
+			badgeStatus = EBadgeStatus.WARNING;
 			break;
 		case EVerificationStatus.VERIFIED:
-			title = 'Verified';
-			color = semanticColors.jade;
+			label = 'Verified';
+			badgeStatus = EBadgeStatus.SUCCESS;
 			break;
 	}
 
-	return <Badge mainColor={color}>{title}</Badge>;
+	return <Badge status={badgeStatus} label={label} />;
 };
 
 export default VerificationBadge;