Merge pull request #1258 from Giveth/release-2.1.0

Release 2.1.0

package.json

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

src/components/StakingPoolImages.tsx

@@ -10,12 +10,13 @@ import { IconElk } from '@/components/Icons/Elk';
 import { IconxDAI } from '@/components/Icons/xDAI';
 import { IconCult } from '@/components/Icons/Cult';
 import { IconOneGIV } from './Icons/OneGIV';
+import { IconAngelVault } from './Icons/AngelVault';
 interface IStakingPoolImagesProps {
 	title: string;
 	icon?: string;
 }
 
-export const getCurIconWithName = (currency: string) => {
+export const getSymbolIconWithName = (currency: string) => {
 	switch (currency) {
 		case 'GIV':
 			return <IconGIV size={40} />;
@@ -35,6 +36,8 @@ export const getCurIconWithName = (currency: string) => {
 			return <IconxDAI size={40} />;
 		case 'oneGIV':
 			return <IconOneGIV size={40} />;
+		case 'angelVault':
+			return <IconAngelVault size={40} />;
 		default:
 			break;
 	}
@@ -49,7 +52,7 @@ export const StakingPoolImages: FC<IStakingPoolImagesProps> = ({
 	return (
 		<StakingPoolImagesContainer lenght={currencies.length}>
 			{currencies.map((currency, idx) => (
-				<div key={idx}>{getCurIconWithName(currency)}</div>
+				<div key={idx}>{getSymbolIconWithName(currency)}</div>
 			))}
 		</StakingPoolImagesContainer>
 	);

src/components/cards/BaseStakingCard.sc.tsx

@@ -131,7 +131,8 @@ export const OutOfRangeTooltip = styled(Subline)`
 
 export const AngelVaultTooltip = styled(Subline)`
 	color: ${neutralColors.gray[100]};
-	width: 261px;
+	// TODO: until we merge the new tooltip to and can align it.
+	width: 161px;
 	text-align: left;
 `;
 

src/components/cards/BaseStakingCard.tsx

@@ -333,7 +333,7 @@ const BaseStakingCard: FC<IBaseStakingCardProps> = ({
 													{type ===
 													StakingType.ICHI_GIV_ONEGIV ? (
 														<IconWithTooltip
-															direction='right'
+															direction='top'
 															icon={
 																<DetailValue>
 																	{apr &&

src/components/cards/StakingCardIntro.tsx

@@ -10,7 +10,7 @@ import {
 import { Dispatch, FC, SetStateAction } from 'react';
 import styled from 'styled-components';
 import { SimplePoolStakingConfig } from '@/types/config';
-import { getCurIconWithName } from '../StakingPoolImages';
+import { getSymbolIconWithName } from '../StakingPoolImages';
 import { Flex } from '../styled-components/Flex';
 import { StakeCardState } from './BaseStakingCard';
 
@@ -24,13 +24,14 @@ const StakingCardIntro: FC<IStakingCardIntro> = ({
 	setState,
 }) => {
 	const { title, introCard } = poolStakingConfig;
+	const titleIcon = introCard?.icon ? introCard?.icon : title.split(' / ')[0];
 	return (
 		<StakingCardIntroContainer>
 			<HeaderRow>
 				<Back onClick={() => setState(StakeCardState.NORMAL)}>
 					<IconArrowLeft size={32} />
 				</Back>
-				{getCurIconWithName(title.split(' / ')[0])}
+				{getSymbolIconWithName(titleIcon)}
 				<H6 weight={700}>{introCard?.title}</H6>
 			</HeaderRow>
 			<ContentWrapper

src/config/development.ts

@@ -81,26 +81,6 @@ const config: EnvConfig = {
 				unit: 'LP',
 				active: true,
 			},
-			{
-				POOL_ADDRESS: '0xA0D500fd3479CBCb64a2238082b7a1Df9f87d98D',
-				LM_ADDRESS: '0x76e98f3Db6681E7de4804F97C085bEe0205164f3',
-				type: StakingType.ICHI_GIV_ONEGIV,
-				platform: StakingPlatform.ICHI,
-				ichiApi: 'https://api.ichi.org/v1/farms/20009',
-				platformTitle: 'Angel Vault',
-				title: 'oneGIV / GIV - Old',
-				description: 'Angel Vault',
-				provideLiquidityLink:
-					'https://3ea0967f.appichiorg.pages.dev/vault/?poolId=5004&back=vault',
-				unit: 'LP',
-				active: true,
-				archived: false,
-				introCard: {
-					title: 'Angel Vault',
-					description: `The Angel Vault is shared Univ3 position structured to protect GIV from downward volatility.\n\nProvide oneGIV as liquidity in our Angel Vault and stake the LP token to earn rewards proportional to the liquidity provided. When you remove liquidity, you will get oneGIV & GIV proportional to the holdings in the Angel Vault.`,
-					link: 'https://docs.ichi.org/ichi-docs-v3/ichi-vaults/angel-vaults',
-				},
-			},
 			{
 				POOL_ADDRESS: '0xA0D500fd3479CBCb64a2238082b7a1Df9f87d98D',
 				LM_ADDRESS: '0x7CD371D230338C74563A9A23AF72dd009a7D1b1C',
@@ -116,6 +96,7 @@ const config: EnvConfig = {
 				active: true,
 				farmStartTimeMS: 1659366000000,
 				introCard: {
+					icon: 'angelVault',
 					title: 'Angel Vault',
 					description: `The Angel Vault is shared Univ3 position structured to protect GIV from downward volatility.\n\nProvide oneGIV as liquidity in our Angel Vault and stake the LP token to earn rewards proportional to the liquidity provided. When you remove liquidity, you will get oneGIV & GIV proportional to the holdings in the Angel Vault.`,
 					link: 'https://docs.ichi.org/ichi-docs-v3/ichi-vaults/angel-vaults',

src/config/production.ts

@@ -80,8 +80,9 @@ const config: EnvConfig = {
 				farmStartTimeMS: 1659625200000,
 				introCard: {
 					title: 'Angel Vault',
+					icon: 'angelVault',
 					description: `The Angel Vault is shared Univ3 position structured to protect GIV from downward volatility.\n\nProvide oneGIV as liquidity in our Angel Vault and stake the LP token to earn rewards proportional to the liquidity provided. When you remove liquidity, you will get oneGIV & GIV proportional to the holdings in the Angel Vault.`,
-					link: 'https://docs.ichi.org/ichi-docs-v3/ichi-vaults/angel-vaults',
+					link: 'https://medium.com/@karmaticacid/the-evolution-of-giv-liquidity-introducing-the-giveth-angel-vault-5ee34b2965c1',
 				},
 			},
 			{

src/types/config.ts

@@ -82,6 +82,7 @@ export interface BalancerPoolStakingConfig extends SimplePoolStakingConfig {
 }
 
 export interface IntroCardConfig {
+	icon?: string;
 	title: string;
 	description: string;
 	link: string;