From 5bdab8a8790bda8e0243348b0807afb030191cf4 Mon Sep 17 00:00:00 2001
From: ninabreznik <ninabreznik@gmail.com>
Date: Fri, 18 Aug 2017 22:14:05 +0100
Subject: [PATCH] Remove legend, add info about type (call/payable/not payable,
 restyle pending)

---
 src/app/tabs/run-tab.js | 49 +++++++++++++++++++----------------------
 src/universal-dapp.js   |  7 +++++-
 2 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/src/app/tabs/run-tab.js b/src/app/tabs/run-tab.js
index ea3e8a9b18..091284eb03 100644
--- a/src/app/tabs/run-tab.js
+++ b/src/app/tabs/run-tab.js
@@ -76,6 +76,11 @@ var css = csjs`
   .contractNames {
     ${styles.dropdown}
   }
+  .subcontainer {
+    display: flex;
+    flex-direction: row;
+    align-items: baseline;
+  }
   .buttons {
     display: flex;
     cursor: pointer;
@@ -115,12 +120,6 @@ var css = csjs`
     color: ${styles.colors.lightGrey};
     font-style: italic;
   }
-  .legend {
-    float: right;
-    display: flex;
-    word-break: normal;
-    margin-left: auto;
-  }
   .item {
     margin-right: 1em;
     display: flex;
@@ -138,13 +137,21 @@ var css = csjs`
     color: ${styles.colors.lightBlue};
     margin-right: .3em;
   }
+  .pendingContainer {
+    display: flex;
+    align-items: baseline;
+  }
   .pending {
-    background-color: ${styles.colors.lightRed};
-    width: 75px;
     height: 25px;
     text-align: center;
     padding-left: 10px;
     border-radius: 3px;
+    margin-left: 5px;
+  }
+  .icon {
+    font-size: 12px;
+    color: ${styles.colors.orange};
+    margin-left: 10%;
   }
 `
 console.log(styles.displayBox.toString())
@@ -212,7 +219,7 @@ function updateAccountBalances (container, appAPI) {
 }
 
 function updatePendingTxs (container, appAPI) {
-  container.querySelector('#pendingtxs').innerText = Object.keys(appAPI.udapp().pendingTransactions()).length + ' pending'
+  container.querySelector('#pendingtxs').innerText = Object.keys(appAPI.udapp().pendingTransactions()).length
 }
 
 /* ------------------------------------------------
@@ -231,7 +238,13 @@ function contractDropdown (appAPI, appEvents, instanceContainer) {
   var selectContractNames = yo`<select class="${css.contractNames}" disabled></select>`
   var el = yo`
     <div class="${css.container}">
-      ${selectContractNames} ${legend()}
+      <div class="${css.subcontainer}">
+        ${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 class="${css.buttons}">
         <div class="${css.button}">
           <div class="${css.atAddress}" onclick=${function () { loadFromAddress(appAPI) }}>At Address</div>
@@ -397,19 +410,3 @@ function settings (appAPI, appEvents) {
 
   return el
 }
-
-/* ------------------------------------------------
-              section  LEGEND
------------------------------------------------- */
-function legend () {
-  var el =
-  yo`
-    <div class="${css.legend}">
-      <div class="${css.item}"><i class="fa fa-circle ${css.call}" aria-hidden="true"></i>Call</div>
-      <div class="${css.item}"><i class="fa fa-circle ${css.transact}" aria-hidden="true"></i>Transact</div>
-      <div class="${css.item}"><i class="fa fa-circle ${css.payable}" aria-hidden="true"></i>Transact(Payable)</div>
-      <div class="${css.item} ${css.pending}" id="pendingtxs"></div>
-    </div>
-  `
-  return el
-}
diff --git a/src/universal-dapp.js b/src/universal-dapp.js
index 3475306c7c..2378345476 100644
--- a/src/universal-dapp.js
+++ b/src/universal-dapp.js
@@ -334,7 +334,7 @@ UniversalDApp.prototype.getCallButton = function (args) {
 
   if (lookupOnly) {
     $contractProperty.addClass('constant')
-    call()
+    button.attr('title', (title + " - call)"))
   }
 
   if (args.funABI.inputs && args.funABI.inputs.length > 0) {
@@ -343,6 +343,11 @@ UniversalDApp.prototype.getCallButton = function (args) {
 
   if (args.funABI.payable === true) {
     $contractProperty.addClass('payable')
+    button.attr('title', (title + " - transact (payable)"))
+  }
+
+  if (args.funABI.payable === false) {
+    button.attr('title', (title + " - transact (not payable)"))
   }
 
   return $contractProperty