Skip to content

Commit b4b51f7

Browse files
blackpanther1881blackpanther1881
committed
fix ibc denom issue
1 parent 7fbb456 commit b4b51f7

File tree

16 files changed

+57
-69
lines changed

16 files changed

+57
-69
lines changed

‎package-lock.json‎

Lines changed: 4 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"lodash": "^4.17.21",
3737
"moment": "^2.29.1",
3838
"mui-datatables": "^3.7.6",
39-
"persistenceonejs": "^3.0.1",
39+
"persistenceonejs": "^3.0.2",
4040
"prettier": "^2.8.8",
4141
"process": "^0.11.10",
4242
"qrcode.react": "^1.0.1",

‎src/containers/Common/ModalVIewAmountDetails/index.js‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import { Modal } from "react-bootstrap";
22
import React, { useState } from "react";
33
import { connect } from "react-redux";
4-
import helper, { tokenValueConversion } from "../../../utils/helper";
4+
import helper, { getDenomFromMinimalDenom, tokenValueConversion } from "../../../utils/helper";
55
import { useTranslation } from "react-i18next";
66
import { decimalize, formatNumber } from "../../../utils/scripts";
77
import NumberView from "../../../components/NumberView";
88
import ReactGA from "react-ga4";
99
import { DefaultChainInfo, PstakeInfo } from "../../../config";
10+
import { QueryClientImpl as IBCQueryClientImpl } from "persistenceonejs/ibc/applications/transfer/v1/query";
1011
const tmRPC = require("@cosmjs/tendermint-rpc");
1112
const { QueryClient, setupIbcExtension } = require("@cosmjs/stargate");
1213
const tendermintRPCURL = process.env.REACT_APP_TENDERMINT_RPC_ENDPOINT;
@@ -32,11 +33,9 @@ const ModalViewAmountDetails = (props) => {
3233
const tendermintClient = await tmRPC.Tendermint34Client.connect(
3334
tendermintRPCURL
3435
);
35-
const queryClient = new QueryClient(tendermintClient);
36-
const ibcExtension = setupIbcExtension(queryClient);
37-
let ibcDenomeResponse = await ibcExtension.ibc.transfer.denomTrace(
38-
denom
39-
);
36+
const ibcQueryClientService = new IBCQueryClientImpl(tendermintClient);
37+
const ibcDenomeResponse = await ibcQueryClientService.Denom({ hash:denom});
38+
4039
let data = {
4140
dataResponse: item,
4241
denomResponse: ibcDenomeResponse
@@ -82,7 +81,7 @@ const ModalViewAmountDetails = (props) => {
8281
)}
8382
 
8483
{helper.denomChange(
85-
item.denomResponse.denomTrace.baseDenom
84+
item.denomResponse.denomTrace.base
8685
)}
8786
</li>
8887
);
@@ -99,10 +98,10 @@ const ModalViewAmountDetails = (props) => {
9998
)}
10099
/>
101100
{helper.denomChange(
102-
item.denomResponse.denomTrace.baseDenom
101+
item.denomResponse.denomTrace.base
103102
)}{" "}
104-
( IBC Trace path - {item.denomResponse.denomTrace.path},
105-
denom: {item.denomResponse.denomTrace.baseDenom} ){" "}
103+
( IBC Trace path - {item.denomResponse.denomTrace.trace[0].channelId},
104+
denom: {item.denomResponse.denomTrace.base} ){" "}
106105
{item.dataResponse.denom}
107106
</li>
108107
);

‎src/containers/Common/ModalViewUnbondDetails/ButtonSubmit.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ const ButtonSubmit = ({ entry, validatorAddress, type, list }) => {
1717
const memo = useSelector((state) => state.cancelUnbondTx.memo);
1818

1919
const onClick = () => {
20-
console.log(entry, validatorAddress, "clicked");
2120
let msgs = [];
2221
if (type === "individual") {
2322
msgs.push(
@@ -50,7 +49,6 @@ const ButtonSubmit = ({ entry, validatorAddress, type, list }) => {
5049
const disable = memo.error.message !== "";
5150

5251
const onClickKeplr = () => {
53-
console.log(entry, validatorAddress, "clicked");
5452
let msgs = [];
5553
if (type === "individual") {
5654
msgs.push(

‎src/containers/Common/ModalViewUnbondDetails/index.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ const ModalViewUnbondDetails = (props) => {
2222
const unbondAmount = useSelector((state) => state.unbond.unbond);
2323
const show = useSelector((state) => state.cancelUnbondTx.modal);
2424
const response = useSelector((state) => state.common.error);
25-
console.log(props.list, "unbond-list");
2625
const { t } = useTranslation();
2726
const handleClose = () => {
2827
dispatch(hideTxCancelUnbondModal());

‎src/containers/Common/TokenInfo.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,9 @@ import { fetchUnbondDelegations } from "../../store/actions/unbond";
77
import { fetchTokenPrice } from "../../store/actions/tokenPrice";
88
import { useTranslation } from "react-i18next";
99
import ModalViewUnbondDetails from "./ModalViewUnbondDetails";
10-
import ModalViewVestingDetails from "./ModalViewVestingDetails";
11-
import ModalViewAmountDetails from "./ModalVIewAmountDetails";
1210
import Icon from "../../components/Icon";
1311
import { Dropdown, OverlayTrigger, Popover } from "react-bootstrap";
14-
import ModalViewDelegationDetails from "./ModalViewDelegationDetails";
1512
import { fetchValidators } from "../../store/actions/validators";
16-
import NumberView from "../../components/NumberView";
1713
import { decimalize, formatNumber, stringTruncate } from "../../utils/scripts";
1814
import { showTxWithDrawTotalModal } from "../../store/actions/transactions/withdrawTotalRewards";
1915
import ReactGA from "react-ga4";

‎src/containers/Staking/StakingTabs.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ const StakingTabs = () => {
2020
}
2121
}, [delegations]);
2222

23-
console.log(activeTab, "activeTab--11");
2423
const onClick = (name) => {
2524
setActiveTab(name);
2625
};

‎src/containers/Transactions/Send/Amount.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ const Amount = () => {
116116
<span className="title">{t("TRANSFERABLE_BALANCE")}:</span>
117117
<span className="value">
118118
<NumberView value={formatNumber(token.transferableAmount)} />
119-
&nbsp;{helper.denomChange(token.tokenItem.denomTrace.baseDenom)}
119+
&nbsp;{helper.denomChange(token.tokenItem.denomTrace.base)}
120120
</span>
121121
</span>
122122
) : (
@@ -129,9 +129,9 @@ const Amount = () => {
129129
<span className="title">{t("TRANSFERABLE_BALANCE")}:</span>
130130
<span className="value">
131131
{token.transferableAmount.toLocaleString()}
132-
{helper.denomChange(token.tokenItem.denomTrace.baseDenom)}( IBC
133-
Trace path - {token.tokenItem.denomTrace.path} , denom:{" "}
134-
{token.tokenItem.denomTrace.baseDenom}, {token.tokenDenom})
132+
{helper.denomChange(token.tokenItem.denomTrace.base)}( IBC
133+
Trace path - {token.tokenItem.denomTrace.trace[0].channelId} , denom:{" "}
134+
{token.tokenItem.denomTrace.base}, {token.tokenDenom})
135135
</span>
136136
</span>
137137
)

‎src/containers/Transactions/Send/Tokens.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ const Tokens = () => {
134134
width={20}
135135
className="mr-2"
136136
/>
137-
{helper.denomChange(item.denomTrace.baseDenom)} (
138-
{item.denomTrace.path})
137+
{helper.denomChange(item.denomTrace.base)} (
138+
{item.denomTrace.trace[0].channelId})
139139
</MenuItem>
140140
);
141141
}

‎src/containers/Transactions/SendIbc/Amount.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ const Amount = () => {
9393
<span
9494
className="value">
9595
<NumberView value={formatNumber(token.transferableAmount)}/>
96-
&nbsp;{helper.denomChange(token.tokenItem.denomTrace.baseDenom)}
96+
&nbsp;{helper.denomChange(token.tokenItem.denomTrace.base)}
9797
</span>
9898
</span>
9999
:
@@ -103,9 +103,9 @@ const Amount = () => {
103103
<Popover id="popover-memo">
104104
<Popover.Content>
105105
{`${token.transferableAmount.toLocaleString()}
106-
${helper.denomChange(token.tokenItem.denomTrace.baseDenom)}
107-
( IBC Trace path - ${token.tokenItem.denomTrace.path},
108-
denom: ${token.tokenItem.denomTrace.baseDenom}), ${token.tokenDenom}` }
106+
${helper.denomChange(token.tokenItem.denomTrace.base)}
107+
( IBC Trace path - ${token.tokenItem.denomTrace.trace[0].channelId},
108+
denom: ${token.tokenItem.denomTrace.base}), ${token.tokenDenom}` }
109109
</Popover.Content>
110110
</Popover>
111111
}>
@@ -116,7 +116,7 @@ const Amount = () => {
116116
</span>
117117
<span className="value">
118118
<NumberView value={formatNumber(token.transferableAmount)}/>
119-
{helper.denomChange(token.tokenItem.denomTrace.baseDenom)}
119+
{helper.denomChange(token.tokenItem.denomTrace.base)}
120120
</span>
121121
</span>
122122
</OverlayTrigger>

0 commit comments

Comments
 (0)