Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-14 01:15:44 -04:00
Code Issues Projects Releases Packages Wiki Activity

fix fiat trades by changing base currency to xmr #7

Browse source
This commit is contained in:
woodser 2021-05-04 22:09:23 -04:00
parent 69ee113dae
commit 01f183b7a7
38 changed files with 106 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

6
desktop/src/main/java/bisq/desktop/main/MainView.java
View file

@ -251,7 +251,7 @@ public class MainView extends InitializableView<StackPane, MainViewModel>
try {
String preferredTradeCurrency = model.getPreferences().getPreferredTradeCurrency().getCode();
double availableBalance = Double.parseDouble(
model.getAvailableBalance().getValue().replace("BTC", ""));
model.getAvailableBalance().getValue().replace("XMR", ""));
double marketPrice = Double.parseDouble(model.getMarketPrice(preferredTradeCurrency).getValue());
tooltipText += "\n" + currencyFormat.format(availableBalance * marketPrice) +
" " + preferredTradeCurrency;
@ -276,7 +276,7 @@ public class MainView extends InitializableView<StackPane, MainViewModel>
try {
String preferredTradeCurrency = model.getPreferences().getPreferredTradeCurrency().getCode();
double reservedBalance = Double.parseDouble(
model.getReservedBalance().getValue().replace("BTC", ""));
model.getReservedBalance().getValue().replace("XMR", ""));
double marketPrice = Double.parseDouble(model.getMarketPrice(preferredTradeCurrency).getValue());
tooltipText += "\n" + currencyFormat.format(reservedBalance * marketPrice) +
" " + preferredTradeCurrency;
@ -301,7 +301,7 @@ public class MainView extends InitializableView<StackPane, MainViewModel>
try {
String preferredTradeCurrency = model.getPreferences().getPreferredTradeCurrency().getCode();
double lockedBalance = Double.parseDouble(
model.getLockedBalance().getValue().replace("BTC", ""));
model.getLockedBalance().getValue().replace("XMR", ""));
double marketPrice = Double.parseDouble(model.getMarketPrice(preferredTradeCurrency).getValue());
tooltipText += "\n" + currencyFormat.format(lockedBalance * marketPrice) +
" " + preferredTradeCurrency;

2
desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java
View file

@ -1464,7 +1464,7 @@ public abstract class MutableOfferView<M extends MutableOfferViewModel<?>> exten
vBox.getChildren().addAll(tradeFeeInBtcLabel, tradeFeeInBsqLabel);
tradeFeeInBtcToggle = new AutoTooltipSlideToggleButton();
tradeFeeInBtcToggle.setText("BTC");
tradeFeeInBtcToggle.setText("BTC"); // TODO (woodser): update to XMR
tradeFeeInBtcToggle.setVisible(false);
tradeFeeInBtcToggle.setPadding(new Insets(-8, 5, -10, 5));

2
desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java
View file

@ -1201,7 +1201,7 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
vBox.getChildren().addAll(tradeFeeInBtcLabel, tradeFeeInBsqLabel);
tradeFeeInBtcToggle = new AutoTooltipSlideToggleButton();
tradeFeeInBtcToggle.setText("BTC");
tradeFeeInBtcToggle.setText("BTC"); // TODO (woodser): update to XMR
tradeFeeInBtcToggle.setPadding(new Insets(-8, 5, -10, 5));
tradeFeeInBsqToggle = new AutoTooltipSlideToggleButton();

8
desktop/src/main/java/bisq/desktop/main/settings/about/AboutView.java
View file

@ -72,15 +72,15 @@ public class AboutView extends ActivatableView<GridPane, Void> {
hyperlinkWithIcon = addHyperlinkWithIcon(root, ++gridRow, Res.get("setting.about.contribute"), "https://bisq.network/contribute");
GridPane.setColumnSpan(hyperlinkWithIcon, 2);
boolean isBtc = Res.getBaseCurrencyCode().equals("BTC");
addTitledGroupBg(root, ++gridRow, isBtc ? 3 : 2, Res.get("setting.about.providers"), Layout.GROUP_DISTANCE);
boolean isXmr = Res.getBaseCurrencyCode().equals("XMR");
addTitledGroupBg(root, ++gridRow, isXmr ? 3 : 2, Res.get("setting.about.providers"), Layout.GROUP_DISTANCE);
label = addLabel(root, gridRow, Res.get(isBtc ? "setting.about.apisWithFee" : "setting.about.apis"), Layout.TWICE_FIRST_ROW_AND_GROUP_DISTANCE);
label = addLabel(root, gridRow, Res.get(isXmr ? "setting.about.apisWithFee" : "setting.about.apis"), Layout.TWICE_FIRST_ROW_AND_GROUP_DISTANCE);
label.setWrapText(true);
GridPane.setHalignment(label, HPos.LEFT);
addCompactTopLabelTextField(root, ++gridRow, Res.get("setting.about.pricesProvided"),
"Bisq Price Index (https://bisq.wiki/Bisq_Price_Index)");
if (isBtc)
if (isXmr)
addCompactTopLabelTextField(root, ++gridRow, Res.get("setting.about.feeEstimation.label"), "mempool.space (https://mempool.space)");
addTitledGroupBg(root, ++gridRow, 2, Res.get("setting.about.versionDetails"), Layout.GROUP_DISTANCE);