diff --git a/electrum/gui/qml/components/NetworkOverview.qml b/electrum/gui/qml/components/NetworkOverview.qml index dc6ac9dcc..201ba2ae4 100644 --- a/electrum/gui/qml/components/NetworkOverview.qml +++ b/electrum/gui/qml/components/NetworkOverview.qml @@ -69,8 +69,8 @@ Pane { RowLayout { Image { visible: Network.isProxyTor - Layout.preferredWidth: constants.iconSizeSmall - Layout.preferredHeight: constants.iconSizeSmall + Layout.preferredWidth: constants.iconSizeMedium + Layout.preferredHeight: constants.iconSizeMedium source: '../../icons/tor_logo.png' } Label { diff --git a/electrum/gui/qml/components/TxDetails.qml b/electrum/gui/qml/components/TxDetails.qml index c6fc2dc88..4f52cc0ee 100644 --- a/electrum/gui/qml/components/TxDetails.qml +++ b/electrum/gui/qml/components/TxDetails.qml @@ -24,6 +24,11 @@ Pane { app.stack.pop() } + function showExport() { + var dialog = exportTxDialog.createObject(root, { txdetails: txdetails }) + dialog.open() + } + ColumnLayout { anchors.fill: parent spacing: 0 diff --git a/electrum/gui/qml/components/WalletMainView.qml b/electrum/gui/qml/components/WalletMainView.qml index f998969cb..a66cdb64d 100644 --- a/electrum/gui/qml/components/WalletMainView.qml +++ b/electrum/gui/qml/components/WalletMainView.qml @@ -313,7 +313,12 @@ Item { finalizer: TxFinalizer { wallet: Daemon.currentWallet canRbf: true - onFinished: _confirmPaymentDialog.destroy() + onFinishedSave: { + // tx was (partially) signed and saved. Show QR for co-signers or online wallet + var page = app.stack.push(Qt.resolvedUrl('TxDetails.qml'), { txid: txid }) + page.showExport() + _confirmPaymentDialog.destroy() + } } } } diff --git a/electrum/gui/qml/qetxfinalizer.py b/electrum/gui/qml/qetxfinalizer.py index d8aafc2d7..79e8b80f7 100644 --- a/electrum/gui/qml/qetxfinalizer.py +++ b/electrum/gui/qml/qetxfinalizer.py @@ -220,7 +220,7 @@ class TxFeeSlider(FeeSlider): class QETxFinalizer(TxFeeSlider): _logger = get_logger(__name__) - finished = pyqtSignal() + finishedSave = pyqtSignal([str], arguments=['txid']) def __init__(self, parent=None, *, make_tx=None, accept=None): super().__init__(parent) @@ -352,7 +352,6 @@ class QETxFinalizer(TxFeeSlider): return self._wallet.sign(self._tx, broadcast=True) - self.finished.emit() @pyqtSlot() def signAndSave(self): @@ -383,7 +382,7 @@ class QETxFinalizer(TxFeeSlider): if not self._wallet.wallet.adb.add_transaction(self._tx): self._logger.error('Could not save tx') - self.finished.emit() + self.finishedSave.emit(self._tx.txid()) @pyqtSlot(result=str) @pyqtSlot(bool, result=str)