Merge branch 'master' into 6-api-xmr-trading

core/src/main/java/bisq/core/locale/LanguageUtil.java

@@ -43,7 +43,8 @@ public class LanguageUtil {
             "ja", // Japanese
             "fa", // Persian
             "it", // Italian
-            "cs" // Czech
+            "cs", // Czech
+            "pl" // Polish
             /*
             // not translated yet
             "el", // Greek
@@ -54,7 +55,6 @@ public class LanguageUtil {
             "iw", // Hebrew
             "hi", // Hindi
             "ko", // Korean
-            "pl", // Polish
             "sv", // Swedish
             "no", // Norwegian
             "nl", // Dutch

core/update_translations.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 cd $(dirname $0)
-tx pull -l de,es,ja,pt,ru,zh_CN,zh_TW,vi,th_TH,fa,fr,pt_BR,it,cs
+tx pull -l de,es,ja,pt,ru,zh_CN,zh_TW,vi,th_TH,fa,fr,pt_BR,it,cs,pl_PL
 
 translations="translations/bisq-desktop.displaystringsproperties"
 i18n="src/main/resources/i18n"
@@ -20,5 +20,6 @@ mv "$translations/fr.properties" "$i18n/displayStrings_fr.properties"
 mv "$translations/pt_BR.properties" "$i18n/displayStrings_pt-br.properties"
 mv "$translations/it.properties" "$i18n/displayStrings_it.properties"
 mv "$translations/cs.properties" "$i18n/displayStrings_cs.properties"
+mv "$translations/pl_PL.properties" "$i18n/displayStrings_pl.properties"
 
 rm -rf $translations

desktop/src/main/java/bisq/desktop/main/portfolio/bsqswaps/UnconfirmedBsqSwapsView.java

@@ -338,7 +338,7 @@ public class UnconfirmedBsqSwapsView extends ActivatableViewAndModel<VBox, Uncon
             if (bsqSwapTrade.getTxId() != null && bsqSwapTrade.getTxId().contains(filterString)) {
                 return true;
             }
-            if (bsqSwapTrade.getTradeProtocolModel().getTempTradingPeerNodeAddress().getFullAddress().contains(filterString)) {
+            if (bsqSwapTrade.getTradingPeerNodeAddress().getFullAddress().contains(filterString)) {
                 return true;
             }
 

desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesView.java

@@ -442,7 +442,7 @@ public class ClosedTradesView extends ActivatableViewAndModel<VBox, ClosedTrades
                 if (bsqSwapTrade.getTxId() != null && bsqSwapTrade.getTxId().contains(filterString)) {
                     return true;
                 }
-                if (bsqSwapTrade.getTradeProtocolModel().getTempTradingPeerNodeAddress().getFullAddress().contains(filterString)) {
+                if (bsqSwapTrade.getTradingPeerNodeAddress().getFullAddress().contains(filterString)) {
                     return true;
                 }
             }