Coinbase BuyBack plugin

[electrum-nvc.git] / gui / qt / lite_window.py

diff --git a/gui/qt/lite_window.py b/gui/qt/lite_window.py
index 5182714..6886743 100644 (file)
--- a/gui/qt/lite_window.py
+++ b/gui/qt/lite_window.py
@@ -111,12 +111,12 @@ def csv_transaction(wallet):
                         time_string = "pending"
 
                     if value is not None:
-                        value_string = format_satoshis(value, True, wallet.num_zeros)
+                        value_string = format_satoshis(value, True)
                     else:
                         value_string = '--'
 
                     if fee is not None:
-                        fee_string = format_satoshis(fee, True, wallet.num_zeros)
+                        fee_string = format_satoshis(fee, True)
                     else:
                         fee_string = '0'
 
@@ -125,9 +125,9 @@ def csv_transaction(wallet):
                     else:
                       label = ""
 
-                    balance_string = format_satoshis(balance, False, wallet.num_zeros)
+                    balance_string = format_satoshis(balance, False)
                     transaction.writerow([tx_hash, label, confirmations, value_string, fee_string, balance_string, time_string])
-                QMessageBox.information(None,"CSV Export created", "Your CSV export has been successfully created.")
+                QMessageBox.information(None,_("CSV Export created"), _("Your CSV export has been successfully created."))
     except (IOError, os.error), reason:
         export_error_label = _("Electrum was unable to produce a transaction export.")
         QMessageBox.critical(None,_("Unable to create csv"), export_error_label + "\n" + str(reason))
@@ -355,8 +355,7 @@ class MiniWindow(QDialog):
     def closeEvent(self, event):
         g = self.geometry()
         self.config.set_key("winpos-lite", [g.left(),g.top(),g.width(),g.height()],True)
-        
-        super(MiniWindow, self).closeEvent(event)
+        self.actuator.g.closeEvent(event)
         qApp.quit()
 
     def set_payment_fields(self, dest_address, amount):
@@ -750,7 +749,7 @@ class MiniActuator:
 
         try:
             tx = self.g.wallet.mktx([(dest_address, amount)], password, fee)
-        except BaseException as error:
+        except Exception as error:
             QMessageBox.warning(parent_window, _('Error'), str(error), _('OK'))
             return False
 
@@ -759,7 +758,7 @@ class MiniActuator:
 
             self.waiting_dialog(lambda: False if self.g.wallet.tx_event.isSet() else _("Sending transaction, please wait..."))
               
-            status, message = self.g.wallet.receive_tx(h)
+            status, message = self.g.wallet.receive_tx(h, tx)
 
             if not status:
                 import tempfile
@@ -778,7 +777,7 @@ class MiniActuator:
                 with open(fileName,'w') as f:
                     f.write(json.dumps(tx.as_dict(),indent=4) + '\n')
                 QMessageBox.information(QWidget(), _('Unsigned transaction created'), _("Unsigned transaction was saved to file:") + " " +fileName, _('OK'))
-            except BaseException as e:
+            except Exception as e:
                 QMessageBox.warning(QWidget(), _('Error'), _('Could not write transaction to file: %s' % e), _('OK'))
         return True
 
@@ -821,9 +820,10 @@ class MiniDriver(QObject):
         self.network = main_window.network
         self.window = mini_window
 
-        self.network.register_callback('updated',self.update_callback)
-        self.network.register_callback('connected', self.update_callback)
-        self.network.register_callback('disconnected', self.update_callback)
+        if self.network:
+            self.network.register_callback('updated',self.update_callback)
+            self.network.register_callback('connected', self.update_callback)
+            self.network.register_callback('disconnected', self.update_callback)
 
         self.state = None
 
@@ -838,7 +838,9 @@ class MiniDriver(QObject):
         self.emit(SIGNAL("updatesignal()"))
 
     def update(self):
-        if not self.network.interface:
+        if not self.network:
+            self.initializing()
+        elif not self.network.interface:
             self.initializing()
         elif not self.network.interface.is_connected:
             self.connecting()