From 13e86726fff3bc4fcb7f598aa6b0b7e4ac12ed95 Mon Sep 17 00:00:00 2001 From: Inso <insomniak.fr@gmail.com> Date: Wed, 3 Feb 2016 21:50:01 +0100 Subject: [PATCH] Fix bug #363 --- src/sakia/models/txhistory.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/sakia/models/txhistory.py b/src/sakia/models/txhistory.py index 38d0d7c2..a351985c 100644 --- a/src/sakia/models/txhistory.py +++ b/src/sakia/models/txhistory.py @@ -230,9 +230,13 @@ class HistoryTableModel(QAbstractTableModel): async def data_received(self, transfer): amount = transfer.metadata['amount'] + if transfer.blockid: + block_number = transfer.blockid.number + else: + block_number = None try: deposit = await self.account.current_ref(transfer.metadata['amount'], self.community, - self.app, transfer.blockid.number)\ + self.app, block_number)\ .diff_localized(international_system=self.app.preferences['international_system_of_units']) except NoPeerAvailable: deposit = "Could not compute" @@ -246,20 +250,21 @@ class HistoryTableModel(QAbstractTableModel): date_ts = transfer.metadata['time'] txid = transfer.metadata['txid'] - if transfer.blockid: - block_number = transfer.blockid.number - else: - block_number = None return (date_ts, sender, "", deposit, comment, transfer.state, txid, transfer.metadata['issuer'], block_number, amount) async def data_sent(self, transfer): + if transfer.blockid: + block_number = transfer.blockid.number + else: + block_number = None + amount = transfer.metadata['amount'] try: paiment = await self.account.current_ref(transfer.metadata['amount'], self.community, - self.app, transfer.blockid.number)\ + self.app, block_number)\ .diff_localized(international_system=self.app.preferences['international_system_of_units']) except NoPeerAvailable: paiment = "Could not compute" @@ -273,11 +278,6 @@ class HistoryTableModel(QAbstractTableModel): date_ts = transfer.metadata['time'] txid = transfer.metadata['txid'] - if transfer.blockid: - block_number = transfer.blockid.number - else: - block_number = None - return (date_ts, receiver, paiment, "", comment, transfer.state, txid, transfer.metadata['receiver'], block_number, amount) -- GitLab