electrum

commit 8b9cff638f820fbe9b76c27c9126f75e9921d435
parent 835bc4e4aa5e938e9cd841de7d8bc38dfde7dc3d
Author: ThomasV <thomasv@electrum.org>
Date:   Fri,  4 Sep 2015 12:19:24 +0200

kivy: fix tx dialog

Diffstat:
M
gui/kivy/uix/dialogs/carousel_dialog.py
 | 
10
++++++----
M
gui/kivy/uix/ui_screens/mainscreen.kv
 | 
2
+-

2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/gui/kivy/uix/dialogs/carousel_dialog.py b/gui/kivy/uix/dialogs/carousel_dialog.py
@@ -120,10 +120,11 @@ class RecentActivityDialog(CarouselDialog):
 
         tx_hash = item.tx_hash
         tx = app.wallet.transactions.get(tx_hash)
+        tx.deserialize()
 
         if tx_hash in app.wallet.transactions.keys():
-            is_relevant, is_mine, v, fee = app.wallet.get_tx_value(tx)
-            conf, timestamp = app.wallet.verifier.get_confirmations(tx_hash)
+            is_relevant, is_mine, v, fee = app.wallet.get_wallet_delta(tx)
+            conf, timestamp = app.wallet.get_confirmations(tx_hash)
         else:
             is_mine = False
 
@@ -139,7 +140,7 @@ class RecentActivityDialog(CarouselDialog):
         addresses = app.wallet.addresses()
         _labels = {}
 
-        self.wallet_name = app.wallet.get_account_names()[0]
+        self.wallet_name = app.wallet.get_account_names()['0']
         for address in addresses:
             _labels[labels.get(address, address)] = address
 
@@ -229,10 +230,11 @@ class RecentActivityDialog(CarouselDialog):
         tx_hash = self.tx_hash
         if tx_hash:
             tx = app.wallet.transactions.get(tx_hash)
+            tx.deserialize()
             if mode == 'out':
                 content.data = \
                     [(address, app.format_amount(value))\
-                    for address, value in tx.outputs]
+                    for _type, address, value in tx.outputs]
             else:
                 content.data = \
                     [(input['address'], input['prevout_hash'])\
diff --git a/gui/kivy/uix/ui_screens/mainscreen.kv b/gui/kivy/uix/ui_screens/mainscreen.kv
@@ -1095,7 +1095,7 @@
     amount_color: '#000000ff'
     quote_text: '0'
     address: u''
-    address_known: unicode(self.address or self.address[1:]) in app.wallet.addressbook + self.labels.keys()
+    address_known: unicode(self.address or self.address[1:]) in app.contacts.keys() + self.labels.keys()
     confirmations: 0
     date: '0/0/0'
     fee: _('unknown')