Browse Source

kivy: fix tx dialog

283
ThomasV 9 years ago
parent
commit
8b9cff638f
  1. 10
      gui/kivy/uix/dialogs/carousel_dialog.py
  2. 2
      gui/kivy/uix/ui_screens/mainscreen.kv

10
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'])\

2
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')

Loading…
Cancel
Save