Commit d7e8ad09 authored by ninabreznik's avatar ninabreznik Committed by yann300

Restrucutre pending transactions

parent 5bdab8a8
...@@ -69,6 +69,14 @@ var css = csjs` ...@@ -69,6 +69,14 @@ var css = csjs`
margin-top: 2%; margin-top: 2%;
border: none; border: none;
} }
.pendingTxsContainer extends ${styles.displayBox} {
display: flex;
flex-direction: column;
background-color: ${styles.colors.transparent};
margin-top: 2%;
border: none;
padding-bottom: 0;
}
.container { .container {
${styles.displayBox} ${styles.displayBox}
margin-top: 2%; margin-top: 2%;
...@@ -120,6 +128,11 @@ var css = csjs` ...@@ -120,6 +128,11 @@ var css = csjs`
color: ${styles.colors.lightGrey}; color: ${styles.colors.lightGrey};
font-style: italic; font-style: italic;
} }
.pendingTxsText extends ${styles.displayBox} {
text-align: center;
color: ${styles.colors.lightGrey};
font-style: italic;
}
.item { .item {
margin-right: 1em; margin-right: 1em;
display: flex; display: flex;
...@@ -162,16 +175,26 @@ module.exports = runTab ...@@ -162,16 +175,26 @@ module.exports = runTab
var instanceContainer = yo`<div class="${css.instanceContainer}"></div>` var instanceContainer = yo`<div class="${css.instanceContainer}"></div>`
var noInstancesText = yo`<div class="${css.noInstancesText}">No Contract Instances.</div>` var noInstancesText = yo`<div class="${css.noInstancesText}">No Contract Instances.</div>`
var pendingTxsText = yo`<div class="${css.pendingTxsText}"></div>`
var pendingTxsContainer = yo`<div class="${css.pendingTxsContainer}">${pendingTxsText}</div>`
function runTab (container, appAPI, appEvents, opts) { function runTab (container, appAPI, appEvents, opts) {
var el = yo` var el = yo`
<div class="${css.runTabView}" id="runTabView"> <div class="${css.runTabView}" id="runTabView">
${settings(appAPI, appEvents)} ${settings(appAPI, appEvents)}
${contractDropdown(appAPI, appEvents, instanceContainer)} ${contractDropdown(appAPI, appEvents, instanceContainer)}
${pendingTxsContainer}
${instanceContainer} ${instanceContainer}
</div> </div>
` `
container.appendChild(el) container.appendChild(el)
// PENDING transactions
function updatePendingTxs (container, appAPI) {
var pendingCount = Object.keys(appAPI.udapp().pendingTransactions()).length
pendingTxsText.innerText = pendingCount + ' pending transactions'
}
// DROPDOWN // DROPDOWN
var selectExEnv = el.querySelector('#selectExEnvOptions') var selectExEnv = el.querySelector('#selectExEnvOptions')
selectExEnv.addEventListener('change', function (event) { selectExEnv.addEventListener('change', function (event) {
...@@ -218,10 +241,6 @@ function updateAccountBalances (container, appAPI) { ...@@ -218,10 +241,6 @@ function updateAccountBalances (container, appAPI) {
}) })
} }
function updatePendingTxs (container, appAPI) {
container.querySelector('#pendingtxs').innerText = Object.keys(appAPI.udapp().pendingTransactions()).length
}
/* ------------------------------------------------ /* ------------------------------------------------
section CONTRACT DROPDOWN and BUTTONS section CONTRACT DROPDOWN and BUTTONS
------------------------------------------------ */ ------------------------------------------------ */
...@@ -240,10 +259,6 @@ function contractDropdown (appAPI, appEvents, instanceContainer) { ...@@ -240,10 +259,6 @@ function contractDropdown (appAPI, appEvents, instanceContainer) {
<div class="${css.container}"> <div class="${css.container}">
<div class="${css.subcontainer}"> <div class="${css.subcontainer}">
${selectContractNames} ${selectContractNames}
<div class="${css.pendingContainer}">
<div class="${css.pending}" id="pendingtxs"></div>
<i title="Contracts pending" class="${css.icon} fa fa-exclamation-triangle"></i>
</div>
</div> </div>
<div class="${css.buttons}"> <div class="${css.buttons}">
<div class="${css.button}"> <div class="${css.button}">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment