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

change default min mix to = 3, various minor ux improvements

Browse source
This commit is contained in:
Craig Raw 2021-12-01 15:10:31 +02:00
parent 3b9c87abc7
commit ed92acc468
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/com/sparrowwallet/sparrow/wallet/KeystoreController.java
View file

@ -39,6 +39,8 @@ import java.util.stream.Collectors;
public class KeystoreController extends WalletFormController implements Initializable { public class KeystoreController extends WalletFormController implements Initializable {
private static final Logger log = LoggerFactory.getLogger(KeystoreController.class); private static final Logger log = LoggerFactory.getLogger(KeystoreController.class);
private static final String DEFAULT_WATCH_ONLY_FINGERPRINT = "00000000";
private Keystore keystore; private Keystore keystore;
@FXML @FXML
@ -215,6 +217,7 @@ public class KeystoreController extends WalletFormController implements Initiali
if(keystoreSource != KeystoreSource.SW_WATCH) { if(keystoreSource != KeystoreSource.SW_WATCH) {
launchImportDialog(keystoreSource); launchImportDialog(keystoreSource);
} else { } else {
fingerprint.setText(DEFAULT_WATCH_ONLY_FINGERPRINT);
selectSourcePane.setVisible(false); selectSourcePane.setVisible(false);
} }
} }

2
src/main/java/com/sparrowwallet/sparrow/whirlpool/Whirlpool.java
View file

@ -57,7 +57,7 @@ public class Whirlpool {
private static final Logger log = LoggerFactory.getLogger(Whirlpool.class); private static final Logger log = LoggerFactory.getLogger(Whirlpool.class);
public static final List<Network> WHIRLPOOL_NETWORKS = List.of(Network.MAINNET, Network.TESTNET); public static final List<Network> WHIRLPOOL_NETWORKS = List.of(Network.MAINNET, Network.TESTNET);
public static final int DEFAULT_MIXTO_MIN_MIXES = 5; public static final int DEFAULT_MIXTO_MIN_MIXES = 3;
public static final int DEFAULT_MIXTO_RANDOM_FACTOR = 4; public static final int DEFAULT_MIXTO_RANDOM_FACTOR = 4;
private final WhirlpoolServer whirlpoolServer; private final WhirlpoolServer whirlpoolServer;

4
src/main/resources/com/sparrowwallet/sparrow/transaction/headers.fxml
View file

@ -238,12 +238,12 @@
</SegmentedButton> </SegmentedButton>
<SegmentedButton HBox.hgrow="ALWAYS"> <SegmentedButton HBox.hgrow="ALWAYS">
<buttons> <buttons>
<ToggleButton HBox.hgrow="ALWAYS" text="Save PSBT" contentDisplay="TOP" wrapText="true" textAlignment="CENTER" onAction="#savePSBT"> <ToggleButton HBox.hgrow="ALWAYS" text="Save Transaction" contentDisplay="TOP" wrapText="true" textAlignment="CENTER" onAction="#savePSBT">
<graphic> <graphic>
<Glyph fontFamily="Font Awesome 5 Free Solid" fontSize="20" icon="SD_CARD" /> <Glyph fontFamily="Font Awesome 5 Free Solid" fontSize="20" icon="SD_CARD" />
</graphic> </graphic>
</ToggleButton> </ToggleButton>
<ToggleButton HBox.hgrow="ALWAYS" text="Load PSBT" contentDisplay="TOP" wrapText="true" textAlignment="CENTER" onAction="#loadPSBT"> <ToggleButton HBox.hgrow="ALWAYS" text="Load Transaction" contentDisplay="TOP" wrapText="true" textAlignment="CENTER" onAction="#loadPSBT">
<graphic> <graphic>
<Glyph fontFamily="Font Awesome 5 Free Solid" fontSize="20" icon="ARROW_UP" /> <Glyph fontFamily="Font Awesome 5 Free Solid" fontSize="20" icon="ARROW_UP" />
</graphic> </graphic>