adapted to API shape change
This commit is contained in:
parent
e85021d245
commit
47e708a4a5
58
index.html
58
index.html
@ -641,8 +641,7 @@
|
|||||||
let frag = document.createDocumentFragment();
|
let frag = document.createDocumentFragment();
|
||||||
const render = {
|
const render = {
|
||||||
homepage(obj) {
|
homepage(obj) {
|
||||||
let { topToken, totalTransactions, walletAddresses, latestBlock } = obj;
|
let { topToken, totalTransactions, walletAddresses, latestBlock: { height, time } } = obj;
|
||||||
const { height, time } = latestBlock
|
|
||||||
return html`
|
return html`
|
||||||
<div id="homepage" class="page">
|
<div id="homepage" class="page">
|
||||||
<section id="first_section">
|
<section id="first_section">
|
||||||
@ -1385,6 +1384,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function renderTransactions(container, transactions = []) {
|
async function renderTransactions(container, transactions = []) {
|
||||||
|
console.log(transactions)
|
||||||
let txFrag = parseTransactions(transactions);
|
let txFrag = parseTransactions(transactions);
|
||||||
const renderedTransactions = txFrag.map(tx => {
|
const renderedTransactions = txFrag.map(tx => {
|
||||||
switch (tx.type) {
|
switch (tx.type) {
|
||||||
@ -1590,26 +1590,28 @@
|
|||||||
let latestTxArray = [];
|
let latestTxArray = [];
|
||||||
txList.forEach(tx => {
|
txList.forEach(tx => {
|
||||||
const {
|
const {
|
||||||
transactionDetails: {
|
txid,
|
||||||
txid, blockHeight, vin, vout, time,
|
blockHeight,
|
||||||
receiverAddress,
|
vin,
|
||||||
senderAddress,
|
vout,
|
||||||
},
|
time,
|
||||||
parsedFloData: {
|
receiverAddress,
|
||||||
contractAddress,
|
senderAddress,
|
||||||
contractType,
|
contractAddress,
|
||||||
contractConditions: { expiryTime, accepting_token, selling_token, subtype, price } = {},
|
contractType,
|
||||||
contractAmount,
|
contractConditions: { expiryTime, accepting_token, selling_token, subtype, price } = {},
|
||||||
type,
|
contractAmount,
|
||||||
tokenAmount,
|
type,
|
||||||
tokenIdentification,
|
tokenAmount,
|
||||||
transferType,
|
transferType,
|
||||||
contractName,
|
triggerCondition,
|
||||||
triggerCondition,
|
userChoice,
|
||||||
userChoice,
|
nftHash,
|
||||||
nftHash,
|
depositAmount,
|
||||||
depositAmount,
|
amount,
|
||||||
}
|
contractName,
|
||||||
|
tokenIdentification,
|
||||||
|
transactionTrigger,
|
||||||
} = tx;
|
} = tx;
|
||||||
let obj = {
|
let obj = {
|
||||||
hash: txid,
|
hash: txid,
|
||||||
@ -1757,9 +1759,7 @@
|
|||||||
if (transaction.result === 'error') {
|
if (transaction.result === 'error') {
|
||||||
return [false, transaction.description]
|
return [false, transaction.description]
|
||||||
} else {
|
} else {
|
||||||
let transactionHash = transaction.transactionHash,
|
let { transactionHash, floData, tokenAmount, tokenIdentification, type, nftHash, blockheight, vin, vout, confirmations } = transaction;
|
||||||
{ flodata, tokenAmount, tokenIdentification, type, nftHash } = transaction.parsedFloData,
|
|
||||||
{ blockheight, vin, vout, confirmations } = transaction.transactionDetails;
|
|
||||||
let sender = vin[0].addr;
|
let sender = vin[0].addr;
|
||||||
let receiver = sender
|
let receiver = sender
|
||||||
for (let i = 0; i < vout.length; i++) {
|
for (let i = 0; i < vout.length; i++) {
|
||||||
@ -1768,13 +1768,9 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
// todo - temporary fixes below. Fix these on the Database and API level
|
// todo - temporary fixes below. Fix these on the Database and API level
|
||||||
let transactionType = ''
|
let transactionType = transferType || ''
|
||||||
if (type == 'transfer') {
|
|
||||||
transactionType = transaction.parsedFloData?.transferType
|
|
||||||
}
|
|
||||||
if (type == 'smartContractPays') {
|
if (type == 'smartContractPays') {
|
||||||
tokenAmount = '-'
|
tokenAmount = '-'
|
||||||
flodata = transaction.transactionDetails.floData
|
|
||||||
}
|
}
|
||||||
return [
|
return [
|
||||||
true, {
|
true, {
|
||||||
@ -1784,7 +1780,7 @@
|
|||||||
amount: tokenAmount,
|
amount: tokenAmount,
|
||||||
sender,
|
sender,
|
||||||
receiver,
|
receiver,
|
||||||
floData: flodata,
|
floData,
|
||||||
hash: transactionHash,
|
hash: transactionHash,
|
||||||
confirmations,
|
confirmations,
|
||||||
nftHash
|
nftHash
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user