From 155bd037a6b6c374f4ae6a0a41e250640eea9069 Mon Sep 17 00:00:00 2001 From: sairaj mote Date: Sun, 11 Jun 2023 13:14:40 +0530 Subject: [PATCH 1/9] Text changes --- index.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/index.html b/index.html index a496fe1..d4d810c 100644 --- a/index.html +++ b/index.html @@ -475,7 +475,7 @@ }) router.addRoute('blocks', async state => { let allBlocks = await getAllBlocks(100); - getRef("page_title").textContent = "All Blocks"; + getRef("page_title").textContent = "All blocks with token transactions"; const renderedBlocks = allBlocks.map(block => render.blockCard(block)) renderElem(getRef("page_container"), html`
@@ -485,7 +485,7 @@ }) router.addRoute('transactions', async state => { let allTxs = await getAllTxs(); - getRef("page_title").textContent = "All Transactions"; + getRef("page_title").textContent = "All token transactions"; renderElem(getRef("page_container"), html`
    @@ -659,21 +659,21 @@

    ${walletAddresses}

    -

    Latest block (${getFormattedTime(time, 'relative')})

    +

    Last token transaction block (${getFormattedTime(time, 'relative')})

    ${height}

    -

    Recent transactions

    +

    Recent token transactions

    View all
    -

    Recent blocks

    +

    Recent token transaction blocks

    View all
    From b1ef88abea557b8ab686d95c0cf126357d75b3be Mon Sep 17 00:00:00 2001 From: sairaj mote Date: Sun, 11 Jun 2023 13:20:21 +0530 Subject: [PATCH 2/9] Bug fix --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index d4d810c..5fe2ea0 100644 --- a/index.html +++ b/index.html @@ -446,6 +446,7 @@ html`${contractDeposits.map(deposit => render.depositCard({ ...deposit, acceptingToken, + sellingToken }))}` ) else @@ -1038,8 +1039,7 @@ }, depositCard(details) { const { currentBalance, depositorAddress, originalBalance, status, time, transactionHash, acceptingToken, sellingToken } = details - console.log("I'm at the debug point") - debugger + console.log(details) return html`
  • From a19e95d06bdc6b4e837e375060d98c61ac266a75 Mon Sep 17 00:00:00 2001 From: sairaj mote Date: Sun, 11 Jun 2023 17:25:19 +0530 Subject: [PATCH 3/9] fixed labelling error --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 5fe2ea0..fec1e70 100644 --- a/index.html +++ b/index.html @@ -944,7 +944,7 @@ ${contractType === 'continuos-event' && contractSubtype === 'tokenswap' ? html`
    deposit token
    -

    ${acceptingToken}

    +

    ${sellingToken}

    participation token
    From 258d9761bdac4cf4e11d0a442fef3383de410ba2 Mon Sep 17 00:00:00 2001 From: sairaj mote Date: Sun, 11 Jun 2023 23:56:53 +0530 Subject: [PATCH 4/9] better wording --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index fec1e70..b97dbfa 100644 --- a/index.html +++ b/index.html @@ -1022,11 +1022,11 @@
    -
    Input amount
    +
    Sent
    ${formatAmount(participationAmount, 'usd')} ${acceptingToken}
    -
    Output amount
    +
    Received
    ${formatAmount(swapAmount, 'usd')} ${sellingToken}
    From 6ad9ef0d9883b3da183598510cf3dccba40639c8 Mon Sep 17 00:00:00 2001 From: sairaj mote Date: Mon, 12 Jun 2023 13:08:14 +0530 Subject: [PATCH 5/9] Bug fix --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index b97dbfa..d3bf4f5 100644 --- a/index.html +++ b/index.html @@ -948,7 +948,7 @@
    participation token
    -

    ${sellingToken}

    +

    ${acceptingToken}

    Exchange rate (${priceType === 'dynamic' ? 'Dynamic' : 'Fixed'})
    From b90d0e22b9089cfa594525c343c8f6dc2294a96c Mon Sep 17 00:00:00 2001 From: sairaj mote Date: Mon, 12 Jun 2023 13:36:04 +0530 Subject: [PATCH 6/9] Added total deposit balance for smart contract info --- index.html | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index d3bf4f5..75c48c5 100644 --- a/index.html +++ b/index.html @@ -877,7 +877,8 @@ totalParticipationAmount, priceType, oracle_address, - price + price, + currentDepositBalance } = obj; console.log(obj) return html` @@ -985,6 +986,12 @@

    ${formatAmount(totalHonorAmount, 'usd')} ${sellingToken}

    `: ''} + ${currentDepositBalance ? html` +
    +
    Total deposit balance
    +

    ${formatAmount(currentDepositBalance, 'usd')} ${sellingToken}

    +
    + `: ''}
    ${userChoices ? html`

    Available Choices

    @@ -1521,7 +1528,8 @@ maximumsubscriptionamount, totalHonorAmount, totalParticipationAmount, - price + price, + currentDepositBalance }, contractAddress, contractName } = info @@ -1546,7 +1554,8 @@ oracle_address, totalHonorAmount, totalParticipationAmount, - price + price, + currentDepositBalance } } From 56ecc2b95c5f77e6bb82c1f9686524cba28404bf Mon Sep 17 00:00:00 2001 From: sairaj mote Date: Mon, 19 Jun 2023 00:54:52 +0530 Subject: [PATCH 7/9] UX improvement --- index.html | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 75c48c5..d8d1475 100644 --- a/index.html +++ b/index.html @@ -1147,8 +1147,14 @@

    ${formatAmount(amount, token.toLowerCase() === 'rupee' ? 'inr' : 'usd')} ${token}

    -
    Contract name
    -

    ${contractName}

    +
    Sender (Smart contract)
    +

    ${contractName}-${sender}

    +
    +
    +
    Receiver
    + + ${receiver} +
    From 4982b70190544ebde52bc8ddf42f0d1fc6a25e29 Mon Sep 17 00:00:00 2001 From: sairaj mote Date: Mon, 19 Jun 2023 01:24:04 +0530 Subject: [PATCH 8/9] Bug fix --- index.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/index.html b/index.html index d8d1475..ddab79f 100644 --- a/index.html +++ b/index.html @@ -1147,14 +1147,14 @@

    ${formatAmount(amount, token.toLowerCase() === 'rupee' ? 'inr' : 'usd')} ${token}

    -
    Sender (Smart contract)
    -

    ${contractName}-${sender}

    +
    Sender
    + + ${sender} +
    -
    Receiver
    - - ${receiver} - +
    Receiver (Smart contract)
    +

    ${contractName}-${receiver}

    From d46375a544d13964dd97de7cad4f6947e687c028 Mon Sep 17 00:00:00 2001 From: sairaj mote Date: Tue, 20 Jun 2023 19:31:18 +0530 Subject: [PATCH 9/9] bug fix --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index ddab79f..8d606bb 100644 --- a/index.html +++ b/index.html @@ -1326,13 +1326,13 @@ `: ''} ${acceptingToken ? html`
    -
    deposit token
    +
    Participation token

    ${acceptingToken}

    `: ''} ${sellingToken ? html`
    -
    participation token
    +
    Deposit token

    ${sellingToken}

    `: ''}