diff --git a/src/sakia/data/entities/connection.py b/src/sakia/data/entities/connection.py index 79d23da97ff1c6441a1207662ab3d038b95c5ac0..09b453740b106506ddad0520368884072731aad8 100644 --- a/src/sakia/data/entities/connection.py +++ b/src/sakia/data/entities/connection.py @@ -21,7 +21,7 @@ class Connection: password = attr.ib(init=False, convert=str, default="", cmp=False, hash=False) def title(self): - return self.uid + "[" + self.pubkey[:7] + "]@" + self.currency + return "@".join([self.uid, self.pubkey[:11]]) @property def scrypt_params(self): diff --git a/src/sakia/data/processors/dividends.py b/src/sakia/data/processors/dividends.py index a094f90b3d1be54f22d788b2dbe1b43e2d1471b2..5c10168face779efd62ff8a91e905a3a0a092616 100644 --- a/src/sakia/data/processors/dividends.py +++ b/src/sakia/data/processors/dividends.py @@ -64,14 +64,14 @@ class DividendsProcessor: for tx in transactions: txdoc = Transaction.from_signed_raw(tx.raw) for input in txdoc.inputs: - if input.source == "D" and input.origin_id == identity.pubkey and input.index not in block_numbers: - block = await self._bma_connector.get(identity.currency, + if input.source == "D" and input.origin_id == connection.pubkey and input.index not in block_numbers: + block = await self._bma_connector.get(connection.currency, bma.blockchain.block, req_args={'number': input.index}, verify=False) await asyncio.sleep(0.5) - dividend = Dividend(currency=identity.currency, - pubkey=identity.pubkey, + dividend = Dividend(currency=connection.currency, + pubkey=connection.pubkey, block_number=input.index, timestamp=block["medianTime"], amount=block["dividend"], diff --git a/src/sakia/gui/dialogs/transfer/controller.py b/src/sakia/gui/dialogs/transfer/controller.py index f4e3cc4520dee62041ef65a4a78ea00b5408b656..e50ffbcf3f0299dc5317ae7be4dae13b717d0b86 100644 --- a/src/sakia/gui/dialogs/transfer/controller.py +++ b/src/sakia/gui/dialogs/transfer/controller.py @@ -168,6 +168,7 @@ class TransferController(QObject): self.view.accept() else: await self.view.show_error(self.model.notifications(), result[1]) + self.model.app.new_transfer.emit(transaction) QApplication.restoreOverrideCursor() self.view.button_box.setEnabled(True)