- {{ totalInvestedLabel }}
-
-
-
-
-
-
-
- {{ l2VeBalBalances?.[networkId] }}
- {{ $t('veBAL.hero.tokens.veBAL') }}
-
- {{ totalLockedValue }} {{ $t('veBAL.hero.tokens.veBAL') }}
- {{ $t('inclXInVeBal', [totalVeBalLabel]) }}
-
-
-
- 
-
-
-
-
-
-
- {{ fNum('0', FNumFormats.fiat) }}
-
-
-
-
diff --git a/src/plugins/router/index.ts b/src/plugins/router/index.ts
index dac9d0de3b..1d18aad1a1 100644
--- a/src/plugins/router/index.ts
+++ b/src/plugins/router/index.ts
@@ -28,7 +28,7 @@ const FaucetPage = () => import('@/pages/faucet.vue');
const BalancesPage = () => import('@/pages/balances.vue');
const ClaimSubmissionsPage = () => import('@/pages/claim-submissions.vue');
-const PortfolioPage = () => import('@/pages/portfolio.vue');
+// const PortfolioPage = () => import('@/pages/portfolio.vue');
const RecoveryExitPage = () =>
import('@/pages/recovery-exit/recovery-exit.vue');
@@ -146,11 +146,11 @@ const routes: RouteRecordRaw[] = [
name: 'legacy-claim',
component: LegacyClaimPage,
},
- {
- path: '/:networkSlug/portfolio',
- name: 'portfolio',
- component: PortfolioPage,
- },
+ // {
+ // path: '/:networkSlug/portfolio',
+ // name: 'portfolio',
+ // component: PortfolioPage,
+ // },
{
path: '/:networkSlug/balances',
name: 'balances',
diff --git a/src/providers/local/user-pools.provider.ts b/src/providers/local/user-pools.provider.ts
index 18a5a02fbe..5da5cfc260 100644
--- a/src/providers/local/user-pools.provider.ts
+++ b/src/providers/local/user-pools.provider.ts
@@ -1,115 +1,24 @@
import { InjectionKey } from 'vue';
import { UserStakingResponse } from '@/providers/local/user-staking.provider';
-import { useUserData } from '@/providers/user-data.provider';
-import { Pool, PoolType, allLinearTypes } from '@/services/pool/types';
-import { bnSum } from '@/lib/utils';
import symbolKeys from '@/constants/symbol.keys';
import { safeInject } from '../inject';
-import { useLock } from '@/composables/useLock';
-import usePoolsQuery from '@/composables/queries/usePoolsQuery';
-import { fiatValueOf } from '@/composables/usePoolHelpers';
-import { isQueryLoading } from '@/composables/queries/useQueryHelpers';
-import { isVeBalSupported } from '@/composables/useVeBAL';
-import { useTokens } from '../tokens.provider';
-import { POOLS } from '@/constants/pools';
-
/**
* Provides user pools data. Primarily for the portfolio page.
*/
export const provider = (userStaking: UserStakingResponse) => {
- const {
- stakedPools,
- totalStakedValue,
- refetchStakedPools,
- isLoading: isStakedDataLoading,
- } = userStaking;
-
- // Access user data fetched on wallet connection/change.
- const { userPoolSharesQuery, lockQuery } = useUserData();
- const { data: userPoolShares, refetch: refetchUserPoolShares } =
- userPoolSharesQuery;
-
- const { totalLockedValue } = useLock();
- const { injectTokens } = useTokens();
-
- // Array of pool IDs that the user hasn't staked.
- const unstakedPoolIds = computed((): string[] =>
- Object.keys(userPoolShares.value || {})
- );
-
- // Only fetch unstaked pools if the user has pool shares.
- const isPoolsQueryEnabled = computed(
- (): boolean => unstakedPoolIds.value.length > 0
- );
-
- // Fetch pools that the user hasn't staked.
- const filterOptions = computed(() => ({
- poolIds: unstakedPoolIds.value,
- pageSize: 999,
- poolTypes: [...POOLS.IncludedPoolTypes, ...allLinearTypes] as PoolType[],
- }));
- const unstakedPoolsQuery = usePoolsQuery(filterOptions, {
- enabled: isPoolsQueryEnabled,
- });
- const { data: _unstakedPools } = unstakedPoolsQuery;
-
- // Helper property to drill down to first page of results.
- const unstakedPools = computed(
- (): Pool[] => _unstakedPools.value?.pages[0].pools || []
- );
-
- // Combine staked and unstaked pools.
- const userPools = computed((): Pool[] => [
- ...unstakedPools.value,
- ...stakedPools.value,
- ]);
-
- // Total fiat value of unstaked positions.
- const totalUnstakedValue = computed((): string => {
- return Object.keys(userPoolShares.value || {})
- .reduce((acc, poolId) => {
- const pool = userPools.value.find(pool => pool.id === poolId);
- if (!pool) return acc;
- const bpt = userPoolShares?.value?.[poolId] || '0';
- return acc + Number(fiatValueOf(pool, bpt));
- }, 0)
- .toString();
- });
-
- // Total portfolio fiat value, including staked, unstaked, and locked positions.
- const totalFiatValue = computed((): string =>
- bnSum([
- totalUnstakedValue.value,
- totalStakedValue.value,
- totalLockedValue.value,
- ]).toString()
- );
-
- const isLoading = computed(
- (): boolean =>
- isStakedDataLoading.value ||
- isQueryLoading(userPoolSharesQuery) ||
- isQueryLoading(unstakedPoolsQuery) ||
- (isVeBalSupported.value && isQueryLoading(lockQuery))
- );
+ const { stakedPools, refetchStakedPools } = userStaking;
// Trigger refetch of queries for staked and unstaked pools.
async function refetchAllUserPools() {
- await Promise.all([refetchUserPoolShares(), refetchStakedPools()]);
+ await Promise.all([refetchStakedPools()]);
}
- // Whenever new pools show up in the user pools array, inject their tokens so
- // that we can add the user's balance to the token registry.
- watch(userPools, newUserPools => {
- injectTokens(newUserPools.map(pool => pool.address));
- });
-
return {
stakedPools,
- unstakedPools,
- userPoolShares,
- totalFiatValue,
- isLoading,
+ // unstakedPools,
+ // userPoolShares,
+ // totalFiatValue,
+ // isLoading,
refetchAllUserPools,
};
};
diff --git a/src/providers/user-data.provider.ts b/src/providers/user-data.provider.ts
index 606b35c957..8288b37b31 100644
--- a/src/providers/user-data.provider.ts
+++ b/src/providers/user-data.provider.ts
@@ -6,7 +6,6 @@
import useStakedSharesQuery from '@/composables/queries/useStakedSharesQuery';
import useUserBoostsQuery from '@/composables/queries/useUserBoostsQuery';
import useUserGaugeSharesQuery from '@/composables/queries/useUserGaugeSharesQuery';
-import useUserPoolSharesQuery from '@/composables/queries/useUserPoolSharesQuery';
import useVeBalLockInfoQuery from '@/composables/queries/useVeBalLockInfoQuery';
import symbolKeys from '@/constants/symbol.keys';
import { InjectionKey, provide } from 'vue';
@@ -17,7 +16,7 @@ export const userDataProvider = () => {
* COMPOSABLES
*/
// Fetch all user's pool shares.
- const userPoolSharesQuery = useUserPoolSharesQuery();
+ // const userPoolSharesQuery = useUserPoolSharesQuery();
// Fetches all user's gaugeShares.
const userGaugeSharesQuery = useUserGaugeSharesQuery();
@@ -32,7 +31,7 @@ export const userDataProvider = () => {
const lockQuery = useVeBalLockInfoQuery();
return {
- userPoolSharesQuery,
+ // userPoolSharesQuery,
userGaugeSharesQuery,
stakedSharesQuery,
userBoostsQuery,
diff --git a/tests/msw/rest-handlers.ts b/tests/msw/rest-handlers.ts
index c7fda08c28..6d7c31beec 100644
--- a/tests/msw/rest-handlers.ts
+++ b/tests/msw/rest-handlers.ts
@@ -71,7 +71,7 @@ export const restHandlers = [
}
),
- rest.get('https://api.balancer.fi/check-wallet', (req, res, ctx) => {
+ rest.get('https://xxx.balancer.fi/check-wallet', (req, res, ctx) => {
const query = req.url.searchParams;
const address = query.get('address');
if (address === SANCTIONED_ADDRESS)
-
-
-
-
-
-
-
-
-
-