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

Merge pull request #1764 from ManfredKarrer/remove_okpay

Browse source 
Deactivate OKPay as it does not exist anymore
This commit is contained in:
Manfred Karrer 2018-10-08 07:10:41 -05:00 • committed by GitHub
commit 7f8a90d1cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/main/java/bisq/core/payment/OKPayAccount.java
View file

@ -24,7 +24,7 @@ import bisq.core.payment.payload.PaymentMethod;
import lombok.EqualsAndHashCode;
//TODO missing support for selected trade currency
@Deprecated
@EqualsAndHashCode(callSuper = true)
public final class OKPayAccount extends PaymentAccount {
public OKPayAccount() {

1
core/src/main/java/bisq/core/payment/payload/OKPayAccountPayload.java
View file

@ -34,6 +34,7 @@ import lombok.Setter;
import lombok.ToString;
import lombok.extern.slf4j.Slf4j;
@Deprecated
@EqualsAndHashCode(callSuper = true)
@ToString
@Setter

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

@ -51,6 +51,7 @@ public final class PaymentMethod implements PersistablePayload, Comparable {
// time in blocks (average 10 min for one block confirmation
private static final long DAY = TimeUnit.HOURS.toMillis(24);
@Deprecated
public static final String OK_PAY_ID = "OK_PAY";
public static final String UPHOLD_ID = "UPHOLD";
@Deprecated
@ -81,6 +82,7 @@ public final class PaymentMethod implements PersistablePayload, Comparable {
public static final String F2F_ID = "F2F";
public static final String BLOCK_CHAINS_ID = "BLOCK_CHAINS";
@Deprecated
public static PaymentMethod OK_PAY;
public static PaymentMethod UPHOLD;
@Deprecated

1
desktop/src/main/java/bisq/desktop/components/paymentmethods/OKPayForm.java
View file

@ -52,6 +52,7 @@ import static bisq.desktop.util.FormBuilder.addLabelInputTextField;
import static bisq.desktop.util.FormBuilder.addLabelTextField;
import static bisq.desktop.util.FormBuilder.addLabelTextFieldWithCopyIcon;
@Deprecated
public class OKPayForm extends PaymentMethodForm {
private static final Logger log = LoggerFactory.getLogger(OKPayForm.class);

3
desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsDataModel.java
View file

@ -89,7 +89,8 @@ class FiatAccountsDataModel extends ActivatableDataModel {
List<PaymentAccount> toRemove = new ArrayList<>();
paymentAccounts.stream()
.filter(paymentAccount -> paymentAccount.getPaymentMethod().getId().equals(PaymentMethod.VENMO_ID) ||
paymentAccount.getPaymentMethod().getId().equals(PaymentMethod.CASH_APP_ID))
paymentAccount.getPaymentMethod().getId().equals(PaymentMethod.CASH_APP_ID) ||
paymentAccount.getPaymentMethod().getId().equals(PaymentMethod.OK_PAY_ID))
.forEach(toRemove::add);
toRemove.forEach(paymentAccount -> {

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

@ -395,6 +395,7 @@ public class FiatAccountsView extends ActivatableViewAndModel<GridPane, FiatAcco
.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<PaymentMethod>() {