<p></p>
<p><b>@sqrrm</b> commented on this pull request.</p>

<p>Some comments, looks generally good</p><hr>

<p>In <a href="https://github.com/bisq-network/bisq/pull/5685#discussion_r710002786">core/src/main/java/bisq/core/api/model/PaymentAccountTypeAdapter.java</a>:</p>
<pre style='color:#555'>> +        else if (account.hasPaymentMethodWithId(REVOLUT_ID))
+            return getTradeCurrenciesInList(currencyCodes, getAllRevolutCurrencies());
+        /*else if (account.hasPaymentMethodWithId(SWIFT_ID))
+            return getTradeCurrenciesInList(currencyCodes, new ArrayList<>(getAllSortedFiatCurrencies()));*/
+        else if (account.hasPaymentMethodWithId(TRANSFERWISE_ID))
+            return getTradeCurrenciesInList(currencyCodes, getAllTransferwiseCurrencies());
+        else if (account.hasPaymentMethodWithId(UPHOLD_ID))
+            return getTradeCurrenciesInList(currencyCodes, getAllUpholdCurrencies());
+        else
+            return Optional.empty();
+    }
+
+    private boolean didReadSelectedTradeCurrencyField(JsonReader in,
+                                                      PaymentAccount account,
+                                                      String fieldName) {
+        if (fieldName.equals("selectedTradeCurrency")) {
</pre>
<p>Prefer return early, eg</p>
<pre><code>if (!fieldName.equals("selectedTradeCurrency")) {
  return false;
}
...
</code></pre>

<hr>

<p>In <a href="https://github.com/bisq-network/bisq/pull/5685#discussion_r710004118">core/src/main/java/bisq/core/api/model/PaymentAccountTypeAdapter.java</a>:</p>
<pre style='color:#555'>> +        else if (account.hasPaymentMethodWithId(UPHOLD_ID))
+            return getTradeCurrenciesInList(currencyCodes, getAllUpholdCurrencies());
+        else
+            return Optional.empty();
+    }
+
+    private boolean didReadSelectedTradeCurrencyField(JsonReader in,
+                                                      PaymentAccount account,
+                                                      String fieldName) {
+        if (fieldName.equals("selectedTradeCurrency")) {
+            String fieldValue = nextStringOrNull(in);
+            if (fieldValue != null && !fieldValue.isEmpty()) {
+                Optional<TradeCurrency> tradeCurrency = getTradeCurrency(fieldValue.toUpperCase());
+                if (tradeCurrency.isPresent()) {
+                    account.setSelectedTradeCurrency(tradeCurrency.get());
+                } else {
</pre>
<p>It does read the field, but should it return true even when it's not defined?</p>

<hr>

<p>In <a href="https://github.com/bisq-network/bisq/pull/5685#discussion_r710005619">apitest/src/test/java/bisq/apitest/method/payment/AbstractPaymentAccountTest.java</a>:</p>
<pre style='color:#555'>> @@ -125,7 +145,13 @@ protected final void verifyEmptyForm(File jsonForm, String paymentMethodId, Stri
                 PAYMENT_ACCOUNT_FORM.toJsonString(jsonForm),
                 Object.class);
         assertNotNull(emptyForm);
-        assertEquals(PROPERTY_VALUE_JSON_COMMENTS, emptyForm.get(PROPERTY_NAME_JSON_COMMENTS));
+
+        if (false && paymentMethodId.equals("SWIFT_ID")) {
</pre>
<p>Maybe a TODO if this is a placeholder for future swift test</p>

<hr>

<p>In <a href="https://github.com/bisq-network/bisq/pull/5685#discussion_r710007087">apitest/src/test/resources/logback.xml</a>:</p>
<pre style='color:#555'>> @@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
</pre>
<p>What does this file do?</p>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />You are receiving this because you are subscribed to this thread.<br />Reply to this email directly, <a href="https://github.com/bisq-network/bisq/pull/5685#pullrequestreview-756144414">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNRXWVLNMQGRAU7X27LUCHEMBANCNFSM5DQWWXCQ">unsubscribe</a>.<br />Triage notifications on the go with GitHub Mobile for <a href="https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675">iOS</a> or <a href="https://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign%3Dnotification-email%26utm_medium%3Demail%26utm_source%3Dgithub">Android</a>.
<img src="https://github.com/notifications/beacon/AJFFTNUAH4JBATOSXHI5G5DUCHEMBA5CNFSM5DQWWXC2YY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOFUI5SHQ.gif" height="1" width="1" alt="" /></p>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/bisq-network/bisq/pull/5685#pullrequestreview-756144414",
"url": "https://github.com/bisq-network/bisq/pull/5685#pullrequestreview-756144414",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>