From 1fd1dec6cffc5057503265aca08d598a66a18626 Mon Sep 17 00:00:00 2001 From: Craig Raw Date: Thu, 8 Jul 2021 11:46:21 +0200 Subject: [PATCH] rename tx segwit version field to segwit flag --- drongo | 2 +- .../java/com/sparrowwallet/sparrow/control/QRScanDialog.java | 1 + .../sparrowwallet/sparrow/transaction/HeadersController.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drongo b/drongo index 60511e2c..5013a0ef 160000 --- a/drongo +++ b/drongo @@ -1 +1 @@ -Subproject commit 60511e2c83eb9a39ab4fd47749b0e7e2da7bf748 +Subproject commit 5013a0ef2fd0c80d4a568891c77361ed0c436173 diff --git a/src/main/java/com/sparrowwallet/sparrow/control/QRScanDialog.java b/src/main/java/com/sparrowwallet/sparrow/control/QRScanDialog.java index 4f460931..55a4104a 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/QRScanDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/QRScanDialog.java @@ -600,6 +600,7 @@ public class QRScanDialog extends Dialog { } if(button instanceof Region) { + ((Region)button).setPrefWidth(150); ((Region)button).setMaxWidth(150); } diff --git a/src/main/java/com/sparrowwallet/sparrow/transaction/HeadersController.java b/src/main/java/com/sparrowwallet/sparrow/transaction/HeadersController.java index e98cc18e..4b840fc8 100644 --- a/src/main/java/com/sparrowwallet/sparrow/transaction/HeadersController.java +++ b/src/main/java/com/sparrowwallet/sparrow/transaction/HeadersController.java @@ -442,7 +442,7 @@ public class HeadersController extends TransactionFormController implements Init String type = "Legacy"; if(headersForm.getTransaction().isSegwit() || (headersForm.getPsbt() != null && headersForm.getPsbt().getPsbtInputs().stream().anyMatch(in -> in.getWitnessUtxo() != null))) { type = "Segwit"; - if(headersForm.getTransaction().getSegwitVersion() == 2) { + if(headersForm.getTransaction().getSegwitFlag() == 2) { type = "Taproot"; } }