mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 23:18:17 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #628 from jonathancross/master

Browse source 
Simplifying wording of bitcoin funding options dialog.
This commit is contained in:
Manfred Karrer 2016-10-06 02:47:24 +02:00 • committed by GitHub
commit 8b7a27cc86
2 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java
View file

@ -348,14 +348,11 @@ public class CreateOfferView extends ActivatableViewAndModel<AnchorPane, CreateO
"- Trading fee: " + model.getOfferFee() + "\n" + "- Trading fee: " + model.getOfferFee() + "\n" +
"- Bitcoin mining fee: " + model.getNetworkFee() + "\n\n" + "- Bitcoin mining fee: " + model.getNetworkFee() + "\n\n" +
"For funding you can choose between 2 options:\n" + "You can choose between 2 options when funding your trade:\n" +
"- Transfer fund from your Bitsquare wallet OR\n" + "- Use your Bitsquare wallet (convenient, but transactions may be linkable) OR\n" +
"- Transfer fund from any external wallet\n\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" + "You will see all funding options and details after closing this popup.")
"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.")
.dontShowAgainId(key, preferences) .dontShowAgainId(key, preferences)
.show(); .show();
} }

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" + "- Trading fee: " + model.getTakerFee() + "\n" +
"- Bitcoin mining fee: " + model.getNetworkFee() + "\n\n" + "- Bitcoin mining fee: " + model.getNetworkFee() + "\n\n" +
"For funding you can choose between 2 options:\n" + "You can choose between 2 options when funding your trade:\n" +
"- Transfer fund from your Bitsquare wallet OR\n" + "- Use your Bitsquare wallet (convenient, but transactions may be linkable) OR\n" +
"- Transfer fund from any external wallet\n\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" + "You will see all funding options and details after closing this popup.")
"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.")
.dontShowAgainId(key, preferences) .dontShowAgainId(key, preferences)
.show(); .show();
} }