Browse Source

rename tx segwit version field to segwit flag

terminal
Craig Raw 4 years ago
parent
commit
1fd1dec6cf
  1. 2
      drongo
  2. 1
      src/main/java/com/sparrowwallet/sparrow/control/QRScanDialog.java
  3. 2
      src/main/java/com/sparrowwallet/sparrow/transaction/HeadersController.java

2
drongo

@ -1 +1 @@
Subproject commit 60511e2c83eb9a39ab4fd47749b0e7e2da7bf748
Subproject commit 5013a0ef2fd0c80d4a568891c77361ed0c436173

1
src/main/java/com/sparrowwallet/sparrow/control/QRScanDialog.java

@ -600,6 +600,7 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
}
if(button instanceof Region) {
((Region)button).setPrefWidth(150);
((Region)button).setMaxWidth(150);
}

2
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";
}
}

Loading…
Cancel
Save