Skip to content

Commit

Permalink
feat: display NEW when APR type includes new
Browse files Browse the repository at this point in the history
  • Loading branch information
Majorfi committed Nov 22, 2023
1 parent abc79c2 commit 9e352bb
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 33 deletions.
30 changes: 14 additions & 16 deletions apps/vaults-v3/components/list/VaultsV3ListRow.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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={
Expand Down Expand Up @@ -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}
Expand All @@ -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}
Expand Down Expand Up @@ -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={
Expand Down Expand Up @@ -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}
Expand All @@ -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'
Expand Down Expand Up @@ -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}
Expand Down
32 changes: 15 additions & 17 deletions apps/vaults/components/list/VaultsListRow.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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={
Expand Down Expand Up @@ -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}
Expand All @@ -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}
Expand Down Expand Up @@ -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={
Expand Down Expand Up @@ -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}
Expand All @@ -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;

Expand All @@ -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'
Expand Down Expand Up @@ -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}
Expand Down

0 comments on commit 9e352bb

Please sign in to comment.