Merge branch 'dev' of github.com:duniter/sakia into dev

src/sakia/core/txhistory.py

 import asyncio
 import logging
 import hashlib
+import math
 from duniterpy.documents.transaction import SimpleTransaction
 from duniterpy.documents.block import Block
 from duniterpy.api import  bma, errors
@@ -9,7 +10,7 @@ from .net.network import MAX_CONFIRMATIONS
 from ..tools.exceptions import LookupFailureError, NoPeerAvailable
 
 
-class TxHistory():
+class TxHistory:
     def __init__(self, app, wallet):
         self._latest_block = 0
         self.wallet = wallet
@@ -169,7 +170,7 @@ class TxHistory():
                        if o.conditions.left.pubkey != self.wallet.pubkey]
             amount = 0
             for o in outputs:
-                amount += o.amount
+                amount += o.amount * math.pow(10, o.base)
             metadata['amount'] = amount
             transfer = Transfer.create_from_blockchain(tx_hash,
                                                        blockUID,
@@ -182,7 +183,7 @@ class TxHistory():
                        if o.conditions.left.pubkey == self.wallet.pubkey]
             amount = 0
             for o in outputs:
-                amount += o.amount
+                amount += o.amount * math.pow(10, o.base)
             metadata['amount'] = amount
 
             transfer = Transfer.create_from_blockchain(tx_hash,

src/sakia/gui/informations_tab.py

@@ -5,6 +5,7 @@ Created on 31 janv. 2015
 """
 
 import logging
+import math
 from PyQt5.QtCore import QLocale, QDateTime, QEvent
 from PyQt5.QtWidgets import QWidget
 from ..gen_resources.informations_tab_uic import Ui_InformationsTabWidget
@@ -77,7 +78,7 @@ class InformationsTabWidget(QWidget, Ui_InformationsTabWidget):
 
         if block_ud:
             # display float values
-            localized_ud = await self.account.current_ref.instance(block_ud['dividend'],
+            localized_ud = await self.account.current_ref.instance(block_ud['dividend'] * math.pow(10, block_ud['unitbase']),
                                                                self.community,
                                                                self.app) \
                 .diff_localized(True, self.app.preferences['international_system_of_units'])
@@ -117,7 +118,7 @@ class InformationsTabWidget(QWidget, Ui_InformationsTabWidget):
                 if block_ud['membersCount'] == 0 or block_ud_minus_1['monetaryMass'] == 0:
                     actual_growth = float(0)
                 else:
-                    actual_growth = block_ud['dividend'] / (block_ud_minus_1['monetaryMass'] / block_ud['membersCount'])
+                    actual_growth = (block_ud['dividend'] * math.pow(10, block_ud['unitbase'])) / (block_ud_minus_1['monetaryMass'] / block_ud['membersCount'])
 
                 localized_ud_median_time_minus_1 = QLocale.toString(
                     QLocale(),