do not request merkle root for unconfirmed transactions

2012-10-29 09:31:42 +01:00
parent ea7dabe640
commit cdb52c30d2
3 changed files with 11 additions and 9 deletions
--- a/lib/gui_qt.py
+++ b/lib/gui_qt.py
@@ -437,7 +437,9 @@ class ElectrumWindow(QMainWindow):
            if tx['height']:
                conf = self.wallet.verifier.get_confirmations(tx_hash)
                time_str = datetime.datetime.fromtimestamp( tx['timestamp']).isoformat(' ')[:-3]
-                if conf < 6:
+                if conf == 0:
+                    icon = QIcon(":icons/unconfirmed.png")
+                elif conf < 6:
                    icon = QIcon(":icons/clock%d.png"%conf)
                else:
                    icon = QIcon(":icons/confirmed.png")