From 62e7f8b20ad6c385205772b7ab9630367d2f1063 Mon Sep 17 00:00:00 2001 From: sairaj mote Date: Mon, 13 Nov 2023 19:21:32 +0530 Subject: [PATCH] fixed off chain ttcs grouping --- index.html | 63 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 27 deletions(-) diff --git a/index.html b/index.html index 9a76bf5..cde14e9 100644 --- a/index.html +++ b/index.html @@ -1191,8 +1191,8 @@ `; }, compoundTransactionCard(details) { - const { time, hash, sender, receiver, contractName, token, amount, offChainTransactions = [], userChoice } = details - const smartContract = `${contractName}-${receiver}` + const { time, hash, sender, receiver, contractName, token, amount, offChainTransactions = [], userChoice, contractAddress } = details + const smartContract = `${contractName}-${receiver || contractAddress}` const renderedOffChainTransactions = offChainTransactions.map(tx => { const { receiverAddress, tokenAmount, tokenIdentification } = tx return html` @@ -1226,31 +1226,35 @@
- -
-
Receiver (Smart contract)
- ${smartContract} -
- + +
+
Receiver (Smart contract)
+ ${smartContract} +
+ + `: ''} ${renderedOffChainTransactions} -
-
-
Transaction ID
- + ${hash ? html` +
+
+
Transaction ID
+ +
+ View details
- View details -
+ `: ''}
` @@ -2008,7 +2012,7 @@ if (!groupedTxs.has(key)) { groupedTxs.set(key, { - sourceTransaction: null, + sourceTransaction: {}, offChainTransactions: [], type: transactionTrigger ? 'compoundTransaction' : undefined, }); @@ -2017,12 +2021,18 @@ if (hash) { groupedTxs.get(key).sourceTransaction = tx; } else { - const { tokenIdentification, senderAddress, receiverAddress, onChain, tokenAmount } = tx; + const { tokenIdentification, senderAddress, receiverAddress, onChain, tokenAmount, time, contractName } = tx; groupedTxs.get(key).offChainTransactions.push({ tokenIdentification, receiverAddress, tokenAmount, }); + if (time) + groupedTxs.get(key).sourceTransaction.time = time + if (contractName) + groupedTxs.get(key).sourceTransaction.contractName = contractName + if (senderAddress) + groupedTxs.get(key).sourceTransaction.contractAddress = senderAddress } }); @@ -2232,7 +2242,6 @@ } async function getContractDeposits(contract) { - console.log(`${floGlobals.tokenApiUrl}/api/v2/smartContractDeposits?contractName=${contract.name}&contractAddress=${contract.address}`) const deposits = await fetchJson(`${floGlobals.tokenApiUrl}/api/v2/smartContractDeposits?contractName=${contract.name}&contractAddress=${contract.address}`) return deposits.depositInfo } @@ -3284,4 +3293,4 @@ - + \ No newline at end of file