aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/mist/assets
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-01-29 01:14:28 +0800
committerobscuren <geffobscura@gmail.com>2015-01-29 01:14:28 +0800
commit7f638f0b2d8d989be25e660178d79df3278e4c84 (patch)
tree85c74ca9ca6c604df04e13c9d90d8af15b99e8d6 /cmd/mist/assets
parentb46e1ca97e61ebfe4c37961e723142245efe5016 (diff)
downloadgo-tangerine-7f638f0b2d8d989be25e660178d79df3278e4c84.tar
go-tangerine-7f638f0b2d8d989be25e660178d79df3278e4c84.tar.gz
go-tangerine-7f638f0b2d8d989be25e660178d79df3278e4c84.tar.bz2
go-tangerine-7f638f0b2d8d989be25e660178d79df3278e4c84.tar.lz
go-tangerine-7f638f0b2d8d989be25e660178d79df3278e4c84.tar.xz
go-tangerine-7f638f0b2d8d989be25e660178d79df3278e4c84.tar.zst
go-tangerine-7f638f0b2d8d989be25e660178d79df3278e4c84.zip
moving to a better xeth
Diffstat (limited to 'cmd/mist/assets')
-rw-r--r--cmd/mist/assets/qml/main.qml4
-rw-r--r--cmd/mist/assets/qml/views/wallet.qml11
2 files changed, 5 insertions, 10 deletions
diff --git a/cmd/mist/assets/qml/main.qml b/cmd/mist/assets/qml/main.qml
index c6b524549..8f62cd0c8 100644
--- a/cmd/mist/assets/qml/main.qml
+++ b/cmd/mist/assets/qml/main.qml
@@ -56,7 +56,9 @@ ApplicationWindow {
mainSplit.setView(wallet.view, wallet.menuItem);
- newBrowserTab("http://etherian.io");
+ console.log(">>>>>>")
+ newBrowserTab("http://etherian.io");
+ console.log("WTF")
// Command setup
gui.sendCommand(0)
diff --git a/cmd/mist/assets/qml/views/wallet.qml b/cmd/mist/assets/qml/views/wallet.qml
index b81273a17..cb9762d2b 100644
--- a/cmd/mist/assets/qml/views/wallet.qml
+++ b/cmd/mist/assets/qml/views/wallet.qml
@@ -22,7 +22,8 @@ Rectangle {
function setBalance() {
//balance.text = "<b>Balance</b>: " + eth.numberToHuman(eth.balanceAt(eth.key().address))
if(menuItem)
- menuItem.secondaryTitle = eth.numberToHuman(eth.balanceAt(eth.key().address))
+ menuItem.secondaryTitle = eth.numberToHuman("0")
+ //menuItem.secondaryTitle = eth.numberToHuman(eth.balanceAt(eth.key().address))
}
ListModel {
@@ -155,14 +156,6 @@ Rectangle {
model: ListModel {
id: txModel
Component.onCompleted: {
- var me = eth.key().address;
- var filterTo = ethx.watch({latest: -1, to: me});
- var filterFrom = ethx.watch({latest: -1, from: me});
- filterTo.changed(addTxs)
- filterFrom.changed(addTxs)
-
- addTxs(filterTo.messages())
- addTxs(filterFrom.messages())
}
function addTxs(messages) {