diff --git a/src/components/Tx/TxData/TxMessage/TxMessage.js b/src/components/Tx/TxData/TxMessage/TxMessage.js index 5c17d0fc..ee0f9d86 100644 --- a/src/components/Tx/TxData/TxMessage/TxMessage.js +++ b/src/components/Tx/TxData/TxMessage/TxMessage.js @@ -305,55 +305,54 @@ const TxMessage = ({ key, msg, data, ind }) => { return !data ? null : getInfoPriceRow(label, data.value, denom); }; - const getRawLog = (rawLog, index) => { - let messageParse = []; - try { - messageParse = tryParseMessage(JSON.parse(rawLog)); - } catch (error) { - messageParse = [{ error: rawLog }]; - } finally { - if (!index) messageParse = [messageParse[0]]; - else messageParse = messageParse.filter(msg => msg.msg_index === index); - return ( - - {!isLargeScreen ? ( - - ) : ( - messageParse.map((msg, key) => { - const { events = [] } = msg || { events: [] }; - return ( -
- Event {key + 1}: - {events.map(event => ( -
-

{event.type}

- - - {event.attributes?.map(attr => ( - - - - - ))} - -
{attr.key}{ValueItem(attr.value)}
-
- ))} -
- ); - }) - )} -
- ); - } + const getRawLog = (data, value, index) => { + let messageParse = data.messages; + console.log({ + messageParse, + index, + }); + + if (!index) messageParse = [messageParse[0]]; + else messageParse = messageParse.filter(msg => msg.msg_index === index); + return ( + + {!isLargeScreen ? ( + + ) : ( + messageParse.map((msg, key) => { + const { events = [] } = msg || { events: [] }; + return ( + + Event {key + 1}: + {events.map(event => ( +
+

{event.type}

+ + + {event.attributes?.map(attr => ( + + + + + ))} + +
{attr.key}{ValueItem(attr.value)}
+
+ ))} +
+ ); + }) + )} +
+ ); }; const getInfoRowSummary = (label, value) => ( diff --git a/src/components/Tx/TxData/TxMessage/TxMessageContent.js b/src/components/Tx/TxData/TxMessage/TxMessageContent.js index 13d935e6..45b13f2f 100644 --- a/src/components/Tx/TxData/TxMessage/TxMessageContent.js +++ b/src/components/Tx/TxData/TxMessage/TxMessageContent.js @@ -258,7 +258,7 @@ const TxMessageContent = ({
{getInfoRow("Data Source", item?.name)} - + {/* - + */} {getInfoRow("Result Status", item?.status)}
@@ -289,7 +289,7 @@ const TxMessageContent = ({
{getInfoRow("Data Source", item?.name)} - + {/* - + */} {getInfoRow("Result Status", item?.status)}
@@ -343,7 +343,7 @@ const TxMessageContent = ({ {getInfoRow("Label", value?.label)} {getAddressRow("Sender", value?.sender, value?.sender_tag)} {getCurrencyRowFromObject("Init funds", value?.init_funds ?? value?.funds)} - + {/* - + */} {getInfoRow("Contract Address", getContractAddress(data?.raw_log))} )} @@ -368,7 +368,7 @@ const TxMessageContent = ({ {getPriceInfoFromRawData(wasmAttributes, "pnl", "Pnl", quote)} {getPriceInfoFromRawData(wasmAttributes, "withdraw_amount", "Withdraw amount", quote)} {getFundsRow("Sent funds", key, data?.messages?.[ind]?.sent_funds, data?.result, data?.amount)} - + {/* - + */} {getTransferRow("Transfer", key, data?.events, data?.result)} {getMultiRoyaltyRow("Royalty", key, data?.raw_log, data?.result)} {checkAttributeEvents(data?.raw_log, "send_packet") && getIBCProgressRow("IBC Progress", data)} @@ -401,20 +401,20 @@ const TxMessageContent = ({ <> {getAddressRow("Signer", value?.signer)} {getInfoRow("Client ID", value?.client_id)} - {getInfoRow("Block", value?.header.signed_header.header.version.block)} - {getInfoRow("App", value?.header.signed_header.header.version.app)} - {getInfoRow("Chain ID", value?.header.signed_header.header.chain_id)} - {getInfoRow("Height", value?.header.signed_header.header.height)} - {getInfoRow("Time", value?.header.signed_header.header.time)} - {getInfoRow("Last Commit Hash", value?.header.signed_header.header.last_commit_hash)} - {getInfoRow("Data Hash", value?.header.signed_header.header.data_hash)} - {getInfoRow("Validators Hash", value?.header.signed_header.header.validators_hash)} - {getInfoRow("Next Validators Hash", value?.header.signed_header.header.next_validators_hash)} - {getInfoRow("Consensus Hash", value?.header.signed_header.header.consensus_hash)} - {getInfoRow("App Hash", value?.header.signed_header.header.app_hash)} - {getInfoRow("Last Results Hash", value?.header.signed_header.header.last_results_hash)} - {getInfoRow("Evidence Hash", value?.header.signed_header.header.evidence_hash)} - {getInfoRow("Proposer Address", value?.header.signed_header.header.proposer_address)} + {getInfoRow("Block", value?.client_message?.signed_header.header.version.block)} + {getInfoRow("App", value?.client_message?.signed_header.header.version.app)} + {getInfoRow("Chain ID", value?.client_message?.signed_header.header.chain_id)} + {getInfoRow("Height", value?.client_message?.signed_header.header.height)} + {getInfoRow("Time", value?.client_message?.signed_header.header.time)} + {getInfoRow("Last Commit Hash", value?.client_message?.signed_header.header.last_commit_hash)} + {getInfoRow("Data Hash", value?.client_message?.signed_header.header.data_hash)} + {getInfoRow("Validators Hash", value?.client_message?.signed_header.header.validators_hash)} + {getInfoRow("Next Validators Hash", value?.client_message?.signed_header.header.next_validators_hash)} + {getInfoRow("Consensus Hash", value?.client_message?.signed_header.header.consensus_hash)} + {getInfoRow("App Hash", value?.client_message?.signed_header.header.app_hash)} + {getInfoRow("Last Results Hash", value?.client_message?.signed_header.header.last_results_hash)} + {getInfoRow("Evidence Hash", value?.client_message?.signed_header.header.evidence_hash)} + {getInfoRow("Proposer Address", value?.client_message?.signed_header.header.proposer_address)} )} {compareTypeMessage(type, [txTypes.COSMOS_SDK.MSG_IBC_RECV_PACKET, txTypes.COSMOS_SDK_NEW_VERSION.MSG_IBC_RECV_PACKET]) && ( @@ -610,7 +610,7 @@ const TxMessageContent = ({ {getInfoRow("Code ID", value?.code_id)} {getAddressRow("Contract", value?.contract)} {getAddressRow("Sender", value?.sender)} - + {/* - + */} )} - {getRawLog(data?.raw_log, ind)} + {getRawLog(data, value, ind)} );