Skip to content
Snippets Groups Projects
Commit 13e86726 authored by inso's avatar inso
Browse files

Fix bug #363

parent 48b5d339
Branches
Tags
No related merge requests found
...@@ -230,9 +230,13 @@ class HistoryTableModel(QAbstractTableModel): ...@@ -230,9 +230,13 @@ class HistoryTableModel(QAbstractTableModel):
async def data_received(self, transfer): async def data_received(self, transfer):
amount = transfer.metadata['amount'] amount = transfer.metadata['amount']
if transfer.blockid:
block_number = transfer.blockid.number
else:
block_number = None
try: try:
deposit = await self.account.current_ref(transfer.metadata['amount'], self.community, 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']) .diff_localized(international_system=self.app.preferences['international_system_of_units'])
except NoPeerAvailable: except NoPeerAvailable:
deposit = "Could not compute" deposit = "Could not compute"
...@@ -246,20 +250,21 @@ class HistoryTableModel(QAbstractTableModel): ...@@ -246,20 +250,21 @@ class HistoryTableModel(QAbstractTableModel):
date_ts = transfer.metadata['time'] date_ts = transfer.metadata['time']
txid = transfer.metadata['txid'] txid = transfer.metadata['txid']
if transfer.blockid:
block_number = transfer.blockid.number
else:
block_number = None
return (date_ts, sender, "", deposit, return (date_ts, sender, "", deposit,
comment, transfer.state, txid, comment, transfer.state, txid,
transfer.metadata['issuer'], block_number, amount) transfer.metadata['issuer'], block_number, amount)
async def data_sent(self, transfer): async def data_sent(self, transfer):
if transfer.blockid:
block_number = transfer.blockid.number
else:
block_number = None
amount = transfer.metadata['amount'] amount = transfer.metadata['amount']
try: try:
paiment = await self.account.current_ref(transfer.metadata['amount'], self.community, 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']) .diff_localized(international_system=self.app.preferences['international_system_of_units'])
except NoPeerAvailable: except NoPeerAvailable:
paiment = "Could not compute" paiment = "Could not compute"
...@@ -273,11 +278,6 @@ class HistoryTableModel(QAbstractTableModel): ...@@ -273,11 +278,6 @@ class HistoryTableModel(QAbstractTableModel):
date_ts = transfer.metadata['time'] date_ts = transfer.metadata['time']
txid = transfer.metadata['txid'] txid = transfer.metadata['txid']
if transfer.blockid:
block_number = transfer.blockid.number
else:
block_number = None
return (date_ts, receiver, paiment, return (date_ts, receiver, paiment,
"", comment, transfer.state, txid, "", comment, transfer.state, txid,
transfer.metadata['receiver'], block_number, amount) transfer.metadata['receiver'], block_number, amount)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment