aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-01-30 21:49:45 +0800
committerobscuren <geffobscura@gmail.com>2015-01-30 21:49:45 +0800
commit0ed3edc99e746eeb8e5ec0217c03be298849459e (patch)
tree60dfd4f90a044858296fa0085b5c35707008e06e
parent0c0708076e2e53f2c85256b9fee5749cccd1d739 (diff)
downloadgo-tangerine-0ed3edc99e746eeb8e5ec0217c03be298849459e.tar
go-tangerine-0ed3edc99e746eeb8e5ec0217c03be298849459e.tar.gz
go-tangerine-0ed3edc99e746eeb8e5ec0217c03be298849459e.tar.bz2
go-tangerine-0ed3edc99e746eeb8e5ec0217c03be298849459e.tar.lz
go-tangerine-0ed3edc99e746eeb8e5ec0217c03be298849459e.tar.xz
go-tangerine-0ed3edc99e746eeb8e5ec0217c03be298849459e.tar.zst
go-tangerine-0ed3edc99e746eeb8e5ec0217c03be298849459e.zip
"fixed" transaction view
-rw-r--r--cmd/mist/assets/qml/main.qml2
-rw-r--r--cmd/mist/assets/qml/views/info.qml2
-rw-r--r--cmd/mist/assets/qml/views/wallet.qml7
3 files changed, 5 insertions, 6 deletions
diff --git a/cmd/mist/assets/qml/main.qml b/cmd/mist/assets/qml/main.qml
index da1f4a0c6..439f7888c 100644
--- a/cmd/mist/assets/qml/main.qml
+++ b/cmd/mist/assets/qml/main.qml
@@ -103,7 +103,7 @@ ApplicationWindow {
return views
} catch(e) {
- ethx.note(e)
+ console.log(e)
}
}
diff --git a/cmd/mist/assets/qml/views/info.qml b/cmd/mist/assets/qml/views/info.qml
index f694f1e7a..14ee0bce1 100644
--- a/cmd/mist/assets/qml/views/info.qml
+++ b/cmd/mist/assets/qml/views/info.qml
@@ -28,7 +28,7 @@ Rectangle {
text: "Address"
}
TextField {
- text: ""//eth.key().address
+ text: eth.coinbase()
width: 500
}
diff --git a/cmd/mist/assets/qml/views/wallet.qml b/cmd/mist/assets/qml/views/wallet.qml
index d6160740d..545098284 100644
--- a/cmd/mist/assets/qml/views/wallet.qml
+++ b/cmd/mist/assets/qml/views/wallet.qml
@@ -20,10 +20,9 @@ Rectangle {
}
function setBalance() {
- //balance.text = "<b>Balance</b>: " + eth.numberToHuman(eth.balanceAt(eth.key().address))
+ balance.text = "<b>Balance</b>: " + eth.numberToHuman(eth.balanceAt(eth.coinbase()))
if(menuItem)
- menuItem.secondaryTitle = eth.numberToHuman("0")
- //menuItem.secondaryTitle = eth.numberToHuman(eth.balanceAt(eth.key().address))
+ menuItem.secondaryTitle = eth.numberToHuman(eth.balanceAt(eth.coinbase()))
}
ListModel {
@@ -131,7 +130,7 @@ Rectangle {
onClicked: {
var value = txValue.text + denomModel.get(valueDenom.currentIndex).zeros;
var gasPrice = "10000000000000"
- //var res = eth.transact({from: eth.key().privateKey, to: txTo.text, value: value, gas: "500", gasPrice: gasPrice})
+ var res = eth.transact({from: eth.coinbase(), to: txTo.text, value: value, gas: "500", gasPrice: gasPrice})
}
}
}