<p></p>
<p><b>@ripcurlx</b> requested changes on this pull request.</p>

<p>NACK - Please see my comments. As I have the changes locally already I'll push them to the branch as soon as I'm done with the Regtest test run. So please wait for doing the changes on your own.</p><hr>

<p>In <a href="https://github.com/bisq-network/bisq/pull/5672#discussion_r705104987">desktop/src/main/java/bisq/desktop/components/paymentmethods/SwiftForm.java</a>:</p>
<pre style='color:#555'>> +import static bisq.core.payment.payload.SwiftAccountPayload.*;
+
+public class SwiftForm extends PaymentMethodForm {
+    private final SwiftAccountPayload formData;
+    private CheckBox useIntermediaryCheck;
+    private LengthValidator defaultValidator = new LengthValidator(2, 34);
+    private LengthValidator swiftValidator = new LengthValidator(11, 11);
+    private LengthValidator accountNrValidator = new LengthValidator(2, 40);
+    private LengthValidator addressValidator = new LengthValidator(1, 100);
+
+    public SwiftForm(PaymentAccount paymentAccount,
+                     AccountAgeWitnessService accountAgeWitnessService,
+                     InputValidator defaultValidator, GridPane gridPane, int gridRow, CoinFormatter formatter) {
+        super(paymentAccount, accountAgeWitnessService, defaultValidator, gridPane, gridRow, formatter);
+        this.formData = ((SwiftAccount) paymentAccount).getPayload();
+        this.useIntermediaryCheck = new CheckBox(Res.get("payment.swift.use.intermediary"));
</pre>

⬇️ Suggested change
<pre style="color: #555">-        this.useIntermediaryCheck = new CheckBox(Res.get("payment.swift.use.intermediary"));
+        this.useIntermediaryCheck = new AutoTooltipCheckBox(Res.get("payment.swift.use.intermediary"));
</pre>

<p>Should be<br>
<a target="_blank" rel="noopener noreferrer" href="https://user-images.githubusercontent.com/170962/132650764-d21100a0-57cf-46a9-8410-5f404dfea48c.png"><img src="https://user-images.githubusercontent.com/170962/132650764-d21100a0-57cf-46a9-8410-5f404dfea48c.png" alt="Bildschirmfoto 2021-09-09 um 10 21 18" style="max-width: 100%;"></a><br>
Instead of<br>
<a target="_blank" rel="noopener noreferrer" href="https://user-images.githubusercontent.com/170962/132650795-5855bd73-ea2a-4e76-85c2-9358e0e123bb.png"><img src="https://user-images.githubusercontent.com/170962/132650795-5855bd73-ea2a-4e76-85c2-9358e0e123bb.png" alt="Bildschirmfoto 2021-09-09 um 10 19 33" style="max-width: 100%;"></a></p>

<hr>

<p>In <a href="https://github.com/bisq-network/bisq/pull/5672#discussion_r705107922">desktop/src/main/java/bisq/desktop/components/paymentmethods/SwiftForm.java</a>:</p>
<pre style='color:#555'>> +        beneficiaryCityField.setValidator(defaultValidator);
+        beneficiaryCityField.textProperty().addListener((ov, oldValue, newValue) -> {
+            formData.setBeneficiaryCity(newValue.trim());
+            updateFromInputs();
+        });
+
+        label = Res.get(Res.get(PHONE + BENEFICIARYPOSTFIX));
+        InputTextField beneficiaryPhoneField = addInputTextField(gridPane, ++gridRow, label);
+        beneficiaryPhoneField.setPromptText(label);
+        beneficiaryPhoneField.setValidator(defaultValidator);
+        beneficiaryPhoneField.textProperty().addListener((ov, oldValue, newValue) -> {
+            formData.setBeneficiaryPhone(newValue.trim());
+            updateFromInputs();
+        });
+
+        label = Res.get("payment.shared.optionalExtraInfo");
</pre>

⬇️ Suggested change
<pre style="color: #555">-        label = Res.get("payment.shared.optionalExtraInfo");
+        label = Res.get("payment.shared.optionalExtra");
</pre>

<p>Wrong key<br>
<a target="_blank" rel="noopener noreferrer" href="https://user-images.githubusercontent.com/170962/132651138-6b90dcde-42dd-4483-ab0c-0617c8c76f1a.png"><img src="https://user-images.githubusercontent.com/170962/132651138-6b90dcde-42dd-4483-ab0c-0617c8c76f1a.png" alt="Bildschirmfoto 2021-09-09 um 10 27 58" style="max-width: 100%;"></a></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/5672#pullrequestreview-750035700">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNTLH3GHS23MPHONFG3UBBWTTANCNFSM5CW36L5Q">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/AJFFTNXYQOINTF32EAXZMX3UBBWTTA5CNFSM5CW36L52YY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOFS2KF5A.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/5672#pullrequestreview-750035700",
"url": "https://github.com/bisq-network/bisq/pull/5672#pullrequestreview-750035700",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>