Merge pull request #7348 from thecockatiel/fix_bugs

fix: remove unnecessary null check, use correct marker class, add mis…
bisq-network · Jan 15, 2025 · cd81537 · cd81537
2 parents 65f64fc + a9b0170
commit cd81537
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/...n/java/bisq/core/offer/placeoffer/bisq_v1/tasks/CheckNumberOfUnconfirmedTransactions.java b/...n/java/bisq/core/offer/placeoffer/bisq_v1/tasks/CheckNumberOfUnconfirmedTransactions.java
@@ -13,8 +13,10 @@ public CheckNumberOfUnconfirmedTransactions(TaskRunner<PlaceOfferModel> taskHand
 
     @Override
     protected void run() {
-        if (model.getWalletService().isUnconfirmedTransactionsLimitHit() || model.getBsqWalletService().isUnconfirmedTransactionsLimitHit())
+        if (model.getWalletService().isUnconfirmedTransactionsLimitHit() || model.getBsqWalletService().isUnconfirmedTransactionsLimitHit()) {
             failed(Res.get("shared.unconfirmedTransactionsLimitReached"));
-        complete();
+        } else {
+            complete();
+        }
     }
 }
diff --git a/core/src/main/java/bisq/core/trade/model/bisq_v1/Trade.java b/core/src/main/java/bisq/core/trade/model/bisq_v1/Trade.java
@@ -917,7 +917,7 @@ private long getTradeStartTime() {
         long now = System.currentTimeMillis();
         long startTime;
         Transaction depositTx = getDepositTx();
-        if (depositTx != null && getDate() != null) {
+        if (depositTx != null) {
             if (depositTx.getConfidence().getDepthInBlocks() > 0) {
                 final long tradeTime = getDate().getTime();
                 // Use tx.getIncludedInBestChainAt() when available, otherwise use tx.getUpdateTime()

diff --git a/core/src/main/java/bisq/core/trade/model/bsq_swap/BsqSwapBuyerAsMakerTrade.java b/core/src/main/java/bisq/core/trade/model/bsq_swap/BsqSwapBuyerAsMakerTrade.java
@@ -18,7 +18,7 @@
 package bisq.core.trade.model.bsq_swap;
 
 import bisq.core.offer.Offer;
-import bisq.core.trade.model.TakerTrade;
+import bisq.core.trade.model.MakerTrade;
 import bisq.core.trade.model.Tradable;
 import bisq.core.trade.protocol.bsq_swap.model.BsqSwapProtocolModel;
 
@@ -35,7 +35,7 @@
 import javax.annotation.Nullable;
 
 @Slf4j
-public final class BsqSwapBuyerAsMakerTrade extends BsqSwapBuyerTrade implements TakerTrade {
+public final class BsqSwapBuyerAsMakerTrade extends BsqSwapBuyerTrade implements MakerTrade {
     public BsqSwapBuyerAsMakerTrade(Offer offer,
                                     Coin amount,
                                     long takeOfferDate,

diff --git a/core/src/main/java/bisq/core/user/Preferences.java b/core/src/main/java/bisq/core/user/Preferences.java
@@ -790,9 +790,8 @@ public void setRpcUser(String value) {
         // We only persist if we have not set the program argument
         if (!rpcUserFromOptions.isEmpty()) {
             prefPayload.setRpcUser(value);
+            requestPersistence();
         }
-        prefPayload.setRpcUser(value);
-        requestPersistence();
     }
 
     public void setRpcPw(String value) {