Skip to content

Commit 1928444

Browse files
authored
Fix unbonding flow (#856)
* fix pool stats data reference * testnet release 2.14.25 * fix unbonding flow * testnet release 2.14.26
1 parent 1e0d956 commit 1928444

File tree

4 files changed

+21
-19
lines changed

4 files changed

+21
-19
lines changed

app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "app",
3-
"version": "2.14.24",
3+
"version": "2.14.26",
44
"private": true,
55
"scripts": {
66
"bump": "bump patch --tag --commit 'testnet release '",

app/src/domains/clp/queries/liquidityProvider.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,17 @@ export const useLiquidityProviderQuery = (
5454
services.chains.get(Network.SIFCHAIN),
5555
);
5656

57-
const liquidityProvider =
58-
await sifchainClients.queryClient.clp.GetLiquidityProvider({
59-
lpAddress: walletAddress,
60-
symbol: externalAssetEntryQuery.data.value?.denom ?? "",
61-
});
57+
const liquidityProvider = externalAssetEntryQuery.data.value?.denom
58+
? await sifchainClients.queryClient.clp.GetLiquidityProvider({
59+
lpAddress: walletAddress,
60+
symbol: externalAssetEntryQuery.data.value?.denom,
61+
})
62+
: null;
6263

6364
const currentHeight = await sifchainClients.signingClient.getHeight();
6465

6566
const lpWithAddedDetails =
66-
liquidityProvider.liquidityProvider === undefined ||
67+
liquidityProvider?.liquidityProvider === undefined ||
6768
rewardsParamsQuery.data.value?.params === undefined
6869
? undefined
6970
: addDetailToLiquidityProvider(

app/src/domains/clp/queries/unlockLiquidityByPercentage.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@ export const useUnlockLiquidityByPercentage = (
1515
const tokenEntries = useTokenRegistryEntriesQuery();
1616

1717
return computed(() => {
18-
if (!isNil(lpQuery.error.value) || !isNil(tokenEntries.error.value)) {
18+
if (!isNil(lpQuery?.error.value) || !isNil(tokenEntries.error.value)) {
1919
return { status: "rejected" as const };
2020
}
2121

22-
if (lpQuery.isLoading.value || tokenEntries.isLoading.value) {
22+
if (lpQuery?.isLoading.value || tokenEntries.isLoading.value) {
2323
return { status: "pending" as const };
2424
}
2525

26-
const externalAssetBalance = lpQuery.data.value?.externalAssetBalance;
27-
const nativeAssetBalance = lpQuery.data.value?.nativeAssetBalance;
28-
const lp = lpQuery.data.value?.liquidityProvider;
26+
const externalAssetBalance = lpQuery?.data.value?.externalAssetBalance;
27+
const nativeAssetBalance = lpQuery?.data.value?.nativeAssetBalance;
28+
const lp = lpQuery?.data.value?.liquidityProvider;
2929

3030
const externalAssetFractionalDigits =
3131
tokenEntries.data.value?.registry?.entries

app/src/views/PoolPage/children/UnbondLiquidity.tsx

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { useCurrentRewardPeriodStatistics } from "~/domains/clp/queries/params";
88
import { useUnlockLiquidityByPercentage } from "~/domains/clp/queries/unlockLiquidityByPercentage";
99
import { useAppWalletPicker } from "~/hooks/useAppWalletPicker";
1010
import { useAssetBySymbol } from "~/hooks/useAssetBySymbol";
11-
import { usePoolStats } from "~/hooks/usePoolStats";
11+
import { PoolStat, usePoolStats } from "~/hooks/usePoolStats";
1212
import { useDeliverTxDetails } from "~/hooks/useTransactionDetails";
1313
import { useWalletButton } from "~/hooks/useWalletButton";
1414
import { accountStore } from "~/store/modules/accounts";
@@ -67,12 +67,13 @@ const UnbondLiquidity = defineComponent({
6767
.toNumber(),
6868
);
6969

70-
const externalAssetPriceUsd = computed(
71-
() =>
72-
poolStats.data.value?.poolData.pools.find(
73-
(x) => x.symbol === externalAssetBaseDenom.value,
74-
)?.priceToken,
75-
);
70+
const externalAssetPriceUsd = computed(() => {
71+
const poolData = poolStats.data?.value?.poolData;
72+
const pools = poolData?.pools as Record<string, PoolStat>;
73+
return Object.values(pools).find(
74+
(x) => x.symbol === externalAssetBaseDenom.value,
75+
)?.priceToken;
76+
});
7677

7778
const externalAssetWithdrawalUsd = computed(() => {
7879
return Amount(withdrawData.withdrawExternalAssetAmount.value)

0 commit comments

Comments
 (0)