fix: inline staking adjustments (#1645)

* fix: consider withdrawable as soon as unbounding era is reached * fix: nom pool name cleanup
TalismanSociety · Oct 10, 2024 · e376d3a · e376d3a
1 parent c66fd3a
commit e376d3a
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 15 deletions.
diff --git a/apps/extension/src/ui/domains/Portfolio/AssetDetails/useChainTokenBalances.ts b/apps/extension/src/ui/domains/Portfolio/AssetDetails/useChainTokenBalances.ts
@@ -6,6 +6,7 @@ import { useTranslation } from "react-i18next"
 
 import { Address, Balances } from "@extension/core"
 import { sortBigBy } from "@talisman/util/bigHelper"
+import { cleanupNomPoolName } from "@ui/domains/Staking/helpers"
 import { useBalancesStatus } from "@ui/hooks/useBalancesStatus"
 import useChain from "@ui/hooks/useChain"
 import { useSelectedCurrency } from "@ui/hooks/useCurrency"
@@ -96,12 +97,8 @@ export const useChainTokenBalances = ({ chainId, balances }: ChainTokenBalancesP
       b.nompools.map((nomPool, index) => ({
         key: `${b.id}-nomPool-${index}`,
         title: getLockTitle(nomPool, { balance: b }),
-
-        description:
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          (nomPool.meta as any)?.description
-            ?.replace(": app.talisman.xyz/staking", "")
-            .replace(" | Auto-Compound > $2USD", "") ?? undefined,
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        description: cleanupNomPoolName((nomPool.meta as any).description) ?? undefined,
         tokens: BigNumber(nomPool.amount.tokens),
         fiat: nomPool.amount.fiat(currency),
         locked: true,

diff --git a/apps/extension/src/ui/domains/Staking/NomPoolWithdraw/useNomPoolWithdrawWizard.ts b/apps/extension/src/ui/domains/Staking/NomPoolWithdraw/useNomPoolWithdrawWizard.ts
@@ -76,7 +76,7 @@ export const useNomPoolWithdrawWizard = () => {
   const pointsToWithdraw = useMemo(() => {
     if (!currentEra || !pool) return null
     return pool.unbonding_eras
-      .filter(([era]) => era < currentEra)
+      .filter(([era]) => era <= currentEra)
       .reduce((acc, [, points]) => acc + points, 0n)
   }, [currentEra, pool])
 

diff --git a/apps/extension/src/ui/domains/Staking/helpers.ts b/apps/extension/src/ui/domains/Staking/helpers.ts
@@ -159,3 +159,8 @@ export const getNomPoolStakingPayload = async (
         { address }
       )
 }
+export const cleanupNomPoolName = (name: string | null | undefined) =>
+  name
+    ?.replace(": app.talisman.xyz/staking", "")
+    .replace(" | Auto-Compound > $2USD", "")
+    .replace(" | Auto-Compound > 1 DOT", "") ?? null
diff --git a/apps/extension/src/ui/domains/Staking/shared/useNomPoolName.ts b/apps/extension/src/ui/domains/Staking/shared/useNomPoolName.ts
@@ -4,6 +4,8 @@ import { ChainId } from "extension-core"
 
 import { useScaleApi } from "@ui/hooks/sapi/useScaleApi"
 
+import { cleanupNomPoolName } from "../helpers"
+
 export const useNomPoolName = (
   chainId: ChainId | null | undefined,
   poolId: number | null | undefined
@@ -17,12 +19,7 @@ export const useNomPoolName = (
 
       const metadata = await sapi.getStorage<Binary>("NominationPools", "Metadata", [poolId])
 
-      return (
-        metadata
-          ?.asText()
-          .replace(": app.talisman.xyz/staking", "")
-          .replace(" | Auto-Compound > $2USD", "") ?? null
-      )
+      return cleanupNomPoolName(metadata?.asText())
     },
     enabled: !!sapi,
     refetchInterval: false,

diff --git a/apps/extension/src/ui/domains/Staking/shared/useNomPoolStakingStatus.ts b/apps/extension/src/ui/domains/Staking/shared/useNomPoolStakingStatus.ts
@@ -79,7 +79,7 @@ export const useNomPoolStakingStatus = (tokenId: TokenId) => {
           const unbondingEras =
             nomPoolStakingByAddress[address]?.unbonding_eras.map(([era]) => era) ?? []
           const maxUnbondingEra = Math.max(...unbondingEras)
-          const erasToUnbonding = currentEra < maxUnbondingEra ? maxUnbondingEra - currentEra : 0
+          const erasToUnbonding = currentEra <= maxUnbondingEra ? maxUnbondingEra - currentEra : 0
 
           return {
             address,
@@ -88,7 +88,7 @@ export const useNomPoolStakingStatus = (tokenId: TokenId) => {
             isNomPoolsStaking: !!nomPoolStakingByAddress[address],
             canBondNomPool: !soloStakingByAddress[address] && !!transferableByAddress[address],
             canUnstake: nomPoolStakingByAddress[address]?.points,
-            canWithdraw: maxUnbondingEra < currentEra,
+            canWithdraw: maxUnbondingEra <= currentEra,
             canWithdrawIn: await getWithdrawWaitDuration(sapi, erasToUnbonding),
           }
         })