Merge branch 'haveno-dex:master' into haveno-reto

2025-04-20 07:46:05 -04:00 · 2025-02-05 21:11:07 +01:00 · 2025-02-05 21:11:07 +01:00 · 7282c21d97
commit 7282c21d97
parent 07d1e51249 728cf22578
28 changed files with 416 additions and 32 deletions
--- a/core/src/main/java/haveno/core/api/model/PaymentAccountForm.java
+++ b/core/src/main/java/haveno/core/api/model/PaymentAccountForm.java
@ -77,7 +77,8 @@ public final class PaymentAccountForm implements PersistablePayload {
        AUSTRALIA_PAYID,
        CASH_APP,
        PAYPAL,
-        VENMO;
+        VENMO,
+        PAYSAFE;

        public static PaymentAccountForm.FormId fromProto(protobuf.PaymentAccountForm.FormId formId) {
            return ProtoUtil.enumFromProto(PaymentAccountForm.FormId.class, formId.name());
--- a/core/src/main/java/haveno/core/payment/PaymentAccountFactory.java
+++ b/core/src/main/java/haveno/core/payment/PaymentAccountFactory.java
@ -136,6 +136,8 @@ public class PaymentAccountFactory {
                return new CashAppAccount();
            case PaymentMethod.VENMO_ID:
                return new VenmoAccount();
+            case PaymentMethod.PAYSAFE_ID:
+                return new PaysafeAccount();

            // Cannot be deleted as it would break old trade history entries
            case PaymentMethod.OK_PAY_ID:
--- a/core/src/main/java/haveno/core/payment/PaysafeAccount.java
+++ b/core/src/main/java/haveno/core/payment/PaysafeAccount.java
@ -0,0 +1,112 @@
+/*
+ * This file is part of Haveno.
+ *
+ * Haveno is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Haveno is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package haveno.core.payment;
+
+import haveno.core.api.model.PaymentAccountFormField;
+import haveno.core.locale.TraditionalCurrency;
+import haveno.core.locale.TradeCurrency;
+import haveno.core.payment.payload.PaymentAccountPayload;
+import haveno.core.payment.payload.PaymentMethod;
+import haveno.core.payment.payload.PaysafeAccountPayload;
+import lombok.EqualsAndHashCode;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+@EqualsAndHashCode(callSuper = true)
+public final class PaysafeAccount extends PaymentAccount {
+
+    private static final List<PaymentAccountFormField.FieldId> INPUT_FIELD_IDS = List.of(
+            PaymentAccountFormField.FieldId.ACCOUNT_NAME,
+            PaymentAccountFormField.FieldId.EMAIL,
+            PaymentAccountFormField.FieldId.TRADE_CURRENCIES,
+            PaymentAccountFormField.FieldId.SALT
+    );
+
+    // https://developer.paysafe.com/en/support/reference-information/codes/
+    public static final List<TradeCurrency> SUPPORTED_CURRENCIES = List.of(
+            new TraditionalCurrency("AED"),
+            new TraditionalCurrency("ARS"),
+            new TraditionalCurrency("AUD"),
+            new TraditionalCurrency("BGN"),
+            new TraditionalCurrency("BRL"),
+            new TraditionalCurrency("CAD"),
+            new TraditionalCurrency("CHF"),
+            new TraditionalCurrency("CZK"),
+            new TraditionalCurrency("DKK"),
+            new TraditionalCurrency("EGP"),
+            new TraditionalCurrency("EUR"),
+            new TraditionalCurrency("GBP"),
+            new TraditionalCurrency("GEL"),
+            new TraditionalCurrency("HUF"),
+            new TraditionalCurrency("ILS"),
+            new TraditionalCurrency("INR"),
+            new TraditionalCurrency("JPY"),
+            new TraditionalCurrency("ISK"),
+            new TraditionalCurrency("KWD"),
+            new TraditionalCurrency("KRW"),
+            new TraditionalCurrency("MXN"),
+            new TraditionalCurrency("NOK"),
+            new TraditionalCurrency("NZD"),
+            new TraditionalCurrency("PEN"),
+            new TraditionalCurrency("PHP"),
+            new TraditionalCurrency("PLN"),
+            new TraditionalCurrency("RON"),
+            new TraditionalCurrency("RSD"),
+            new TraditionalCurrency("RUB"),
+            new TraditionalCurrency("SAR"),
+            new TraditionalCurrency("SEK"),
+            new TraditionalCurrency("TRY"),
+            new TraditionalCurrency("USD"),
+            new TraditionalCurrency("UYU")
+    );
+
+    public PaysafeAccount() {
+        super(PaymentMethod.PAYSAFE);
+    }
+
+    @Override
+    protected PaymentAccountPayload createPayload() {
+        return new PaysafeAccountPayload(paymentMethod.getId(), id);
+    }
+
+    @Override
+    public @NotNull List<TradeCurrency> getSupportedCurrencies() {
+        return SUPPORTED_CURRENCIES;
+    }
+
+    @Override
+    public @NotNull List<PaymentAccountFormField.FieldId> getInputFieldIds() {
+        return INPUT_FIELD_IDS;
+    }
+
+    public void setEmail(String accountId) {
+        ((PaysafeAccountPayload) paymentAccountPayload).setEmail(accountId);
+    }
+
+    public String getEmail() {
+        return ((PaysafeAccountPayload) paymentAccountPayload).getEmail();
+    }
+
+    @Override
+    protected PaymentAccountFormField getEmptyFormField(PaymentAccountFormField.FieldId fieldId) {
+        var field = super.getEmptyFormField(fieldId);
+        if (field.getId() == PaymentAccountFormField.FieldId.TRADE_CURRENCIES) field.setValue("");
+        return field;
+    }
+}
--- a/core/src/main/java/haveno/core/payment/payload/PaymentMethod.java
+++ b/core/src/main/java/haveno/core/payment/payload/PaymentMethod.java
@ -51,6 +51,7 @@ import haveno.core.payment.CashAppAccount;
 import haveno.core.payment.CashAtAtmAccount;
 import haveno.core.payment.PayByMailAccount;
 import haveno.core.payment.PayPalAccount;
+import haveno.core.payment.PaysafeAccount;
 import haveno.core.payment.CashDepositAccount;
 import haveno.core.payment.CelPayAccount;
 import haveno.core.payment.ZelleAccount;
@ -193,6 +194,7 @@ public final class PaymentMethod implements PersistablePayload, Comparable<Payme
    public static final String CASH_APP_ID = "CASH_APP";
    public static final String VENMO_ID = "VENMO";
    public static final String PAYPAL_ID = "PAYPAL";
+    public static final String PAYSAFE_ID = "PAYSAFE";

    public static PaymentMethod UPHOLD;
    public static PaymentMethod MONEY_BEAM;
@ -252,6 +254,7 @@ public final class PaymentMethod implements PersistablePayload, Comparable<Payme
    public static PaymentMethod PAYPAL;
    public static PaymentMethod CASH_APP;
    public static PaymentMethod VENMO;
+    public static PaymentMethod PAYSAFE;

    // Cannot be deleted as it would break old trade history entries
    @Deprecated
@ -322,6 +325,7 @@ public final class PaymentMethod implements PersistablePayload, Comparable<Payme
            DOMESTIC_WIRE_TRANSFER = new PaymentMethod(DOMESTIC_WIRE_TRANSFER_ID, 3 * DAY, DEFAULT_TRADE_LIMIT_HIGH_RISK, getAssetCodes(DomesticWireTransferAccount.SUPPORTED_CURRENCIES)),
            PAYPAL = new PaymentMethod(PAYPAL_ID, DAY, DEFAULT_TRADE_LIMIT_HIGH_RISK, getAssetCodes(PayPalAccount.SUPPORTED_CURRENCIES)),
            CASH_APP = new PaymentMethod(CASH_APP_ID, DAY, DEFAULT_TRADE_LIMIT_HIGH_RISK, getAssetCodes(CashAppAccount.SUPPORTED_CURRENCIES)),
+            PAYSAFE = new PaymentMethod(PaymentMethod.PAYSAFE_ID, DAY, DEFAULT_TRADE_LIMIT_HIGH_RISK, getAssetCodes(PaysafeAccount.SUPPORTED_CURRENCIES)),

            // Japan
            JAPAN_BANK = new PaymentMethod(JAPAN_BANK_ID, DAY, DEFAULT_TRADE_LIMIT_LOW_RISK, getAssetCodes(JapanBankAccount.SUPPORTED_CURRENCIES)),
@ -364,7 +368,8 @@ public final class PaymentMethod implements PersistablePayload, Comparable<Payme
                AUSTRALIA_PAYID_ID,
                CASH_APP_ID,
                PAYPAL_ID,
-                VENMO_ID);
+                VENMO_ID,
+                PAYSAFE_ID);
        return paymentMethods.stream().filter(paymentMethod -> paymentMethodIds.contains(paymentMethod.getId())).collect(Collectors.toList());
    }

@ -588,7 +593,8 @@ public final class PaymentMethod implements PersistablePayload, Comparable<Payme
                id.equals(PaymentMethod.UPHOLD_ID) ||
                id.equals(PaymentMethod.CASH_APP_ID) ||
                id.equals(PaymentMethod.PAYPAL_ID) ||
-                id.equals(PaymentMethod.VENMO_ID);
+                id.equals(PaymentMethod.VENMO_ID) ||
+                id.equals(PaymentMethod.PAYSAFE_ID);
    }

    public static boolean isRoundedForAtmCash(String id) {
--- a/core/src/main/java/haveno/core/payment/payload/PaysafeAccountPayload.java
+++ b/core/src/main/java/haveno/core/payment/payload/PaysafeAccountPayload.java
@ -0,0 +1,96 @@
+/*
+ * This file is part of Haveno.
+ *
+ * Haveno is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Haveno is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package haveno.core.payment.payload;
+
+import com.google.protobuf.Message;
+import haveno.core.locale.Res;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.extern.slf4j.Slf4j;
+
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+
+@EqualsAndHashCode(callSuper = true)
+@ToString
+@Setter
+@Getter
+@Slf4j
+public final class PaysafeAccountPayload extends PaymentAccountPayload {
+    private String email = "";
+
+    public PaysafeAccountPayload(String paymentMethod, String id) {
+        super(paymentMethod, id);
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // PROTO BUFFER
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    private PaysafeAccountPayload(String paymentMethod,
+                                       String id,
+                                       String email,
+                                       long maxTradePeriod,
+                                       Map<String, String> excludeFromJsonDataMap) {
+        super(paymentMethod,
+                id,
+                maxTradePeriod,
+                excludeFromJsonDataMap);
+
+        this.email = email;
+    }
+
+    @Override
+    public Message toProtoMessage() {
+        return getPaymentAccountPayloadBuilder()
+                .setPaysafeAccountPayload(protobuf.PaysafeAccountPayload.newBuilder().setEmail(email))
+                .build();
+    }
+
+    public static PaysafeAccountPayload fromProto(protobuf.PaymentAccountPayload proto) {
+        return new PaysafeAccountPayload(proto.getPaymentMethodId(),
+                proto.getId(),
+                proto.getPaysafeAccountPayload().getEmail(),
+                proto.getMaxTradePeriod(),
+                new HashMap<>(proto.getExcludeFromJsonDataMap()));
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // API
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    @Override
+    public String getPaymentDetails() {
+        return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.email") + " " + email;
+    }
+
+    @Override
+    public String getPaymentDetailsForTradePopup() {
+        return getPaymentDetails();
+    }
+
+    @Override
+    public byte[] getAgeWitnessInputData() {
+        return super.getAgeWitnessInputData(email.getBytes(StandardCharsets.UTF_8));
+    }
+}
--- a/core/src/main/java/haveno/core/proto/CoreProtoResolver.java
+++ b/core/src/main/java/haveno/core/proto/CoreProtoResolver.java
@ -54,6 +54,7 @@ import haveno.core.payment.payload.NequiAccountPayload;
 import haveno.core.payment.payload.OKPayAccountPayload;
 import haveno.core.payment.payload.PaxumAccountPayload;
 import haveno.core.payment.payload.PaymentAccountPayload;
+import haveno.core.payment.payload.PaysafeAccountPayload;
 import haveno.core.payment.payload.PayPalAccountPayload;
 import haveno.core.payment.payload.PayseraAccountPayload;
 import haveno.core.payment.payload.PaytmAccountPayload;
@ -239,6 +240,8 @@ public class CoreProtoResolver implements ProtoResolver {
                    return VenmoAccountPayload.fromProto(proto);
                case PAYPAL_ACCOUNT_PAYLOAD:
                    return PayPalAccountPayload.fromProto(proto);
+                case PAYSAFE_ACCOUNT_PAYLOAD:
+                    return PaysafeAccountPayload.fromProto(proto);

                default:
                    throw new ProtobufferRuntimeException("Unknown proto message case(PB.PaymentAccountPayload). messageCase=" + messageCase);
--- a/core/src/main/resources/i18n/displayStrings.properties
+++ b/core/src/main/resources/i18n/displayStrings.properties
@ -2980,8 +2980,8 @@ payment.usPostalMoneyOrder.info=Trading using US Postal Money Orders (USPMO) on
 - XMR buyers must send the USPMO to the XMR seller with Delivery Confirmation.\n\
 \n\
 In the event mediation is necessary, or if there is a trade dispute, you will be required to send the photos to the Haveno mediator or refund agent, together with the USPMO Serial Number, Post Office Number, and dollar amount, so they can verify the details on the US Post Office website.\n\n\
-Failure to provide the required information to the Mediator or Arbitrator will result in losing the dispute case.\n\n\
-In all dispute cases, the USPMO sender bears 100% of the burden of responsibility in providing evidence/proof to the Mediator or Arbitrator.\n\n\
+Failure to provide the required information to the arbitrator will result in losing the dispute case.\n\n\
+In all dispute cases, the USPMO sender bears 100% of the burden of responsibility in providing evidence/proof to the arbitrator.\n\n\
 If you do not understand these requirements, do not trade using USPMO on Haveno.

 payment.payByMail.info=Trading using Pay by Mail on Haveno requires that you understand the following:\n\
@ -3040,7 +3040,7 @@ payment.f2f.info='Face to Face' trades have different rules and come with differ
  ● The trading peers need to bring their laptops and do the confirmation of 'payment sent' and 'payment received' at the meeting place.\n\
  ● If a maker has special 'terms and conditions' they must state those in the 'Additional information' text field in the account.\n\
  ● By taking an offer the taker agrees to the maker's stated 'terms and conditions'.\n\
-  ● In case of a dispute the mediator or arbitrator cannot be of much assistance as it is usually difficult to get tamper-proof evidence \
+  ● In case of a dispute the arbitrator cannot be of much assistance as it is usually difficult to get tamper-proof evidence \
  of what happened at the meeting. In such cases the XMR funds might get locked indefinitely or until the trading peers come to \
  an agreement.\n\n\
  To be sure you fully understand the differences with 'Face to Face' trades please read the instructions and \
@ -3067,6 +3067,9 @@ payment.amazonGiftCard.info=To pay with Amazon eGift Card, you will need to send
  - try to use creative, believable text for the gift card''s message (e.g., "Happy birthday Susan!") along with the trade ID (and use trader chat \
  to tell your trading peer the reference text you picked so they can verify your payment)\n\
  - Amazon eGift Cards can only be redeemed on the Amazon website they were purchased on (e.g., a gift card purchased on amazon.it can only be redeemed on amazon.it)
+payment.paysafe.info=For your protection, we strongly discourage using Paysafecard PINs for payment.\n\n\
+  Transactions made via PINs cannot be independently verified for dispute resolution. If an issue arises, recovering funds may not be possible.\n\n\
+  To ensure transaction security with dispute resolution, always use payment methods that provide verifiable records.

 # We use constants from the code so we do not use our normal naming convention
 # dynamic values are not recognized by IntelliJ
@ -3302,6 +3305,8 @@ CASH_APP_SHORT=Cash App
 # suppress inspection "UnusedProperty"
 VENMO_SHORT=Venmo
 PAYPAL_SHORT=PayPal
+# suppress inspection "UnusedProperty"
+PAYSAFE=Paysafe


 ####################################################################
--- a/core/src/main/resources/i18n/displayStrings_cs.properties
+++ b/core/src/main/resources/i18n/displayStrings_cs.properties
@ -3065,6 +3065,10 @@ payment.amazonGiftCard.info=Chcete-li platit dárkovou kartou Amazon eGift, bude
  - Na kartě do zprávy pro příjemce můžete přidat i vlastní originální text (např. "Happy birthday Susan!") spolu s ID obchodu (v takovém případě \
  o tom informujte protistranu pomocí obchodovacího chatu, aby mohli s jistotou ověřit, že obdržená dárková karta pochází od vás.)\n\
  - Karty Amazon eGift lze uplatnit pouze na té stránce Amazon, na které byly také koupeny (např. karta koupená na amazon.it může být uplatněna zase jen na amazon.it).
+payment.paysafe.info=Pro vaši ochranu důrazně nedoporučujeme používat Paysafecard PINy pro platby.\n\n\
+  Transakce provedené pomocí PINů nelze nezávisle ověřit pro řešení sporů. Pokud nastane problém, obnova prostředků nemusí být možná.\n\n\
+  Pro zajištění bezpečnosti transakcí a podpory řešení sporů vždy používejte platební metody, které poskytují ověřitelné záznamy.
+

 # We use constants from the code so we do not use our normal naming convention
 # dynamic values are not recognized by IntelliJ
--- a/core/src/main/resources/i18n/displayStrings_de.properties
+++ b/core/src/main/resources/i18n/displayStrings_de.properties
@ -2047,6 +2047,9 @@ payment.australia.payid=PayID
 payment.payid=PayIDs wie E-Mail Adressen oder Telefonnummern die mit Finanzinstitutionen verbunden sind.
 payment.payid.info=Eine PayID wie eine Telefonnummer, E-Mail Adresse oder Australische Business Number (ABN) mit der Sie sicher Ihre Bank, Kreditgenossenschaft oder Bausparkassenkonto verlinken können. Sie müssen bereits eine PayID mit Ihrer Australischen Finanzinstitution erstellt haben. Beide Institutionen, die die sendet und die die empfängt, müssen PayID unterstützen. Weitere informationen finden Sie unter [HYPERLINK:https://payid.com.au/faqs/]
 payment.amazonGiftCard.info=Um mit einer Amazon eGift Geschenkkarte zu bezahlen, müssen Sie eine Amazon eGift Geschenkkarte über Ihr Amazon-Konto an den XMR-Verkäufer senden. \n\nHaveno zeigt die E-Mail-Adresse oder Telefonnummer des XMR-Verkäufers an, an die die Geschenkkarte gesendet werden soll, und Sie müssen die Handels-ID in das Nachrichtenfeld der Geschenkkarte eintragen. Bitte lesen Sie das Wiki [HYPERLINK:https://haveno.exchange/wiki/Amazon_eGift_card] für weitere Details und empfohlene Vorgehensweisen. \n\nDrei wichtige Hinweise:\n- Versuchen Sie Geschenkkarten mit Beträgen von 100 USD oder weniger zu versenden, weil Amazon größere Geschenkkarten gerne als betrügerisch kennzeichnet\n- Versuchen Sie einen kreativen, glaubwürdigen Text für die Nachricht der Geschenkkarten zu verwenden (z.B. "Alles Gute zum Geburtstag Susi!"), zusammen mit der Handels-ID (und verwenden Sie den Handels-Chat, um Ihrem Handelspartner den von Ihnen gewählten Referenztext mitzuteilen, damit er Ihre Zahlung überprüfen kann)\n- Amazon Geschenkkarten können nur auf der Amazon-Website eingelöst werden, auf der sie gekauft wurden (z. B. kann eine auf amazon.it gekaufte Geschenkkarte nur auf amazon.it eingelöst werden)
+payment.paysafe.info=Zum Schutz Ihrer Sicherheit raten wir dringend davon ab, Paysafecard-PINs für Zahlungen zu verwenden.\n\n\
+  Transaktionen, die über PINs durchgeführt werden, können nicht unabhängig zur Streitbeilegung überprüft werden. Wenn ein Problem auftritt, kann die Rückerstattung von Geldern möglicherweise nicht möglich sein.\n\n\
+  Um die Transaktionssicherheit mit Streitbeilegung zu gewährleisten, verwenden Sie immer Zahlungsmethoden, die überprüfbare Aufzeichnungen bieten.


 # We use constants from the code so we do not use our normal naming convention
--- a/core/src/main/resources/i18n/displayStrings_es.properties
+++ b/core/src/main/resources/i18n/displayStrings_es.properties
@ -2048,6 +2048,9 @@ payment.australia.payid=PayID
 payment.payid=PayID conectado a una institución financiera. Como la dirección email o el número de móvil.
 payment.payid.info=Un PayID como un número de teléfono, dirección email o Australian Business Number (ABN), que puede conectar con seguridad a su banco, unión de crédito o cuenta de construcción de sociedad. Necesita haber creado una PayID con su institución financiera australiana. Tanto para enviar y recibir las instituciones financieras deben soportar PayID. Para más información por favor compruebe [HYPERLINK:https://payid.com.au/faqs/]
 payment.amazonGiftCard.info=Para pagar con Tarjeta eGift Amazon. necesitará enviar una Tarjeta eGift Amazon al vendedor XMR a través de su cuenta Amazon.\n\nHaveno mostrará la dirección e-mail del vendedor de XMR o el número de teléfono donde la tarjeta de regalo deberá enviarse. Por favor vea la wiki  [HYPERLINK:https://haveno.exchange/wiki/Amazon_eGift_card]  para más detalles y mejores prácticas.\n\nNotas importantes:\n- Pruebe a enviar las tarjetas regalo en cantidades de 100USD o menores, ya que Amazon está señalando tarjetas regalo mayores como fraudulentas.\n- Intente usar textos para el mensaje de la tarjeta regalo creíbles y creativos ("Feliz cumpleaños!").\n- Las tarjetas Amazon eGift pueden ser redimidas únicamente en la web de Amazon en la que se compraron (por ejemplo, una tarjeta comprada en amazon.it solo puede ser redimida en amazon.it)
+payment.paysafe.info=Por su protección, desaconsejamos encarecidamente el uso de PINs de Paysafecard para pagos.\n\n\
+  Las transacciones realizadas mediante PINs no pueden ser verificadas de forma independiente para la resolución de disputas. Si surge un problema, recuperar los fondos puede no ser posible.\n\n\
+  Para garantizar la seguridad de las transacciones con resolución de disputas, utilice siempre métodos de pago que proporcionen registros verificables.


 # We use constants from the code so we do not use our normal naming convention
--- a/core/src/main/resources/i18n/displayStrings_fa.properties
+++ b/core/src/main/resources/i18n/displayStrings_fa.properties
@ -1995,8 +1995,6 @@ payment.amazonGiftCard.upgrade=Amazon gift cards payment method requires the cou
 payment.account.amazonGiftCard.addCountryInfo={0}\nYour existing Amazon Gift Card account ({1}) does not have a Country specified.\nPlease enter your Amazon Gift Card Country to update your account data.\nThis will not affect your account age status.
 payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account

-payment.usPostalMoneyOrder.info=Trading using US Postal Money Orders (USPMO) on Haveno requires that you understand the following:\n\n- XMR buyers must write the XMR Seller’s name in both the Payer and the Payee’s fields & take a high-resolution photo of the USPMO and envelope with proof of tracking before sending.\n- XMR buyers must send the USPMO to the XMR seller with Delivery Confirmation.\n\nIn the event mediation is necessary, or if there is a trade dispute, you will be required to send the photos to the Haveno mediator or refund agent, together with the USPMO Serial Number, Post Office Number, and dollar amount, so they can verify the details on the US Post Office website.\n\nFailure to provide the required information to the Mediator or Arbitrator will result in losing the dispute case.\n\nIn all dispute cases, the USPMO sender bears 100% of the burden of responsibility in providing evidence/proof to the Mediator or Arbitrator.\n\nIf you do not understand these requirements, do not trade using USPMO on Haveno.
-
 payment.payByMail.contact=اطلاعات تماس
 payment.payByMail.contact.prompt=Name or nym envelope should be addressed to
 payment.f2f.contact=اطلاعات تماس
@ -2009,7 +2007,6 @@ payment.shared.extraInfo.offer=اطلاعات اضافی پیشنهاد
 payment.shared.extraInfo.prompt.paymentAccount=هرگونه اصطلاحات، شرایط یا جزئیات خاصی که می‌خواهید همراه با پیشنهادات شما برای این حساب پرداخت نمایش داده شود را تعریف کنید (کاربران قبل از پذیرش پیشنهادات این اطلاعات را مشاهده خواهند کرد).
 payment.shared.extraInfo.prompt.offer=هر اصطلاح، شرایط یا جزئیات خاصی که مایلید همراه با پیشنهاد خود نمایش داده شود را تعریف کنید.
 payment.shared.extraInfo.noDeposit=جزئیات تماس و شرایط پیشنهاد
-payment.f2f.info='Face to Face' trades have different rules and come with different risks than online transactions.\n\nThe main differences are:\n● The trading peers need to exchange information about the meeting location and time by using their provided contact details.\n● The trading peers need to bring their laptops and do the confirmation of 'payment sent' and 'payment received' at the meeting place.\n● If a maker has special 'terms and conditions' they must state those in the 'Additional information' text field in the account.\n● By taking an offer the taker agrees to the maker's stated 'terms and conditions'.\n● In case of a dispute the mediator or arbitrator cannot be of much assistance as it is usually difficult to get tamper-proof evidence of what happened at the meeting. In such cases the XMR funds might get locked indefinitely or until the trading peers come to an agreement.\n\nTo be sure you fully understand the differences with 'Face to Face' trades please read the instructions and recommendations at: [HYPERLINK:https://docs.haveno.exchange/trading-rules.html#f2f-trading]
 payment.f2f.info.openURL=باز کردن صفحه وب
 payment.f2f.offerbook.tooltip.countryAndCity=Country and city: {0} / {1}
 payment.shared.extraInfo.tooltip=اطلاعات اضافی: {0}
@ -2022,6 +2019,9 @@ payment.australia.payid=PayID
 payment.payid=PayID linked to financial institution. Like email address or mobile phone.
 payment.payid.info=A PayID like a phone number, email address or an Australian Business Number (ABN), that you can securely link to your bank, credit union or building society account. You need to have already created a PayID with your Australian financial institution. Both sending and receiving financial institutions must support PayID. For more information please check [HYPERLINK:https://payid.com.au/faqs/]
 payment.amazonGiftCard.info=To pay with Amazon eGift Card, you will need to send an Amazon eGift Card to the XMR seller via your Amazon account. \n\nHaveno will show the XMR seller''s email address or phone number where the gift card should be sent, and you must include the trade ID in the gift card''s message field. Please see the wiki [HYPERLINK:https://haveno.exchange/wiki/Amazon_eGift_card] for further details and best practices. \n\nThree important notes:\n- try to send gift cards with amounts of 100 USD or smaller, as Amazon is known to flag larger gift cards as fraudulent\n- try to use creative, believable text for the gift card''s message (e.g., "Happy birthday Susan!") along with the trade ID (and use trader chat to tell your trading peer the reference text you picked so they can verify your payment)\n- Amazon eGift Cards can only be redeemed on the Amazon website they were purchased on (e.g., a gift card purchased on amazon.it can only be redeemed on amazon.it)
+payment.paysafe.info=برای حفاظت از شما، به شدت از استفاده از پین‌های Paysafecard برای پرداخت جلوگیری می‌کنیم.\n\n\
+  تراکنش‌های انجام شده از طریق پین‌ها نمی‌توانند به طور مستقل برای حل اختلاف تأیید شوند. اگر مشکلی پیش آید، بازیابی وجوه ممکن است غیرممکن باشد.\n\n\
+  برای اطمینان از امنیت تراکنش و حل اختلاف، همیشه از روش‌های پرداختی استفاده کنید که سوابق قابل تاییدی ارائه می‌دهند.


 # We use constants from the code so we do not use our normal naming convention
--- a/core/src/main/resources/i18n/displayStrings_fr.properties
+++ b/core/src/main/resources/i18n/displayStrings_fr.properties
@ -2051,6 +2051,9 @@ payment.australia.payid=ID de paiement
 payment.payid=ID de paiement lié à une institution financière. Comme l'addresse email ou le téléphone portable.
 payment.payid.info=Un PayID, tel qu'un numéro de téléphone, une adresse électronique ou un numéro d'entreprise australien (ABN), que vous pouvez lier en toute sécurité à votre compte bancaire, votre crédit mutuel ou votre société de crédit immobilier. Vous devez avoir déjà créé un PayID auprès de votre institution financière australienne. Les institutions financières émettrices et réceptrices doivent toutes deux prendre en charge PayID. Pour  plus d'informations, veuillez consulter [LIEN:https://payid.com.au/faqs/].
 payment.amazonGiftCard.info=Pour payer avec une carte cadeau Amazon eGift Card, vous devrez envoyer une carte cadeau Amazon eGift Card au vendeur de XMR via votre compte Amazon. \n\nHaveno indiquera l'adresse e-mail ou le numéro de téléphone du vendeur XMR où la carte cadeau doit être envoyée, et vous devrez inclure l'ID du trade dans le champ de messagerie de la carte cadeau. Veuillez consulter le wiki [LIEN:https://haveno.exchange/wiki/Amazon_eGift_card] pour plus de détails et pour les meilleures pratiques à adopter. \n\nTrois remarques importantes :\n- essayez d'envoyer des cartes-cadeaux d'un montant inférieur ou égal à 100 USD, car Amazon est connu pour signaler les cartes-cadeaux plus importantes comme frauduleuses\n- essayez d'utiliser un texte créatif et crédible pour le message de la carte cadeau (par exemple, "Joyeux anniversaire Susan !") ainsi que l'ID du trade (et utilisez le chat du trader pour indiquer à votre pair de trading le texte de référence que vous avez choisi afin qu'il puisse vérifier votre paiement).\n- Les cartes cadeaux électroniques Amazon ne peuvent être échangées que sur le site Amazon où elles ont été achetées (par exemple, une carte cadeau achetée sur amazon.it ne peut être échangée que sur amazon.it).
+payment.paysafe.info=Pour votre protection, nous déconseillons fortement d'utiliser les PINs Paysafecard pour les paiements.\n\n\
+  Les transactions effectuées via des PINs ne peuvent pas être vérifiées de manière indépendante pour la résolution des litiges. En cas de problème, la récupération des fonds peut ne pas être possible.\n\n\
+  Pour garantir la sécurité des transactions et la résolution des litiges, utilisez toujours des méthodes de paiement qui fournissent des preuves vérifiables.


 # We use constants from the code so we do not use our normal naming convention
--- a/core/src/main/resources/i18n/displayStrings_it.properties
+++ b/core/src/main/resources/i18n/displayStrings_it.properties
@ -1998,8 +1998,6 @@ payment.amazonGiftCard.upgrade=Amazon gift cards payment method requires the cou
 payment.account.amazonGiftCard.addCountryInfo={0}\nYour existing Amazon Gift Card account ({1}) does not have a Country specified.\nPlease enter your Amazon Gift Card Country to update your account data.\nThis will not affect your account age status.
 payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account

-payment.usPostalMoneyOrder.info=Trading using US Postal Money Orders (USPMO) on Haveno requires that you understand the following:\n\n- XMR buyers must write the XMR Seller’s name in both the Payer and the Payee’s fields & take a high-resolution photo of the USPMO and envelope with proof of tracking before sending.\n- XMR buyers must send the USPMO to the XMR seller with Delivery Confirmation.\n\nIn the event mediation is necessary, or if there is a trade dispute, you will be required to send the photos to the Haveno mediator or refund agent, together with the USPMO Serial Number, Post Office Number, and dollar amount, so they can verify the details on the US Post Office website.\n\nFailure to provide the required information to the Mediator or Arbitrator will result in losing the dispute case.\n\nIn all dispute cases, the USPMO sender bears 100% of the burden of responsibility in providing evidence/proof to the Mediator or Arbitrator.\n\nIf you do not understand these requirements, do not trade using USPMO on Haveno.
-
 payment.payByMail.contact=Informazioni di contatto
 payment.payByMail.contact.prompt=Name or nym envelope should be addressed to
 payment.f2f.contact=Informazioni di contatto
@ -2012,7 +2010,6 @@ payment.shared.extraInfo.offer=Informazioni aggiuntive sull'offerta
 payment.shared.extraInfo.prompt.paymentAccount=Definisci eventuali termini, condizioni o dettagli speciali che desideri vengano visualizzati con le tue offerte per questo account di pagamento (gli utenti vedranno queste informazioni prima di accettare le offerte).
 payment.shared.extraInfo.prompt.offer=Definisci eventuali termini, condizioni o dettagli speciali che desideri mostrare con la tua offerta.
 payment.shared.extraInfo.noDeposit=Dettagli di contatto e termini dell'offerta
-payment.f2f.info='Face to Face' trades have different rules and come with different risks than online transactions.\n\nThe main differences are:\n● The trading peers need to exchange information about the meeting location and time by using their provided contact details.\n● The trading peers need to bring their laptops and do the confirmation of 'payment sent' and 'payment received' at the meeting place.\n● If a maker has special 'terms and conditions' they must state those in the 'Additional information' text field in the account.\n● By taking an offer the taker agrees to the maker's stated 'terms and conditions'.\n● In case of a dispute the mediator or arbitrator cannot be of much assistance as it is usually difficult to get tamper-proof evidence of what happened at the meeting. In such cases the XMR funds might get locked indefinitely or until the trading peers come to an agreement.\n\nTo be sure you fully understand the differences with 'Face to Face' trades please read the instructions and recommendations at: [HYPERLINK:https://docs.haveno.exchange/trading-rules.html#f2f-trading]
 payment.f2f.info.openURL=Apri sito web
 payment.f2f.offerbook.tooltip.countryAndCity=Paese e città: {0} / {1}
 payment.shared.extraInfo.tooltip=Ulteriori informazioni: {0}
@ -2025,6 +2022,9 @@ payment.australia.payid=PayID
 payment.payid=PayID linked to financial institution. Like email address or mobile phone.
 payment.payid.info=A PayID like a phone number, email address or an Australian Business Number (ABN), that you can securely link to your bank, credit union or building society account. You need to have already created a PayID with your Australian financial institution. Both sending and receiving financial institutions must support PayID. For more information please check [HYPERLINK:https://payid.com.au/faqs/]
 payment.amazonGiftCard.info=To pay with Amazon eGift Card, you will need to send an Amazon eGift Card to the XMR seller via your Amazon account. \n\nHaveno will show the XMR seller''s email address or phone number where the gift card should be sent, and you must include the trade ID in the gift card''s message field. Please see the wiki [HYPERLINK:https://haveno.exchange/wiki/Amazon_eGift_card] for further details and best practices. \n\nThree important notes:\n- try to send gift cards with amounts of 100 USD or smaller, as Amazon is known to flag larger gift cards as fraudulent\n- try to use creative, believable text for the gift card''s message (e.g., "Happy birthday Susan!") along with the trade ID (and use trader chat to tell your trading peer the reference text you picked so they can verify your payment)\n- Amazon eGift Cards can only be redeemed on the Amazon website they were purchased on (e.g., a gift card purchased on amazon.it can only be redeemed on amazon.it)
+payment.paysafe.info=Per la tua protezione, sconsigliamo vivamente di utilizzare i PIN di Paysafecard per i pagamenti.\n\n\
+  Le transazioni effettuate tramite PIN non possono essere verificate in modo indipendente per la risoluzione delle controversie. Se si verifica un problema, il recupero dei fondi potrebbe non essere possibile.\n\n\
+  Per garantire la sicurezza delle transazioni con risoluzione delle controversie, utilizza sempre metodi di pagamento che forniscono registrazioni verificabili.


 # We use constants from the code so we do not use our normal naming convention
--- a/core/src/main/resources/i18n/displayStrings_ja.properties
+++ b/core/src/main/resources/i18n/displayStrings_ja.properties
@ -2047,6 +2047,9 @@ payment.australia.payid=PayID
 payment.payid=金融機関と繋がっているPayID。例えばEメールアドレスそれとも携帯電話番号。
 payment.payid.info=銀行、信用金庫、あるいは住宅金融組合アカウントと安全に繋がれるPayIDとして使われる電話番号、Eメールアドレス、それともオーストラリア企業番号（ABN）。すでにオーストラリアの金融機関とPayIDを作った必要があります。送金と受取の金融機関は両方PayIDをサポートする必要があります。詳しくは以下を訪れて下さい [HYPERLINK:https://payid.com.au/faqs/]
 payment.amazonGiftCard.info=アマゾンeGiftカードで支払うには、アマゾンアカウントを使ってeGiftカードをXMR売り手に送る必要があります。\n\nHavenoはeGiftカードの送り先になるXMR売り手のメールアドレスそれとも電話番号を表示します。そしてeGiftカードのメッセージフィールドに、必ずトレードIDを入力して下さい。最良の慣行について詳しくはWikiを参照して下さい：[HYPERLINK:https://haveno.exchange/wiki/Amazon_eGift_card]\n\n3つの注意点：\n- 可能であれば、100米ドル価格以下のeGiftカードを送って下さい。それ以上の価格はアマゾンに不正な取引というフラグが立てられることがあります。\n- eGiftカードのメッセージフィールドに、トレードIDと一緒に信ぴょう性のあるメッセージを入力して下さい。（例えば隆さん、「お誕生日おめでとう！」）。（そして確認のため、取引者チャットでトレードピアにメッセージの内容を伝えて下さい）。\n- アマゾンeGiftカードは買われたサイトのみに交換できます（例えば、amazon.jpから買われたカードはamazon.jpのみに交換できます）。
+payment.paysafe.info=あなたの保護のため、支払いにPaysafecard PINの使用は強くお勧めしません。\n\n\
+  PINを使用した取引は、紛争解決のために独立して確認することができません。問題が発生した場合、資金の回収が不可能になることがあります。\n\n\
+  取引の安全性と紛争解決を確保するため、常に確認可能な記録を提供する支払い方法を使用してください。


 # We use constants from the code so we do not use our normal naming convention
--- a/core/src/main/resources/i18n/displayStrings_pt-br.properties
+++ b/core/src/main/resources/i18n/displayStrings_pt-br.properties
@ -2005,8 +2005,6 @@ payment.amazonGiftCard.upgrade=Amazon gift cards payment method requires the cou
 payment.account.amazonGiftCard.addCountryInfo={0}\nYour existing Amazon Gift Card account ({1}) does not have a Country specified.\nPlease enter your Amazon Gift Card Country to update your account data.\nThis will not affect your account age status.
 payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account

-payment.usPostalMoneyOrder.info=Trading using US Postal Money Orders (USPMO) on Haveno requires that you understand the following:\n\n- XMR buyers must write the XMR Seller’s name in both the Payer and the Payee’s fields & take a high-resolution photo of the USPMO and envelope with proof of tracking before sending.\n- XMR buyers must send the USPMO to the XMR seller with Delivery Confirmation.\n\nIn the event mediation is necessary, or if there is a trade dispute, you will be required to send the photos to the Haveno mediator or refund agent, together with the USPMO Serial Number, Post Office Number, and dollar amount, so they can verify the details on the US Post Office website.\n\nFailure to provide the required information to the Mediator or Arbitrator will result in losing the dispute case.\n\nIn all dispute cases, the USPMO sender bears 100% of the burden of responsibility in providing evidence/proof to the Mediator or Arbitrator.\n\nIf you do not understand these requirements, do not trade using USPMO on Haveno.
-
 payment.payByMail.contact=Informações para contato
 payment.payByMail.contact.prompt=Name or nym envelope should be addressed to
 payment.f2f.contact=Informações para contato
@ -2019,7 +2017,6 @@ payment.shared.extraInfo.offer=Informações adicionais sobre a oferta
 payment.shared.extraInfo.prompt.paymentAccount=Defina quaisquer termos, condições ou detalhes especiais que você gostaria que fossem exibidos com suas ofertas para esta conta de pagamento (os usuários verão estas informações antes de aceitar as ofertas).
 payment.shared.extraInfo.prompt.offer=Defina quaisquer termos, condições ou detalhes especiais que você gostaria de exibir com sua oferta.
 payment.shared.extraInfo.noDeposit=Detalhes de contato e termos da oferta
-payment.f2f.info='Face to Face' trades have different rules and come with different risks than online transactions.\n\nThe main differences are:\n● The trading peers need to exchange information about the meeting location and time by using their provided contact details.\n● The trading peers need to bring their laptops and do the confirmation of 'payment sent' and 'payment received' at the meeting place.\n● If a maker has special 'terms and conditions' they must state those in the 'Additional information' text field in the account.\n● By taking an offer the taker agrees to the maker's stated 'terms and conditions'.\n● In case of a dispute the mediator or arbitrator cannot be of much assistance as it is usually difficult to get tamper-proof evidence of what happened at the meeting. In such cases the XMR funds might get locked indefinitely or until the trading peers come to an agreement.\n\nTo be sure you fully understand the differences with 'Face to Face' trades please read the instructions and recommendations at: [HYPERLINK:https://docs.haveno.exchange/trading-rules.html#f2f-trading]
 payment.f2f.info.openURL=Abrir site
 payment.f2f.offerbook.tooltip.countryAndCity=País e cidade: {0} / {1}
 payment.shared.extraInfo.tooltip=Informações adicionais: {0}
@ -2032,6 +2029,9 @@ payment.australia.payid=PayID
 payment.payid=PayID linked to financial institution. Like email address or mobile phone.
 payment.payid.info=A PayID like a phone number, email address or an Australian Business Number (ABN), that you can securely link to your bank, credit union or building society account. You need to have already created a PayID with your Australian financial institution. Both sending and receiving financial institutions must support PayID. For more information please check [HYPERLINK:https://payid.com.au/faqs/]
 payment.amazonGiftCard.info=To pay with Amazon eGift Card, you will need to send an Amazon eGift Card to the XMR seller via your Amazon account. \n\nHaveno will show the XMR seller''s email address or phone number where the gift card should be sent, and you must include the trade ID in the gift card''s message field. Please see the wiki [HYPERLINK:https://haveno.exchange/wiki/Amazon_eGift_card] for further details and best practices. \n\nThree important notes:\n- try to send gift cards with amounts of 100 USD or smaller, as Amazon is known to flag larger gift cards as fraudulent\n- try to use creative, believable text for the gift card''s message (e.g., "Happy birthday Susan!") along with the trade ID (and use trader chat to tell your trading peer the reference text you picked so they can verify your payment)\n- Amazon eGift Cards can only be redeemed on the Amazon website they were purchased on (e.g., a gift card purchased on amazon.it can only be redeemed on amazon.it)
+payment.paysafe.info=Para sua proteção, desaconselhamos fortemente o uso de PINs do Paysafecard para pagamento.\n\n\  
+  Transações feitas por PINs não podem ser verificadas de forma independente para resolução de disputas. Se ocorrer um problema, a recuperação de fundos pode não ser possível.\n\n\  
+  Para garantir a segurança das transações com resolução de disputas, sempre utilize métodos de pagamento que forneçam registros verificáveis.


 # We use constants from the code so we do not use our normal naming convention
--- a/core/src/main/resources/i18n/displayStrings_pt.properties
+++ b/core/src/main/resources/i18n/displayStrings_pt.properties
@ -1995,8 +1995,6 @@ payment.amazonGiftCard.upgrade=Amazon gift cards payment method requires the cou
 payment.account.amazonGiftCard.addCountryInfo={0}\nYour existing Amazon Gift Card account ({1}) does not have a Country specified.\nPlease enter your Amazon Gift Card Country to update your account data.\nThis will not affect your account age status.
 payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account

-payment.usPostalMoneyOrder.info=Trading using US Postal Money Orders (USPMO) on Haveno requires that you understand the following:\n\n- XMR buyers must write the XMR Seller’s name in both the Payer and the Payee’s fields & take a high-resolution photo of the USPMO and envelope with proof of tracking before sending.\n- XMR buyers must send the USPMO to the XMR seller with Delivery Confirmation.\n\nIn the event mediation is necessary, or if there is a trade dispute, you will be required to send the photos to the Haveno mediator or refund agent, together with the USPMO Serial Number, Post Office Number, and dollar amount, so they can verify the details on the US Post Office website.\n\nFailure to provide the required information to the Mediator or Arbitrator will result in losing the dispute case.\n\nIn all dispute cases, the USPMO sender bears 100% of the burden of responsibility in providing evidence/proof to the Mediator or Arbitrator.\n\nIf you do not understand these requirements, do not trade using USPMO on Haveno.
-
 payment.payByMail.contact=Informação de contacto
 payment.payByMail.contact.prompt=Name or nym envelope should be addressed to
 payment.f2f.contact=Informação de contacto
@ -2009,7 +2007,6 @@ payment.shared.extraInfo.offer=Informações adicionais sobre a oferta
 payment.shared.extraInfo.prompt.paymentAccount=Defina quaisquer termos especiais, condições ou detalhes que você gostaria de exibir com suas ofertas para esta conta de pagamento (os usuários verão essas informações antes de aceitar as ofertas).
 payment.shared.extraInfo.prompt.offer=Defina quaisquer termos, condições ou detalhes especiais que você gostaria de exibir com sua oferta.
 payment.shared.extraInfo.noDeposit=Detalhes de contato e termos da oferta
-payment.f2f.info='Face to Face' trades have different rules and come with different risks than online transactions.\n\nThe main differences are:\n● The trading peers need to exchange information about the meeting location and time by using their provided contact details.\n● The trading peers need to bring their laptops and do the confirmation of 'payment sent' and 'payment received' at the meeting place.\n● If a maker has special 'terms and conditions' they must state those in the 'Additional information' text field in the account.\n● By taking an offer the taker agrees to the maker's stated 'terms and conditions'.\n● In case of a dispute the mediator or arbitrator cannot be of much assistance as it is usually difficult to get tamper-proof evidence of what happened at the meeting. In such cases the XMR funds might get locked indefinitely or until the trading peers come to an agreement.\n\nTo be sure you fully understand the differences with 'Face to Face' trades please read the instructions and recommendations at: [HYPERLINK:https://docs.haveno.exchange/trading-rules.html#f2f-trading]
 payment.f2f.info.openURL=Abrir página web
 payment.f2f.offerbook.tooltip.countryAndCity=País e cidade: {0} / {1}
 payment.shared.extraInfo.tooltip=Informação adicional: {0}
@ -2022,6 +2019,9 @@ payment.australia.payid=PayID
 payment.payid=PayID linked to financial institution. Like email address or mobile phone.
 payment.payid.info=A PayID like a phone number, email address or an Australian Business Number (ABN), that you can securely link to your bank, credit union or building society account. You need to have already created a PayID with your Australian financial institution. Both sending and receiving financial institutions must support PayID. For more information please check [HYPERLINK:https://payid.com.au/faqs/]
 payment.amazonGiftCard.info=To pay with Amazon eGift Card, you will need to send an Amazon eGift Card to the XMR seller via your Amazon account. \n\nHaveno will show the XMR seller''s email address or phone number where the gift card should be sent, and you must include the trade ID in the gift card''s message field. Please see the wiki [HYPERLINK:https://haveno.exchange/wiki/Amazon_eGift_card] for further details and best practices. \n\nThree important notes:\n- try to send gift cards with amounts of 100 USD or smaller, as Amazon is known to flag larger gift cards as fraudulent\n- try to use creative, believable text for the gift card''s message (e.g., "Happy birthday Susan!") along with the trade ID (and use trader chat to tell your trading peer the reference text you picked so they can verify your payment)\n- Amazon eGift Cards can only be redeemed on the Amazon website they were purchased on (e.g., a gift card purchased on amazon.it can only be redeemed on amazon.it)
+payment.paysafe.info=Para sua proteção, desaconselhamos fortemente o uso de PINs do Paysafecard para pagamento.\n\n\  
+  Transações feitas por PINs não podem ser verificadas de forma independente para resolução de disputas. Se ocorrer um problema, a recuperação dos fundos pode não ser possível.\n\n\  
+  Para garantir a segurança das transações com resolução de disputas, sempre use métodos de pagamento que forneçam registros verificáveis.


 # We use constants from the code so we do not use our normal naming convention
--- a/core/src/main/resources/i18n/displayStrings_ru.properties
+++ b/core/src/main/resources/i18n/displayStrings_ru.properties
@ -1996,8 +1996,6 @@ payment.amazonGiftCard.upgrade=Amazon gift cards payment method requires the cou
 payment.account.amazonGiftCard.addCountryInfo={0}\nYour existing Amazon Gift Card account ({1}) does not have a Country specified.\nPlease enter your Amazon Gift Card Country to update your account data.\nThis will not affect your account age status.
 payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account

-payment.usPostalMoneyOrder.info=Trading using US Postal Money Orders (USPMO) on Haveno requires that you understand the following:\n\n- XMR buyers must write the XMR Seller’s name in both the Payer and the Payee’s fields & take a high-resolution photo of the USPMO and envelope with proof of tracking before sending.\n- XMR buyers must send the USPMO to the XMR seller with Delivery Confirmation.\n\nIn the event mediation is necessary, or if there is a trade dispute, you will be required to send the photos to the Haveno mediator or refund agent, together with the USPMO Serial Number, Post Office Number, and dollar amount, so they can verify the details on the US Post Office website.\n\nFailure to provide the required information to the Mediator or Arbitrator will result in losing the dispute case.\n\nIn all dispute cases, the USPMO sender bears 100% of the burden of responsibility in providing evidence/proof to the Mediator or Arbitrator.\n\nIf you do not understand these requirements, do not trade using USPMO on Haveno.
-
 payment.payByMail.contact=Контактная информация
 payment.payByMail.contact.prompt=Name or nym envelope should be addressed to
 payment.f2f.contact=Контактная информация
@ -2023,6 +2021,9 @@ payment.australia.payid=PayID
 payment.payid=PayID linked to financial institution. Like email address or mobile phone.
 payment.payid.info=A PayID like a phone number, email address or an Australian Business Number (ABN), that you can securely link to your bank, credit union or building society account. You need to have already created a PayID with your Australian financial institution. Both sending and receiving financial institutions must support PayID. For more information please check [HYPERLINK:https://payid.com.au/faqs/]
 payment.amazonGiftCard.info=To pay with Amazon eGift Card, you will need to send an Amazon eGift Card to the XMR seller via your Amazon account. \n\nHaveno will show the XMR seller''s email address or phone number where the gift card should be sent, and you must include the trade ID in the gift card''s message field. Please see the wiki [HYPERLINK:https://haveno.exchange/wiki/Amazon_eGift_card] for further details and best practices. \n\nThree important notes:\n- try to send gift cards with amounts of 100 USD or smaller, as Amazon is known to flag larger gift cards as fraudulent\n- try to use creative, believable text for the gift card''s message (e.g., "Happy birthday Susan!") along with the trade ID (and use trader chat to tell your trading peer the reference text you picked so they can verify your payment)\n- Amazon eGift Cards can only be redeemed on the Amazon website they were purchased on (e.g., a gift card purchased on amazon.it can only be redeemed on amazon.it)
+payment.paysafe.info=Для вашей защиты мы настоятельно не рекомендуем использовать PIN-коды Paysafecard для платежей.\n\n\  
+  Транзакции, выполненные с помощью PIN-кодов, не могут быть независимо подтверждены для разрешения споров. В случае возникновения проблемы возврат средств может быть невозможен.\n\n\  
+  Чтобы обеспечить безопасность транзакций с возможностью разрешения споров, всегда используйте методы оплаты, предоставляющие проверяемые записи.


 # We use constants from the code so we do not use our normal naming convention
--- a/core/src/main/resources/i18n/displayStrings_th.properties
+++ b/core/src/main/resources/i18n/displayStrings_th.properties
@ -1996,8 +1996,6 @@ payment.amazonGiftCard.upgrade=Amazon gift cards payment method requires the cou
 payment.account.amazonGiftCard.addCountryInfo={0}\nYour existing Amazon Gift Card account ({1}) does not have a Country specified.\nPlease enter your Amazon Gift Card Country to update your account data.\nThis will not affect your account age status.
 payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account

-payment.usPostalMoneyOrder.info=Trading using US Postal Money Orders (USPMO) on Haveno requires that you understand the following:\n\n- XMR buyers must write the XMR Seller’s name in both the Payer and the Payee’s fields & take a high-resolution photo of the USPMO and envelope with proof of tracking before sending.\n- XMR buyers must send the USPMO to the XMR seller with Delivery Confirmation.\n\nIn the event mediation is necessary, or if there is a trade dispute, you will be required to send the photos to the Haveno mediator or refund agent, together with the USPMO Serial Number, Post Office Number, and dollar amount, so they can verify the details on the US Post Office website.\n\nFailure to provide the required information to the Mediator or Arbitrator will result in losing the dispute case.\n\nIn all dispute cases, the USPMO sender bears 100% of the burden of responsibility in providing evidence/proof to the Mediator or Arbitrator.\n\nIf you do not understand these requirements, do not trade using USPMO on Haveno.
-
 payment.payByMail.contact=ข้อมูลติดต่อ
 payment.payByMail.contact.prompt=Name or nym envelope should be addressed to
 payment.f2f.contact=ข้อมูลติดต่อ
@ -2010,7 +2008,6 @@ payment.shared.extraInfo.offer=ข้อมูลเพิ่มเติมเ
 payment.shared.extraInfo.prompt.paymentAccount=กำหนดคำศัพท์ เงื่อนไข หรือรายละเอียดพิเศษใดๆ ที่คุณต้องการให้แสดงพร้อมข้อเสนอของคุณสำหรับบัญชีการชำระเงินนี้ (ผู้ใช้จะเห็นข้อมูลนี้ก่อนที่จะยอมรับข้อเสนอ)
 payment.shared.extraInfo.prompt.offer=กำหนดเงื่อนไขพิเศษ ข้อกำหนด หรือรายละเอียดใด ๆ ที่คุณต้องการแสดงพร้อมกับข้อเสนอของคุณ
 payment.shared.extraInfo.noDeposit=รายละเอียดการติดต่อและเงื่อนไขข้อเสนอ
-payment.f2f.info='Face to Face' trades have different rules and come with different risks than online transactions.\n\nThe main differences are:\n● The trading peers need to exchange information about the meeting location and time by using their provided contact details.\n● The trading peers need to bring their laptops and do the confirmation of 'payment sent' and 'payment received' at the meeting place.\n● If a maker has special 'terms and conditions' they must state those in the 'Additional information' text field in the account.\n● By taking an offer the taker agrees to the maker's stated 'terms and conditions'.\n● In case of a dispute the mediator or arbitrator cannot be of much assistance as it is usually difficult to get tamper-proof evidence of what happened at the meeting. In such cases the XMR funds might get locked indefinitely or until the trading peers come to an agreement.\n\nTo be sure you fully understand the differences with 'Face to Face' trades please read the instructions and recommendations at: [HYPERLINK:https://docs.haveno.exchange/trading-rules.html#f2f-trading]
 payment.f2f.info.openURL=เปิดหน้าเว็บ
 payment.f2f.offerbook.tooltip.countryAndCity=Country and city: {0} / {1}
 payment.shared.extraInfo.tooltip=ข้อมูลเพิ่มเติม: {0}
@ -2023,6 +2020,9 @@ payment.australia.payid=PayID
 payment.payid=PayID linked to financial institution. Like email address or mobile phone.
 payment.payid.info=A PayID like a phone number, email address or an Australian Business Number (ABN), that you can securely link to your bank, credit union or building society account. You need to have already created a PayID with your Australian financial institution. Both sending and receiving financial institutions must support PayID. For more information please check [HYPERLINK:https://payid.com.au/faqs/]
 payment.amazonGiftCard.info=To pay with Amazon eGift Card, you will need to send an Amazon eGift Card to the XMR seller via your Amazon account. \n\nHaveno will show the XMR seller''s email address or phone number where the gift card should be sent, and you must include the trade ID in the gift card''s message field. Please see the wiki [HYPERLINK:https://haveno.exchange/wiki/Amazon_eGift_card] for further details and best practices. \n\nThree important notes:\n- try to send gift cards with amounts of 100 USD or smaller, as Amazon is known to flag larger gift cards as fraudulent\n- try to use creative, believable text for the gift card''s message (e.g., "Happy birthday Susan!") along with the trade ID (and use trader chat to tell your trading peer the reference text you picked so they can verify your payment)\n- Amazon eGift Cards can only be redeemed on the Amazon website they were purchased on (e.g., a gift card purchased on amazon.it can only be redeemed on amazon.it)
+payment.paysafe.info=เพื่อความปลอดภัยของคุณ เราขอแนะนำอย่างยิ่งให้หลีกเลี่ยงการใช้ Paysafecard PINs ในการชำระเงิน\n\n\  
+  ธุรกรรมที่ดำเนินการผ่าน PIN ไม่สามารถตรวจสอบได้อย่างอิสระสำหรับการระงับข้อพิพาท หากเกิดปัญหา อาจไม่สามารถกู้คืนเงินได้\n\n\  
+  เพื่อความปลอดภัยของธุรกรรมและรองรับการระงับข้อพิพาท โปรดใช้วิธีการชำระเงินที่มีบันทึกการทำธุรกรรมที่ตรวจสอบได้


 # We use constants from the code so we do not use our normal naming convention
--- a/core/src/main/resources/i18n/displayStrings_tr.properties
+++ b/core/src/main/resources/i18n/displayStrings_tr.properties
@ -3052,6 +3052,9 @@ payment.amazonGiftCard.info=Amazon eGift Kart ile ödeme yapmak için, Amazon he
  - hediye kartının mesajı için yaratıcı, inanılabilir bir metin kullanmaya çalışın (örneğin, "Doğum günün kutlu olsun Metin Torun!") ve ticaret \
  kimliğini ekleyin (ve ticaret sohbetinde ticaret eşinize seçtiğiniz referans metnini söyleyin, böylece ödemenizi doğrulayabilirler)\n\
  - Amazon eGift Kartları, yalnızca satın alındıkları Amazon web sitesinde kullanılabilir (örneğin, amazon.it üzerinden satın alınan bir hediye kartı yalnızca amazon.it üzerinde kullanılabilir)
+payment.paysafe.info=Sizin korumanız için, Paysafecard PIN'lerini ödeme için kullanmanızı kesinlikle önermiyoruz.\n\n\  
+  PIN'ler ile yapılan işlemler, ihtilaf çözümü için bağımsız olarak doğrulanamaz. Bir sorun oluşursa, fonların geri alınması mümkün olmayabilir.\n\n\  
+  İhtilaf çözümü ile işlem güvenliğini sağlamak için, her zaman doğrulanabilir kayıtlar sağlayan ödeme yöntemlerini kullanın.

 # We use constants from the code so we do not use our normal naming convention
 # dynamic values are not recognized by IntelliJ
--- a/core/src/main/resources/i18n/displayStrings_vi.properties
+++ b/core/src/main/resources/i18n/displayStrings_vi.properties
@ -1998,8 +1998,6 @@ payment.amazonGiftCard.upgrade=Amazon gift cards payment method requires the cou
 payment.account.amazonGiftCard.addCountryInfo={0}\nYour existing Amazon Gift Card account ({1}) does not have a Country specified.\nPlease enter your Amazon Gift Card Country to update your account data.\nThis will not affect your account age status.
 payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account

-payment.usPostalMoneyOrder.info=Trading using US Postal Money Orders (USPMO) on Haveno requires that you understand the following:\n\n- XMR buyers must write the XMR Seller’s name in both the Payer and the Payee’s fields & take a high-resolution photo of the USPMO and envelope with proof of tracking before sending.\n- XMR buyers must send the USPMO to the XMR seller with Delivery Confirmation.\n\nIn the event mediation is necessary, or if there is a trade dispute, you will be required to send the photos to the Haveno mediator or refund agent, together with the USPMO Serial Number, Post Office Number, and dollar amount, so they can verify the details on the US Post Office website.\n\nFailure to provide the required information to the Mediator or Arbitrator will result in losing the dispute case.\n\nIn all dispute cases, the USPMO sender bears 100% of the burden of responsibility in providing evidence/proof to the Mediator or Arbitrator.\n\nIf you do not understand these requirements, do not trade using USPMO on Haveno.
-
 payment.payByMail.contact=thông tin liên hệ
 payment.payByMail.contact.prompt=Name or nym envelope should be addressed to
 payment.f2f.contact=thông tin liên hệ
@ -2012,7 +2010,6 @@ payment.shared.extraInfo.offer=Thông tin bổ sung về ưu đãi
 payment.shared.extraInfo.prompt.paymentAccount=Xác định bất kỳ điều khoản, điều kiện hoặc chi tiết đặc biệt nào bạn muốn hiển thị cùng với các ưu đãi của mình cho tài khoản thanh toán này (người dùng sẽ thấy thông tin này trước khi chấp nhận các ưu đãi).
 payment.shared.extraInfo.prompt.offer=Xác định bất kỳ thuật ngữ, điều kiện hoặc chi tiết đặc biệt nào bạn muốn hiển thị cùng với đề nghị của mình.
 payment.shared.extraInfo.noDeposit=Chi tiết liên hệ và điều khoản ưu đãi
-payment.f2f.info='Face to Face' trades have different rules and come with different risks than online transactions.\n\nThe main differences are:\n● The trading peers need to exchange information about the meeting location and time by using their provided contact details.\n● The trading peers need to bring their laptops and do the confirmation of 'payment sent' and 'payment received' at the meeting place.\n● If a maker has special 'terms and conditions' they must state those in the 'Additional information' text field in the account.\n● By taking an offer the taker agrees to the maker's stated 'terms and conditions'.\n● In case of a dispute the mediator or arbitrator cannot be of much assistance as it is usually difficult to get tamper-proof evidence of what happened at the meeting. In such cases the XMR funds might get locked indefinitely or until the trading peers come to an agreement.\n\nTo be sure you fully understand the differences with 'Face to Face' trades please read the instructions and recommendations at: [HYPERLINK:https://docs.haveno.exchange/trading-rules.html#f2f-trading]
 payment.f2f.info.openURL=Mở trang web
 payment.f2f.offerbook.tooltip.countryAndCity=Country and city: {0} / {1}
 payment.shared.extraInfo.tooltip=Thông tin thêm: {0}
@ -2025,6 +2022,9 @@ payment.australia.payid=PayID
 payment.payid=PayID linked to financial institution. Like email address or mobile phone.
 payment.payid.info=A PayID like a phone number, email address or an Australian Business Number (ABN), that you can securely link to your bank, credit union or building society account. You need to have already created a PayID with your Australian financial institution. Both sending and receiving financial institutions must support PayID. For more information please check [HYPERLINK:https://payid.com.au/faqs/]
 payment.amazonGiftCard.info=To pay with Amazon eGift Card, you will need to send an Amazon eGift Card to the XMR seller via your Amazon account. \n\nHaveno will show the XMR seller''s email address or phone number where the gift card should be sent, and you must include the trade ID in the gift card''s message field. Please see the wiki [HYPERLINK:https://haveno.exchange/wiki/Amazon_eGift_card] for further details and best practices. \n\nThree important notes:\n- try to send gift cards with amounts of 100 USD or smaller, as Amazon is known to flag larger gift cards as fraudulent\n- try to use creative, believable text for the gift card''s message (e.g., "Happy birthday Susan!") along with the trade ID (and use trader chat to tell your trading peer the reference text you picked so they can verify your payment)\n- Amazon eGift Cards can only be redeemed on the Amazon website they were purchased on (e.g., a gift card purchased on amazon.it can only be redeemed on amazon.it)
+payment.paysafe.info=Vì sự bảo vệ của bạn, chúng tôi khuyến cáo không nên sử dụng mã PIN Paysafecard để thanh toán.\n\n\  
+  Các giao dịch được thực hiện bằng mã PIN không thể được xác minh độc lập để giải quyết tranh chấp. Nếu có vấn đề xảy ra, có thể không thể khôi phục số tiền đã mất.\n\n\  
+  Để đảm bảo an toàn giao dịch và có thể giải quyết tranh chấp, hãy luôn sử dụng các phương thức thanh toán có hồ sơ xác minh được.


 # We use constants from the code so we do not use our normal naming convention
--- a/core/src/main/resources/i18n/displayStrings_zh-hans.properties
+++ b/core/src/main/resources/i18n/displayStrings_zh-hans.properties
@ -2032,6 +2032,9 @@ payment.australia.payid=PayID
 payment.payid=PayID 需链接至金融机构。例如电子邮件地址或手机。
 payment.payid.info=PayID，如电话号码、电子邮件地址或澳大利亚商业号码（ABN），您可以安全地连接到您的银行、信用合作社或建立社会帐户。你需要在你的澳大利亚金融机构创建一个 PayID。发送和接收金融机构都必须支持 PayID。更多信息请查看[HYPERLINK:https://payid.com.au/faqs/]
 payment.amazonGiftCard.info=To pay with Amazon eGift Card, you will need to send an Amazon eGift Card to the XMR seller via your Amazon account. \n\nHaveno will show the XMR seller''s email address or phone number where the gift card should be sent, and you must include the trade ID in the gift card''s message field. Please see the wiki [HYPERLINK:https://haveno.exchange/wiki/Amazon_eGift_card] for further details and best practices. \n\nThree important notes:\n- try to send gift cards with amounts of 100 USD or smaller, as Amazon is known to flag larger gift cards as fraudulent\n- try to use creative, believable text for the gift card''s message (e.g., "Happy birthday Susan!") along with the trade ID (and use trader chat to tell your trading peer the reference text you picked so they can verify your payment)\n- Amazon eGift Cards can only be redeemed on the Amazon website they were purchased on (e.g., a gift card purchased on amazon.it can only be redeemed on amazon.it)
+payment.paysafe.info=为了保障您的安全，我们强烈不建议使用 Paysafecard PIN 进行支付。\n\n\  
+  通过 PIN 进行的交易无法被独立验证以解决争议。如果出现问题，资金可能无法追回。\n\n\  
+  为确保交易安全并支持争议解决，请始终使用提供可验证记录的支付方式。


 # We use constants from the code so we do not use our normal naming convention
--- a/core/src/main/resources/i18n/displayStrings_zh-hant.properties
+++ b/core/src/main/resources/i18n/displayStrings_zh-hant.properties
@ -2026,6 +2026,9 @@ payment.australia.payid=PayID
 payment.payid=PayID 需鏈接至金融機構。例如電子郵件地址或手機。
 payment.payid.info=PayID，如電話號碼、電子郵件地址或澳大利亞商業號碼（ABN），您可以安全地連接到您的銀行、信用合作社或建立社會帳户。你需要在你的澳大利亞金融機構創建一個 PayID。發送和接收金融機構都必須支持 PayID。更多信息請查看[HYPERLINK:https://payid.com.au/faqs/]
 payment.amazonGiftCard.info=To pay with Amazon eGift Card, you will need to send an Amazon eGift Card to the XMR seller via your Amazon account. \n\nHaveno will show the XMR seller''s email address or phone number where the gift card should be sent, and you must include the trade ID in the gift card''s message field. Please see the wiki [HYPERLINK:https://haveno.exchange/wiki/Amazon_eGift_card] for further details and best practices. \n\nThree important notes:\n- try to send gift cards with amounts of 100 USD or smaller, as Amazon is known to flag larger gift cards as fraudulent\n- try to use creative, believable text for the gift card''s message (e.g., "Happy birthday Susan!") along with the trade ID (and use trader chat to tell your trading peer the reference text you picked so they can verify your payment)\n- Amazon eGift Cards can only be redeemed on the Amazon website they were purchased on (e.g., a gift card purchased on amazon.it can only be redeemed on amazon.it)
+payment.paysafe.info=為了保護您的安全，我們強烈不建議使用 Paysafecard PIN 進行付款。\n\n\  
+  透過 PIN 進行的交易無法獨立驗證以進行爭議解決。如果發生問題，可能無法追回資金。\n\n\  
+  為確保交易安全並支持爭議解決，請始終使用可驗證記錄的付款方式。


 # We use constants from the code so we do not use our normal naming convention
--- a/desktop/src/main/java/haveno/desktop/components/paymentmethods/PaysafeForm.java
+++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/PaysafeForm.java
@ -0,0 +1,111 @@
+/*
+ * This file is part of Haveno.
+ *
+ * Haveno is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Haveno is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Haveno. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package haveno.desktop.components.paymentmethods;
+
+import haveno.core.account.witness.AccountAgeWitnessService;
+import haveno.core.locale.Res;
+import haveno.core.payment.PaymentAccount;
+import haveno.core.payment.PaysafeAccount;
+import haveno.core.payment.payload.PaysafeAccountPayload;
+import haveno.core.payment.payload.PaymentAccountPayload;
+import haveno.core.payment.validation.EmailValidator;
+import haveno.core.util.coin.CoinFormatter;
+import haveno.core.util.validation.InputValidator;
+import haveno.desktop.components.InputTextField;
+import haveno.desktop.util.FormBuilder;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.FlowPane;
+import javafx.scene.layout.GridPane;
+
+import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
+import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
+
+public class PaysafeForm extends PaymentMethodForm {
+    private final PaysafeAccount account;
+    private final EmailValidator validator = new EmailValidator();
+
+    public static int addFormForBuyer(GridPane gridPane, int gridRow,
+                                      PaymentAccountPayload paymentAccountPayload) {
+        addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, Res.get("payment.email"),
+                ((PaysafeAccountPayload) paymentAccountPayload).getEmail());
+        return gridRow;
+    }
+
+    public PaysafeForm(PaymentAccount paymentAccount, AccountAgeWitnessService accountAgeWitnessService,
+                            InputValidator inputValidator, GridPane gridPane,
+                            int gridRow, CoinFormatter formatter) {
+        super(paymentAccount, accountAgeWitnessService, inputValidator, gridPane, gridRow, formatter);
+        this.account = (PaysafeAccount) paymentAccount;
+    }
+
+    @Override
+    public void addFormForAddAccount() {
+        gridRowFrom = gridRow + 1;
+
+        InputTextField emailInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.email"));
+        emailInputTextField.setValidator(validator);
+        emailInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
+            account.setEmail(newValue.trim());
+            updateFromInputs();
+        });
+
+        addCurrenciesGrid(true);
+        addLimitations(false);
+        addAccountNameTextFieldWithAutoFillToggleButton();
+    }
+
+    private void addCurrenciesGrid(boolean isEditable) {
+        FlowPane flowPane = FormBuilder.addTopLabelFlowPane(gridPane, ++gridRow,
+                Res.get("payment.supportedCurrenciesForReceiver"), 20, 20).second;
+
+        if (isEditable) {
+            flowPane.setId("flow-pane-checkboxes-bg");
+        } else {
+            flowPane.setId("flow-pane-checkboxes-non-editable-bg");
+        }
+
+        paymentAccount.getSupportedCurrencies().forEach(currency ->
+                fillUpFlowPaneWithCurrencies(isEditable, flowPane, currency, account));
+    }
+
+    @Override
+    protected void autoFillNameTextField() {
+        setAccountNameWithString(account.getEmail());
+    }
+
+    @Override
+    public void addFormForEditAccount() {
+        gridRowFrom = gridRow;
+        addAccountNameTextFieldWithAutoFillToggleButton();
+        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"),
+                Res.get(account.getPaymentMethod().getId()));
+        TextField field = addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.email"),
+                account.getEmail()).second;
+        field.setMouseTransparent(false);
+        addLimitations(true);
+        addCurrenciesGrid(false);
+    }
+
+    @Override
+    public void updateAllInputsValid() {
+        allInputsValid.set(isAccountNameValid()
+                && account.getEmail() != null
+                && validator.validate(account.getEmail()).isValid
+                && account.getTradeCurrencies().size() > 0);
+    }
+}
--- a/desktop/src/main/java/haveno/desktop/main/account/content/traditionalaccounts/TraditionalAccountsView.java
+++ b/desktop/src/main/java/haveno/desktop/main/account/content/traditionalaccounts/TraditionalAccountsView.java
@ -38,6 +38,7 @@ import haveno.core.payment.PayByMailAccount;
 import haveno.core.payment.PayPalAccount;
 import haveno.core.payment.PaymentAccount;
 import haveno.core.payment.PaymentAccountFactory;
+import haveno.core.payment.PaysafeAccount;
 import haveno.core.payment.RevolutAccount;
 import haveno.core.payment.USPostalMoneyOrderAccount;
 import haveno.core.payment.VenmoAccount;
@ -103,6 +104,7 @@ import haveno.desktop.components.paymentmethods.PaxumForm;
 import haveno.desktop.components.paymentmethods.PayByMailForm;
 import haveno.desktop.components.paymentmethods.PayPalForm;
 import haveno.desktop.components.paymentmethods.PaymentMethodForm;
+import haveno.desktop.components.paymentmethods.PaysafeForm;
 import haveno.desktop.components.paymentmethods.PayseraForm;
 import haveno.desktop.components.paymentmethods.PaytmForm;
 import haveno.desktop.components.paymentmethods.PerfectMoneyForm;
@ -400,6 +402,13 @@ public class TraditionalAccountsView extends PaymentAccountsView<GridPane, Tradi
                                    .actionButtonText(Res.get("shared.iUnderstand"))
                                    .onAction(() -> doSaveNewAccount(paymentAccount))
                                    .show();
+                        } else if (paymentAccount instanceof PaysafeAccount) {
+                            new Popup().warning(Res.get("payment.paysafe.info"))
+                                    .width(700)
+                                    .closeButtonText(Res.get("shared.cancel"))
+                                    .actionButtonText(Res.get("shared.iUnderstand"))
+                                    .onAction(() -> doSaveNewAccount(paymentAccount))
+                                    .show();
                        } else {
                            doSaveNewAccount(paymentAccount);
                        }
@ -677,6 +686,8 @@ public class TraditionalAccountsView extends PaymentAccountsView<GridPane, Tradi
                return new VenmoForm(paymentAccount, accountAgeWitnessService, venmoValidator, inputValidator, root, gridRow, formatter);
            case PaymentMethod.CASH_APP_ID:
                return new CashAppForm(paymentAccount, accountAgeWitnessService, cashAppValidator, inputValidator, root, gridRow, formatter);
+            case PaymentMethod.PAYSAFE_ID:
+                return new PaysafeForm(paymentAccount, accountAgeWitnessService, inputValidator, root, gridRow, formatter);
            default:
                log.error("Not supported PaymentMethod: " + paymentMethod);
                return null;
--- a/desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBookViewModel.java
+++ b/desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBookViewModel.java
@ -643,9 +643,10 @@ abstract class OfferBookViewModel extends ActivatableViewModel {

    public boolean hasSelectionAccountSigning() {
        if (showAllTradeCurrenciesProperty.get()) {
-            if (!isShowAllEntry(selectedPaymentMethod.getId())) {
+            if (isShowAllEntry(selectedPaymentMethod.getId()))
+                return !(this instanceof CryptoOfferBookViewModel);
+            else
                return PaymentMethod.hasChargebackRisk(selectedPaymentMethod);
-            }
        } else {
            if (isShowAllEntry(selectedPaymentMethod.getId()))
                return CurrencyUtil.getMatureMarketCurrencies().stream()
@ -653,7 +654,6 @@ abstract class OfferBookViewModel extends ActivatableViewModel {
            else
                return PaymentMethod.hasChargebackRisk(selectedPaymentMethod, tradeCurrencyCode.get());
        }
-        return true;
    }

    private static String getDirectionWithCodeDetailed(OfferDirection direction, String currencyCode) {
--- a/desktop/src/main/java/haveno/desktop/main/overlays/Overlay.java
+++ b/desktop/src/main/java/haveno/desktop/main/overlays/Overlay.java
@ -394,7 +394,7 @@ public abstract class Overlay<T extends Overlay<T>> {

    public T useReportBugButton() {
        this.closeButtonText = Res.get("shared.reportBug");
-        this.closeHandlerOptional = Optional.of(() -> GUIUtil.openWebPage("https://haveno.exchange/source/haveno/issues"));
+        this.closeHandlerOptional = Optional.of(() -> GUIUtil.openWebPage("https://github.com/haveno-dex/haveno/issues"));
        return cast();
    }

@ -939,7 +939,7 @@ public abstract class Overlay<T extends Overlay<T>> {
        gitHubButton.setOnAction(event -> {
            if (message != null)
                Utilities.copyToClipboard(message);
-            GUIUtil.openWebPage("https://haveno.exchange/source/haveno/issues");
+            GUIUtil.openWebPage("https://github.com/haveno-dex/haveno/issues");
            hide();
        });
    }
--- a/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java
+++ b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java
@ -55,6 +55,7 @@ import haveno.desktop.components.paymentmethods.CashAppForm;
 import haveno.desktop.components.paymentmethods.CashAtAtmForm;
 import haveno.desktop.components.paymentmethods.PayByMailForm;
 import haveno.desktop.components.paymentmethods.PayPalForm;
+import haveno.desktop.components.paymentmethods.PaysafeForm;
 import haveno.desktop.components.paymentmethods.CashDepositForm;
 import haveno.desktop.components.paymentmethods.CelPayForm;
 import haveno.desktop.components.paymentmethods.ChaseQuickPayForm;
@ -417,6 +418,9 @@ public class BuyerStep2View extends TradeStepView {
            case PaymentMethod.VENMO_ID:
                gridRow = VenmoForm.addFormForBuyer(gridPane, gridRow, paymentAccountPayload);
                break;
+            case PaymentMethod.PAYSAFE_ID:
+                gridRow = PaysafeForm.addFormForBuyer(gridPane, gridRow, paymentAccountPayload);
+                break;
            default:
                log.error("Not supported PaymentMethod: " + paymentMethodId);
        }
--- a/proto/src/main/proto/pb.proto
+++ b/proto/src/main/proto/pb.proto
@ -876,13 +876,14 @@ message PaymentAccountPayload {
        PayByMailAccountPayload pay_by_mail_account_payload = 32;
        CapitualAccountPayload capitual_account_payload = 33;
        PayseraAccountPayload Paysera_account_payload = 34;
-        PaxumAccountPayload Paxum_account_payload = 35;
+        PaxumAccountPayload paxum_account_payload = 35;
        SwiftAccountPayload swift_account_payload = 36;
        CelPayAccountPayload cel_pay_account_payload = 37;
        MoneseAccountPayload monese_account_payload = 38;
        VerseAccountPayload verse_account_payload = 39;
        CashAtAtmAccountPayload cash_at_atm_account_payload = 40;
        PayPalAccountPayload paypal_account_payload = 41;
+        PaysafeAccountPayload paysafe_account_payload = 42;
    }
 }

@ -1073,6 +1074,7 @@ message MoneyBeamAccountPayload {
 message VenmoAccountPayload {
    string email_or_mobile_nr_or_username = 1;
 }
+
 message PayPalAccountPayload {
    string email_or_mobile_nr_or_username = 1;
    string extra_info = 2;
@ -1234,6 +1236,10 @@ message SwiftAccountPayload {
    string intermediary_address = 16;
 }

+message PaysafeAccountPayload {
+    string email = 1;
+}
+
 message PersistableEnvelope {
    oneof message {
        SequenceNumberMap sequence_number_map = 1;
@ -1888,6 +1894,7 @@ message PaymentAccountForm {
        CASH_APP = 16;
        PAYPAL = 17;
        VENMO = 18;
+        PAYSAFE = 19;
    }
    FormId id = 1;
    repeated PaymentAccountFormField fields = 2;