From 9e352bb1c245c85cf0e947e5a465ebaff7d04e2f Mon Sep 17 00:00:00 2001
From: Majorfi <major-tom.eth@pm.me>
Date: Wed, 22 Nov 2023 15:15:06 +0100
Subject: [PATCH] feat: display NEW when APR type includes new

---
 .../components/list/VaultsV3ListRow.tsx       | 30 ++++++++---------
 apps/vaults/components/list/VaultsListRow.tsx | 32 +++++++++----------
 2 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/apps/vaults-v3/components/list/VaultsV3ListRow.tsx b/apps/vaults-v3/components/list/VaultsV3ListRow.tsx
index 80a2e0628..9e9d79658 100755
--- a/apps/vaults-v3/components/list/VaultsV3ListRow.tsx
+++ b/apps/vaults-v3/components/list/VaultsV3ListRow.tsx
@@ -32,8 +32,8 @@ function VaultForwardAPR({currentVault}: {currentVault: TYDaemonVault}): ReactEl
 					<span className={'tooltip'}>
 						<b className={'yearn--table-data-section-item-value'}>
 							<Renderable
-								shouldRender={!(currentVault.apr?.type === 'new' && hasZeroBoostedAPR)}
-								fallback={'New'}>
+								shouldRender={!currentVault.apr.forwardAPR?.type.includes('new')}
+								fallback={'NEW'}>
 								{'⚡️ '}
 								<span
 									className={
@@ -90,8 +90,8 @@ function VaultForwardAPR({currentVault}: {currentVault: TYDaemonVault}): ReactEl
 			<div className={'flex flex-col md:text-right'}>
 				<b className={'yearn--table-data-section-item-value'}>
 					<Renderable
-						shouldRender={!(currentVault.apr?.type === 'new' && hasZeroAPR)}
-						fallback={'New'}>
+						shouldRender={!currentVault.apr.forwardAPR?.type.includes('new')}
+						fallback={'NEW'}>
 						<RenderAmount
 							value={currentVault.apr?.netAPR}
 							shouldHideTooltip={hasZeroAPR}
@@ -114,10 +114,8 @@ function VaultForwardAPR({currentVault}: {currentVault: TYDaemonVault}): ReactEl
 							'yearn--table-data-section-item-value underline decoration-neutral-600/30 decoration-dotted underline-offset-4 transition-opacity hover:decoration-neutral-600'
 						}>
 						<Renderable
-							shouldRender={
-								!(currentVault.apr?.type === 'new' && isZero(currentVault.apr.forwardAPR.netAPR))
-							}
-							fallback={'New'}>
+							shouldRender={!currentVault.apr.forwardAPR?.type.includes('new')}
+							fallback={'NEW'}>
 							<RenderAmount
 								shouldHideTooltip
 								value={currentVault.apr.forwardAPR.netAPR}
@@ -178,8 +176,8 @@ function VaultForwardAPR({currentVault}: {currentVault: TYDaemonVault}): ReactEl
 				<span className={'tooltip'}>
 					<b className={'yearn--table-data-section-item-value'}>
 						<Renderable
-							shouldRender={!(currentVault.apr?.type === 'new' && hasZeroBoostedAPR)}
-							fallback={'New'}>
+							shouldRender={!currentVault.apr.forwardAPR?.type.includes('new')}
+							fallback={'NEW'}>
 							{'⚡️ '}
 							<span
 								className={
@@ -238,8 +236,8 @@ function VaultForwardAPR({currentVault}: {currentVault: TYDaemonVault}): ReactEl
 		<div className={'flex flex-col md:text-right'}>
 			<b className={'yearn--table-data-section-item-value'}>
 				<Renderable
-					shouldRender={!(currentVault.apr?.type === 'new' && isZero(currentVault.apr.forwardAPR.netAPR))}
-					fallback={'New'}>
+					shouldRender={!currentVault.apr.forwardAPR?.type.includes('new')}
+					fallback={'NEW'}>
 					<RenderAmount
 						shouldHideTooltip={hasZeroAPR}
 						value={currentVault.apr.forwardAPR.netAPR}
@@ -261,8 +259,8 @@ function VaultHistoricalAPR({currentVault}: {currentVault: TYDaemonVault}): Reac
 				<span className={'tooltip'}>
 					<b className={'yearn--table-data-section-item-value'}>
 						<Renderable
-							shouldRender={!(currentVault.apr?.type === 'new' && hasZeroAPR)}
-							fallback={'New'}>
+							shouldRender={!currentVault.apr?.type.includes('new')}
+							fallback={'NEW'}>
 							<span
 								className={
 									'underline decoration-neutral-600/30 decoration-dotted underline-offset-4 transition-opacity hover:decoration-neutral-600'
@@ -314,8 +312,8 @@ function VaultHistoricalAPR({currentVault}: {currentVault: TYDaemonVault}): Reac
 		<div className={'flex flex-col md:text-right'}>
 			<b className={'yearn--table-data-section-item-value'}>
 				<Renderable
-					shouldRender={!(currentVault.apr?.type === 'new' && hasZeroAPR)}
-					fallback={'New'}>
+					shouldRender={!currentVault.apr?.type.includes('new')}
+					fallback={'NEW'}>
 					<RenderAmount
 						value={currentVault.apr?.netAPR}
 						shouldHideTooltip={hasZeroAPR}
diff --git a/apps/vaults/components/list/VaultsListRow.tsx b/apps/vaults/components/list/VaultsListRow.tsx
index 75de540b9..a8754b3ca 100755
--- a/apps/vaults/components/list/VaultsListRow.tsx
+++ b/apps/vaults/components/list/VaultsListRow.tsx
@@ -29,8 +29,8 @@ export function VaultForwardAPR({currentVault}: {currentVault: TYDaemonVault}):
 					<span className={'tooltip'}>
 						<b className={'yearn--table-data-section-item-value'}>
 							<Renderable
-								shouldRender={!(currentVault.apr?.type === 'new' && hasZeroBoostedAPR)}
-								fallback={'New'}>
+								shouldRender={!currentVault.apr.forwardAPR?.type.includes('new')}
+								fallback={'NEW'}>
 								{'⚡️ '}
 								<span
 									className={
@@ -87,8 +87,8 @@ export function VaultForwardAPR({currentVault}: {currentVault: TYDaemonVault}):
 			<div className={'flex flex-col text-right'}>
 				<b className={'yearn--table-data-section-item-value'}>
 					<Renderable
-						shouldRender={!(currentVault.apr?.type === 'new' && hasZeroAPR)}
-						fallback={'New'}>
+						shouldRender={!currentVault.apr.forwardAPR?.type.includes('new')}
+						fallback={'NEW'}>
 						<RenderAmount
 							value={currentVault.apr?.netAPR}
 							shouldHideTooltip={hasZeroAPR}
@@ -111,10 +111,8 @@ export function VaultForwardAPR({currentVault}: {currentVault: TYDaemonVault}):
 							'yearn--table-data-section-item-value underline decoration-neutral-600/30 decoration-dotted underline-offset-4 transition-opacity hover:decoration-neutral-600'
 						}>
 						<Renderable
-							shouldRender={
-								!(currentVault.apr?.type === 'new' && isZero(currentVault.apr.forwardAPR.netAPR))
-							}
-							fallback={'New'}>
+							shouldRender={!currentVault.apr.forwardAPR?.type.includes('new')}
+							fallback={'NEW'}>
 							<RenderAmount
 								shouldHideTooltip
 								value={currentVault.apr.forwardAPR.netAPR}
@@ -175,8 +173,8 @@ export function VaultForwardAPR({currentVault}: {currentVault: TYDaemonVault}):
 				<span className={'tooltip'}>
 					<b className={'yearn--table-data-section-item-value'}>
 						<Renderable
-							shouldRender={!(currentVault.apr?.type === 'new' && hasZeroBoostedAPR)}
-							fallback={'New'}>
+							shouldRender={!currentVault.apr.forwardAPR?.type.includes('new')}
+							fallback={'NEW'}>
 							{'⚡️ '}
 							<span
 								className={
@@ -236,8 +234,8 @@ export function VaultForwardAPR({currentVault}: {currentVault: TYDaemonVault}):
 		<div className={'flex flex-col text-right'}>
 			<b className={'yearn--table-data-section-item-value'}>
 				<Renderable
-					shouldRender={!(currentVault.apr?.type === 'new' && isZero(currentVault.apr.forwardAPR.netAPR))}
-					fallback={'New'}>
+					shouldRender={!currentVault.apr.forwardAPR?.type.includes('new')}
+					fallback={'NEW'}>
 					<RenderAmount
 						shouldHideTooltip={hasZeroAPR}
 						value={currentVault.apr.forwardAPR.netAPR}
@@ -250,7 +248,7 @@ export function VaultForwardAPR({currentVault}: {currentVault: TYDaemonVault}):
 	);
 }
 
-export function VaultHistoricalAPR({currentVault}: {currentVault: TYDaemonVault}): ReactElement {
+function VaultHistoricalAPR({currentVault}: {currentVault: TYDaemonVault}): ReactElement {
 	const hasZeroAPR =
 		isZero(currentVault.apr?.netAPR) || Number(Number(currentVault.apr?.netAPR || 0).toFixed(2)) === 0;
 
@@ -260,8 +258,8 @@ export function VaultHistoricalAPR({currentVault}: {currentVault: TYDaemonVault}
 				<span className={'tooltip'}>
 					<b className={'yearn--table-data-section-item-value'}>
 						<Renderable
-							shouldRender={!(currentVault.apr?.type === 'new' && hasZeroAPR)}
-							fallback={'New'}>
+							shouldRender={!currentVault.apr?.type.includes('new')}
+							fallback={'NEW'}>
 							<span
 								className={
 									'underline decoration-neutral-600/30 decoration-dotted underline-offset-4 transition-opacity hover:decoration-neutral-600'
@@ -313,8 +311,8 @@ export function VaultHistoricalAPR({currentVault}: {currentVault: TYDaemonVault}
 		<div className={'flex flex-col text-right'}>
 			<b className={'yearn--table-data-section-item-value'}>
 				<Renderable
-					shouldRender={!(currentVault.apr?.type === 'new' && hasZeroAPR)}
-					fallback={'New'}>
+					shouldRender={!currentVault.apr?.type.includes('new')}
+					fallback={'NEW'}>
 					<RenderAmount
 						value={currentVault.apr?.netAPR}
 						shouldHideTooltip={hasZeroAPR}