From d9c509ba5345764bf2435a1a786c8dd580a22a9e Mon Sep 17 00:00:00 2001
From: chimp1984 <chimp1984@gmx.com>
Date: Tue, 9 Nov 2021 22:42:37 +0100
Subject: [PATCH] Fix missing handling for non-mainnet use case

---
 core/src/main/java/bisq/core/util/FeeReceiverSelector.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/bisq/core/util/FeeReceiverSelector.java b/core/src/main/java/bisq/core/util/FeeReceiverSelector.java
index 9e093333561..a7f32e13cdc 100644
--- a/core/src/main/java/bisq/core/util/FeeReceiverSelector.java
+++ b/core/src/main/java/bisq/core/util/FeeReceiverSelector.java
@@ -19,6 +19,8 @@
 
 import bisq.core.filter.FilterManager;
 
+import bisq.common.config.Config;
+
 import org.bitcoinj.core.Coin;
 
 import com.google.common.annotations.VisibleForTesting;
@@ -35,7 +37,9 @@ public class FeeReceiverSelector {
     public static final String BTC_FEE_RECEIVER_ADDRESS = "38bZBj5peYS3Husdz7AH3gEUiUbYRD951t";
 
     public static String getMostRecentAddress() {
-        return BTC_FEE_RECEIVER_ADDRESS;
+        return Config.baseCurrencyNetwork().isMainnet() ? BTC_FEE_RECEIVER_ADDRESS :
+                Config.baseCurrencyNetwork().isTestnet() ? "2N4mVTpUZAnhm9phnxB7VrHB4aBhnWrcUrV" :
+                        "2MzBNTJDjjXgViKBGnatDU3yWkJ8pJkEg9w";
     }
 
     public static String getAddress(FilterManager filterManager) {