diff --git a/components/portfolio/MarketPositions.tsx b/components/portfolio/MarketPositions.tsx index 8415a638c..5236c34ca 100644 --- a/components/portfolio/MarketPositions.tsx +++ b/components/portfolio/MarketPositions.tsx @@ -170,104 +170,104 @@ export const MarketPositions = ({ ); }; - if (positions.some(displayBalance)) { - return ( -
- - displayBalance(pos)) - .map( - ({ - assetId, - price, - userBalance, - outcome, - changePercentage, - market, - avgCost, - rpnl, - upnl, - }) => { - const baseAssetUsdPrice = lookUpAssetPrice( - market.baseAsset, - foreignAssetPrices, - usdZtgPrice, - ); - return { - outcome: outcome, - userBalance: userBalance.div(ZTG).toNumber(), - price: { - value: price.toNumber(), - usdValue: price.mul(baseAssetUsdPrice ?? 0).toNumber(), - }, - cost: { - value: avgCost, - usdValue: new Decimal(avgCost) - .mul(baseAssetUsdPrice ?? 0) - .toNumber(), - }, - upnl: { - value: upnl, - usdValue: new Decimal(upnl) - .mul(baseAssetUsdPrice ?? 0) - .toNumber(), - }, - rpnl: { - value: rpnl, - usdValue: new Decimal(rpnl) - .mul(baseAssetUsdPrice ?? 0) - .toNumber(), - }, - value: { - value: userBalance.mul(price).div(ZTG).toNumber(), - usdValue: userBalance - .mul(price) - .mul(baseAssetUsdPrice ?? 0) - .div(ZTG) - .toNumber(), - }, - change: isNaN(changePercentage) - ? 0 - : changePercentage.toFixed(1), - actions: ( -
- {IOPoolShareAssetId.is(assetId) ? ( - - ) : marketStage?.type === "Trading" && - IOMarketOutcomeAssetId.is(assetId) ? ( - - ) : marketStage?.type === "Resolved" ? ( - - ) : IOMarketOutcomeAssetId.is(assetId) && - marketStage?.type === "Reported" ? ( - - ) : IOMarketOutcomeAssetId.is(assetId) && - (marketStage?.type === "OpenReportingPeriod" || - (marketStage?.type === "OracleReportingPeriod" && - isOracle)) ? ( - - ) : ( - "" - )} -
- ), - }; - }, - )} - /> - - ); - } + // if (positions.some(displayBalance)) { + return ( +
+ +
displayBalance(pos)) + .map( + ({ + assetId, + price, + userBalance, + outcome, + changePercentage, + market, + avgCost, + rpnl, + upnl, + }) => { + const baseAssetUsdPrice = lookUpAssetPrice( + market.baseAsset, + foreignAssetPrices, + usdZtgPrice, + ); + return { + outcome: outcome, + userBalance: userBalance.div(ZTG).toNumber(), + price: { + value: price.toNumber(), + usdValue: price.mul(baseAssetUsdPrice ?? 0).toNumber(), + }, + cost: { + value: avgCost, + usdValue: new Decimal(avgCost) + .mul(baseAssetUsdPrice ?? 0) + .toNumber(), + }, + upnl: { + value: upnl, + usdValue: new Decimal(upnl) + .mul(baseAssetUsdPrice ?? 0) + .toNumber(), + }, + rpnl: { + value: rpnl, + usdValue: new Decimal(rpnl) + .mul(baseAssetUsdPrice ?? 0) + .toNumber(), + }, + value: { + value: userBalance.mul(price).div(ZTG).toNumber(), + usdValue: userBalance + .mul(price) + .mul(baseAssetUsdPrice ?? 0) + .div(ZTG) + .toNumber(), + }, + change: isNaN(changePercentage) + ? 0 + : changePercentage.toFixed(1), + actions: ( +
+ {IOPoolShareAssetId.is(assetId) ? ( + + ) : marketStage?.type === "Trading" && + IOMarketOutcomeAssetId.is(assetId) ? ( + + ) : marketStage?.type === "Resolved" ? ( + + ) : IOMarketOutcomeAssetId.is(assetId) && + marketStage?.type === "Reported" ? ( + + ) : IOMarketOutcomeAssetId.is(assetId) && + (marketStage?.type === "OpenReportingPeriod" || + (marketStage?.type === "OracleReportingPeriod" && + isOracle)) ? ( + + ) : ( + "" + )} +
+ ), + }; + }, + )} + /> + + ); + // } return <>; }; diff --git a/lib/util/calc-resolved-market-prices.ts b/lib/util/calc-resolved-market-prices.ts index 33aafa8ec..c5be5e994 100644 --- a/lib/util/calc-resolved-market-prices.ts +++ b/lib/util/calc-resolved-market-prices.ts @@ -1,4 +1,4 @@ -import { FullMarketFragment, ScoringRule } from "@zeitgeistpm/indexer"; +import { FullMarketFragment } from "@zeitgeistpm/indexer"; import Decimal from "decimal.js"; import { MarketPrices } from "lib/hooks/queries/useMarketSpotPrices"; import { calcScalarResolvedPrices } from "./calc-scalar-winnings"; @@ -8,14 +8,9 @@ import { IOBaseAssetId, MarketId } from "@zeitgeistpm/sdk"; export const calcResolvedMarketPrices = ( market: FullMarketFragment, ): MarketPrices => { - const assetIds = ( - market.scoringRule === ScoringRule.AmmCdaHybrid || - market.scoringRule === ScoringRule.Lmsr - ? market.neoPool?.account.balances.map((b) => - parseAssetIdString(b.assetId), - ) - : market?.assets.map((a) => parseAssetIdString(a.assetId)) - )?.filter((assetId) => IOBaseAssetId.is(assetId) === false); + const assetIds = market.assets + .map((a) => parseAssetIdString(a.assetId)) + .filter((assetId) => IOBaseAssetId.is(assetId) === false); const spotPrices: MarketPrices = new Map(); diff --git a/pages/portfolio/[address].tsx b/pages/portfolio/[address].tsx index 47134eb1e..f422999d2 100644 --- a/pages/portfolio/[address].tsx +++ b/pages/portfolio/[address].tsx @@ -133,9 +133,9 @@ const Portfolio: NextPageWithLayout = () => { (marketPositions) => { const market = marketPositions[0].market; - marketPositions = marketPositions.filter((position) => - position.userBalance.gt(0), - ); + // marketPositions = marketPositions.filter((position) => + // position.userBalance.gt(0), + // ); if ( market.status === "Resolved" && @@ -156,9 +156,12 @@ const Portfolio: NextPageWithLayout = () => { className="mb-8" market={market} usdZtgPrice={ztgPrice} - positions={marketPositions.filter((position) => - position.userBalance.gt(0), - )} + positions={ + marketPositions + // .filter((position) => + // position.userBalance.gt(0), + // ) + } /> ); },