feat: add a check on the isFinished

yearn · Jul 29, 2024 · 707d30d · 707d30d
1 parent 2e2ae9b
commit 707d30d
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 18 deletions.
diff --git a/components/v1/ListViewVault.tsx b/components/v1/ListViewVault.tsx
@@ -97,9 +97,11 @@ export function ListViewVault(props: TVaultUIProps): ReactElement {
 						<span
 							suppressHydrationWarning
 							className={'col-span-2 flex flex-col gap-2'}>
-							{`${formatWithUnit(Number(onChainData?.weeklyStakingRewards || 0), 0, 0, {
-								locales: ['en-US']
-							})}/week`}
+							{onChainData?.weeklyStakingRewards === 0
+								? 'None'
+								: `${formatWithUnit(Number(onChainData?.weeklyStakingRewards || 0), 0, 0, {
+										locales: ['en-US']
+									})}/week`}
 							<span
 								suppressHydrationWarning
 								className={'col-span-2 text-xs font-normal text-neutral-700'}>

diff --git a/components/v1/StakerWithReward.tsx b/components/v1/StakerWithReward.tsx
@@ -455,9 +455,11 @@ function DesktopStats(props: {vault: TVaultData}): ReactElement {
 				<b
 					suppressHydrationWarning
 					className={'block break-all text-3xl text-neutral-900'}>
-					{`${formatWithUnit(Number(props.vault.onChainData?.weeklyStakingRewards || 0), 0, 0, {
-						locales: ['en-US']
-					})}/week`}
+					{props.vault.onChainData?.weeklyStakingRewards || 0 === 0
+						? 'None'
+						: `${formatWithUnit(Number(props.vault.onChainData?.weeklyStakingRewards || 0), 0, 0, {
+								locales: ['en-US']
+							})}/week`}
 				</b>
 			</div>
 			<div className={'rounded-lg border-2 border-neutral-900 bg-beige p-4 leading-4'}>
@@ -520,9 +522,11 @@ function MobileStats(props: {vault: TVaultData}): ReactElement {
 					<b
 						className={'block text-neutral-900'}
 						suppressHydrationWarning>
-						{`${formatWithUnit(Number(props.vault.onChainData?.weeklyStakingRewards || 0), 0, 0, {
-							locales: ['en-US']
-						})}/week`}
+						{props.vault.onChainData?.weeklyStakingRewards || 0 === 0
+							? 'None'
+							: `${formatWithUnit(Number(props.vault.onChainData?.weeklyStakingRewards || 0), 0, 0, {
+									locales: ['en-US']
+								})}/week`}
 					</b>
 				</div>
 				<div className={'flex items-center justify-between'}>

diff --git a/components/v2/ListViewVault.tsx b/components/v2/ListViewVault.tsx
@@ -97,9 +97,11 @@ export function ListViewVault(props: TVaultUIProps): ReactElement {
 						<span
 							suppressHydrationWarning
 							className={'col-span-2 flex flex-col gap-2'}>
-							{`${formatWithUnit(Number(onChainData?.weeklyStakingRewards || 0), 0, 0, {
-								locales: ['en-US']
-							})}/week`}
+							{onChainData?.weeklyStakingRewards === 0
+								? 'None'
+								: `${formatWithUnit(Number(onChainData?.weeklyStakingRewards || 0), 0, 0, {
+										locales: ['en-US']
+									})}/week`}
 							<span
 								suppressHydrationWarning
 								className={'col-span-2 text-xs font-normal text-neutral-700'}>

diff --git a/components/v2/StakerWithReward.tsx b/components/v2/StakerWithReward.tsx
@@ -435,9 +435,11 @@ function DesktopStats(props: {vault: TVaultData}): ReactElement {
 				<b
 					suppressHydrationWarning
 					className={'block break-all text-3xl text-neutral-900'}>
-					{`${formatWithUnit(Number(props.vault.onChainData?.weeklyStakingRewards || 0), 0, 0, {
-						locales: ['en-US']
-					})}/week`}
+					{props.vault.onChainData?.weeklyStakingRewards || 0 === 0
+						? 'None'
+						: `${formatWithUnit(Number(props.vault.onChainData?.weeklyStakingRewards || 0), 0, 0, {
+								locales: ['en-US']
+							})}/week`}
 				</b>
 			</div>
 			<div className={'rounded-lg border-2 border-neutral-900 bg-beige p-4 leading-4'}>
@@ -485,9 +487,11 @@ function MobileStats(props: {vault: TVaultData}): ReactElement {
 					<b
 						className={'block text-neutral-900'}
 						suppressHydrationWarning>
-						{`${formatWithUnit(Number(props.vault.onChainData?.weeklyStakingRewards || 0), 0, 0, {
-							locales: ['en-US']
-						})}/week`}
+						{props.vault.onChainData?.weeklyStakingRewards || 0 === 0
+							? 'None'
+							: `${formatWithUnit(Number(props.vault.onChainData?.weeklyStakingRewards || 0), 0, 0, {
+									locales: ['en-US']
+								})}/week`}
 					</b>
 				</div>
 				<div className={'flex items-center justify-between'}>