feat: update vault schema & display spot price for v3

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.3.5 (29/12/2023)
+
+-   Feat: Update the vault schema to take into account the new V3 composite elements.
+-   Feat: For the V3 vaults, display the spot expected APR next to the Net APR.
+
 # 0.3.4 (22/12/2023)
 
 -   Fix: display v3 vaults on the V2 app.

apps/common/schemas/yDaemonVaultsSchemas.ts

@@ -129,7 +129,9 @@ export const yDaemonVaultSchema = z.object({
 						boostedAPR: z.number().default(0).catch(0),
 						baseAPR: z.number().default(0).catch(0),
 						cvxAPR: z.number().default(0).catch(0),
-						rewardsAPR: z.number().default(0).catch(0)
+						rewardsAPR: z.number().default(0).catch(0),
+						v3OracleCurrentAPR: z.number().default(0).catch(0),
+						v3OracleStratRatioAPR: z.number().default(0).catch(0)
 					})
 					.default({})
 			})

apps/vaults-v3/components/list/VaultsV3ListRow.tsx

@@ -231,6 +231,37 @@ function VaultForwardAPR({currentVault}: {currentVault: TYDaemonVault}): ReactEl
 		);
 	}
 
+	const hasV3Composite =
+		!isZero(currentVault?.apr?.forwardAPR.composite.v3OracleCurrentAPR) &&
+		!isZero(currentVault?.apr?.forwardAPR.composite.v3OracleStratRatioAPR);
+	if (hasV3Composite) {
+		return (
+			<div className={'-mb-0 flex flex-col md:-mb-4 md:text-right'}>
+				<b className={'yearn--table-data-section-item-value transition-opacity'}>
+					<Renderable
+						shouldRender={!currentVault.apr.forwardAPR?.type.includes('new')}
+						fallback={'NEW'}>
+						<RenderAmount
+							shouldHideTooltip
+							value={currentVault?.apr?.forwardAPR.composite.v3OracleStratRatioAPR}
+							symbol={'percent'}
+							decimals={6}
+						/>
+					</Renderable>
+				</b>
+				<small className={'text-xs text-neutral-900/40'}>
+					{`SPOT: `}
+					<RenderAmount
+						shouldHideTooltip
+						value={currentVault?.apr?.forwardAPR.composite.v3OracleCurrentAPR}
+						symbol={'percent'}
+						decimals={6}
+					/>
+				</small>
+			</div>
+		);
+	}
+
 	const hasZeroAPR = isZero(currentVault.apr?.netAPR) || Number((currentVault.apr?.netAPR || 0).toFixed(2)) === 0;
 	return (
 		<div className={'flex flex-col md:text-right'}>
@@ -240,7 +271,7 @@ function VaultForwardAPR({currentVault}: {currentVault: TYDaemonVault}): ReactEl
 					fallback={'NEW'}>
 					<RenderAmount
 						shouldHideTooltip={hasZeroAPR}
-						value={currentVault.apr.forwardAPR.netAPR}
+						value={currentVault.apr.netAPR}
 						symbol={'percent'}
 						decimals={6}
 					/>