Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ PERSONAL_TENDERLY_API_KEY=
PERSONAL_ACCOUNT_SLUG=
PERSONAL_PROJECT_SLUG=
PERSONAL_TENDERLY_RPC_NAME=
TENDERLY_TEST_TX_FROM_ADDRESS=

VITE_ALCHEMY_KEY=
VITE_INFURA_PROJECT_ID=
Expand Down
4 changes: 3 additions & 1 deletion scripts/tenderly-vnet-status.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import {
selectMatchingTenderlyVnet
} from './tenderly-vnet-status'

const TEST_TX_FROM_ADDRESS = process.env.TENDERLY_TEST_TX_FROM_ADDRESS ?? '0x2222222222222222222222222222222222222222'

describe('tenderly-vnet-status', () => {
it('defaults to the webops profile', () => {
expect(
Expand Down Expand Up @@ -137,7 +139,7 @@ describe('tenderly-vnet-status', () => {
createdAtAgeLabel: '8s',
blockNumber: 24_735_515,
txHash: '0xb00dc057e50c8926896495cb31717bfa7ab47608673789b4b7b478ec114080cb',
from: '0x5b0d3243c78fb9d4ac035fb2384ffdf7a9ef6396',
from: 'TEST_TX_FROM_ADDRESS',
to: '0xc56413869c6cdf96496f2b1ef801fedbdfa7ddb0'
}
],
Expand Down
35 changes: 27 additions & 8 deletions src/components/pages/portfolio/hooks/usePortfolioModel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
} from '@pages/vaults/domain/kongVaultSelectors'
import { getCanonicalHoldingsVaultAddress } from '@pages/vaults/domain/normalizeVault'
import { isNonYearnErc4626Vault } from '@pages/vaults/domain/vaultWarnings'
import { getHeldYieldSplitterModeSummary } from '@pages/vaults/domain/yieldSplitterModes'
import { type TPossibleSortBy, useSortVaults } from '@pages/vaults/hooks/useSortVaults'
import { useYvUsdCharts } from '@pages/vaults/hooks/useYvUsdCharts'
import { useYvUsdVaults } from '@pages/vaults/hooks/useYvUsdVaults'
Expand Down Expand Up @@ -232,17 +233,20 @@ export function usePortfolioModel(): TPortfolioModel {

visibleHoldingsVaults.forEach((vault) => {
const key = getVaultKey(vault)
const yieldModeSummary = getHeldYieldSplitterModeSummary(vault, allVaults, getBalance)
flags[key] = {
hasHoldings: true,
isMigratable: Boolean(getVaultMigration(vault)?.available),
isRetired: Boolean(getVaultInfo(vault)?.isRetired),
isHidden: Boolean(getVaultInfo(vault)?.isHidden),
isNotYearn: isYvUsdVault(vault) ? false : isNonYearnErc4626Vault({ vault: vault as TKongVault })
isNotYearn: isYvUsdVault(vault) ? false : isNonYearnErc4626Vault({ vault: vault as TKongVault }),
yieldModeLabel: yieldModeSummary?.label,
yieldModeTooltip: yieldModeSummary?.tooltip
}
})

return flags
}, [visibleHoldingsVaults])
}, [allVaults, getBalance, visibleHoldingsVaults])

const isSearchingBalances =
(isActive || isUserConnecting) && (isWalletLoading || isUserConnecting || isIdentityLoading)
Expand Down Expand Up @@ -280,12 +284,27 @@ export function usePortfolioModel(): TPortfolioModel {

const holdingsRows = useMemo(
() =>
sortedHoldings.map((vault) => ({
key: getVaultKey(vault),
vault,
hrefOverride: getPortfolioRowHref(vault)
})),
[sortedHoldings]
sortedHoldings.map((vault) => {
const modeSummary = getHeldYieldSplitterModeSummary(vault, allVaults, getBalance)
const baseHref = getPortfolioRowHref(vault)

if (!modeSummary?.preferredVaultAddress) {
return {
key: getVaultKey(vault),
vault,
hrefOverride: baseHref
}
}

return {
key: getVaultKey(vault),
vault,
hrefOverride: baseHref
? `${baseHref}?yieldMode=${modeSummary.preferredVaultAddress}`
: `/vaults/${getVaultChainID(vault)}/${toAddress(getVaultAddress(vault))}?yieldMode=${modeSummary.preferredVaultAddress}`
}
}),
[allVaults, getBalance, sortedHoldings]
)

const suggestedRows = useMemo((): TSuggestedItem[] => {
Expand Down
Loading
Loading