RanchiMall/floscout-testnet
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed off chain ttcs grouping

Browse Source
This commit is contained in:
sairaj mote 2023-11-13 19:21:32 +05:30
parent 45ec74ffad
commit 62e7f8b20a
1 changed files with 36 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
index.html
View File

@ -1191,8 +1191,8 @@
</li>`; </li>`;
}, },
compoundTransactionCard(details) { compoundTransactionCard(details) {
const { time, hash, sender, receiver, contractName, token, amount, offChainTransactions = [], userChoice } = details const { time, hash, sender, receiver, contractName, token, amount, offChainTransactions = [], userChoice, contractAddress } = details
const smartContract = `${contractName}-${receiver}` const smartContract = `${contractName}-${receiver || contractAddress}`
const renderedOffChainTransactions = offChainTransactions.map(tx => { const renderedOffChainTransactions = offChainTransactions.map(tx => {
const { receiverAddress, tokenAmount, tokenIdentification } = tx const { receiverAddress, tokenAmount, tokenIdentification } = tx
return html` return html`
@ -1226,31 +1226,35 @@
</div> </div>
<div class="contract-info"> <div class="contract-info">
<ul class="transfer-steps"> <ul class="transfer-steps">
<li class="transfer-step"> ${sender ? html`
<div class="flex flex-direction-column gap-0-5"> <li class="transfer-step">
<div class="flex flex-direction-column"> <div class="flex flex-direction-column gap-0-5">
<h5 class="label">Sender</h5> <div class="flex flex-direction-column">
<sm-copy value=${sender}> <h5 class="label">Sender</h5>
<a href=${`#/address/${sender}`} class="address wrap-around">${sender}</a> <sm-copy value=${sender}>
</sm-copy> <a href=${`#/address/${sender}`} class="address wrap-around">${sender}</a>
<p>Sent: <b>${amount} ${token}</b></p> </sm-copy>
<p>Sent: <b>${amount} ${token}</b></p>
</div>
</div> </div>
</div> <svg class="icon" xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M12 4l-1.41 1.41L16.17 11H4v2h12.17l-5.58 5.59L12 20l8-8-8-8z"/></svg>
<svg class="icon" xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M12 4l-1.41 1.41L16.17 11H4v2h12.17l-5.58 5.59L12 20l8-8-8-8z"/></svg> <div class="flex flex-direction-column">
<div class="flex flex-direction-column"> <h5 class="label">Receiver (Smart contract)</h5>
<h5 class="label">Receiver (Smart contract)</h5> <a href=${`#/contract/${smartContract}`} class="address wrap-around">${smartContract}</a>
<a href=${`#/contract/${smartContract}`} class="address wrap-around">${smartContract}</a> </div>
</div> </li>
</li> `: ''}
${renderedOffChainTransactions} ${renderedOffChainTransactions}
</ul> </ul>
<div class="flex align-center space-between flex-wrap gap-1"> ${hash ? html`
<div class="flex flex-direction-column"> <div class="flex align-center space-between flex-wrap gap-1">
<h5 class="label">Transaction ID</h5> <div class="flex flex-direction-column">
<sm-copy value=${hash} clip-text></sm-copy> <h5 class="label">Transaction ID</h5>
<sm-copy value=${hash} clip-text></sm-copy>
</div>
<a href=${`#/transaction/${hash}`} class="button button--small button--colored">View details</a>
</div> </div>
<a href=${`#/transaction/${hash}`} class="button button--small button--colored">View details</a> `: ''}
</div>
</div> </div>
</li> </li>
` `
@ -2008,7 +2012,7 @@
if (!groupedTxs.has(key)) { if (!groupedTxs.has(key)) {
groupedTxs.set(key, { groupedTxs.set(key, {
sourceTransaction: null, sourceTransaction: {},
offChainTransactions: [], offChainTransactions: [],
type: transactionTrigger ? 'compoundTransaction' : undefined, type: transactionTrigger ? 'compoundTransaction' : undefined,
}); });
@ -2017,12 +2021,18 @@
if (hash) { if (hash) {
groupedTxs.get(key).sourceTransaction = tx; groupedTxs.get(key).sourceTransaction = tx;
} else { } else {
const { tokenIdentification, senderAddress, receiverAddress, onChain, tokenAmount } = tx; const { tokenIdentification, senderAddress, receiverAddress, onChain, tokenAmount, time, contractName } = tx;
groupedTxs.get(key).offChainTransactions.push({ groupedTxs.get(key).offChainTransactions.push({
tokenIdentification, tokenIdentification,
receiverAddress, receiverAddress,
tokenAmount, 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) { 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}`) const deposits = await fetchJson(`${floGlobals.tokenApiUrl}/api/v2/smartContractDeposits?contractName=${contract.name}&contractAddress=${contract.address}`)
return deposits.depositInfo return deposits.depositInfo
} }
@ -3284,4 +3293,4 @@
</script> </script>
</body> </body>
</html> </html>