diff --git a/apps/portal/src/components/widgets/staking/substrate/NominationPoolsStakeSideSheet.tsx b/apps/portal/src/components/widgets/staking/substrate/NominationPoolsStakeSideSheet.tsx
index 8c2d56307..5329fb532 100644
--- a/apps/portal/src/components/widgets/staking/substrate/NominationPoolsStakeSideSheet.tsx
+++ b/apps/portal/src/components/widgets/staking/substrate/NominationPoolsStakeSideSheet.tsx
@@ -1,4 +1,4 @@
-import { ChainProvider, useChainState } from '../../../../domains/chains'
+import { ChainProvider } from '../../../../domains/chains'
import { nominationPoolsEnabledChainsState, type ChainInfo } from '../../../../domains/chains/recoils'
import { useEraEtaFormatter } from '../../../../domains/common/hooks'
import { useApr } from '../../../../domains/staking/substrate/nominationPools'
@@ -7,19 +7,12 @@ import StakeForm from '../../../recipes/StakeForm/StakeForm'
import ErrorBoundary from '../../ErrorBoundary'
import { AssetSelect, ControlledStakeForm } from './StakeForm'
import { CircularProgressIndicator } from '@talismn/ui'
-import { Text } from '@talismn/ui'
import BN from 'bn.js'
import { Suspense, useState, useTransition } from 'react'
import { useSearchParams } from 'react-router-dom'
import { useRecoilValue } from 'recoil'
-const Rewards = () => {
- const chain = useRecoilValue(useChainState())
- const apr = useApr()
-
- if (chain.id === 'avail') return Coming Soon
- return <>{apr.toLocaleString(undefined, { style: 'percent', maximumFractionDigits: 2 })}>
-}
+const Rewards = () => <>{useApr().toLocaleString(undefined, { style: 'percent', maximumFractionDigits: 2 })}>
const EraEta = () => {
return <>{useEraEtaFormatter()(new BN(1))}>
diff --git a/apps/portal/src/components/widgets/staking/substrate/NominationPoolsStatisticsSideSheet.tsx b/apps/portal/src/components/widgets/staking/substrate/NominationPoolsStatisticsSideSheet.tsx
index ec0857a0b..bc81f5c9a 100644
--- a/apps/portal/src/components/widgets/staking/substrate/NominationPoolsStatisticsSideSheet.tsx
+++ b/apps/portal/src/components/widgets/staking/substrate/NominationPoolsStatisticsSideSheet.tsx
@@ -305,13 +305,7 @@ const ExistingPool = (props: NominationPoolsStatisticsSideSheetProps & { pool: D
poolStatus={props.pool.status}
balance={{balance.decimalAmount.toLocaleString()}}
rewards={{last15DaysTotalPayouts.toLocaleString()}}
- apr={
- chain.id === 'avail' ? (
- Coming Soon
- ) : (
- stakedReturn.toLocaleString(undefined, { style: 'percent' })
- )
- }
+ apr={stakedReturn.toLocaleString(undefined, { style: 'percent' })}
nextEraEta={useEraEtaFormatter()(1)}
unbondings={useMemo(
() =>
diff --git a/apps/portal/src/components/widgets/staking/substrate/StakeCalculatorDialog.tsx b/apps/portal/src/components/widgets/staking/substrate/StakeCalculatorDialog.tsx
index 9a5bbc21d..20b7f8f52 100644
--- a/apps/portal/src/components/widgets/staking/substrate/StakeCalculatorDialog.tsx
+++ b/apps/portal/src/components/widgets/staking/substrate/StakeCalculatorDialog.tsx
@@ -4,7 +4,6 @@ import { useApr } from '../../../../domains/staking/substrate/nominationPools'
import StakeCalculatorDialogComponent from '../../../recipes/StakeCalculatorDialog'
import ErrorBoundary from '../../ErrorBoundary'
import { AssetSelect } from './StakeForm'
-import { Text } from '@talismn/ui'
import BN from 'bn.js'
import { Suspense, useDeferredValue, useMemo, useState, useTransition } from 'react'
import { useRecoilValue } from 'recoil'
@@ -12,7 +11,6 @@ import { useRecoilValue } from 'recoil'
type StakeCalculatorDialogProps = { open?: boolean; onRequestDismiss: () => unknown }
const EstimatedYield = (props: { amount: string }) => {
- const chain = useRecoilValue(useChainState())
const stakedReturn = useApr()
const amount = useTokenAmount(props.amount)
@@ -30,16 +28,6 @@ const EstimatedYield = (props: { amount: string }) => {
const dailyYield = useTokenAmountFromPlanck(useMemo(() => bnPlanck?.divn(365), [bnPlanck]))
- if (chain.id === 'avail')
- return (
- Coming Soon}
- monthlyYield={monthlyYield.decimalAmount?.toLocaleString()}
- weeklyYield={weeklyYield.decimalAmount?.toLocaleString()}
- dailyYield={dailyYield.decimalAmount?.toLocaleString()}
- />
- )
-
return (
(props: {
const EstimatedYield = memo(
(props: { amount: Decimal }) => {
- const chain = useRecoilValue(Chains_useChainState())
const stakedReturn = useApr()
const annualReturn = useMemo(
() => new BN(props.amount.planck.toString()).muln(stakedReturn),
@@ -255,9 +253,6 @@ const EstimatedYield = memo(
)
const parsedAnnualReturn = useTokenAmountFromPlanck(annualReturn)
- if (chain.id === 'avail')
- return Coming Soon} fiatAmount={null} />
-
return (
{
- const chain = useRecoilValue(useChainState())
- const apr = useApr()
-
- if (chain.id === 'avail') return Coming Soon
- return <>{apr.toLocaleString(undefined, { style: 'percent', maximumFractionDigits: 2 })}>
-}
+const Apr = () => <>{useApr().toLocaleString(undefined, { style: 'percent', maximumFractionDigits: 2 })}>
const useAvailableBalance = () => {
const apiId = usePolkadotApiId()