From 288b7cd3bc635d109554f851c81d485e2fb1d690 Mon Sep 17 00:00:00 2001 From: Sander van Grieken Date: Wed, 29 Mar 2023 11:39:40 +0200 Subject: [PATCH] qml: show explanatory text when sharing partially signed tx after creating a multisig transaction --- electrum/gui/qml/components/ExportTxDialog.qml | 7 +++---- electrum/gui/qml/components/TxDetails.qml | 7 +++++-- electrum/gui/qml/components/WalletMainView.qml | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/electrum/gui/qml/components/ExportTxDialog.qml b/electrum/gui/qml/components/ExportTxDialog.qml index b69461803..0db305af4 100644 --- a/electrum/gui/qml/components/ExportTxDialog.qml +++ b/electrum/gui/qml/components/ExportTxDialog.qml @@ -51,13 +51,12 @@ ElDialog { } } - Label { + InfoTextArea { + Layout.fillWidth: true + Layout.margins: constants.paddingLarge visible: dialog.text_help text: dialog.text_help - wrapMode: Text.Wrap - Layout.fillWidth: true } - } } diff --git a/electrum/gui/qml/components/TxDetails.qml b/electrum/gui/qml/components/TxDetails.qml index 68000b298..a7b803225 100644 --- a/electrum/gui/qml/components/TxDetails.qml +++ b/electrum/gui/qml/components/TxDetails.qml @@ -24,8 +24,11 @@ Pane { app.stack.pop() } - function showExport() { - var dialog = exportTxDialog.createObject(root, { txdetails: txdetails }) + function showExport(helptext) { + var dialog = exportTxDialog.createObject(root, { + txdetails: txdetails, + text_help: helptext + }) dialog.open() } diff --git a/electrum/gui/qml/components/WalletMainView.qml b/electrum/gui/qml/components/WalletMainView.qml index 38d94360e..c4fd23c55 100644 --- a/electrum/gui/qml/components/WalletMainView.qml +++ b/electrum/gui/qml/components/WalletMainView.qml @@ -400,7 +400,7 @@ Item { 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() + page.showExport(qsTr('Transaction created and partially signed by this wallet. Present this QR code to the next co-signer')) _confirmPaymentDialog.destroy() } }