diff options
author | obscuren <geffobscura@gmail.com> | 2014-09-25 02:41:22 +0800 |
---|---|---|
committer | obscuren <geffobscura@gmail.com> | 2014-09-25 02:41:22 +0800 |
commit | 29f5dd38e34b394d947e91597b322d50852effa4 (patch) | |
tree | 1331dac4c445733c05c7061fcee173e62da53e97 /mist/ui_lib.go | |
parent | 6ecbbe4006b8d1c5b40e3b268cd78a6b57605018 (diff) | |
parent | 1cb12296f6a0107acd0ed18b28c1d5e414c10bcf (diff) | |
download | go-tangerine-29f5dd38e34b394d947e91597b322d50852effa4.tar go-tangerine-29f5dd38e34b394d947e91597b322d50852effa4.tar.gz go-tangerine-29f5dd38e34b394d947e91597b322d50852effa4.tar.bz2 go-tangerine-29f5dd38e34b394d947e91597b322d50852effa4.tar.lz go-tangerine-29f5dd38e34b394d947e91597b322d50852effa4.tar.xz go-tangerine-29f5dd38e34b394d947e91597b322d50852effa4.tar.zst go-tangerine-29f5dd38e34b394d947e91597b322d50852effa4.zip |
Merge branch 'release/0.6.6' into develop
Diffstat (limited to 'mist/ui_lib.go')
-rw-r--r-- | mist/ui_lib.go | 4 |
1 files changed, 2 insertions, 2 deletions
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() |