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

Merge pull request #1972 from ManfredKarrer/bug-fixes

Browse source 
Bug fixes
This commit is contained in:
Manfred Karrer 2018-11-26 15:36:25 +01:00 • committed by GitHub
commit 7ea76470d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 34 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
core/src/main/java/bisq/core/payment/payload/PaymentMethod.java
View file

@ -29,8 +29,8 @@ import org.bitcoinj.core.Coin;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import lombok.EqualsAndHashCode;
import lombok.Getter;
@ -238,19 +238,27 @@ public final class PaymentMethod implements PersistablePayload, Comparable {
// Altcoins
BLOCK_CHAINS = new PaymentMethod(BLOCK_CHAINS_ID, DAY, maxTradeLimitVeryLowRisk)
));
ALL_VALUES.sort((o1, o2) -> {
String id1 = o1.getId();
if (id1.equals(CLEAR_X_CHANGE_ID))
id1 = "ZELLE";
String id2 = o2.getId();
if (id2.equals(CLEAR_X_CHANGE_ID))
id2 = "ZELLE";
return id1.compareTo(id2);
});
}
ALL_VALUES.sort((o1, o2) -> {
String id1 = o1.getId();
if (id1.equals(CLEAR_X_CHANGE_ID))
id1 = "ZELLE";
String id2 = o2.getId();
if (id2.equals(CLEAR_X_CHANGE_ID))
id2 = "ZELLE";
return id1.compareTo(id2);
});
return ALL_VALUES;
}
public static List<PaymentMethod> getActivePaymentMethods() {
return getAllValues().stream()
.filter(paymentMethod -> !paymentMethod.getId().equals(PaymentMethod.VENMO_ID))
.filter(paymentMethod -> !paymentMethod.getId().equals(PaymentMethod.CASH_APP_ID))
.filter(paymentMethod -> !paymentMethod.getId().equals(PaymentMethod.OK_PAY_ID))
.collect(Collectors.toList());
}
///////////////////////////////////////////////////////////////////////////////////////////
// PROTO BUFFER
@ -282,8 +290,10 @@ public final class PaymentMethod implements PersistablePayload, Comparable {
}
public static PaymentMethod getPaymentMethodById(String id) {
Optional<PaymentMethod> paymentMethodOptional = getAllValues().stream().filter(e -> e.getId().equals(id)).findFirst();
return paymentMethodOptional.orElseGet(() -> new PaymentMethod(Res.get("shared.na")));
return getAllValues().stream()
.filter(e -> e.getId().equals(id))
.findFirst()
.orElseGet(() -> new PaymentMethod(Res.get("shared.na")));
}
// Hack for SF as the smallest unit is 1 SF ;-( and price is about 3 BTC!

4
desktop/package/macosx/create_app.sh
View file

@ -87,7 +87,11 @@ if [ -z "$JAVA_HOME" ]; then
JAVA_HOME=$(/usr/libexec/java_home)
fi
# Open jdk does not has the java packager.
# JAVA_HOME=/Library/Java/JavaVirtualMachines/oracle_jdk-10.0.2.jdk/Contents/Home
echo "Using JAVA_HOME: $JAVA_HOME"
$JAVA_HOME/bin/javapackager \
-deploy \
-BappVersion=$version \

5
desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java
View file

@ -340,11 +340,8 @@ public class FiatAccountsView extends PaymentAccountsView<GridPane, FiatAccounts
paymentMethodComboBox.setPromptText(Res.get("shared.selectPaymentMethod"));
paymentMethodComboBox.setVisibleRowCount(11);
paymentMethodComboBox.setPrefWidth(250);
List<PaymentMethod> list = PaymentMethod.getAllValues().stream()
List<PaymentMethod> list = PaymentMethod.getActivePaymentMethods().stream()
.filter(paymentMethod -> !paymentMethod.getId().equals(PaymentMethod.BLOCK_CHAINS_ID))
.filter(paymentMethod -> !paymentMethod.getId().equals(PaymentMethod.VENMO_ID))
.filter(paymentMethod -> !paymentMethod.getId().equals(PaymentMethod.CASH_APP_ID))
.filter(paymentMethod -> !paymentMethod.getId().equals(PaymentMethod.OK_PAY_ID))
.collect(Collectors.toList());
paymentMethodComboBox.setItems(FXCollections.observableArrayList(list));
paymentMethodComboBox.setConverter(new StringConverter<>() {

2
desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookViewModel.java
View file

@ -328,7 +328,7 @@ class OfferBookViewModel extends ActivatableViewModel {
}
ObservableList<PaymentMethod> getPaymentMethods() {
ObservableList<PaymentMethod> list = FXCollections.observableArrayList(PaymentMethod.getAllValues());
ObservableList<PaymentMethod> list = FXCollections.observableArrayList(PaymentMethod.getActivePaymentMethods());
list.add(0, new PaymentMethod(GUIUtil.SHOW_ALL_FLAG));
return list;
}

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

@ -321,9 +321,6 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
tradeFeeInBtcToggle.setManaged(false);
tradeFeeInBsqToggle.setVisible(false);
tradeFeeInBsqToggle.setManaged(false);
tradeFeeDescriptionLabel.setVisible(false);
tradeFeeDescriptionLabel.setManaged(false);
}
}
@ -621,6 +618,7 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
tradeFeeInBtcLabel.visibleProperty().bind(model.isTradeFeeVisible);
tradeFeeInBsqLabel.visibleProperty().bind(model.isTradeFeeVisible);
tradeFeeDescriptionLabel.visibleProperty().bind(model.isTradeFeeVisible);
tradeFeeDescriptionLabel.managedProperty().bind(tradeFeeDescriptionLabel.visibleProperty());
// funding
fundingHBox.visibleProperty().bind(model.dataModel.getIsBtcWalletFunded().not().and(model.showPayFundsScreenDisplayed));
@ -646,6 +644,7 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
tradeFeeInBtcLabel.visibleProperty().unbind();
tradeFeeInBsqLabel.visibleProperty().unbind();
tradeFeeDescriptionLabel.visibleProperty().unbind();
tradeFeeDescriptionLabel.managedProperty().unbind();
// funding
fundingHBox.visibleProperty().unbind();

4
desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferViewModel.java
View file

@ -174,6 +174,10 @@ class TakeOfferViewModel extends ActivatableWithDataModel<TakeOfferDataModel> im
updateButtonDisableState();
updateSpinnerInfo();
if (!DevEnv.isDaoActivated()) {
isTradeFeeVisible.setValue(false);
}
}
@Override