mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 18:03:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Simplifying wording of bitcoin funding options dialog.

Browse Source
This commit is contained in:
Jonathan Cross 2016-10-01 01:08:02 +02:00
parent dab1b56e75
commit 775b042a39
No known key found for this signature in database
GPG Key ID: D8578DF8EA7CCF1B
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java
View File

@ -241,7 +241,7 @@ public class CreateOfferView extends ActivatableViewAndModel<AnchorPane, CreateO
public void initWithData(Offer.Direction direction, TradeCurrency tradeCurrency) {
boolean result = model.initWithData(direction, tradeCurrency);
if (!result)
if (!result)
new Popup().warning("You don't have a payment account set up.").onClose(this::close).show();
if (direction == Offer.Direction.BUY) {
@ -348,14 +348,11 @@ public class CreateOfferView extends ActivatableViewAndModel<AnchorPane, CreateO
"- Trading fee: " + model.getOfferFee() + "\n" +
"- Bitcoin mining fee: " + model.getNetworkFee() + "\n\n" +
"For funding you can choose between 2 options:\n" +
"- Transfer fund from your Bitsquare wallet OR\n" +
"- Transfer fund from any external wallet\n\n" +
"You can choose between 2 options when funding your trade:\n" +
"- Use your Bitsquare wallet (convenient, but transactions may be linkable) OR\n" +
"- Transfer from an external wallet (potentially more private)\n\n" +
"If you prefer a higher level of privacy you should use for each trade a distinct funding transaction using the external wallet option.\n" +
"If you prefer convenience using the Bitsquare wallet for several trades might be your preferred option.\n\n" +
"You can see all the details for funding when you close that popup.")
"You will see all funding options and details after closing this popup.")
.dontShowAgainId(key, preferences)
.show();
}
@ -627,7 +624,7 @@ public class CreateOfferView extends ActivatableViewAndModel<AnchorPane, CreateO
if (DevFlags.DEV_MODE) {
close();
} else if (newValue) {
// We need a bit of delay to avoid issues with fade out/fade in of 2 popups
// We need a bit of delay to avoid issues with fade out/fade in of 2 popups
String key = "createOfferSuccessInfo";
if (preferences.showAgain(key)) {
UserThread.runAfter(() -> new Popup().headLine(BSResources.get("createOffer.success.headline"))

11
gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.java
View File

@ -350,14 +350,11 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
"- Trading fee: " + model.getTakerFee() + "\n" +
"- Bitcoin mining fee: " + model.getNetworkFee() + "\n\n" +
"For funding you can choose between 2 options:\n" +
"- Transfer fund from your Bitsquare wallet OR\n" +
"- Transfer fund from any external wallet\n\n" +
"You can choose between 2 options when funding your trade:\n" +
"- Use your Bitsquare wallet (convenient, but transactions may be linkable) OR\n" +
"- Transfer from an external wallet (potentially more private)\n\n" +
"If you prefer a higher level of privacy you should use for each trade a distinct funding transaction using the external wallet option.\n" +
"If you prefer convenience using the Bitsquare wallet for several trades might be your preferred option.\n\n" +
"You can see all the details for funding when you close that popup.")
"You will see all funding options and details after closing this popup.")
.dontShowAgainId(key, preferences)
.show();
}