From 25dd0440f6cec45cb616ce845bdccb84c8b59dfe Mon Sep 17 00:00:00 2001 From: Craig Raw Date: Wed, 3 Nov 2021 14:09:49 +0200 Subject: [PATCH] add show transaction/psbt as qr from file menu --- .../sparrowwallet/sparrow/AppController.java | 41 +++++++++++++++++++ .../com/sparrowwallet/sparrow/app.fxml | 2 + 2 files changed, 43 insertions(+) diff --git a/src/main/java/com/sparrowwallet/sparrow/AppController.java b/src/main/java/com/sparrowwallet/sparrow/AppController.java index 0a82cf9b..fbd1775c 100644 --- a/src/main/java/com/sparrowwallet/sparrow/AppController.java +++ b/src/main/java/com/sparrowwallet/sparrow/AppController.java @@ -17,6 +17,9 @@ import com.sparrowwallet.drongo.psbt.PSBTInput; import com.sparrowwallet.drongo.psbt.PSBTParseException; import com.sparrowwallet.drongo.psbt.PSBTSignatureException; import com.sparrowwallet.drongo.wallet.*; +import com.sparrowwallet.hummingbird.UR; +import com.sparrowwallet.hummingbird.registry.CryptoPSBT; +import com.sparrowwallet.hummingbird.registry.RegistryType; import com.sparrowwallet.sparrow.control.*; import com.sparrowwallet.sparrow.event.*; import com.sparrowwallet.sparrow.glyphfont.FontAwesome5; @@ -90,12 +93,18 @@ public class AppController implements Initializable { @FXML private MenuItem saveTransaction; + @FXML + private MenuItem showTransaction; + @FXML private Menu savePSBT; @FXML private MenuItem savePSBTBinary; + @FXML + private MenuItem showPSBT; + @FXML private MenuItem exportWallet; @@ -306,8 +315,11 @@ public class AppController implements Initializable { preventSleep.selectedProperty().bindBidirectional(preventSleepProperty); saveTransaction.setDisable(true); + showTransaction.visibleProperty().bind(Bindings.and(saveTransaction.visibleProperty(), saveTransaction.disableProperty().not())); + showTransaction.disableProperty().bind(saveTransaction.disableProperty()); savePSBT.visibleProperty().bind(saveTransaction.visibleProperty().not()); savePSBTBinary.disableProperty().bind(saveTransaction.visibleProperty()); + showPSBT.visibleProperty().bind(saveTransaction.visibleProperty().not()); exportWallet.setDisable(true); lockWallet.setDisable(true); refreshWallet.disableProperty().bind(Bindings.or(exportWallet.disableProperty(), Bindings.or(serverToggle.disableProperty(), AppServices.onlineProperty().not()))); @@ -588,6 +600,23 @@ public class AppController implements Initializable { } } + public void showTransaction(ActionEvent event) { + Tab selectedTab = tabs.getSelectionModel().getSelectedItem(); + TabData tabData = (TabData)selectedTab.getUserData(); + if(tabData.getType() == TabData.TabType.TRANSACTION) { + TransactionTabData transactionTabData = (TransactionTabData) tabData; + Transaction transaction = transactionTabData.getTransaction(); + + try { + UR ur = UR.fromBytes(transaction.bitcoinSerialize()); + QRDisplayDialog qrDisplayDialog = new QRDisplayDialog(ur); + qrDisplayDialog.showAndWait(); + } catch(Exception e) { + log.error("Error creating UR", e); + } + } + } + public void savePSBTBinary(ActionEvent event) { savePSBT(false, true); } @@ -671,6 +700,18 @@ public class AppController implements Initializable { } } + public void showPSBT(ActionEvent event) { + Tab selectedTab = tabs.getSelectionModel().getSelectedItem(); + TabData tabData = (TabData)selectedTab.getUserData(); + if(tabData.getType() == TabData.TabType.TRANSACTION) { + TransactionTabData transactionTabData = (TransactionTabData)tabData; + + CryptoPSBT cryptoPSBT = new CryptoPSBT(transactionTabData.getPsbt().serialize()); + QRDisplayDialog qrDisplayDialog = new QRDisplayDialog(cryptoPSBT.toUR()); + qrDisplayDialog.show(); + } + } + public List getOpenWalletTabData() { List openWalletTabData = new ArrayList<>(); diff --git a/src/main/resources/com/sparrowwallet/sparrow/app.fxml b/src/main/resources/com/sparrowwallet/sparrow/app.fxml index 7791efc3..3a6e21b7 100644 --- a/src/main/resources/com/sparrowwallet/sparrow/app.fxml +++ b/src/main/resources/com/sparrowwallet/sparrow/app.fxml @@ -28,6 +28,7 @@ + @@ -40,6 +41,7 @@ +