Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: utilize grossYield for app display #2351

Merged
merged 2 commits into from
Sep 9, 2022
Merged

refactor: utilize grossYield for app display #2351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9982d43
test: update snapshots
okjintao Sep 8, 2022
8ebecf2
refactor: utilize all gross apr
okjintao Sep 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/components-v2/InfluenceVault/InfluenceVaultPerfomanceTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ const InfluenceVaultPerfomanceTab = ({ vault, config }: Props): JSX.Element => {
const classes = useStyles();
const sortedSources = vault.apy.sources
.slice()
.sort((a, b) => (b.performance.baseYield > a.performance.baseYield ? 1 : -1));
const apy = vaults.vaultsFilters.showAPR ? vault.apr : vault.apy;
.sort((a, b) => (b.performance.grossYield > a.performance.grossYield ? 1 : -1));
const apy = vault.apy;
const lockedBalance = lockedDeposits.getLockedDepositBalances(vault.underlyingToken);
const { processingEmissions, emissionsSchedules, swapPercentage } = influenceVaultStore.getInfluenceVault(
vault.vaultToken,
Expand Down Expand Up @@ -96,7 +96,7 @@ const InfluenceVaultPerfomanceTab = ({ vault, config }: Props): JSX.Element => {
APY
</Typography>
<Typography variant="body1" display="inline">
{numberWithCommas(String(apy.baseYield.toFixed(2)))}%
{numberWithCommas(String(apy.grossYield.toFixed(2)))}%
</Typography>
</Box>
<Divider className={classes.divider} />
Expand Down
1 change: 0 additions & 1 deletion src/components-v2/VaultApyBreakdownItem/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ const VaultApyBreakdownItem = ({ vault, source }: Props): JSX.Element => {
const maxBoost = calculateUserBoost(MAX_BOOST_RANK.stakeRatioBoundary);
const userBoost = user.accountDetails?.boost ?? 1;

// TODO: this is now duplicated p sure - probably should do a helper fn
const sourceApr = source.boostable
? source.minApr + (source.maxApr - source.minApr) * (userBoost / maxBoost)
: source.apr;
Expand Down
10 changes: 5 additions & 5 deletions src/components-v2/VaultApyInformation/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,13 +130,13 @@ export interface YieldValueSource extends ValueSource {
* @returns value source derived from yield source
*/
export function yieldToValueSource(source: YieldSource): ValueSource {
const { baseYield, minYield, maxYield } = source.performance;
const { grossYield, minGrossYield, maxGrossYield } = source.performance;
return {
name: source.name,
apr: baseYield,
apr: grossYield,
boostable: source.boostable,
minApr: minYield,
maxApr: maxYield,
minApr: minGrossYield,
maxApr: maxGrossYield,
};
}

Expand All @@ -150,7 +150,7 @@ const VaultApyInformation = ({ open, onClose, boost, vault, projectedBoost }: Pr
const classes = useStyles();
const sortedSources = sources
.slice()
.sort((a, b) => (isBadgerSource(b) ? -1 : b.performance.baseYield > a.performance.baseYield ? 1 : -1));
.sort((a, b) => (isBadgerSource(b) ? -1 : b.performance.grossYield > a.performance.grossYield ? 1 : -1));
const badgerRewardsSources = sortedSources.filter(isBadgerSource);
const harvestSources: YieldSourceDisplay[] = harvestPeriodSourcesApy;
const additionalSources: YieldSourceDisplay[] = nonHarvestSourcesApy.map(yieldToValueSource);
Expand Down
2 changes: 1 addition & 1 deletion src/hooks/useVaultInformation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export function useVaultInformation(vault: VaultDTOV3): VaultInformation {

const depositBalance = user.getBalance(vaultToken);
const boostContribution = getBoostContribution(vault, user.accountDetails?.boost ?? 0);
const vaultBoost = apy.baseYield + boostContribution;
const vaultBoost = apy.grossYield + boostContribution;

let projectedVaultBoost = null;
if (vault.version === VaultVersion.v1_5) {
Expand Down
Loading