diff --git a/src/containers/Transactions/ModalRedeemShares/ButtonRedeem.js b/src/containers/Transactions/ModalRedeemShares/ButtonRedeem.js index eac58390..34ac56c0 100644 --- a/src/containers/Transactions/ModalRedeemShares/ButtonRedeem.js +++ b/src/containers/Transactions/ModalRedeemShares/ButtonRedeem.js @@ -35,7 +35,7 @@ const ButtonRedeem = ({ tokenizedShares, rewardList }) => { ); messages.push(msg); }); - console.log(messages, "messages"); + console.log(messages, "messages1"); dispatch(submitFormData(messages)); }; diff --git a/src/containers/Transactions/ModalTransferShares/ButtonTransfer.js b/src/containers/Transactions/ModalTransferShares/ButtonTransfer.js index 99ca7ccd..6e1f6cba 100644 --- a/src/containers/Transactions/ModalTransferShares/ButtonTransfer.js +++ b/src/containers/Transactions/ModalTransferShares/ButtonTransfer.js @@ -37,7 +37,7 @@ const ButtonTransfer = ({ tokenizedShares, rewardList }) => { const onClick = () => { const messages = getMessage(); - console.log(messages, "messages") + console.log(messages, "messages-transfer") dispatch(submitFormData(messages)); }; @@ -45,34 +45,50 @@ const ButtonTransfer = ({ tokenizedShares, rewardList }) => { const getMessage = () => { let messages = []; - rewardList.forEach((item) => { - const msg = TokenizedSharesRewardsMsg(item.owner,item.recordId); - messages.push(msg); - }); - - let blcList = []; - - tokenizedShares.forEach((item) => { - const msg = TokenizeSharesTransferMsg( + const ledgerApp = localStorage.getItem("ledgerAppName"); + if(loginInfo && loginInfo.loginMode === "keplr" || ledgerApp !== "Persistence"){ + rewardList.forEach((item) => { + const msg = TokenizedSharesRewardsMsg(item.owner,item.recordId); + messages.push(msg); + }); + let blcList = []; + tokenizedShares.forEach((item) => { + const blc = { + amount: (item.amount * DefaultChainInfo.uTokenValue).toFixed(0), + denom: item.denom + }; + blcList.push(blc); + const msg = TokenizeSharesTransferMsg( item.recordId, - loginInfo.address, - toAddress.value + loginInfo.address, + toAddress.value + ); + messages.push(msg); + }); + const sendMsg = SendMsg( + loginInfo && loginInfo.address, + toAddress.value, + blcList ); - const blc = { - amount: (item.amount * DefaultChainInfo.uTokenValue).toFixed(0), - denom: item.denom - }; - blcList.push(blc); - messages.push(msg); - }); - - const sendMsg = SendMsg( - loginInfo && loginInfo.address, - toAddress.value, - blcList - ); - messages.push(sendMsg); - return messages; + messages.push(sendMsg); + return messages; + } else { + let blcList = []; + tokenizedShares.forEach((item) => { + const blc = { + amount: (item.amount * DefaultChainInfo.uTokenValue).toFixed(0), + denom: item.denom + }; + blcList.push(blc); + }); + const sendMsg = SendMsg( + loginInfo && loginInfo.address, + toAddress.value, + blcList + ); + messages.push(sendMsg); + return messages; + } }; const onClickKeplr = () => { diff --git a/src/store/actions/balance.js b/src/store/actions/balance.js index 10a7b2fa..1fada19f 100644 --- a/src/store/actions/balance.js +++ b/src/store/actions/balance.js @@ -94,6 +94,7 @@ export const fetchTransferableVestingAmount = (address) => { const response = await stakingQueryService.AllBalances({ address: address }); + console.log(response, "response-balances") if (response.balances.length) { let tokenList = []; for (let i = 0; i < response.balances.length; i++) {