From 527732b046a326a829d9b79ad328f297086adbcc Mon Sep 17 00:00:00 2001
From: "vien.nguyen2-tiki" <vien.nguyen2@tiki.vn>
Date: Tue, 14 Feb 2023 11:09:12 +0700
Subject: [PATCH] fix: update From/To from cosmos msg

---
 views/transactions/utils.ts | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/views/transactions/utils.ts b/views/transactions/utils.ts
index 220d5d9b..c71938db 100644
--- a/views/transactions/utils.ts
+++ b/views/transactions/utils.ts
@@ -36,6 +36,8 @@ export const evmTransactionDetail = async (evmHash?: string, cosmosHash?: string
 	)
 	const result = res.data.result
 	if (!result) return
+
+	const [from, to] = _getFromAndToEvmFromCosmosMsg(res.data)
 	data.evmHash = isUndefined(evmHash)
 		? result.messages && result.messages.length > 0
 			? getEvmTxhash(result.messages)
@@ -46,9 +48,9 @@ export const evmTransactionDetail = async (evmHash?: string, cosmosHash?: string
 	data.confirmations = result.confirmations ? result.confirmations.toString() : ''
 	data.blockHeight = `${result.blockHeight}`
 	data.time = result.blockTime
-	data.from = result.from
+	data.from = from
 	data.fromAddressName = result.fromAddressName
-	data.to = result.to
+	data.to = to
 	data.toAddressName = result.toAddressName
 	data.createdContractAddressHash = result.createdContractAddressHash
 	data.createdContractAddressName = result.createdContractAddressName
@@ -249,3 +251,25 @@ const _convertTransfer = (
 ) => {
 	data.tabTokenTransfers = convertMessageToTransfer(messages, blockTime, success)
 }
+
+const _getFromAndToEvmFromCosmosMsg = (res: EvmTransactionDetailResponse): [string, string] => {
+	const { result } = res
+	const { messages } = result
+
+	let from = ''
+	let to = ''
+	if (!isEmpty(result) && !isEmpty(result.from) && !isEmpty(result.to)) {
+		// server parsed
+		from = result.from
+		to = result.to
+	} else {
+		// server is parsing data
+		const message = messages[0]
+		try {
+			from = message.content.params.from
+			to = message.content.params.data.to
+		} catch (e) {}
+	}
+
+	return [from, to]
+}