aboutsummaryrefslogtreecommitdiffstats
path: root/mist
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-09-25 02:40:18 +0800
committerobscuren <geffobscura@gmail.com>2014-09-25 02:40:18 +0800
commit1cb12296f6a0107acd0ed18b28c1d5e414c10bcf (patch)
tree1331dac4c445733c05c7061fcee173e62da53e97 /mist
parent96fd1ce270b7e6ab98497b612c3c3dce39670fcc (diff)
downloadgo-tangerine-1cb12296f6a0107acd0ed18b28c1d5e414c10bcf.tar.gz
go-tangerine-1cb12296f6a0107acd0ed18b28c1d5e414c10bcf.tar.zst
go-tangerine-1cb12296f6a0107acd0ed18b28c1d5e414c10bcf.zip
Temp work around
Diffstat (limited to 'mist')
-rw-r--r--mist/assets/qml/views/jeffcoin/jeffcoin.qml6
-rw-r--r--mist/assets/qml/views/wallet.qml2
-rw-r--r--mist/ui_lib.go4
3 files changed, 6 insertions, 6 deletions
diff --git a/mist/assets/qml/views/jeffcoin/jeffcoin.qml b/mist/assets/qml/views/jeffcoin/jeffcoin.qml
index dc8678d1c..6506b53b8 100644
--- a/mist/assets/qml/views/jeffcoin/jeffcoin.qml
+++ b/mist/assets/qml/views/jeffcoin/jeffcoin.qml
@@ -47,9 +47,9 @@ Rectangle {
});
var blockNumber = eth.block(-1).number;
- var messages = filter.messages()
- for(var i = messages.length-1; i >= 0; i--) {
- var message = messages.get(i)
+ var msgs = filter.messages()
+ for(var i = msgs.length-1; i >= 0; i--) {
+ var message = JSON.parse(msgs.getAsJson(i))
insertTx(message, blockNumber)
}
diff --git a/mist/assets/qml/views/wallet.qml b/mist/assets/qml/views/wallet.qml
index fbe1dfd0e..a3a4a6e7c 100644
--- a/mist/assets/qml/views/wallet.qml
+++ b/mist/assets/qml/views/wallet.qml
@@ -151,7 +151,7 @@ Rectangle {
model: ListModel {
id: txModel
Component.onCompleted: {
- var filter = ethx.watch({latest: -1, from: eth.key().address});
+ var filter = ethx.watch({latest: -1, from: eth.key().address});
filter.changed(addTxs)
addTxs(filter.messages())
diff --git a/mist/ui_lib.go b/mist/ui_lib.go
index e5ddd38c8..e1963aa86 100644
--- a/mist/ui_lib.go
+++ b/mist/ui_lib.go
@@ -188,9 +188,9 @@ func (self *UiLib) NewFilterString(typ string) int {
func (self *UiLib) Messages(id int) *ethutil.List {
filter := self.eth.GetFilter(id)
if filter != nil {
- messages := filter.Find()
+ messages := ethpipe.ToJSMessages(filter.Find())
- return ethpipe.ToJSMessages(messages)
+ return messages
}
return ethutil.EmptyList()