AaronFiore/electrum
1
0
Fork 0
Code Activity

TxDialog: fix hooks. only show psbt widgets when applicable.

Browse Source 
users of 'transaction_dialog' were assuming that dialog.tx is already set
This commit is contained in:
SomberNight
2019-11-12 23:02:02 +01:00
parent 05c496edd1
commit 0c0a6b2145
4 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
electrum/plugins/coldcard/qt.py
View File

@@ -78,15 +78,15 @@ class Plugin(ColdcardPlugin, QtPluginBase):
def gettx_for_coldcard_export() -> PartialTransaction:
if not isinstance(dia.tx, PartialTransaction):
raise Exception("Can only export partial transactions for coinjoins.")
raise Exception("Can only export partial transactions for {}.".format(self.device))
tx = copy.deepcopy(dia.tx)
tx.add_info_from_wallet(dia.wallet, include_xpubs_and_full_paths=True)
return tx
# add a new "export" option
if isinstance(dia.tx, PartialTransaction):
export_submenu = dia.export_actions_menu.addMenu(_("For {}; include xpubs").format(self.device))
dia.add_export_actions_to_menu(export_submenu, gettx=gettx_for_coldcard_export)
export_submenu = dia.export_actions_menu.addMenu(_("For {}; include xpubs").format(self.device))
dia.add_export_actions_to_menu(export_submenu, gettx=gettx_for_coldcard_export)
dia.psbt_only_widgets.append(export_submenu)
def show_settings_dialog(self, window, keystore):
# When they click on the icon for CC we come here.