From fee17a9542c09f98065d1d742d9e754af5a88ddb Mon Sep 17 00:00:00 2001
From: Devin Bileck <603793+devinbileck@users.noreply.github.com>
Date: Sat, 26 Oct 2019 03:54:59 -0700
Subject: [PATCH] Minor updates (#3474)

* Remove unnecessary log statement

This seems to be a left over log statement from debugging.

* Use a small delay for MakerSetsLockTime on regtest

When testing on regtest, not in devmode, we want a relatively short
delay to be able to test the delay period.

* Clarify payment limits up to 30 days after signing
---
 core/src/main/java/bisq/core/btc/wallet/WalletService.java   | 1 -
 .../core/trade/protocol/tasks/maker/MakerSetsLockTime.java   | 5 +++--
 core/src/main/resources/i18n/displayStrings.properties       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/bisq/core/btc/wallet/WalletService.java b/core/src/main/java/bisq/core/btc/wallet/WalletService.java
index d5749bae08b..d04567d5f16 100644
--- a/core/src/main/java/bisq/core/btc/wallet/WalletService.java
+++ b/core/src/main/java/bisq/core/btc/wallet/WalletService.java
@@ -697,7 +697,6 @@ public static Transaction maybeAddTxToWallet(byte[] serializedTransaction,
                                                  TransactionConfidence.Source source) throws VerificationException {
         Transaction tx = new Transaction(wallet.getParams(), serializedTransaction);
         Transaction walletTransaction = wallet.getTransaction(tx.getHash());
-        log.error("maybeAddTxToWallet id={}, is walletTransaction==null? {}", tx.getHashAsString(), walletTransaction == null);
 
         if (walletTransaction == null) {
             // We need to recreate the transaction otherwise we get a null pointer...
diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/maker/MakerSetsLockTime.java b/core/src/main/java/bisq/core/trade/protocol/tasks/maker/MakerSetsLockTime.java
index 94158523d7c..18cb46a96c8 100644
--- a/core/src/main/java/bisq/core/trade/protocol/tasks/maker/MakerSetsLockTime.java
+++ b/core/src/main/java/bisq/core/trade/protocol/tasks/maker/MakerSetsLockTime.java
@@ -17,6 +17,7 @@
 
 package bisq.core.trade.protocol.tasks.maker;
 
+import bisq.core.app.BisqEnvironment;
 import bisq.core.trade.Trade;
 import bisq.core.trade.protocol.tasks.TradeTask;
 
@@ -39,8 +40,8 @@ protected void run() {
 
             // 10 days for altcoins, 20 days for other payment methods
             int delay = processModel.getOffer().getPaymentMethod().isAsset() ? 144 * 10 : 144 * 20;
-            if (DevEnv.isDevMode()) {
-                delay = 1;
+            if (BisqEnvironment.getBaseCurrencyNetwork().isRegtest()) {
+                delay = 5;
             }
 
             long lockTime = processModel.getBtcWalletService().getBestChainHeight() + delay;
diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties
index 259068940d4..b9c727b0c26 100644
--- a/core/src/main/resources/i18n/displayStrings.properties
+++ b/core/src/main/resources/i18n/displayStrings.properties
@@ -2898,7 +2898,7 @@ payment.limits.info=To limit chargeback risk, Bisq sets per-trade buy limits bas
   so it is limited to buying {0} per trade. \
   After it is signed, buy limits will increase as follows:\n\
   \n\
-  ● Before signing, and 30 days after signing, your per-trade buy limit will be {0}\n\
+  ● Before signing, and up to 30 days after signing, your per-trade buy limit will be {0}\n\
   ● 30 days after signing, your per-trade buy limit will be {1}\n\
   ● 60 days after signing, your per-trade buy limit will be {2}\n\
   \n\