sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-12-24 12:46:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

show better descriptions on outputs based on signing wallet

Browse source
This commit is contained in:
Craig Raw 2020-08-31 11:22:15 +02:00
parent b808222faa
commit 5d6bb5e4f9
3 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drongo

@ -1 +1 @@
Subproject commit 10035278543d9ca90b11ae3d396edc3e6131fee2 Subproject commit 59d610f5395cab69a33cf675b3fb116f7e09394c

20
src/main/java/com/sparrowwallet/sparrow/transaction/OutputController.java
View file

@ -1,6 +1,7 @@
package com.sparrowwallet.sparrow.transaction; package com.sparrowwallet.sparrow.transaction;
import com.google.common.eventbus.Subscribe; import com.google.common.eventbus.Subscribe;
import com.sparrowwallet.drongo.KeyPurpose;
import com.sparrowwallet.drongo.address.Address; import com.sparrowwallet.drongo.address.Address;
import com.sparrowwallet.drongo.protocol.NonStandardScriptException; import com.sparrowwallet.drongo.protocol.NonStandardScriptException;
import com.sparrowwallet.drongo.protocol.TransactionInput; import com.sparrowwallet.drongo.protocol.TransactionInput;
@ -39,7 +40,7 @@ public class OutputController extends TransactionFormController implements Initi
private CopyableLabel to; private CopyableLabel to;
@FXML @FXML
private CopyableLabel change; private CopyableLabel walletType;
@FXML @FXML
private AddressLabel address; private AddressLabel address;
@ -83,10 +84,21 @@ public class OutputController extends TransactionFormController implements Initi
//ignore //ignore
} }
change.managedProperty().bind(change.visibleProperty()); walletType.managedProperty().bind(walletType.visibleProperty());
change.setVisible(false); walletType.setVisible(false);
outputForm.signingWalletProperty().addListener((observable, oldValue, signingWallet) -> { outputForm.signingWalletProperty().addListener((observable, oldValue, signingWallet) -> {
change.setVisible(signingWallet != null && signingWallet.isWalletOutputScript(txOutput.getScript())); if(signingWallet != null) {
walletType.setVisible(true);
if(signingWallet.getWalletOutputScripts(KeyPurpose.RECEIVE).containsKey(txOutput.getScript())) {
walletType.setText("(Consolidation)");
} else if(signingWallet.getWalletOutputScripts(KeyPurpose.CHANGE).containsKey(txOutput.getScript())) {
walletType.setText("(Change)");
} else {
walletType.setText("(Payment)");
}
} else {
walletType.setVisible(false);
}
}); });
spentField.managedProperty().bind(spentField.visibleProperty()); spentField.managedProperty().bind(spentField.visibleProperty());

2
src/main/resources/com/sparrowwallet/sparrow/transaction/output.fxml
View file

@ -34,7 +34,7 @@
<CoinLabel fx:id="value"/> <CoinLabel fx:id="value"/>
<CopyableLabel fx:id="to" text="to" /> <CopyableLabel fx:id="to" text="to" />
<AddressLabel fx:id="address" /> <AddressLabel fx:id="address" />
<CopyableLabel fx:id="change" text="(Change)" /> <CopyableLabel fx:id="walletType" />
</Field> </Field>
<Field fx:id="spentField" text="Spent?"> <Field fx:id="spentField" text="Spent?">
<Label fx:id="spent" /> <Label fx:id="spent" />