Add check for account age to apply restrictions

core/src/main/java/bisq/core/payment/AccountAgeRestrictions.java

@@ -18,7 +18,9 @@
 package bisq.core.payment;
 
 import bisq.core.offer.Offer;
+import bisq.core.offer.OfferPayload;
 import bisq.core.offer.OfferRestrictions;
+import bisq.core.payment.payload.PaymentMethod;
 import bisq.core.trade.Trade;
 
 import bisq.common.util.Utilities;
@@ -47,8 +49,31 @@ public static boolean isMyAccountAgeImmature(AccountAgeWitnessService accountAge
         return accountCreationDate > SAFE_ACCOUNT_AGE_DATE;
     }
 
-    public static long getMyTradeLimitAtTakeOffer(AccountAgeWitnessService accountAgeWitnessService, PaymentAccount paymentAccount, String currencyCode) {
-        if (AccountAgeRestrictions.isMyAccountAgeImmature(accountAgeWitnessService, paymentAccount)) {
+    public static long getMyTradeLimitAtCreateOffer(AccountAgeWitnessService accountAgeWitnessService,
+                                                    PaymentAccount paymentAccount,
+                                                    String currencyCode,
+                                                    OfferPayload.Direction direction) {
+        if (direction == OfferPayload.Direction.BUY &&
+                PaymentMethod.hasChargebackRisk(paymentAccount.getPaymentMethod()) &&
+                AccountAgeRestrictions.isMyAccountAgeImmature(accountAgeWitnessService, paymentAccount)) {
+            return OfferRestrictions.TOLERATED_SMALL_TRADE_AMOUNT.value;
+        } else {
+            return accountAgeWitnessService.getMyTradeLimit(paymentAccount, currencyCode);
+        }
+    }
+
+    public static long getMyTradeLimitAtTakeOffer(AccountAgeWitnessService accountAgeWitnessService,
+                                                  PaymentAccount paymentAccount,
+                                                  Offer offer,
+                                                  String currencyCode,
+                                                  OfferPayload.Direction direction) {
+        if (direction == OfferPayload.Direction.BUY && PaymentMethod.hasChargebackRisk(paymentAccount.getPaymentMethod()) &&
+                AccountAgeRestrictions.isMakersAccountAgeImmature(accountAgeWitnessService, offer)) {
+            // Taker is seller
+            return OfferRestrictions.TOLERATED_SMALL_TRADE_AMOUNT.value;
+        } else if (direction == OfferPayload.Direction.SELL && PaymentMethod.hasChargebackRisk(paymentAccount.getPaymentMethod()) &&
+                AccountAgeRestrictions.isMyAccountAgeImmature(accountAgeWitnessService, paymentAccount)) {
+            // Taker is buyer
             return OfferRestrictions.TOLERATED_SMALL_TRADE_AMOUNT.value;
         } else {
             return accountAgeWitnessService.getMyTradeLimit(paymentAccount, currencyCode);

core/src/main/java/bisq/core/payment/PaymentAccountUtil.java

@@ -61,7 +61,8 @@ public static boolean isSellOfferAndAnyTakerPaymentAccountForOfferMature(Offer o
     private static boolean isTakerAccountForOfferMature(Offer offer,
                                                         PaymentAccount takerPaymentAccount,
                                                         AccountAgeWitnessService accountAgeWitnessService) {
-        return !OfferRestrictions.isMinTradeAmountRisky(offer) ||
+        return !PaymentMethod.hasChargebackRisk(offer.getPaymentMethod()) ||
+                !OfferRestrictions.isMinTradeAmountRisky(offer) ||
                 (isTakerPaymentAccountValidForOffer(offer, takerPaymentAccount) &&
                         !AccountAgeRestrictions.isMyAccountAgeImmature(accountAgeWitnessService, takerPaymentAccount));
     }

core/src/main/resources/i18n/displayStrings.properties

@@ -358,7 +358,10 @@ offerbook.warning.sellOfferAndAnyTakerPaymentAccountForOfferMature=This offer ca
 offerbook.warning.newVersionAnnouncement=We needed to deploy this restriction as a short-term measure for enhanced security.\n\n\
  The next software release will provide more robust protection tools so that offers with this risk profile can be traded again.
 
-takeOffer.popup.tradeLimitDueAccountAgeRestriction=The allowed trade amount is limited because of security restrictions based on the following criteria:\n\
+popup.warning.tradeLimitDueAccountAgeRestriction.seller=The allowed trade amount is limited to 0.01 BTC because of security restrictions based on the following criteria:\n\
+ - The buyers account was created after March 15th 2019\n\
+ - The payment method for this offer is considered risky for bank chargebacks\n\n{0}
+popup.warning.tradeLimitDueAccountAgeRestriction.buyer=The allowed trade amount is limited to 0.01 BTC because of security restrictions based on the following criteria:\n\
  - Your payment account was created after March 15th 2019\n\
  - The payment method for this offer is considered risky for bank chargebacks\n\n{0}
 

desktop/src/main/java/bisq/desktop/main/offer/MutableOfferDataModel.java

@@ -35,6 +35,7 @@
 import bisq.core.offer.OfferPayload;
 import bisq.core.offer.OfferUtil;
 import bisq.core.offer.OpenOfferManager;
+import bisq.core.payment.AccountAgeRestrictions;
 import bisq.core.payment.AccountAgeWitnessService;
 import bisq.core.payment.HalCashAccount;
 import bisq.core.payment.PaymentAccount;
@@ -438,9 +439,8 @@ void onPaymentAccountSelected(PaymentAccount paymentAccount) {
 
             buyerSecurityDeposit.set(preferences.getBuyerSecurityDepositAsPercent(getPaymentAccount()));
 
-            long myLimit = accountAgeWitnessService.getMyTradeLimit(paymentAccount, tradeCurrencyCode.get());
             if (amount.get() != null)
-                this.amount.set(Coin.valueOf(Math.min(amount.get().value, myLimit)));
+                this.amount.set(Coin.valueOf(Math.min(amount.get().value, getMaxTradeLimit())));
         }
     }
 
@@ -581,7 +581,7 @@ boolean isMakerFeeValid() {
 
     long getMaxTradeLimit() {
         if (paymentAccount != null)
-            return accountAgeWitnessService.getMyTradeLimit(paymentAccount, tradeCurrencyCode.get());
+            return AccountAgeRestrictions.getMyTradeLimitAtCreateOffer(accountAgeWitnessService, paymentAccount, tradeCurrencyCode.get(), direction);
         else
             return 0;
     }

desktop/src/main/java/bisq/desktop/main/offer/MutableOfferViewModel.java

@@ -44,6 +44,7 @@
 import bisq.core.monetary.Volume;
 import bisq.core.offer.Offer;
 import bisq.core.offer.OfferPayload;
+import bisq.core.offer.OfferRestrictions;
 import bisq.core.offer.OfferUtil;
 import bisq.core.payment.PaymentAccount;
 import bisq.core.provider.price.MarketPrice;
@@ -728,6 +729,11 @@ void onFocusOutAmountTextField(boolean oldValue, boolean newValue) {
 
                 if (minAmount.get() != null)
                     minAmountValidationResult.set(isBtcInputValid(minAmount.get()));
+            } else if (btcValidator.getMaxTradeLimit() != null && btcValidator.getMaxTradeLimit().value == OfferRestrictions.TOLERATED_SMALL_TRADE_AMOUNT.value) {
+                new Popup<>().information(Res.get("popup.warning.tradeLimitDueAccountAgeRestriction.buyer",
+                        Res.get("offerbook.warning.newVersionAnnouncement")))
+                        .width(900)
+                        .show();
             }
             // We want to trigger a recalculation of the volume
             UserThread.execute(() -> {

desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookViewModel.java

@@ -515,7 +515,7 @@ boolean isSellOfferAndAnyTakerPaymentAccountForOfferMature(Offer offer) {
     }
 
     boolean isRiskyBuyOfferWithImmatureAccountAge(Offer offer) {
-        return user.getPaymentAccounts() != null && PaymentAccountUtil.isRiskyBuyOfferWithImmatureAccountAge(offer, accountAgeWitnessService);
+        return PaymentAccountUtil.isRiskyBuyOfferWithImmatureAccountAge(offer, accountAgeWitnessService);
     }
 
     boolean hasPaymentAccountForCurrency() {

desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferDataModel.java

@@ -430,7 +430,7 @@ boolean hasAcceptedArbitrators() {
 
     long getMaxTradeLimit() {
         if (paymentAccount != null)
-            return AccountAgeRestrictions.getMyTradeLimitAtTakeOffer(accountAgeWitnessService, paymentAccount, getCurrencyCode());
+            return AccountAgeRestrictions.getMyTradeLimitAtTakeOffer(accountAgeWitnessService, paymentAccount, offer, getCurrencyCode(), getDirection());
         else
             return 0;
     }

desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferViewModel.java

@@ -373,10 +373,18 @@ void onFocusOutAmountTextField(boolean oldValue, boolean newValue, String userIn
                     amountValidationResult.set(new InputValidator.ValidationResult(false,
                             Res.get("takeOffer.validation.amountLargerThanOfferAmountMinusFee")));
             } else if (btcValidator.getMaxTradeLimit() != null && btcValidator.getMaxTradeLimit().value == OfferRestrictions.TOLERATED_SMALL_TRADE_AMOUNT.value) {
-                new Popup<>().information(Res.get("takeOffer.popup.tradeLimitDueAccountAgeRestriction",
-                        Res.get("offerbook.warning.newVersionAnnouncement")))
-                        .width(900)
-                        .show();
+                if (dataModel.getDirection() == OfferPayload.Direction.BUY) {
+                    new Popup<>().information(Res.get("popup.warning.tradeLimitDueAccountAgeRestriction.seller",
+                            Res.get("offerbook.warning.newVersionAnnouncement")))
+                            .width(900)
+                            .show();
+                } else {
+                    new Popup<>().information(Res.get("popup.warning.tradeLimitDueAccountAgeRestriction.buyer",
+                            Res.get("offerbook.warning.newVersionAnnouncement")))
+                            .width(900)
+                            .show();
+                }
+
             }
         }
     }