Merge branch 'master' of github.com:retoaccess1/haveno-reto into haveno-reto

Uploading new haveno logos

.github/workflows/build.yml

@@ -34,6 +34,7 @@ jobs:
       - name: cache nodes dependencies
         uses: actions/upload-artifact@v3
         with:
+          include-hidden-files: true
           name: cached-localnet
           path: .localnet
       - name: Install dependencies

README.md

@@ -25,11 +25,16 @@ See the [FAQ on our website](https://haveno.exchange/faq/) for more information.
 
 ## Installing Haveno
 
-Haveno can be installed on Linux, macOS, and Windows by using a third party installer and network. We do not endorse any networks at this time.
+Haveno can be installed on Linux, macOS, and Windows by using a third party installer and network.
+
+> [!note]
+> The official Haveno repository does not support making real trades directly.
+> 
+> To make real trades with Haveno, first find a third party network, and then use their installer or build their repository. We do not endorse any networks at this time.
 
 A test network is also available for users to make test trades using Monero's stagenet. See the [instructions](https://github.com/haveno-dex/haveno/blob/master/docs/installing.md) to build Haveno and connect to the test network.
 
-Alternatively, you can [start your own network](https://github.com/haveno-dex/haveno/blob/master/docs/create-mainnet.md).
+Alternatively, you can [create your own mainnet network](create-mainnet.md).
 
 Note that Haveno is being actively developed. If you find issues or bugs, please let us know.
 
@@ -47,7 +52,7 @@ If you wish to help, take a look at the repositories above and look for open iss
 Haveno is a community-driven project. For it to be successful it's fundamental to have the support and help of the community. Join the community rooms on our Matrix server:
 
 - General discussions: **Haveno** ([#haveno:monero.social](https://matrix.to/#/#haveno:monero.social)) relayed on IRC/Libera (`#haveno`)
-- Development discussions: **Haveno Development** ([#haveno-dev:monero.social](https://matrix.to/#/#haveno-dev:monero.social)) relayed on IRC/Libera (`#haveno-dev`)
+- Development discussions: **Haveno Development** ([#haveno-development:monero.social](https://matrix.to/#/#haveno-development:monero.social)) relayed on IRC/Libera (`#haveno-development`)
 
 Email: contact@haveno.exchange
 Website: [haveno.exchange](https://haveno.exchange)

apitest/src/test/java/haveno/apitest/method/MethodTest.java

@@ -43,7 +43,7 @@ import java.util.stream.Collectors;
 import static haveno.apitest.config.ApiTestConfig.BTC;
 import static haveno.apitest.config.ApiTestRateMeterInterceptorConfig.getTestRateMeterInterceptorConfig;
 import static haveno.cli.table.builder.TableType.BTC_BALANCE_TBL;
-import static haveno.core.xmr.wallet.Restrictions.getDefaultBuyerSecurityDepositAsPercent;
+import static haveno.core.xmr.wallet.Restrictions.getDefaultSecurityDepositAsPercent;
 import static java.lang.String.format;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Arrays.stream;
@@ -157,8 +157,8 @@ public class MethodTest extends ApiTestCase {
         return haveno.core.payment.PaymentAccount.fromProto(paymentAccount, CORE_PROTO_RESOLVER);
     }
 
-    public static final Supplier<Double> defaultBuyerSecurityDepositPct = () -> {
-        var defaultPct = BigDecimal.valueOf(getDefaultBuyerSecurityDepositAsPercent());
+    public static final Supplier<Double> defaultSecurityDepositPct = () -> {
+        var defaultPct = BigDecimal.valueOf(getDefaultSecurityDepositAsPercent());
         if (defaultPct.precision() != 2)
             throw new IllegalStateException(format(
                     "Unexpected decimal precision, expected 2 but actual is %d%n."

apitest/src/test/java/haveno/apitest/method/offer/CancelOfferTest.java

@@ -47,7 +47,7 @@ public class CancelOfferTest extends AbstractOfferTest {
                 10000000L,
                 10000000L,
                 0.00,
-                defaultBuyerSecurityDepositPct.get(),
+                defaultSecurityDepositPct.get(),
                 paymentAccountId,
                 NO_TRIGGER_PRICE);
     };

apitest/src/test/java/haveno/apitest/method/offer/CreateOfferUsingFixedPriceTest.java

@@ -49,7 +49,7 @@ public class CreateOfferUsingFixedPriceTest extends AbstractOfferTest {
                 10_000_000L,
                 10_000_000L,
                 "36000",
-                defaultBuyerSecurityDepositPct.get(),
+                defaultSecurityDepositPct.get(),
                 audAccount.getId());
         log.debug("Offer #1:\n{}", toOfferTable.apply(newOffer));
         assertTrue(newOffer.getIsMyOffer());
@@ -97,7 +97,7 @@ public class CreateOfferUsingFixedPriceTest extends AbstractOfferTest {
                 10_000_000L,
                 10_000_000L,
                 "30000.1234",
-                defaultBuyerSecurityDepositPct.get(),
+                defaultSecurityDepositPct.get(),
                 usdAccount.getId());
         log.debug("Offer #2:\n{}", toOfferTable.apply(newOffer));
         assertTrue(newOffer.getIsMyOffer());
@@ -145,7 +145,7 @@ public class CreateOfferUsingFixedPriceTest extends AbstractOfferTest {
                 10_000_000L,
                 5_000_000L,
                 "29500.1234",
-                defaultBuyerSecurityDepositPct.get(),
+                defaultSecurityDepositPct.get(),
                 eurAccount.getId());
         log.debug("Offer #3:\n{}", toOfferTable.apply(newOffer));
         assertTrue(newOffer.getIsMyOffer());

apitest/src/test/java/haveno/apitest/method/offer/CreateOfferUsingMarketPriceMarginTest.java

@@ -66,7 +66,7 @@ public class CreateOfferUsingMarketPriceMarginTest extends AbstractOfferTest {
                 10_000_000L,
                 10_000_000L,
                 priceMarginPctInput,
-                defaultBuyerSecurityDepositPct.get(),
+                defaultSecurityDepositPct.get(),
                 usdAccount.getId(),
                 NO_TRIGGER_PRICE);
         log.debug("Offer #1:\n{}", toOfferTable.apply(newOffer));
@@ -114,7 +114,7 @@ public class CreateOfferUsingMarketPriceMarginTest extends AbstractOfferTest {
                 10_000_000L,
                 10_000_000L,
                 priceMarginPctInput,
-                defaultBuyerSecurityDepositPct.get(),
+                defaultSecurityDepositPct.get(),
                 nzdAccount.getId(),
                 NO_TRIGGER_PRICE);
         log.debug("Offer #2:\n{}", toOfferTable.apply(newOffer));
@@ -162,7 +162,7 @@ public class CreateOfferUsingMarketPriceMarginTest extends AbstractOfferTest {
                 10_000_000L,
                 5_000_000L,
                 priceMarginPctInput,
-                defaultBuyerSecurityDepositPct.get(),
+                defaultSecurityDepositPct.get(),
                 gbpAccount.getId(),
                 NO_TRIGGER_PRICE);
         log.debug("Offer #3:\n{}", toOfferTable.apply(newOffer));
@@ -210,7 +210,7 @@ public class CreateOfferUsingMarketPriceMarginTest extends AbstractOfferTest {
                 10_000_000L,
                 5_000_000L,
                 priceMarginPctInput,
-                defaultBuyerSecurityDepositPct.get(),
+                defaultSecurityDepositPct.get(),
                 brlAccount.getId(),
                 NO_TRIGGER_PRICE);
         log.debug("Offer #4:\n{}", toOfferTable.apply(newOffer));
@@ -259,7 +259,7 @@ public class CreateOfferUsingMarketPriceMarginTest extends AbstractOfferTest {
                 10_000_000L,
                 5_000_000L,
                 0.0,
-                defaultBuyerSecurityDepositPct.get(),
+                defaultSecurityDepositPct.get(),
                 usdAccount.getId(),
                 triggerPrice);
         assertTrue(newOffer.getIsMyOffer());

apitest/src/test/java/haveno/apitest/method/offer/CreateXMROffersTest.java

@@ -62,7 +62,7 @@ public class CreateXMROffersTest extends AbstractOfferTest {
                 100_000_000L,
                 75_000_000L,
                 "0.005",   // FIXED PRICE IN BTC FOR 1 XMR
-                defaultBuyerSecurityDepositPct.get(),
+                defaultSecurityDepositPct.get(),
                 alicesXmrAcct.getId());
         log.debug("Sell XMR (Buy BTC) offer:\n{}", toOfferTable.apply(newOffer));
         assertTrue(newOffer.getIsMyOffer());
@@ -108,7 +108,7 @@ public class CreateXMROffersTest extends AbstractOfferTest {
                 100_000_000L,
                 50_000_000L,
                 "0.005",   // FIXED PRICE IN BTC (satoshis) FOR 1 XMR
-                defaultBuyerSecurityDepositPct.get(),
+                defaultSecurityDepositPct.get(),
                 alicesXmrAcct.getId());
         log.debug("Buy XMR (Sell BTC) offer:\n{}", toOfferTable.apply(newOffer));
         assertTrue(newOffer.getIsMyOffer());
@@ -156,7 +156,7 @@ public class CreateXMROffersTest extends AbstractOfferTest {
                 100_000_000L,
                 75_000_000L,
                 priceMarginPctInput,
-                defaultBuyerSecurityDepositPct.get(),
+                defaultSecurityDepositPct.get(),
                 alicesXmrAcct.getId(),
                 triggerPrice);
         log.debug("Pending Sell XMR (Buy BTC) offer:\n{}", toOfferTable.apply(newOffer));
@@ -211,7 +211,7 @@ public class CreateXMROffersTest extends AbstractOfferTest {
                 100_000_000L,
                 50_000_000L,
                 priceMarginPctInput,
-                defaultBuyerSecurityDepositPct.get(),
+                defaultSecurityDepositPct.get(),
                 alicesXmrAcct.getId(),
                 NO_TRIGGER_PRICE);
         log.debug("Buy XMR (Sell BTC) offer:\n{}", toOfferTable.apply(newOffer));

apitest/src/test/java/haveno/apitest/method/offer/ValidateCreateOfferTest.java

@@ -47,7 +47,7 @@ public class ValidateCreateOfferTest extends AbstractOfferTest {
                         100000000000L, // exceeds amount limit
                         100000000000L,
                         "10000.0000",
-                        defaultBuyerSecurityDepositPct.get(),
+                        defaultSecurityDepositPct.get(),
                         usdAccount.getId()));
         assertEquals("UNKNOWN: An error occurred at task: ValidateOffer", exception.getMessage());
     }
@@ -63,7 +63,7 @@ public class ValidateCreateOfferTest extends AbstractOfferTest {
                         10000000L,
                         10000000L,
                         "40000.0000",
-                        defaultBuyerSecurityDepositPct.get(),
+                        defaultSecurityDepositPct.get(),
                         chfAccount.getId()));
         String expectedError = format("UNKNOWN: cannot create EUR offer with payment account %s", chfAccount.getId());
         assertEquals(expectedError, exception.getMessage());
@@ -80,7 +80,7 @@ public class ValidateCreateOfferTest extends AbstractOfferTest {
                         10000000L,
                         10000000L,
                         "63000.0000",
-                        defaultBuyerSecurityDepositPct.get(),
+                        defaultSecurityDepositPct.get(),
                         audAccount.getId()));
         String expectedError = format("UNKNOWN: cannot create CAD offer with payment account %s", audAccount.getId());
         assertEquals(expectedError, exception.getMessage());

apitest/src/test/java/haveno/apitest/method/trade/TakeBuyBTCOfferTest.java

@@ -52,7 +52,7 @@ public class TakeBuyBTCOfferTest extends AbstractTradeTest {
                     12_500_000L,
                     12_500_000L, // min-amount = amount
                     0.00,
-                    defaultBuyerSecurityDepositPct.get(),
+                    defaultSecurityDepositPct.get(),
                     alicesUsdAccount.getId(),
                     NO_TRIGGER_PRICE);
             var offerId = alicesOffer.getId();

apitest/src/test/java/haveno/apitest/method/trade/TakeBuyBTCOfferWithNationalBankAcctTest.java

@@ -96,7 +96,7 @@ public class TakeBuyBTCOfferWithNationalBankAcctTest extends AbstractTradeTest {
                     1_000_000L,
                     1_000_000L, // min-amount = amount
                     0.00,
-                    defaultBuyerSecurityDepositPct.get(),
+                    defaultSecurityDepositPct.get(),
                     alicesPaymentAccount.getId(),
                     NO_TRIGGER_PRICE);
             var offerId = alicesOffer.getId();

apitest/src/test/java/haveno/apitest/method/trade/TakeBuyXMROfferTest.java

@@ -65,7 +65,7 @@ public class TakeBuyXMROfferTest extends AbstractTradeTest {
                     15_000_000L,
                     7_500_000L,
                     "0.00455500",   // FIXED PRICE IN BTC (satoshis) FOR 1 XMR
-                    defaultBuyerSecurityDepositPct.get(),
+                    defaultSecurityDepositPct.get(),
                     alicesXmrAcct.getId());
             log.debug("Alice's BUY XMR (SELL BTC) Offer:\n{}", new TableBuilder(OFFER_TBL, alicesOffer).build());
             genBtcBlocksThenWait(1, 5000);

apitest/src/test/java/haveno/apitest/method/trade/TakeSellBTCOfferTest.java

@@ -58,7 +58,7 @@ public class TakeSellBTCOfferTest extends AbstractTradeTest {
                     12_500_000L,
                     12_500_000L, // min-amount = amount
                     0.00,
-                    defaultBuyerSecurityDepositPct.get(),
+                    defaultSecurityDepositPct.get(),
                     alicesUsdAccount.getId(),
                     NO_TRIGGER_PRICE);
             var offerId = alicesOffer.getId();

apitest/src/test/java/haveno/apitest/method/trade/TakeSellXMROfferTest.java

@@ -71,7 +71,7 @@ public class TakeSellXMROfferTest extends AbstractTradeTest {
                     20_000_000L,
                     10_500_000L,
                     priceMarginPctInput,
-                    defaultBuyerSecurityDepositPct.get(),
+                    defaultSecurityDepositPct.get(),
                     alicesXmrAcct.getId(),
                     NO_TRIGGER_PRICE);
             log.debug("Alice's SELL XMR (BUY BTC) Offer:\n{}", new TableBuilder(OFFER_TBL, alicesOffer).build());

apitest/src/test/java/haveno/apitest/scenario/LongRunningOfferDeactivationTest.java

@@ -57,7 +57,7 @@ public class LongRunningOfferDeactivationTest extends AbstractOfferTest {
                 1_000_000,
                 1_000_000,
                 0.00,
-                defaultBuyerSecurityDepositPct.get(),
+                defaultSecurityDepositPct.get(),
                 paymentAcct.getId(),
                 triggerPrice);
         log.info("SELL offer {} created with margin based price {}.",
@@ -103,7 +103,7 @@ public class LongRunningOfferDeactivationTest extends AbstractOfferTest {
                 1_000_000,
                 1_000_000,
                 0.00,
-                defaultBuyerSecurityDepositPct.get(),
+                defaultSecurityDepositPct.get(),
                 paymentAcct.getId(),
                 triggerPrice);
         log.info("BUY offer {} created with margin based price {}.",

apitest/src/test/java/haveno/apitest/scenario/bot/RandomOffer.java

@@ -28,7 +28,7 @@ import java.text.DecimalFormat;
 import java.util.Objects;
 import java.util.function.Supplier;
 
-import static haveno.apitest.method.offer.AbstractOfferTest.defaultBuyerSecurityDepositPct;
+import static haveno.apitest.method.offer.AbstractOfferTest.defaultSecurityDepositPct;
 import static haveno.cli.CurrencyFormat.formatInternalFiatPrice;
 import static haveno.cli.CurrencyFormat.formatSatoshis;
 import static haveno.common.util.MathUtils.scaleDownByPowerOf10;
@@ -119,7 +119,7 @@ public class RandomOffer {
                         amount,
                         minAmount,
                         priceMargin,
-                        defaultBuyerSecurityDepositPct.get(),
+                        defaultSecurityDepositPct.get(),
                         "0" /*no trigger price*/);
             } else {
                 this.offer = botClient.createOfferAtFixedPrice(paymentAccount,
@@ -128,7 +128,7 @@ public class RandomOffer {
                         amount,
                         minAmount,
                         fixedOfferPrice,
-                        defaultBuyerSecurityDepositPct.get());
+                        defaultSecurityDepositPct.get());
             }
             this.id = offer.getId();
             return this;

assets/src/main/java/haveno/asset/tokens/USDCoinERC20.java

@@ -19,9 +19,9 @@ package haveno.asset.tokens;
 
 import haveno.asset.Erc20Token;
 
-public class USDCoin extends Erc20Token {
+public class USDCoinERC20 extends Erc20Token {
 
-    public USDCoin() {
-        super("USD Coin", "USDC");
+    public USDCoinERC20() {
+        super("USD Coin (ERC20)", "USDC-ERC20");
     }
 }

assets/src/main/resources/META-INF/services/haveno.asset.Asset

@@ -8,4 +8,5 @@ haveno.asset.coins.Ether
 haveno.asset.coins.Litecoin
 haveno.asset.coins.Monero
 haveno.asset.tokens.TetherUSDERC20
-haveno.asset.tokens.TetherUSDTRC20
+haveno.asset.tokens.TetherUSDTRC20
+haveno.asset.tokens.USDCoinERC20

build.gradle

@@ -610,7 +610,7 @@ configure(project(':desktop')) {
     apply plugin: 'com.github.johnrengelman.shadow'
     apply from: 'package/package.gradle'
 
-    version = '1.0.14-SNAPSHOT'
+    version = '1.0.15-SNAPSHOT'
 
     jar.manifest.attributes(
         "Implementation-Title": project.name,

cli/src/main/java/haveno/cli/request/OffersServiceRequest.java

@@ -81,7 +81,7 @@ public class OffersServiceRequest {
                 .setUseMarketBasedPrice(useMarketBasedPrice)
                 .setPrice(fixedPrice)
                 .setMarketPriceMarginPct(marketPriceMarginPct)
-                .setBuyerSecurityDepositPct(securityDepositPct)
+                .setSecurityDepositPct(securityDepositPct)
                 .setPaymentAccountId(paymentAcctId)
                 .setTriggerPrice(triggerPrice)
                 .build();

common/src/main/java/haveno/common/app/Capabilities.java

@@ -59,8 +59,10 @@ public class Capabilities {
     }
 
     public Capabilities(Collection<Capability> capabilities) {
-        synchronized (this.capabilities) {
-            this.capabilities.addAll(capabilities);
+        synchronized (capabilities) {
+            synchronized (this.capabilities) {
+                this.capabilities.addAll(capabilities);
+            }
         }
     }
 
@@ -73,9 +75,11 @@ public class Capabilities {
     }
 
     public void set(Collection<Capability> capabilities) {
-        synchronized (this.capabilities) {
-            this.capabilities.clear();
-            this.capabilities.addAll(capabilities);
+        synchronized (capabilities) {
+            synchronized (this.capabilities) {
+                this.capabilities.clear();
+                this.capabilities.addAll(capabilities);
+            }
         }
     }
 
@@ -87,15 +91,19 @@ public class Capabilities {
 
     public void addAll(Capabilities capabilities) {
         if (capabilities != null) {
-            synchronized (this.capabilities) {
-                this.capabilities.addAll(capabilities.capabilities);
+            synchronized (capabilities.capabilities) {
+                synchronized (this.capabilities) {
+                    this.capabilities.addAll(capabilities.capabilities);
+                }
             }
         }
     }
 
     public boolean containsAll(final Set<Capability> requiredItems) {
-        synchronized (this.capabilities) {
-            return capabilities.containsAll(requiredItems);
+        synchronized(requiredItems) {
+            synchronized (this.capabilities) {
+                return capabilities.containsAll(requiredItems);
+            }
         }
     }
 
@@ -129,7 +137,9 @@ public class Capabilities {
      * @return int list of Capability ordinals
      */
     public static List<Integer> toIntList(Capabilities capabilities) {
-        return capabilities.capabilities.stream().map(Enum::ordinal).sorted().collect(Collectors.toList());
+        synchronized (capabilities.capabilities) {
+            return capabilities.capabilities.stream().map(Enum::ordinal).sorted().collect(Collectors.toList());
+        }
     }
 
     /**
@@ -139,11 +149,13 @@ public class Capabilities {
      * @return a {@link Capabilities} object
      */
     public static Capabilities fromIntList(List<Integer> capabilities) {
-        return new Capabilities(capabilities.stream()
-                .filter(integer -> integer < Capability.values().length)
-                .filter(integer -> integer >= 0)
-                .map(integer -> Capability.values()[integer])
-                .collect(Collectors.toSet()));
+        synchronized (capabilities) {
+            return new Capabilities(capabilities.stream()
+                    .filter(integer -> integer < Capability.values().length)
+                    .filter(integer -> integer >= 0)
+                    .map(integer -> Capability.values()[integer])
+                    .collect(Collectors.toSet()));
+        }
     }
 
     /**
@@ -181,7 +193,9 @@ public class Capabilities {
     }
 
     public static boolean hasMandatoryCapability(Capabilities capabilities, Capability mandatoryCapability) {
-        return capabilities.capabilities.stream().anyMatch(c -> c == mandatoryCapability);
+        synchronized (capabilities.capabilities) {
+            return capabilities.capabilities.stream().anyMatch(c -> c == mandatoryCapability);
+        }
     }
 
     @Override
@@ -211,8 +225,10 @@ public class Capabilities {
     // Neither would support removal of past capabilities, a use case we never had so far and which might have
     // backward compatibility issues, so we should treat capabilities as an append-only data structure.
     public int findHighestCapability(Capabilities capabilities) {
-        return (int) capabilities.capabilities.stream()
-                .mapToLong(e -> (long) e.ordinal())
-                .sum();
+        synchronized (capabilities.capabilities) {
+            return (int) capabilities.capabilities.stream()
+                    .mapToLong(e -> (long) e.ordinal())
+                    .sum();
+        }
     }
 }

common/src/main/java/haveno/common/app/Version.java

@@ -28,7 +28,7 @@ import static com.google.common.base.Preconditions.checkArgument;
 public class Version {
     // The application versions
     // We use semantic versioning with major, minor and patch
-    public static final String VERSION = "1.0.14";
+    public static final String VERSION = "1.0.15";
 
     /**
      * Holds a list of the tagged resource files for optimizing the getData requests.

core/src/main/java/haveno/core/account/witness/AccountAgeWitnessService.java

@@ -40,6 +40,7 @@ import haveno.core.offer.OfferDirection;
 import haveno.core.offer.OfferRestrictions;
 import haveno.core.payment.ChargeBackRisk;
 import haveno.core.payment.PaymentAccount;
+import haveno.core.payment.TradeLimits;
 import haveno.core.payment.payload.PaymentAccountPayload;
 import haveno.core.payment.payload.PaymentMethod;
 import haveno.core.support.dispute.Dispute;
@@ -498,10 +499,15 @@ public class AccountAgeWitnessService {
         return getAccountAge(getMyWitness(paymentAccountPayload), new Date());
     }
 
-    public long getMyTradeLimit(PaymentAccount paymentAccount, String currencyCode, OfferDirection direction) {
+    public long getMyTradeLimit(PaymentAccount paymentAccount, String currencyCode, OfferDirection direction, boolean buyerAsTakerWithoutDeposit) {
         if (paymentAccount == null)
             return 0;
 
+        if (buyerAsTakerWithoutDeposit) {
+            TradeLimits tradeLimits = new TradeLimits();
+            return tradeLimits.getMaxTradeLimitBuyerAsTakerWithoutDeposit().longValueExact();
+        }
+
         AccountAgeWitness accountAgeWitness = getMyWitness(paymentAccount.getPaymentAccountPayload());
         BigInteger maxTradeLimit = paymentAccount.getPaymentMethod().getMaxTradeLimit(currencyCode);
         if (hasTradeLimitException(accountAgeWitness)) {

core/src/main/java/haveno/core/api/CoreApi.java

@@ -419,10 +419,12 @@ public class CoreApi {
                                    double marketPriceMargin,
                                    long amountAsLong,
                                    long minAmountAsLong,
-                                   double buyerSecurityDeposit,
+                                   double securityDepositPct,
                                    String triggerPriceAsString,
                                    boolean reserveExactAmount,
                                    String paymentAccountId,
+                                   boolean isPrivateOffer,
+                                   boolean buyerAsTakerWithoutDeposit,
                                    Consumer<Offer> resultHandler,
                                    ErrorMessageHandler errorMessageHandler) {
         coreOffersService.postOffer(currencyCode,
@@ -432,10 +434,12 @@ public class CoreApi {
                 marketPriceMargin,
                 amountAsLong,
                 minAmountAsLong,
-                buyerSecurityDeposit,
+                securityDepositPct,
                 triggerPriceAsString,
                 reserveExactAmount,
                 paymentAccountId,
+                isPrivateOffer,
+                buyerAsTakerWithoutDeposit,
                 resultHandler,
                 errorMessageHandler);
     }
@@ -448,8 +452,10 @@ public class CoreApi {
                            double marketPriceMargin,
                            BigInteger amount,
                            BigInteger minAmount,
-                           double buyerSecurityDeposit,
-                           PaymentAccount paymentAccount) {
+                           double securityDepositPct,
+                           PaymentAccount paymentAccount,
+                           boolean isPrivateOffer,
+                           boolean buyerAsTakerWithoutDeposit) {
         return coreOffersService.editOffer(offerId,
                 currencyCode,
                 direction,
@@ -458,8 +464,10 @@ public class CoreApi {
                 marketPriceMargin,
                 amount,
                 minAmount,
-                buyerSecurityDeposit,
-                paymentAccount);
+                securityDepositPct,
+                paymentAccount,
+                isPrivateOffer,
+                buyerAsTakerWithoutDeposit);
     }
 
     public void cancelOffer(String id, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
@@ -535,9 +543,11 @@ public class CoreApi {
     public void takeOffer(String offerId,
                           String paymentAccountId,
                           long amountAsLong,
+                          String challenge,
                           Consumer<Trade> resultHandler,
                           ErrorMessageHandler errorMessageHandler) {
         Offer offer = coreOffersService.getOffer(offerId);
+        offer.setChallenge(challenge);
         coreTradesService.takeOffer(offer, paymentAccountId, amountAsLong, resultHandler, errorMessageHandler);
     }
 

core/src/main/java/haveno/core/api/CoreDisputesService.java

@@ -62,11 +62,12 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 public class CoreDisputesService {
 
-    public enum DisputePayout {
+    // TODO: persist in DisputeResult?
+    public enum PayoutSuggestion {
         BUYER_GETS_TRADE_AMOUNT,
-        BUYER_GETS_ALL, // used in desktop
+        BUYER_GETS_ALL,
         SELLER_GETS_TRADE_AMOUNT,
-        SELLER_GETS_ALL, // used in desktop
+        SELLER_GETS_ALL,
         CUSTOM
     }
 
@@ -172,17 +173,17 @@ public class CoreDisputesService {
                 // create dispute result
                 var closeDate = new Date();
                 var winnerDisputeResult = createDisputeResult(winningDispute, winner, reason, summaryNotes, closeDate);
-                DisputePayout payout;
+                PayoutSuggestion payoutSuggestion;
                 if (customWinnerAmount > 0) {
-                    payout = DisputePayout.CUSTOM;
+                    payoutSuggestion = PayoutSuggestion.CUSTOM;
                 } else if (winner == DisputeResult.Winner.BUYER) {
-                    payout = DisputePayout.BUYER_GETS_TRADE_AMOUNT;
+                    payoutSuggestion = PayoutSuggestion.BUYER_GETS_TRADE_AMOUNT;
                 } else if (winner == DisputeResult.Winner.SELLER) {
-                    payout = DisputePayout.SELLER_GETS_TRADE_AMOUNT;
+                    payoutSuggestion = PayoutSuggestion.SELLER_GETS_TRADE_AMOUNT;
                 } else {
                     throw new IllegalStateException("Unexpected DisputeResult.Winner: " + winner);
                 }
-                applyPayoutAmountsToDisputeResult(payout, winningDispute, winnerDisputeResult, customWinnerAmount);
+                applyPayoutAmountsToDisputeResult(payoutSuggestion, winningDispute, winnerDisputeResult, customWinnerAmount);
 
                 // close winning dispute ticket
                 closeDisputeTicket(arbitrationManager, winningDispute, winnerDisputeResult, () -> {
@@ -227,26 +228,26 @@ public class CoreDisputesService {
      * Sets payout amounts given a payout type. If custom is selected, the winner gets a custom amount, and the peer
      * receives the remaining amount minus the mining fee.
      */
-    public void applyPayoutAmountsToDisputeResult(DisputePayout payout, Dispute dispute, DisputeResult disputeResult, long customWinnerAmount) {
+    public void applyPayoutAmountsToDisputeResult(PayoutSuggestion payoutSuggestion, Dispute dispute, DisputeResult disputeResult, long customWinnerAmount) {
         Contract contract = dispute.getContract();
         Trade trade = tradeManager.getTrade(dispute.getTradeId());
         BigInteger buyerSecurityDeposit = trade.getBuyer().getSecurityDeposit();
         BigInteger sellerSecurityDeposit = trade.getSeller().getSecurityDeposit();
         BigInteger tradeAmount = contract.getTradeAmount();
         disputeResult.setSubtractFeeFrom(DisputeResult.SubtractFeeFrom.BUYER_AND_SELLER);
-        if (payout == DisputePayout.BUYER_GETS_TRADE_AMOUNT) {
+        if (payoutSuggestion == PayoutSuggestion.BUYER_GETS_TRADE_AMOUNT) {
             disputeResult.setBuyerPayoutAmountBeforeCost(tradeAmount.add(buyerSecurityDeposit));
             disputeResult.setSellerPayoutAmountBeforeCost(sellerSecurityDeposit);
-        } else if (payout == DisputePayout.BUYER_GETS_ALL) {
+        } else if (payoutSuggestion == PayoutSuggestion.BUYER_GETS_ALL) {
             disputeResult.setBuyerPayoutAmountBeforeCost(tradeAmount.add(buyerSecurityDeposit).add(sellerSecurityDeposit)); // TODO (woodser): apply min payout to incentivize loser? (see post v1.1.7)
             disputeResult.setSellerPayoutAmountBeforeCost(BigInteger.ZERO);
-        } else if (payout == DisputePayout.SELLER_GETS_TRADE_AMOUNT) {
+        } else if (payoutSuggestion == PayoutSuggestion.SELLER_GETS_TRADE_AMOUNT) {
             disputeResult.setBuyerPayoutAmountBeforeCost(buyerSecurityDeposit);
             disputeResult.setSellerPayoutAmountBeforeCost(tradeAmount.add(sellerSecurityDeposit));
-        } else if (payout == DisputePayout.SELLER_GETS_ALL) {
+        } else if (payoutSuggestion == PayoutSuggestion.SELLER_GETS_ALL) {
             disputeResult.setBuyerPayoutAmountBeforeCost(BigInteger.ZERO);
             disputeResult.setSellerPayoutAmountBeforeCost(tradeAmount.add(sellerSecurityDeposit).add(buyerSecurityDeposit));
-        } else if (payout == DisputePayout.CUSTOM) {
+        } else if (payoutSuggestion == PayoutSuggestion.CUSTOM) {
             if (customWinnerAmount > trade.getWallet().getBalance().longValueExact()) throw new RuntimeException("Winner payout is more than the trade wallet's balance");
             long loserAmount = tradeAmount.add(buyerSecurityDeposit).add(sellerSecurityDeposit).subtract(BigInteger.valueOf(customWinnerAmount)).longValueExact();
             if (loserAmount < 0) throw new RuntimeException("Loser payout cannot be negative");

core/src/main/java/haveno/core/api/CoreOffersService.java

@@ -172,10 +172,12 @@ public class CoreOffersService {
                              double marketPriceMargin,
                              long amountAsLong,
                              long minAmountAsLong,
-                             double securityDeposit,
+                             double securityDepositPct,
                              String triggerPriceAsString,
                              boolean reserveExactAmount,
                              String paymentAccountId,
+                             boolean isPrivateOffer,
+                             boolean buyerAsTakerWithoutDeposit,
                              Consumer<Offer> resultHandler,
                              ErrorMessageHandler errorMessageHandler) {
         coreWalletsService.verifyWalletsAreAvailable();
@@ -199,8 +201,10 @@ public class CoreOffersService {
                 price,
                 useMarketBasedPrice,
                 exactMultiply(marketPriceMargin, 0.01),
-                securityDeposit,
-                paymentAccount);
+                securityDepositPct,
+                paymentAccount,
+                isPrivateOffer,
+                buyerAsTakerWithoutDeposit);
 
         verifyPaymentAccountIsValidForNewOffer(offer, paymentAccount);
 
@@ -223,8 +227,10 @@ public class CoreOffersService {
                     double marketPriceMargin,
                     BigInteger amount,
                     BigInteger minAmount,
-                    double buyerSecurityDeposit,
-                    PaymentAccount paymentAccount) {
+                    double securityDepositPct,
+                    PaymentAccount paymentAccount,
+                    boolean isPrivateOffer,
+                    boolean buyerAsTakerWithoutDeposit) {
         return createOfferService.createAndGetOffer(offerId,
                 direction,
                 currencyCode.toUpperCase(),
@@ -233,8 +239,10 @@ public class CoreOffersService {
                 price,
                 useMarketBasedPrice,
                 exactMultiply(marketPriceMargin, 0.01),
-                buyerSecurityDeposit,
-                paymentAccount);
+                securityDepositPct,
+                paymentAccount,
+                isPrivateOffer,
+                buyerAsTakerWithoutDeposit);
     }
 
     void cancelOffer(String id, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {

core/src/main/java/haveno/core/api/CoreTradesService.java

@@ -132,7 +132,7 @@ class CoreTradesService {
             // adjust amount for fixed-price offer (based on TakeOfferViewModel)
             String currencyCode = offer.getCurrencyCode();
             OfferDirection direction = offer.getOfferPayload().getDirection();
-            long maxTradeLimit = offerUtil.getMaxTradeLimit(paymentAccount, currencyCode, direction);
+            long maxTradeLimit = offerUtil.getMaxTradeLimit(paymentAccount, currencyCode, direction, offer.hasBuyerAsTakerWithoutDeposit());
             if (offer.getPrice() != null) {
                 if (PaymentMethod.isRoundedForAtmCash(paymentAccount.getPaymentMethod().getId())) {
                     amount = CoinUtil.getRoundedAtmCashAmount(amount, offer.getPrice(), maxTradeLimit);

core/src/main/java/haveno/core/api/XmrConnectionService.java

@@ -40,10 +40,10 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.exception.ExceptionUtils;
 
+import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.LongProperty;
 import javafx.beans.property.ObjectProperty;
@@ -51,6 +51,7 @@ import javafx.beans.property.ReadOnlyDoubleProperty;
 import javafx.beans.property.ReadOnlyIntegerProperty;
 import javafx.beans.property.ReadOnlyLongProperty;
 import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleLongProperty;
 import javafx.beans.property.SimpleObjectProperty;
@@ -64,7 +65,6 @@ import monero.common.MoneroRpcConnection;
 import monero.common.TaskLooper;
 import monero.daemon.MoneroDaemonRpc;
 import monero.daemon.model.MoneroDaemonInfo;
-import monero.daemon.model.MoneroPeer;
 
 @Slf4j
 @Singleton
@@ -85,12 +85,14 @@ public final class XmrConnectionService {
     private final XmrLocalNode xmrLocalNode;
     private final MoneroConnectionManager connectionManager;
     private final EncryptedConnectionList connectionList;
-    private final ObjectProperty<List<MoneroPeer>> peers = new SimpleObjectProperty<>();
+    private final ObjectProperty<List<MoneroRpcConnection>> connections = new SimpleObjectProperty<>();
+    private final IntegerProperty numConnections = new SimpleIntegerProperty(0);
     private final ObjectProperty<MoneroRpcConnection> connectionProperty = new SimpleObjectProperty<>();
-    private final IntegerProperty numPeers = new SimpleIntegerProperty(0);
     private final LongProperty chainHeight = new SimpleLongProperty(0);
     private final DownloadListener downloadListener = new DownloadListener();
     @Getter
+    private final BooleanProperty connectionServiceFallbackHandlerActive = new SimpleBooleanProperty();
+    @Getter
     private final StringProperty connectionServiceErrorMsg = new SimpleStringProperty();
     private final LongProperty numUpdates = new SimpleLongProperty(0);
     private Socks5ProxyProvider socks5ProxyProvider;
@@ -101,6 +103,7 @@ public final class XmrConnectionService {
     private Boolean isConnected = false;
     @Getter
     private MoneroDaemonInfo lastInfo;
+    private Long lastFallbackInvocation;
     private Long lastLogPollErrorTimestamp;
     private long lastLogDaemonNotSyncedTimestamp;
     private Long syncStartHeight;
@@ -117,6 +120,8 @@ public final class XmrConnectionService {
     private int numRequestsLastMinute;
     private long lastSwitchTimestamp;
     private Set<MoneroRpcConnection> excludedConnections = new HashSet<>();
+    private static final long FALLBACK_INVOCATION_PERIOD_MS = 1000 * 60 * 1; // offer to fallback up to once every minute
+    private boolean fallbackApplied;
 
     @Inject
     public XmrConnectionService(P2PService p2PService,
@@ -144,7 +149,7 @@ public final class XmrConnectionService {
         p2PService.addP2PServiceListener(new P2PServiceListener() {
             @Override
             public void onTorNodeReady() {
-                initialize();
+                ThreadUtils.submitToPool(() -> initialize());
             }
             @Override
             public void onHiddenServicePublished() {}
@@ -390,12 +395,12 @@ public final class XmrConnectionService {
 
     // ----------------------------- APP METHODS ------------------------------
 
-    public ReadOnlyIntegerProperty numPeersProperty() {
-        return numPeers;
+    public ReadOnlyIntegerProperty numConnectionsProperty() {
+        return numConnections;
     }
 
-    public ReadOnlyObjectProperty<List<MoneroPeer>> peerConnectionsProperty() {
-        return peers;
+    public ReadOnlyObjectProperty<List<MoneroRpcConnection>> connectionsProperty() {
+        return connections;
     }
 
     public ReadOnlyObjectProperty<MoneroRpcConnection> connectionProperty() {
@@ -403,7 +408,7 @@ public final class XmrConnectionService {
     }
 
     public boolean hasSufficientPeersForBroadcast() {
-        return numPeers.get() >= getMinBroadcastConnections();
+        return numConnections.get() >= getMinBroadcastConnections();
     }
 
     public LongProperty chainHeightProperty() {
@@ -426,6 +431,19 @@ public final class XmrConnectionService {
         return numUpdates;
     }
 
+    public void fallbackToBestConnection() {
+        if (isShutDownStarted) return;
+        if (xmrNodes.getProvidedXmrNodes().isEmpty()) {
+            log.warn("Falling back to public nodes");
+            preferences.setMoneroNodesOptionOrdinal(XmrNodes.MoneroNodesOption.PUBLIC.ordinal());
+        } else {
+            log.warn("Falling back to provided nodes");
+            preferences.setMoneroNodesOptionOrdinal(XmrNodes.MoneroNodesOption.PROVIDED.ordinal());
+        }
+        fallbackApplied = true;
+        initializeConnections();
+    }
+
     // ------------------------------- HELPERS --------------------------------
 
     private void doneDownload() {
@@ -535,7 +553,7 @@ public final class XmrConnectionService {
             }
 
             // restore connections
-            if ("".equals(config.xmrNode)) {
+            if (!isFixedConnection()) {
 
                 // load previous or default connections
                 if (coreContext.isApiUser()) {
@@ -571,10 +589,7 @@ public final class XmrConnectionService {
                 }
 
                 // restore last connection
-                if (isFixedConnection()) {
-                    if (getConnections().size() != 1) throw new IllegalStateException("Expected connection list to have 1 fixed connection but was: " + getConnections().size());
-                    connectionManager.setConnection(getConnections().get(0));
-                } else if (connectionList.getCurrentConnectionUri().isPresent() && connectionManager.hasConnection(connectionList.getCurrentConnectionUri().get())) {
+                if (connectionList.getCurrentConnectionUri().isPresent() && connectionManager.hasConnection(connectionList.getCurrentConnectionUri().get())) {
                     if (!xmrLocalNode.shouldBeIgnored() || !xmrLocalNode.equalsUri(connectionList.getCurrentConnectionUri().get())) {
                         connectionManager.setConnection(connectionList.getCurrentConnectionUri().get());
                     }
@@ -594,7 +609,7 @@ public final class XmrConnectionService {
                 maybeStartLocalNode();
 
                 // update connection
-                if (!isFixedConnection() && (connectionManager.getConnection() == null || connectionManager.getAutoSwitch())) {
+                if (connectionManager.getConnection() == null || connectionManager.getAutoSwitch()) {
                     MoneroRpcConnection bestConnection = getBestAvailableConnection();
                     if (bestConnection != null) setConnection(bestConnection);
                 }
@@ -616,6 +631,7 @@ public final class XmrConnectionService {
         }
 
         // notify initial connection
+        lastRefreshPeriodMs = getRefreshPeriodMs();
         onConnectionChanged(connectionManager.getConnection());
     }
 
@@ -718,16 +734,14 @@ public final class XmrConnectionService {
                     // skip handling if shutting down
                     if (isShutDownStarted) return;
 
-                    // fallback to provided or public nodes if custom connection fails on startup
-                    if (lastInfo == null && "".equals(config.xmrNode) && preferences.getMoneroNodesOption() == XmrNodes.MoneroNodesOption.CUSTOM) {
-                        if (xmrNodes.getProvidedXmrNodes().isEmpty()) {
-                            log.warn("Failed to fetch daemon info from custom node on startup, falling back to public nodes: " + e.getMessage());
-                            preferences.setMoneroNodesOptionOrdinal(XmrNodes.MoneroNodesOption.PUBLIC.ordinal());
-                        } else {
-                            log.warn("Failed to fetch daemon info from custom node on startup, falling back to provided nodes: " + e.getMessage());
-                            preferences.setMoneroNodesOptionOrdinal(XmrNodes.MoneroNodesOption.PROVIDED.ordinal());
+                    // invoke fallback handling on startup error
+                    boolean canFallback = isFixedConnection() || isCustomConnections();
+                    if (lastInfo == null && canFallback) {
+                        if (!connectionServiceFallbackHandlerActive.get() && (lastFallbackInvocation == null || System.currentTimeMillis() - lastFallbackInvocation > FALLBACK_INVOCATION_PERIOD_MS)) {
+                            log.warn("Failed to fetch daemon info from custom connection on startup: " + e.getMessage());
+                            lastFallbackInvocation = System.currentTimeMillis();
+                            connectionServiceFallbackHandlerActive.set(true);
                         }
-                        initializeConnections();
                         return;
                     }
 
@@ -782,16 +796,15 @@ public final class XmrConnectionService {
                         downloadListener.progress(percent, blocksLeft, null);
                     }
 
-                    // set peer connections
-                    // TODO: peers often uknown due to restricted RPC call, skipping call to get peer connections
-                    // try {
-                    //     peers.set(getOnlinePeers());
-                    // } catch (Exception err) {
-                    //     // TODO: peers unknown due to restricted RPC call
-                    // }
-                    // numPeers.set(peers.get().size());
-                    numPeers.set(lastInfo.getNumOutgoingConnections() + lastInfo.getNumIncomingConnections());
-                    peers.set(new ArrayList<MoneroPeer>());
+                    // set available connections
+                    List<MoneroRpcConnection> availableConnections = new ArrayList<>();
+                    for (MoneroRpcConnection connection : connectionManager.getConnections()) {
+                        if (Boolean.TRUE.equals(connection.isOnline()) && Boolean.TRUE.equals(connection.isAuthenticated())) {
+                            availableConnections.add(connection);
+                        }
+                    }
+                    connections.set(availableConnections);
+                    numConnections.set(availableConnections.size());
 
                     // notify update
                     numUpdates.set(numUpdates.get() + 1);
@@ -821,13 +834,11 @@ public final class XmrConnectionService {
         }
     }
 
-    private List<MoneroPeer> getOnlinePeers() {
-        return daemon.getPeers().stream()
-                .filter(peer -> peer.isOnline())
-                .collect(Collectors.toList());
+    private boolean isFixedConnection() {
+        return !"".equals(config.xmrNode) && !fallbackApplied;
     }
 
-    private boolean isFixedConnection() {
-        return !"".equals(config.xmrNode) || preferences.getMoneroNodesOption() == XmrNodes.MoneroNodesOption.CUSTOM;
+    private boolean isCustomConnections() {
+        return preferences.getMoneroNodesOption() == XmrNodes.MoneroNodesOption.CUSTOM;
     }
 }

core/src/main/java/haveno/core/api/model/OfferInfo.java

@@ -78,6 +78,8 @@ public class OfferInfo implements Payload {
     @Nullable
     private final String splitOutputTxHash;
     private final long splitOutputTxFee;
+    private final boolean isPrivateOffer;
+    private final String challenge;
 
     public OfferInfo(OfferInfoBuilder builder) {
         this.id = builder.getId();
@@ -111,6 +113,8 @@ public class OfferInfo implements Payload {
         this.arbitratorSigner = builder.getArbitratorSigner();
         this.splitOutputTxHash = builder.getSplitOutputTxHash();
         this.splitOutputTxFee = builder.getSplitOutputTxFee();
+        this.isPrivateOffer = builder.isPrivateOffer();
+        this.challenge = builder.getChallenge();
     }
 
     public static OfferInfo toOfferInfo(Offer offer) {
@@ -137,6 +141,7 @@ public class OfferInfo implements Payload {
                 .withIsActivated(isActivated)
                 .withSplitOutputTxHash(openOffer.getSplitOutputTxHash())
                 .withSplitOutputTxFee(openOffer.getSplitOutputTxFee())
+                .withChallenge(openOffer.getChallenge())
                 .build();
     }
 
@@ -177,7 +182,9 @@ public class OfferInfo implements Payload {
                 .withPubKeyRing(offer.getOfferPayload().getPubKeyRing().toString())
                 .withVersionNumber(offer.getOfferPayload().getVersionNr())
                 .withProtocolVersion(offer.getOfferPayload().getProtocolVersion())
-                .withArbitratorSigner(offer.getOfferPayload().getArbitratorSigner() == null ? null : offer.getOfferPayload().getArbitratorSigner().getFullAddress());
+                .withArbitratorSigner(offer.getOfferPayload().getArbitratorSigner() == null ? null : offer.getOfferPayload().getArbitratorSigner().getFullAddress())
+                .withIsPrivateOffer(offer.isPrivateOffer())
+                .withChallenge(offer.getChallenge());
     }
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -215,9 +222,11 @@ public class OfferInfo implements Payload {
                 .setPubKeyRing(pubKeyRing)
                 .setVersionNr(versionNumber)
                 .setProtocolVersion(protocolVersion)
-                .setSplitOutputTxFee(splitOutputTxFee);
+                .setSplitOutputTxFee(splitOutputTxFee)
+                .setIsPrivateOffer(isPrivateOffer);
         Optional.ofNullable(arbitratorSigner).ifPresent(builder::setArbitratorSigner);
         Optional.ofNullable(splitOutputTxHash).ifPresent(builder::setSplitOutputTxHash);
+        Optional.ofNullable(challenge).ifPresent(builder::setChallenge);
         return builder.build();
     }
 
@@ -255,6 +264,8 @@ public class OfferInfo implements Payload {
                 .withArbitratorSigner(proto.getArbitratorSigner())
                 .withSplitOutputTxHash(proto.getSplitOutputTxHash())
                 .withSplitOutputTxFee(proto.getSplitOutputTxFee())
+                .withIsPrivateOffer(proto.getIsPrivateOffer())
+                .withChallenge(proto.getChallenge())
                 .build();
     }
 }

core/src/main/java/haveno/core/api/model/TradeInfo.java

@@ -172,14 +172,14 @@ public class TradeInfo implements Payload {
                 .withAmount(trade.getAmount().longValueExact())
                 .withMakerFee(trade.getMakerFee().longValueExact())
                 .withTakerFee(trade.getTakerFee().longValueExact())
-                .withBuyerSecurityDeposit(trade.getBuyer().getSecurityDeposit() == null ? -1 : trade.getBuyer().getSecurityDeposit().longValueExact())
-                .withSellerSecurityDeposit(trade.getSeller().getSecurityDeposit() == null ? -1 : trade.getSeller().getSecurityDeposit().longValueExact())
-                .withBuyerDepositTxFee(trade.getBuyer().getDepositTxFee() == null ? -1 : trade.getBuyer().getDepositTxFee().longValueExact())
-                .withSellerDepositTxFee(trade.getSeller().getDepositTxFee() == null ? -1 : trade.getSeller().getDepositTxFee().longValueExact())
-                .withBuyerPayoutTxFee(trade.getBuyer().getPayoutTxFee() == null ? -1 : trade.getBuyer().getPayoutTxFee().longValueExact())
-                .withSellerPayoutTxFee(trade.getSeller().getPayoutTxFee() == null ? -1 : trade.getSeller().getPayoutTxFee().longValueExact())
-                .withBuyerPayoutAmount(trade.getBuyer().getPayoutAmount() == null ? -1 : trade.getBuyer().getPayoutAmount().longValueExact())
-                .withSellerPayoutAmount(trade.getSeller().getPayoutAmount() == null ? -1 : trade.getSeller().getPayoutAmount().longValueExact())
+                .withBuyerSecurityDeposit(trade.getBuyer().getSecurityDeposit().longValueExact())
+                .withSellerSecurityDeposit(trade.getSeller().getSecurityDeposit().longValueExact())
+                .withBuyerDepositTxFee(trade.getBuyer().getDepositTxFee().longValueExact())
+                .withSellerDepositTxFee(trade.getSeller().getDepositTxFee().longValueExact())
+                .withBuyerPayoutTxFee(trade.getBuyer().getPayoutTxFee().longValueExact())
+                .withSellerPayoutTxFee(trade.getSeller().getPayoutTxFee().longValueExact())
+                .withBuyerPayoutAmount(trade.getBuyer().getPayoutAmount().longValueExact())
+                .withSellerPayoutAmount(trade.getSeller().getPayoutAmount().longValueExact())
                 .withTotalTxFee(trade.getTotalTxFee().longValueExact())
                 .withPrice(toPreciseTradePrice.apply(trade))
                 .withVolume(toRoundedVolume.apply(trade))

core/src/main/java/haveno/core/api/model/builder/OfferInfoBuilder.java

@@ -63,6 +63,8 @@ public final class OfferInfoBuilder {
     private String arbitratorSigner;
     private String splitOutputTxHash;
     private long splitOutputTxFee;
+    private boolean isPrivateOffer;
+    private String challenge;
 
     public OfferInfoBuilder withId(String id) {
         this.id = id;
@@ -234,6 +236,16 @@ public final class OfferInfoBuilder {
         return this;
     }
 
+    public OfferInfoBuilder withIsPrivateOffer(boolean isPrivateOffer) {
+        this.isPrivateOffer = isPrivateOffer;
+        return this;
+    }
+
+    public OfferInfoBuilder withChallenge(String challenge) {
+        this.challenge = challenge;
+        return this;
+    }
+
     public OfferInfo build() {
         return new OfferInfo(this);
     }

core/src/main/java/haveno/core/app/AppStartupState.java

@@ -73,7 +73,7 @@ public class AppStartupState {
                 isWalletSynced.set(true);
         });
 
-        xmrConnectionService.numPeersProperty().addListener((observable, oldValue, newValue) -> {
+        xmrConnectionService.numConnectionsProperty().addListener((observable, oldValue, newValue) -> {
             if (xmrConnectionService.hasSufficientPeersForBroadcast())
                 hasSufficientPeersForBroadcast.set(true);
         });

core/src/main/java/haveno/core/app/HavenoHeadlessApp.java

@@ -75,6 +75,7 @@ public class HavenoHeadlessApp implements HeadlessApp {
             log.info("onDisplayTacHandler: We accept the tacs automatically in headless mode");
             acceptedHandler.run();
         });
+        havenoSetup.setDisplayMoneroConnectionFallbackHandler(show -> log.info("onDisplayMoneroConnectionFallbackHandler: show={}", show));
         havenoSetup.setDisplayTorNetworkSettingsHandler(show -> log.info("onDisplayTorNetworkSettingsHandler: show={}", show));
         havenoSetup.setChainFileLockedExceptionHandler(msg -> log.error("onChainFileLockedExceptionHandler: msg={}", msg));
         tradeManager.setLockedUpFundsHandler(msg -> log.info("onLockedUpFundsHandler: msg={}", msg));

core/src/main/java/haveno/core/app/HavenoSetup.java

@@ -158,6 +158,9 @@ public class HavenoSetup {
             rejectedTxErrorMessageHandler;
     @Setter
     @Nullable
+    private Consumer<Boolean> displayMoneroConnectionFallbackHandler;        
+    @Setter
+    @Nullable
     private Consumer<Boolean> displayTorNetworkSettingsHandler;
     @Setter
     @Nullable
@@ -426,6 +429,12 @@ public class HavenoSetup {
         getXmrDaemonSyncProgress().addListener((observable, oldValue, newValue) -> resetStartupTimeout());
         getXmrWalletSyncProgress().addListener((observable, oldValue, newValue) -> resetStartupTimeout());
 
+        // listen for fallback handling
+        getConnectionServiceFallbackHandlerActive().addListener((observable, oldValue, newValue) -> {
+            if (displayMoneroConnectionFallbackHandler == null) return;
+            displayMoneroConnectionFallbackHandler.accept(newValue);
+        });
+
         log.info("Init P2P network");
         havenoSetupListeners.forEach(HavenoSetupListener::onInitP2pNetwork);
         p2pNetworkReady = p2PNetworkSetup.init(this::initWallet, displayTorNetworkSettingsHandler);
@@ -725,6 +734,10 @@ public class HavenoSetup {
         return xmrConnectionService.getConnectionServiceErrorMsg();
     }
 
+    public BooleanProperty getConnectionServiceFallbackHandlerActive() {
+        return xmrConnectionService.getConnectionServiceFallbackHandlerActive();
+    }
+
     public StringProperty getTopErrorMsg() {
         return topErrorMsg;
     }

core/src/main/java/haveno/core/app/P2PNetworkSetup.java

@@ -87,7 +87,7 @@ public class P2PNetworkSetup {
         BooleanProperty initialP2PNetworkDataReceived = new SimpleBooleanProperty();
 
         p2PNetworkInfoBinding = EasyBind.combine(bootstrapState, bootstrapWarning, p2PService.getNumConnectedPeers(),
-                xmrConnectionService.numPeersProperty(), hiddenServicePublished, initialP2PNetworkDataReceived,
+                xmrConnectionService.numConnectionsProperty(), hiddenServicePublished, initialP2PNetworkDataReceived,
                 (state, warning, numP2pPeers, numXmrPeers, hiddenService, dataReceived) -> {
                     String result;
                     int p2pPeers = (int) numP2pPeers;

core/src/main/java/haveno/core/app/WalletAppSetup.java

@@ -120,7 +120,7 @@ public class WalletAppSetup {
               @Nullable Runnable showPopupIfInvalidBtcConfigHandler,
               Runnable downloadCompleteHandler,
               Runnable walletInitializedHandler) {
-        log.info("Initialize WalletAppSetup with monero-java version {}", MoneroUtils.getVersion());
+        log.info("Initialize WalletAppSetup with monero-java v{}", MoneroUtils.getVersion());
 
         ObjectProperty<Throwable> walletServiceException = new SimpleObjectProperty<>();
         xmrInfoBinding = EasyBind.combine(

core/src/main/java/haveno/core/locale/CurrencyUtil.java

@@ -201,6 +201,7 @@ public class CurrencyUtil {
         result.add(new CryptoCurrency("ETH", "Ether"));
         result.add(new CryptoCurrency("LTC", "Litecoin"));
         result.add(new CryptoCurrency("USDT-ERC20", "Tether USD (ERC20)"));
+        result.add(new CryptoCurrency("USDC-ERC20", "USD Coin (ERC20)"));
         result.sort(TradeCurrency::compareTo);
         return result;
     }
@@ -328,13 +329,14 @@ public class CurrencyUtil {
     private static boolean isCryptoCurrencyBase(String currencyCode) {
         if (currencyCode == null) return false;
         currencyCode = currencyCode.toUpperCase();
-        return currencyCode.equals("USDT");
+        return currencyCode.equals("USDT") || currencyCode.equals("USDC");
     }
 
     public static String getCurrencyCodeBase(String currencyCode) {
         if (currencyCode == null) return null;
         currencyCode = currencyCode.toUpperCase();
         if (currencyCode.contains("USDT")) return "USDT";
+        if (currencyCode.contains("USDC")) return "USDC";
         return currencyCode;
     }
 

core/src/main/java/haveno/core/offer/CreateOfferService.java

@@ -33,10 +33,8 @@ import haveno.core.provider.price.PriceFeedService;
 import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager;
 import haveno.core.trade.HavenoUtils;
 import haveno.core.trade.statistics.TradeStatisticsManager;
-import haveno.core.user.Preferences;
 import haveno.core.user.User;
 import haveno.core.util.coin.CoinUtil;
-import haveno.core.xmr.wallet.Restrictions;
 import haveno.core.xmr.wallet.XmrWalletService;
 import haveno.network.p2p.NodeAddress;
 import haveno.network.p2p.P2PService;
@@ -102,9 +100,10 @@ public class CreateOfferService {
                                    Price fixedPrice,
                                    boolean useMarketBasedPrice,
                                    double marketPriceMargin,
-                                   double securityDepositAsDouble,
-                                   PaymentAccount paymentAccount) {
-
+                                   double securityDepositPct,
+                                   PaymentAccount paymentAccount,
+                                   boolean isPrivateOffer,
+                                   boolean buyerAsTakerWithoutDeposit) {
         log.info("create and get offer with offerId={}, " +
                         "currencyCode={}, " +
                         "direction={}, " +
@@ -113,7 +112,9 @@ public class CreateOfferService {
                         "marketPriceMargin={}, " +
                         "amount={}, " +
                         "minAmount={}, " +
-                        "securityDeposit={}",
+                        "securityDepositPct={}, " +
+                        "isPrivateOffer={}, " +
+                        "buyerAsTakerWithoutDeposit={}",
                 offerId,
                 currencyCode,
                 direction,
@@ -122,7 +123,15 @@ public class CreateOfferService {
                 marketPriceMargin,
                 amount,
                 minAmount,
-                securityDepositAsDouble);
+                securityDepositPct,
+                isPrivateOffer,
+                buyerAsTakerWithoutDeposit);
+
+        // verify buyer as taker security deposit
+        boolean isBuyerMaker = offerUtil.isBuyOffer(direction);
+        if (!isBuyerMaker && !isPrivateOffer && buyerAsTakerWithoutDeposit) {
+            throw new IllegalArgumentException("Buyer as taker deposit is required for public offers");
+        }
 
         // verify fixed price xor market price with margin
         if (fixedPrice != null) {
@@ -143,10 +152,17 @@ public class CreateOfferService {
         }
 
         // adjust amount and min amount for fixed-price offer
-        long maxTradeLimit = offerUtil.getMaxTradeLimit(paymentAccount, currencyCode, direction);
         if (fixedPrice != null) {
-            amount = CoinUtil.getRoundedAmount(amount, fixedPrice, maxTradeLimit, currencyCode, paymentAccount.getPaymentMethod().getId());
-            minAmount = CoinUtil.getRoundedAmount(minAmount, fixedPrice, maxTradeLimit, currencyCode, paymentAccount.getPaymentMethod().getId());
+            amount = CoinUtil.getRoundedAmount(amount, fixedPrice, null, currencyCode, paymentAccount.getPaymentMethod().getId());
+            minAmount = CoinUtil.getRoundedAmount(minAmount, fixedPrice, null, currencyCode, paymentAccount.getPaymentMethod().getId());
+        }
+
+        // generate one-time challenge for private offer
+        String challenge = null;
+        String challengeHash = null;
+        if (isPrivateOffer) {
+            challenge = HavenoUtils.generateChallenge();
+            challengeHash = HavenoUtils.getChallengeHash(challenge);
         }
 
         long priceAsLong = fixedPrice != null ? fixedPrice.getValue() : 0L;
@@ -161,21 +177,16 @@ public class CreateOfferService {
         String bankId = PaymentAccountUtil.getBankId(paymentAccount);
         List<String> acceptedBanks = PaymentAccountUtil.getAcceptedBanks(paymentAccount);
         long maxTradePeriod = paymentAccount.getMaxTradePeriod();
-
-        // reserved for future use cases
-        // Use null values if not set
-        boolean isPrivateOffer = false;
+        boolean hasBuyerAsTakerWithoutDeposit = !isBuyerMaker && isPrivateOffer && buyerAsTakerWithoutDeposit;
+        long maxTradeLimit = offerUtil.getMaxTradeLimit(paymentAccount, currencyCode, direction, hasBuyerAsTakerWithoutDeposit);
         boolean useAutoClose = false;
         boolean useReOpenAfterAutoClose = false;
         long lowerClosePrice = 0;
         long upperClosePrice = 0;
-        String hashOfChallenge = null;
-        Map<String, String> extraDataMap = offerUtil.getExtraDataMap(paymentAccount,
-                currencyCode,
-                direction);
+        Map<String, String> extraDataMap = offerUtil.getExtraDataMap(paymentAccount, currencyCode, direction);
 
         offerUtil.validateOfferData(
-                securityDepositAsDouble,
+                securityDepositPct,
                 paymentAccount,
                 currencyCode);
 
@@ -189,11 +200,11 @@ public class CreateOfferService {
                 useMarketBasedPriceValue,
                 amountAsLong,
                 minAmountAsLong,
-                HavenoUtils.MAKER_FEE_PCT,
-                HavenoUtils.TAKER_FEE_PCT,
+                hasBuyerAsTakerWithoutDeposit ? HavenoUtils.MAKER_FEE_FOR_TAKER_WITHOUT_DEPOSIT_PCT : HavenoUtils.MAKER_FEE_PCT,
+                hasBuyerAsTakerWithoutDeposit ? 0d : HavenoUtils.TAKER_FEE_PCT,
                 HavenoUtils.PENALTY_FEE_PCT,
-                securityDepositAsDouble,
-                securityDepositAsDouble,
+                hasBuyerAsTakerWithoutDeposit ? 0d : securityDepositPct, // buyer as taker security deposit is optional for private offers
+                securityDepositPct,
                 baseCurrencyCode,
                 counterCurrencyCode,
                 paymentAccount.getPaymentMethod().getId(),
@@ -211,7 +222,7 @@ public class CreateOfferService {
                 upperClosePrice,
                 lowerClosePrice,
                 isPrivateOffer,
-                hashOfChallenge,
+                challengeHash,
                 extraDataMap,
                 Version.TRADE_PROTOCOL_VERSION,
                 null,
@@ -219,38 +230,10 @@ public class CreateOfferService {
                 null);
         Offer offer = new Offer(offerPayload);
         offer.setPriceFeedService(priceFeedService);
+        offer.setChallenge(challenge);
         return offer;
     }
 
-    public BigInteger getReservedFundsForOffer(OfferDirection direction,
-                                         BigInteger amount,
-                                         double buyerSecurityDeposit,
-                                         double sellerSecurityDeposit) {
-
-        BigInteger reservedFundsForOffer = getSecurityDeposit(direction,
-                amount,
-                buyerSecurityDeposit,
-                sellerSecurityDeposit);
-        if (!offerUtil.isBuyOffer(direction))
-            reservedFundsForOffer = reservedFundsForOffer.add(amount);
-
-        return reservedFundsForOffer;
-    }
-
-    public BigInteger getSecurityDeposit(OfferDirection direction,
-                                   BigInteger amount,
-                                   double buyerSecurityDeposit,
-                                   double sellerSecurityDeposit) {
-        return offerUtil.isBuyOffer(direction) ?
-                getBuyerSecurityDeposit(amount, buyerSecurityDeposit) :
-                getSellerSecurityDeposit(amount, sellerSecurityDeposit);
-    }
-
-    public double getSellerSecurityDepositAsDouble(double buyerSecurityDeposit) {
-        return Preferences.USE_SYMMETRIC_SECURITY_DEPOSIT ? buyerSecurityDeposit :
-                Restrictions.getSellerSecurityDepositAsPercent();
-    }
-
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Private
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -259,26 +242,4 @@ public class CreateOfferService {
         MarketPrice marketPrice = priceFeedService.getMarketPrice(currencyCode);
         return marketPrice != null && marketPrice.isExternallyProvidedPrice();
     }
-
-    private BigInteger getBuyerSecurityDeposit(BigInteger amount, double buyerSecurityDeposit) {
-        BigInteger percentOfAmount = CoinUtil.getPercentOfAmount(buyerSecurityDeposit, amount);
-        return getBoundedBuyerSecurityDeposit(percentOfAmount);
-    }
-
-    private BigInteger getSellerSecurityDeposit(BigInteger amount, double sellerSecurityDeposit) {
-        BigInteger percentOfAmount = CoinUtil.getPercentOfAmount(sellerSecurityDeposit, amount);
-        return getBoundedSellerSecurityDeposit(percentOfAmount);
-    }
-
-    private BigInteger getBoundedBuyerSecurityDeposit(BigInteger value) {
-        // We need to ensure that for small amount values we don't get a too low BTC amount. We limit it with using the
-        // MinBuyerSecurityDeposit from Restrictions.
-        return Restrictions.getMinBuyerSecurityDeposit().max(value);
-    }
-
-    private BigInteger getBoundedSellerSecurityDeposit(BigInteger value) {
-        // We need to ensure that for small amount values we don't get a too low BTC amount. We limit it with using the
-        // MinSellerSecurityDeposit from Restrictions.
-        return Restrictions.getMinSellerSecurityDeposit().max(value);
-    }
 }

core/src/main/java/haveno/core/offer/Offer.java

@@ -115,6 +115,12 @@ public class Offer implements NetworkPayload, PersistablePayload {
     @Setter
     transient private boolean isReservedFundsSpent;
 
+    @JsonExclude
+    @Getter
+    @Setter
+    @Nullable
+    transient private String challenge;
+
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Constructor
@@ -337,6 +343,18 @@ public class Offer implements NetworkPayload, PersistablePayload {
         return offerPayload.getSellerSecurityDepositPct();
     }
 
+    public boolean isPrivateOffer() {
+        return offerPayload.isPrivateOffer();
+    }
+
+    public String getChallengeHash() {
+        return offerPayload.getChallengeHash();
+    }
+
+    public boolean hasBuyerAsTakerWithoutDeposit() {
+        return getDirection() == OfferDirection.SELL && getBuyerSecurityDepositPct() == 0;
+    }
+
     public BigInteger getMaxTradeLimit() {
         return BigInteger.valueOf(offerPayload.getMaxTradeLimit());
     }

core/src/main/java/haveno/core/offer/OfferFilterService.java

@@ -201,7 +201,7 @@ public class OfferFilterService {
                 accountAgeWitnessService);
         long myTradeLimit = accountOptional
                 .map(paymentAccount -> accountAgeWitnessService.getMyTradeLimit(paymentAccount,
-                        offer.getCurrencyCode(), offer.getMirroredDirection()))
+                        offer.getCurrencyCode(), offer.getMirroredDirection(), offer.hasBuyerAsTakerWithoutDeposit()))
                 .orElse(0L);
         long offerMinAmount = offer.getMinAmount().longValueExact();
         log.debug("isInsufficientTradeLimit accountOptional={}, myTradeLimit={}, offerMinAmount={}, ",

core/src/main/java/haveno/core/offer/OfferPayload.java

@@ -156,7 +156,7 @@ public final class OfferPayload implements ProtectedStoragePayload, ExpirablePay
     // Reserved for possible future use to support private trades where the taker needs to have an accessKey
     private final boolean isPrivateOffer;
     @Nullable
-    private final String hashOfChallenge;
+    private final String challengeHash;
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -195,7 +195,7 @@ public final class OfferPayload implements ProtectedStoragePayload, ExpirablePay
                         long lowerClosePrice,
                         long upperClosePrice,
                         boolean isPrivateOffer,
-                        @Nullable String hashOfChallenge,
+                        @Nullable String challengeHash,
                         @Nullable Map<String, String> extraDataMap,
                         int protocolVersion,
                         @Nullable NodeAddress arbitratorSigner,
@@ -238,7 +238,7 @@ public final class OfferPayload implements ProtectedStoragePayload, ExpirablePay
         this.lowerClosePrice = lowerClosePrice;
         this.upperClosePrice = upperClosePrice;
         this.isPrivateOffer = isPrivateOffer;
-        this.hashOfChallenge = hashOfChallenge;
+        this.challengeHash = challengeHash;
     }
 
     public byte[] getHash() {
@@ -284,7 +284,7 @@ public final class OfferPayload implements ProtectedStoragePayload, ExpirablePay
             lowerClosePrice,
             upperClosePrice,
             isPrivateOffer,
-            hashOfChallenge,
+            challengeHash,
             extraDataMap,
             protocolVersion,
             arbitratorSigner,
@@ -328,12 +328,17 @@ public final class OfferPayload implements ProtectedStoragePayload, ExpirablePay
 
     public BigInteger getBuyerSecurityDepositForTradeAmount(BigInteger tradeAmount) {
         BigInteger securityDepositUnadjusted = HavenoUtils.multiply(tradeAmount, getBuyerSecurityDepositPct());
-        return Restrictions.getMinBuyerSecurityDeposit().max(securityDepositUnadjusted);
+        boolean isBuyerTaker = getDirection() == OfferDirection.SELL;
+        if (isPrivateOffer() && isBuyerTaker) {
+            return securityDepositUnadjusted;
+        } else {
+            return Restrictions.getMinSecurityDeposit().max(securityDepositUnadjusted);
+        }
     }
 
     public BigInteger getSellerSecurityDepositForTradeAmount(BigInteger tradeAmount) {
         BigInteger securityDepositUnadjusted = HavenoUtils.multiply(tradeAmount, getSellerSecurityDepositPct());
-        return Restrictions.getMinSellerSecurityDeposit().max(securityDepositUnadjusted);
+        return Restrictions.getMinSecurityDeposit().max(securityDepositUnadjusted);
     }
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -376,7 +381,7 @@ public final class OfferPayload implements ProtectedStoragePayload, ExpirablePay
         Optional.ofNullable(bankId).ifPresent(builder::setBankId);
         Optional.ofNullable(acceptedBankIds).ifPresent(builder::addAllAcceptedBankIds);
         Optional.ofNullable(acceptedCountryCodes).ifPresent(builder::addAllAcceptedCountryCodes);
-        Optional.ofNullable(hashOfChallenge).ifPresent(builder::setHashOfChallenge);
+        Optional.ofNullable(challengeHash).ifPresent(builder::setChallengeHash);
         Optional.ofNullable(extraDataMap).ifPresent(builder::putAllExtraData);
         Optional.ofNullable(arbitratorSigner).ifPresent(e -> builder.setArbitratorSigner(arbitratorSigner.toProtoMessage()));
         Optional.ofNullable(arbitratorSignature).ifPresent(e -> builder.setArbitratorSignature(ByteString.copyFrom(e)));
@@ -392,7 +397,7 @@ public final class OfferPayload implements ProtectedStoragePayload, ExpirablePay
                 null : new ArrayList<>(proto.getAcceptedCountryCodesList());
         List<String> reserveTxKeyImages = proto.getReserveTxKeyImagesList().isEmpty() ?
                 null : new ArrayList<>(proto.getReserveTxKeyImagesList());
-        String hashOfChallenge = ProtoUtil.stringOrNullFromProto(proto.getHashOfChallenge());
+        String challengeHash = ProtoUtil.stringOrNullFromProto(proto.getChallengeHash());
         Map<String, String> extraDataMapMap = CollectionUtils.isEmpty(proto.getExtraDataMap()) ?
                 null : proto.getExtraDataMap();
 
@@ -428,7 +433,7 @@ public final class OfferPayload implements ProtectedStoragePayload, ExpirablePay
                 proto.getLowerClosePrice(),
                 proto.getUpperClosePrice(),
                 proto.getIsPrivateOffer(),
-                hashOfChallenge,
+                challengeHash,
                 extraDataMapMap,
                 proto.getProtocolVersion(),
                 proto.hasArbitratorSigner() ? NodeAddress.fromProto(proto.getArbitratorSigner()) : null,
@@ -475,7 +480,7 @@ public final class OfferPayload implements ProtectedStoragePayload, ExpirablePay
                 ",\r\n     lowerClosePrice=" + lowerClosePrice +
                 ",\r\n     upperClosePrice=" + upperClosePrice +
                 ",\r\n     isPrivateOffer=" + isPrivateOffer +
-                ",\r\n     hashOfChallenge='" + hashOfChallenge + '\'' +
+                ",\r\n     challengeHash='" + challengeHash + '\'' +
                 ",\r\n     arbitratorSigner=" + arbitratorSigner +
                 ",\r\n     arbitratorSignature=" + Utilities.bytesAsHexString(arbitratorSignature) +
                 "\r\n} ";

core/src/main/java/haveno/core/offer/OfferUtil.java

@@ -58,8 +58,8 @@ import haveno.core.trade.statistics.ReferralIdService;
 import haveno.core.user.AutoConfirmSettings;
 import haveno.core.user.Preferences;
 import haveno.core.util.coin.CoinFormatter;
-import static haveno.core.xmr.wallet.Restrictions.getMaxBuyerSecurityDepositAsPercent;
-import static haveno.core.xmr.wallet.Restrictions.getMinBuyerSecurityDepositAsPercent;
+import static haveno.core.xmr.wallet.Restrictions.getMaxSecurityDepositAsPercent;
+import static haveno.core.xmr.wallet.Restrictions.getMinSecurityDepositAsPercent;
 import haveno.network.p2p.P2PService;
 import java.math.BigInteger;
 import java.util.HashMap;
@@ -120,9 +120,10 @@ public class OfferUtil {
 
     public long getMaxTradeLimit(PaymentAccount paymentAccount,
                                  String currencyCode,
-                                 OfferDirection direction) {
+                                 OfferDirection direction,
+                                 boolean buyerAsTakerWithoutDeposit) {
         return paymentAccount != null
-                ? accountAgeWitnessService.getMyTradeLimit(paymentAccount, currencyCode, direction)
+                ? accountAgeWitnessService.getMyTradeLimit(paymentAccount, currencyCode, direction, buyerAsTakerWithoutDeposit)
                 : 0;
     }
 
@@ -228,16 +229,16 @@ public class OfferUtil {
         return extraDataMap.isEmpty() ? null : extraDataMap;
     }
 
-    public void validateOfferData(double buyerSecurityDeposit,
+    public void validateOfferData(double securityDeposit,
                                   PaymentAccount paymentAccount,
                                   String currencyCode) {
         checkNotNull(p2PService.getAddress(), "Address must not be null");
-        checkArgument(buyerSecurityDeposit <= getMaxBuyerSecurityDepositAsPercent(),
+        checkArgument(securityDeposit <= getMaxSecurityDepositAsPercent(),
                 "securityDeposit must not exceed " +
-                        getMaxBuyerSecurityDepositAsPercent());
-        checkArgument(buyerSecurityDeposit >= getMinBuyerSecurityDepositAsPercent(),
+                        getMaxSecurityDepositAsPercent());
+        checkArgument(securityDeposit >= getMinSecurityDepositAsPercent(),
                 "securityDeposit must not be less than " +
-                        getMinBuyerSecurityDepositAsPercent() + " but was " + buyerSecurityDeposit);
+                        getMinSecurityDepositAsPercent() + " but was " + securityDeposit);
         checkArgument(!filterManager.isCurrencyBanned(currencyCode),
                 Res.get("offerbook.warning.currencyBanned"));
         checkArgument(!filterManager.isPaymentMethodBanned(paymentAccount.getPaymentMethod()),

core/src/main/java/haveno/core/offer/OpenOffer.java

@@ -96,6 +96,9 @@ public final class OpenOffer implements Tradable {
     @Getter
     private String reserveTxKey;
     @Getter
+    @Setter
+    private String challenge;
+    @Getter
     private final long triggerPrice;
     @Getter
     @Setter
@@ -107,7 +110,6 @@ public final class OpenOffer implements Tradable {
     @Getter
     @Setter
     transient int numProcessingAttempts = 0;
-
     public OpenOffer(Offer offer) {
         this(offer, 0, false);
     }
@@ -120,6 +122,7 @@ public final class OpenOffer implements Tradable {
         this.offer = offer;
         this.triggerPrice = triggerPrice;
         this.reserveExactAmount = reserveExactAmount;
+        this.challenge = offer.getChallenge();
         state = State.PENDING;
     }
 
@@ -137,6 +140,7 @@ public final class OpenOffer implements Tradable {
         this.reserveTxHash = openOffer.reserveTxHash;
         this.reserveTxHex = openOffer.reserveTxHex;
         this.reserveTxKey = openOffer.reserveTxKey;
+        this.challenge = openOffer.challenge;
     }
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -153,7 +157,8 @@ public final class OpenOffer implements Tradable {
                       long splitOutputTxFee,
                       @Nullable String reserveTxHash,
                       @Nullable String reserveTxHex,
-                      @Nullable String reserveTxKey) {
+                      @Nullable String reserveTxKey,
+                      @Nullable String challenge) {
         this.offer = offer;
         this.state = state;
         this.triggerPrice = triggerPrice;
@@ -164,6 +169,7 @@ public final class OpenOffer implements Tradable {
         this.reserveTxHash = reserveTxHash;
         this.reserveTxHex = reserveTxHex;
         this.reserveTxKey = reserveTxKey;
+        this.challenge = challenge;
 
         // reset reserved state to available
         if (this.state == State.RESERVED) setState(State.AVAILABLE);
@@ -184,6 +190,7 @@ public final class OpenOffer implements Tradable {
         Optional.ofNullable(reserveTxHash).ifPresent(e -> builder.setReserveTxHash(reserveTxHash));
         Optional.ofNullable(reserveTxHex).ifPresent(e -> builder.setReserveTxHex(reserveTxHex));
         Optional.ofNullable(reserveTxKey).ifPresent(e -> builder.setReserveTxKey(reserveTxKey));
+        Optional.ofNullable(challenge).ifPresent(e -> builder.setChallenge(challenge));
 
         return protobuf.Tradable.newBuilder().setOpenOffer(builder).build();
     }
@@ -199,7 +206,8 @@ public final class OpenOffer implements Tradable {
                 proto.getSplitOutputTxFee(),
                 ProtoUtil.stringOrNullFromProto(proto.getReserveTxHash()),
                 ProtoUtil.stringOrNullFromProto(proto.getReserveTxHex()),
-                ProtoUtil.stringOrNullFromProto(proto.getReserveTxKey()));
+                ProtoUtil.stringOrNullFromProto(proto.getReserveTxKey()),
+                ProtoUtil.stringOrNullFromProto(proto.getChallenge()));
         return openOffer;
     }
 

core/src/main/java/haveno/core/offer/OpenOfferManager.java

@@ -79,6 +79,7 @@ import haveno.core.util.JsonUtil;
 import haveno.core.util.Validator;
 import haveno.core.xmr.model.XmrAddressEntry;
 import haveno.core.xmr.wallet.BtcWalletService;
+import haveno.core.xmr.wallet.Restrictions;
 import haveno.core.xmr.wallet.XmrKeyImageListener;
 import haveno.core.xmr.wallet.XmrKeyImagePoller;
 import haveno.core.xmr.wallet.TradeWalletService;
@@ -947,7 +948,7 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
                 if (openOffer.getScheduledTxHashes() != null) {
                     boolean scheduledTxsAvailable = true;
                     for (MoneroTxWallet tx : xmrWalletService.getTxs(openOffer.getScheduledTxHashes())) {
-                        if (!tx.isLocked() && !isOutputsAvailable(tx)) {
+                        if (!tx.isLocked() && !hasSpendableAmount(tx)) {
                             scheduledTxsAvailable = false;
                             break;
                         }
@@ -1164,23 +1165,21 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
             throw new RuntimeException("Not enough money in Haveno wallet");
         }
 
-        // get earliest available or pending txs with sufficient incoming amount
+        // get earliest available or pending txs with sufficient spendable amount
         BigInteger scheduledAmount = BigInteger.ZERO;
         Set<MoneroTxWallet> scheduledTxs = new HashSet<MoneroTxWallet>();
         for (MoneroTxWallet tx : xmrWalletService.getTxs()) {
 
-            // skip if outputs unavailable
-            if (tx.getIncomingTransfers() == null || tx.getIncomingTransfers().isEmpty()) continue;
-            if (!isOutputsAvailable(tx)) continue;
+            // get spendable amount
+            BigInteger spendableAmount = getSpendableAmount(tx);
+
+            // skip if no spendable amount or already scheduled
+            if (spendableAmount.equals(BigInteger.ZERO)) continue;
             if (isTxScheduledByOtherOffer(openOffers, openOffer, tx.getHash())) continue;
 
-            // add scheduled tx
-            for (MoneroIncomingTransfer transfer : tx.getIncomingTransfers()) {
-                if (transfer.getAccountIndex() == 0) {
-                    scheduledAmount = scheduledAmount.add(transfer.getAmount());
-                    scheduledTxs.add(tx);
-                }
-            }
+            // schedule tx
+            scheduledAmount = scheduledAmount.add(spendableAmount);
+            scheduledTxs.add(tx);
 
             // break if sufficient funds
             if (scheduledAmount.compareTo(offerReserveAmount) >= 0) break;
@@ -1193,6 +1192,34 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
         openOffer.setState(OpenOffer.State.PENDING);
     }
 
+    private BigInteger getSpendableAmount(MoneroTxWallet tx) {
+
+        // compute spendable amount from outputs if confirmed
+        if (tx.isConfirmed()) {
+            BigInteger spendableAmount = BigInteger.ZERO;
+            if (tx.getOutputsWallet() != null) {
+                for (MoneroOutputWallet output : tx.getOutputsWallet()) {
+                    if (!output.isSpent() && !output.isFrozen() && output.getAccountIndex() == 0) {
+                        spendableAmount = spendableAmount.add(output.getAmount());
+                    }
+                }
+            }
+            return spendableAmount;
+        }
+
+        // funds sent to self always show 0 incoming amount, so compute from destinations manually
+        // TODO: this excludes change output, so change is missing from spendable amount until confirmed
+        BigInteger sentToSelfAmount = xmrWalletService.getAmountSentToSelf(tx);
+        if (sentToSelfAmount.compareTo(BigInteger.ZERO) > 0) return sentToSelfAmount;
+
+        // if not confirmed and not sent to self, return incoming amount
+        return tx.getIncomingAmount() == null ? BigInteger.ZERO : tx.getIncomingAmount();
+    }
+
+    private boolean hasSpendableAmount(MoneroTxWallet tx) {
+        return getSpendableAmount(tx).compareTo(BigInteger.ZERO) > 0;
+    }
+
     private BigInteger getScheduledAmount(List<OpenOffer> openOffers) {
         BigInteger scheduledAmount = BigInteger.ZERO;
         for (OpenOffer openOffer : openOffers) {
@@ -1224,14 +1251,6 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
         return false;
     }
 
-    private boolean isOutputsAvailable(MoneroTxWallet tx) {
-        if (tx.getOutputsWallet() == null) return false;
-        for (MoneroOutputWallet output : tx.getOutputsWallet()) {
-            if (output.isSpent() || output.isFrozen()) return false;
-        }
-        return true;
-    }
-
     private void signAndPostOffer(OpenOffer openOffer,
                                   boolean useSavingsWallet, // TODO: remove this?
                                   TransactionResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
@@ -1299,7 +1318,7 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
             NodeAddress thisAddress = p2PService.getNetworkNode().getNodeAddress();
             if (thisArbitrator == null || !thisArbitrator.getNodeAddress().equals(thisAddress)) {
               errorMessage = "Cannot sign offer because we are not a registered arbitrator";
-              log.info(errorMessage);
+              log.warn(errorMessage);
               sendAckMessage(request.getClass(), peer, request.getPubKeyRing(), request.getOfferId(), request.getUid(), false, errorMessage);
               return;
             }
@@ -1307,47 +1326,109 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
             // verify arbitrator is signer of offer payload
             if (!thisAddress.equals(request.getOfferPayload().getArbitratorSigner())) {
                 errorMessage = "Cannot sign offer because offer payload is for a different arbitrator";
-                log.info(errorMessage);
+                log.warn(errorMessage);
                 sendAckMessage(request.getClass(), peer, request.getPubKeyRing(), request.getOfferId(), request.getUid(), false, errorMessage);
                 return;
             }
 
-            // verify maker's trade fee
+            // private offers must have challenge hash
             Offer offer = new Offer(request.getOfferPayload());
-            if (offer.getMakerFeePct() != HavenoUtils.MAKER_FEE_PCT) {
-                errorMessage = "Wrong maker fee for offer " + request.offerId;
-                log.info(errorMessage);
+            if (offer.isPrivateOffer() && (offer.getChallengeHash() == null || offer.getChallengeHash().length() == 0)) {
+                errorMessage = "Private offer must have challenge hash for offer " + request.offerId;
+                log.warn(errorMessage);
                 sendAckMessage(request.getClass(), peer, request.getPubKeyRing(), request.getOfferId(), request.getUid(), false, errorMessage);
                 return;
             }
 
-            // verify taker's trade fee
-            if (offer.getTakerFeePct() != HavenoUtils.TAKER_FEE_PCT) {
-                errorMessage = "Wrong taker fee for offer " + request.offerId;
-                log.info(errorMessage);
-                sendAckMessage(request.getClass(), peer, request.getPubKeyRing(), request.getOfferId(), request.getUid(), false, errorMessage);
-                return;
+            // verify maker and taker fees
+            boolean hasBuyerAsTakerWithoutDeposit = offer.getDirection() == OfferDirection.SELL && offer.isPrivateOffer() && offer.getChallengeHash() != null && offer.getChallengeHash().length() > 0 && offer.getTakerFeePct() == 0;
+            if (hasBuyerAsTakerWithoutDeposit) {
+
+                // verify maker's trade fee
+                if (offer.getMakerFeePct() != HavenoUtils.MAKER_FEE_FOR_TAKER_WITHOUT_DEPOSIT_PCT) {
+                    errorMessage = "Wrong maker fee for offer " + request.offerId;
+                    log.warn(errorMessage);
+                    sendAckMessage(request.getClass(), peer, request.getPubKeyRing(), request.getOfferId(), request.getUid(), false, errorMessage);
+                    return;
+                }
+
+                // verify taker's trade fee
+                if (offer.getTakerFeePct() != 0) {
+                    errorMessage = "Wrong taker fee for offer " + request.offerId + ". Expected 0 but got " + offer.getTakerFeePct();
+                    log.warn(errorMessage);
+                    sendAckMessage(request.getClass(), peer, request.getPubKeyRing(), request.getOfferId(), request.getUid(), false, errorMessage);
+                    return;
+                }
+
+                // verify maker security deposit
+                if (offer.getSellerSecurityDepositPct() != Restrictions.MIN_SECURITY_DEPOSIT_PCT) {
+                    errorMessage = "Wrong seller security deposit for offer " + request.offerId + ". Expected " + Restrictions.MIN_SECURITY_DEPOSIT_PCT + " but got " + offer.getSellerSecurityDepositPct();
+                    log.warn(errorMessage);
+                    sendAckMessage(request.getClass(), peer, request.getPubKeyRing(), request.getOfferId(), request.getUid(), false, errorMessage);
+                    return;
+                }
+
+                // verify taker's security deposit
+                if (offer.getBuyerSecurityDepositPct() != 0) {
+                    errorMessage = "Wrong buyer security deposit for offer " + request.offerId + ". Expected 0 but got " + offer.getBuyerSecurityDepositPct();
+                    log.warn(errorMessage);
+                    sendAckMessage(request.getClass(), peer, request.getPubKeyRing(), request.getOfferId(), request.getUid(), false, errorMessage);
+                    return;
+                }
+            } else {
+
+                // verify maker's trade fee
+                if (offer.getMakerFeePct() != HavenoUtils.MAKER_FEE_PCT) {
+                    errorMessage = "Wrong maker fee for offer " + request.offerId;
+                    log.warn(errorMessage);
+                    sendAckMessage(request.getClass(), peer, request.getPubKeyRing(), request.getOfferId(), request.getUid(), false, errorMessage);
+                    return;
+                }
+
+                // verify taker's trade fee
+                if (offer.getTakerFeePct() != HavenoUtils.TAKER_FEE_PCT) {
+                    errorMessage = "Wrong taker fee for offer " + request.offerId + ". Expected " + HavenoUtils.TAKER_FEE_PCT + " but got " + offer.getTakerFeePct();
+                    log.warn(errorMessage);
+                    sendAckMessage(request.getClass(), peer, request.getPubKeyRing(), request.getOfferId(), request.getUid(), false, errorMessage);
+                    return;
+                }
+
+                // verify seller's security deposit
+                if (offer.getSellerSecurityDepositPct() < Restrictions.MIN_SECURITY_DEPOSIT_PCT) {
+                    errorMessage = "Insufficient seller security deposit for offer " + request.offerId + ". Expected at least " + Restrictions.MIN_SECURITY_DEPOSIT_PCT + " but got " + offer.getSellerSecurityDepositPct();
+                    log.warn(errorMessage);
+                    sendAckMessage(request.getClass(), peer, request.getPubKeyRing(), request.getOfferId(), request.getUid(), false, errorMessage);
+                    return;
+                }
+
+                // verify buyer's security deposit
+                if (offer.getBuyerSecurityDepositPct() < Restrictions.MIN_SECURITY_DEPOSIT_PCT) {
+                    errorMessage = "Insufficient buyer security deposit for offer " + request.offerId + ". Expected at least " + Restrictions.MIN_SECURITY_DEPOSIT_PCT + " but got " + offer.getBuyerSecurityDepositPct();
+                    log.warn(errorMessage);
+                    sendAckMessage(request.getClass(), peer, request.getPubKeyRing(), request.getOfferId(), request.getUid(), false, errorMessage);
+                    return;
+                }
+
+                // security deposits must be equal
+                if (offer.getBuyerSecurityDepositPct() != offer.getSellerSecurityDepositPct()) {
+                    errorMessage = "Buyer and seller security deposits are not equal for offer " + request.offerId + ": " + offer.getSellerSecurityDepositPct() + " vs " + offer.getBuyerSecurityDepositPct();
+                    log.warn(errorMessage);
+                    sendAckMessage(request.getClass(), peer, request.getPubKeyRing(), request.getOfferId(), request.getUid(), false, errorMessage);
+                    return;
+                }
             }
 
             // verify penalty fee
             if (offer.getPenaltyFeePct() != HavenoUtils.PENALTY_FEE_PCT) {
                 errorMessage = "Wrong penalty fee for offer " + request.offerId;
-                log.info(errorMessage);
-                sendAckMessage(request.getClass(), peer, request.getPubKeyRing(), request.getOfferId(), request.getUid(), false, errorMessage);
-                return;
-            }
-
-            // verify security deposits are equal
-            if (offer.getBuyerSecurityDepositPct() != offer.getSellerSecurityDepositPct()) {
-                errorMessage = "Buyer and seller security deposits are not equal for offer " + request.offerId;
-                log.info(errorMessage);
+                log.warn(errorMessage);
                 sendAckMessage(request.getClass(), peer, request.getPubKeyRing(), request.getOfferId(), request.getUid(), false, errorMessage);
                 return;
             }
 
             // verify maker's reserve tx (double spend, trade fee, trade amount, mining fee)
             BigInteger penaltyFee = HavenoUtils.multiply(offer.getAmount(), HavenoUtils.PENALTY_FEE_PCT);
-            BigInteger maxTradeFee = HavenoUtils.multiply(offer.getAmount(), HavenoUtils.MAKER_FEE_PCT);
+            BigInteger maxTradeFee = HavenoUtils.multiply(offer.getAmount(), hasBuyerAsTakerWithoutDeposit ? HavenoUtils.MAKER_FEE_FOR_TAKER_WITHOUT_DEPOSIT_PCT : HavenoUtils.MAKER_FEE_PCT);
             BigInteger sendTradeAmount =  offer.getDirection() == OfferDirection.BUY ? BigInteger.ZERO : offer.getAmount();
             BigInteger securityDeposit = offer.getDirection() == OfferDirection.BUY ? offer.getMaxBuyerSecurityDeposit() : offer.getMaxSellerSecurityDeposit();
             MoneroTx verifiedTx = xmrWalletService.verifyReserveTx(
@@ -1702,7 +1783,7 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
                         originalOfferPayload.getLowerClosePrice(),
                         originalOfferPayload.getUpperClosePrice(),
                         originalOfferPayload.isPrivateOffer(),
-                        originalOfferPayload.getHashOfChallenge(),
+                        originalOfferPayload.getChallengeHash(),
                         updatedExtraDataMap,
                         protocolVersion,
                         originalOfferPayload.getArbitratorSigner(),

core/src/main/java/haveno/core/offer/availability/tasks/SendOfferAvailabilityRequest.java

@@ -88,7 +88,8 @@ public class SendOfferAvailabilityRequest extends Task<OfferAvailabilityModel> {
                     null, // reserve tx not sent from taker to maker
                     null,
                     null,
-                    payoutAddress);
+                    payoutAddress,
+                    null); // challenge is required when offer taken
 
             // save trade request to later send to arbitrator
             model.setTradeRequest(tradeRequest);

core/src/main/java/haveno/core/offer/placeoffer/tasks/ValidateOffer.java

@@ -21,6 +21,7 @@ import haveno.common.taskrunner.Task;
 import haveno.common.taskrunner.TaskRunner;
 import haveno.core.account.witness.AccountAgeWitnessService;
 import haveno.core.offer.Offer;
+import haveno.core.offer.OfferDirection;
 import haveno.core.offer.placeoffer.PlaceOfferModel;
 import haveno.core.trade.HavenoUtils;
 import haveno.core.trade.messages.TradeMessage;
@@ -63,8 +64,21 @@ public class ValidateOffer extends Task<PlaceOfferModel> {
         checkBINotNullOrZero(offer.getMaxTradeLimit(), "MaxTradeLimit");
         if (offer.getMakerFeePct() < 0) throw new IllegalArgumentException("Maker fee must be >= 0% but was " + offer.getMakerFeePct());
         if (offer.getTakerFeePct() < 0) throw new IllegalArgumentException("Taker fee must be >= 0% but was " + offer.getTakerFeePct());
-        if (offer.getBuyerSecurityDepositPct() <= 0) throw new IllegalArgumentException("Buyer security deposit percent must be positive but was " + offer.getBuyerSecurityDepositPct());
-        if (offer.getSellerSecurityDepositPct() <= 0) throw new IllegalArgumentException("Seller security deposit percent must be positive but was " + offer.getSellerSecurityDepositPct());
+        offer.isPrivateOffer();
+        if (offer.isPrivateOffer()) {
+            boolean isBuyerMaker = offer.getDirection() == OfferDirection.BUY;
+            if (isBuyerMaker) {
+                if (offer.getBuyerSecurityDepositPct() <= 0) throw new IllegalArgumentException("Buyer security deposit percent must be positive but was " + offer.getBuyerSecurityDepositPct());
+                if (offer.getSellerSecurityDepositPct() < 0) throw new IllegalArgumentException("Seller security deposit percent must be >= 0% but was " + offer.getSellerSecurityDepositPct());
+            } else {
+                if (offer.getBuyerSecurityDepositPct() < 0) throw new IllegalArgumentException("Buyer security deposit percent must be >= 0% but was " + offer.getBuyerSecurityDepositPct());
+                if (offer.getSellerSecurityDepositPct() <= 0) throw new IllegalArgumentException("Seller security deposit percent must be positive but was " + offer.getSellerSecurityDepositPct());
+            }
+        } else {
+            if (offer.getBuyerSecurityDepositPct() <= 0) throw new IllegalArgumentException("Buyer security deposit percent must be positive but was " + offer.getBuyerSecurityDepositPct());
+            if (offer.getSellerSecurityDepositPct() <= 0) throw new IllegalArgumentException("Seller security deposit percent must be positive but was " + offer.getSellerSecurityDepositPct());
+        }
+
 
         // We remove those checks to be more flexible with future changes.
         /*checkArgument(offer.getMakerFee().value >= FeeService.getMinMakerFee(offer.isCurrencyForMakerFeeBtc()).value,
@@ -82,9 +96,9 @@ public class ValidateOffer extends Task<PlaceOfferModel> {
         /*checkArgument(offer.getMinAmount().compareTo(ProposalConsensus.getMinTradeAmount()) >= 0,
             "MinAmount is less than " + ProposalConsensus.getMinTradeAmount().toFriendlyString());*/
 
-        long maxAmount = accountAgeWitnessService.getMyTradeLimit(user.getPaymentAccount(offer.getMakerPaymentAccountId()), offer.getCurrencyCode(), offer.getDirection());
+        long maxAmount = accountAgeWitnessService.getMyTradeLimit(user.getPaymentAccount(offer.getMakerPaymentAccountId()), offer.getCurrencyCode(), offer.getDirection(), offer.hasBuyerAsTakerWithoutDeposit());
         checkArgument(offer.getAmount().longValueExact() <= maxAmount,
-                "Amount is larger than " + HavenoUtils.atomicUnitsToXmr(offer.getPaymentMethod().getMaxTradeLimit(offer.getCurrencyCode())) + " XMR");
+                "Amount is larger than " + HavenoUtils.atomicUnitsToXmr(maxAmount) + " XMR");
         checkArgument(offer.getAmount().compareTo(offer.getMinAmount()) >= 0, "MinAmount is larger than Amount");
 
         checkNotNull(offer.getPrice(), "Price is null");

core/src/main/java/haveno/core/offer/takeoffer/TakeOfferModel.java

@@ -148,7 +148,8 @@ public class TakeOfferModel implements Model {
     private long getMaxTradeLimit() {
         return accountAgeWitnessService.getMyTradeLimit(paymentAccount,
                 offer.getCurrencyCode(),
-                offer.getMirroredDirection());
+                offer.getMirroredDirection(),
+                offer.hasBuyerAsTakerWithoutDeposit());
     }
 
     @NotNull

core/src/main/java/haveno/core/payment/PaymentAccountUtil.java

@@ -124,7 +124,7 @@ public class PaymentAccountUtil {
                                                 AccountAgeWitnessService accountAgeWitnessService) {
         boolean hasChargebackRisk = hasChargebackRisk(offer.getPaymentMethod(), offer.getCurrencyCode());
         boolean hasValidAccountAgeWitness = accountAgeWitnessService.getMyTradeLimit(paymentAccount,
-                offer.getCurrencyCode(), offer.getMirroredDirection()) >= offer.getMinAmount().longValueExact();
+                offer.getCurrencyCode(), offer.getMirroredDirection(), offer.hasBuyerAsTakerWithoutDeposit()) >= offer.getMinAmount().longValueExact();
         return !hasChargebackRisk || hasValidAccountAgeWitness;
     }
 

core/src/main/java/haveno/core/payment/TradeLimits.java

@@ -30,7 +30,9 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 @Singleton
 public class TradeLimits {
-    private static final BigInteger MAX_TRADE_LIMIT = HavenoUtils.xmrToAtomicUnits(96.0); // max trade limit for lowest risk payment method. Others will get derived from that.
+    private static final BigInteger MAX_TRADE_LIMIT = HavenoUtils.xmrToAtomicUnits(528); // max trade limit for lowest risk payment method. Others will get derived from that.
+    private static final BigInteger MAX_TRADE_LIMIT_WITHOUT_BUYER_AS_TAKER_DEPOSIT = HavenoUtils.xmrToAtomicUnits(1); // max trade limit without deposit from buyer
+
     @Nullable
     @Getter
     private static TradeLimits INSTANCE;
@@ -57,6 +59,15 @@ public class TradeLimits {
        return MAX_TRADE_LIMIT;
     }
 
+    /**
+     * The maximum trade limit without a buyer deposit.
+     * 
+     * @return the maximum trade limit for a buyer without a deposit
+     */
+    public BigInteger getMaxTradeLimitBuyerAsTakerWithoutDeposit() {
+        return MAX_TRADE_LIMIT_WITHOUT_BUYER_AS_TAKER_DEPOSIT;
+    }
+
     // We possibly rounded value for the first month gets multiplied by 4 to get the trade limit after the account
     // age witness is not considered anymore (> 2 months).
 

core/src/main/java/haveno/core/payment/payload/PaymentMethod.java

@@ -124,13 +124,8 @@ public final class PaymentMethod implements PersistablePayload, Comparable<Payme
                                     Config.baseCurrencyNetwork() == BaseCurrencyNetwork.XMR_STAGENET ? TimeUnit.MINUTES.toMillis(30) :
                                     TimeUnit.DAYS.toMillis(1);
 
-    // Default trade limits.
-    // We initialize very early before reading persisted data. We will apply later the limit from
-    // the DAO param (Param.MAX_TRADE_LIMIT) but that can be only done after the dao is initialized.
-    // The default values will be used for deriving the
-    // risk factor so the relation between the risk categories stays the same as with the default values.
-    // We must not change those values as it could lead to invalid offers if amount becomes lower then new trade limit.
-    // Increasing might be ok, but needs more thought as well...
+    // These values are not used except to derive the associated risk factor.
+    private static final BigInteger DEFAULT_TRADE_LIMIT_CRYPTO = HavenoUtils.xmrToAtomicUnits(200);
     private static final BigInteger DEFAULT_TRADE_LIMIT_VERY_LOW_RISK = HavenoUtils.xmrToAtomicUnits(100);
     private static final BigInteger DEFAULT_TRADE_LIMIT_LOW_RISK = HavenoUtils.xmrToAtomicUnits(50);
     private static final BigInteger DEFAULT_TRADE_LIMIT_MID_RISK = HavenoUtils.xmrToAtomicUnits(25);
@@ -288,7 +283,7 @@ public final class PaymentMethod implements PersistablePayload, Comparable<Payme
 
             // Global
             CASH_DEPOSIT = new PaymentMethod(CASH_DEPOSIT_ID, 4 * DAY, DEFAULT_TRADE_LIMIT_HIGH_RISK, getAssetCodes(CashDepositAccount.SUPPORTED_CURRENCIES)),
-            PAY_BY_MAIL = new PaymentMethod(PAY_BY_MAIL_ID, 8 * DAY, DEFAULT_TRADE_LIMIT_HIGH_RISK, getAssetCodes(PayByMailAccount.SUPPORTED_CURRENCIES)),
+            PAY_BY_MAIL = new PaymentMethod(PAY_BY_MAIL_ID, 8 * DAY, DEFAULT_TRADE_LIMIT_LOW_RISK, getAssetCodes(PayByMailAccount.SUPPORTED_CURRENCIES)),
             CASH_AT_ATM = new PaymentMethod(CASH_AT_ATM_ID, 4 * DAY, DEFAULT_TRADE_LIMIT_HIGH_RISK, getAssetCodes(CashAtAtmAccount.SUPPORTED_CURRENCIES)),
             MONEY_GRAM = new PaymentMethod(MONEY_GRAM_ID, 4 * DAY, DEFAULT_TRADE_LIMIT_MID_RISK, getAssetCodes(MoneyGramAccount.SUPPORTED_CURRENCIES)),
             WESTERN_UNION = new PaymentMethod(WESTERN_UNION_ID, 4 * DAY, DEFAULT_TRADE_LIMIT_MID_RISK, getAssetCodes(WesternUnionAccount.SUPPORTED_CURRENCIES)),
@@ -342,10 +337,10 @@ public final class PaymentMethod implements PersistablePayload, Comparable<Payme
             PROMPT_PAY = new PaymentMethod(PROMPT_PAY_ID, DAY, DEFAULT_TRADE_LIMIT_LOW_RISK, getAssetCodes(PromptPayAccount.SUPPORTED_CURRENCIES)),
 
             // Cryptos
-            BLOCK_CHAINS = new PaymentMethod(BLOCK_CHAINS_ID, DAY, DEFAULT_TRADE_LIMIT_VERY_LOW_RISK, Arrays.asList()),
+            BLOCK_CHAINS = new PaymentMethod(BLOCK_CHAINS_ID, DAY, DEFAULT_TRADE_LIMIT_CRYPTO, Arrays.asList()),
             
             // Cryptos with 1 hour trade period
-            BLOCK_CHAINS_INSTANT = new PaymentMethod(BLOCK_CHAINS_INSTANT_ID, TimeUnit.HOURS.toMillis(1), DEFAULT_TRADE_LIMIT_VERY_LOW_RISK, Arrays.asList())
+            BLOCK_CHAINS_INSTANT = new PaymentMethod(BLOCK_CHAINS_INSTANT_ID, TimeUnit.HOURS.toMillis(1), DEFAULT_TRADE_LIMIT_CRYPTO, Arrays.asList())
     );
 
     // TODO: delete this override method, which overrides the paymentMethods variable, when all payment methods supported using structured form api, and make paymentMethods private
@@ -497,17 +492,21 @@ public final class PaymentMethod implements PersistablePayload, Comparable<Payme
         }
 
         // We use the class field maxTradeLimit only for mapping the risk factor.
+        // The actual trade limit is calculated by dividing TradeLimits.MAX_TRADE_LIMIT by the
+        // risk factor, and then further decreasing by chargeback risk, account signing, and age.
         long riskFactor;
-        if (maxTradeLimit == DEFAULT_TRADE_LIMIT_VERY_LOW_RISK.longValueExact())
+        if (maxTradeLimit == DEFAULT_TRADE_LIMIT_CRYPTO.longValueExact())
             riskFactor = 1;
-        else if (maxTradeLimit == DEFAULT_TRADE_LIMIT_LOW_RISK.longValueExact())
-            riskFactor = 2;
-        else if (maxTradeLimit == DEFAULT_TRADE_LIMIT_MID_RISK.longValueExact())
+        else if (maxTradeLimit == DEFAULT_TRADE_LIMIT_VERY_LOW_RISK.longValueExact())
             riskFactor = 4;
+        else if (maxTradeLimit == DEFAULT_TRADE_LIMIT_LOW_RISK.longValueExact())
+            riskFactor = 11;
+        else if (maxTradeLimit == DEFAULT_TRADE_LIMIT_MID_RISK.longValueExact())
+            riskFactor = 22;
         else if (maxTradeLimit == DEFAULT_TRADE_LIMIT_HIGH_RISK.longValueExact())
-            riskFactor = 8;
+            riskFactor = 44;
         else {
-            riskFactor = 8;
+            riskFactor = 44;
             log.warn("maxTradeLimit is not matching one of our default values. We use highest risk factor. " +
                             "maxTradeLimit={}. PaymentMethod={}", maxTradeLimit, this);
         }

core/src/main/java/haveno/core/payment/validation/SecurityDepositValidator.java

@@ -59,7 +59,7 @@ public class SecurityDepositValidator extends NumberValidator {
     private ValidationResult validateIfNotTooLowPercentageValue(String input) {
         try {
             double percentage = ParsingUtils.parsePercentStringToDouble(input);
-            double minPercentage = Restrictions.getMinBuyerSecurityDepositAsPercent();
+            double minPercentage = Restrictions.getMinSecurityDepositAsPercent();
             if (percentage < minPercentage)
                 return new ValidationResult(false,
                         Res.get("validation.inputTooSmall", FormattingUtils.formatToPercentWithSymbol(minPercentage)));
@@ -73,7 +73,7 @@ public class SecurityDepositValidator extends NumberValidator {
     private ValidationResult validateIfNotTooHighPercentageValue(String input) {
         try {
             double percentage = ParsingUtils.parsePercentStringToDouble(input);
-            double maxPercentage = Restrictions.getMaxBuyerSecurityDepositAsPercent();
+            double maxPercentage = Restrictions.getMaxSecurityDepositAsPercent();
             if (percentage > maxPercentage)
                 return new ValidationResult(false,
                         Res.get("validation.inputTooLarge", FormattingUtils.formatToPercentWithSymbol(maxPercentage)));

core/src/main/java/haveno/core/trade/ArbitratorTrade.java

@@ -28,6 +28,8 @@ import lombok.extern.slf4j.Slf4j;
 import java.math.BigInteger;
 import java.util.UUID;
 
+import javax.annotation.Nullable;
+
 /**
  * Trade in the context of an arbitrator.
  */
@@ -42,8 +44,9 @@ public class ArbitratorTrade extends Trade {
           String uid,
           NodeAddress makerNodeAddress,
           NodeAddress takerNodeAddress,
-          NodeAddress arbitratorNodeAddress) {
-    super(offer, tradeAmount, tradePrice, xmrWalletService, processModel, uid, makerNodeAddress, takerNodeAddress, arbitratorNodeAddress);
+          NodeAddress arbitratorNodeAddress,
+          @Nullable String challenge) {
+    super(offer, tradeAmount, tradePrice, xmrWalletService, processModel, uid, makerNodeAddress, takerNodeAddress, arbitratorNodeAddress, challenge);
   }
 
   @Override
@@ -81,7 +84,8 @@ public class ArbitratorTrade extends Trade {
                       uid,
                       proto.getProcessModel().getMaker().hasNodeAddress() ? NodeAddress.fromProto(proto.getProcessModel().getMaker().getNodeAddress()) : null,
                       proto.getProcessModel().getTaker().hasNodeAddress() ? NodeAddress.fromProto(proto.getProcessModel().getTaker().getNodeAddress()) : null,
-                      proto.getProcessModel().getArbitrator().hasNodeAddress() ? NodeAddress.fromProto(proto.getProcessModel().getArbitrator().getNodeAddress()) : null),
+                      proto.getProcessModel().getArbitrator().hasNodeAddress() ? NodeAddress.fromProto(proto.getProcessModel().getArbitrator().getNodeAddress()) : null,
+                      ProtoUtil.stringOrNullFromProto(proto.getChallenge())),
               proto,
               coreProtoResolver);
   }

core/src/main/java/haveno/core/trade/BuyerAsMakerTrade.java

@@ -28,6 +28,8 @@ import lombok.extern.slf4j.Slf4j;
 import java.math.BigInteger;
 import java.util.UUID;
 
+import javax.annotation.Nullable;
+
 @Slf4j
 public final class BuyerAsMakerTrade extends BuyerTrade implements MakerTrade {
 
@@ -43,7 +45,8 @@ public final class BuyerAsMakerTrade extends BuyerTrade implements MakerTrade {
                              String uid,
                              NodeAddress makerNodeAddress,
                              NodeAddress takerNodeAddress,
-                             NodeAddress arbitratorNodeAddress) {
+                             NodeAddress arbitratorNodeAddress,
+                             @Nullable String challenge) {
         super(offer,
                 tradeAmount,
                 tradePrice,
@@ -52,7 +55,8 @@ public final class BuyerAsMakerTrade extends BuyerTrade implements MakerTrade {
                 uid,
                 makerNodeAddress,
                 takerNodeAddress,
-                arbitratorNodeAddress);
+                arbitratorNodeAddress,
+                challenge);
     }
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -85,7 +89,8 @@ public final class BuyerAsMakerTrade extends BuyerTrade implements MakerTrade {
                 uid,
                 proto.getProcessModel().getMaker().hasNodeAddress() ? NodeAddress.fromProto(proto.getProcessModel().getMaker().getNodeAddress()) : null,
                 proto.getProcessModel().getTaker().hasNodeAddress() ? NodeAddress.fromProto(proto.getProcessModel().getTaker().getNodeAddress()) : null,
-                proto.getProcessModel().getArbitrator().hasNodeAddress() ? NodeAddress.fromProto(proto.getProcessModel().getArbitrator().getNodeAddress()) : null);
+                proto.getProcessModel().getArbitrator().hasNodeAddress() ? NodeAddress.fromProto(proto.getProcessModel().getArbitrator().getNodeAddress()) : null,
+                ProtoUtil.stringOrNullFromProto(proto.getChallenge()));
 
         trade.setPrice(proto.getPrice());
 

core/src/main/java/haveno/core/trade/BuyerAsTakerTrade.java

@@ -44,7 +44,8 @@ public final class BuyerAsTakerTrade extends BuyerTrade implements TakerTrade {
                              String uid,
                              @Nullable NodeAddress makerNodeAddress,
                              @Nullable NodeAddress takerNodeAddress,
-                             @Nullable NodeAddress arbitratorNodeAddress) {
+                             @Nullable NodeAddress arbitratorNodeAddress,
+                             @Nullable String challenge) {
         super(offer,
                 tradeAmount,
                 tradePrice,
@@ -53,7 +54,8 @@ public final class BuyerAsTakerTrade extends BuyerTrade implements TakerTrade {
                 uid,
                 makerNodeAddress,
                 takerNodeAddress,
-                arbitratorNodeAddress);
+                arbitratorNodeAddress,
+                challenge);
     }
 
 
@@ -87,7 +89,8 @@ public final class BuyerAsTakerTrade extends BuyerTrade implements TakerTrade {
                         uid,
                         proto.getProcessModel().getMaker().hasNodeAddress() ? NodeAddress.fromProto(proto.getProcessModel().getMaker().getNodeAddress()) : null,
                         proto.getProcessModel().getTaker().hasNodeAddress() ? NodeAddress.fromProto(proto.getProcessModel().getTaker().getNodeAddress()) : null,
-                        proto.getProcessModel().getArbitrator().hasNodeAddress() ? NodeAddress.fromProto(proto.getProcessModel().getArbitrator().getNodeAddress()) : null),
+                        proto.getProcessModel().getArbitrator().hasNodeAddress() ? NodeAddress.fromProto(proto.getProcessModel().getArbitrator().getNodeAddress()) : null,
+                        ProtoUtil.stringOrNullFromProto(proto.getChallenge())),
                 proto,
                 coreProtoResolver);
     }

core/src/main/java/haveno/core/trade/BuyerTrade.java

@@ -38,7 +38,8 @@ public abstract class BuyerTrade extends Trade {
                String uid,
                @Nullable NodeAddress takerNodeAddress,
                @Nullable NodeAddress makerNodeAddress,
-               @Nullable NodeAddress arbitratorNodeAddress) {
+               @Nullable NodeAddress arbitratorNodeAddress,
+               @Nullable String challenge) {
         super(offer,
                 tradeAmount,
                 tradePrice,
@@ -47,7 +48,8 @@ public abstract class BuyerTrade extends Trade {
                 uid,
                 takerNodeAddress,
                 makerNodeAddress,
-                arbitratorNodeAddress);
+                arbitratorNodeAddress,
+                challenge);
     }
 
     @Override

core/src/main/java/haveno/core/trade/Contract.java

@@ -36,6 +36,7 @@ package haveno.core.trade;
 
 import com.google.protobuf.ByteString;
 import haveno.common.crypto.PubKeyRing;
+import haveno.common.proto.ProtoUtil;
 import haveno.common.proto.network.NetworkPayload;
 import haveno.common.util.JsonExclude;
 import haveno.common.util.Utilities;
@@ -53,6 +54,7 @@ import org.apache.commons.lang3.StringUtils;
 
 import javax.annotation.Nullable;
 import java.math.BigInteger;
+import java.util.Optional;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
@@ -79,6 +81,7 @@ public final class Contract implements NetworkPayload {
     private final String makerPayoutAddressString;
     private final String takerPayoutAddressString;
     private final String makerDepositTxHash;
+    @Nullable
     private final String takerDepositTxHash;
 
     public Contract(OfferPayload offerPayload,
@@ -99,7 +102,7 @@ public final class Contract implements NetworkPayload {
                     String makerPayoutAddressString,
                     String takerPayoutAddressString,
                     String makerDepositTxHash,
-                    String takerDepositTxHash) {
+                    @Nullable String takerDepositTxHash) {
         this.offerPayload = offerPayload;
         this.tradeAmount = tradeAmount;
         this.tradePrice = tradePrice;
@@ -134,6 +137,31 @@ public final class Contract implements NetworkPayload {
     // PROTO BUFFER
     ///////////////////////////////////////////////////////////////////////////////////////////
 
+    @Override
+    public protobuf.Contract toProtoMessage() {
+        protobuf.Contract.Builder builder = protobuf.Contract.newBuilder()
+                .setOfferPayload(offerPayload.toProtoMessage().getOfferPayload())
+                .setTradeAmount(tradeAmount)
+                .setTradePrice(tradePrice)
+                .setBuyerNodeAddress(buyerNodeAddress.toProtoMessage())
+                .setSellerNodeAddress(sellerNodeAddress.toProtoMessage())
+                .setArbitratorNodeAddress(arbitratorNodeAddress.toProtoMessage())
+                .setIsBuyerMakerAndSellerTaker(isBuyerMakerAndSellerTaker)
+                .setMakerAccountId(makerAccountId)
+                .setTakerAccountId(takerAccountId)
+                .setMakerPaymentMethodId(makerPaymentMethodId)
+                .setTakerPaymentMethodId(takerPaymentMethodId)
+                .setMakerPaymentAccountPayloadHash(ByteString.copyFrom(makerPaymentAccountPayloadHash))
+                .setTakerPaymentAccountPayloadHash(ByteString.copyFrom(takerPaymentAccountPayloadHash))
+                .setMakerPubKeyRing(makerPubKeyRing.toProtoMessage())
+                .setTakerPubKeyRing(takerPubKeyRing.toProtoMessage())
+                .setMakerPayoutAddressString(makerPayoutAddressString)
+                .setTakerPayoutAddressString(takerPayoutAddressString)
+                .setMakerDepositTxHash(makerDepositTxHash);
+        Optional.ofNullable(takerDepositTxHash).ifPresent(builder::setTakerDepositTxHash);
+        return builder.build();
+    }
+
     public static Contract fromProto(protobuf.Contract proto, CoreProtoResolver coreProtoResolver) {
         return new Contract(OfferPayload.fromProto(proto.getOfferPayload()),
                 proto.getTradeAmount(),
@@ -153,32 +181,7 @@ public final class Contract implements NetworkPayload {
                 proto.getMakerPayoutAddressString(),
                 proto.getTakerPayoutAddressString(),
                 proto.getMakerDepositTxHash(),
-                proto.getTakerDepositTxHash());
-    }
-
-    @Override
-    public protobuf.Contract toProtoMessage() {
-        return protobuf.Contract.newBuilder()
-                .setOfferPayload(offerPayload.toProtoMessage().getOfferPayload())
-                .setTradeAmount(tradeAmount)
-                .setTradePrice(tradePrice)
-                .setBuyerNodeAddress(buyerNodeAddress.toProtoMessage())
-                .setSellerNodeAddress(sellerNodeAddress.toProtoMessage())
-                .setArbitratorNodeAddress(arbitratorNodeAddress.toProtoMessage())
-                .setIsBuyerMakerAndSellerTaker(isBuyerMakerAndSellerTaker)
-                .setMakerAccountId(makerAccountId)
-                .setTakerAccountId(takerAccountId)
-                .setMakerPaymentMethodId(makerPaymentMethodId)
-                .setTakerPaymentMethodId(takerPaymentMethodId)
-                .setMakerPaymentAccountPayloadHash(ByteString.copyFrom(makerPaymentAccountPayloadHash))
-                .setTakerPaymentAccountPayloadHash(ByteString.copyFrom(takerPaymentAccountPayloadHash))
-                .setMakerPubKeyRing(makerPubKeyRing.toProtoMessage())
-                .setTakerPubKeyRing(takerPubKeyRing.toProtoMessage())
-                .setMakerPayoutAddressString(makerPayoutAddressString)
-                .setTakerPayoutAddressString(takerPayoutAddressString)
-                .setMakerDepositTxHash(makerDepositTxHash)
-                .setTakerDepositTxHash(takerDepositTxHash)
-                .build();
+                ProtoUtil.stringOrNullFromProto(proto.getTakerDepositTxHash()));
     }
 
 

core/src/main/java/haveno/core/trade/HavenoUtils.java

@@ -28,6 +28,7 @@ import haveno.common.crypto.KeyRing;
 import haveno.common.crypto.PubKeyRing;
 import haveno.common.crypto.Sig;
 import haveno.common.file.FileUtil;
+import haveno.common.util.Base64;
 import haveno.common.util.Utilities;
 import haveno.core.api.CoreNotificationService;
 import haveno.core.api.XmrConnectionService;
@@ -48,7 +49,10 @@ import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.InetAddress;
 import java.net.URI;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.security.PrivateKey;
+import java.security.SecureRandom;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.text.SimpleDateFormat;
@@ -90,10 +94,12 @@ public class HavenoUtils {
     public static final double MAKER_FEE_PCT = 0.00; // 0%
     public static final double TAKER_FEE_PCT = 0.00; // 0%
     public static final double PENALTY_FEE_PCT = 0.02; // 2%
+    public static final double MAKER_FEE_FOR_TAKER_WITHOUT_DEPOSIT_PCT = MAKER_FEE_PCT + TAKER_FEE_PCT; // customize maker's fee when no deposit or fee from taker
 
     // other configuration
     public static final long LOG_POLL_ERROR_PERIOD_MS = 1000 * 60 * 4; // log poll errors up to once every 4 minutes
     public static final long LOG_DAEMON_NOT_SYNCED_WARN_PERIOD_MS = 1000 * 30; // log warnings when daemon not synced once every 30s
+    public static final int PRIVATE_OFFER_PASSPHRASE_NUM_WORDS = 8; // number of words in a private offer passphrase
 
     // synchronize requests to the daemon
     private static boolean SYNC_DAEMON_REQUESTS = false; // sync long requests to daemon (e.g. refresh, update pool) // TODO: performance suffers by syncing daemon requests, but otherwise we sometimes get sporadic errors?
@@ -286,6 +292,41 @@ public class HavenoUtils {
 
     // ------------------------ SIGNING AND VERIFYING -------------------------
 
+    public static String generateChallenge() {
+        try {
+
+            // load bip39 words
+            String fileName = "bip39_english.txt";
+            File bip39File = new File(havenoSetup.getConfig().appDataDir, fileName);
+            if (!bip39File.exists()) FileUtil.resourceToFile(fileName, bip39File);
+            List<String> bip39Words = Files.readAllLines(bip39File.toPath(), StandardCharsets.UTF_8);
+
+            // select words randomly
+            List<String> passphraseWords = new ArrayList<String>();
+            SecureRandom secureRandom = new SecureRandom();
+            for (int i = 0; i < PRIVATE_OFFER_PASSPHRASE_NUM_WORDS; i++) {
+                passphraseWords.add(bip39Words.get(secureRandom.nextInt(bip39Words.size())));
+            }
+            return String.join(" ", passphraseWords);
+        } catch (Exception e) {
+            throw new IllegalStateException("Failed to generate challenge", e);
+        }
+    }
+
+    public static String getChallengeHash(String challenge) {
+        if (challenge == null) return null;
+
+        // tokenize passphrase
+        String[] words = challenge.toLowerCase().split(" ");
+
+        // collect first 4 letters of each word, which are unique in bip39
+        List<String> prefixes = new ArrayList<String>();
+        for (String word : words) prefixes.add(word.substring(0, Math.min(word.length(), 4)));
+
+        // hash the result
+        return Base64.encode(Hash.getSha256Hash(String.join(" ", prefixes).getBytes()));
+    }
+
     public static byte[] sign(KeyRing keyRing, String message) {
         return sign(keyRing.getSignatureKeyPair().getPrivate(), message);
     }

core/src/main/java/haveno/core/trade/SellerAsMakerTrade.java

@@ -44,7 +44,8 @@ public final class SellerAsMakerTrade extends SellerTrade implements MakerTrade
                               String uid,
                               @Nullable NodeAddress makerNodeAddress,
                               @Nullable NodeAddress takerNodeAddress,
-                              @Nullable NodeAddress arbitratorNodeAddress) {
+                              @Nullable NodeAddress arbitratorNodeAddress,
+                              @Nullable String challenge) {
         super(offer,
                 tradeAmount,
                 tradePrice,
@@ -53,7 +54,8 @@ public final class SellerAsMakerTrade extends SellerTrade implements MakerTrade
                 uid,
                 makerNodeAddress,
                 takerNodeAddress,
-                arbitratorNodeAddress);
+                arbitratorNodeAddress,
+                challenge);
     }
 
 
@@ -87,7 +89,8 @@ public final class SellerAsMakerTrade extends SellerTrade implements MakerTrade
                 uid,
                 proto.getProcessModel().getMaker().hasNodeAddress() ? NodeAddress.fromProto(proto.getProcessModel().getMaker().getNodeAddress()) : null,
                 proto.getProcessModel().getTaker().hasNodeAddress() ? NodeAddress.fromProto(proto.getProcessModel().getTaker().getNodeAddress()) : null,
-                proto.getProcessModel().getArbitrator().hasNodeAddress() ? NodeAddress.fromProto(proto.getProcessModel().getArbitrator().getNodeAddress()) : null);
+                proto.getProcessModel().getArbitrator().hasNodeAddress() ? NodeAddress.fromProto(proto.getProcessModel().getArbitrator().getNodeAddress()) : null,
+                ProtoUtil.stringOrNullFromProto(proto.getChallenge()));
 
         trade.setPrice(proto.getPrice());
 

core/src/main/java/haveno/core/trade/SellerAsTakerTrade.java

@@ -44,7 +44,8 @@ public final class SellerAsTakerTrade extends SellerTrade implements TakerTrade
                               String uid,
                               @Nullable NodeAddress makerNodeAddress,
                               @Nullable NodeAddress takerNodeAddress,
-                              @Nullable NodeAddress arbitratorNodeAddress) {
+                              @Nullable NodeAddress arbitratorNodeAddress,
+                              @Nullable String challenge) {
         super(offer,
                 tradeAmount,
                 tradePrice,
@@ -53,7 +54,8 @@ public final class SellerAsTakerTrade extends SellerTrade implements TakerTrade
                 uid,
                 makerNodeAddress,
                 takerNodeAddress,
-                arbitratorNodeAddress);
+                arbitratorNodeAddress,
+                challenge);
     }
 
 
@@ -87,7 +89,8 @@ public final class SellerAsTakerTrade extends SellerTrade implements TakerTrade
                         uid,
                         proto.getProcessModel().getMaker().hasNodeAddress() ? NodeAddress.fromProto(proto.getProcessModel().getMaker().getNodeAddress()) : null,
                         proto.getProcessModel().getTaker().hasNodeAddress() ? NodeAddress.fromProto(proto.getProcessModel().getTaker().getNodeAddress()) : null,
-                        proto.getProcessModel().getArbitrator().hasNodeAddress() ? NodeAddress.fromProto(proto.getProcessModel().getArbitrator().getNodeAddress()) : null),
+                        proto.getProcessModel().getArbitrator().hasNodeAddress() ? NodeAddress.fromProto(proto.getProcessModel().getArbitrator().getNodeAddress()) : null,
+                        ProtoUtil.stringOrNullFromProto(proto.getChallenge())),
                 proto,
                 coreProtoResolver);
     }

core/src/main/java/haveno/core/trade/SellerTrade.java

@@ -36,7 +36,8 @@ public abstract class SellerTrade extends Trade {
                 String uid,
                 @Nullable NodeAddress makerNodeAddress,
                 @Nullable NodeAddress takerNodeAddress,
-                @Nullable NodeAddress arbitratorNodeAddress) {
+                @Nullable NodeAddress arbitratorNodeAddress,
+                @Nullable String challenge) {
         super(offer,
                 tradeAmount,
                 tradePrice,
@@ -45,7 +46,8 @@ public abstract class SellerTrade extends Trade {
                 uid,
                 makerNodeAddress,
                 takerNodeAddress,
-                arbitratorNodeAddress);
+                arbitratorNodeAddress,
+                challenge);
     }
 
     @Override

core/src/main/java/haveno/core/trade/Trade.java

@@ -486,6 +486,8 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
     private IdlePayoutSyncer idlePayoutSyncer;
     @Getter
     private boolean isCompleted;
+    @Getter
+    private final String challenge;
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Constructors
@@ -500,7 +502,8 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
                     String uid,
                     @Nullable NodeAddress makerNodeAddress,
                     @Nullable NodeAddress takerNodeAddress,
-                    @Nullable NodeAddress arbitratorNodeAddress) {
+                    @Nullable NodeAddress arbitratorNodeAddress,
+                    @Nullable String challenge) {
         super();
         this.offer = offer;
         this.amount = tradeAmount.longValueExact();
@@ -511,6 +514,7 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
         this.uid = uid;
         this.takeOfferDate = new Date().getTime();
         this.tradeListeners = new ArrayList<TradeListener>();
+        this.challenge = challenge;
 
         getMaker().setNodeAddress(makerNodeAddress);
         getTaker().setNodeAddress(takerNodeAddress);
@@ -534,7 +538,8 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
                     String uid,
                     @Nullable NodeAddress makerNodeAddress,
                     @Nullable NodeAddress takerNodeAddress,
-                    @Nullable NodeAddress arbitratorNodeAddress) {
+                    @Nullable NodeAddress arbitratorNodeAddress,
+                    @Nullable String challenge) {
 
         this(offer,
                 tradeAmount,
@@ -544,7 +549,8 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
                 uid,
                 makerNodeAddress,
                 takerNodeAddress,
-                arbitratorNodeAddress);
+                arbitratorNodeAddress,
+                challenge);
     }
 
     // TODO: remove these constructors
@@ -559,7 +565,8 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
                     NodeAddress arbitratorNodeAddress,
                     XmrWalletService xmrWalletService,
                     ProcessModel processModel,
-                    String uid) {
+                    String uid,
+                    @Nullable String challenge) {
 
       this(offer,
               tradeAmount,
@@ -569,7 +576,8 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
               uid,
               makerNodeAddress,
               takerNodeAddress,
-              arbitratorNodeAddress);
+              arbitratorNodeAddress,
+              challenge);
 
         setAmount(tradeAmount);
     }
@@ -649,6 +657,8 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
             ThreadUtils.submitToPool(() -> {
                 if (newValue == Trade.Phase.DEPOSIT_REQUESTED) startPolling();
                 if (newValue == Trade.Phase.DEPOSITS_PUBLISHED) onDepositsPublished();
+                if (newValue == Trade.Phase.DEPOSITS_CONFIRMED) onDepositsConfirmed();
+                if (newValue == Trade.Phase.DEPOSITS_UNLOCKED) onDepositsUnlocked();
                 if (newValue == Trade.Phase.PAYMENT_SENT) onPaymentSent();
                 if (isDepositsPublished() && !isPayoutUnlocked()) updatePollPeriod();
                 if (isPaymentReceived()) {
@@ -1233,7 +1243,7 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
         Preconditions.checkNotNull(sellerPayoutAddress, "Seller payout address must not be null");
         Preconditions.checkNotNull(buyerPayoutAddress, "Buyer payout address must not be null");
         BigInteger sellerDepositAmount = getSeller().getDepositTx().getIncomingAmount();
-        BigInteger buyerDepositAmount = getBuyer().getDepositTx().getIncomingAmount();
+        BigInteger buyerDepositAmount = hasBuyerAsTakerWithoutDeposit() ? BigInteger.ZERO : getBuyer().getDepositTx().getIncomingAmount();
         BigInteger tradeAmount = getAmount();
         BigInteger buyerPayoutAmount = buyerDepositAmount.add(tradeAmount);
         BigInteger sellerPayoutAmount = sellerDepositAmount.subtract(tradeAmount);
@@ -1324,7 +1334,7 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
         MoneroWallet wallet = getWallet();
         Contract contract = getContract();
         BigInteger sellerDepositAmount = getSeller().getDepositTx().getIncomingAmount();
-        BigInteger buyerDepositAmount = getBuyer().getDepositTx().getIncomingAmount();
+        BigInteger buyerDepositAmount = hasBuyerAsTakerWithoutDeposit() ? BigInteger.ZERO : getBuyer().getDepositTx().getIncomingAmount();
         BigInteger tradeAmount = getAmount();
 
         // describe payout tx
@@ -2091,9 +2101,9 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
         final long tradeTime = getTakeOfferDate().getTime();
         MoneroDaemon daemonRpc = xmrWalletService.getDaemon();
         if (daemonRpc == null) throw new RuntimeException("Cannot set start time for trade " + getId() + " because it has no connection to monerod");
-        if (getMakerDepositTx() == null || getTakerDepositTx() == null) throw new RuntimeException("Cannot set start time for trade " + getId() + " because its unlocked deposit tx is null. Is client connected to a daemon?");
+        if (getMakerDepositTx() == null || (getTakerDepositTx() == null && !hasBuyerAsTakerWithoutDeposit())) throw new RuntimeException("Cannot set start time for trade " + getId() + " because its unlocked deposit tx is null. Is client connected to a daemon?");
 
-        long maxHeight = Math.max(getMakerDepositTx().getHeight(), getTakerDepositTx().getHeight());
+        long maxHeight = Math.max(getMakerDepositTx().getHeight(), hasBuyerAsTakerWithoutDeposit() ? 0l : getTakerDepositTx().getHeight());
         long blockTime = daemonRpc.getBlockByHeight(maxHeight).getTimestamp();
 
         // If block date is in future (Date in blocks can be off by +/- 2 hours) we use our current date.
@@ -2125,7 +2135,7 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
 
     public boolean isDepositsPublished() {
         if (isDepositFailed()) return false;
-        return getState().getPhase().ordinal() >= Phase.DEPOSITS_PUBLISHED.ordinal() && getMaker().getDepositTxHash() != null && getTaker().getDepositTxHash() != null;
+        return getState().getPhase().ordinal() >= Phase.DEPOSITS_PUBLISHED.ordinal() && getMaker().getDepositTxHash() != null && (getTaker().getDepositTxHash() != null || hasBuyerAsTakerWithoutDeposit());
     }
 
     public boolean isFundsLockedIn() {
@@ -2277,7 +2287,11 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
     }
 
     public BigInteger getTakerFee() {
-        return offer.getTakerFee(getAmount());
+        return hasBuyerAsTakerWithoutDeposit() ? BigInteger.ZERO : offer.getTakerFee(getAmount());
+    }
+
+    public BigInteger getSecurityDepositBeforeMiningFee() {
+        return isBuyer() ? getBuyerSecurityDepositBeforeMiningFee() : getSellerSecurityDepositBeforeMiningFee();
     }
 
     public BigInteger getBuyerSecurityDepositBeforeMiningFee() {
@@ -2288,6 +2302,14 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
         return offer.getOfferPayload().getSellerSecurityDepositForTradeAmount(getAmount());
     }
 
+    public boolean isBuyerAsTakerWithoutDeposit() {
+        return isBuyer() && isTaker() && BigInteger.ZERO.equals(getBuyerSecurityDepositBeforeMiningFee());
+    }
+
+    public boolean hasBuyerAsTakerWithoutDeposit() {
+        return getBuyer() == getTaker() && BigInteger.ZERO.equals(getBuyerSecurityDepositBeforeMiningFee());
+    }
+
     @Override
     public BigInteger getTotalTxFee() {
         return getSelf().getDepositTxFee().add(getSelf().getPayoutTxFee()); // sum my tx fees
@@ -2303,7 +2325,7 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
     }
 
     public boolean isTxChainInvalid() {
-        return processModel.getMaker().getDepositTxHash() == null || processModel.getTaker().getDepositTxHash() == null;
+        return processModel.getMaker().getDepositTxHash() == null || (processModel.getTaker().getDepositTxHash() == null && !hasBuyerAsTakerWithoutDeposit());
     }
 
     /**
@@ -2537,7 +2559,7 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
             if (isPayoutUnlocked()) return;
 
             // skip if deposit txs unknown or not requested
-            if (processModel.getMaker().getDepositTxHash() == null || processModel.getTaker().getDepositTxHash() == null || !isDepositRequested()) return;
+            if (!isDepositRequested() || processModel.getMaker().getDepositTxHash() == null || (processModel.getTaker().getDepositTxHash() == null && !hasBuyerAsTakerWithoutDeposit())) return;
 
             // skip if daemon not synced
             if (xmrConnectionService.getTargetHeight() == null || !xmrConnectionService.isSyncedWithinTolerance()) return;
@@ -2553,7 +2575,7 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
 
                 // get txs from trade wallet
                 MoneroTxQuery query = new MoneroTxQuery().setIncludeOutputs(true);
-                Boolean updatePool = !isDepositsConfirmed() && (getMaker().getDepositTx() == null || getTaker().getDepositTx() == null);
+                Boolean updatePool = !isDepositsConfirmed() && (getMaker().getDepositTx() == null || (getTaker().getDepositTx() == null && hasBuyerAsTakerWithoutDeposit()));
                 if (!updatePool) query.setInTxPool(false); // avoid updating from pool if possible
                 List<MoneroTxWallet> txs;
                 if (!updatePool) txs = wallet.getTxs(query);
@@ -2565,22 +2587,22 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
                     }
                 }
                 setDepositTxs(txs);
-                if (getMaker().getDepositTx() == null || getTaker().getDepositTx() == null) return; // skip if either deposit tx not seen
+                if (getMaker().getDepositTx() == null || (getTaker().getDepositTx() == null && !hasBuyerAsTakerWithoutDeposit())) return; // skip if either deposit tx not seen
                 setStateDepositsSeen();
 
                 // set actual security deposits
                 if (getBuyer().getSecurityDeposit().longValueExact() == 0) {
-                    BigInteger buyerSecurityDeposit = ((MoneroTxWallet) getBuyer().getDepositTx()).getIncomingAmount();
+                    BigInteger buyerSecurityDeposit = hasBuyerAsTakerWithoutDeposit() ? BigInteger.ZERO : ((MoneroTxWallet) getBuyer().getDepositTx()).getIncomingAmount();
                     BigInteger sellerSecurityDeposit = ((MoneroTxWallet) getSeller().getDepositTx()).getIncomingAmount().subtract(getAmount());
                     getBuyer().setSecurityDeposit(buyerSecurityDeposit);
                     getSeller().setSecurityDeposit(sellerSecurityDeposit);
                 }
 
                 // check for deposit txs confirmation
-                if (getMaker().getDepositTx().isConfirmed() && getTaker().getDepositTx().isConfirmed()) setStateDepositsConfirmed();
+                if (getMaker().getDepositTx().isConfirmed() && (hasBuyerAsTakerWithoutDeposit() || getTaker().getDepositTx().isConfirmed())) setStateDepositsConfirmed();
 
                 // check for deposit txs unlocked
-                if (getMaker().getDepositTx().getNumConfirmations() >= XmrWalletService.NUM_BLOCKS_UNLOCK && getTaker().getDepositTx().getNumConfirmations() >= XmrWalletService.NUM_BLOCKS_UNLOCK) {
+                if (getMaker().getDepositTx().getNumConfirmations() >= XmrWalletService.NUM_BLOCKS_UNLOCK && (hasBuyerAsTakerWithoutDeposit() || getTaker().getDepositTx().getNumConfirmations() >= XmrWalletService.NUM_BLOCKS_UNLOCK)) {
                     setStateDepositsUnlocked();
                 }
             }
@@ -2750,7 +2772,7 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
                 log.warn("Missing maker deposit tx for {} {}", getClass().getSimpleName(), getId());
                 return true;
             }
-            if (getTakerDepositTx() == null) {
+            if (getTakerDepositTx() == null && !hasBuyerAsTakerWithoutDeposit()) {
                 log.warn("Missing taker deposit tx for {} {}", getClass().getSimpleName(), getId());
                 return true;
             }
@@ -2872,10 +2894,16 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
         ThreadUtils.submitToPool(() -> xmrWalletService.freezeOutputs(getSelf().getReserveTxKeyImages()));
     }
 
+    private void onDepositsConfirmed() {
+        HavenoUtils.notificationService.sendTradeNotification(this, Phase.DEPOSITS_CONFIRMED, "Trade Deposits Confirmed", "The deposit transactions have confirmed");
+    }
+
+    private void onDepositsUnlocked() {
+        HavenoUtils.notificationService.sendTradeNotification(this, Phase.DEPOSITS_UNLOCKED, "Trade Deposits Unlocked", "The deposit transactions have unlocked");
+    }
+
     private void onPaymentSent() {
-        if (this instanceof SellerTrade) {
-            HavenoUtils.notificationService.sendTradeNotification(this, Phase.PAYMENT_SENT, "Payment Sent", "The buyer has sent the payment"); // TODO (woodser): use language translation
-        }
+        HavenoUtils.notificationService.sendTradeNotification(this, Phase.PAYMENT_SENT, "Payment Sent", "The buyer has sent the payment");
     }
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -2913,6 +2941,7 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
         Optional.ofNullable(payoutTxHex).ifPresent(e -> builder.setPayoutTxHex(payoutTxHex));
         Optional.ofNullable(payoutTxKey).ifPresent(e -> builder.setPayoutTxKey(payoutTxKey));
         Optional.ofNullable(counterCurrencyExtraData).ifPresent(e -> builder.setCounterCurrencyExtraData(counterCurrencyExtraData));
+        Optional.ofNullable(challenge).ifPresent(e -> builder.setChallenge(challenge));
         return builder.build();
     }
 
@@ -2982,6 +3011,7 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
                 ",\n     refundResultState=" + refundResultState +
                 ",\n     refundResultStateProperty=" + refundResultStateProperty +
                 ",\n     isCompleted=" + isCompleted +
+                ",\n     challenge='" + challenge + '\'' +
                 "\n}";
     }
 }

core/src/main/java/haveno/core/trade/TradeManager.java

@@ -561,6 +561,12 @@ public class TradeManager implements PersistedDataHost, DecryptedDirectMessageLi
             OpenOffer openOffer = openOfferOptional.get();
             if (openOffer.getState() != OpenOffer.State.AVAILABLE) return;
             Offer offer = openOffer.getOffer();
+
+            // validate challenge
+            if (openOffer.getChallenge() != null && !HavenoUtils.getChallengeHash(openOffer.getChallenge()).equals(HavenoUtils.getChallengeHash(request.getChallenge()))) {
+                log.warn("Ignoring InitTradeRequest to maker because challenge is incorrect, tradeId={}, sender={}", request.getOfferId(), sender);
+                return;
+            }
   
             // ensure trade does not already exist
             Optional<Trade> tradeOptional = getOpenTrade(request.getOfferId());
@@ -583,7 +589,8 @@ public class TradeManager implements PersistedDataHost, DecryptedDirectMessageLi
                         UUID.randomUUID().toString(),
                         request.getMakerNodeAddress(),
                         request.getTakerNodeAddress(),
-                        request.getArbitratorNodeAddress());
+                        request.getArbitratorNodeAddress(),
+                        openOffer.getChallenge());
             else
                 trade = new SellerAsMakerTrade(offer,
                         BigInteger.valueOf(request.getTradeAmount()),
@@ -593,7 +600,8 @@ public class TradeManager implements PersistedDataHost, DecryptedDirectMessageLi
                         UUID.randomUUID().toString(),
                         request.getMakerNodeAddress(),
                         request.getTakerNodeAddress(),
-                        request.getArbitratorNodeAddress());
+                        request.getArbitratorNodeAddress(),
+                        openOffer.getChallenge());
             trade.getMaker().setPaymentAccountId(trade.getOffer().getOfferPayload().getMakerPaymentAccountId());
             trade.getTaker().setPaymentAccountId(request.getTakerPaymentAccountId());
             trade.getMaker().setPubKeyRing(trade.getOffer().getPubKeyRing());
@@ -646,6 +654,12 @@ public class TradeManager implements PersistedDataHost, DecryptedDirectMessageLi
                 return;
             }
 
+            // validate challenge hash
+            if (offer.getChallengeHash() != null && !offer.getChallengeHash().equals(HavenoUtils.getChallengeHash(request.getChallenge()))) {
+                log.warn("Ignoring InitTradeRequest to arbitrator because challenge hash is incorrect, tradeId={}, sender={}", request.getOfferId(), sender);
+                return;
+            }
+
             // handle trade
             Trade trade;
             Optional<Trade> tradeOptional = getOpenTrade(offer.getId());
@@ -679,7 +693,8 @@ public class TradeManager implements PersistedDataHost, DecryptedDirectMessageLi
                         UUID.randomUUID().toString(),
                         request.getMakerNodeAddress(),
                         request.getTakerNodeAddress(),
-                        request.getArbitratorNodeAddress());
+                        request.getArbitratorNodeAddress(),
+                        request.getChallenge());
 
                 // set reserve tx hash if available
                 Optional<SignedOffer> signedOfferOptional = openOfferManager.getSignedOfferById(request.getOfferId());
@@ -873,7 +888,8 @@ public class TradeManager implements PersistedDataHost, DecryptedDirectMessageLi
                     UUID.randomUUID().toString(),
                     offer.getMakerNodeAddress(),
                     P2PService.getMyNodeAddress(),
-                    null);
+                    null,
+                    offer.getChallenge());
         } else {
             trade = new BuyerAsTakerTrade(offer,
                     amount,
@@ -883,7 +899,8 @@ public class TradeManager implements PersistedDataHost, DecryptedDirectMessageLi
                     UUID.randomUUID().toString(),
                     offer.getMakerNodeAddress(),
                     P2PService.getMyNodeAddress(),
-                    null);
+                    null,
+                    offer.getChallenge());
         }
         trade.getProcessModel().setUseSavingsWallet(useSavingsWallet);
         trade.getProcessModel().setFundsNeededForTrade(fundsNeededForTrade.longValueExact());
@@ -994,7 +1011,6 @@ public class TradeManager implements PersistedDataHost, DecryptedDirectMessageLi
         if (tradeOptional.isPresent()) {
             Trade trade = tradeOptional.get();
             trade.setDisputeState(disputeState);
-            onTradeCompleted(trade);
             xmrWalletService.resetAddressEntriesForTrade(trade.getId());
             requestPersistence();
         }
@@ -1128,7 +1144,7 @@ public class TradeManager implements PersistedDataHost, DecryptedDirectMessageLi
                                 log.warn("We found a closed trade with locked up funds. " +
                                         "That should never happen. trade ID={} ID={}, state={}, payoutState={}, disputeState={}", trade.getClass().getSimpleName(), trade.getId(), trade.getState(), trade.getPayoutState(), trade.getDisputeState());
                             }
-                        } else {
+                        } else if (!trade.hasBuyerAsTakerWithoutDeposit()) {
                             log.warn("Closed trade with locked up funds missing taker deposit tx. {} ID={}, state={}, payoutState={}, disputeState={}", trade.getClass().getSimpleName(), trade.getId(), trade.getState(), trade.getPayoutState(), trade.getDisputeState());
                             tradeTxException.set(new TradeTxException(Res.get("error.closedTradeWithNoDepositTx", trade.getShortId())));
                         }

core/src/main/java/haveno/core/trade/messages/DepositRequest.java

@@ -33,7 +33,9 @@ import java.util.Optional;
 public final class DepositRequest extends TradeMessage implements DirectMessage {
     private final long currentDate;
     private final byte[] contractSignature;
+    @Nullable
     private final String depositTxHex;
+    @Nullable
     private final String depositTxKey;
     @Nullable
     private final byte[] paymentAccountKey;
@@ -43,8 +45,8 @@ public final class DepositRequest extends TradeMessage implements DirectMessage
                                      String messageVersion,
                                      long currentDate,
                                      byte[] contractSignature,
-                                     String depositTxHex,
-                                     String depositTxKey,
+                                     @Nullable String depositTxHex,
+                                     @Nullable String depositTxKey,
                                      @Nullable byte[] paymentAccountKey) {
         super(messageVersion, tradeId, uid);
         this.currentDate = currentDate;
@@ -63,13 +65,12 @@ public final class DepositRequest extends TradeMessage implements DirectMessage
     public protobuf.NetworkEnvelope toProtoNetworkEnvelope() {
         protobuf.DepositRequest.Builder builder = protobuf.DepositRequest.newBuilder()
                 .setTradeId(offerId)
-                .setUid(uid)
-                .setDepositTxHex(depositTxHex)
-                .setDepositTxKey(depositTxKey);
+                .setUid(uid);
         builder.setCurrentDate(currentDate);
         Optional.ofNullable(paymentAccountKey).ifPresent(e -> builder.setPaymentAccountKey(ByteString.copyFrom(e)));
+        Optional.ofNullable(depositTxHex).ifPresent(builder::setDepositTxHex);
+        Optional.ofNullable(depositTxKey).ifPresent(builder::setDepositTxKey);
         Optional.ofNullable(contractSignature).ifPresent(e -> builder.setContractSignature(ByteString.copyFrom(e)));
-
         return getNetworkEnvelopeBuilder().setDepositRequest(builder).build();
     }
 
@@ -81,8 +82,8 @@ public final class DepositRequest extends TradeMessage implements DirectMessage
                 messageVersion,
                 proto.getCurrentDate(),
                 ProtoUtil.byteArrayOrNullFromProto(proto.getContractSignature()),
-                proto.getDepositTxHex(),
-                proto.getDepositTxKey(),
+                ProtoUtil.stringOrNullFromProto(proto.getDepositTxHex()),
+                ProtoUtil.stringOrNullFromProto(proto.getDepositTxKey()),
                 ProtoUtil.byteArrayOrNullFromProto(proto.getPaymentAccountKey()));
     }
 

core/src/main/java/haveno/core/trade/messages/InitTradeRequest.java

@@ -58,6 +58,8 @@ public final class InitTradeRequest extends TradeMessage implements DirectMessag
     private final String reserveTxKey;
     @Nullable
     private final String payoutAddress;
+    @Nullable
+    private final String challenge;
 
     public InitTradeRequest(TradeProtocolVersion tradeProtocolVersion,
                                     String offerId,
@@ -79,7 +81,8 @@ public final class InitTradeRequest extends TradeMessage implements DirectMessag
                                     @Nullable String reserveTxHash,
                                     @Nullable String reserveTxHex,
                                     @Nullable String reserveTxKey,
-                                    @Nullable String payoutAddress) {
+                                    @Nullable String payoutAddress,
+                                    @Nullable String challenge) {
         super(messageVersion, offerId, uid);
         this.tradeProtocolVersion = tradeProtocolVersion;
         this.tradeAmount = tradeAmount;
@@ -99,6 +102,7 @@ public final class InitTradeRequest extends TradeMessage implements DirectMessag
         this.reserveTxHex = reserveTxHex;
         this.reserveTxKey = reserveTxKey;
         this.payoutAddress = payoutAddress;
+        this.challenge = challenge;
     }
 
 
@@ -129,6 +133,7 @@ public final class InitTradeRequest extends TradeMessage implements DirectMessag
         Optional.ofNullable(reserveTxHex).ifPresent(e -> builder.setReserveTxHex(reserveTxHex));
         Optional.ofNullable(reserveTxKey).ifPresent(e -> builder.setReserveTxKey(reserveTxKey));
         Optional.ofNullable(payoutAddress).ifPresent(e -> builder.setPayoutAddress(payoutAddress));
+        Optional.ofNullable(challenge).ifPresent(e -> builder.setChallenge(challenge));
         Optional.ofNullable(accountAgeWitnessSignatureOfOfferId).ifPresent(e -> builder.setAccountAgeWitnessSignatureOfOfferId(ByteString.copyFrom(e)));
         builder.setCurrentDate(currentDate);
 
@@ -158,7 +163,8 @@ public final class InitTradeRequest extends TradeMessage implements DirectMessag
                 ProtoUtil.stringOrNullFromProto(proto.getReserveTxHash()),
                 ProtoUtil.stringOrNullFromProto(proto.getReserveTxHex()),
                 ProtoUtil.stringOrNullFromProto(proto.getReserveTxKey()),
-                ProtoUtil.stringOrNullFromProto(proto.getPayoutAddress()));
+                ProtoUtil.stringOrNullFromProto(proto.getPayoutAddress()),
+                ProtoUtil.stringOrNullFromProto(proto.getChallenge()));
     }
 
     @Override
@@ -183,6 +189,7 @@ public final class InitTradeRequest extends TradeMessage implements DirectMessag
                 ",\n     reserveTxHex=" + reserveTxHex +
                 ",\n     reserveTxKey=" + reserveTxKey +
                 ",\n     payoutAddress=" + payoutAddress +
+                ",\n     challenge=" + challenge +
                 "\n} " + super.toString();
     }
 }

core/src/main/java/haveno/core/trade/messages/SignContractRequest.java

@@ -35,7 +35,9 @@ public final class SignContractRequest extends TradeMessage implements DirectMes
     private final String accountId;
     private final byte[] paymentAccountPayloadHash;
     private final String payoutAddress;
+    @Nullable
     private final String depositTxHash;
+    @Nullable
     private final byte[] accountAgeWitnessSignatureOfDepositHash;
 
     public SignContractRequest(String tradeId,
@@ -45,7 +47,7 @@ public final class SignContractRequest extends TradeMessage implements DirectMes
                                      String accountId,
                                      byte[] paymentAccountPayloadHash,
                                      String payoutAddress,
-                                     String depositTxHash,
+                                     @Nullable String depositTxHash,
                                      @Nullable byte[] accountAgeWitnessSignatureOfDepositHash) {
         super(messageVersion, tradeId, uid);
         this.currentDate = currentDate;
@@ -68,10 +70,9 @@ public final class SignContractRequest extends TradeMessage implements DirectMes
                 .setUid(uid)
                 .setAccountId(accountId)
                 .setPaymentAccountPayloadHash(ByteString.copyFrom(paymentAccountPayloadHash))
-                .setPayoutAddress(payoutAddress)
-                .setDepositTxHash(depositTxHash);
-
+                .setPayoutAddress(payoutAddress);
         Optional.ofNullable(accountAgeWitnessSignatureOfDepositHash).ifPresent(e -> builder.setAccountAgeWitnessSignatureOfDepositHash(ByteString.copyFrom(e)));
+        Optional.ofNullable(depositTxHash).ifPresent(builder::setDepositTxHash);
         builder.setCurrentDate(currentDate);
 
         return getNetworkEnvelopeBuilder().setSignContractRequest(builder).build();
@@ -87,7 +88,7 @@ public final class SignContractRequest extends TradeMessage implements DirectMes
                 proto.getAccountId(),
                 proto.getPaymentAccountPayloadHash().toByteArray(),
                 proto.getPayoutAddress(),
-                proto.getDepositTxHash(),
+                ProtoUtil.stringOrNullFromProto(proto.getDepositTxHash()),
                 ProtoUtil.byteArrayOrNullFromProto(proto.getAccountAgeWitnessSignatureOfDepositHash()));
     }
 

core/src/main/java/haveno/core/trade/protocol/TradePeer.java

@@ -158,7 +158,6 @@ public final class TradePeer implements PersistablePayload {
     }
 
     public BigInteger getSecurityDeposit() {
-        if (depositTxHash == null) return null;
         return BigInteger.valueOf(securityDeposit);
     }
 

core/src/main/java/haveno/core/trade/protocol/tasks/ArbitratorProcessDepositRequest.java

@@ -36,8 +36,9 @@ import monero.daemon.model.MoneroSubmitTxResult;
 import monero.daemon.model.MoneroTx;
 
 import java.math.BigInteger;
-import java.util.Arrays;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 import java.util.UUID;
 
 @Slf4j
@@ -83,72 +84,86 @@ public class ArbitratorProcessDepositRequest extends TradeTask {
         byte[] signature = request.getContractSignature();
 
         // get trader info
-        TradePeer trader = trade.getTradePeer(processModel.getTempTradePeerNodeAddress());
-        if (trader == null) throw new RuntimeException(request.getClass().getSimpleName() + " is not from maker, taker, or arbitrator");
-        PubKeyRing peerPubKeyRing = trader.getPubKeyRing();
+        TradePeer sender = trade.getTradePeer(processModel.getTempTradePeerNodeAddress());
+        if (sender == null) throw new RuntimeException(request.getClass().getSimpleName() + " is not from maker, taker, or arbitrator");
+        PubKeyRing senderPubKeyRing = sender.getPubKeyRing();
 
         // verify signature
-        if (!HavenoUtils.isSignatureValid(peerPubKeyRing, contractAsJson, signature)) {
+        if (!HavenoUtils.isSignatureValid(senderPubKeyRing, contractAsJson, signature)) {
             throw new RuntimeException("Peer's contract signature is invalid");
         }
 
         // set peer's signature
-        trader.setContractSignature(signature);
+        sender.setContractSignature(signature);
 
         // collect expected values
         Offer offer = trade.getOffer();
-        boolean isFromTaker = trader == trade.getTaker();
-        boolean isFromBuyer = trader == trade.getBuyer();
+        boolean isFromTaker = sender == trade.getTaker();
+        boolean isFromBuyer = sender == trade.getBuyer();
         BigInteger tradeFee = isFromTaker ? trade.getTakerFee() : trade.getMakerFee();
         BigInteger sendTradeAmount =  isFromBuyer ? BigInteger.ZERO : trade.getAmount();
         BigInteger securityDeposit = isFromBuyer ? trade.getBuyerSecurityDepositBeforeMiningFee() : trade.getSellerSecurityDepositBeforeMiningFee();
         String depositAddress = processModel.getMultisigAddress();
+        sender.setSecurityDeposit(securityDeposit);
 
         // verify deposit tx
-        MoneroTx verifiedTx;
-        try {
-            verifiedTx = trade.getXmrWalletService().verifyDepositTx(
-                    offer.getId(),
-                    tradeFee,
-                    trade.getProcessModel().getTradeFeeAddress(),
-                    sendTradeAmount,
-                    securityDeposit,
-                    depositAddress,
-                    trader.getDepositTxHash(),
-                    request.getDepositTxHex(),
-                    request.getDepositTxKey(),
-                    null);
-        } catch (Exception e) {
-            throw new RuntimeException("Error processing deposit tx from " + (isFromTaker ? "taker " : "maker ") + trader.getNodeAddress() + ", offerId=" + offer.getId() + ": " + e.getMessage());
+        boolean isFromBuyerAsTakerWithoutDeposit = isFromBuyer && isFromTaker && trade.hasBuyerAsTakerWithoutDeposit();
+        if (!isFromBuyerAsTakerWithoutDeposit) {
+            MoneroTx verifiedTx;
+            try {
+                verifiedTx = trade.getXmrWalletService().verifyDepositTx(
+                        offer.getId(),
+                        tradeFee,
+                        trade.getProcessModel().getTradeFeeAddress(),
+                        sendTradeAmount,
+                        securityDeposit,
+                        depositAddress,
+                        sender.getDepositTxHash(),
+                        request.getDepositTxHex(),
+                        request.getDepositTxKey(),
+                        null);
+            } catch (Exception e) {
+                throw new RuntimeException("Error processing deposit tx from " + (isFromTaker ? "taker " : "maker ") + sender.getNodeAddress() + ", offerId=" + offer.getId() + ": " + e.getMessage());
+            }
+    
+            // update trade state
+            sender.setSecurityDeposit(sender.getSecurityDeposit().subtract(verifiedTx.getFee())); // subtract mining fee from security deposit
+            sender.setDepositTxFee(verifiedTx.getFee());
+            sender.setDepositTxHex(request.getDepositTxHex());
+            sender.setDepositTxKey(request.getDepositTxKey());
         }
 
         // update trade state
-        trader.setSecurityDeposit(securityDeposit.subtract(verifiedTx.getFee())); // subtract mining fee from security deposit
-        trader.setDepositTxFee(verifiedTx.getFee());
-        trader.setDepositTxHex(request.getDepositTxHex());
-        trader.setDepositTxKey(request.getDepositTxKey());
-        if (request.getPaymentAccountKey() != null) trader.setPaymentAccountKey(request.getPaymentAccountKey());
+        if (request.getPaymentAccountKey() != null) sender.setPaymentAccountKey(request.getPaymentAccountKey());
         processModel.getTradeManager().requestPersistence();
 
-        // relay deposit txs when both available
+        // relay deposit txs when both requests received
         MoneroDaemon daemon = trade.getXmrWalletService().getDaemon();
-        if (processModel.getMaker().getDepositTxHex() != null && processModel.getTaker().getDepositTxHex() != null) {
+        if (processModel.getMaker().getContractSignature() != null && processModel.getTaker().getContractSignature() != null) {
 
             // check timeout and extend just before relaying
             if (isTimedOut()) throw new RuntimeException("Trade protocol has timed out before relaying deposit txs for {} {}" + trade.getClass().getSimpleName() + " " + trade.getShortId());
             trade.addInitProgressStep();
 
+            // relay deposit txs
             boolean depositTxsRelayed = false;
+            List<String> txHashes = new ArrayList<>();
             try {
 
-                // submit txs to pool but do not relay
+                // submit maker tx to pool but do not relay
                 MoneroSubmitTxResult makerResult = daemon.submitTxHex(processModel.getMaker().getDepositTxHex(), true);
-                MoneroSubmitTxResult takerResult = daemon.submitTxHex(processModel.getTaker().getDepositTxHex(), true);
                 if (!makerResult.isGood()) throw new RuntimeException("Error submitting maker deposit tx: " + JsonUtils.serialize(makerResult));
-                if (!takerResult.isGood()) throw new RuntimeException("Error submitting taker deposit tx: " + JsonUtils.serialize(takerResult));
+                txHashes.add(processModel.getMaker().getDepositTxHash());
+
+                // submit taker tx to pool but do not relay
+                if (!trade.hasBuyerAsTakerWithoutDeposit()) {
+                    MoneroSubmitTxResult takerResult = daemon.submitTxHex(processModel.getTaker().getDepositTxHex(), true);
+                    if (!takerResult.isGood()) throw new RuntimeException("Error submitting taker deposit tx: " + JsonUtils.serialize(takerResult));
+                    txHashes.add(processModel.getTaker().getDepositTxHash());
+                }
 
                 // relay txs
-                daemon.relayTxsByHash(Arrays.asList(processModel.getMaker().getDepositTxHash(), processModel.getTaker().getDepositTxHash()));
+                daemon.relayTxsByHash(txHashes);
                 depositTxsRelayed = true;
 
                 // update trade state
@@ -160,7 +175,7 @@ public class ArbitratorProcessDepositRequest extends TradeTask {
 
                     // flush txs from pool
                     try {
-                        daemon.flushTxPool(processModel.getMaker().getDepositTxHash(), processModel.getTaker().getDepositTxHash());
+                        daemon.flushTxPool(txHashes);
                     } catch (Exception e2) {
                         log.warn("Error flushing deposit txs from pool for trade {}: {}\n", trade.getId(), e2.getMessage(), e2);
                     }
@@ -180,7 +195,7 @@ public class ArbitratorProcessDepositRequest extends TradeTask {
             });
 
             if (processModel.getMaker().getDepositTxHex() == null) log.info("Arbitrator waiting for deposit request from maker for trade " + trade.getId());
-            if (processModel.getTaker().getDepositTxHex() == null) log.info("Arbitrator waiting for deposit request from taker for trade " + trade.getId());
+            if (processModel.getTaker().getDepositTxHex() == null && !trade.hasBuyerAsTakerWithoutDeposit()) log.info("Arbitrator waiting for deposit request from taker for trade " + trade.getId());
         }
     }
 

core/src/main/java/haveno/core/trade/protocol/tasks/ArbitratorProcessReserveTx.java

@@ -53,38 +53,44 @@ public class ArbitratorProcessReserveTx extends TradeTask {
             TradePeer sender = trade.getTradePeer(processModel.getTempTradePeerNodeAddress());
             boolean isFromMaker = sender == trade.getMaker();
             boolean isFromBuyer = isFromMaker ? offer.getDirection() == OfferDirection.BUY : offer.getDirection() == OfferDirection.SELL;
+            sender = isFromMaker ? processModel.getMaker() : processModel.getTaker();
+            BigInteger securityDeposit = isFromMaker ? isFromBuyer ? offer.getMaxBuyerSecurityDeposit() : offer.getMaxSellerSecurityDeposit() : isFromBuyer ? trade.getBuyerSecurityDepositBeforeMiningFee() : trade.getSellerSecurityDepositBeforeMiningFee();
+            sender.setSecurityDeposit(securityDeposit);
 
             // TODO (woodser): if signer online, should never be called by maker?
 
-            // process reserve tx with expected values
-            BigInteger penaltyFee = HavenoUtils.multiply(isFromMaker ? offer.getAmount() : trade.getAmount(), offer.getPenaltyFeePct());
-            BigInteger tradeFee = isFromMaker ? offer.getMaxMakerFee() : trade.getTakerFee();
-            BigInteger sendAmount =  isFromBuyer ? BigInteger.ZERO : isFromMaker ? offer.getAmount() : trade.getAmount(); // maker reserve tx is for offer amount
-            BigInteger securityDeposit = isFromMaker ? isFromBuyer ? offer.getMaxBuyerSecurityDeposit() : offer.getMaxSellerSecurityDeposit() : isFromBuyer ? trade.getBuyerSecurityDepositBeforeMiningFee() : trade.getSellerSecurityDepositBeforeMiningFee();
-            MoneroTx verifiedTx;
-            try {
-                verifiedTx = trade.getXmrWalletService().verifyReserveTx(
-                    offer.getId(),
-                    penaltyFee,
-                    tradeFee,
-                    sendAmount,
-                    securityDeposit,
-                    request.getPayoutAddress(),
-                    request.getReserveTxHash(),
-                    request.getReserveTxHex(),
-                    request.getReserveTxKey(),
-                    null);
-            } catch (Exception e) {
-                log.error(ExceptionUtils.getStackTrace(e));
-                throw new RuntimeException("Error processing reserve tx from " + (isFromMaker ? "maker " : "taker ") + processModel.getTempTradePeerNodeAddress() + ", offerId=" + offer.getId() + ": " + e.getMessage());
-            }
+            // process reserve tx unless from buyer as taker without deposit
+            boolean isFromBuyerAsTakerWithoutDeposit = isFromBuyer && !isFromMaker && trade.hasBuyerAsTakerWithoutDeposit();
+            if (!isFromBuyerAsTakerWithoutDeposit) {
 
-            // save reserve tx to model
-            TradePeer trader = isFromMaker ? processModel.getMaker() : processModel.getTaker();
-            trader.setSecurityDeposit(securityDeposit.subtract(verifiedTx.getFee())); // subtract mining fee from security deposit
-            trader.setReserveTxHash(request.getReserveTxHash());
-            trader.setReserveTxHex(request.getReserveTxHex());
-            trader.setReserveTxKey(request.getReserveTxKey());
+                // process reserve tx with expected values
+                BigInteger penaltyFee = HavenoUtils.multiply(isFromMaker ? offer.getAmount() : trade.getAmount(), offer.getPenaltyFeePct());
+                BigInteger tradeFee = isFromMaker ? offer.getMaxMakerFee() : trade.getTakerFee();
+                BigInteger sendAmount =  isFromBuyer ? BigInteger.ZERO : isFromMaker ? offer.getAmount() : trade.getAmount(); // maker reserve tx is for offer amount
+                MoneroTx verifiedTx;
+                try {
+                    verifiedTx = trade.getXmrWalletService().verifyReserveTx(
+                        offer.getId(),
+                        penaltyFee,
+                        tradeFee,
+                        sendAmount,
+                        securityDeposit,
+                        request.getPayoutAddress(),
+                        request.getReserveTxHash(),
+                        request.getReserveTxHex(),
+                        request.getReserveTxKey(),
+                        null);
+                } catch (Exception e) {
+                    log.error(ExceptionUtils.getStackTrace(e));
+                    throw new RuntimeException("Error processing reserve tx from " + (isFromMaker ? "maker " : "taker ") + processModel.getTempTradePeerNodeAddress() + ", offerId=" + offer.getId() + ": " + e.getMessage());
+                }
+
+                // save reserve tx to model
+                sender.setSecurityDeposit(sender.getSecurityDeposit().subtract(verifiedTx.getFee())); // subtract mining fee from security deposit
+                sender.setReserveTxHash(request.getReserveTxHash());
+                sender.setReserveTxHex(request.getReserveTxHex());
+                sender.setReserveTxKey(request.getReserveTxKey());
+            }
 
             // persist trade
             processModel.getTradeManager().requestPersistence();

core/src/main/java/haveno/core/trade/protocol/tasks/ArbitratorSendInitTradeOrMultisigRequests.java

@@ -78,6 +78,7 @@ public class ArbitratorSendInitTradeOrMultisigRequests extends TradeTask {
                         null,
                         null,
                         null,
+                        null,
                         null);
 
                 // send request to taker
@@ -118,7 +119,7 @@ public class ArbitratorSendInitTradeOrMultisigRequests extends TradeTask {
 
         // ensure arbitrator has reserve txs
         if (processModel.getMaker().getReserveTxHash() == null) throw new RuntimeException("Arbitrator does not have maker's reserve tx after initializing trade");
-        if (processModel.getTaker().getReserveTxHash() == null) throw new RuntimeException("Arbitrator does not have taker's reserve tx after initializing trade");
+        if (processModel.getTaker().getReserveTxHash() == null && !trade.hasBuyerAsTakerWithoutDeposit()) throw new RuntimeException("Arbitrator does not have taker's reserve tx after initializing trade");
 
         // create wallet for multisig
         MoneroWallet multisigWallet = trade.createWallet();

core/src/main/java/haveno/core/trade/protocol/tasks/BuyerPreparePaymentSentMessage.java

@@ -74,7 +74,7 @@ public class BuyerPreparePaymentSentMessage extends TradeTask {
             Preconditions.checkNotNull(trade.getSeller().getPaymentAccountPayload(), "Seller's payment account payload is null");
             Preconditions.checkNotNull(trade.getAmount(), "trade.getTradeAmount() must not be null");
             Preconditions.checkNotNull(trade.getMakerDepositTx(), "trade.getMakerDepositTx() must not be null");
-            Preconditions.checkNotNull(trade.getTakerDepositTx(), "trade.getTakerDepositTx() must not be null");
+            if (!trade.hasBuyerAsTakerWithoutDeposit()) Preconditions.checkNotNull(trade.getTakerDepositTx(), "trade.getTakerDepositTx() must not be null");
             checkNotNull(trade.getOffer(), "offer must not be null");
 
             // create payout tx if we have seller's updated multisig hex

core/src/main/java/haveno/core/trade/protocol/tasks/MakerSendInitTradeRequestToArbitrator.java

@@ -138,7 +138,8 @@ public class MakerSendInitTradeRequestToArbitrator extends TradeTask {
                 trade.getSelf().getReserveTxHash(),
                 trade.getSelf().getReserveTxHex(),
                 trade.getSelf().getReserveTxKey(),
-                model.getXmrWalletService().getOrCreateAddressEntry(trade.getOffer().getId(), XmrAddressEntry.Context.TRADE_PAYOUT).getAddressString());
+                model.getXmrWalletService().getOrCreateAddressEntry(trade.getOffer().getId(), XmrAddressEntry.Context.TRADE_PAYOUT).getAddressString(),
+                trade.getChallenge());
 
         // send request to arbitrator
         log.info("Sending {} with offerId {} and uid {} to arbitrator {}", arbitratorRequest.getClass().getSimpleName(), arbitratorRequest.getOfferId(), arbitratorRequest.getUid(), trade.getArbitrator().getNodeAddress());

core/src/main/java/haveno/core/trade/protocol/tasks/MaybeSendSignContractRequest.java

@@ -83,7 +83,7 @@ public class MaybeSendSignContractRequest extends TradeTask {
                 if (isTimedOut()) throw new RuntimeException("Trade protocol has timed out while getting lock to create deposit tx, tradeId=" + trade.getShortId());
                 trade.startProtocolTimeout();
 
-                // collect relevant info
+                // collect info
                 Integer subaddressIndex = null;
                 boolean reserveExactAmount = false;
                 if (trade instanceof MakerTrade) {
@@ -97,53 +97,60 @@ public class MaybeSendSignContractRequest extends TradeTask {
                 }
 
                 // attempt creating deposit tx
-                try {
-                    synchronized (HavenoUtils.getWalletFunctionLock()) {
-                        for (int i = 0; i < TradeProtocol.MAX_ATTEMPTS; i++) {
-                            MoneroRpcConnection sourceConnection = trade.getXmrConnectionService().getConnection();
-                            try {
-                                depositTx = trade.getXmrWalletService().createDepositTx(trade, reserveExactAmount, subaddressIndex);
-                            } catch (Exception e) {
-                                log.warn("Error creating deposit tx, tradeId={}, attempt={}/{}, error={}", trade.getShortId(), i + 1, TradeProtocol.MAX_ATTEMPTS, e.getMessage());
-                                trade.getXmrWalletService().handleWalletError(e, sourceConnection);
+                if (!trade.isBuyerAsTakerWithoutDeposit()) {
+                    try {
+                        synchronized (HavenoUtils.getWalletFunctionLock()) {
+                            for (int i = 0; i < TradeProtocol.MAX_ATTEMPTS; i++) {
+                                MoneroRpcConnection sourceConnection = trade.getXmrConnectionService().getConnection();
+                                try {
+                                    depositTx = trade.getXmrWalletService().createDepositTx(trade, reserveExactAmount, subaddressIndex);
+                                } catch (Exception e) {
+                                    log.warn("Error creating deposit tx, tradeId={}, attempt={}/{}, error={}", trade.getShortId(), i + 1, TradeProtocol.MAX_ATTEMPTS, e.getMessage());
+                                    trade.getXmrWalletService().handleWalletError(e, sourceConnection);
+                                    if (isTimedOut()) throw new RuntimeException("Trade protocol has timed out while creating deposit tx, tradeId=" + trade.getShortId());
+                                    if (i == TradeProtocol.MAX_ATTEMPTS - 1) throw e;
+                                    HavenoUtils.waitFor(TradeProtocol.REPROCESS_DELAY_MS); // wait before retrying
+                                }
+                
+                                // check for timeout
                                 if (isTimedOut()) throw new RuntimeException("Trade protocol has timed out while creating deposit tx, tradeId=" + trade.getShortId());
-                                if (i == TradeProtocol.MAX_ATTEMPTS - 1) throw e;
-                                HavenoUtils.waitFor(TradeProtocol.REPROCESS_DELAY_MS); // wait before retrying
+                                if (depositTx != null) break;
                             }
-            
-                            // check for timeout
-                            if (isTimedOut()) throw new RuntimeException("Trade protocol has timed out while creating deposit tx, tradeId=" + trade.getShortId());
-                            if (depositTx != null) break;
                         }
+                    } catch (Exception e) {
+    
+                        // thaw deposit inputs
+                        if (depositTx != null) {
+                            trade.getXmrWalletService().thawOutputs(HavenoUtils.getInputKeyImages(depositTx));
+                            trade.getSelf().setReserveTxKeyImages(null);
+                        }
+    
+                        // re-freeze maker offer inputs
+                        if (trade instanceof MakerTrade) {
+                            trade.getXmrWalletService().freezeOutputs(trade.getOffer().getOfferPayload().getReserveTxKeyImages());
+                        }
+    
+                        throw e;
                     }
-                } catch (Exception e) {
-
-                    // thaw deposit inputs
-                    if (depositTx != null) {
-                        trade.getXmrWalletService().thawOutputs(HavenoUtils.getInputKeyImages(depositTx));
-                        trade.getSelf().setReserveTxKeyImages(null);
-                    }
-
-                    // re-freeze maker offer inputs
-                    if (trade instanceof MakerTrade) {
-                        trade.getXmrWalletService().freezeOutputs(trade.getOffer().getOfferPayload().getReserveTxKeyImages());
-                    }
-
-                    throw e;
                 }
 
                 // reset protocol timeout
                 trade.addInitProgressStep();
 
                 // update trade state
-                BigInteger securityDeposit = trade instanceof BuyerTrade ? trade.getBuyerSecurityDepositBeforeMiningFee() : trade.getSellerSecurityDepositBeforeMiningFee();
-                trade.getSelf().setSecurityDeposit(securityDeposit.subtract(depositTx.getFee()));
-                trade.getSelf().setDepositTx(depositTx);
-                trade.getSelf().setDepositTxHash(depositTx.getHash());
-                trade.getSelf().setDepositTxFee(depositTx.getFee());
-                trade.getSelf().setReserveTxKeyImages(HavenoUtils.getInputKeyImages(depositTx));
                 trade.getSelf().setPayoutAddressString(trade.getXmrWalletService().getOrCreateAddressEntry(trade.getOffer().getId(), XmrAddressEntry.Context.TRADE_PAYOUT).getAddressString()); // TODO (woodser): allow custom payout address?
                 trade.getSelf().setPaymentAccountPayload(trade.getProcessModel().getPaymentAccountPayload(trade.getSelf().getPaymentAccountId()));
+                trade.getSelf().setPaymentAccountPayloadHash(trade.getSelf().getPaymentAccountPayload().getHash());
+                BigInteger securityDeposit = trade instanceof BuyerTrade ? trade.getBuyerSecurityDepositBeforeMiningFee() : trade.getSellerSecurityDepositBeforeMiningFee();
+                if (depositTx == null) {
+                    trade.getSelf().setSecurityDeposit(securityDeposit);
+                } else {
+                    trade.getSelf().setSecurityDeposit(securityDeposit.subtract(depositTx.getFee()));
+                    trade.getSelf().setDepositTx(depositTx);
+                    trade.getSelf().setDepositTxHash(depositTx.getHash());
+                    trade.getSelf().setDepositTxFee(depositTx.getFee());
+                    trade.getSelf().setReserveTxKeyImages(HavenoUtils.getInputKeyImages(depositTx));
+                }
             }
 
             // maker signs deposit hash nonce to avoid challenge protocol
@@ -161,7 +168,7 @@ public class MaybeSendSignContractRequest extends TradeTask {
                     trade.getProcessModel().getAccountId(),
                     trade.getSelf().getPaymentAccountPayload().getHash(),
                     trade.getSelf().getPayoutAddressString(),
-                    depositTx.getHash(),
+                    depositTx == null ? null : depositTx.getHash(),
                     sig);
 
             // send request to trading peer

core/src/main/java/haveno/core/trade/protocol/tasks/ProcessSignContractRequest.java

@@ -63,20 +63,20 @@ public class ProcessSignContractRequest extends TradeTask {
           // extract fields from request
           // TODO (woodser): verify request and from maker or taker
           SignContractRequest request = (SignContractRequest) processModel.getTradeMessage();
-          TradePeer trader = trade.getTradePeer(processModel.getTempTradePeerNodeAddress());
-          trader.setDepositTxHash(request.getDepositTxHash());
-          trader.setAccountId(request.getAccountId());
-          trader.setPaymentAccountPayloadHash(request.getPaymentAccountPayloadHash());
-          trader.setPayoutAddressString(request.getPayoutAddress());
+          TradePeer sender = trade.getTradePeer(processModel.getTempTradePeerNodeAddress());
+          sender.setDepositTxHash(request.getDepositTxHash());
+          sender.setAccountId(request.getAccountId());
+          sender.setPaymentAccountPayloadHash(request.getPaymentAccountPayloadHash());
+          sender.setPayoutAddressString(request.getPayoutAddress());
 
           // maker sends witness signature of deposit tx hash
-          if (trader == trade.getMaker()) {
-            trader.setAccountAgeWitnessNonce(request.getDepositTxHash().getBytes(Charsets.UTF_8));
-            trader.setAccountAgeWitnessSignature(request.getAccountAgeWitnessSignatureOfDepositHash());
+          if (sender == trade.getMaker()) {
+            sender.setAccountAgeWitnessNonce(request.getDepositTxHash().getBytes(Charsets.UTF_8));
+            sender.setAccountAgeWitnessSignature(request.getAccountAgeWitnessSignatureOfDepositHash());
           }
 
-          // sign contract only when both deposit txs hashes known
-          if (processModel.getMaker().getDepositTxHash() == null || processModel.getTaker().getDepositTxHash() == null) {
+          // sign contract only when received from both peers
+          if (processModel.getMaker().getPaymentAccountPayloadHash() == null || processModel.getTaker().getPaymentAccountPayloadHash() == null) {
               complete();
               return;
           }

core/src/main/java/haveno/core/trade/protocol/tasks/SendDepositRequest.java

@@ -82,8 +82,8 @@ public class SendDepositRequest extends TradeTask {
                         Version.getP2PMessageVersion(),
                         new Date().getTime(),
                         trade.getSelf().getContractSignature(),
-                        trade.getSelf().getDepositTx().getFullHex(),
-                        trade.getSelf().getDepositTx().getKey(),
+                        trade.getSelf().getDepositTx() == null ? null : trade.getSelf().getDepositTx().getFullHex(),
+                        trade.getSelf().getDepositTx() == null ? null : trade.getSelf().getDepositTx().getKey(),
                         trade.getSelf().getPaymentAccountKey());
 
                 // update trade state

core/src/main/java/haveno/core/trade/protocol/tasks/TakerReserveTradeFunds.java

@@ -47,62 +47,63 @@ public class TakerReserveTradeFunds extends TradeTask {
                 throw new RuntimeException("Expected taker trade but was " + trade.getClass().getSimpleName() + " " + trade.getShortId() + ". That should never happen.");
             }
 
-            // create reserve tx
+            // create reserve tx unless deposit not required from buyer as taker
             MoneroTxWallet reserveTx = null;
-            synchronized (HavenoUtils.xmrWalletService.getWalletLock()) {
+            if (!trade.isBuyerAsTakerWithoutDeposit()) {
+                synchronized (HavenoUtils.xmrWalletService.getWalletLock()) {
 
-                // check for timeout
-                if (isTimedOut()) throw new RuntimeException("Trade protocol has timed out while getting lock to create reserve tx, tradeId=" + trade.getShortId());
-                trade.startProtocolTimeout();
+                    // check for timeout
+                    if (isTimedOut()) throw new RuntimeException("Trade protocol has timed out while getting lock to create reserve tx, tradeId=" + trade.getShortId());
+                    trade.startProtocolTimeout();
 
-                // collect relevant info
-                BigInteger penaltyFee = HavenoUtils.multiply(trade.getAmount(), trade.getOffer().getPenaltyFeePct());
-                BigInteger takerFee = trade.getTakerFee();
-                BigInteger sendAmount = trade.getOffer().getDirection() == OfferDirection.BUY ? trade.getAmount() : BigInteger.ZERO;
-                BigInteger securityDeposit = trade.getOffer().getDirection() == OfferDirection.BUY ? trade.getSellerSecurityDepositBeforeMiningFee() : trade.getBuyerSecurityDepositBeforeMiningFee();
-                String returnAddress = trade.getXmrWalletService().getOrCreateAddressEntry(trade.getOffer().getId(), XmrAddressEntry.Context.TRADE_PAYOUT).getAddressString();
+                    // collect relevant info
+                    BigInteger penaltyFee = HavenoUtils.multiply(trade.getAmount(), trade.getOffer().getPenaltyFeePct());
+                    BigInteger takerFee = trade.getTakerFee();
+                    BigInteger sendAmount = trade.getOffer().getDirection() == OfferDirection.BUY ? trade.getAmount() : BigInteger.ZERO;
+                    BigInteger securityDeposit = trade.getSecurityDepositBeforeMiningFee();
+                    String returnAddress = trade.getXmrWalletService().getOrCreateAddressEntry(trade.getOffer().getId(), XmrAddressEntry.Context.TRADE_PAYOUT).getAddressString();
 
-                // attempt creating reserve tx
-                try {
-                    synchronized (HavenoUtils.getWalletFunctionLock()) {
-                        for (int i = 0; i < TradeProtocol.MAX_ATTEMPTS; i++) {
-                            MoneroRpcConnection sourceConnection = trade.getXmrConnectionService().getConnection();
-                            try {
-                                reserveTx = model.getXmrWalletService().createReserveTx(penaltyFee, takerFee, sendAmount, securityDeposit, returnAddress, false, null);
-                            } catch (Exception e) {
-                                log.warn("Error creating reserve tx, tradeId={}, attempt={}/{}, error={}", trade.getShortId(), i + 1, TradeProtocol.MAX_ATTEMPTS, e.getMessage());
-                                trade.getXmrWalletService().handleWalletError(e, sourceConnection);
+                    // attempt creating reserve tx
+                    try {
+                        synchronized (HavenoUtils.getWalletFunctionLock()) {
+                            for (int i = 0; i < TradeProtocol.MAX_ATTEMPTS; i++) {
+                                MoneroRpcConnection sourceConnection = trade.getXmrConnectionService().getConnection();
+                                try {
+                                    reserveTx = model.getXmrWalletService().createReserveTx(penaltyFee, takerFee, sendAmount, securityDeposit, returnAddress, false, null);
+                                } catch (Exception e) {
+                                    log.warn("Error creating reserve tx, tradeId={}, attempt={}/{}, error={}", trade.getShortId(), i + 1, TradeProtocol.MAX_ATTEMPTS, e.getMessage());
+                                    trade.getXmrWalletService().handleWalletError(e, sourceConnection);
+                                    if (isTimedOut()) throw new RuntimeException("Trade protocol has timed out while creating reserve tx, tradeId=" + trade.getShortId());
+                                    if (i == TradeProtocol.MAX_ATTEMPTS - 1) throw e;
+                                    HavenoUtils.waitFor(TradeProtocol.REPROCESS_DELAY_MS); // wait before retrying
+                                }
+                
+                                // check for timeout
                                 if (isTimedOut()) throw new RuntimeException("Trade protocol has timed out while creating reserve tx, tradeId=" + trade.getShortId());
-                                if (i == TradeProtocol.MAX_ATTEMPTS - 1) throw e;
-                                HavenoUtils.waitFor(TradeProtocol.REPROCESS_DELAY_MS); // wait before retrying
+                                if (reserveTx != null) break;
                             }
-            
-                            // check for timeout
-                            if (isTimedOut()) throw new RuntimeException("Trade protocol has timed out while creating reserve tx, tradeId=" + trade.getShortId());
-                            if (reserveTx != null) break;
                         }
-                    }
-                } catch (Exception e) {
+                    } catch (Exception e) {
 
-                    // reset state with wallet lock
-                    model.getXmrWalletService().resetAddressEntriesForTrade(trade.getId());
-                    if (reserveTx != null) {
-                        model.getXmrWalletService().thawOutputs(HavenoUtils.getInputKeyImages(reserveTx));
-                        trade.getSelf().setReserveTxKeyImages(null);
+                        // reset state with wallet lock
+                        model.getXmrWalletService().resetAddressEntriesForTrade(trade.getId());
+                        if (reserveTx != null) {
+                            model.getXmrWalletService().thawOutputs(HavenoUtils.getInputKeyImages(reserveTx));
+                            trade.getSelf().setReserveTxKeyImages(null);
+                        }
+
+                        throw e;
                     }
 
-                    throw e;
+                    // reset protocol timeout
+                    trade.startProtocolTimeout();
+
+                    // update trade state
+                    trade.getTaker().setReserveTxHash(reserveTx.getHash());
+                    trade.getTaker().setReserveTxHex(reserveTx.getFullHex());
+                    trade.getTaker().setReserveTxKey(reserveTx.getKey());
+                    trade.getTaker().setReserveTxKeyImages(HavenoUtils.getInputKeyImages(reserveTx));
                 }
-
-
-                // reset protocol timeout
-                trade.startProtocolTimeout();
-
-                // update trade state
-                trade.getTaker().setReserveTxHash(reserveTx.getHash());
-                trade.getTaker().setReserveTxHex(reserveTx.getFullHex());
-                trade.getTaker().setReserveTxKey(reserveTx.getKey());
-                trade.getTaker().setReserveTxKeyImages(HavenoUtils.getInputKeyImages(reserveTx));
             }
 
             // save process state

core/src/main/java/haveno/core/trade/protocol/tasks/TakerSendInitTradeRequestToArbitrator.java

@@ -48,7 +48,9 @@ public class TakerSendInitTradeRequestToArbitrator extends TradeTask {
             InitTradeRequest sourceRequest = (InitTradeRequest) processModel.getTradeMessage(); // arbitrator's InitTradeRequest to taker
             checkNotNull(sourceRequest);
             checkTradeId(processModel.getOfferId(), sourceRequest);
-            if (trade.getSelf().getReserveTxHash() == null || trade.getSelf().getReserveTxHash().isEmpty()) throw new IllegalStateException("Reserve tx id is not initialized: " + trade.getSelf().getReserveTxHash());
+            if (!trade.isBuyerAsTakerWithoutDeposit() && trade.getSelf().getReserveTxHash() == null) {
+                throw new IllegalStateException("Taker reserve tx id is not initialized: " + trade.getSelf().getReserveTxHash());
+            }
 
             // create request to arbitrator
             Offer offer = processModel.getOffer();
@@ -73,7 +75,8 @@ public class TakerSendInitTradeRequestToArbitrator extends TradeTask {
                     trade.getSelf().getReserveTxHash(),
                     trade.getSelf().getReserveTxHex(),
                     trade.getSelf().getReserveTxKey(),
-                    model.getXmrWalletService().getAddressEntry(offer.getId(), XmrAddressEntry.Context.TRADE_PAYOUT).get().getAddressString());
+                    model.getXmrWalletService().getAddressEntry(offer.getId(), XmrAddressEntry.Context.TRADE_PAYOUT).get().getAddressString(),
+                    trade.getChallenge());
 
             // send request to arbitrator
             log.info("Sending {} with offerId {} and uid {} to arbitrator {}", arbitratorRequest.getClass().getSimpleName(), arbitratorRequest.getOfferId(), arbitratorRequest.getUid(), trade.getArbitrator().getNodeAddress());

core/src/main/java/haveno/core/trade/protocol/tasks/TakerSendInitTradeRequestToMaker.java

@@ -47,7 +47,9 @@ public class TakerSendInitTradeRequestToMaker extends TradeTask {
             runInterceptHook();
 
             // verify trade state
-            if (trade.getSelf().getReserveTxHash() == null || trade.getSelf().getReserveTxHash().isEmpty()) throw new IllegalStateException("Reserve tx id is not initialized: " + trade.getSelf().getReserveTxHash());
+            if (!trade.isBuyerAsTakerWithoutDeposit() && trade.getSelf().getReserveTxHash() == null) {
+                throw new IllegalStateException("Taker reserve tx id is not initialized: " + trade.getSelf().getReserveTxHash());
+            }
 
             // collect fields
             Offer offer = model.getOffer();
@@ -55,6 +57,7 @@ public class TakerSendInitTradeRequestToMaker extends TradeTask {
             P2PService p2PService = processModel.getP2PService();
             XmrWalletService walletService = model.getXmrWalletService();
             String payoutAddress = walletService.getOrCreateAddressEntry(offer.getId(), XmrAddressEntry.Context.TRADE_PAYOUT).getAddressString();
+            String challenge = model.getChallenge();
 
             // taker signs offer using offer id as nonce to avoid challenge protocol
             byte[] sig = HavenoUtils.sign(p2PService.getKeyRing(), offer.getId());
@@ -81,7 +84,8 @@ public class TakerSendInitTradeRequestToMaker extends TradeTask {
                     null, // reserve tx not sent from taker to maker
                     null,
                     null,
-                    payoutAddress);
+                    payoutAddress,
+                    challenge);
 
             // send request to maker
             log.info("Sending {} with offerId {} and uid {} to maker {}", makerRequest.getClass().getSimpleName(), makerRequest.getOfferId(), makerRequest.getUid(), trade.getMaker().getNodeAddress());

core/src/main/java/haveno/core/user/Preferences.java

@@ -616,14 +616,14 @@ public final class Preferences implements PersistedDataHost, BridgeAddressProvid
         requestPersistence();
     }
 
-    public void setBuyerSecurityDepositAsPercent(double buyerSecurityDepositAsPercent, PaymentAccount paymentAccount) {
-        double max = Restrictions.getMaxBuyerSecurityDepositAsPercent();
-        double min = Restrictions.getMinBuyerSecurityDepositAsPercent();
+    public void setSecurityDepositAsPercent(double securityDepositAsPercent, PaymentAccount paymentAccount) {
+        double max = Restrictions.getMaxSecurityDepositAsPercent();
+        double min = Restrictions.getMinSecurityDepositAsPercent();
 
         if (PaymentAccountUtil.isCryptoCurrencyAccount(paymentAccount))
-            prefPayload.setBuyerSecurityDepositAsPercentForCrypto(Math.min(max, Math.max(min, buyerSecurityDepositAsPercent)));
+            prefPayload.setSecurityDepositAsPercentForCrypto(Math.min(max, Math.max(min, securityDepositAsPercent)));
         else
-            prefPayload.setBuyerSecurityDepositAsPercent(Math.min(max, Math.max(min, buyerSecurityDepositAsPercent)));
+            prefPayload.setSecurityDepositAsPercent(Math.min(max, Math.max(min, securityDepositAsPercent)));
         requestPersistence();
     }
 
@@ -755,6 +755,11 @@ public final class Preferences implements PersistedDataHost, BridgeAddressProvid
         requestPersistence();
     }
 
+    public void setShowPrivateOffers(boolean value) {
+        prefPayload.setShowPrivateOffers(value);
+        requestPersistence();
+    }
+
     public void setDenyApiTaker(boolean value) {
         prefPayload.setDenyApiTaker(value);
         requestPersistence();
@@ -838,16 +843,16 @@ public final class Preferences implements PersistedDataHost, BridgeAddressProvid
         return prefPayload.isSplitOfferOutput();
     }
 
-    public double getBuyerSecurityDepositAsPercent(PaymentAccount paymentAccount) {
+    public double getSecurityDepositAsPercent(PaymentAccount paymentAccount) {
         double value = PaymentAccountUtil.isCryptoCurrencyAccount(paymentAccount) ?
-                prefPayload.getBuyerSecurityDepositAsPercentForCrypto() : prefPayload.getBuyerSecurityDepositAsPercent();
+                prefPayload.getSecurityDepositAsPercentForCrypto() : prefPayload.getSecurityDepositAsPercent();
 
-        if (value < Restrictions.getMinBuyerSecurityDepositAsPercent()) {
-            value = Restrictions.getMinBuyerSecurityDepositAsPercent();
-            setBuyerSecurityDepositAsPercent(value, paymentAccount);
+        if (value < Restrictions.getMinSecurityDepositAsPercent()) {
+            value = Restrictions.getMinSecurityDepositAsPercent();
+            setSecurityDepositAsPercent(value, paymentAccount);
         }
 
-        return value == 0 ? Restrictions.getDefaultBuyerSecurityDepositAsPercent() : value;
+        return value == 0 ? Restrictions.getDefaultSecurityDepositAsPercent() : value;
     }
 
     @Override

core/src/main/java/haveno/core/user/PreferencesPayload.java

@@ -41,7 +41,7 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import static haveno.core.xmr.wallet.Restrictions.getDefaultBuyerSecurityDepositAsPercent;
+import static haveno.core.xmr.wallet.Restrictions.getDefaultSecurityDepositAsPercent;
 
 @Slf4j
 @Data
@@ -120,10 +120,10 @@ public final class PreferencesPayload implements PersistableEnvelope {
     private String rpcPw;
     @Nullable
     private String takeOfferSelectedPaymentAccountId;
-    private double buyerSecurityDepositAsPercent = getDefaultBuyerSecurityDepositAsPercent();
+    private double securityDepositAsPercent = getDefaultSecurityDepositAsPercent();
     private int ignoreDustThreshold = 600;
     private int clearDataAfterDays = Preferences.CLEAR_DATA_AFTER_DAYS_INITIAL;
-    private double buyerSecurityDepositAsPercentForCrypto = getDefaultBuyerSecurityDepositAsPercent();
+    private double securityDepositAsPercentForCrypto = getDefaultSecurityDepositAsPercent();
     private int blockNotifyPort;
     private boolean tacAcceptedV120;
     private double bsqAverageTrimThreshold = 0.05;
@@ -134,6 +134,7 @@ public final class PreferencesPayload implements PersistableEnvelope {
     // Added in 1.5.5
     private boolean hideNonAccountPaymentMethods;
     private boolean showOffersMatchingMyAccounts;
+    private boolean showPrivateOffers;
     private boolean denyApiTaker;
     private boolean notifyOnPreRelease;
 
@@ -193,10 +194,10 @@ public final class PreferencesPayload implements PersistableEnvelope {
                 .setUseStandbyMode(useStandbyMode)
                 .setUseSoundForNotifications(useSoundForNotifications)
                 .setUseSoundForNotificationsInitialized(useSoundForNotificationsInitialized)
-                .setBuyerSecurityDepositAsPercent(buyerSecurityDepositAsPercent)
+                .setSecurityDepositAsPercent(securityDepositAsPercent)
                 .setIgnoreDustThreshold(ignoreDustThreshold)
                 .setClearDataAfterDays(clearDataAfterDays)
-                .setBuyerSecurityDepositAsPercentForCrypto(buyerSecurityDepositAsPercentForCrypto)
+                .setSecurityDepositAsPercentForCrypto(securityDepositAsPercentForCrypto)
                 .setBlockNotifyPort(blockNotifyPort)
                 .setTacAcceptedV120(tacAcceptedV120)
                 .setBsqAverageTrimThreshold(bsqAverageTrimThreshold)
@@ -205,6 +206,7 @@ public final class PreferencesPayload implements PersistableEnvelope {
                         .collect(Collectors.toList()))
                 .setHideNonAccountPaymentMethods(hideNonAccountPaymentMethods)
                 .setShowOffersMatchingMyAccounts(showOffersMatchingMyAccounts)
+                .setShowPrivateOffers(showPrivateOffers)
                 .setDenyApiTaker(denyApiTaker)
                 .setNotifyOnPreRelease(notifyOnPreRelease);
 
@@ -297,10 +299,10 @@ public final class PreferencesPayload implements PersistableEnvelope {
                 proto.getRpcUser().isEmpty() ? null : proto.getRpcUser(),
                 proto.getRpcPw().isEmpty() ? null : proto.getRpcPw(),
                 proto.getTakeOfferSelectedPaymentAccountId().isEmpty() ? null : proto.getTakeOfferSelectedPaymentAccountId(),
-                proto.getBuyerSecurityDepositAsPercent(),
+                proto.getSecurityDepositAsPercent(),
                 proto.getIgnoreDustThreshold(),
                 proto.getClearDataAfterDays(),
-                proto.getBuyerSecurityDepositAsPercentForCrypto(),
+                proto.getSecurityDepositAsPercentForCrypto(),
                 proto.getBlockNotifyPort(),
                 proto.getTacAcceptedV120(),
                 proto.getBsqAverageTrimThreshold(),
@@ -310,6 +312,7 @@ public final class PreferencesPayload implements PersistableEnvelope {
                                 .collect(Collectors.toList())),
                 proto.getHideNonAccountPaymentMethods(),
                 proto.getShowOffersMatchingMyAccounts(),
+                proto.getShowPrivateOffers(),
                 proto.getDenyApiTaker(),
                 proto.getNotifyOnPreRelease(),
                 XmrNodeSettings.fromProto(proto.getXmrNodeSettings())

core/src/main/java/haveno/core/util/coin/CoinUtil.java

@@ -47,35 +47,35 @@ public class CoinUtil {
     }
 
     /**
-     * @param value Btc amount to be converted to percent value. E.g. 0.01 BTC is 1% (of 1 BTC)
+     * @param value Xmr amount to be converted to percent value. E.g. 0.01 XMR is 1% (of 1 XMR)
      * @return The percentage value as double (e.g. 1% is 0.01)
      */
-    public static double getAsPercentPerBtc(BigInteger value) {
-        return getAsPercentPerBtc(value, HavenoUtils.xmrToAtomicUnits(1.0));
+    public static double getAsPercentPerXmr(BigInteger value) {
+        return getAsPercentPerXmr(value, HavenoUtils.xmrToAtomicUnits(1.0));
     }
 
     /**
-     * @param part Btc amount to be converted to percent value, based on total value passed.
-     *              E.g. 0.1 BTC is 25% (of 0.4 BTC)
-     * @param total Total Btc amount the percentage part is calculated from
+     * @param part Xmr amount to be converted to percent value, based on total value passed.
+     *              E.g. 0.1 XMR is 25% (of 0.4 XMR)
+     * @param total Total Xmr amount the percentage part is calculated from
      *
      * @return The percentage value as double (e.g. 1% is 0.01)
      */
-    public static double getAsPercentPerBtc(BigInteger part, BigInteger total) {
+    public static double getAsPercentPerXmr(BigInteger part, BigInteger total) {
         return MathUtils.roundDouble(HavenoUtils.divide(part == null ? BigInteger.ZERO : part, total == null ? BigInteger.valueOf(1) : total), 4);
     }
 
     /**
      * @param percent       The percentage value as double (e.g. 1% is 0.01)
      * @param amount        The amount as atomic units for the percentage calculation
-     * @return The percentage as atomic units (e.g. 1% of 1 BTC is 0.01 BTC)
+     * @return The percentage as atomic units (e.g. 1% of 1 XMR is 0.01 XMR)
      */
     public static BigInteger getPercentOfAmount(double percent, BigInteger amount) {
         if (amount == null) amount = BigInteger.ZERO;
         return BigDecimal.valueOf(percent).multiply(new BigDecimal(amount)).setScale(8, RoundingMode.DOWN).toBigInteger();
     }
 
-    public static BigInteger getRoundedAmount(BigInteger amount, Price price, long maxTradeLimit, String currencyCode, String paymentMethodId) {
+    public static BigInteger getRoundedAmount(BigInteger amount, Price price, Long maxTradeLimit, String currencyCode, String paymentMethodId) {
         if (PaymentMethod.isRoundedForAtmCash(paymentMethodId)) {
             return getRoundedAtmCashAmount(amount, price, maxTradeLimit);
         } else if (CurrencyUtil.isVolumeRoundedToNearestUnit(currencyCode)) {
@@ -86,7 +86,7 @@ public class CoinUtil {
         return amount;
     }
 
-    public static BigInteger getRoundedAtmCashAmount(BigInteger amount, Price price, long maxTradeLimit) {
+    public static BigInteger getRoundedAtmCashAmount(BigInteger amount, Price price, Long maxTradeLimit) {
         return getAdjustedAmount(amount, price, maxTradeLimit, 10);
     }
 
@@ -99,11 +99,11 @@ public class CoinUtil {
      * @param maxTradeLimit     The max. trade limit of the users account, in atomic units.
      * @return The adjusted amount
      */
-    public static BigInteger getRoundedAmountUnit(BigInteger amount, Price price, long maxTradeLimit) {
+    public static BigInteger getRoundedAmountUnit(BigInteger amount, Price price, Long maxTradeLimit) {
         return getAdjustedAmount(amount, price, maxTradeLimit, 1);
     }
     
-    public static BigInteger getRoundedAmount4Decimals(BigInteger amount, Price price, long maxTradeLimit) {
+    public static BigInteger getRoundedAmount4Decimals(BigInteger amount, Price price, Long maxTradeLimit) {
         DecimalFormat decimalFormat = new DecimalFormat("#.####");
         double roundedXmrAmount = Double.parseDouble(decimalFormat.format(HavenoUtils.atomicUnitsToXmr(amount)));
         return HavenoUtils.xmrToAtomicUnits(roundedXmrAmount);
@@ -121,7 +121,7 @@ public class CoinUtil {
      * @return The adjusted amount
      */
     @VisibleForTesting
-    static BigInteger getAdjustedAmount(BigInteger amount, Price price, long maxTradeLimit, int factor) {
+    static BigInteger getAdjustedAmount(BigInteger amount, Price price, Long maxTradeLimit, int factor) {
         checkArgument(
                 amount.longValueExact() >= Restrictions.getMinTradeAmount().longValueExact(),
                 "amount needs to be above minimum of " + HavenoUtils.atomicUnitsToXmr(Restrictions.getMinTradeAmount()) + " xmr"
@@ -163,11 +163,13 @@ public class CoinUtil {
 
         // If we are above our trade limit we reduce the amount by the smallestUnitForAmount
         BigInteger smallestUnitForAmountUnadjusted = price.getAmountByVolume(smallestUnitForVolume);
-        while (adjustedAmount > maxTradeLimit) {
-            adjustedAmount -= smallestUnitForAmountUnadjusted.longValueExact();
+        if (maxTradeLimit != null) {
+            while (adjustedAmount > maxTradeLimit) {
+                adjustedAmount -= smallestUnitForAmountUnadjusted.longValueExact();
+            }
         }
         adjustedAmount = Math.max(minTradeAmount, adjustedAmount);
-        adjustedAmount = Math.min(maxTradeLimit, adjustedAmount);
+        if (maxTradeLimit != null) adjustedAmount = Math.min(maxTradeLimit, adjustedAmount);
         return BigInteger.valueOf(adjustedAmount);
     }
 }

core/src/main/java/haveno/core/xmr/wallet/Restrictions.java

@@ -24,11 +24,13 @@ import org.bitcoinj.core.Coin;
 import java.math.BigInteger;
 
 public class Restrictions {
+
+    // configure restrictions
+    public static final double MIN_SECURITY_DEPOSIT_PCT = 0.15;
+    public static final double MAX_SECURITY_DEPOSIT_PCT = 0.5;
     public static BigInteger MIN_TRADE_AMOUNT = HavenoUtils.xmrToAtomicUnits(0.1);
-    public static BigInteger MIN_BUYER_SECURITY_DEPOSIT = HavenoUtils.xmrToAtomicUnits(0.1);
-    // For the seller we use a fixed one as there is no way the seller can cancel the trade
-    // To make it editable would just increase complexity.
-    public static BigInteger MIN_SELLER_SECURITY_DEPOSIT = MIN_BUYER_SECURITY_DEPOSIT;
+    public static BigInteger MIN_SECURITY_DEPOSIT = HavenoUtils.xmrToAtomicUnits(0.1);
+
     // At mediation we require a min. payout to the losing party to keep incentive for the trader to accept the
     // mediated payout. For Refund agent cases we do not have that restriction.
     private static BigInteger MIN_REFUND_AT_MEDIATED_DISPUTE;
@@ -53,31 +55,20 @@ public class Restrictions {
         return MIN_TRADE_AMOUNT;
     }
 
-    public static double getDefaultBuyerSecurityDepositAsPercent() {
-        return 0.15; // 15% of trade amount.
+    public static double getDefaultSecurityDepositAsPercent() {
+        return MIN_SECURITY_DEPOSIT_PCT;
     }
 
-    public static double getMinBuyerSecurityDepositAsPercent() {
-        return 0.15; // 15% of trade amount.
+    public static double getMinSecurityDepositAsPercent() {
+        return MIN_SECURITY_DEPOSIT_PCT;
     }
 
-    public static double getMaxBuyerSecurityDepositAsPercent() {
-        return 0.5; // 50% of trade amount. For a 1 BTC trade it is about 3500 USD @ 7000 USD/BTC
+    public static double getMaxSecurityDepositAsPercent() {
+        return MAX_SECURITY_DEPOSIT_PCT;
     }
 
-    // We use MIN_BUYER_SECURITY_DEPOSIT as well as lower bound in case of small trade amounts.
-    // So 0.0005 BTC is the min. buyer security deposit even with amount of 0.0001 BTC and 0.05% percentage value.
-    public static BigInteger getMinBuyerSecurityDeposit() {
-        return MIN_BUYER_SECURITY_DEPOSIT;
-    }
-
-
-    public static double getSellerSecurityDepositAsPercent() {
-        return 0.15; // 15% of trade amount.
-    }
-
-    public static BigInteger getMinSellerSecurityDeposit() {
-        return MIN_SELLER_SECURITY_DEPOSIT;
+    public static BigInteger getMinSecurityDeposit() {
+        return MIN_SECURITY_DEPOSIT;
     }
 
     // This value must be lower than MIN_BUYER_SECURITY_DEPOSIT and SELLER_SECURITY_DEPOSIT

core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java

@@ -1219,10 +1219,29 @@ public class XmrWalletService extends XmrWalletBase {
         return cachedAvailableBalance;
     }
 
+    public boolean hasAddress(String address) {
+        for (MoneroSubaddress subaddress : getSubaddresses()) {
+            if (subaddress.getAddress().equals(address)) return true;
+        }
+        return false;
+    }
+
     public List<MoneroSubaddress> getSubaddresses() {
         return cachedSubaddresses;
     }
 
+    public BigInteger getAmountSentToSelf(MoneroTxWallet tx) {
+        BigInteger sentToSelfAmount = BigInteger.ZERO;
+        if (tx.getOutgoingTransfer() != null && tx.getOutgoingTransfer().getDestinations() != null) {
+            for (MoneroDestination destination : tx.getOutgoingTransfer().getDestinations()) {
+                if (hasAddress(destination.getAddress())) {
+                    sentToSelfAmount = sentToSelfAmount.add(destination.getAmount());
+                }
+            }
+        }
+        return sentToSelfAmount;
+    }
+
     public List<MoneroOutputWallet> getOutputs(MoneroOutputQuery query) {
         List<MoneroOutputWallet> filteredOutputs = new ArrayList<MoneroOutputWallet>();
         for (MoneroOutputWallet output : cachedOutputs) {
@@ -1279,9 +1298,10 @@ public class XmrWalletService extends XmrWalletBase {
             } else {
 
                 // force restart main wallet if connection changed while syncing
-                log.warn("Force restarting main wallet because connection changed while syncing");
-                forceRestartMainWallet();
-                return;
+                if (wallet != null) {
+                    log.warn("Force restarting main wallet because connection changed while syncing");
+                    forceRestartMainWallet();
+                }
             }
         });
 

core/src/main/resources/i18n/displayStrings.properties

@@ -43,6 +43,8 @@ shared.buyMonero=Buy Monero
 shared.sellMonero=Sell Monero
 shared.buyCurrency=Buy {0}
 shared.sellCurrency=Sell {0}
+shared.buyCurrencyLocked=Buy {0} 🔒
+shared.sellCurrencyLocked=Sell {0} 🔒
 shared.buyingXMRWith=buying XMR with {0}
 shared.sellingXMRFor=selling XMR for {0}
 shared.buyingCurrency=buying {0} (selling XMR)
@@ -107,7 +109,7 @@ shared.chooseTradingAccount=Choose trading account
 shared.faq=Visit FAQ page
 shared.yesCancel=Yes, cancel
 shared.nextStep=Next step
-shared.fundFromSavingsWalletButton=Transfer funds from Haveno wallet
+shared.fundFromSavingsWalletButton=Apply funds from Haveno wallet
 shared.fundFromExternalWalletButton=Open your external wallet for funding
 shared.openDefaultWalletFailed=Failed to open a Monero wallet application. Are you sure you have one installed?
 shared.belowInPercent=Below % from market price
@@ -198,7 +200,7 @@ shared.total=Total
 shared.totalsNeeded=Funds needed
 shared.tradeWalletAddress=Trade wallet address
 shared.tradeWalletBalance=Trade wallet balance
-shared.reserveExactAmount=Reserve only the funds needed. May require a mining fee and 10 confirmations (~20 minutes) before your offer is live.
+shared.reserveExactAmount=Reserve only the necessary funds. Requires a mining fee and ~20 minutes before your offer goes live.
 shared.makerTxFee=Maker: {0}
 shared.takerTxFee=Taker: {0}
 shared.iConfirm=I confirm
@@ -349,6 +351,7 @@ market.trades.showVolumeInUSD=Show volume in USD
 offerbook.createOffer=Create offer
 offerbook.takeOffer=Take offer
 offerbook.takeOffer.createAccount=Create account and take offer
+offerbook.takeOffer.enterChallenge=Enter the offer passphrase
 offerbook.trader=Trader
 offerbook.offerersBankId=Maker''s bank ID (BIC/SWIFT): {0}
 offerbook.offerersBankName=Maker''s bank name: {0}
@@ -360,6 +363,8 @@ offerbook.availableOffersToSell=Sell {0} for {1}
 offerbook.filterByCurrency=Choose currency
 offerbook.filterByPaymentMethod=Choose payment method
 offerbook.matchingOffers=Offers matching my accounts
+offerbook.filterNoDeposit=No deposit
+offerbook.noDepositOffers=Offers with no deposit (passphrase required)
 offerbook.timeSinceSigning=Account info
 offerbook.timeSinceSigning.info.arbitrator=signed by an arbitrator and can sign peer accounts
 offerbook.timeSinceSigning.info.peer=signed by a peer, waiting %d days for limits to be lifted
@@ -414,7 +419,7 @@ offerbook.warning.counterpartyTradeRestrictions=This offer cannot be taken due t
 
 offerbook.warning.newVersionAnnouncement=With this version of the software, trading peers can verify and sign each others' payment accounts to create a network of trusted payment accounts.\n\n\
  After successfully trading with a peer with a verified payment account, your payment account will be signed and trading limits will be lifted after a certain time interval (length of this interval is based on the verification method).\n\n\
-  For more information on account signing, please see the documentation at [HYPERLINK:https://haveno.exchange/wiki/Account_limits#Account_signing].
+  For more information on account signing, please see the documentation at [HYPERLINK:https://docs.haveno.exchange/the-project/account_limits/#account-signing].
 
 popup.warning.tradeLimitDueAccountAgeRestriction.seller=The allowed trade amount is limited to {0} because of security restrictions based on the following criteria:\n\
  - The buyer''s account has not been signed by an arbitrator or a peer\n\
@@ -527,7 +532,10 @@ createOffer.setDepositAsBuyer=Set my security deposit as buyer (%)
 createOffer.setDepositForBothTraders=Set both traders' security deposit (%)
 createOffer.securityDepositInfo=Your buyer''s security deposit will be {0}
 createOffer.securityDepositInfoAsBuyer=Your security deposit as buyer will be {0}
-createOffer.minSecurityDepositUsed=Min. buyer security deposit is used
+createOffer.minSecurityDepositUsed=Minimum security deposit is used
+createOffer.buyerAsTakerWithoutDeposit=No deposit required from buyer (passphrase protected)
+createOffer.myDeposit=My security deposit (%)
+createOffer.myDepositInfo=Your security deposit will be {0}
 
 
 ####################################################################
@@ -553,6 +561,8 @@ takeOffer.fundsBox.networkFee=Total mining fees
 takeOffer.fundsBox.takeOfferSpinnerInfo=Taking offer: {0}
 takeOffer.fundsBox.paymentLabel=Haveno trade with ID {0}
 takeOffer.fundsBox.fundsStructure=({0} security deposit, {1} trade fee)
+takeOffer.fundsBox.noFundingRequiredTitle=No funding required
+takeOffer.fundsBox.noFundingRequiredDescription=Get the offer passphrase from the seller outside Haveno to take this offer.
 takeOffer.success.headline=You have successfully taken an offer.
 takeOffer.success.info=You can see the status of your trade at \"Portfolio/Open trades\".
 takeOffer.error.message=An error occurred when taking the offer.\n\n{0}
@@ -1315,6 +1325,8 @@ settings.net.p2pHeader=Haveno network
 settings.net.onionAddressLabel=My onion address
 settings.net.xmrNodesLabel=Use custom Monero nodes
 settings.net.moneroPeersLabel=Connected peers
+settings.net.connection=Connection
+settings.net.connected=Connected
 settings.net.useTorForXmrJLabel=Use Tor for Monero network
 settings.net.useTorForXmrAfterSyncRadio=After wallet is synchronized
 settings.net.useTorForXmrOffRadio=Never
@@ -1966,6 +1978,7 @@ offerDetailsWindow.confirm.taker=Confirm: Take offer to {0} monero
 offerDetailsWindow.confirm.takerCrypto=Confirm: Take offer to {0} {1}
 offerDetailsWindow.creationDate=Creation date
 offerDetailsWindow.makersOnion=Maker's onion address
+offerDetailsWindow.challenge=Offer passphrase
 
 qRCodeWindow.headline=QR Code
 qRCodeWindow.msg=Please use this QR code for funding your Haveno wallet from your external wallet.
@@ -2014,7 +2027,7 @@ tacWindow.disagree=I disagree and quit
 tacWindow.arbitrationSystem=Dispute resolution
 
 tradeDetailsWindow.headline=Trade
-tradeDetailsWindow.disputedPayoutTxId=Disputed payout transaction ID:
+tradeDetailsWindow.disputedPayoutTxId=Disputed payout transaction ID
 tradeDetailsWindow.tradeDate=Trade date
 tradeDetailsWindow.txFee=Mining fee
 tradeDetailsWindow.tradePeersOnion=Trading peers onion address
@@ -2042,6 +2055,9 @@ closedTradesSummaryWindow.totalTradeFeeInXmr.title=Sum of all trade fees paid in
 closedTradesSummaryWindow.totalTradeFeeInXmr.value={0} ({1} of total trade amount)
 walletPasswordWindow.headline=Enter password to unlock
 
+connectionFallback.headline=Connection error
+connectionFallback.msg=Error connecting to your custom Monero node(s).\n\nDo you want to try the next best available Monero node?
+
 torNetworkSettingWindow.header=Tor networks settings
 torNetworkSettingWindow.noBridges=Don't use bridges
 torNetworkSettingWindow.providedBridges=Connect with provided bridges
@@ -2264,6 +2280,12 @@ popup.accountSigning.unsignedPubKeys.signed=Pubkeys were signed
 popup.accountSigning.unsignedPubKeys.result.signed=Signed pubkeys
 popup.accountSigning.unsignedPubKeys.result.failed=Failed to sign
 
+popup.info.buyerAsTakerWithoutDeposit.headline=No deposit required from buyer
+popup.info.buyerAsTakerWithoutDeposit=\
+  Your offer will not require a security deposit or fee from the XMR buyer.\n\n\
+  To accept your offer, you must share a passphrase with your trade partner outside Haveno.\n\n\
+  The passphrase is automatically generated and shown in the offer details after creation.\
+
 popup.info.torMigration.msg=Your Haveno node is probably using a deprecated Tor v2 address. \
   Please switch your Haveno node to a Tor v3 address. \
   Make sure to back up your data directory beforehand.
@@ -2403,6 +2425,7 @@ navigation.support=\"Support\"
 
 formatter.formatVolumeLabel={0} amount{1}
 formatter.makerTaker=Maker as {0} {1} / Taker as {2} {3}
+formatter.makerTakerLocked=Maker as {0} {1} / Taker as {2} {3} 🔒
 formatter.youAreAsMaker=You are: {1} {0} (maker) / Taker is: {3} {2}
 formatter.youAreAsTaker=You are: {1} {0} (taker) / Maker is: {3} {2}
 formatter.youAre=You are {0} {1} ({2} {3})
@@ -2649,7 +2672,7 @@ payment.limits.info=Please be aware that all bank transfers carry a certain amou
   \n\
   This limit only applies to the size of a single trade—you can place as many trades as you like.\n\
   \n\
-  See more details on the wiki [HYPERLINK:https://haveno.exchange/wiki/Account_limits].
+  See more details on the wiki [HYPERLINK:https://docs.haveno.exchange/the-project/account_limits].
 # suppress inspection "UnusedProperty"
 payment.limits.info.withSigning=To limit chargeback risk, Haveno sets per-trade limits for this payment account type based \
   on the following 2 factors:\n\n\
@@ -2667,7 +2690,7 @@ payment.limits.info.withSigning=To limit chargeback risk, Haveno sets per-trade
   \n\
   These limits only apply to the size of a single trade—you can place as many trades as you like. \n\
   \n\
-  See more details on the wiki [HYPERLINK:https://haveno.exchange/wiki/Account_limits].
+  See more details on the wiki [HYPERLINK:https://docs.haveno.exchange/the-project/account_limits].
 
 payment.cashDeposit.info=Please confirm your bank allows you to send cash deposits into other peoples' accounts. \
   For example, Bank of America and Wells Fargo no longer allow such deposits.

core/src/main/resources/i18n/displayStrings_cs.properties

@@ -40,6 +40,8 @@ shared.buyMonero=Koupit monero
 shared.sellMonero=Prodat monero
 shared.buyCurrency=Koupit {0}
 shared.sellCurrency=Prodat {0}
+shared.buyCurrencyLocked=Koupit {0} 🔒
+shared.sellCurrencyLocked=Prodat {0} 🔒
 shared.buyingXMRWith=nakoupit XMR za {0}
 shared.sellingXMRFor=prodat XMR za {0}
 shared.buyingCurrency=nakoupit {0} (prodat XMR)
@@ -103,9 +105,9 @@ shared.faq=Navštívit stránku FAQ
 shared.yesCancel=Ano, zrušit
 shared.nextStep=Další krok
 shared.selectTradingAccount=Vyberte obchodní účet
-shared.fundFromSavingsWalletButton=Přesunout finance z Haveno peněženky
+shared.fundFromSavingsWalletButton=Použít prostředky z peněženky Haveno
 shared.fundFromExternalWalletButton=Otevřít vaši externí peněženku pro financování
-shared.openDefaultWalletFailed=Nepodařilo se otevřít aplikaci moneroové peněženky. Jste si jisti, že máte nějakou nainstalovanou?
+shared.openDefaultWalletFailed=Nepodařilo se otevřít aplikaci peněženky Monero. Jste si jisti, že máte nějakou nainstalovanou?
 shared.belowInPercent=% pod tržní cenou
 shared.aboveInPercent=% nad tržní cenou
 shared.enterPercentageValue=Zadejte % hodnotu
@@ -124,7 +126,7 @@ shared.noDetailsAvailable=Detaily nejsou k dispozici
 shared.notUsedYet=Ještě nepoužito
 shared.date=Datum
 # suppress inspection "TrailingSpacesInProperty"
-shared.sendFundsDetailsDust=Haveno zjistil, že tato transakce by vytvořila drobné mince, které jsou pod limitem drobných mincí (a není to povoleno pravidly pro moneroový konsenzus). Místo toho budou tyto drobné mince ({0} satoshi {1}) přidány k poplatku za těžbu.\n\n\n
+shared.sendFundsDetailsDust=Haveno zjistil, že tato transakce by vytvořila drobné mince, které jsou pod limitem drobných mincí (a není to povoleno pravidly pro konsenzus Monero). Místo toho budou tyto drobné mince ({0} satoshi {1}) přidány k poplatku za těžbu.\n\n\n
 shared.copyToClipboard=Kopírovat do schránky
 shared.language=Jazyk
 shared.country=Země
@@ -186,7 +188,7 @@ shared.total=Celkem
 shared.totalsNeeded=Potřebné prostředky
 shared.tradeWalletAddress=Adresa obchodní peněženky
 shared.tradeWalletBalance=Zůstatek obchodní peněženky
-shared.reserveExactAmount=Rezervujte pouze potřebné finanční prostředky. Před aktivací vaší nabídky může být vyžadována těžební poplatek a 10 potvrzení (~20 minut).
+shared.reserveExactAmount=Rezervujte pouze nezbytné prostředky. Vyžaduje poplatek za těžbu a přibližně 20 minut, než vaše nabídka půjde živě.
 shared.makerTxFee=Tvůrce: {0}
 shared.takerTxFee=Příjemce: {0}
 shared.iConfirm=Potvrzuji
@@ -258,19 +260,19 @@ mainView.footer.xmrInfo.synchronizingWalletWith=Synchronizace peněženky s {0}
 mainView.footer.xmrInfo.syncedWith=Synchronizováno s {0} na bloku {1}
 mainView.footer.xmrInfo.connectingTo=Připojování
 mainView.footer.xmrInfo.connectionFailed=Připojení se nezdařilo
-mainView.footer.xmrPeers=Monero síťové nody: {0}
-mainView.footer.p2pPeers=Haveno síťové nody: {0}
+mainView.footer.xmrPeers=Monero síťové uzly: {0}
+mainView.footer.p2pPeers=Haveno síťové uzly: {0}
 
 mainView.bootstrapState.connectionToTorNetwork=(1/4) Připojování do sítě Tor...
-mainView.bootstrapState.torNodeCreated=(2/4) Tor node vytvořen
+mainView.bootstrapState.torNodeCreated=(2/4) Tor uzel vytvořen
 mainView.bootstrapState.hiddenServicePublished=(3/4) Skrytá služba publikována
 mainView.bootstrapState.initialDataReceived=(4/4) Iniciační data přijata
 
-mainView.bootstrapWarning.noSeedNodesAvailable=Žádné seed nody nejsou k dispozici
-mainView.bootstrapWarning.noNodesAvailable=Žádné seed ani peer nody k dispozici
+mainView.bootstrapWarning.noSeedNodesAvailable=Žádné seed uzly nejsou k dispozici
+mainView.bootstrapWarning.noNodesAvailable=Žádné seed ani peer uzly k dispozici
 mainView.bootstrapWarning.bootstrappingToP2PFailed=Zavádění do sítě Haveno se nezdařilo
 
-mainView.p2pNetworkWarnMsg.noNodesAvailable=Pro vyžádání dat nejsou k dispozici žádné seed ani peer nody.\nZkontrolujte připojení k internetu nebo zkuste aplikaci restartovat.
+mainView.p2pNetworkWarnMsg.noNodesAvailable=Pro vyžádání dat nejsou k dispozici žádné seed ani peer uzly.\nZkontrolujte připojení k internetu nebo zkuste aplikaci restartovat.
 mainView.p2pNetworkWarnMsg.connectionToP2PFailed=Připojení k síti Haveno selhalo (nahlášená chyba: {0}).\nZkontrolujte připojení k internetu nebo zkuste aplikaci restartovat.
 
 mainView.walletServiceErrorMsg.timeout=Připojení k síti Monero selhalo kvůli vypršení časového limitu.
@@ -278,8 +280,8 @@ mainView.walletServiceErrorMsg.connectionError=Připojení k síti Monero selhal
 
 mainView.walletServiceErrorMsg.rejectedTxException=Transakce byla ze sítě zamítnuta.\n\n{0}
 
-mainView.networkWarning.allConnectionsLost=Ztratili jste připojení ke všem {0} síťovým peer nodům.\nMožná jste ztratili připojení k internetu nebo byl váš počítač v pohotovostním režimu.
-mainView.networkWarning.localhostMoneroLost=Ztratili jste připojení k Moneroovému localhost nodu.\nRestartujte aplikaci Haveno a připojte se k jiným Moneroovým nodům nebo restartujte Moneroový localhost node.
+mainView.networkWarning.allConnectionsLost=Ztratili jste připojení ke všem {0} síťovým peer uzlům.\nMožná jste ztratili připojení k internetu nebo byl váš počítač v pohotovostním režimu.
+mainView.networkWarning.localhostMoneroLost=Ztratili jste připojení k localhost uzlu Monero.\nRestartujte aplikaci Haveno a připojte se k jiným uzlům Monero nebo restartujte localhost Monero uzel.
 mainView.version.update=(Dostupná aktualizace)
 
 
@@ -330,6 +332,7 @@ offerbook.createOffer=Vytvořit nabídku
 offerbook.takeOffer=Přijmout nabídku
 offerbook.takeOfferToBuy=Přijmout nabídku na nákup {0}
 offerbook.takeOfferToSell=Přijmout nabídku k prodeji {0}
+offerbook.takeOffer.enterChallenge=Zadejte heslo nabídky
 offerbook.trader=Obchodník
 offerbook.offerersBankId=ID banky tvůrce (BIC/SWIFT): {0}
 offerbook.offerersBankName=Jméno banky tvůrce: {0}
@@ -340,6 +343,8 @@ offerbook.availableOffers=Dostupné nabídky
 offerbook.filterByCurrency=Filtrovat podle měny
 offerbook.filterByPaymentMethod=Filtrovat podle platební metody
 offerbook.matchingOffers=Nabídky odpovídající mým účtům
+offerbook.filterNoDeposit=Žádný vklad
+offerbook.noDepositOffers=Nabídky bez zálohy (vyžaduje se heslo)
 offerbook.timeSinceSigning=Informace o účtu
 offerbook.timeSinceSigning.info=Tento účet byl ověřen a {0}
 offerbook.timeSinceSigning.info.arbitrator=podepsán rozhodcem a může podepisovat účty partnerů
@@ -360,7 +365,7 @@ offerbook.timeSinceSigning.notSigned.noNeed=N/A
 shared.notSigned=Tento účet ještě nebyl podepsán a byl vytvořen před {0} dny
 shared.notSigned.noNeed=Tento typ účtu nevyžaduje podepisování
 shared.notSigned.noNeedDays=Tento typ účtu nevyžaduje podepisování a byl vytvořen před {0} dny
-shared.notSigned.noNeedAlts=Cryptoové účty neprocházejí kontrolou podpisu a stáří
+shared.notSigned.noNeedAlts=Kryptoměnové účty neprocházejí kontrolou podpisu a stáří
 
 offerbook.nrOffers=Počet nabídek: {0}
 offerbook.volume={0} (min - max)
@@ -458,7 +463,12 @@ createOffer.placeOfferButton=Přehled: Umístěte nabídku {0} monero
 createOffer.createOfferFundWalletInfo.headline=Financujte svou nabídku
 # suppress inspection "TrailingSpacesInProperty"
 createOffer.createOfferFundWalletInfo.tradeAmount=- Výše obchodu: {0}\n
-createOffer.createOfferFundWalletInfo.msg=Do této nabídky musíte vložit {0}.\n\nTyto prostředky jsou rezervovány ve vaší lokální peněžence a budou uzamčeny na vkladové multisig adrese, jakmile někdo příjme vaši nabídku.\n\nČástka je součtem:\n{1}- Vaše kauce: {2}\n- Obchodní poplatek: {3}\n- Poplatek za těžbu: {4}\n\nPři financování obchodu si můžete vybrat ze dvou možností:\n- Použijte svou peněženku Haveno (pohodlné, ale transakce mohou být propojitelné) NEBO\n- Přenos z externí peněženky (potenciálně více soukromé)\n\nPo uzavření tohoto vyskakovacího okna se zobrazí všechny možnosti a podrobnosti financování.
+createOffer.createOfferFundWalletInfo.msg=Potřebujete vložit {0} do této nabídky.\n\n\
+  Tyto prostředky jsou rezervovány ve vaší místní peněžence a budou zablokovány v multisig peněžence, jakmile někdo přijme vaši nabídku.\n\n\
+  Částka je součtem:\n\
+  {1}\
+  - Vaše záloha: {2}\n\
+  - Poplatek za obchodování: {3}
 
 # only first part "An error occurred when placing the offer:" has been used before. We added now the rest (need update in existing translations!)
 createOffer.amountPriceBox.error.message=Při zadávání nabídky došlo k chybě:\n\n{0}\n\nPeněženku ještě neopustily žádné finanční prostředky.\nRestartujte aplikaci a zkontrolujte síťové připojení.
@@ -480,7 +490,10 @@ createOffer.setDepositAsBuyer=Nastavit mou kauci jako kupujícího (%)
 createOffer.setDepositForBothTraders=Nastavit kauci obou obchodníků (%)
 createOffer.securityDepositInfo=Kauce vašeho kupujícího bude {0}
 createOffer.securityDepositInfoAsBuyer=Vaše kauce jako kupující bude {0}
-createOffer.minSecurityDepositUsed=Je použita min. záloha kupujícího
+createOffer.minSecurityDepositUsed=Minimální bezpečnostní záloha je použita
+createOffer.buyerAsTakerWithoutDeposit=Žádný vklad od kupujícího (chráněno heslem)
+createOffer.myDeposit=Můj bezpečnostní vklad (%)
+createOffer.myDepositInfo=Vaše záloha na bezpečnost bude {0}
 
 
 ####################################################################
@@ -504,6 +517,8 @@ takeOffer.fundsBox.networkFee=Celkové poplatky za těžbu
 takeOffer.fundsBox.takeOfferSpinnerInfo=Přijímám nabídku: {0}
 takeOffer.fundsBox.paymentLabel=Haveno obchod s ID {0}
 takeOffer.fundsBox.fundsStructure=(kauce {0}, obchodní poplatek {1}, poplatek za těžbu {2})
+takeOffer.fundsBox.noFundingRequiredTitle=Žádné financování požadováno
+takeOffer.fundsBox.noFundingRequiredDescription=Získejte passphrase nabídky od prodávajícího mimo Haveno, abyste tuto nabídku přijali.
 takeOffer.success.headline=Úspěšně jste přijali nabídku.
 takeOffer.success.info=Stav vašeho obchodu můžete vidět v \"Portfolio/Otevřené obchody\".
 takeOffer.error.message=Při převzetí nabídky došlo k chybě.\n\n{0}
@@ -742,7 +757,7 @@ portfolio.pending.step5_buyer.alreadyWithdrawn=Vaše finanční prostředky již
 portfolio.pending.step5_buyer.confirmWithdrawal=Potvrďte žádost o výběr
 portfolio.pending.step5_buyer.amountTooLow=Částka k převodu je nižší než transakční poplatek a min. možná hodnota tx (drobné).
 portfolio.pending.step5_buyer.withdrawalCompleted.headline=Výběr byl dokončen
-portfolio.pending.step5_buyer.withdrawalCompleted.msg=Vaše dokončené obchody jsou uloženy na \"Portfolio/Historie\".\nVšechny své moneroové transakce si můžete prohlédnout v sekci \"Prostředky/Transakce\"
+portfolio.pending.step5_buyer.withdrawalCompleted.msg=Vaše dokončené obchody jsou uloženy na \"Portfolio/Historie\".\nVšechny své transakce Monero si můžete prohlédnout v sekci \"Finance/Transakce\"
 portfolio.pending.step5_buyer.bought=Koupili jste
 portfolio.pending.step5_buyer.paid=Zaplatili jste
 
@@ -1010,8 +1025,8 @@ setting.preferences.prefCurrency=Preferovaná měna
 setting.preferences.displayTraditional=Zobrazit národní měny
 setting.preferences.noTraditional=Nejsou vybrány žádné národní měny
 setting.preferences.cannotRemovePrefCurrency=Vybranou zobrazovanou měnu nelze odebrat.
-setting.preferences.displayCryptos=Zobrazit cryptoy
-setting.preferences.noCryptos=Nejsou vybrány žádné cryptoy
+setting.preferences.displayCryptos=Zobrazit kryptoměny
+setting.preferences.noCryptos=Nejsou vybrány žádné kryptoměny
 setting.preferences.addTraditional=Přidejte národní měnu
 setting.preferences.addCrypto=Přidejte crypto
 setting.preferences.displayOptions=Zobrazit možnosti
@@ -1033,22 +1048,24 @@ settings.preferences.editCustomExplorer.name=Jméno
 settings.preferences.editCustomExplorer.txUrl=Transakční URL
 settings.preferences.editCustomExplorer.addressUrl=Adresa URL
 
-settings.net.xmrHeader=Moneroová síť
+settings.net.xmrHeader=Síť Monero
 settings.net.p2pHeader=Síť Haveno
 settings.net.onionAddressLabel=Moje onion adresa
-settings.net.xmrNodesLabel=Použijte vlastní Monero node
+settings.net.xmrNodesLabel=Použijte vlastní Monero uzel
 settings.net.moneroPeersLabel=Připojené peer uzly
+settings.net.connection=Připojení
+settings.net.connected=Připojeno
 settings.net.useTorForXmrJLabel=Použít Tor pro Monero síť
-settings.net.moneroNodesLabel=Monero nody, pro připojení
-settings.net.useProvidedNodesRadio=Použijte nabízené Monero Core nody
-settings.net.usePublicNodesRadio=Použít veřejnou Moneroovou síť
-settings.net.useCustomNodesRadio=Použijte vlastní Monero Core node
-settings.net.warn.usePublicNodes=Pokud používáte veřejné Monero nody, jste vystaveni riziku spojenému s používáním nedůvěryhodných vzdálených nodů.\n\nProsím, přečtěte si více podrobností na [HYPERLINK:https://www.getmonero.org/resources/moneropedia/remote-node.html].\n\nJste si jistí, že chcete použít veřejné nody?
-settings.net.warn.usePublicNodes.useProvided=Ne, použijte nabízené nody
+settings.net.moneroNodesLabel=Monero uzly, pro připojení
+settings.net.useProvidedNodesRadio=Použijte nabízené Monero Core uzly
+settings.net.usePublicNodesRadio=Použít veřejnou síť Monero
+settings.net.useCustomNodesRadio=Použijte vlastní Monero Core uzel
+settings.net.warn.usePublicNodes=Pokud používáte veřejné Monero uzly, jste vystaveni riziku spojenému s používáním nedůvěryhodných vzdálených uzlů.\n\nProsím, přečtěte si více podrobností na [HYPERLINK:https://www.getmonero.org/resources/moneropedia/remote-node.html].\n\nJste si jistí, že chcete použít veřejné uzly?
+settings.net.warn.usePublicNodes.useProvided=Ne, použijte nabízené uzly
 settings.net.warn.usePublicNodes.usePublic=Ano, použít veřejnou síť
-settings.net.warn.useCustomNodes.B2XWarning=Ujistěte se, že váš moneroový node je důvěryhodný Monero Core node!\n\nPřipojení k nodům, které nedodržují pravidla konsensu Monero Core, může poškodit vaši peněženku a způsobit problémy v obchodním procesu.\n\nUživatelé, kteří se připojují k nodům, které porušují pravidla konsensu, odpovídají za případné škody, které z toho vyplývají. Jakékoli výsledné spory budou rozhodnuty ve prospěch druhého obchodníka. Uživatelům, kteří ignorují tyto varovné a ochranné mechanismy, nebude poskytována technická podpora!
-settings.net.warn.invalidXmrConfig=Připojení k moneroové síti selhalo, protože je vaše konfigurace  neplatná.\n\nVaše konfigurace byla resetována, aby se místo toho použily poskytnuté moneroové uzly. Budete muset restartovat aplikaci.
-settings.net.localhostXmrNodeInfo=Základní informace: Haveno při spuštění hledá místní Moneroový uzel. Pokud je nalezen, Haveno bude komunikovat se sítí Monero výhradně skrze něj.
+settings.net.warn.useCustomNodes.B2XWarning=Ujistěte se, že váš Monero uzel je důvěryhodný Monero Core uzel!\n\nPřipojení k uzlům, které nedodržují pravidla konsensu Monero Core, může poškodit vaši peněženku a způsobit problémy v obchodním procesu.\n\nUživatelé, kteří se připojují k uzlům, které porušují pravidla konsensu, odpovídají za případné škody, které z toho vyplývají. Jakékoli výsledné spory budou rozhodnuty ve prospěch druhého obchodníka. Uživatelům, kteří ignorují tyto varovné a ochranné mechanismy, nebude poskytována technická podpora!
+settings.net.warn.invalidXmrConfig=Připojení k síti Monero selhalo, protože je vaše konfigurace neplatná.\n\nVaše konfigurace byla resetována, aby byly místo toho použity poskytnuté uzly Monero. Budete muset restartovat aplikaci.
+settings.net.localhostXmrNodeInfo=Základní informace: Haveno při spuštění hledá místní Monero uzel. Pokud je nalezen, Haveno bude komunikovat se sítí Monero výhradně skrze něj.
 settings.net.p2PPeersLabel=Připojené uzly
 settings.net.onionAddressColumn=Onion adresa
 settings.net.creationDateColumn=Založeno
@@ -1072,7 +1089,7 @@ settings.net.sentData=Odeslaná data: {0}, {1} zprávy, {2} zprávy/sekundu
 settings.net.receivedData=Přijatá data: {0}, {1} zprávy, {2} zprávy/sekundu
 settings.net.chainHeight=Monero Peers: {0}
 settings.net.ips=[IP adresa:port | název hostitele:port | onion adresa:port] (oddělené čárkou). Pokud je použit výchozí port (8333), lze port vynechat.
-settings.net.seedNode=Seed node
+settings.net.seedNode=Seed uzel
 settings.net.directPeer=Peer uzel (přímý)
 settings.net.initialDataExchange={0} [Bootstrapping]
 settings.net.peer=Peer
@@ -1151,10 +1168,10 @@ account.tab.mediatorRegistration=Registrace mediátora
 account.tab.refundAgentRegistration=Registrace rozhodce pro vrácení peněz
 account.tab.signing=Podepisování
 account.info.headline=Vítejte ve vašem účtu Haveno
-account.info.msg=Zde můžete přidat obchodní účty pro národní měny & cryptoy a vytvořit zálohu dat vaší peněženky a účtu.\n\nPři prvním spuštění Haveno byla vytvořena nová moneroová peněženka.\n\nDůrazně doporučujeme zapsat si seed slova moneroových peněženek (viz záložka nahoře) a před financováním zvážit přidání hesla. Vklady a výběry moneroů jsou spravovány v sekci \ "Finance \".\n\nOchrana osobních údajů a zabezpečení: protože Haveno je decentralizovaná směnárna, všechna data jsou uložena ve vašem počítači. Neexistují žádné servery, takže nemáme přístup k vašim osobním informacím, vašim finančním prostředkům ani vaší IP adrese. Údaje, jako jsou čísla bankovních účtů, adresy cryptoů a monerou atd., jsou sdíleny pouze s obchodním partnerem za účelem uskutečnění obchodů, které zahájíte (v případě sporu uvidí Prostředník nebo Rozhodce stejná data jako váš obchodní partner).
+account.info.msg=Zde můžete přidat obchodní účty pro národní měny & kryptoměny a vytvořit zálohu dat vaší peněženky a účtu.\n\nPři prvním spuštění Haveno byla vytvořena nová peněženka Monero.\n\nDůrazně doporučujeme zapsat si seed slova peněženek (viz záložka nahoře) a před financováním zvážit přidání hesla. Vklady a výběry moneroů jsou spravovány v sekci \ "Finance \".\n\nOchrana osobních údajů a zabezpečení: protože Haveno je decentralizovaná směnárna, všechna data jsou uložena ve vašem počítači. Neexistují žádné servery, takže nemáme přístup k vašim osobním informacím, vašim finančním prostředkům ani vaší IP adrese. Údaje, jako jsou čísla bankovních účtů, adresy cryptoů a monerou atd., jsou sdíleny pouze s obchodním partnerem za účelem uskutečnění obchodů, které zahájíte (v případě sporu uvidí Prostředník nebo Rozhodce stejná data jako váš obchodní partner).
 
 account.menu.paymentAccount=Účty v národní měně
-account.menu.altCoinsAccountView=Cryptoové účty
+account.menu.altCoinsAccountView=Kryptoměnové účty
 account.menu.password=Heslo peněženky
 account.menu.seedWords=Seed peněženky
 account.menu.walletInfo=Info o peněžence
@@ -1183,7 +1200,7 @@ account.arbitratorRegistration.removedFailed=Registraci se nepodařilo odebrat.
 account.arbitratorRegistration.registerSuccess=Úspěšně jste se zaregistrovali do sítě Haveno.
 account.arbitratorRegistration.registerFailed=Registraci se nepodařilo dokončit. {0}
 
-account.crypto.yourCryptoAccounts=Vaše cryptoové účty
+account.crypto.yourCryptoAccounts=Vaše kryptoměnové účty
 account.crypto.popup.wallet.msg=Ujistěte se, že dodržujete požadavky na používání peněženek {0}, jak je popsáno na webové stránce {1}.\nPoužití peněženek z centralizovaných směnáren, kde (a) nevlastníte své soukromé klíče nebo (b) které nepoužívají kompatibilní software peněženky, je riskantní: může to vést ke ztrátě obchodovaných prostředků!\nMediátor nebo rozhodce není specialista {2} a v takových případech nemůže pomoci.
 account.crypto.popup.wallet.confirm=Rozumím a potvrzuji, že vím, jakou peněženku musím použít.
 # suppress inspection "UnusedProperty"
@@ -1237,7 +1254,7 @@ account.password.removePw.button=Odstraňte heslo
 account.password.removePw.headline=Odstraňte ochranu peněženky pomocí hesla
 account.password.setPw.button=Nastavit heslo
 account.password.setPw.headline=Nastavte ochranu peněženky pomocí hesla
-account.password.info=S ochranou pomocí hesla budete muset zadat heslo při spuštění aplikace, při výběru monera z vaší peněženky a při zobrazení vašich slov z klíčového základu.
+account.password.info=S ochranou pomocí hesla budete muset zadat heslo při spuštění aplikace, při výběru monera z vaší peněženky a při zobrazení slov seedu peněženky.
 
 account.seed.backup.title=Zálohujte svá klíčová slova peněženky.
 account.seed.info=Prosím, zapište si jak klíčová slova peněženky, tak datum. Kdykoliv můžete obnovit svou peněženku pomocí klíčových slov a data.\n\nKlíčová slova byste měli zapsat na kus papíru. Neukládejte je na počítač.\n\nVezměte prosím na vědomí, že klíčová slova NEJSOU náhradou za zálohu.\nMusíte vytvořit zálohu celého adresáře aplikace z obrazovky "Účet/Záloha", abyste mohli obnovit stav a data aplikace.
@@ -1245,7 +1262,7 @@ account.seed.backup.warning=Prosím, poznamenejte si, že klíčová slova nejso
 account.seed.warn.noPw.msg=Nenastavili jste si heslo k peněžence, které by chránilo zobrazení seed slov.\n\nChcete zobrazit seed slova?
 account.seed.warn.noPw.yes=Ano, a už se mě znovu nezeptat
 account.seed.enterPw=Chcete-li zobrazit seed slova, zadejte heslo
-account.seed.restore.info=Před použitím obnovení ze seed slov si vytvořte zálohu. Uvědomte si, že obnova peněženky je pouze pro naléhavé případy a může způsobit problémy s interní databází peněženky.\nNení to způsob, jak použít zálohu! K obnovení předchozího stavu aplikace použijte zálohu z adresáře dat aplikace.\n\nPo obnovení se aplikace automaticky vypne. Po restartování aplikace se bude znovu synchronizovat s moneroovou sítí. To může chvíli trvat a může spotřebovat hodně CPU, zejména pokud byla peněženka starší a měla mnoho transakcí. Vyhněte se přerušování tohoto procesu, jinak budete možná muset znovu odstranit soubor řetězu SPV nebo opakovat proces obnovy.
+account.seed.restore.info=Před použitím obnovení ze seed slov si vytvořte zálohu. Uvědomte si, že obnova peněženky je pouze pro naléhavé případy a může způsobit problémy s interní databází peněženky.\nNení to způsob, jak použít zálohu! K obnovení předchozího stavu aplikace použijte zálohu z adresáře dat aplikace.\n\nPo obnovení se aplikace automaticky vypne. Po restartování aplikace se bude znovu synchronizovat se sítí Monero. To může chvíli trvat a může spotřebovat hodně CPU, zejména pokud byla peněženka starší a měla mnoho transakcí. Vyhněte se přerušování tohoto procesu, jinak budete možná muset znovu odstranit soubor řetězu SPV nebo opakovat proces obnovy.
 account.seed.restore.ok=Dobře, proveďte obnovu a vypněte Haveno
 
 
@@ -1316,7 +1333,7 @@ inputControlWindow.balanceLabel=Dostupný zůstatek
 
 contractWindow.title=Podrobnosti o sporu
 contractWindow.dates=Datum nabídky / Datum obchodu
-contractWindow.xmrAddresses=Moneroová adresa kupujícího XMR / prodávajícího XMR
+contractWindow.xmrAddresses=Monero adresa kupujícího XMR / prodávajícího XMR
 contractWindow.onions=Síťová adresa kupující XMR / prodávající XMR
 contractWindow.accountAge=Stáří účtu XMR kupující / XMR prodejce
 contractWindow.numDisputes=Počet sporů XMR kupující / XMR prodejce
@@ -1429,10 +1446,10 @@ filterWindow.bannedPrivilegedDevPubKeys=Filtrované privilegované klíče pub d
 filterWindow.arbitrators=Filtrovaní rozhodci (onion adresy oddělené čárkami)
 filterWindow.mediators=Filtrovaní mediátoři (onion adresy oddělené čárkami)
 filterWindow.refundAgents=Filtrovaní rozhodci pro vrácení peněz (onion adresy oddělené čárkami)
-filterWindow.seedNode=Filtrované seed nody (onion adresy oddělené čárkami)
-filterWindow.priceRelayNode=Filtrované cenové relay nody (onion adresy oddělené čárkami)
-filterWindow.xmrNode=Filtrované Moneroové nody (adresy+porty oddělené čárkami)
-filterWindow.preventPublicXmrNetwork=Zabraňte použití veřejné moneroové sítě
+filterWindow.seedNode=Filtrované seed uzly (onion adresy oddělené čárkami)
+filterWindow.priceRelayNode=Filtrované cenové relay uzly (onion adresy oddělené čárkami)
+filterWindow.xmrNode=Filtrované uzly Monero (adresy+porty oddělené čárkami)
+filterWindow.preventPublicXmrNetwork=Zabraňte použití veřejné sítě Monero
 filterWindow.disableAutoConf=Zakázat automatické potvrzení
 filterWindow.autoConfExplorers=Filtrované průzkumníky s automatickým potvrzením (adresy oddělené čárkami)
 filterWindow.disableTradeBelowVersion=Min. verze nutná pro obchodování
@@ -1457,6 +1474,7 @@ offerDetailsWindow.confirm.maker=Potvrďte: Umístit nabídku {0} monero
 offerDetailsWindow.confirm.taker=Potvrďte: Využít nabídku {0} monero
 offerDetailsWindow.creationDate=Datum vzniku
 offerDetailsWindow.makersOnion=Onion adresa tvůrce
+offerDetailsWindow.challenge=Passphrase nabídky
 
 qRCodeWindow.headline=QR Kód
 qRCodeWindow.msg=Použijte tento QR kód k financování vaší peněženky Haveno z vaší externí peněženky.
@@ -1497,7 +1515,7 @@ tacWindow.disagree=Nesouhlasím a odcházím
 tacWindow.arbitrationSystem=Řešení sporů
 
 tradeDetailsWindow.headline=Obchod
-tradeDetailsWindow.disputedPayoutTxId=ID sporné platební transakce:
+tradeDetailsWindow.disputedPayoutTxId=ID sporné platební transakce
 tradeDetailsWindow.tradeDate=Datum obchodu
 tradeDetailsWindow.txFee=Poplatek za těžbu
 tradeDetailsWindow.tradePeersOnion=Onion adresa obchodního partnera
@@ -1588,12 +1606,12 @@ popup.warning.startupFailed.twoInstances=Haveno již běží. Nemůžete spustit
 popup.warning.tradePeriod.halfReached=Váš obchod s ID {0} dosáhl poloviny max. povoleného obchodního období a stále není dokončen.\n\nObdobí obchodování končí {1}\n\nDalší informace o stavu obchodu naleznete na adrese \"Portfolio/Otevřené obchody\".
 popup.warning.tradePeriod.ended=Váš obchod s ID {0} dosáhl max. povoleného obchodního období a není dokončen.\n\nObdobí obchodování skončilo {1}\n\nZkontrolujte prosím svůj obchod v sekci "Portfolio/Otevřené obchody\", abyste kontaktovali mediátora.
 popup.warning.noTradingAccountSetup.headline=Nemáte nastaven obchodní účet
-popup.warning.noTradingAccountSetup.msg=Než budete moci vytvořit nabídku, musíte si nastavit národní měnu nebo cryptoový účet.\nChcete si založit účet?
+popup.warning.noTradingAccountSetup.msg=Než budete moci vytvořit nabídku, musíte si nastavit národní měnu nebo kryptoměnový účet.\nChcete si založit účet?
 popup.warning.noArbitratorsAvailable=Nejsou k dispozici žádní rozhodci.
 popup.warning.noMediatorsAvailable=Nejsou k dispozici žádní mediátoři.
 popup.warning.notFullyConnected=Musíte počkat, až budete plně připojeni k síti.\nTo může při spuštění trvat až 2 minuty.
-popup.warning.notSufficientConnectionsToXmrNetwork=Musíte počkat, až budete mít alespoň {0} připojení k moneroové síti.
-popup.warning.downloadNotComplete=Musíte počkat, až bude stahování chybějících moneroových bloků kompletní.
+popup.warning.notSufficientConnectionsToXmrNetwork=Musíte počkat, až budete mít alespoň {0} připojení k síti Monero.
+popup.warning.downloadNotComplete=Musíte počkat, až bude dokončeno stahování chybějících bloků Monero.
 popup.warning.walletNotSynced=Haveno peněženka není synchronizována s nejnovější výškou blockchainu. Počkejte, dokud se peněženka nesynchronizuje, nebo zkontrolujte své připojení.
 popup.warning.removeOffer=Opravdu chcete tuto nabídku odebrat?
 popup.warning.tooLargePercentageValue=Nelze nastavit procento 100% nebo větší.
@@ -1615,11 +1633,11 @@ popup.warning.seed=seed
 popup.warning.mandatoryUpdate.trading=Aktualizujte prosím na nejnovější verzi Haveno. Byla vydána povinná aktualizace, která zakazuje obchodování se starými verzemi. Další informace naleznete na fóru Haveno.
 popup.warning.burnXMR=Tato transakce není možná, protože poplatky za těžbu {0} by přesáhly částku převodu {1}. Počkejte prosím, dokud nebudou poplatky za těžbu opět nízké nebo dokud nenahromadíte více XMR k převodu.
 
-popup.warning.openOffer.makerFeeTxRejected=Transakční poplatek tvůrce za nabídku s ID {0} byl moneroovou sítí odmítnut.\nID transakce = {1}.\nNabídka byla odstraněna, aby se předešlo dalším problémům.\nPřejděte do \"Nastavení/Informace o síti\" a proveďte synchronizaci SPV.\nPro další pomoc prosím kontaktujte podpůrný kanál v Haveno Keybase týmu.
+popup.warning.openOffer.makerFeeTxRejected=Transakční poplatek tvůrce za nabídku s ID {0} byl odmítnut sítí Monero.\nID transakce = {1}.\nNabídka byla odstraněna, aby se předešlo dalším problémům.\nPřejděte do \"Nastavení/Informace o síti\" a proveďte synchronizaci SPV.\nPro další pomoc prosím kontaktujte podpůrný kanál v Haveno Keybase týmu.
 
 popup.warning.trade.txRejected.tradeFee=obchodní poplatek
 popup.warning.trade.txRejected.deposit=vklad
-popup.warning.trade.txRejected=Moneroová síť odmítla {0} transakci pro obchod s ID {1}.\nID transakce = {2}\nObchod byl přesunut do neúspěšných obchodů.\nPřejděte do části \"Nastavení/Informace o síti\" a proveďte synchronizaci SPV.\nPro další pomoc prosím kontaktujte podpůrný kanál v Haveno Keybase týmu.
+popup.warning.trade.txRejected=Síť Monero odmítla {0} transakci pro obchod s ID {1}.\nID transakce = {2}\nObchod byl přesunut do neúspěšných obchodů.\nPřejděte do části \"Nastavení/Informace o síti\" a proveďte synchronizaci SPV.\nPro další pomoc prosím kontaktujte podpůrný kanál v Haveno Keybase týmu.
 
 popup.warning.openOfferWithInvalidMakerFeeTx=Transakční poplatek tvůrce za nabídku s ID {0} je neplatný.\nID transakce = {1}.\nPřejděte do \"Nastavení/Informace o síti\" a proveďte synchronizaci SPV.\nPro další pomoc prosím kontaktujte podpůrný kanál v Haveno Keybase týmu.
 
@@ -1634,9 +1652,9 @@ popup.warn.downGradePrevention=Downgrade z verze {0} na verzi {1} není podporov
 popup.privateNotification.headline=Důležité soukromé oznámení!
 
 popup.securityRecommendation.headline=Důležité bezpečnostní doporučení
-popup.securityRecommendation.msg=Chtěli bychom vám připomenout, abyste zvážili použití ochrany heslem pro vaši peněženku, pokud jste ji již neaktivovali.\n\nDůrazně se také doporučuje zapsat seed slova peněženky. Tato seed slova jsou jako hlavní heslo pro obnovení vaší moneroové peněženky.\nV sekci "Seed peněženky" naleznete další informace.\n\nDále byste měli zálohovat úplnou složku dat aplikace v sekci \"Záloha\".
+popup.securityRecommendation.msg=Chtěli bychom vám připomenout, abyste zvážili použití ochrany heslem pro vaši peněženku, pokud jste ji již neaktivovali.\n\nDůrazně se také doporučuje zapsat seed slova peněženky. Tato seed slova jsou jako hlavní heslo pro obnovení vaší peněženky Monero.\nV sekci "Seed peněženky" naleznete další informace.\n\nDále byste měli zálohovat úplnou složku dat aplikace v sekci \"Záloha\".
 
-popup.xmrLocalNode.msg=Haveno zjistil, že na tomto stroji (na localhostu) běží Monero node.\n\nUjistěte se, prosím, že tento node je plně synchronizován před spuštěním Havena.
+popup.xmrLocalNode.msg=Haveno zjistil, že na tomto stroji (na localhostu) běží Monero uzel.\n\nUjistěte se, prosím, že tento uzel je plně synchronizován před spuštěním Havena.
 
 popup.shutDownInProgress.headline=Probíhá vypínání
 popup.shutDownInProgress.msg=Vypnutí aplikace může trvat několik sekund.\nProsím, nepřerušujte tento proces.
@@ -1682,6 +1700,9 @@ popup.accountSigning.unsignedPubKeys.signed=Pubkeys byly podepsány
 popup.accountSigning.unsignedPubKeys.result.signed=Podepsané pubkeys
 popup.accountSigning.unsignedPubKeys.result.failed=Nepodařilo se podepsat
 
+popup.info.buyerAsTakerWithoutDeposit.headline=Žádný vklad není od kupujícího požadován
+popup.info.buyerAsTakerWithoutDeposit=Vaše nabídka nebude vyžadovat bezpečnostní zálohu ani poplatek od kupujícího XMR.\n\nPro přijetí vaší nabídky musíte sdílet heslo se svým obchodním partnerem mimo Haveno.\n\nHeslo je automaticky vygenerováno a zobrazeno v detailech nabídky po jejím vytvoření.
+
 ####################################################################
 # Notifications
 ####################################################################
@@ -1772,10 +1793,10 @@ peerInfo.age.noRisk=Stáří platebního účtu
 peerInfo.age.chargeBackRisk=Čas od podpisu
 peerInfo.unknownAge=Stáří není známo
 
-addressTextField.openWallet=Otevřete výchozí moneroovou peněženku
+addressTextField.openWallet=Otevřete výchozí peněženku Monero
 addressTextField.copyToClipboard=Zkopírujte adresu do schránky
 addressTextField.addressCopiedToClipboard=Adresa byla zkopírována do schránky
-addressTextField.openWallet.failed=Otevření výchozí moneroové peněženky se nezdařilo. Možná nemáte žádnou nainstalovanou?
+addressTextField.openWallet.failed=Otevření výchozí peněženky Monero selhalo. Možná nemáte žádnou nainstalovanou?
 
 peerInfoIcon.tooltip={0}\nŠtítek: {1}
 
@@ -1807,6 +1828,7 @@ navigation.support=\"Podpora\"
 
 formatter.formatVolumeLabel={0} částka{1}
 formatter.makerTaker=Tvůrce jako {0} {1} / Příjemce jako {2} {3}
+formatter.makerTakerLocked=Tvůrce jako {0} {1} / Příjemce jako {2} {3} 🔒
 formatter.youAreAsMaker=Jste {1} {0} (jako tvůrce) / Příjemce je {3} {2}
 formatter.youAreAsTaker=Jste {1} {0} (jako příjemce) / Tvůrce je {3} {2}
 formatter.youAre={0}te {1} ({2}te {3})
@@ -1865,7 +1887,7 @@ seed.date=Datum peněženky
 seed.restore.title=Obnovit peněženky z seed slov
 seed.restore=Obnovit peněženky
 seed.creationDate=Datum vzniku
-seed.warn.walletNotEmpty.msg=Vaše moneroová peněženka není prázdná.\n\nTuto peněženku musíte vyprázdnit, než se pokusíte obnovit starší, protože smíchání peněženek může vést ke zneplatnění záloh.\n\nDokončete své obchody, uzavřete všechny otevřené nabídky a přejděte do sekce Prostředky, kde si můžete vybrat své moneroy.\nV případě, že nemáte přístup ke svým moneroům, můžete použít nouzový nástroj k vyprázdnění peněženky.\nNouzový nástroj otevřete stisknutím kombinace kláves \"Alt+e\" nebo \"Cmd/Ctrl+e\".
+seed.warn.walletNotEmpty.msg=Vaše peněženka Monero není prázdná.\n\nTuto peněženku musíte vyprázdnit, než se pokusíte obnovit starší, protože smíchání peněženek může vést ke zneplatnění záloh.\n\nDokončete své obchody, uzavřete všechny otevřené nabídky a přejděte do sekce Prostředky, kde si můžete vybrat své moneroy.\nV případě, že nemáte přístup ke svým moneroům, můžete použít nouzový nástroj k vyprázdnění peněženky.\nNouzový nástroj otevřete stisknutím kombinace kláves \"Alt+e\" nebo \"Cmd/Ctrl+e\".
 seed.warn.walletNotEmpty.restore=Chci přesto obnovit
 seed.warn.walletNotEmpty.emptyWallet=Nejprve vyprázdním své peněženky
 seed.warn.notEncryptedAnymore=Vaše peněženky jsou šifrovány.\n\nPo obnovení již nebudou peněženky šifrovány a musíte nastavit nové heslo.\n\nChcete pokračovat?
@@ -1932,7 +1954,7 @@ shared.accountSigningState=Stav podpisu účtu
 
 #new
 payment.crypto.address.dyn={0} adresa
-payment.crypto.receiver.address=Cryptoová adresa příjemce
+payment.crypto.receiver.address=Kryptoměnová adresa příjemce
 payment.accountNr=Číslo účtu
 payment.emailOrMobile=E-mail nebo mobilní číslo
 payment.useCustomAccountName=Použijte vlastní název účtu
@@ -1962,9 +1984,9 @@ payment.moneyGram.info=Při používání MoneyGram musí XMR kupující zaslat
 payment.westernUnion.info=Při používání služby Western Union musí kupující XMR zaslat prodejci XMR e-mailem MTCN (sledovací číslo) a fotografii potvrzení. Potvrzení musí jasně uvádět celé jméno prodejce, město, zemi a částku. E-mail prodávajícího se kupujícímu zobrazí během procesu obchodování.
 payment.halCash.info=Při používání HalCash musí kupující XMR poslat prodejci XMR kód HalCash prostřednictvím textové zprávy z mobilního telefonu.\n\nUjistěte se, že nepřekračujete maximální částku, kterou vám banka umožňuje odesílat pomocí HalCash. Min. částka za výběr je 10 EUR a max. částka je 600 EUR. Pro opakované výběry je to 3000 EUR za příjemce za den a 6000 EUR za příjemce za měsíc. Zkontrolujte prosím tyto limity u své banky, abyste se ujistili, že používají stejné limity, jaké jsou zde uvedeny.\n\nČástka pro výběr musí být násobkem 10 EUR, protože z bankomatu nemůžete vybrat jiné částky. Uživatelské rozhraní na obrazovce vytvořit-nabídku and přijmout-nabídku upraví částku XMR tak, aby částka EUR byla správná. Nemůžete použít tržní cenu, protože částka v EURECH se mění s měnícími se cenami.\n\nV případě sporu musí kupující XMR poskytnout důkaz, že zaslal EURA.
 # suppress inspection "UnusedMessageFormatParameter"
-payment.limits.info=Uvědomte si, že u všech bankovních převodů existuje určité riziko zpětného zúčtování. Aby se toto riziko zmírnilo, stanoví Haveno limity pro jednotlivé obchody na základě odhadované úrovně rizika zpětného zúčtování pro použitou platební metodu.\n\nU této platební metody je váš limit pro jednotlivé obchody pro nákup a prodej {2}.\n\nToto omezení se vztahuje pouze na velikost jednoho obchodu - můžete zadat tolik obchodů, kolik chcete.\n\nDalší podrobnosti najdete na wiki [HYPERLINK:https://haveno.exchange/wiki/Account_limits].
+payment.limits.info=Uvědomte si, že u všech bankovních převodů existuje určité riziko zpětného zúčtování. Aby se toto riziko zmírnilo, stanoví Haveno limity pro jednotlivé obchody na základě odhadované úrovně rizika zpětného zúčtování pro použitou platební metodu.\n\nU této platební metody je váš limit pro jednotlivé obchody pro nákup a prodej {2}.\n\nToto omezení se vztahuje pouze na velikost jednoho obchodu - můžete zadat tolik obchodů, kolik chcete.\n\nDalší podrobnosti najdete na wiki [HYPERLINK:https://docs.haveno.exchange/the-project/account_limits].
 # suppress inspection "UnusedProperty"
-payment.limits.info.withSigning=Aby se omezilo riziko zpětného zúčtování, Haveno stanoví limity pro jednotlivé obchody pro tento typ platebního účtu na základě následujících 2 faktorů:\n\n1. Obecné riziko zpětného zúčtování pro platební metodu\n2. Stav podepisování účtu\n\nTento platební účet ještě není podepsán, takže je omezen na nákup {0} za obchod. Po podpisu se limity nákupu zvýší následovně:\n\n● Před podpisem a 30 dní po podpisu bude váš limit nákupu podle obchodu {0}\n● 30 dní po podpisu bude váš limit nákupu podle obchodu {1}\n● 60 dní po podpisu bude váš limit nákupu podle obchodu {2}\n\nPodpisy účtu neovlivňují prodejní limity. Můžete okamžitě prodat {2} v jednom obchodu.\n\nTato omezení platí pouze pro objem jednoho obchodu - můžete zadat tolik obchodů, kolik chcete.\n\nDalší podrobnosti najdete na wiki [HYPERLINK:https://haveno.exchange/wiki/Account_limits].
+payment.limits.info.withSigning=Aby se omezilo riziko zpětného zúčtování, Haveno stanoví limity pro jednotlivé obchody pro tento typ platebního účtu na základě následujících 2 faktorů:\n\n1. Obecné riziko zpětného zúčtování pro platební metodu\n2. Stav podepisování účtu\n\nTento platební účet ještě není podepsán, takže je omezen na nákup {0} za obchod. Po podpisu se limity nákupu zvýší následovně:\n\n● Před podpisem a 30 dní po podpisu bude váš limit nákupu podle obchodu {0}\n● 30 dní po podpisu bude váš limit nákupu podle obchodu {1}\n● 60 dní po podpisu bude váš limit nákupu podle obchodu {2}\n\nPodpisy účtu neovlivňují prodejní limity. Můžete okamžitě prodat {2} v jednom obchodu.\n\nTato omezení platí pouze pro objem jednoho obchodu - můžete zadat tolik obchodů, kolik chcete.\n\nDalší podrobnosti najdete na wiki [HYPERLINK:https://docs.haveno.exchange/the-project/account_limits].
 
 payment.cashDeposit.info=Potvrďte, že vám vaše banka umožňuje odesílat hotovostní vklady na účty jiných lidí. Například Bank of America a Wells Fargo již takové vklady nepovolují.
 
@@ -2073,7 +2095,7 @@ INTERAC_E_TRANSFER=Interac e-Transfer
 # suppress inspection "UnusedProperty"
 HAL_CASH=HalCash
 # suppress inspection "UnusedProperty"
-BLOCK_CHAINS=Cryptoy
+BLOCK_CHAINS=Kryptoměny
 # suppress inspection "UnusedProperty"
 PROMPT_PAY=PromptPay
 # suppress inspection "UnusedProperty"
@@ -2083,7 +2105,7 @@ TRANSFERWISE=TransferWise
 # suppress inspection "UnusedProperty"
 AMAZON_GIFT_CARD=Amazon eGift Card
 # suppress inspection "UnusedProperty"
-BLOCK_CHAINS_INSTANT=Instantní Cryptoy
+BLOCK_CHAINS_INSTANT=Instantní kryptoměny
 
 # Deprecated: Cannot be deleted as it would break old trade history entries
 # suppress inspection "UnusedProperty"
@@ -2125,7 +2147,7 @@ INTERAC_E_TRANSFER_SHORT=Interac e-Transfer
 # suppress inspection "UnusedProperty"
 HAL_CASH_SHORT=HalCash
 # suppress inspection "UnusedProperty"
-BLOCK_CHAINS_SHORT=Cryptoy
+BLOCK_CHAINS_SHORT=Kryptoměny
 # suppress inspection "UnusedProperty"
 PROMPT_PAY_SHORT=PromptPay
 # suppress inspection "UnusedProperty"
@@ -2135,7 +2157,7 @@ TRANSFERWISE_SHORT=TransferWise
 # suppress inspection "UnusedProperty"
 AMAZON_GIFT_CARD_SHORT=Amazon eGift Card
 # suppress inspection "UnusedProperty"
-BLOCK_CHAINS_INSTANT_SHORT=Instantní Cryptoy
+BLOCK_CHAINS_INSTANT_SHORT=Instantní kryptoměny
 
 # Deprecated: Cannot be deleted as it would break old trade history entries
 # suppress inspection "UnusedProperty"

core/src/main/resources/i18n/displayStrings_de.properties

@@ -40,6 +40,8 @@ shared.buyMonero=Monero kaufen
 shared.sellMonero=Monero verkaufen
 shared.buyCurrency={0} kaufen
 shared.sellCurrency={0} verkaufen
+shared.buyCurrencyLocked={0} kaufen 🔒
+shared.sellCurrencyLocked={0} verkaufen 🔒
 shared.buyingXMRWith=kaufe XMR mit {0}
 shared.sellingXMRFor=verkaufe XMR für {0}
 shared.buyingCurrency=kaufe {0} (verkaufe XMR)
@@ -103,7 +105,7 @@ shared.faq=Zur FAQ Seite
 shared.yesCancel=Ja, abbrechen
 shared.nextStep=Nächster Schritt
 shared.selectTradingAccount=Handelskonto auswählen
-shared.fundFromSavingsWalletButton=Gelder aus Haveno-Wallet überweisen
+shared.fundFromSavingsWalletButton=Wenden Sie Gelder aus der Haveno-Wallet an
 shared.fundFromExternalWalletButton=Ihre externe Wallet zum Finanzieren öffnen
 shared.openDefaultWalletFailed=Das Öffnen des Standardprogramms für Monero-Wallets ist fehlgeschlagen. Sind Sie sicher, dass Sie eines installiert haben?
 shared.belowInPercent=% unter dem Marktpreis
@@ -186,7 +188,7 @@ shared.total=Insgesamt
 shared.totalsNeeded=Benötigte Gelder
 shared.tradeWalletAddress=Adresse der Handels-Wallet
 shared.tradeWalletBalance=Guthaben der Handels-Wallet
-shared.reserveExactAmount=Reservieren Sie nur die benötigten Mittel. Es kann erforderlich sein, eine Mining-Gebühr zu zahlen und 10 Bestätigungen (~20 Minuten) abzuwarten, bevor Ihr Angebot aktiv ist.
+shared.reserveExactAmount=Reserviere nur die notwendigen Mittel. Erfordert eine Mining-Gebühr und ca. 20 Minuten, bevor dein Angebot live geht.
 shared.makerTxFee=Ersteller: {0}
 shared.takerTxFee=Abnehmer: {0}
 shared.iConfirm=Ich bestätige
@@ -330,6 +332,7 @@ offerbook.createOffer=Angebot erstellen
 offerbook.takeOffer=Angebot annehmen
 offerbook.takeOfferToBuy=Angebot annehmen {0} zu kaufen
 offerbook.takeOfferToSell=Angebot annehmen {0} zu verkaufen
+offerbook.takeOffer.enterChallenge=Geben Sie das Angebots-Passphrase ein
 offerbook.trader=Händler
 offerbook.offerersBankId=Bankkennung des Erstellers (BIC/SWIFT): {0}
 offerbook.offerersBankName=Bankname des Erstellers: {0}
@@ -340,6 +343,8 @@ offerbook.availableOffers=Verfügbare Angebote
 offerbook.filterByCurrency=Nach Währung filtern
 offerbook.filterByPaymentMethod=Nach Zahlungsmethode filtern
 offerbook.matchingOffers=Angebote die meinen Zahlungskonten entsprechen
+offerbook.filterNoDeposit=Kein Deposit
+offerbook.noDepositOffers=Angebote ohne Einzahlung (Passphrase erforderlich)
 offerbook.timeSinceSigning=Informationen zum Zahlungskonto
 offerbook.timeSinceSigning.info=Dieses Konto wurde verifiziert und {0}
 offerbook.timeSinceSigning.info.arbitrator=von einem Vermittler unterzeichnet und kann Partner-Konten unterzeichnen
@@ -458,7 +463,12 @@ createOffer.placeOfferButton=Überprüfung: Anbieten moneros zu {0}
 createOffer.createOfferFundWalletInfo.headline=Ihr Angebot finanzieren
 # suppress inspection "TrailingSpacesInProperty"
 createOffer.createOfferFundWalletInfo.tradeAmount=- Handelsbetrag: {0} \n
-createOffer.createOfferFundWalletInfo.msg=Sie müssen zum Annehmen dieses Angebots {0} einzahlen.\n\nDiese Gelder werden in Ihrer lokalen Wallet reserviert und in die MultiSig-Kautionsadresse eingesperrt, wenn jemand Ihr Angebot annimmt.\n\nDer Betrag ist die Summe aus:\n{1}- Kaution: {2}\n- Handelsgebühr: {3}\n- Mining-Gebühr: {4}\n\nSie haben zwei Möglichkeiten, Ihren Handel zu finanzieren:\n- Nutzen Sie Ihre Haveno-Wallet (bequem, aber Transaktionen können nachverfolgbar sein) ODER\n- Von einer externen Wallet überweisen (möglicherweise vertraulicher)\n\nSie werden nach dem Schließen dieses Dialogs alle Finanzierungsmöglichkeiten und Details sehen.
+createOffer.createOfferFundWalletInfo.msg=Sie müssen {0} in dieses Angebot einzahlen.\n\n\
+  Diese Gelder werden in Ihrer lokalen Wallet reserviert und in eine Multisig-Wallet gesperrt, sobald jemand Ihr Angebot annimmt.\n\n\
+  Der Betrag ist die Summe aus:\n\
+  {1}\
+  - Ihre Sicherheitskaution: {2}\n\
+  - Handelsgebühr: {3}
 
 # only first part "An error occurred when placing the offer:" has been used before. We added now the rest (need update in existing translations!)
 createOffer.amountPriceBox.error.message=Es gab einen Fehler beim Erstellen des Angebots:\n\n{0}\n\nEs haben noch keine Gelder Ihre Wallet verlassen.\nBitte starten Sie Ihre Anwendung neu und überprüfen Sie Ihre Netzwerkverbindung.
@@ -480,7 +490,10 @@ createOffer.setDepositAsBuyer=Meine Kaution als Käufer festlegen (%)
 createOffer.setDepositForBothTraders=Legen Sie die Kaution für beide Handelspartner fest (%)
 createOffer.securityDepositInfo=Die Kaution ihres Käufers wird {0}
 createOffer.securityDepositInfoAsBuyer=Ihre Kaution als Käufer wird {0}
-createOffer.minSecurityDepositUsed=Min. Kaution des Käufers wird verwendet
+createOffer.minSecurityDepositUsed=Der Mindest-Sicherheitsbetrag wird verwendet.
+createOffer.buyerAsTakerWithoutDeposit=Kein Deposit erforderlich vom Käufer (Passphrase geschützt)
+createOffer.myDeposit=Meine Sicherheitsleistung (%)
+createOffer.myDepositInfo=Ihre Sicherheitsleistung beträgt {0}
 
 
 ####################################################################
@@ -504,6 +517,8 @@ takeOffer.fundsBox.networkFee=Gesamte Mining-Gebühr
 takeOffer.fundsBox.takeOfferSpinnerInfo=Angebot annehmen: {0}
 takeOffer.fundsBox.paymentLabel=Haveno-Handel mit der ID {0}
 takeOffer.fundsBox.fundsStructure=({0} Kaution, {1} Handelsgebühr, {2} Mining-Gebühr)
+takeOffer.fundsBox.noFundingRequiredTitle=Keine Finanzierung erforderlich
+takeOffer.fundsBox.noFundingRequiredDescription=Holen Sie sich das Angebots-Passwort vom Verkäufer außerhalb von Haveno, um dieses Angebot anzunehmen.
 takeOffer.success.headline=Sie haben erfolgreich ein Angebot angenommen.
 takeOffer.success.info=Sie können den Status Ihres Trades unter \"Portfolio/Offene Trades\" einsehen.
 takeOffer.error.message=Bei der Angebotsannahme trat ein Fehler auf.\n\n{0}
@@ -1038,6 +1053,8 @@ settings.net.p2pHeader=Haveno-Netzwerk
 settings.net.onionAddressLabel=Meine Onion-Adresse
 settings.net.xmrNodesLabel=Spezifische Monero-Knoten verwenden
 settings.net.moneroPeersLabel=Verbundene Peers
+settings.net.connection=Verbindung
+settings.net.connected=Verbunden
 settings.net.useTorForXmrJLabel=Tor für das Monero-Netzwerk verwenden
 settings.net.moneroNodesLabel=Mit Monero-Knoten verbinden
 settings.net.useProvidedNodesRadio=Bereitgestellte Monero-Core-Knoten verwenden
@@ -1457,6 +1474,7 @@ offerDetailsWindow.confirm.maker=Bestätigen: Anbieten monero zu {0}
 offerDetailsWindow.confirm.taker=Bestätigen: Angebot annehmen monero zu {0}
 offerDetailsWindow.creationDate=Erstellungsdatum
 offerDetailsWindow.makersOnion=Onion-Adresse des Erstellers
+offerDetailsWindow.challenge=Angebots-Passphrase
 
 qRCodeWindow.headline=QR Code
 qRCodeWindow.msg=Bitte nutzen Sie diesen QR Code um Ihr Haveno Wallet von Ihrem externen Wallet aufzuladen.
@@ -1497,7 +1515,7 @@ tacWindow.disagree=Ich stimme nicht zu und beende
 tacWindow.arbitrationSystem=Streitbeilegung
 
 tradeDetailsWindow.headline=Handel
-tradeDetailsWindow.disputedPayoutTxId=Transaktions-ID der strittigen Auszahlung:
+tradeDetailsWindow.disputedPayoutTxId=Transaktions-ID der strittigen Auszahlung
 tradeDetailsWindow.tradeDate=Handelsdatum
 tradeDetailsWindow.txFee=Mining-Gebühr
 tradeDetailsWindow.tradePeersOnion=Onion-Adresse des Handelspartners
@@ -1683,6 +1701,9 @@ popup.accountSigning.unsignedPubKeys.signed=Pubkeys wurden unterzeichnet
 popup.accountSigning.unsignedPubKeys.result.signed=Unterzeichnete Pubkeys
 popup.accountSigning.unsignedPubKeys.result.failed=Unterzeichnung fehlgeschlagen
 
+popup.info.buyerAsTakerWithoutDeposit.headline=Kein Depositum vom Käufer erforderlich
+popup.info.buyerAsTakerWithoutDeposit=Ihr Angebot erfordert keine Sicherheitsleistung oder Gebühr vom XMR-Käufer.\n\nUm Ihr Angebot anzunehmen, müssen Sie ein Passwort mit Ihrem Handelspartner außerhalb von Haveno teilen.\n\nDas Passwort wird automatisch generiert und nach der Erstellung in den Angebotsdetails angezeigt.
+
 ####################################################################
 # Notifications
 ####################################################################
@@ -1808,6 +1829,7 @@ navigation.support=\"Support\"
 
 formatter.formatVolumeLabel={0} Betrag{1}
 formatter.makerTaker=Ersteller als {0} {1} / Abnehmer als {2} {3}
+formatter.makerTakerLocked=Ersteller als {0} {1} / Abnehmer als {2} {3} 🔒
 formatter.youAreAsMaker=Sie sind: {1} {0} (Ersteller) / Abnehmer ist: {3} {2}
 formatter.youAreAsTaker=Sie sind: {1} {0} (Abnehmer) / Ersteller ist: {3} {2}
 formatter.youAre=Sie {0} {1} ({2} {3})
@@ -1963,9 +1985,9 @@ payment.moneyGram.info=Bei der Nutzung von MoneyGram, muss der XMR Käufer die M
 payment.westernUnion.info=Bei der Nutzung von Western Union, muss der XMR Käufer die MTCN (Tracking-Nummer)  Foto der Quittung per E-Mail an den XMR-Verkäufer senden. Die Quittung muss den vollständigen Namen, das Land, die Stadt des Verkäufers und den Betrag deutlich zeigen. Der Käufer bekommt die E-Mail-Adresse des Verkäufers im Handelsprozess angezeigt.
 payment.halCash.info=Bei Verwendung von HalCash muss der XMR-Käufer dem XMR-Verkäufer den HalCash-Code per SMS vom Mobiltelefon senden.\n\nBitte achten Sie darauf, dass Sie den maximalen Betrag, den Sie bei Ihrer Bank mit HalCash versenden dürfen, nicht überschreiten. Der Mindestbetrag pro Auszahlung beträgt 10 EUR und der Höchstbetrag 600 EUR. Bei wiederholten Abhebungen sind es 3000 EUR pro Empfänger pro Tag und 6000 EUR pro Empfänger pro Monat. Bitte überprüfen Sie diese Limits bei Ihrer Bank, um sicherzustellen, dass sie die gleichen Limits wie hier angegeben verwenden.\n\nDer Auszahlungsbetrag muss ein Vielfaches von 10 EUR betragen, da Sie keine anderen Beträge an einem Geldautomaten abheben können. Die Benutzeroberfläche beim Erstellen und Annehmen eines Angebots passt den XMR-Betrag so an, dass der EUR-Betrag korrekt ist. Sie können keinen marktbasierten Preis verwenden, da sich der EUR-Betrag bei sich ändernden Preisen ändern würde.\n\nIm Streitfall muss der XMR-Käufer den Nachweis erbringen, dass er die EUR geschickt hat.
 # suppress inspection "UnusedMessageFormatParameter"
-payment.limits.info=Bitte beachten Sie, dass alle Banküberweisungen mit einem gewissen Rückbuchungsrisiko verbunden sind. Um dieses Risiko zu mindern, setzt Haveno Limits pro Trade fest, je nachdem wie hoch das Rückbuchungsrisiko der Zahlungsmethode ist. \n\nFür diese Zahlungsmethode beträgt Ihr Pro-Trade-Limit zum Kaufen oder Verkaufen {2}.\nDieses Limit gilt nur für die Größe eines einzelnen Trades - Sie können soviele Trades platzieren wie Sie möchten.\n\nFinden Sie mehr Informationen im Wiki [HYPERLINK:https://haveno.exchange/wiki/Account_limits].
+payment.limits.info=Bitte beachten Sie, dass alle Banküberweisungen mit einem gewissen Rückbuchungsrisiko verbunden sind. Um dieses Risiko zu mindern, setzt Haveno Limits pro Trade fest, je nachdem wie hoch das Rückbuchungsrisiko der Zahlungsmethode ist. \n\nFür diese Zahlungsmethode beträgt Ihr Pro-Trade-Limit zum Kaufen oder Verkaufen {2}.\nDieses Limit gilt nur für die Größe eines einzelnen Trades - Sie können soviele Trades platzieren wie Sie möchten.\n\nFinden Sie mehr Informationen im Wiki [HYPERLINK:https://docs.haveno.exchange/the-project/account_limits].
 # suppress inspection "UnusedProperty"
-payment.limits.info.withSigning=Um das Risiko einer Rückbuchung zu minimieren, setzt Haveno für diese Zahlungsmethode Limits pro Trade auf der Grundlage der folgenden 2 Faktoren fest:\n\n1. Allgemeines Rückbuchungsrisiko für die Zahlungsmethode\n2. Status der Kontounterzeichnung\n\nDieses Zahlungskonto ist noch nicht unterzeichnet. Es ist daher auf den Kauf von {0} pro Trade beschränkt ist. Nach der Unterzeichnung werden die Kauflimits wie folgt erhöht:\n\n● Vor der Unterzeichnung und für 30 Tage nach der Unterzeichnung beträgt Ihr Kauflimit pro Trade {0}\n● 30 Tage nach der Unterzeichnung beträgt Ihr Kauflimit pro Trade {1}\n● 60 Tage nach der Unterzeichnung beträgt Ihr Kauflimit pro Trade {2}\n\nVerkaufslimits sind von der Kontounterzeichnung nicht betroffen. Sie können  {2} in einem einzigen Trade sofort verkaufen.\n\nDieses Limit gilt nur für die Größe eines einzelnen Trades - Sie können soviele Trades platzieren wie sie möchten.\n\nWeitere Informationen gibt es im Wiki [HYPERLINK:https://haveno.exchange/wiki/Account_limits].
+payment.limits.info.withSigning=Um das Risiko einer Rückbuchung zu minimieren, setzt Haveno für diese Zahlungsmethode Limits pro Trade auf der Grundlage der folgenden 2 Faktoren fest:\n\n1. Allgemeines Rückbuchungsrisiko für die Zahlungsmethode\n2. Status der Kontounterzeichnung\n\nDieses Zahlungskonto ist noch nicht unterzeichnet. Es ist daher auf den Kauf von {0} pro Trade beschränkt ist. Nach der Unterzeichnung werden die Kauflimits wie folgt erhöht:\n\n● Vor der Unterzeichnung und für 30 Tage nach der Unterzeichnung beträgt Ihr Kauflimit pro Trade {0}\n● 30 Tage nach der Unterzeichnung beträgt Ihr Kauflimit pro Trade {1}\n● 60 Tage nach der Unterzeichnung beträgt Ihr Kauflimit pro Trade {2}\n\nVerkaufslimits sind von der Kontounterzeichnung nicht betroffen. Sie können  {2} in einem einzigen Trade sofort verkaufen.\n\nDieses Limit gilt nur für die Größe eines einzelnen Trades - Sie können soviele Trades platzieren wie sie möchten.\n\nWeitere Informationen gibt es im Wiki [HYPERLINK:https://docs.haveno.exchange/the-project/account_limits].
 
 payment.cashDeposit.info=Bitte bestätigen Sie, dass Ihre Bank Bareinzahlungen in Konten von anderen Personen erlaubt. Zum Beispiel werden diese Einzahlungen bei der Bank of America und Wells Fargo nicht mehr erlaubt.
 

core/src/main/resources/i18n/displayStrings_es.properties

@@ -40,6 +40,8 @@ shared.buyMonero=Comprar monero
 shared.sellMonero=Vender monero
 shared.buyCurrency=Comprar {0}
 shared.sellCurrency=Vender {0}
+shared.buyCurrencyLocked=Comprar {0} 🔒
+shared.sellCurrencyLocked=Vender {0} 🔒
 shared.buyingXMRWith=Comprando XMR con {0}
 shared.sellingXMRFor=Vendiendo XMR por {0}
 shared.buyingCurrency=comprando {0} (Vendiendo XMR)
@@ -103,7 +105,7 @@ shared.faq=Visitar web preguntas frecuentes
 shared.yesCancel=Sí, cancelar
 shared.nextStep=Siguiente paso
 shared.selectTradingAccount=Selecionar cuenta de intercambio
-shared.fundFromSavingsWalletButton=Transferir fondos desde la cartera Haveno
+shared.fundFromSavingsWalletButton=Aplicar fondos desde la billetera de Haveno
 shared.fundFromExternalWalletButton=Abrir su monedero externo para agregar fondos
 shared.openDefaultWalletFailed=Fallo al abrir la aplicación de cartera predeterminada. ¿Tal vez no tenga una instalada?
 shared.belowInPercent=% por debajo del precio de mercado
@@ -186,7 +188,7 @@ shared.total=Total
 shared.totalsNeeded=Fondos necesarios
 shared.tradeWalletAddress=Dirección de la cartera para intercambio
 shared.tradeWalletBalance=Saldo de la cartera de intercambio
-shared.reserveExactAmount=Reserve solo los fondos necesarios. Podría requerir una tarifa de minería y 10 confirmaciones (~20 minutos) antes de que su oferta esté activa.
+shared.reserveExactAmount=Reserve solo los fondos necesarios. Requiere una tarifa de minería y aproximadamente 20 minutos antes de que tu oferta se haga pública.
 shared.makerTxFee=Creador: {0}
 shared.takerTxFee=Tomador: {0}
 shared.iConfirm=Confirmo
@@ -330,6 +332,7 @@ offerbook.createOffer=Crear oferta
 offerbook.takeOffer=Tomar oferta
 offerbook.takeOfferToBuy=Tomar oferta de compra de {0}
 offerbook.takeOfferToSell=Tomar oferta de venta de {0}
+offerbook.takeOffer.enterChallenge=Introduzca la frase secreta de la oferta
 offerbook.trader=Trader
 offerbook.offerersBankId=ID del banco del creador (BIC/SWIFT): {0}
 offerbook.offerersBankName=Nombre del banco del creador: {0}
@@ -340,6 +343,8 @@ offerbook.availableOffers=Ofertas disponibles
 offerbook.filterByCurrency=Filtrar por moneda
 offerbook.filterByPaymentMethod=Filtrar por método de pago
 offerbook.matchingOffers=Ofertas que concuerden con mis cuentas
+offerbook.filterNoDeposit=Sin depósito
+offerbook.noDepositOffers=Ofertas sin depósito (se requiere frase de paso)
 offerbook.timeSinceSigning=Información de la cuenta
 offerbook.timeSinceSigning.info=Esta cuenta fue verificada y {0}
 offerbook.timeSinceSigning.info.arbitrator=firmada por un árbitro y puede firmar cuentas de pares
@@ -458,7 +463,12 @@ createOffer.placeOfferButton=Revisar: Poner oferta para {0} monero
 createOffer.createOfferFundWalletInfo.headline=Dote de fondos su trato.
 # suppress inspection "TrailingSpacesInProperty"
 createOffer.createOfferFundWalletInfo.tradeAmount=- Cantidad a intercambiar: {0}\n
-createOffer.createOfferFundWalletInfo.msg=Necesita depositar {0} para completar esta oferta.\n\nEsos fondos son reservados en su cartera local y se bloquearán en la dirección de depósito multifirma una vez que alguien tome su oferta.\nLa cantidad es la suma de:\n{1}- Su depósito de seguridad: {2}\n- Comisión de intercambio: {3}\n- Comisión de minado: {4}\n\nPuede elegir entre dos opciones a la hora de depositar fondos para realizar su intercambio:\n- Usar su cartera Haveno (conveniente, pero las transacciones pueden ser trazables) O también\n- Transferir desde una cartera externa (potencialmente con mayor privacidad)\n\nConocerá todos los detalles y opciones para depositar fondos al cerrar esta ventana.
+createOffer.createOfferFundWalletInfo.msg=Necesitas depositar {0} para esta oferta.\n\n\
+  Estos fondos están reservados en tu billetera local y se bloquearán en una billetera multisig una vez que alguien acepte tu oferta.\n\n\
+  El monto es la suma de:\n\
+  {1}\
+  - Tu depósito de seguridad: {2}\n\
+  - Comisión de comercio: {3}
 
 # only first part "An error occurred when placing the offer:" has been used before. We added now the rest (need update in existing translations!)
 createOffer.amountPriceBox.error.message=Ocurrió un error al colocar la oferta:\n\n{0}\n\nNingún importe de su cartera ha sido deducido aún.\nPor favor, reinicie su aplicación y compruebe su conexión a la red.
@@ -480,7 +490,10 @@ createOffer.setDepositAsBuyer=Establecer mi depósito de seguridad como comprado
 createOffer.setDepositForBothTraders=Establecer el depósito de seguridad para los comerciantes (%)
 createOffer.securityDepositInfo=Su depósito de seguridad como comprador será {0}
 createOffer.securityDepositInfoAsBuyer=Su depósito de seguridad como comprador será {0}
-createOffer.minSecurityDepositUsed=En uso el depósito de seguridad mínimo
+createOffer.minSecurityDepositUsed=Se utiliza un depósito de seguridad mínimo
+createOffer.buyerAsTakerWithoutDeposit=No se requiere depósito del comprador (protegido por passphrase)
+createOffer.myDeposit=Mi depósito de seguridad (%)
+createOffer.myDepositInfo=Tu depósito de seguridad será {0}
 
 
 ####################################################################
@@ -504,6 +517,8 @@ takeOffer.fundsBox.networkFee=Comisiones de minado totales
 takeOffer.fundsBox.takeOfferSpinnerInfo=Aceptando oferta: {0}
 takeOffer.fundsBox.paymentLabel=Intercambio Haveno con ID {0}
 takeOffer.fundsBox.fundsStructure=({0} depósito de seguridad {1} tasa de intercambio, {2} tarifa de minado)
+takeOffer.fundsBox.noFundingRequiredTitle=No se requiere financiamiento
+takeOffer.fundsBox.noFundingRequiredDescription=Obtén la frase de acceso de la oferta del vendedor fuera de Haveno para aceptar esta oferta.
 takeOffer.success.headline=Ha aceptado la oferta con éxito.
 takeOffer.success.info=Puede ver el estado de su intercambio en \"Portafolio/Intercambios abiertos\".
 takeOffer.error.message=Un error ocurrió al tomar la oferta.\n\n{0}
@@ -514,7 +529,7 @@ takeOffer.noPriceFeedAvailable=No puede tomar esta oferta porque utiliza un prec
 takeOffer.takeOfferFundWalletInfo.headline=Dotar de fondos su intercambio
 # suppress inspection "TrailingSpacesInProperty"
 takeOffer.takeOfferFundWalletInfo.tradeAmount=- Cantidad a intercambiar: {0}\n
-takeOffer.takeOfferFundWalletInfo.msg=Necesita depositar {0} para tomar esta oferta.\n\nLa cantidad es la suma de:\n{1} - Su depósito de seguridad: {2}\n- Comisión de intercambio: {3}\n- Comisiones de minado totales: {4}\n\nPuede elegir entre dos opciones al depositar fondos para realizar su intercambio:\n- Usar su cartera Haveno (conveniente, pero las transacciones pueden ser trazables) O también\n- Transferir desde una cartera externa (potencialmente con mayor privacidad)\n\nVerá todos los detalles y opciones para depositar fondos al cerrar esta ventana.
+takeOffer.takeOfferFundWalletInfo.msg=Necesitas depositar {0} para aceptar esta oferta.\n\nLa cantidad es la suma de:\n{1}- Tu depósito de seguridad: {2}\n- Tarifa de transacción: {3}
 takeOffer.alreadyPaidInFunds=Si ya ha depositado puede retirarlo en la pantalla \"Fondos/Disponible para retirar\".
 takeOffer.paymentInfo=Información de pago
 takeOffer.setAmountPrice=Establecer cantidad
@@ -1039,6 +1054,8 @@ settings.net.p2pHeader=Red Haveno
 settings.net.onionAddressLabel=Mi dirección onion
 settings.net.xmrNodesLabel=Utilizar nodos Monero personalizados
 settings.net.moneroPeersLabel=Pares conectados
+settings.net.connection=Conexión
+settings.net.connected=Conectado
 settings.net.useTorForXmrJLabel=Usar Tor para la red Monero
 settings.net.moneroNodesLabel=Nodos Monero para conectarse
 settings.net.useProvidedNodesRadio=Utilizar nodos Monero Core proporcionados
@@ -1458,6 +1475,7 @@ offerDetailsWindow.confirm.maker=Confirmar: Poner oferta para {0} monero
 offerDetailsWindow.confirm.taker=Confirmar: Tomar oferta {0} monero
 offerDetailsWindow.creationDate=Fecha de creación
 offerDetailsWindow.makersOnion=Dirección onion del creador
+offerDetailsWindow.challenge=Frase de contraseña de la oferta
 
 qRCodeWindow.headline=Código QR
 qRCodeWindow.msg=Por favor, utilice este código QR para fondear su billetera Haveno desde su billetera externa.
@@ -1684,6 +1702,9 @@ popup.accountSigning.unsignedPubKeys.signed=Las claves públicas se firmaron
 popup.accountSigning.unsignedPubKeys.result.signed=Claves públicas firmadas
 popup.accountSigning.unsignedPubKeys.result.failed=Error al firmar
 
+popup.info.buyerAsTakerWithoutDeposit.headline=No se requiere depósito del comprador
+popup.info.buyerAsTakerWithoutDeposit=Tu oferta no requerirá un depósito de seguridad ni una tarifa del comprador de XMR.\n\nPara aceptar tu oferta, debes compartir una frase de acceso con tu compañero de comercio fuera de Haveno.\n\nLa frase de acceso se genera automáticamente y se muestra en los detalles de la oferta después de la creación.
+
 ####################################################################
 # Notifications
 ####################################################################
@@ -1809,6 +1830,7 @@ navigation.support=\"Soporte\"
 
 formatter.formatVolumeLabel={0} cantidad{1}
 formatter.makerTaker=Creador como {0} {1} / Tomador como {2} {3}
+formatter.makerTakerLocked=Creador como {0} {1} / Tomador como {2} {3} 🔒
 formatter.youAreAsMaker=Usted es: {1} {0} (creador) / El tomador es: {3} {2}
 formatter.youAreAsTaker=Usted es: {1} {0} (tomador) / Creador es: {3} {2}
 formatter.youAre=Usted es {0} {1} ({2} {3})
@@ -1964,9 +1986,9 @@ payment.moneyGram.info=Al utilizar MoneyGram, el comprador de XMR tiene que envi
 payment.westernUnion.info=Al utilizar Western Union, el comprador de XMR tiene que enviar el número de seguimiento (MTCN) y una foto del recibo al vendedor de XMR por correo electrónico. El recibo debe mostrar claramente el como el nombre completo del vendedor, país, ciudad y cantidad. Al comprador se le mostrará el correo electrónico del vendedor en el proceso de intercambio.
 payment.halCash.info=Al usar HalCash el comprador de XMR necesita enviar al vendedor de XMR el código HalCash a través de un mensaje de texto desde el teléfono móvil.\n\nPor favor asegúrese de que no excede la cantidad máxima que su banco le permite enviar con HalCash. La cantidad mínima por retirada es de 10 EUR y el máximo son 600 EUR. Para retiros frecuentes es 3000 por receptor al día y 6000 por receptor al mes. Por favor compruebe estos límites con su banco y asegúrese que son los mismos aquí expuestos.\n\nLa cantidad de retiro debe ser un múltiplo de 10 EUR ya que no se puede retirar otras cantidades desde el cajero automático. La Interfaz de Usuario en la pantalla crear oferta y tomar oferta ajustará la cantidad de XMR para que la cantidad de EUR sea correcta. No puede usar precios basados en el mercado ya que la cantidad de EUR cambiaría con el cambio de precios.\n\nEn caso de disputa  el comprador de XMR necesita proveer la prueba de que ha enviado EUR.
 # suppress inspection "UnusedMessageFormatParameter"
-payment.limits.info=Por favor, tenga en cuenta que todas las transferencias bancarias tienen cierto riesgo de reversión de pago.\n\nPara disminuir este riesgo, Haveno establece límites por intercambio en función del nivel estimado de riesgo de reversión de pago para el método usado.\n\nPara este método de pago, su límite por intercambio para comprar y vender es {2}.\n\nEste límite solo aplica al tamaño de un intercambio: puede poner tantos intercambios como quira.\n\nConsulte detalles en la wiki [HYPERLINK:https://haveno.exchange/wiki/Account_limits].
+payment.limits.info=Por favor, tenga en cuenta que todas las transferencias bancarias tienen cierto riesgo de reversión de pago.\n\nPara disminuir este riesgo, Haveno establece límites por intercambio en función del nivel estimado de riesgo de reversión de pago para el método usado.\n\nPara este método de pago, su límite por intercambio para comprar y vender es {2}.\n\nEste límite solo aplica al tamaño de un intercambio: puede poner tantos intercambios como quira.\n\nConsulte detalles en la wiki [HYPERLINK:https://docs.haveno.exchange/the-project/account_limits].
 # suppress inspection "UnusedProperty"
-payment.limits.info.withSigning=Para limitar el riesgo de devolución de cargo, Haveno establece límites por compra basados en los 2 siguientes factores:\n\n1. Riesgo general de devolución de cargo para el método de pago\n2. Estado de firmado de cuenta\n\nEsta cuenta de pago aún no ha sido firmada, con lo que ha sido limitada para comprar {0} por intercambio. Después de firmarse, los límites de compra se incrementarán de esta manera:\n\n● Antes de ser firmada, y hasta 30 días después de la firma, su límite por intercambio de compra será {0}\n● 30 días después de la firma, su límite de compra por intercambio será de {1}\n● 60 días después de la firma, su límite de compra por intercambio será de {2}\n\nLos límites de venta no se ven afectados por el firmado de cuentas. Puede vender {2} en un solo \nintercambio inmediatamente.\n\nEstos límites solo aplican al tamaño de un intercambio. Puede hacer tantos intercambios como quiera.\n\n Consulte detalles en la wiki [HYPERLINK:https://haveno.exchange/wiki/Account_limits].\n\n
+payment.limits.info.withSigning=Para limitar el riesgo de devolución de cargo, Haveno establece límites por compra basados en los 2 siguientes factores:\n\n1. Riesgo general de devolución de cargo para el método de pago\n2. Estado de firmado de cuenta\n\nEsta cuenta de pago aún no ha sido firmada, con lo que ha sido limitada para comprar {0} por intercambio. Después de firmarse, los límites de compra se incrementarán de esta manera:\n\n● Antes de ser firmada, y hasta 30 días después de la firma, su límite por intercambio de compra será {0}\n● 30 días después de la firma, su límite de compra por intercambio será de {1}\n● 60 días después de la firma, su límite de compra por intercambio será de {2}\n\nLos límites de venta no se ven afectados por el firmado de cuentas. Puede vender {2} en un solo \nintercambio inmediatamente.\n\nEstos límites solo aplican al tamaño de un intercambio. Puede hacer tantos intercambios como quiera.\n\n Consulte detalles en la wiki [HYPERLINK:https://docs.haveno.exchange/the-project/account_limits].\n\n
 
 payment.cashDeposit.info=Por favor confirme que su banco permite enviar depósitos de efectivo a cuentas de otras personas. Por ejemplo, Bank of America y Wells Fargo ya no permiten estos depósitos.
 

core/src/main/resources/i18n/displayStrings_fa.properties

@@ -40,6 +40,8 @@ shared.buyMonero=خرید بیتکوین
 shared.sellMonero=بیتکوین بفروشید
 shared.buyCurrency=خرید {0}
 shared.sellCurrency=فروش {0}
+shared.buyCurrencyLocked=بخر {0} 🔒
+shared.sellCurrencyLocked=فروش {0} 🔒
 shared.buyingXMRWith=خرید بیتکوین با {0}
 shared.sellingXMRFor=فروش بیتکوین با {0}
 shared.buyingCurrency=خرید {0} ( فروش بیتکوین)
@@ -103,7 +105,7 @@ shared.faq=Visit FAQ page
 shared.yesCancel=بله، لغو شود
 shared.nextStep=گام بعدی
 shared.selectTradingAccount=حساب معاملات را انتخاب کنید
-shared.fundFromSavingsWalletButton=انتقال وجه از کیف  Haveno
+shared.fundFromSavingsWalletButton=اعمال وجه از کیف پول هاونو
 shared.fundFromExternalWalletButton=برای تهیه پول، کیف پول بیرونی خود را باز کنید
 shared.openDefaultWalletFailed=Failed to open a Monero wallet application. Are you sure you have one installed?
 shared.belowInPercent= ٪ زیر قیمت بازار
@@ -186,7 +188,7 @@ shared.total=مجموع
 shared.totalsNeeded=وجه مورد نیاز
 shared.tradeWalletAddress=آدرس کیف‌پول معاملات
 shared.tradeWalletBalance=موجودی کیف‌پول معاملات
-shared.reserveExactAmount=رزرو فقط مقدار مورد نیاز پول. قبل از فعال شدن پیشنهاد شما، ممکن است نیاز به هزینه استخراج و 10 تایید (~20 دقیقه) باشد.
+shared.reserveExactAmount=فقط وجوه مورد نیاز را رزرو کنید. نیاز به هزینه استخراج و حدود ۲۰ دقیقه زمان قبل از فعال شدن پیشنهاد شما دارد.
 shared.makerTxFee=سفارش گذار: {0}
 shared.takerTxFee=پذیرنده سفارش: {0}
 shared.iConfirm=تایید می‌کنم
@@ -330,6 +332,7 @@ offerbook.createOffer=ایجاد پیشنهاد
 offerbook.takeOffer=برداشتن پیشنهاد
 offerbook.takeOfferToBuy=پیشنهاد خرید {0} را بردار
 offerbook.takeOfferToSell=پیشنهاد فروش {0} را بردار
+offerbook.takeOffer.enterChallenge=عبارت عبور پیشنهاد را وارد کنید
 offerbook.trader=معامله‌گر
 offerbook.offerersBankId=شناسه بانک سفارش‌گذار (BIC/SWIFT): {0}
 offerbook.offerersBankName= نام بانک سفارش‌گذار : {0}
@@ -339,7 +342,9 @@ offerbook.offerersAcceptedBankSeats=بانک‌های کشورهای پذیرف
 offerbook.availableOffers=پیشنهادهای موجود
 offerbook.filterByCurrency=فیلتر بر اساس ارز
 offerbook.filterByPaymentMethod=فیلتر بر اساس روش پرداخت
-offerbook.matchingOffers=Offers matching my accounts
+offerbook.matchingOffers=پیشنهادات متناسب با حساب‌های من
+offerbook.filterNoDeposit=هیچ سپرده‌ای
+offerbook.noDepositOffers=پیشنهادهایی بدون ودیعه (نیاز به عبارت عبور)
 offerbook.timeSinceSigning=Account info
 offerbook.timeSinceSigning.info=This account was verified and {0}
 offerbook.timeSinceSigning.info.arbitrator=signed by an arbitrator and can sign peer accounts
@@ -457,7 +462,12 @@ createOffer.placeOfferButton=بررسی: پیشنهاد را برای  {0} بی
 createOffer.createOfferFundWalletInfo.headline=پیشنهاد خود را تامین وجه نمایید
 # suppress inspection "TrailingSpacesInProperty"
 createOffer.createOfferFundWalletInfo.tradeAmount=مقدار معامله:{0}\n
-createOffer.createOfferFundWalletInfo.msg=شما باید {0} برای این پیشنهاد، سپرده بگذارید.\nآن وجوه در کیف پول محلی شما ذخیره شده اند و هنگامی که کسی پیشنهاد شما را دریافت می کند، به آدرس سپرده چند امضایی قفل خواهد شد.\n\nمقدار مذکور، مجموع موارد ذیل است:\n{1} - سپرده‌ی اطمینان شما: {2}\n-هزینه معامله: {3}\n-هزینه تراکنش شبکه: {4}\nشما هنگام تامین مالی معامله‌ی خود، می‌توانید بین دو گزینه انتخاب کنید:\n- از کیف پول Haveno خود استفاده کنید (این روش راحت است، اما ممکن است تراکنش‌ها قابل رصد شوند)، یا\n- از کیف پول خارجی انتقال دهید (به طور بالقوه‌ای این روش ایمن‌تر و محافظ حریم خصوصی شما است)\n\nشما تمام گزینه‌ها و جزئیات تامین مالی را پس از بستن این پنجره، خواهید دید.
+createOffer.createOfferFundWalletInfo.msg=شما باید {0} را برای این پیشنهاد واریز کنید.\n\n\
+این وجوه در کیف پول محلی شما رزرو می‌شوند و هنگامی که کسی پیشنهاد شما را قبول کند، به یک کیف پول مولتی‌سیگ قفل خواهند شد.\n\n\
+مقدار این مبلغ مجموع موارد زیر است:\n\
+{1}\
+- ودیعه امنیتی شما: {2}\n\
+- هزینه معامله: {3}
 
 # only first part "An error occurred when placing the offer:" has been used before. We added now the rest (need update in existing translations!)
 createOffer.amountPriceBox.error.message=یک خطا هنگام قرار دادن پیشنهاد، رخ داده است:\n\n{0}\n\nهیچ پولی تاکنون از کیف پول شما کم نشده است.\nلطفاً برنامه را مجدداً راه اندازی کرده و ارتباط اینترنت خود را بررسی نمایید.
@@ -479,7 +489,10 @@ createOffer.setDepositAsBuyer=تنظیم سپرده‌ی اطمینان من ب
 createOffer.setDepositForBothTraders=Set both traders' security deposit (%)
 createOffer.securityDepositInfo=سپرده‌ی اطمینان خریدار شما {0} خواهد بود
 createOffer.securityDepositInfoAsBuyer=سپرده‌ی اطمینان شما به عنوان خریدار {0} خواهد بود
-createOffer.minSecurityDepositUsed=Min. buyer security deposit is used
+createOffer.minSecurityDepositUsed=حداقل سپرده امنیتی استفاده می‌شود
+createOffer.buyerAsTakerWithoutDeposit=هیچ سپرده‌ای از خریدار مورد نیاز نیست (محافظت شده با پس‌عبارت)
+createOffer.myDeposit=سپرده امنیتی من (%)
+createOffer.myDepositInfo=ودیعه امنیتی شما {0} خواهد بود
 
 
 ####################################################################
@@ -503,6 +516,8 @@ takeOffer.fundsBox.networkFee=کل کارمزد استخراج
 takeOffer.fundsBox.takeOfferSpinnerInfo=پذیرفتن پیشنهاد: {0}
 takeOffer.fundsBox.paymentLabel=معامله Haveno با شناسه‌ی {0}
 takeOffer.fundsBox.fundsStructure=({0} سپرده‌ی اطمینان، {1} هزینه‌ی معامله، {2} هزینه تراکنش شبکه)
+takeOffer.fundsBox.noFundingRequiredTitle=نیاز به تأمین مالی نیست
+takeOffer.fundsBox.noFundingRequiredDescription=برای پذیرش این پیشنهاد، رمزعبور آن را از فروشنده خارج از هاونئو دریافت کنید.
 takeOffer.success.headline=با موفقیت یک پیشنهاد را قبول کرده‌اید.
 takeOffer.success.info=شما می‌توانید وضعیت معامله‌ی خود را در \"سبد سهام /معاملات باز\" ببینید.
 takeOffer.error.message=هنگام قبول کردن پیشنهاد، اتفاقی رخ داده است.\n\n{0}
@@ -513,7 +528,7 @@ takeOffer.noPriceFeedAvailable=امکان پذیرفتن پیشنهاد وجود
 takeOffer.takeOfferFundWalletInfo.headline=معامله خود را تأمین وجه نمایید
 # suppress inspection "TrailingSpacesInProperty"
 takeOffer.takeOfferFundWalletInfo.tradeAmount=مقدار معامله: {0}\n
-takeOffer.takeOfferFundWalletInfo.msg=شما باید {0} برای قبول این پیشنهاد، سپرده بگذارید.\nاین مقدار مجموع موارد ذیل است:\n{1} - سپرده‌ی اطمینان شما: {2}\n-هزینه معامله: {3}\n-تمامی هزینه های تراکنش شبکه: {4}\nشما هنگام تامین مالی معامله‌ی خود، می‌توانید بین دو گزینه انتخاب کنید:\n- از کیف پول Haveno خود استفاده کنید (این روش راحت است، اما ممکن است تراکنش‌ها قابل رصد شوند)، یا\n- از کیف پول خارجی انتقال دهید (به طور بالقوه‌ای این روش ایمن‌تر و محافظ حریم خصوصی شما است)\n\nشما تمام گزینه‌ها و جزئیات تامین مالی را پس از بستن این پنجره، خواهید دید.
+takeOffer.takeOfferFundWalletInfo.msg=باید {0} را برای پذیرش این پیشنهاد واریز کنید.\n\nمبلغ مجموع موارد زیر است:\n{1}- سپرده امنیتی شما: {2}\n- هزینه معامله: {3}
 takeOffer.alreadyPaidInFunds=اگر شما در حال حاضر در وجوه، پرداختی داشته اید، می توانید آن را در صفحه ی \"وجوه/ارسال وجوه\" برداشت کنید.
 takeOffer.paymentInfo=اطلاعات پرداخت
 takeOffer.setAmountPrice=تنظیم مقدار
@@ -1035,6 +1050,8 @@ settings.net.p2pHeader=Haveno network
 settings.net.onionAddressLabel=آدرس onion من
 settings.net.xmrNodesLabel=استفاده از گره‌های Monero اختصاصی
 settings.net.moneroPeersLabel=همتایان متصل
+settings.net.connection=اتصال
+settings.net.connected=متصل
 settings.net.useTorForXmrJLabel=استفاده از Tor برای شبکه مونرو
 settings.net.moneroNodesLabel=گره‌های Monero در دسترس
 settings.net.useProvidedNodesRadio=استفاده از نودهای بیتکوین ارائه شده
@@ -1453,6 +1470,7 @@ offerDetailsWindow.confirm.maker=تأیید: پیشنهاد را به {0} بگذ
 offerDetailsWindow.confirm.taker=تأیید: پیشنهاد را به {0} بپذیرید
 offerDetailsWindow.creationDate=تاریخ ایجاد
 offerDetailsWindow.makersOnion=آدرس Onion سفارش گذار
+offerDetailsWindow.challenge=Passphrase de l'offre
 
 qRCodeWindow.headline=QR Code
 qRCodeWindow.msg=Please use this QR code for funding your Haveno wallet from your external wallet.
@@ -1676,6 +1694,9 @@ popup.accountSigning.unsignedPubKeys.signed=Pubkeys were signed
 popup.accountSigning.unsignedPubKeys.result.signed=Signed pubkeys
 popup.accountSigning.unsignedPubKeys.result.failed=Failed to sign
 
+popup.info.buyerAsTakerWithoutDeposit.headline=هیچ پیش‌پرداختی از خریدار مورد نیاز نیست
+popup.info.buyerAsTakerWithoutDeposit=پیشنهاد شما نیاز به ودیعه امنیتی یا هزینه از خریدار XMR ندارد.\n\nبرای پذیرفتن پیشنهاد شما، باید یک پس‌عبارت را با شریک تجاری خود خارج از Haveno به اشتراک بگذارید.\n\nپس‌عبارت به‌طور خودکار تولید می‌شود و پس از ایجاد در جزئیات پیشنهاد نمایش داده می‌شود.
+
 ####################################################################
 # Notifications
 ####################################################################
@@ -1801,6 +1822,7 @@ navigation.support=\"پشتیبانی\"
 
 formatter.formatVolumeLabel={0} مبلغ {1}
 formatter.makerTaker=سفارش گذار به عنوان {0} {1} / پذیرنده به عنوان {2} {3}
+formatter.makerTakerLocked=سفارش گذار به عنوان {0} {1} / پذیرنده به عنوان {2} {3} 🔒
 formatter.youAreAsMaker=You are: {1} {0} (maker) / Taker is: {3} {2}
 formatter.youAreAsTaker=You are: {1} {0} (taker) / Maker is: {3} {2}
 formatter.youAre=شما {0} {1} ({2} {3}) هستید
@@ -1956,9 +1978,9 @@ payment.moneyGram.info=When using MoneyGram the XMR buyer has to send the Author
 payment.westernUnion.info=When using Western Union the XMR buyer has to send the MTCN (tracking number) and a photo of the receipt by email to the XMR seller. The receipt must clearly show the seller's full name, city, country and the amount. The seller's email will be displayed to the buyer during the trade process.
 payment.halCash.info=زمانی که از HalCash استفاده می‌کنید، خریدار باید کد HalCash را از طریق پیام کوتاه موبایل به فروشنده XMR ارسال کند.\n\nلطفا مطمئن شوید که از حداکثر میزانی که بانک شما برای انتقال از طریق HalCash مجاز می‌داند تجاوز نکرده‌اید. حداقل مقداردر هر برداشت معادل 10 یورو و حداکثر مقدار 600 یورو می‌باشد. این محدودیت برای برداشت‌های تکراری برای هر گیرنده در روز 3000 یورو و در ماه 6000 یورو می‌باشد. لطفا این محدودیت‌ها را با بانک خود مطابقت دهید و مطمئن شوید که آنها هم همین محدودی‌ها را دارند.\n\nمقدار برداشت باید شریبی از 10 یورو باشد چرا که مقادیر غیر از این را نمی‌توانید از طریق ATM برداشت کنید. رابط کاربری در صفحه ساخت پینشهاد و پذیرش پیشنهاد مقدار XMR را به گونه‌ای تنظیم می‌کنند که مقدار EUR درست باشد. شما نمی‌توانید از قیمت بر مبنای بازار استفاده کنید چون مقدار یورو با تغییر قیمت‌ها عوض خواهد شد.\n\nدر صورت بروز اختلاف خریدار XMR باید شواهد مربوط به ارسال یورو را ارائه دهد.
 # suppress inspection "UnusedMessageFormatParameter"
-payment.limits.info=Please be aware that all bank transfers carry a certain amount of chargeback risk. To mitigate this risk, Haveno sets per-trade limits based on the estimated level of chargeback risk for the payment method used.\n\nFor this payment method, your per-trade limit for buying and selling is {2}.\n\nThis limit only applies to the size of a single trade—you can place as many trades as you like.\n\nSee more details on the wiki [HYPERLINK:https://haveno.exchange/wiki/Account_limits].
+payment.limits.info=Please be aware that all bank transfers carry a certain amount of chargeback risk. To mitigate this risk, Haveno sets per-trade limits based on the estimated level of chargeback risk for the payment method used.\n\nFor this payment method, your per-trade limit for buying and selling is {2}.\n\nThis limit only applies to the size of a single trade—you can place as many trades as you like.\n\nSee more details on the wiki [HYPERLINK:https://docs.haveno.exchange/the-project/account_limits].
 # suppress inspection "UnusedProperty"
-payment.limits.info.withSigning=To limit chargeback risk, Haveno sets per-trade limits for this payment account type based on the following 2 factors:\n\n1. General chargeback risk for the payment method\n2. Account signing status\n\nThis payment account is not yet signed, so it is limited to buying {0} per trade. After signing, buy limits will increase as follows:\n\n● Before signing, and for 30 days after signing, your per-trade buy limit will be {0}\n● 30 days after signing, your per-trade buy limit will be {1}\n● 60 days after signing, your per-trade buy limit will be {2}\n\nSell limits are not affected by account signing. You can sell {2} in a single trade immediately.\n\nThese limits only apply to the size of a single trade—you can place as many trades as you like. \n\nSee more details on the wiki [HYPERLINK:https://haveno.exchange/wiki/Account_limits].
+payment.limits.info.withSigning=To limit chargeback risk, Haveno sets per-trade limits for this payment account type based on the following 2 factors:\n\n1. General chargeback risk for the payment method\n2. Account signing status\n\nThis payment account is not yet signed, so it is limited to buying {0} per trade. After signing, buy limits will increase as follows:\n\n● Before signing, and for 30 days after signing, your per-trade buy limit will be {0}\n● 30 days after signing, your per-trade buy limit will be {1}\n● 60 days after signing, your per-trade buy limit will be {2}\n\nSell limits are not affected by account signing. You can sell {2} in a single trade immediately.\n\nThese limits only apply to the size of a single trade—you can place as many trades as you like. \n\nSee more details on the wiki [HYPERLINK:https://docs.haveno.exchange/the-project/account_limits].
 
 payment.cashDeposit.info=لطفا مطمئن شوید که بانک شما اجازه پرداخت سپرده نفد به حساب دیگر افراد را می‌دهد. برای مثال، Bank of America و Wells Fargo دیگر اجازه چنین پرداخت‌هایی را نمی‌دهند.
 

core/src/main/resources/i18n/displayStrings_fr.properties

@@ -40,6 +40,8 @@ shared.buyMonero=Achat Monero
 shared.sellMonero=Vendre des Moneros
 shared.buyCurrency=Achat {0}
 shared.sellCurrency=Vendre {0}
+shared.buyCurrencyLocked=Achat {0} 🔒
+shared.sellCurrencyLocked=Vendre {0} 🔒
 shared.buyingXMRWith=achat XMR avec {0}
 shared.sellingXMRFor=vendre XMR pour {0}
 shared.buyingCurrency=achat {0} (vente XMR)
@@ -103,7 +105,7 @@ shared.faq=Visitez la page FAQ
 shared.yesCancel=Oui, annuler
 shared.nextStep=Étape suivante
 shared.selectTradingAccount=Sélectionner le compte de trading
-shared.fundFromSavingsWalletButton=Transférer des fonds depuis le portefeuille Haveno
+shared.fundFromSavingsWalletButton=Appliquer les fonds depuis le portefeuille Haveno
 shared.fundFromExternalWalletButton=Ouvrez votre portefeuille externe pour provisionner
 shared.openDefaultWalletFailed=L'ouverture de l'application de portefeuille Monero par défaut a échoué. Êtes-vous sûr de l'avoir installée?
 shared.belowInPercent=% sous le prix du marché
@@ -186,7 +188,7 @@ shared.total=Total
 shared.totalsNeeded=Fonds nécessaires
 shared.tradeWalletAddress=Adresse du portefeuille de trading
 shared.tradeWalletBalance=Solde du portefeuille de trading
-shared.reserveExactAmount=Réservez uniquement les fonds nécessaires. Il peut être nécessaire de payer des frais de minage et d'attendre 10 confirmations (~20 minutes) avant que votre offre ne soit active.
+shared.reserveExactAmount=Réservez uniquement les fonds nécessaires. Nécessite des frais de minage et environ 20 minutes avant que votre offre ne soit mise en ligne.
 shared.makerTxFee=Maker: {0}
 shared.takerTxFee=Taker: {0}
 shared.iConfirm=Je confirme
@@ -330,6 +332,7 @@ offerbook.createOffer=Créer un ordre
 offerbook.takeOffer=Accepter un ordre
 offerbook.takeOfferToBuy=Accepter l''ordre d''achat {0}
 offerbook.takeOfferToSell=Accepter l''ordre de vente {0}
+offerbook.takeOffer.enterChallenge=Entrez la phrase secrète de l'offre
 offerbook.trader=Échanger
 offerbook.offerersBankId=ID de la banque du maker (BIC/SWIFT): {0}
 offerbook.offerersBankName=Nom de la banque du maker: {0}
@@ -340,6 +343,8 @@ offerbook.availableOffers=Ordres disponibles
 offerbook.filterByCurrency=Filtrer par devise
 offerbook.filterByPaymentMethod=Filtrer par mode de paiement
 offerbook.matchingOffers=Offres correspondants à mes comptes
+offerbook.filterNoDeposit=Aucun dépôt
+offerbook.noDepositOffers=Offres sans dépôt (passphrase requise)
 offerbook.timeSinceSigning=Informations du compte
 offerbook.timeSinceSigning.info=Ce compte a été vérifié et {0}
 offerbook.timeSinceSigning.info.arbitrator=signé par un arbitre et pouvant signer des comptes pairs
@@ -458,7 +463,12 @@ createOffer.placeOfferButton=Review: Placer un ordre de {0} monero
 createOffer.createOfferFundWalletInfo.headline=Financer votre ordre
 # suppress inspection "TrailingSpacesInProperty"
 createOffer.createOfferFundWalletInfo.tradeAmount=Montant du trade: {0}\n\n
-createOffer.createOfferFundWalletInfo.msg=Vous devez déposer {0} pour cet ordre.\n\nCes fonds sont réservés dans votre portefeuille local et seront bloqués sur une adresse de dépôt multisig une fois que quelqu''un aura accepté votre ordre.\n\nLe montant correspond à la somme de:\n{1}- Votre dépôt de garantie: {2}\n- Frais de trading: {3}\n- Frais d''exploitation minière: {4}\n\nVous avez le choix entre deux options pour financer votre transaction :\n- Utilisez votre portefeuille Haveno (pratique, mais les transactions peuvent être associables) OU\n- Transfert depuis un portefeuille externe (potentiellement plus privé)\n\nVous pourrez voir toutes les options de financement et les détails après avoir fermé ce popup.
+createOffer.createOfferFundWalletInfo.msg=Vous devez déposer {0} à cette offre.\n\n\
+  Ces fonds sont réservés dans votre portefeuille local et seront verrouillés dans un portefeuille multisignature dès qu'une personne acceptera votre offre.\n\n\
+  Le montant est la somme de :\n\
+  {1}\
+  - Votre dépôt de garantie : {2}\n\
+  - Frais de transaction : {3}
 
 # only first part "An error occurred when placing the offer:" has been used before. We added now the rest (need update in existing translations!)
 createOffer.amountPriceBox.error.message=Une erreur s''est produite lors du placement de cet ordre:\n\n{0}\n\nAucun fonds n''a été prélevé sur votre portefeuille pour le moment.\nVeuillez redémarrer l''application et vérifier votre connexion réseau.
@@ -480,7 +490,10 @@ createOffer.setDepositAsBuyer=Définir mon dépôt de garantie en tant qu'achete
 createOffer.setDepositForBothTraders=Établissez le dépôt de sécurité des deux traders (%)
 createOffer.securityDepositInfo=Le dépôt de garantie de votre acheteur sera de {0}
 createOffer.securityDepositInfoAsBuyer=Votre dépôt de garantie en tant qu''acheteur sera de {0}
-createOffer.minSecurityDepositUsed=Le minimum de dépôt de garantie de l'acheteur est utilisé
+createOffer.minSecurityDepositUsed=Le dépôt de sécurité minimum est utilisé
+createOffer.buyerAsTakerWithoutDeposit=Aucun dépôt requis de la part de l'acheteur (protégé par un mot de passe)
+createOffer.myDeposit=Mon dépôt de garantie (%)
+createOffer.myDepositInfo=Votre dépôt de garantie sera de {0}
 
 
 ####################################################################
@@ -504,6 +517,8 @@ takeOffer.fundsBox.networkFee=Total des frais de minage
 takeOffer.fundsBox.takeOfferSpinnerInfo=Acceptation de l'offre : {0}
 takeOffer.fundsBox.paymentLabel=Transaction Haveno avec l''ID {0}
 takeOffer.fundsBox.fundsStructure=({0} dépôt de garantie, {1} frais de transaction, {2} frais de minage)
+takeOffer.fundsBox.noFundingRequiredTitle=Aucun financement requis
+takeOffer.fundsBox.noFundingRequiredDescription=Obtenez la phrase secrète de l'offre auprès du vendeur en dehors de Haveno pour accepter cette offre.
 takeOffer.success.headline=Vous avez accepté un ordre avec succès.
 takeOffer.success.info=Vous pouvez voir vos transactions dans \"Portfolio/Échanges en cours\".
 takeOffer.error.message=Une erreur s''est produite pendant l’'acceptation de l''ordre.\n\n{0}
@@ -514,7 +529,7 @@ takeOffer.noPriceFeedAvailable=Vous ne pouvez pas accepter cet ordre, car celui-
 takeOffer.takeOfferFundWalletInfo.headline=Provisionner votre trade
 # suppress inspection "TrailingSpacesInProperty"
 takeOffer.takeOfferFundWalletInfo.tradeAmount=- Montant du trade: {0}\n
-takeOffer.takeOfferFundWalletInfo.msg=Vous devez envoyer {0} pour cet odre.\n\nLe montant est la somme de:\n{1}--Dépôt de garantie: {2}\n- Frais de transaction: {3}\n- Frais de minage: {4}\n\nVous avez deux choix pour payer votre transaction :\n- Utiliser votre portefeuille local Haveno (pratique, mais vos transactions peuvent être tracées) OU\n- Transférer d''un portefeuille externe (potentiellement plus confidentiel)\n\nVous retrouverez toutes les options de provisionnement après fermeture de ce popup.
+takeOffer.takeOfferFundWalletInfo.msg=Vous devez déposer {0} pour accepter cette offre.\n\nLe montant est la somme de :\n{1}- Votre dépôt de garantie : {2}\n- Frais de transaction : {3}
 takeOffer.alreadyPaidInFunds=Si vous avez déjà provisionner des fonds vous pouvez les retirer dans l'onglet \"Fonds/Envoyer des fonds\".
 takeOffer.paymentInfo=Informations de paiement
 takeOffer.setAmountPrice=Définir le montant
@@ -1040,6 +1055,8 @@ settings.net.p2pHeader=Le réseau Haveno
 settings.net.onionAddressLabel=Mon adresse onion
 settings.net.xmrNodesLabel=Utiliser des nœuds Monero personnalisés
 settings.net.moneroPeersLabel=Pairs connectés
+settings.net.connection=Connexion
+settings.net.connected=Connecté
 settings.net.useTorForXmrJLabel=Utiliser Tor pour le réseau Monero
 settings.net.moneroNodesLabel=Nœuds Monero pour se connecter à
 settings.net.useProvidedNodesRadio=Utiliser les nœuds Monero Core fournis
@@ -1459,6 +1476,7 @@ offerDetailsWindow.confirm.maker=Confirmer: Placer un ordre de {0} monero
 offerDetailsWindow.confirm.taker=Confirmer: Acceptez l''ordre de {0} monero
 offerDetailsWindow.creationDate=Date de création
 offerDetailsWindow.makersOnion=Adresse onion du maker
+offerDetailsWindow.challenge=Phrase secrète de l'offre
 
 qRCodeWindow.headline=QR Code
 qRCodeWindow.msg=Veuillez utiliser le code QR pour recharger du portefeuille externe au portefeuille Haveno.
@@ -1499,7 +1517,7 @@ tacWindow.disagree=Je ne suis pas d'accord et je quitte
 tacWindow.arbitrationSystem=Règlement du litige
 
 tradeDetailsWindow.headline=Échange
-tradeDetailsWindow.disputedPayoutTxId=ID de la transaction de versement contestée :
+tradeDetailsWindow.disputedPayoutTxId=ID de la transaction de versement contestée
 tradeDetailsWindow.tradeDate=Date de l'échange
 tradeDetailsWindow.txFee=Frais de minage
 tradeDetailsWindow.tradePeersOnion=Adresse onion du pair de trading
@@ -1685,6 +1703,9 @@ popup.accountSigning.unsignedPubKeys.signed=Les clés publiques ont été signé
 popup.accountSigning.unsignedPubKeys.result.signed=Clés publiques signées
 popup.accountSigning.unsignedPubKeys.result.failed=Échec de la signature
 
+popup.info.buyerAsTakerWithoutDeposit.headline=Aucun dépôt requis de la part de l'acheteur
+popup.info.buyerAsTakerWithoutDeposit=Votre offre ne nécessitera pas de dépôt de sécurité ni de frais de la part de l'acheteur XMR.\n\nPour accepter votre offre, vous devez partager un mot de passe avec votre partenaire commercial en dehors de Haveno.\n\nLe mot de passe est généré automatiquement et affiché dans les détails de l'offre après sa création.
+
 ####################################################################
 # Notifications
 ####################################################################
@@ -1810,6 +1831,7 @@ navigation.support=\"Assistance\"
 
 formatter.formatVolumeLabel={0} montant{1}
 formatter.makerTaker=Maker comme {0} {1} / Taker comme {2} {3}
+formatter.makerTakerLocked=Maker comme {0} {1} / Taker comme {2} {3} 🔒
 formatter.youAreAsMaker=Vous êtes {1} {0} (maker) / Le preneur est: {3} {2}
 formatter.youAreAsTaker=Vous êtes: {1} {0} (preneur) / Le maker est: {3} {2}
 formatter.youAre=Vous êtes {0} {1} ({2} {3})
@@ -1965,9 +1987,9 @@ payment.moneyGram.info=Lors de l'utilisation de MoneyGram, l'acheteur de XMR doi
 payment.westernUnion.info=Lors de l'utilisation de Western Union, l'acheteur XMR doit envoyer le MTCN (numéro de suivi) et une photo du reçu par e-mail au vendeur de XMR. Le reçu doit indiquer clairement le nom complet du vendeur, la ville, le pays et le montant. L'acheteur verra ensuite s'afficher l'email du vendeur pendant le processus de transaction.
 payment.halCash.info=Lors de l'utilisation de HalCash, l'acheteur de XMR doit envoyer au vendeur de XMR le code HalCash par SMS depuis son téléphone portable.\n\nVeuillez vous assurer de ne pas dépasser le montant maximum que votre banque vous permet d'envoyer avec HalCash. Le montant minimum par retrait est de 10 EUR et le montant maximum est de 600 EUR. Pour les retraits récurrents, il est de 3000 EUR par destinataire par jour et 6000 EUR par destinataire par mois. Veuillez vérifier ces limites auprès de votre banque pour vous assurer qu'elles utilisent les mêmes limites que celles indiquées ici.\n\nLe montant du retrait doit être un multiple de 10 EUR car vous ne pouvez pas retirer d'autres montants à un distributeur automatique. Pendant les phases de create-offer et take-offer l'affichage de l'interface utilisateur ajustera le montant en XMR afin que le montant en euros soit correct. Vous ne pouvez pas utiliser le prix basé sur le marché, car le montant en euros varierait en fonction de l'évolution des prix.\n\nEn cas de litige, l'acheteur de XMR doit fournir la preuve qu'il a envoyé la somme en EUR.
 # suppress inspection "UnusedMessageFormatParameter"
-payment.limits.info=Sachez que tous les virements bancaires comportent un certain risque de rétrofacturation. Pour mitiger ce risque, Haveno fixe des limites par trade en fonction du niveau estimé de risque de rétrofacturation pour la méthode de paiement utilisée.\n\nPour cette méthode de paiement, votre limite de trading pour l'achat et la vente est de {2}.\n\nCette limite ne s'applique qu'à la taille d'une seule transaction. Vous pouvez effectuer autant de transactions que vous le souhaitez.\n\nVous trouverez plus de détails sur le wiki [HYPERLINK:https://haveno.exchange/wiki/Account_limits].
+payment.limits.info=Sachez que tous les virements bancaires comportent un certain risque de rétrofacturation. Pour mitiger ce risque, Haveno fixe des limites par trade en fonction du niveau estimé de risque de rétrofacturation pour la méthode de paiement utilisée.\n\nPour cette méthode de paiement, votre limite de trading pour l'achat et la vente est de {2}.\n\nCette limite ne s'applique qu'à la taille d'une seule transaction. Vous pouvez effectuer autant de transactions que vous le souhaitez.\n\nVous trouverez plus de détails sur le wiki [HYPERLINK:https://docs.haveno.exchange/the-project/account_limits].
 # suppress inspection "UnusedProperty"
-payment.limits.info.withSigning=Afin de limiter le risque de rétrofacturation des achats, Haveno fixe des limites d'achat par transaction pour ce compte de paiement basé sur les 2 facteurs suivants :\n\n1. Risque de rétrofacturation pour le mode de paiement\n2. Statut de signature du compte\n\nCe compte de paiement n'est pas encore signé, il est donc limité à l'achat de {0} par trade. Après sa signature, les limites d'achat augmenteront comme suit :\n\n● Avant la signature, et jusqu'à 30 jours après la signature, votre limite d'achat par trade sera de {0}\n● 30 jours après la signature, votre limite d'achat par trade sera de {1}\n● 60 jours après la signature, votre limite d'achat par trade sera de {2}\n\nLes limites de vente ne sont pas affectées par la signature du compte. Vous pouvez vendre {2} en un seul trade immédiatement.\n\nCes limites s'appliquent uniquement à la taille d'un seul trade-vous pouvez placer autant de trades que vous voulez.\n\n  Pour plus d''nformations, rendez vous à [LIEN:https://haveno.exchange/wiki/Account_limits].
+payment.limits.info.withSigning=Afin de limiter le risque de rétrofacturation des achats, Haveno fixe des limites d'achat par transaction pour ce compte de paiement basé sur les 2 facteurs suivants :\n\n1. Risque de rétrofacturation pour le mode de paiement\n2. Statut de signature du compte\n\nCe compte de paiement n'est pas encore signé, il est donc limité à l'achat de {0} par trade. Après sa signature, les limites d'achat augmenteront comme suit :\n\n● Avant la signature, et jusqu'à 30 jours après la signature, votre limite d'achat par trade sera de {0}\n● 30 jours après la signature, votre limite d'achat par trade sera de {1}\n● 60 jours après la signature, votre limite d'achat par trade sera de {2}\n\nLes limites de vente ne sont pas affectées par la signature du compte. Vous pouvez vendre {2} en un seul trade immédiatement.\n\nCes limites s'appliquent uniquement à la taille d'un seul trade-vous pouvez placer autant de trades que vous voulez.\n\n  Pour plus d''nformations, rendez vous à [LIEN:https://docs.haveno.exchange/the-project/account_limits].
 
 payment.cashDeposit.info=Veuillez confirmer que votre banque vous permet d'envoyer des dépôts en espèces sur le compte d'autres personnes. Par exemple, Bank of America et Wells Fargo n'autorisent plus de tels dépôts.
 

core/src/main/resources/i18n/displayStrings_it.properties

@@ -40,6 +40,8 @@ shared.buyMonero=Acquista monero
 shared.sellMonero=Vendi monero
 shared.buyCurrency=Acquista {0}
 shared.sellCurrency=Vendi {0}
+shared.buyCurrencyLocked=Acquista {0} 🔒
+shared.sellCurrencyLocked=Vendi {0} 🔒
 shared.buyingXMRWith=acquistando XMR con {0}
 shared.sellingXMRFor=vendendo XMR per {0}
 shared.buyingCurrency=comprando {0} (vendendo XMR)
@@ -103,7 +105,7 @@ shared.faq=Visit FAQ page
 shared.yesCancel=Si, annulla
 shared.nextStep=Passo successivo
 shared.selectTradingAccount=Seleziona conto di trading
-shared.fundFromSavingsWalletButton=Trasferisci fondi dal portafoglio Haveno
+shared.fundFromSavingsWalletButton=Applica fondi dal portafoglio Haveno
 shared.fundFromExternalWalletButton=Apri il tuo portafoglio esterno per aggiungere fondi
 shared.openDefaultWalletFailed=Failed to open a Monero wallet application. Are you sure you have one installed?
 shared.belowInPercent=Sotto % del prezzo di mercato
@@ -186,7 +188,7 @@ shared.total=Totale
 shared.totalsNeeded=Fondi richiesti
 shared.tradeWalletAddress=Indirizzo del portafoglio per gli scambi
 shared.tradeWalletBalance=Saldo del portafogli per gli scambi
-shared.reserveExactAmount=Riserva solo i fondi necessari. Potrebbe essere richiesta una tassa di mining e 10 conferme (~20 minuti) prima che la tua offerta sia attiva.
+shared.reserveExactAmount=Riserva solo i fondi necessari. Richiede una tassa di mining e circa 20 minuti prima che la tua offerta diventi attiva.
 shared.makerTxFee=Maker: {0}
 shared.takerTxFee=Taker: {0}
 shared.iConfirm=Confermo
@@ -330,6 +332,7 @@ offerbook.createOffer=Crea offerta
 offerbook.takeOffer=Accetta offerta
 offerbook.takeOfferToBuy=Accetta l'offerta per acquistare {0}
 offerbook.takeOfferToSell=Accetta l'offerta per vendere {0}
+offerbook.takeOffer.enterChallenge=Inserisci la passphrase dell'offerta
 offerbook.trader=Trader
 offerbook.offerersBankId=ID banca del Maker (BIC/SWIFT): {0}
 offerbook.offerersBankName=Nome della banca del Maker: {0}
@@ -339,7 +342,9 @@ offerbook.offerersAcceptedBankSeats=Sede accettata dei paesi bancari (acquirente
 offerbook.availableOffers=Offerte disponibili
 offerbook.filterByCurrency=Filtra per valuta
 offerbook.filterByPaymentMethod=Filtra per metodo di pagamento
-offerbook.matchingOffers=Offers matching my accounts
+offerbook.matchingOffers=Offerte che corrispondono ai miei account
+offerbook.filterNoDeposit=Nessun deposito
+offerbook.noDepositOffers=Offerte senza deposito (passphrase richiesta)
 offerbook.timeSinceSigning=Account info
 offerbook.timeSinceSigning.info=Questo account è stato verificato e {0}
 offerbook.timeSinceSigning.info.arbitrator=firmato da un arbitro e può firmare account peer
@@ -457,7 +462,12 @@ createOffer.placeOfferButton=Revisione: piazza l'offerta a {0} monero
 createOffer.createOfferFundWalletInfo.headline=Finanzia la tua offerta
 # suppress inspection "TrailingSpacesInProperty"
 createOffer.createOfferFundWalletInfo.tradeAmount=- Importo di scambio: {0} \n
-createOffer.createOfferFundWalletInfo.msg=Devi depositare {0} a questa offerta.\n\nTali fondi sono riservati nel tuo portafoglio locale e verranno bloccati nell'indirizzo di deposito multisig una volta che qualcuno accetta la tua offerta.\n\nL'importo è la somma di:\n{1} - Il tuo deposito cauzionale: {2}\n- Commissione di scambio: {3}\n- Commissione di mining: {4}\n\nPuoi scegliere tra due opzioni quando finanzi il tuo scambio:\n- Usa il tuo portafoglio Haveno (comodo, ma le transazioni possono essere collegabili) OPPURE\n- Effettua il trasferimento da un portafoglio esterno (potenzialmente più privato)\n\nVedrai tutte le opzioni di finanziamento e i dettagli dopo aver chiuso questo popup.
+createOffer.createOfferFundWalletInfo.msg=Devi depositare {0} per questa offerta.\n\n\
+  Questi fondi sono riservati nel tuo portafoglio locale e verranno bloccati in un portafoglio multisig una volta che qualcuno accetta la tua offerta.\n\n\
+  L'importo è la somma di:\n\
+  {1}\
+  - Il tuo deposito di sicurezza: {2}\n\
+  - Tassa di trading: {3}
 
 # only first part "An error occurred when placing the offer:" has been used before. We added now the rest (need update in existing translations!)
 createOffer.amountPriceBox.error.message=Si è verificato un errore durante l'immissione dell'offerta:\n\n{0}\n\nNon sono ancora usciti fondi dal tuo portafoglio.\nRiavvia l'applicazione e controlla la connessione di rete.
@@ -479,7 +489,10 @@ createOffer.setDepositAsBuyer=Imposta il mio deposito cauzionale come acquirente
 createOffer.setDepositForBothTraders=Set both traders' security deposit (%)
 createOffer.securityDepositInfo=Il deposito cauzionale dell'acquirente sarà {0}
 createOffer.securityDepositInfoAsBuyer=Il tuo deposito cauzionale come acquirente sarà {0}
-createOffer.minSecurityDepositUsed=Viene utilizzato il minimo deposito cauzionale dell'acquirente
+createOffer.minSecurityDepositUsed=Il deposito di sicurezza minimo è utilizzato
+createOffer.buyerAsTakerWithoutDeposit=Nessun deposito richiesto dal compratore (protetto da passphrase)
+createOffer.myDeposit=Il mio deposito di sicurezza (%)
+createOffer.myDepositInfo=Il tuo deposito di sicurezza sarà {0}
 
 
 ####################################################################
@@ -503,6 +516,8 @@ takeOffer.fundsBox.networkFee=Totale commissioni di mining
 takeOffer.fundsBox.takeOfferSpinnerInfo=Accettare l'offerta: {0}
 takeOffer.fundsBox.paymentLabel=Scambia Haveno con ID {0}
 takeOffer.fundsBox.fundsStructure=({0} deposito cauzionale, {1} commissione commerciale, {2} commissione mineraria)
+takeOffer.fundsBox.noFundingRequiredTitle=Nessun finanziamento richiesto
+takeOffer.fundsBox.noFundingRequiredDescription=Ottieni la passphrase dell'offerta dal venditore fuori da Haveno per accettare questa offerta.
 takeOffer.success.headline=Hai accettato con successo un'offerta.
 takeOffer.success.info=Puoi vedere lo stato del tuo scambio su \"Portafoglio/Scambi aperti\".
 takeOffer.error.message=Si è verificato un errore durante l'accettazione dell'offerta.\n\n{0}
@@ -513,7 +528,7 @@ takeOffer.noPriceFeedAvailable=Non puoi accettare questa offerta poiché utilizz
 takeOffer.takeOfferFundWalletInfo.headline=Finanzia il tuo scambio
 # suppress inspection "TrailingSpacesInProperty"
 takeOffer.takeOfferFundWalletInfo.tradeAmount=- Importo di scambio: {0} \n
-takeOffer.takeOfferFundWalletInfo.msg=Devi depositare {0} per accettare questa offerta.\n\nL'importo è la somma de:\n{1} - Il tuo deposito cauzionale: {2}\n- La commissione di trading: {3}\n- I costi di mining: {4}\n\nPuoi scegliere tra due opzioni quando finanzi il tuo scambio:\n- Usare il tuo portafoglio Haveno (comodo, ma le transazioni possono essere collegabili) OPPURE\n- Trasferimento da un portafoglio esterno (potenzialmente più privato)\n\nVedrai tutte le opzioni di finanziamento e i dettagli dopo aver chiuso questo popup.
+takeOffer.takeOfferFundWalletInfo.msg=Devi depositare {0} per accettare questa offerta.\n\nL'importo è la somma di:\n{1}- Il tuo deposito di sicurezza: {2}\n- Commissione di trading: {3}
 takeOffer.alreadyPaidInFunds=Se hai già pagato in fondi puoi effettuare il ritiro nella schermata \"Fondi/Invia fondi\".
 takeOffer.paymentInfo=Informazioni sul pagamento
 takeOffer.setAmountPrice=Importo stabilito
@@ -1037,6 +1052,8 @@ settings.net.p2pHeader=Rete Haveno
 settings.net.onionAddressLabel=Il mio indirizzo onion
 settings.net.xmrNodesLabel=Usa nodi Monero personalizzati
 settings.net.moneroPeersLabel=Peer connessi
+settings.net.connection=Connessione
+settings.net.connected=Connesso
 settings.net.useTorForXmrJLabel=Usa Tor per la rete Monero
 settings.net.moneroNodesLabel=Nodi Monero a cui connettersi
 settings.net.useProvidedNodesRadio=Usa i nodi Monero Core forniti
@@ -1456,6 +1473,7 @@ offerDetailsWindow.confirm.maker=Conferma: Piazza l'offerta a {0} monero
 offerDetailsWindow.confirm.taker=Conferma: Accetta l'offerta a {0} monero
 offerDetailsWindow.creationDate=Data di creazione
 offerDetailsWindow.makersOnion=Indirizzo .onion del maker
+offerDetailsWindow.challenge=Passphrase dell'offerta
 
 qRCodeWindow.headline=QR Code
 qRCodeWindow.msg=Please use this QR code for funding your Haveno wallet from your external wallet.
@@ -1496,7 +1514,7 @@ tacWindow.disagree=Non accetto ed esco
 tacWindow.arbitrationSystem=Risoluzione disputa
 
 tradeDetailsWindow.headline=Scambio
-tradeDetailsWindow.disputedPayoutTxId=ID transazione di pagamento contestato:
+tradeDetailsWindow.disputedPayoutTxId=ID transazione di pagamento contestato
 tradeDetailsWindow.tradeDate=Data di scambio
 tradeDetailsWindow.txFee=Commissione di mining
 tradeDetailsWindow.tradePeersOnion=Indirizzi onion peer di trading
@@ -1679,6 +1697,9 @@ popup.accountSigning.unsignedPubKeys.signed=Pubkeys were signed
 popup.accountSigning.unsignedPubKeys.result.signed=Signed pubkeys
 popup.accountSigning.unsignedPubKeys.result.failed=Failed to sign
 
+popup.info.buyerAsTakerWithoutDeposit.headline=Nessun deposito richiesto dal compratore
+popup.info.buyerAsTakerWithoutDeposit=La tua offerta non richiederà un deposito di sicurezza o una commissione da parte dell'acquirente XMR.\n\nPer accettare la tua offerta, devi condividere una passphrase con il tuo partner commerciale al di fuori di Haveno.\n\nLa passphrase viene generata automaticamente e mostrata nei dettagli dell'offerta dopo la creazione.
+
 ####################################################################
 # Notifications
 ####################################################################
@@ -1804,6 +1825,7 @@ navigation.support=\"Supporto\"
 
 formatter.formatVolumeLabel={0} importo{1}
 formatter.makerTaker=Maker come {0} {1} / Taker come {2} {3}
+formatter.makerTakerLocked=Maker come {0} {1} / Taker come {2} {3} 🔒
 formatter.youAreAsMaker=You are: {1} {0} (maker) / Taker is: {3} {2}
 formatter.youAreAsTaker=You are: {1} {0} (taker) / Maker is: {3} {2}
 formatter.youAre=Sei {0} {1} ({2} {3})
@@ -1959,9 +1981,9 @@ payment.moneyGram.info=When using MoneyGram the XMR buyer has to send the Author
 payment.westernUnion.info=When using Western Union the XMR buyer has to send the MTCN (tracking number) and a photo of the receipt by email to the XMR seller. The receipt must clearly show the seller's full name, city, country and the amount. The seller's email will be displayed to the buyer during the trade process.
 payment.halCash.info=Quando utilizza HalCash, l'acquirente XMR deve inviare al venditore XMR il codice HalCash tramite un messaggio di testo dal proprio telefono cellulare.\n\nAssicurati di non superare l'importo massimo che la tua banca ti consente di inviare con HalCash. L'importo minimo per prelievo è di 10 EURO, l'importo massimo è di 600 EURO. Per prelievi ripetuti è di 3000 EURO per destinatario al giorno e 6000 EURO per destintario al mese. Verifica i limiti con la tua banca per accertarti che utilizzino gli stessi limiti indicati qui.\n\nL'importo del prelievo deve essere un multiplo di 10 EURO in quanto non è possibile prelevare altri importi da un bancomat. L'interfaccia utente nella schermata di creazione offerta e accettazione offerta modificherà l'importo XMR in modo che l'importo in EURO sia corretto. Non è possibile utilizzare il prezzo di mercato poiché l'importo in EURO cambierebbe al variare dei prezzi.\n\nIn caso di controversia, l'acquirente XMR deve fornire la prova di aver inviato gli EURO.
 # suppress inspection "UnusedMessageFormatParameter"
-payment.limits.info=Please be aware that all bank transfers carry a certain amount of chargeback risk. To mitigate this risk, Haveno sets per-trade limits based on the estimated level of chargeback risk for the payment method used.\n\nFor this payment method, your per-trade limit for buying and selling is {2}.\n\nThis limit only applies to the size of a single trade—you can place as many trades as you like.\n\nSee more details on the wiki [HYPERLINK:https://haveno.exchange/wiki/Account_limits].
+payment.limits.info=Please be aware that all bank transfers carry a certain amount of chargeback risk. To mitigate this risk, Haveno sets per-trade limits based on the estimated level of chargeback risk for the payment method used.\n\nFor this payment method, your per-trade limit for buying and selling is {2}.\n\nThis limit only applies to the size of a single trade—you can place as many trades as you like.\n\nSee more details on the wiki [HYPERLINK:https://docs.haveno.exchange/the-project/account_limits].
 # suppress inspection "UnusedProperty"
-payment.limits.info.withSigning=To limit chargeback risk, Haveno sets per-trade limits for this payment account type based on the following 2 factors:\n\n1. General chargeback risk for the payment method\n2. Account signing status\n\nThis payment account is not yet signed, so it is limited to buying {0} per trade. After signing, buy limits will increase as follows:\n\n● Before signing, and for 30 days after signing, your per-trade buy limit will be {0}\n● 30 days after signing, your per-trade buy limit will be {1}\n● 60 days after signing, your per-trade buy limit will be {2}\n\nSell limits are not affected by account signing. You can sell {2} in a single trade immediately.\n\nThese limits only apply to the size of a single trade—you can place as many trades as you like. \n\nSee more details on the wiki [HYPERLINK:https://haveno.exchange/wiki/Account_limits].
+payment.limits.info.withSigning=To limit chargeback risk, Haveno sets per-trade limits for this payment account type based on the following 2 factors:\n\n1. General chargeback risk for the payment method\n2. Account signing status\n\nThis payment account is not yet signed, so it is limited to buying {0} per trade. After signing, buy limits will increase as follows:\n\n● Before signing, and for 30 days after signing, your per-trade buy limit will be {0}\n● 30 days after signing, your per-trade buy limit will be {1}\n● 60 days after signing, your per-trade buy limit will be {2}\n\nSell limits are not affected by account signing. You can sell {2} in a single trade immediately.\n\nThese limits only apply to the size of a single trade—you can place as many trades as you like. \n\nSee more details on the wiki [HYPERLINK:https://docs.haveno.exchange/the-project/account_limits].
 
 payment.cashDeposit.info=Conferma che la tua banca ti consente di inviare depositi in contanti su conti di altre persone. Ad esempio, Bank of America e Wells Fargo non consentono più tali depositi.
 

core/src/main/resources/i18n/displayStrings_ja.properties

@@ -40,6 +40,8 @@ shared.buyMonero=ビットコインを買う
 shared.sellMonero=ビットコインを売る
 shared.buyCurrency={0}を買う
 shared.sellCurrency={0}を売る
+shared.buyCurrencyLocked={0}を買う 🔒
+shared.sellCurrencyLocked={0}を売る 🔒
 shared.buyingXMRWith=XMRを{0}で買う
 shared.sellingXMRFor=XMRを{0}で売る
 shared.buyingCurrency={0}を購入中 (XMRを売却中)
@@ -103,7 +105,7 @@ shared.faq=FAQを参照する
 shared.yesCancel=はい、取り消します
 shared.nextStep=次へ
 shared.selectTradingAccount=取引アカウントを選択
-shared.fundFromSavingsWalletButton=Havenoウォレットから資金を移動する
+shared.fundFromSavingsWalletButton=Havenoウォレットから資金を適用
 shared.fundFromExternalWalletButton=外部のwalletを開く
 shared.openDefaultWalletFailed=ビットコインウォレットのアプリを開けませんでした。インストールされているか確認して下さい。
 shared.belowInPercent=市場価格から％以下
@@ -186,7 +188,7 @@ shared.total=合計
 shared.totalsNeeded=必要な資金
 shared.tradeWalletAddress=トレードウォレットアドレス
 shared.tradeWalletBalance=トレードウォレット残高
-shared.reserveExactAmount=必要な資金のみを予約してください。提供が有効になる前に、マイニング手数料と10回の確認（約20分）が必要な場合があります。
+shared.reserveExactAmount=必要な資金のみを予約してください。オファーが公開されるまでにマイニング手数料と約20分が必要です。
 shared.makerTxFee=メイカー: {0}
 shared.takerTxFee=テイカー: {0}
 shared.iConfirm=確認します
@@ -330,6 +332,7 @@ offerbook.createOffer=オファーを作る
 offerbook.takeOffer=オファーを受ける
 offerbook.takeOfferToBuy={0}購入オファーを受ける
 offerbook.takeOfferToSell={0}売却オファーを受ける
+offerbook.takeOffer.enterChallenge=オファーのパスフレーズを入力してください
 offerbook.trader=取引者
 offerbook.offerersBankId=メイカーの銀行ID (BIC/SWIFT): {0}
 offerbook.offerersBankName=メーカーの銀行名: {0}
@@ -340,6 +343,8 @@ offerbook.availableOffers=利用可能なオファー
 offerbook.filterByCurrency=通貨でフィルター
 offerbook.filterByPaymentMethod=支払い方法でフィルター
 offerbook.matchingOffers=アカウントと一致するオファー
+offerbook.filterNoDeposit=デポジットなし
+offerbook.noDepositOffers=預金不要のオファー（パスフレーズ必須）
 offerbook.timeSinceSigning=アカウント情報
 offerbook.timeSinceSigning.info=このアカウントは認証されまして、{0}
 offerbook.timeSinceSigning.info.arbitrator=調停人に署名されました。ピアアカウントも署名できます
@@ -458,7 +463,12 @@ createOffer.placeOfferButton=再確認: ビットコインを{0}オファーを
 createOffer.createOfferFundWalletInfo.headline=あなたのオファーへ入金
 # suppress inspection "TrailingSpacesInProperty"
 createOffer.createOfferFundWalletInfo.tradeAmount=- 取引額: {0}\n
-createOffer.createOfferFundWalletInfo.msg=このオファーに対して {0} のデポジットを送金する必要があります。\n\nこの資金はあなたのローカルウォレットに予約済として保管され、オファーが受け入れられた時にマルチシグデポジットアドレスに移動しロックされます。\n\n金額の合計は以下の通りです\n{1} - セキュリティデポジット: {2}\n- 取引手数料: {3}\n- マイニング手数料: {4}\n\nこのオファーにデポジットを送金するには、以下の2つの方法があります。\n- Havenoウォレットを使う (便利ですがトランザクションが追跡される可能性があります)\n- 外部のウォレットから送金する (機密性の高い方法です)\n\nこのポップアップを閉じると全ての送金方法について詳細な情報が表示されます。
+createOffer.createOfferFundWalletInfo.msg=このオファーには {0} をデポジットする必要があります。\n\n\
+  この資金はあなたのローカルウォレットに予約され、誰かがあなたのオファーを受け入れるとマルチシグウォレットにロックされます。\n\n\
+  金額は以下の合計です:\n\
+  {1}\
+  - あなたの保証金: {2}\n\
+  - 取引手数料: {3}
 
 # only first part "An error occurred when placing the offer:" has been used before. We added now the rest (need update in existing translations!)
 createOffer.amountPriceBox.error.message=オファーを出す時にエラーが発生しました:\n\n{0}\n\nウォレットにまだ資金がありません。\nアプリケーションを再起動してネットワーク接続を確認してください。
@@ -480,7 +490,10 @@ createOffer.setDepositAsBuyer=購入時のセキュリティデポジット (%)
 createOffer.setDepositForBothTraders=両方の取引者の保証金を設定する(%)
 createOffer.securityDepositInfo=あなたの買い手のセキュリティデポジットは{0}です
 createOffer.securityDepositInfoAsBuyer=あなたの購入時のセキュリティデポジットは{0}です
-createOffer.minSecurityDepositUsed=最小値の買い手の保証金は使用されます
+createOffer.minSecurityDepositUsed=最低セキュリティデポジットが使用されます
+createOffer.buyerAsTakerWithoutDeposit=購入者に保証金は不要（パスフレーズ保護）
+createOffer.myDeposit=私の保証金（％）
+createOffer.myDepositInfo=あなたのセキュリティデポジットは{0}です
 
 
 ####################################################################
@@ -504,6 +517,8 @@ takeOffer.fundsBox.networkFee=合計マイニング手数料
 takeOffer.fundsBox.takeOfferSpinnerInfo=オファーを受け入れる: {0}
 takeOffer.fundsBox.paymentLabel=次のIDとのHavenoトレード: {0}
 takeOffer.fundsBox.fundsStructure=（{0} セキュリティデポジット, {1} 取引手数料, {2}マイニング手数料）
+takeOffer.fundsBox.noFundingRequiredTitle=資金は必要ありません
+takeOffer.fundsBox.noFundingRequiredDescription=このオファーを受けるには、Haveno外で売り手からオファーパスフレーズを取得してください。
 takeOffer.success.headline=オファー受け入れに成功しました
 takeOffer.success.info=あなたのトレード状態は「ポートフォリオ/オープントレード」で見られます
 takeOffer.error.message=オファーの受け入れ時にエラーが発生しました。\n\n{0}
@@ -514,7 +529,7 @@ takeOffer.noPriceFeedAvailable=そのオファーは市場価格に基づくパ
 takeOffer.takeOfferFundWalletInfo.headline=あなたのオファーへ入金
 # suppress inspection "TrailingSpacesInProperty"
 takeOffer.takeOfferFundWalletInfo.tradeAmount= - 取引額: {0}\n
-takeOffer.takeOfferFundWalletInfo.msg=このオファーに対して {0} のデポジットを送金する必要があります。\n\n金額の合計は以下の通りです\n{1} - セキュリティデポジット: {2}\n- 取引手数料: {3}\n- マイニング手数料: {4}\n\nこのオファーにデポジットを送金するには、以下の2つの方法があります。\n- Havenoウォレットを使う (便利ですがトランザクションが追跡される可能性があります)\nまたは\n- 外部のウォレットから送金する (機密性の高い方法です)\n\nこのポップアップを閉じると全ての送金方法について詳細な情報が表示されます。
+takeOffer.takeOfferFundWalletInfo.msg=このオファーを受けるには、{0} を預ける必要があります。\n\n金額は以下の合計です：\n{1}- あなたの保証金: {2}\n- 取引手数料: {3}
 takeOffer.alreadyPaidInFunds=あなたがすでに資金を支払っている場合は「資金/送金する」画面でそれを出金することができます。
 takeOffer.paymentInfo=支払い情報
 takeOffer.setAmountPrice=金額を設定
@@ -1038,6 +1053,8 @@ settings.net.p2pHeader=Havenoネットワーク
 settings.net.onionAddressLabel=私のonionアドレス
 settings.net.xmrNodesLabel=任意のモネロノードを使う
 settings.net.moneroPeersLabel=接続されたピア
+settings.net.connection=接続
+settings.net.connected=接続されました
 settings.net.useTorForXmrJLabel=MoneroネットワークにTorを使用
 settings.net.moneroNodesLabel=接続するMoneroノード:
 settings.net.useProvidedNodesRadio=提供されたMonero Core ノードを使う
@@ -1457,6 +1474,7 @@ offerDetailsWindow.confirm.maker=承認: ビットコインを{0}オファーを
 offerDetailsWindow.confirm.taker=承認: ビットコインを{0}オファーを受ける
 offerDetailsWindow.creationDate=作成日
 offerDetailsWindow.makersOnion=メイカーのonionアドレス
+offerDetailsWindow.challenge=オファーパスフレーズ
 
 qRCodeWindow.headline=QRコード
 qRCodeWindow.msg=外部ウォレットからHavenoウォレットへ送金するのに、このQRコードを利用して下さい。
@@ -1497,7 +1515,7 @@ tacWindow.disagree=同意せずにに終了
 tacWindow.arbitrationSystem=紛争解決
 
 tradeDetailsWindow.headline=トレード
-tradeDetailsWindow.disputedPayoutTxId=係争中の支払い取引ID:
+tradeDetailsWindow.disputedPayoutTxId=係争中の支払い取引ID
 tradeDetailsWindow.tradeDate=取引日
 tradeDetailsWindow.txFee=マイニング手数料
 tradeDetailsWindow.tradePeersOnion=トレード相手のonionアドレス
@@ -1682,6 +1700,9 @@ popup.accountSigning.unsignedPubKeys.signed=パブリックキーは署名され
 popup.accountSigning.unsignedPubKeys.result.signed=署名されたパブリックキー
 popup.accountSigning.unsignedPubKeys.result.failed=署名が失敗しました
 
+popup.info.buyerAsTakerWithoutDeposit.headline=購入者による保証金は不要
+popup.info.buyerAsTakerWithoutDeposit=あなたのオファーには、XMR購入者からのセキュリティデポジットや手数料は必要ありません。\n\nオファーを受け入れるには、Haveno外で取引相手とパスフレーズを共有する必要があります。\n\nパスフレーズは自動的に生成され、作成後にオファーの詳細に表示されます。
+
 ####################################################################
 # Notifications
 ####################################################################
@@ -1807,6 +1828,7 @@ navigation.support=「サポート」
 
 formatter.formatVolumeLabel={0} 額{1}
 formatter.makerTaker=メイカーは{0} {1} / テイカーは{2} {3}
+formatter.makerTakerLocked=メイカーは{0} {1} / テイカーは{2} {3} 🔒
 formatter.youAreAsMaker=あなたは:{1} {0}(メイカー) / テイカーは:{3} {2}
 formatter.youAreAsTaker=あなたは:{1} {0}(テイカー) / メイカーは{3} {2}
 formatter.youAre=あなたは{0} {1} ({2} {3})
@@ -1962,9 +1984,9 @@ payment.moneyGram.info=MoneyGramを使用する場合、XMRの買い手は認証
 payment.westernUnion.info=Western Unionを使用する場合、XMRの買い手はMTCN（追跡番号）と領収書の写真をEメールでXMRの売り手に送信する必要があります。領収書には、売り手の氏名、市区町村、国、金額を明確に記載する必要があります。トレードプロセスにて、売り手のEメールは買い手に表示されます。
 payment.halCash.info=HalCashを使用する場合、XMRの買い手は携帯電話からのテキストメッセージを介してXMRの売り手にHalCashコードを送信する必要があります。\n\n銀行がHalCashで送金できる最大額を超えないようにしてください。 1回の出金あたりの最小金額は10EURで、最大金額は600EURです。繰り返し出金する場合は、1日に受取人1人あたり3000EUR、1ヶ月に受取人１人あたり6000EURです。あなたの銀行でも、ここに記載されているのと同じ制限を使用しているか、これらの制限を銀行と照合して確認してください。\n\n出金額は10の倍数EURでなければ、ATMから出金できません。 オファーの作成画面およびオファー受け入れ画面のUIは、EUR金額が正しくなるようにXMR金額を調整します。価格の変化とともにEURの金額は変化するため、市場ベースの価格を使用することはできません。\n\n係争が発生した場合、XMRの買い手はEURを送ったという証明を提出する必要があります。
 # suppress inspection "UnusedMessageFormatParameter"
-payment.limits.info=すべての銀行振込にはある程度の支払取り消しのリスクがあることに気を付けて下さい。\n\nこのリスクを軽減するために、Havenoは使用する支払い方法での支払取り消しリスクの推定レベルに基づいてトレードごとの制限を設定します。\n\n現在使用する支払い方法では、トレードごとの売買制限は{2}です。\n\n制限は各トレードの量のみに適用されることに注意して下さい。トレードできる合計回数には制限はありません。\n\n詳しくはWikiを調べて下さい [HYPERLINK:https://haveno.exchange/wiki/Account_limits] 。
+payment.limits.info=すべての銀行振込にはある程度の支払取り消しのリスクがあることに気を付けて下さい。\n\nこのリスクを軽減するために、Havenoは使用する支払い方法での支払取り消しリスクの推定レベルに基づいてトレードごとの制限を設定します。\n\n現在使用する支払い方法では、トレードごとの売買制限は{2}です。\n\n制限は各トレードの量のみに適用されることに注意して下さい。トレードできる合計回数には制限はありません。\n\n詳しくはWikiを調べて下さい [HYPERLINK:https://docs.haveno.exchange/the-project/account_limits] 。
 # suppress inspection "UnusedProperty"
-payment.limits.info.withSigning=支払取り消しのリスクを軽減するために、Havenoはこの支払いアカウントに下記の2つの要因に基づいてトレードごとの制限を設定します。\n\n1.使用する支払い方法での支払取り消しリスクの推定レベル\n2.アカウントの署名状況\n\nこの支払いアカウントはまだ無署名ですので、トレードごとに{0}の買い制限があります。 アカウントが署名される後、トレードごとの制限は以下のように成長します：\n\n●署名の前、そして署名から30日間までに、1トレードあたりの買い制限は{0}になります\n●署名から30日間後に、1トレードあたりの買い制限は{1}になります\n●署名から60日間後に、1トレードあたりの買い制限は{2}になります\n\n売り制限は署名状況に関係がありません。現在のところ、1トレードあたりに{2}を売ることができます。\n\n制限は各トレードの量のみに適用されることに注意して下さい。取引できる合計回数には制限はありません。\n\n詳しくは: [HYPERLINK:https://haveno.exchange/wiki/Account_limits]
+payment.limits.info.withSigning=支払取り消しのリスクを軽減するために、Havenoはこの支払いアカウントに下記の2つの要因に基づいてトレードごとの制限を設定します。\n\n1.使用する支払い方法での支払取り消しリスクの推定レベル\n2.アカウントの署名状況\n\nこの支払いアカウントはまだ無署名ですので、トレードごとに{0}の買い制限があります。 アカウントが署名される後、トレードごとの制限は以下のように成長します：\n\n●署名の前、そして署名から30日間までに、1トレードあたりの買い制限は{0}になります\n●署名から30日間後に、1トレードあたりの買い制限は{1}になります\n●署名から60日間後に、1トレードあたりの買い制限は{2}になります\n\n売り制限は署名状況に関係がありません。現在のところ、1トレードあたりに{2}を売ることができます。\n\n制限は各トレードの量のみに適用されることに注意して下さい。取引できる合計回数には制限はありません。\n\n詳しくは: [HYPERLINK:https://docs.haveno.exchange/the-project/account_limits]
 
 payment.cashDeposit.info=あなたの銀行が他の人の口座に現金入金を送ることを許可していることを確認してください。たとえば、Bank of America と Wells Fargo では、こうした預金は許可されなくなりました。
 

core/src/main/resources/i18n/displayStrings_pt-br.properties

@@ -40,6 +40,8 @@ shared.buyMonero=Comprar monero
 shared.sellMonero=Vender monero
 shared.buyCurrency=Comprar {0}
 shared.sellCurrency=Vender {0}
+shared.buyCurrencyLocked=Comprar {0} 🔒
+shared.sellCurrencyLocked=Vender {0} 🔒
 shared.buyingXMRWith=comprando XMR com {0}
 shared.sellingXMRFor=vendendo XMR por {0}
 shared.buyingCurrency=comprando {0} (vendendo XMR)
@@ -103,7 +105,7 @@ shared.faq=Visit FAQ page
 shared.yesCancel=Sim, cancelar
 shared.nextStep=Próximo passo
 shared.selectTradingAccount=Selecionar conta de negociação
-shared.fundFromSavingsWalletButton=Transferir fundos da carteira Haveno
+shared.fundFromSavingsWalletButton=Aplicar fundos da carteira Haveno
 shared.fundFromExternalWalletButton=Abrir sua carteira externa para prover fundos
 shared.openDefaultWalletFailed=Failed to open a Monero wallet application. Are you sure you have one installed?
 shared.belowInPercent=% abaixo do preço de mercado
@@ -186,7 +188,7 @@ shared.total=Total
 shared.totalsNeeded=Fundos necessária
 shared.tradeWalletAddress=Endereço da carteira de negociação
 shared.tradeWalletBalance=Saldo da carteira de negociação
-shared.reserveExactAmount=Reserve apenas os fundos necessários. Pode ser necessário uma taxa de mineração e 10 confirmações (~20 minutos) antes que sua oferta esteja ativa.
+shared.reserveExactAmount=Reserve apenas os fundos necessários. Requer uma taxa de mineração e cerca de 20 minutos antes que sua oferta seja publicada.
 shared.makerTxFee=Ofertante: {0}
 shared.takerTxFee=Aceitador: {0}
 shared.iConfirm=Eu confirmo
@@ -333,6 +335,7 @@ offerbook.createOffer=Criar oferta
 offerbook.takeOffer=Aceitar oferta
 offerbook.takeOfferToBuy=Comprar {0}
 offerbook.takeOfferToSell=Vender {0}
+offerbook.takeOffer.enterChallenge=Digite a senha da oferta
 offerbook.trader=Trader
 offerbook.offerersBankId=ID do banco do ofertante (BIC/SWIFT): {0}
 offerbook.offerersBankName=Nome do banco do ofertante: {0}
@@ -342,7 +345,9 @@ offerbook.offerersAcceptedBankSeats=Países aceitos como sede bancária (tomador
 offerbook.availableOffers=Ofertas disponíveis
 offerbook.filterByCurrency=Filtrar por moeda
 offerbook.filterByPaymentMethod=Filtrar por método de pagamento
-offerbook.matchingOffers=Offers matching my accounts
+offerbook.matchingOffers=Ofertas que correspondem às minhas contas
+offerbook.filterNoDeposit=Sem depósito
+offerbook.noDepositOffers=Ofertas sem depósito (senha necessária)
 offerbook.timeSinceSigning=Account info
 offerbook.timeSinceSigning.info=Esta conta foi verificada e {0}
 offerbook.timeSinceSigning.info.arbitrator=assinada por um árbitro e pode assinar contas de pares
@@ -460,7 +465,12 @@ createOffer.placeOfferButton=Revisar: Criar oferta para {0} monero
 createOffer.createOfferFundWalletInfo.headline=Financiar sua oferta
 # suppress inspection "TrailingSpacesInProperty"
 createOffer.createOfferFundWalletInfo.tradeAmount=- Quantia da negociação: {0} \n
-createOffer.createOfferFundWalletInfo.msg=Você precisa depositar {0} para esta oferta.\n\nEsses fundos ficam reservados na sua carteira local e ficarão travados no endereço de depósito multisig quando alguém aceitar a sua oferta.\n\nA quantia equivale à soma de:\n{1}- Seu depósito de segurança: {2}\n- Taxa de negociação: {3}\n- Taxa de mineração: {4}\n\nVocê pode financiar sua negociação das seguintes maneiras:\n- Usando a sua carteira Haveno (conveniente, mas transações poderão ser associadas entre si) OU\n- Usando uma carteira externa (maior privacidade)\n\nVocê verá todas as opções de financiamento e detalhes após fechar esta janela.
+createOffer.createOfferFundWalletInfo.msg=Você precisa depositar {0} para esta oferta.\n\n\
+  Esses fundos são reservados em sua carteira local e serão bloqueados em uma carteira multisig assim que alguém aceitar sua oferta.\n\n\
+  O valor é a soma de:\n\
+  {1}\
+  - Seu depósito de segurança: {2}\n\
+  - Taxa de negociação: {3}
 
 # only first part "An error occurred when placing the offer:" has been used before. We added now the rest (need update in existing translations!)
 createOffer.amountPriceBox.error.message=Um erro ocorreu ao emitir uma oferta:\n\n{0}\n\nNenhum fundo foi retirado de sua carteira até agora.\nPor favor, reinicie o programa e verifique sua conexão de internet.
@@ -482,7 +492,10 @@ createOffer.setDepositAsBuyer=Definir o meu depósito de segurança como comprad
 createOffer.setDepositForBothTraders=Set both traders' security deposit (%)
 createOffer.securityDepositInfo=O seu depósito de segurança do comprador será de {0}
 createOffer.securityDepositInfoAsBuyer=O seu depósito de segurança como comprador será de {0}
-createOffer.minSecurityDepositUsed=Depósito de segurança mínimo para compradores foi usado
+createOffer.minSecurityDepositUsed=O depósito de segurança mínimo é utilizado
+createOffer.buyerAsTakerWithoutDeposit=Nenhum depósito necessário do comprador (protegido por senha)
+createOffer.myDeposit=Meu depósito de segurança (%)
+createOffer.myDepositInfo=Seu depósito de segurança será {0}
 
 
 ####################################################################
@@ -506,6 +519,8 @@ takeOffer.fundsBox.networkFee=Total em taxas de mineração
 takeOffer.fundsBox.takeOfferSpinnerInfo=Aceitando a oferta: {0}
 takeOffer.fundsBox.paymentLabel=negociação Haveno com ID {0}
 takeOffer.fundsBox.fundsStructure=({0} depósito de segurança, {1} taxa de transação, {2} taxa de mineração)
+takeOffer.fundsBox.noFundingRequiredTitle=Sem financiamento necessário
+takeOffer.fundsBox.noFundingRequiredDescription=Obtenha a frase secreta da oferta com o vendedor fora do Haveno para aceitar esta oferta.
 takeOffer.success.headline=Você aceitou uma oferta com sucesso.
 takeOffer.success.info=Você pode ver o status de sua negociação em \"Portfolio/Negociações em aberto\".
 takeOffer.error.message=Ocorreu um erro ao aceitar a oferta.\n\n{0}
@@ -516,7 +531,7 @@ takeOffer.noPriceFeedAvailable=Você não pode aceitar essa oferta pois ela usa
 takeOffer.takeOfferFundWalletInfo.headline=Financiar sua negociação
 # suppress inspection "TrailingSpacesInProperty"
 takeOffer.takeOfferFundWalletInfo.tradeAmount=- Quantia a negociar: {0} \n
-takeOffer.takeOfferFundWalletInfo.msg=Você precisa depositar {0} para aceitar esta oferta.\n\nA quantia equivale a soma de:\n{1}- Seu depósito de segurança: {2}\n- Taxa de negociação: {3}\n\nVocê pode escolher entre duas opções para financiar sua negociação:\n- Usar a sua carteira Haveno (conveniente, mas transações podem ser associadas entre si) OU\n- Transferir a partir de uma carteira externa (potencialmente mais privado)\n\nVocê verá todas as opções de financiamento e detalhes após fechar esta janela.
+takeOffer.takeOfferFundWalletInfo.msg=Você precisa depositar {0} para aceitar esta oferta.\n\nO valor é a soma de:\n{1}- Seu depósito de segurança: {2}\n- Taxa de negociação: {3}
 takeOffer.alreadyPaidInFunds=Se você já pagou por essa oferta, você pode retirar seus fundos na seção \"Fundos/Enviar fundos\".
 takeOffer.paymentInfo=Informações de pagamento
 takeOffer.setAmountPrice=Definir quantia
@@ -1039,6 +1054,8 @@ settings.net.p2pHeader=Rede Haveno
 settings.net.onionAddressLabel=Meu endereço onion
 settings.net.xmrNodesLabel=Usar nodos personalizados do Monero
 settings.net.moneroPeersLabel=Pares conectados
+settings.net.connection=Conexão
+settings.net.connected=Conectado
 settings.net.useTorForXmrJLabel=Usar Tor na rede Monero
 settings.net.moneroNodesLabel=Conexão a nodos do Monero
 settings.net.useProvidedNodesRadio=Usar nodos do Monero Core fornecidos
@@ -1460,6 +1477,7 @@ offerDetailsWindow.confirm.maker=Criar oferta para {0} monero
 offerDetailsWindow.confirm.taker=Confirmar: Aceitar oferta de {0} monero
 offerDetailsWindow.creationDate=Criada em
 offerDetailsWindow.makersOnion=Endereço onion do ofertante
+offerDetailsWindow.challenge=Passphrase da oferta
 
 qRCodeWindow.headline=QR Code
 qRCodeWindow.msg=Please use this QR code for funding your Haveno wallet from your external wallet.
@@ -1500,7 +1518,7 @@ tacWindow.disagree=Eu não concordo e desisto
 tacWindow.arbitrationSystem=Resolução de disputas
 
 tradeDetailsWindow.headline=Negociação
-tradeDetailsWindow.disputedPayoutTxId=ID de transação do pagamento disputado:
+tradeDetailsWindow.disputedPayoutTxId=ID de transação do pagamento disputado
 tradeDetailsWindow.tradeDate=Data da negociação
 tradeDetailsWindow.txFee=Taxa de mineração
 tradeDetailsWindow.tradePeersOnion=Endereço onion dos parceiros de negociação
@@ -1686,6 +1704,9 @@ popup.accountSigning.unsignedPubKeys.signed=Pubkeys were signed
 popup.accountSigning.unsignedPubKeys.result.signed=Signed pubkeys
 popup.accountSigning.unsignedPubKeys.result.failed=Failed to sign
 
+popup.info.buyerAsTakerWithoutDeposit.headline=Nenhum depósito exigido do comprador
+popup.info.buyerAsTakerWithoutDeposit=Sua oferta não exigirá um depósito de segurança ou taxa do comprador de XMR.\n\nPara aceitar sua oferta, você deve compartilhar uma senha com seu parceiro de negociação fora do Haveno.\n\nA senha é gerada automaticamente e exibida nos detalhes da oferta após a criação.
+
 ####################################################################
 # Notifications
 ####################################################################
@@ -1811,6 +1832,7 @@ navigation.support=\"Suporte\"
 
 formatter.formatVolumeLabel={0} quantia{1}
 formatter.makerTaker=Ofertante: {1} de {0} / Aceitador: {3} de {2}
+formatter.makerTakerLocked=Ofertante: {1} de {0} / Aceitador: {3} de {2} 🔒
 formatter.youAreAsMaker=You are: {1} {0} (maker) / Taker is: {3} {2}
 formatter.youAreAsTaker=You are: {1} {0} (taker) / Maker is: {3} {2}
 formatter.youAre=Você está {0} {1} ({2} {3})
@@ -1966,9 +1988,9 @@ payment.moneyGram.info=When using MoneyGram the XMR buyer has to send the Author
 payment.westernUnion.info=When using Western Union the XMR buyer has to send the MTCN (tracking number) and a photo of the receipt by email to the XMR seller. The receipt must clearly show the seller's full name, city, country and the amount. The seller's email will be displayed to the buyer during the trade process.
 payment.halCash.info=Ao usar o HalCash, o comprador de XMR precisa enviar ao vendedor de XMR o código HalCash através de uma mensagem de texto do seu telefone.\n\nPor favor, certifique-se de não exceder a quantia máxima que seu banco lhe permite enviar com o HalCash. O valor mínimo de saque é de 10 euros e valor máximo é de 600 EUR. Para saques repetidos é de 3000 euros por destinatário por dia e 6000 euros por destinatário por mês. Por favor confirme esses limites com seu banco para ter certeza de que eles usam os mesmos limites mencionados aqui.\n\nO valor de saque deve ser um múltiplo de 10 euros, pois você não pode sacar notas diferentes de uma ATM. Esse valor em XMR será ajustado na telas de criar e aceitar ofertas para que a quantia de EUR esteja correta. Você não pode usar o preço com base no mercado, pois o valor do EUR estaria mudando com a variação dos preços.\n\nEm caso de disputa, o comprador de XMR precisa fornecer a prova de que enviou o EUR.
 # suppress inspection "UnusedMessageFormatParameter"
-payment.limits.info=Please be aware that all bank transfers carry a certain amount of chargeback risk. To mitigate this risk, Haveno sets per-trade limits based on the estimated level of chargeback risk for the payment method used.\n\nFor this payment method, your per-trade limit for buying and selling is {2}.\n\nThis limit only applies to the size of a single trade—you can place as many trades as you like.\n\nSee more details on the wiki [HYPERLINK:https://haveno.exchange/wiki/Account_limits].
+payment.limits.info=Please be aware that all bank transfers carry a certain amount of chargeback risk. To mitigate this risk, Haveno sets per-trade limits based on the estimated level of chargeback risk for the payment method used.\n\nFor this payment method, your per-trade limit for buying and selling is {2}.\n\nThis limit only applies to the size of a single trade—you can place as many trades as you like.\n\nSee more details on the wiki [HYPERLINK:https://docs.haveno.exchange/the-project/account_limits].
 # suppress inspection "UnusedProperty"
-payment.limits.info.withSigning=To limit chargeback risk, Haveno sets per-trade limits for this payment account type based on the following 2 factors:\n\n1. General chargeback risk for the payment method\n2. Account signing status\n\nThis payment account is not yet signed, so it is limited to buying {0} per trade. After signing, buy limits will increase as follows:\n\n● Before signing, and for 30 days after signing, your per-trade buy limit will be {0}\n● 30 days after signing, your per-trade buy limit will be {1}\n● 60 days after signing, your per-trade buy limit will be {2}\n\nSell limits are not affected by account signing. You can sell {2} in a single trade immediately.\n\nThese limits only apply to the size of a single trade—you can place as many trades as you like. \n\nSee more details on the wiki [HYPERLINK:https://haveno.exchange/wiki/Account_limits].
+payment.limits.info.withSigning=To limit chargeback risk, Haveno sets per-trade limits for this payment account type based on the following 2 factors:\n\n1. General chargeback risk for the payment method\n2. Account signing status\n\nThis payment account is not yet signed, so it is limited to buying {0} per trade. After signing, buy limits will increase as follows:\n\n● Before signing, and for 30 days after signing, your per-trade buy limit will be {0}\n● 30 days after signing, your per-trade buy limit will be {1}\n● 60 days after signing, your per-trade buy limit will be {2}\n\nSell limits are not affected by account signing. You can sell {2} in a single trade immediately.\n\nThese limits only apply to the size of a single trade—you can place as many trades as you like. \n\nSee more details on the wiki [HYPERLINK:https://docs.haveno.exchange/the-project/account_limits].
 
 payment.cashDeposit.info=Certifique-se de que o seu banco permite a realização de depósitos em espécie na conta de terceiros.
 

core/src/main/resources/i18n/displayStrings_pt.properties

@@ -40,6 +40,8 @@ shared.buyMonero=Comprar monero
 shared.sellMonero=Vender monero
 shared.buyCurrency=Comprar {0}
 shared.sellCurrency=Vender {0}
+shared.buyCurrencyLocked=Comprar {0} 🔒
+shared.sellCurrencyLocked=Vender {0} 🔒
 shared.buyingXMRWith=comprando XMR com {0}
 shared.sellingXMRFor=vendendo XMR por {0}
 shared.buyingCurrency=comprando {0} (vendendo XMR)
@@ -103,7 +105,7 @@ shared.faq=Visit FAQ page
 shared.yesCancel=Sim, cancelar
 shared.nextStep=Próximo passo
 shared.selectTradingAccount=Selecionar conta de negociação
-shared.fundFromSavingsWalletButton=Transferir fundos da carteira Haveno
+shared.fundFromSavingsWalletButton=Aplicar fundos da carteira Haveno
 shared.fundFromExternalWalletButton=Abrir sua carteira externa para o financiamento
 shared.openDefaultWalletFailed=Failed to open a Monero wallet application. Are you sure you have one installed?
 shared.belowInPercent=Abaixo % do preço de mercado
@@ -186,14 +188,14 @@ shared.total=Total
 shared.totalsNeeded=Fundos necessários
 shared.tradeWalletAddress=Endereço da carteira do negócio
 shared.tradeWalletBalance=Saldo da carteira de negócio
-shared.reserveExactAmount=Reserve apenas os fundos necessários. Pode ser necessário uma taxa de mineração e 10 confirmações (~20 minutos) antes que sua oferta seja ativada.
+shared.reserveExactAmount=Reserve apenas os fundos necessários. Requer uma taxa de mineração e ~20 minutos antes que sua oferta seja publicada.
 shared.makerTxFee=Ofertante: {0}
 shared.takerTxFee=Aceitador: {0}
 shared.iConfirm=Eu confirmo
 shared.openURL=Abrir {0}
 shared.fiat=Moeda fiduciária
 shared.crypto=Cripto
-shared.preciousMetals=TODO
+shared.preciousMetals=Metais Preciosos
 shared.all=Tudo
 shared.edit=Editar
 shared.advancedOptions=Opções avançadas
@@ -330,6 +332,7 @@ offerbook.createOffer=Criar oferta
 offerbook.takeOffer=Aceitar oferta
 offerbook.takeOfferToBuy=Aceitar oferta para comprar {0}
 offerbook.takeOfferToSell=Aceitar oferta para vender {0}
+offerbook.takeOffer.enterChallenge=Digite a senha da oferta
 offerbook.trader=Negociador
 offerbook.offerersBankId=ID do banco do ofertante (BIC/SWIFT): {0}
 offerbook.offerersBankName=Nome do banco do ofertante: {0}
@@ -339,7 +342,9 @@ offerbook.offerersAcceptedBankSeats=Sede do banco aceite (aceitador):\n {0}
 offerbook.availableOffers=Ofertas disponíveis
 offerbook.filterByCurrency=Filtrar por moeda
 offerbook.filterByPaymentMethod=Filtrar por método de pagamento
-offerbook.matchingOffers=Offers matching my accounts
+offerbook.matchingOffers=Ofertas que correspondem às minhas contas
+offerbook.filterNoDeposit=Sem depósito
+offerbook.noDepositOffers=Ofertas sem depósito (senha necessária)
 offerbook.timeSinceSigning=Account info
 offerbook.timeSinceSigning.info=Esta conta foi verificada e {0}
 offerbook.timeSinceSigning.info.arbitrator=assinada pelo árbitro e pode assinar contas de pares
@@ -457,7 +462,12 @@ createOffer.placeOfferButton=Rever: Colocar oferta para {0} monero
 createOffer.createOfferFundWalletInfo.headline=Financiar sua oferta
 # suppress inspection "TrailingSpacesInProperty"
 createOffer.createOfferFundWalletInfo.tradeAmount=- Quantia de negócio: {0} \n
-createOffer.createOfferFundWalletInfo.msg=Você precisa depositar {0} para esta oferta.\n\nEsses fundos estão reservados na sua carteira local e serão bloqueados no endereço de depósito multi-assinatura assim que alguém aceitar a sua oferta.\n\nA quantia é a soma de:\n{1} - Seu depósito de segurança: {2}\n- Taxa de negociação: {3}\n- Taxa de mineração: {4}\n\nVocê pode escolher entre duas opções ao financiar o seu negócio:\n- Use sua carteira Haveno (conveniente, mas as transações podem ser conectadas) OU\n- Transferência de uma carteira externa (potencialmente mais privada)\n\nVocê verá todas as opções de financiamento e detalhes depois de fechar este popup.
+createOffer.createOfferFundWalletInfo.msg=Você precisa depositar {0} para esta oferta.\n\n\
+  Esses fundos são reservados em sua carteira local e serão bloqueados em uma carteira multisig assim que alguém aceitar sua oferta.\n\n\
+  O valor é a soma de:\n\
+  {1}\
+  - Seu depósito de segurança: {2}\n\
+  - Taxa de negociação: {3}
 
 # only first part "An error occurred when placing the offer:" has been used before. We added now the rest (need update in existing translations!)
 createOffer.amountPriceBox.error.message=Ocorreu um erro ao colocar a oferta:\n\n{0}\n\nAinda nenhuns fundos saíram da sua carteira.\nPor favor, reinicie seu programa e verifique sua conexão de rede.
@@ -479,7 +489,10 @@ createOffer.setDepositAsBuyer=Definir o meu depósito de segurança enquanto com
 createOffer.setDepositForBothTraders=Set both traders' security deposit (%)
 createOffer.securityDepositInfo=O depósito de segurança do seu comprador será {0}
 createOffer.securityDepositInfoAsBuyer=O seu depósito de segurança enquanto comprador será {0}
-createOffer.minSecurityDepositUsed=O mín. depósito de segurança para o comprador é utilizado
+createOffer.minSecurityDepositUsed=O depósito de segurança mínimo é utilizado
+createOffer.buyerAsTakerWithoutDeposit=Nenhum depósito exigido do comprador (protegido por frase secreta)
+createOffer.myDeposit=Meu depósito de segurança (%)
+createOffer.myDepositInfo=Seu depósito de segurança será {0}
 
 
 ####################################################################
@@ -503,6 +516,8 @@ takeOffer.fundsBox.networkFee=Total de taxas de mineração
 takeOffer.fundsBox.takeOfferSpinnerInfo=Aceitando a oferta: {0}
 takeOffer.fundsBox.paymentLabel=negócio do Haveno com ID {0}
 takeOffer.fundsBox.fundsStructure=({0} depósito de segurança, {1} taxa de negócio, {2} taxa de mineração)
+takeOffer.fundsBox.noFundingRequiredTitle=Nenhum financiamento necessário
+takeOffer.fundsBox.noFundingRequiredDescription=Obtenha a senha da oferta com o vendedor fora do Haveno para aceitar esta oferta.
 takeOffer.success.headline=Você aceitou uma oferta com sucesso.
 takeOffer.success.info=Você pode ver o estado de seu negócio em \"Portefólio/Negócios abertos\".
 takeOffer.error.message=Ocorreu um erro ao aceitar a oferta .\n\n{0}
@@ -513,7 +528,7 @@ takeOffer.noPriceFeedAvailable=Você não pode aceitar aquela oferta pois ela ut
 takeOffer.takeOfferFundWalletInfo.headline=Financiar seu negócio
 # suppress inspection "TrailingSpacesInProperty"
 takeOffer.takeOfferFundWalletInfo.tradeAmount=- Quantia de negócio: {0} \n
-takeOffer.takeOfferFundWalletInfo.msg=Você precisa depositar {0} para aceitar esta oferta.\n\nA quantia é a soma de:\n{1} - Seu depósito de segurança: {2}\n- Taxa de negociação: {3}\n\nVocê pode escolher entre duas opções ao financiar o seu negócio:\n- Use sua carteira Haveno (conveniente, mas as transações podem ser conectas) OU\n- Transferência de uma carteira externa (potencialmente mais privada)\n\nVocê verá todas as opções de financiamento e detalhes depois de fechar este popup.
+takeOffer.takeOfferFundWalletInfo.msg=Você precisa depositar {0} para aceitar esta oferta.\n\nO valor é a soma de:\n{1}- Seu depósito de segurança: {2}\n- Taxa de negociação: {3}
 takeOffer.alreadyPaidInFunds=Se você já pagou com seus fundos você pode levantá-los na janela \"Fundos/Enviar fundos\".
 takeOffer.paymentInfo=Informações de pagamento
 takeOffer.setAmountPrice=Definir quantia
@@ -1036,6 +1051,8 @@ settings.net.p2pHeader=Rede do Haveno
 settings.net.onionAddressLabel=O meu endereço onion
 settings.net.xmrNodesLabel=Usar nós de Monero personalizados
 settings.net.moneroPeersLabel=Pares conectados
+settings.net.connection=Conexão
+settings.net.connected=Conectado
 settings.net.useTorForXmrJLabel=Usar Tor para a rede de Monero
 settings.net.moneroNodesLabel=Nós de Monero para conectar
 settings.net.useProvidedNodesRadio=Usar nós de Monero Core providenciados
@@ -1453,6 +1470,7 @@ offerDetailsWindow.confirm.maker=Confirmar: Criar oferta para {0} monero
 offerDetailsWindow.confirm.taker=Confirmar: Aceitar oferta de {0} monero
 offerDetailsWindow.creationDate=Data de criação
 offerDetailsWindow.makersOnion=Endereço onion do ofertante
+offerDetailsWindow.challenge=Passphrase da oferta
 
 qRCodeWindow.headline=QR Code
 qRCodeWindow.msg=Please use this QR code for funding your Haveno wallet from your external wallet.
@@ -1493,7 +1511,7 @@ tacWindow.disagree=Eu não concordo e desisto
 tacWindow.arbitrationSystem=Resolução da disputa
 
 tradeDetailsWindow.headline=Negócio
-tradeDetailsWindow.disputedPayoutTxId=ID de transação do pagamento disputado:
+tradeDetailsWindow.disputedPayoutTxId=ID de transação do pagamento disputado
 tradeDetailsWindow.tradeDate=Data de negócio
 tradeDetailsWindow.txFee=Taxa de mineração
 tradeDetailsWindow.tradePeersOnion=Endereço onion dos parceiros de negociação
@@ -1676,6 +1694,9 @@ popup.accountSigning.unsignedPubKeys.signed=Pubkeys were signed
 popup.accountSigning.unsignedPubKeys.result.signed=Signed pubkeys
 popup.accountSigning.unsignedPubKeys.result.failed=Failed to sign
 
+popup.info.buyerAsTakerWithoutDeposit.headline=Nenhum depósito exigido do comprador
+popup.info.buyerAsTakerWithoutDeposit=Sua oferta não exigirá um depósito de segurança ou taxa do comprador de XMR.\n\nPara aceitar sua oferta, você deve compartilhar uma senha com seu parceiro comercial fora do Haveno.\n\nA senha é gerada automaticamente e exibida nos detalhes da oferta após a criação.
+
 ####################################################################
 # Notifications
 ####################################################################
@@ -1801,6 +1822,7 @@ navigation.support=\"Apoio\"
 
 formatter.formatVolumeLabel={0} quantia{1}
 formatter.makerTaker=Ofertante como {0} {1} / Aceitador como {2} {3}
+formatter.makerTakerLocked=Ofertante como {0} {1} / Aceitador como {2} {3} 🔒
 formatter.youAreAsMaker=You are: {1} {0} (maker) / Taker is: {3} {2}
 formatter.youAreAsTaker=You are: {1} {0} (taker) / Maker is: {3} {2}
 formatter.youAre=Você é {0} {1} ({2} {3})
@@ -1956,9 +1978,9 @@ payment.moneyGram.info=When using MoneyGram the XMR buyer has to send the Author
 payment.westernUnion.info=When using Western Union the XMR buyer has to send the MTCN (tracking number) and a photo of the receipt by email to the XMR seller. The receipt must clearly show the seller's full name, city, country and the amount. The seller's email will be displayed to the buyer during the trade process.
 payment.halCash.info=Ao usar o HalCash, o comprador de XMR precisa enviar ao vendedor de XMR o código HalCash através de uma mensagem de texto do seu telemóvel.\n\nPor favor, certifique-se de não exceder a quantia máxima que seu banco lhe permite enviar com o HalCash. A quantia mín. de levantamento é de 10 euros e a quantia máx. é de 600 EUR. Para levantamentos repetidos é de 3000 euros por recipiente por dia e 6000 euros por recipiente por mês. Por favor confirme esses limites com seu banco para ter certeza de que eles usam os mesmos limites mencionados aqui.\n\nA quantia de levantamento deve ser um múltiplo de 10 euros, pois você não pode levantar outras quantias de uma ATM. A interface do utilizador no ecrã para criar oferta e aceitar ofertas ajustará a quantia de XMR para que a quantia de EUR esteja correta. Você não pode usar o preço com base no mercado, pois o valor do EUR estaria mudando com a variação dos preços.\n\nEm caso de disputa, o comprador de XMR precisa fornecer a prova de que enviou o EUR.
 # suppress inspection "UnusedMessageFormatParameter"
-payment.limits.info=Please be aware that all bank transfers carry a certain amount of chargeback risk. To mitigate this risk, Haveno sets per-trade limits based on the estimated level of chargeback risk for the payment method used.\n\nFor this payment method, your per-trade limit for buying and selling is {2}.\n\nThis limit only applies to the size of a single trade—you can place as many trades as you like.\n\nSee more details on the wiki [HYPERLINK:https://haveno.exchange/wiki/Account_limits].
+payment.limits.info=Please be aware that all bank transfers carry a certain amount of chargeback risk. To mitigate this risk, Haveno sets per-trade limits based on the estimated level of chargeback risk for the payment method used.\n\nFor this payment method, your per-trade limit for buying and selling is {2}.\n\nThis limit only applies to the size of a single trade—you can place as many trades as you like.\n\nSee more details on the wiki [HYPERLINK:https://docs.haveno.exchange/the-project/account_limits].
 # suppress inspection "UnusedProperty"
-payment.limits.info.withSigning=To limit chargeback risk, Haveno sets per-trade limits for this payment account type based on the following 2 factors:\n\n1. General chargeback risk for the payment method\n2. Account signing status\n\nThis payment account is not yet signed, so it is limited to buying {0} per trade. After signing, buy limits will increase as follows:\n\n● Before signing, and for 30 days after signing, your per-trade buy limit will be {0}\n● 30 days after signing, your per-trade buy limit will be {1}\n● 60 days after signing, your per-trade buy limit will be {2}\n\nSell limits are not affected by account signing. You can sell {2} in a single trade immediately.\n\nThese limits only apply to the size of a single trade—you can place as many trades as you like. \n\nSee more details on the wiki [HYPERLINK:https://haveno.exchange/wiki/Account_limits].
+payment.limits.info.withSigning=To limit chargeback risk, Haveno sets per-trade limits for this payment account type based on the following 2 factors:\n\n1. General chargeback risk for the payment method\n2. Account signing status\n\nThis payment account is not yet signed, so it is limited to buying {0} per trade. After signing, buy limits will increase as follows:\n\n● Before signing, and for 30 days after signing, your per-trade buy limit will be {0}\n● 30 days after signing, your per-trade buy limit will be {1}\n● 60 days after signing, your per-trade buy limit will be {2}\n\nSell limits are not affected by account signing. You can sell {2} in a single trade immediately.\n\nThese limits only apply to the size of a single trade—you can place as many trades as you like. \n\nSee more details on the wiki [HYPERLINK:https://docs.haveno.exchange/the-project/account_limits].
 
 payment.cashDeposit.info=Por favor, confirme que seu banco permite-lhe enviar depósitos em dinheiro para contas de outras pessoas. Por exemplo, o Bank of America e o Wells Fargo não permitem mais esses depósitos.
 

core/src/main/resources/i18n/displayStrings_ru.properties

@@ -40,6 +40,8 @@ shared.buyMonero=Купить биткойн
 shared.sellMonero=Продать биткойн
 shared.buyCurrency=Купить {0}
 shared.sellCurrency=Продать {0}
+shared.buyCurrencyLocked=Купить {0} 🔒
+shared.sellCurrencyLocked=Продать {0} 🔒
 shared.buyingXMRWith=покупка ВТС за {0}
 shared.sellingXMRFor=продажа ВТС за {0}
 shared.buyingCurrency=покупка {0} (продажа ВТС)
@@ -103,7 +105,7 @@ shared.faq=Visit FAQ page
 shared.yesCancel=Да, отменить
 shared.nextStep=Далее
 shared.selectTradingAccount=Выбрать торговый счёт
-shared.fundFromSavingsWalletButton=Перевести средства с кошелька Haveno
+shared.fundFromSavingsWalletButton=Применить средства из кошелька Haveno
 shared.fundFromExternalWalletButton=Открыть внешний кошелёк для пополнения
 shared.openDefaultWalletFailed=Failed to open a Monero wallet application. Are you sure you have one installed?
 shared.belowInPercent=% ниже рыночного курса
@@ -186,7 +188,7 @@ shared.total=Всего
 shared.totalsNeeded=Требуемая сумма
 shared.tradeWalletAddress=Адрес кошелька сделки
 shared.tradeWalletBalance=Баланс кошелька сделки
-shared.reserveExactAmount=Зарезервируйте только необходимые средства. Может потребоваться комиссия за майнинг и 10 подтверждений (~20 минут), прежде чем ваше предложение станет активным.
+shared.reserveExactAmount=Резервируйте только необходимые средства. Требуется комиссия за майнинг и ~20 минут, прежде чем ваше предложение станет активным.
 shared.makerTxFee=Мейкер: {0}
 shared.takerTxFee=Тейкер: {0}
 shared.iConfirm=Подтверждаю
@@ -330,6 +332,7 @@ offerbook.createOffer=Создать предложение
 offerbook.takeOffer=Принять предложение
 offerbook.takeOfferToBuy=Принять предложение купить {0}
 offerbook.takeOfferToSell=Принять предложение продать {0}
+offerbook.takeOffer.enterChallenge=Введите фразу-пароль предложения
 offerbook.trader=Трейдер
 offerbook.offerersBankId=Идент. банка (BIC/SWIFT) мейкера: {0}
 offerbook.offerersBankName=Название банка мейкера: {0}
@@ -339,7 +342,9 @@ offerbook.offerersAcceptedBankSeats=Допустимые страны банка
 offerbook.availableOffers=Доступные предложения
 offerbook.filterByCurrency=Фильтровать по валюте
 offerbook.filterByPaymentMethod=Фильтровать по способу оплаты
-offerbook.matchingOffers=Offers matching my accounts
+offerbook.matchingOffers=Предложения, соответствующие моим аккаунтам
+offerbook.filterNoDeposit=Нет депозита
+offerbook.noDepositOffers=Предложения без депозита (требуется пароль)
 offerbook.timeSinceSigning=Account info
 offerbook.timeSinceSigning.info=This account was verified and {0}
 offerbook.timeSinceSigning.info.arbitrator=signed by an arbitrator and can sign peer accounts
@@ -457,7 +462,12 @@ createOffer.placeOfferButton=Проверка: разместить предло
 createOffer.createOfferFundWalletInfo.headline=Обеспечить своё предложение
 # suppress inspection "TrailingSpacesInProperty"
 createOffer.createOfferFundWalletInfo.tradeAmount=- Сумма сделки: {0} \n
-createOffer.createOfferFundWalletInfo.msg=Вы должны внести {0} для обеспечения этого предложения.\n\nЭти средства будут зарезервированы в вашем локальном кошельке, а когда кто-то примет ваше предложение — заблокированы на депозитном multisig-адресе.\n\nСумма состоит из:\n{1}- вашего залога: {2},\n- комиссии за сделку: {3},\n- комиссии майнера: {4}.\n\nВы можете выбрать один из двух вариантов финансирования сделки:\n - использовать свой кошелёк Haveno (удобно, но сделки можно отследить) ИЛИ\n - перевести из внешнего кошелька (потенциально более анонимно).\n\nВы увидите все варианты обеспечения предложения и их подробности после закрытия этого окна.
+createOffer.createOfferFundWalletInfo.msg=Вам нужно внести депозит {0} для этого предложения.\n\n\
+  Эти средства резервируются в вашем локальном кошельке и будут заблокированы в мультиподписном кошельке, как только кто-то примет ваше предложение.\n\n\
+  Сумма состоит из:\n\
+  {1}\
+  - Ваш залог: {2}\n\
+  - Торговая комиссия: {3}
 
 # only first part "An error occurred when placing the offer:" has been used before. We added now the rest (need update in existing translations!)
 createOffer.amountPriceBox.error.message=Ошибка при создании предложения:\n\n{0}\n\nВаши средства остались в кошельке.\nПерезагрузите приложение и проверьте сетевое соединение.
@@ -479,7 +489,10 @@ createOffer.setDepositAsBuyer=Установить мой залог как по
 createOffer.setDepositForBothTraders=Set both traders' security deposit (%)
 createOffer.securityDepositInfo=Сумма залога покупателя: {0}
 createOffer.securityDepositInfoAsBuyer=Сумма вашего залога: {0}
-createOffer.minSecurityDepositUsed=Min. buyer security deposit is used
+createOffer.minSecurityDepositUsed=Минимальный залог используется
+createOffer.buyerAsTakerWithoutDeposit=Залог от покупателя не требуется (защищено паролем)
+createOffer.myDeposit=Мой залог (%)
+createOffer.myDepositInfo=Ваш залог составит {0}
 
 
 ####################################################################
@@ -503,6 +516,8 @@ takeOffer.fundsBox.networkFee=Oбщая комиссия майнера
 takeOffer.fundsBox.takeOfferSpinnerInfo=Принятие предложения: {0}
 takeOffer.fundsBox.paymentLabel=Сделка в Haveno с идентификатором {0}
 takeOffer.fundsBox.fundsStructure=({0} — залог, {1} — комиссия за сделку, {2} — комиссия майнера)
+takeOffer.fundsBox.noFundingRequiredTitle=Не требуется финансирование
+takeOffer.fundsBox.noFundingRequiredDescription=Получите пароль предложения от продавца вне Haveno, чтобы принять это предложение.
 takeOffer.success.headline=Вы успешно приняли предложение.
 takeOffer.success.info=Статус вашей сделки отображается в разделе \«Папка/Текущие сделки\».
 takeOffer.error.message=Ошибка при принятии предложения:\n\n{0}
@@ -513,7 +528,7 @@ takeOffer.noPriceFeedAvailable=Нельзя принять это предлож
 takeOffer.takeOfferFundWalletInfo.headline=Обеспечьте свою сделку
 # suppress inspection "TrailingSpacesInProperty"
 takeOffer.takeOfferFundWalletInfo.tradeAmount=- Сумма сделки: {0} \n
-takeOffer.takeOfferFundWalletInfo.msg=Вы должны внести {0} для принятия этого предложения.\n\nСумма состоит из:\n{1}- вашего залога: {2},\n- комиссии за сделку: {3}\n\nВы можете выбрать один из двух вариантов финансирования сделки:\n - использовать свой кошелёк Haveno (удобно, но сделки можно отследить) ИЛИ\n - перевести из внешнего кошелька (потенциально более анонимно).\n\nВы увидите все варианты обеспечения предложения и их подробности после закрытия этого окна.
+takeOffer.takeOfferFundWalletInfo.msg=Вам нужно внести депозит в размере {0} для принятия этого предложения.\n\nСумма составляет:\n{1}- Ваш залог: {2}\n- Торговая комиссия: {3}
 takeOffer.alreadyPaidInFunds=Если вы уже внесли средства, их можно вывести в разделе \«Средства/Отправить средства\».
 takeOffer.paymentInfo=Информация о платеже
 takeOffer.setAmountPrice=Задайте сумму
@@ -1035,6 +1050,8 @@ settings.net.p2pHeader=Haveno network
 settings.net.onionAddressLabel=Мой onion-адрес
 settings.net.xmrNodesLabel=Использовать особые узлы Monero
 settings.net.moneroPeersLabel=Подключенные пиры
+settings.net.connection=Соединение
+settings.net.connected=Подключено
 settings.net.useTorForXmrJLabel=Использовать Tor для сети Monero
 settings.net.moneroNodesLabel=Узлы Monero для подключения
 settings.net.useProvidedNodesRadio=Использовать предоставленные узлы Monero Core
@@ -1454,6 +1471,7 @@ offerDetailsWindow.confirm.maker=Подтвердите: разместить п
 offerDetailsWindow.confirm.taker=Подтвердите: принять предложение {0} биткойн
 offerDetailsWindow.creationDate=Дата создания
 offerDetailsWindow.makersOnion=Onion-адрес мейкера
+offerDetailsWindow.challenge=Пароль предложения
 
 qRCodeWindow.headline=QR Code
 qRCodeWindow.msg=Please use this QR code for funding your Haveno wallet from your external wallet.
@@ -1677,6 +1695,9 @@ popup.accountSigning.unsignedPubKeys.signed=Pubkeys were signed
 popup.accountSigning.unsignedPubKeys.result.signed=Signed pubkeys
 popup.accountSigning.unsignedPubKeys.result.failed=Failed to sign
 
+popup.info.buyerAsTakerWithoutDeposit.headline=Депозит от покупателя не требуется
+popup.info.buyerAsTakerWithoutDeposit=Ваше предложение не потребует залога или комиссии от покупателя XMR.\n\nЧтобы принять ваше предложение, вы должны поделиться парольной фразой с вашим торговым партнером вне Haveno.\n\nПарольная фраза генерируется автоматически и отображается в деталях предложения после его создания.
+
 ####################################################################
 # Notifications
 ####################################################################
@@ -1802,6 +1823,7 @@ navigation.support=\«Поддержка\»
 
 formatter.formatVolumeLabel={0} сумма {1}
 formatter.makerTaker=Мейкер как {0} {1} / Тейкер как {2} {3}
+formatter.makerTakerLocked=Мейкер как {0} {1} / Тейкер как {2} {3} 🔒
 formatter.youAreAsMaker=You are: {1} {0} (maker) / Taker is: {3} {2}
 formatter.youAreAsTaker=You are: {1} {0} (taker) / Maker is: {3} {2}
 formatter.youAre=Вы {0} {1} ({2} {3})
@@ -1957,9 +1979,9 @@ payment.moneyGram.info=When using MoneyGram the XMR buyer has to send the Author
 payment.westernUnion.info=When using Western Union the XMR buyer has to send the MTCN (tracking number) and a photo of the receipt by email to the XMR seller. The receipt must clearly show the seller's full name, city, country and the amount. The seller's email will be displayed to the buyer during the trade process.
 payment.halCash.info=Используя HalCash, покупатель XMR обязуется отправить продавцу XMR код HalCash через СМС с мобильного телефона.\n\nУбедитесь, что не вы не превысили максимальную сумму, которую ваш банк позволяет отправить с HalCash. Минимальная сумма на вывод средств составляет 10 EUR, а и максимальная — 600 EUR. При повторном выводе средств лимит составляет 3000 EUR на получателя в день и 6000 EUR на получателя в месяц. Просьба сверить эти лимиты с вашим банком и убедиться, что лимиты банка соответствуют лимитам, указанным здесь.\n\nВыводимая сумма должна быть кратна 10 EUR, так как другие суммы снять из банкомата невозможно. Приложение само отрегулирует сумму XMR, чтобы она соответствовала сумме в EUR, во время создания или принятия предложения. Вы не сможете использовать текущий рыночный курс, так как сумма в EUR будет меняться с изменением курса.\n\nВ случае спора покупателю XMR необходимо предоставить доказательство отправки EUR.
 # suppress inspection "UnusedMessageFormatParameter"
-payment.limits.info=Please be aware that all bank transfers carry a certain amount of chargeback risk. To mitigate this risk, Haveno sets per-trade limits based on the estimated level of chargeback risk for the payment method used.\n\nFor this payment method, your per-trade limit for buying and selling is {2}.\n\nThis limit only applies to the size of a single trade—you can place as many trades as you like.\n\nSee more details on the wiki [HYPERLINK:https://haveno.exchange/wiki/Account_limits].
+payment.limits.info=Please be aware that all bank transfers carry a certain amount of chargeback risk. To mitigate this risk, Haveno sets per-trade limits based on the estimated level of chargeback risk for the payment method used.\n\nFor this payment method, your per-trade limit for buying and selling is {2}.\n\nThis limit only applies to the size of a single trade—you can place as many trades as you like.\n\nSee more details on the wiki [HYPERLINK:https://docs.haveno.exchange/the-project/account_limits].
 # suppress inspection "UnusedProperty"
-payment.limits.info.withSigning=To limit chargeback risk, Haveno sets per-trade limits for this payment account type based on the following 2 factors:\n\n1. General chargeback risk for the payment method\n2. Account signing status\n\nThis payment account is not yet signed, so it is limited to buying {0} per trade. After signing, buy limits will increase as follows:\n\n● Before signing, and for 30 days after signing, your per-trade buy limit will be {0}\n● 30 days after signing, your per-trade buy limit will be {1}\n● 60 days after signing, your per-trade buy limit will be {2}\n\nSell limits are not affected by account signing. You can sell {2} in a single trade immediately.\n\nThese limits only apply to the size of a single trade—you can place as many trades as you like. \n\nSee more details on the wiki [HYPERLINK:https://haveno.exchange/wiki/Account_limits].
+payment.limits.info.withSigning=To limit chargeback risk, Haveno sets per-trade limits for this payment account type based on the following 2 factors:\n\n1. General chargeback risk for the payment method\n2. Account signing status\n\nThis payment account is not yet signed, so it is limited to buying {0} per trade. After signing, buy limits will increase as follows:\n\n● Before signing, and for 30 days after signing, your per-trade buy limit will be {0}\n● 30 days after signing, your per-trade buy limit will be {1}\n● 60 days after signing, your per-trade buy limit will be {2}\n\nSell limits are not affected by account signing. You can sell {2} in a single trade immediately.\n\nThese limits only apply to the size of a single trade—you can place as many trades as you like. \n\nSee more details on the wiki [HYPERLINK:https://docs.haveno.exchange/the-project/account_limits].
 
 payment.cashDeposit.info=Убедитесь, что ваш банк позволяет отправлять денежные переводы на счета других лиц. Например, Bank of America и Wells Fargo больше не разрешают такие переводы.
 

core/src/main/resources/i18n/displayStrings_th.properties

@@ -40,6 +40,8 @@ shared.buyMonero=ซื้อ  monero (บิตคอยน์)
 shared.sellMonero=ขาย monero (บิตคอยน์)
 shared.buyCurrency=ซื้อ {0}
 shared.sellCurrency=ขาย {0}
+shared.buyCurrencyLocked=ซื้อ {0} 🔒
+shared.sellCurrencyLocked=ขาย {0} 🔒
 shared.buyingXMRWith=การซื้อ XMR กับ {0}
 shared.sellingXMRFor=การขาย XMR แก่ {0}
 shared.buyingCurrency=การซื้อ {0} (การขาย XMR)
@@ -103,7 +105,7 @@ shared.faq=Visit FAQ page
 shared.yesCancel=ใช่ ยกเลิก
 shared.nextStep=ขั้นถัดไป
 shared.selectTradingAccount=เลือกบัญชีการซื้อขาย
-shared.fundFromSavingsWalletButton=โอนเงินจาก Haveno wallet
+shared.fundFromSavingsWalletButton=ใช้เงินจากกระเป๋าเงิน Haveno
 shared.fundFromExternalWalletButton=เริ่มทำการระดมเงินทุนหาแหล่งเงินจากกระเป๋าสตางค์ภายนอกของคุณ
 shared.openDefaultWalletFailed=Failed to open a Monero wallet application. Are you sure you have one installed?
 shared.belowInPercent=ต่ำกว่า % จากราคาตลาด
@@ -186,7 +188,7 @@ shared.total=ยอดทั้งหมด
 shared.totalsNeeded=เงินที่จำเป็น
 shared.tradeWalletAddress=ที่อยู่ Trade wallet
 shared.tradeWalletBalance=ยอดคงเหลือของ Trade wallet
-shared.reserveExactAmount=สงวนเฉพาะเงินทุนที่จำเป็นเท่านั้น อาจจะต้องเสียค่าขุดแร่และรับรอง 10 ครั้ง (~20 นาที) ก่อนที่ข้อเสนอของคุณจะเป็นสถานะออนไลน์
+shared.reserveExactAmount=สำรองเฉพาะเงินที่จำเป็น ต้องใช้ค่าธรรมเนียมการขุดและเวลาประมาณ 20 นาทีก่อนที่ข้อเสนอของคุณจะเผยแพร่
 shared.makerTxFee=ผู้ทำ: {0}
 shared.takerTxFee=ผู้รับ: {0}
 shared.iConfirm=ฉันยืนยัน
@@ -330,6 +332,7 @@ offerbook.createOffer=สร้างข้อเสนอ
 offerbook.takeOffer=รับข้อเสนอ
 offerbook.takeOfferToBuy=Take offer to buy {0}
 offerbook.takeOfferToSell=Take offer to sell {0}
+offerbook.takeOffer.enterChallenge=กรอกพาสเฟรสข้อเสนอ
 offerbook.trader=Trader (เทรดเดอร์)
 offerbook.offerersBankId=รหัสธนาคารของผู้สร้าง (BIC / SWIFT): {0}
 offerbook.offerersBankName=ชื่อธนาคารของผู้สร้าง: {0}
@@ -339,7 +342,9 @@ offerbook.offerersAcceptedBankSeats=ยอมรับตำแหน่งป
 offerbook.availableOffers=ข้อเสนอที่พร้อมใช้งาน
 offerbook.filterByCurrency=กรองตามสกุลเงิน
 offerbook.filterByPaymentMethod=ตัวกรองตามวิธีการชำระเงิน
-offerbook.matchingOffers=Offers matching my accounts
+offerbook.matchingOffers=ข้อเสนอที่ตรงกับบัญชีของฉัน
+offerbook.filterNoDeposit=ไม่มีเงินมัดจำ
+offerbook.noDepositOffers=ข้อเสนอที่ไม่มีเงินมัดจำ (ต้องการรหัสผ่าน)
 offerbook.timeSinceSigning=Account info
 offerbook.timeSinceSigning.info=This account was verified and {0}
 offerbook.timeSinceSigning.info.arbitrator=signed by an arbitrator and can sign peer accounts
@@ -457,7 +462,12 @@ createOffer.placeOfferButton=รีวิว: ใส่ข้อเสนอไ
 createOffer.createOfferFundWalletInfo.headline=เงินทุนสำหรับข้อเสนอของคุณ
 # suppress inspection "TrailingSpacesInProperty"
 createOffer.createOfferFundWalletInfo.tradeAmount=- ปริมาณการซื้อขาย: {0}
-createOffer.createOfferFundWalletInfo.msg=คุณต้องวางเงินมัดจำ {0} ข้อเสนอนี้\n\nเงินเหล่านั้นจะถูกสงวนไว้ใน wallet ภายในประเทศของคุณและจะถูกล็อคไว้ในที่อยู่ที่ฝากเงิน multisig เมื่อมีคนรับข้อเสนอของคุณ\n\nผลรวมของจำนวนของ: \n{1} - เงินประกันของคุณ: {2} \n- ค่าธรรมเนียมการซื้อขาย: {3} \n- ค่าขุด: {4} \n\nคุณสามารถเลือกระหว่างสองตัวเลือกเมื่อมีการระดุมทุนการซื้อขายของคุณ: \n- ใช้กระเป๋าสตางค์ Haveno ของคุณ (สะดวก แต่ธุรกรรมอาจเชื่อมโยงกันได้) หรือ\n- โอนเงินจากเงินภายนอกเข้ามา (อาจเป็นส่วนตัวมากขึ้น) \n\nคุณจะเห็นตัวเลือกและรายละเอียดการระดมทุนทั้งหมดหลังจากปิดป๊อปอัปนี้
+createOffer.createOfferFundWalletInfo.msg=คุณจำเป็นต้องฝากเงิน {0} เพื่อข้อเสนอนี้\n\n\
+  เงินเหล่านี้จะถูกสงวนไว้ในกระเป๋าเงินในเครื่องของคุณ และจะถูกล็อกในกระเป๋าเงินมัลติซิกเมื่อมีคนรับข้อเสนอของคุณ\n\n\
+  จำนวนเงินคือผลรวมของ:\n\
+  {1}\
+  - เงินประกันของคุณ: {2}\n\
+  - ค่าธรรมเนียมการซื้อขาย: {3}
 
 # only first part "An error occurred when placing the offer:" has been used before. We added now the rest (need update in existing translations!)
 createOffer.amountPriceBox.error.message=เกิดข้อผิดพลาดขณะใส่ข้อเสนอ: \n\n{0} \n\nยังไม่มีการโอนเงินจาก wallet ของคุณเลย\nโปรดเริ่มแอปพลิเคชันใหม่และตรวจสอบการเชื่อมต่อเครือข่ายของคุณ
@@ -479,7 +489,10 @@ createOffer.setDepositAsBuyer=Set my security deposit as buyer (%)
 createOffer.setDepositForBothTraders=Set both traders' security deposit (%)
 createOffer.securityDepositInfo=Your buyer''s security deposit will be {0}
 createOffer.securityDepositInfoAsBuyer=Your security deposit as buyer will be {0}
-createOffer.minSecurityDepositUsed=Min. buyer security deposit is used
+createOffer.minSecurityDepositUsed=เงินประกันความปลอดภัยขั้นต่ำถูกใช้
+createOffer.buyerAsTakerWithoutDeposit=ไม่ต้องวางมัดจำจากผู้ซื้อ (ป้องกันด้วยรหัสผ่าน)
+createOffer.myDeposit=เงินประกันความปลอดภัยของฉัน (%)
+createOffer.myDepositInfo=เงินประกันความปลอดภัยของคุณจะเป็น {0}
 
 
 ####################################################################
@@ -503,6 +516,8 @@ takeOffer.fundsBox.networkFee=ยอดรวมค่าธรรมเนี
 takeOffer.fundsBox.takeOfferSpinnerInfo=ยอมรับข้อเสนอ: {0}
 takeOffer.fundsBox.paymentLabel=การซื้อขาย Haveno ด้วย ID {0}
 takeOffer.fundsBox.fundsStructure=({0} เงินประกัน {1} ค่าธรรมเนียมการซื้อขาย {2} ค่าธรรมเนียมการขุด)
+takeOffer.fundsBox.noFundingRequiredTitle=ไม่ต้องใช้เงินทุน
+takeOffer.fundsBox.noFundingRequiredDescription=รับรหัสผ่านข้อเสนอจากผู้ขายภายนอก Haveno เพื่อรับข้อเสนอนี้
 takeOffer.success.headline=คุณได้รับข้อเสนอเป็นที่เรีบยร้อยแล้ว
 takeOffer.success.info=คุณสามารถดูสถานะการค้าของคุณได้ที่ \ "Portfolio (แฟ้มผลงาน) / เปิดการซื้อขาย \"
 takeOffer.error.message=เกิดข้อผิดพลาดขณะรับข้อเสนอ\n\n{0}
@@ -513,7 +528,7 @@ takeOffer.noPriceFeedAvailable=คุณไม่สามารถรับข
 takeOffer.takeOfferFundWalletInfo.headline=ทุนการซื้อขายของคุณ
 # suppress inspection "TrailingSpacesInProperty"
 takeOffer.takeOfferFundWalletInfo.tradeAmount=- ปริมาณการซื้อขาย: {0}
-takeOffer.takeOfferFundWalletInfo.msg=คุณต้องวางเงินประกัน {0} เพื่อรับข้อเสนอนี้\n\nจำนวนเงินคือผลรวมของ: \n{1} - เงินประกันของคุณ: {2} \n- ค่าธรรมเนียมการซื้อขาย: {3} \n\nคุณสามารถเลือกระหว่างสองตัวเลือกเมื่อลงทุนการซื้อขายของคุณ: \n- ใช้กระเป๋าสตางค์ Haveno ของคุณ (สะดวก แต่ธุรกรรมอาจเชื่อมโยงกันได้) หรือ\n- โอนเงินจากแหล่งเงินภายนอก (อาจเป็นส่วนตัวมากขึ้น) \n\nคุณจะเห็นตัวเลือกและรายละเอียดการลงทุนทั้งหมดหลังจากปิดป๊อปอัปนี้
+takeOffer.takeOfferFundWalletInfo.msg=คุณต้องฝากเงิน {0} เพื่อรับข้อเสนอนี้。\n\nจำนวนเงินคือผลรวมของ:\n{1}- เงินมัดจำของคุณ: {2}\n- ค่าธรรมเนียมการซื้อขาย: {3}
 takeOffer.alreadyPaidInFunds=หากคุณได้ชำระเงินแล้วคุณสามารถถอนเงินออกได้ในหน้าจอ \"เงิน / ส่งเงิน \"
 takeOffer.paymentInfo=ข้อมูลการชำระเงิน
 takeOffer.setAmountPrice=ตั้งยอดจำนวน
@@ -1035,6 +1050,8 @@ settings.net.p2pHeader=Haveno network
 settings.net.onionAddressLabel=ที่อยู่  onion ของฉัน
 settings.net.xmrNodesLabel=ใช้โหนดเครือข่าย Monero ที่กำหนดเอง
 settings.net.moneroPeersLabel=เชื่อมต่อกับเน็ตเวิร์ก peers แล้ว
+settings.net.connection=การเชื่อมต่อ
+settings.net.connected=เชื่อมต่อ
 settings.net.useTorForXmrJLabel=ใช้ Tor สำหรับเครือข่าย Monero
 settings.net.moneroNodesLabel=ใช้โหนดเครือข่าย Monero เพื่อเชื่อมต่อ
 settings.net.useProvidedNodesRadio=ใช้โหนดเครือข่าย Monero ที่ให้มา
@@ -1454,6 +1471,7 @@ offerDetailsWindow.confirm.maker=ยืนยัน: ยื่นข้อเส
 offerDetailsWindow.confirm.taker=ยืนยัน: รับข้อเสนอไปยัง {0} บิทคอยน์
 offerDetailsWindow.creationDate=วันที่สร้าง
 offerDetailsWindow.makersOnion=ที่อยู่ onion ของผู้สร้าง
+offerDetailsWindow.challenge=รหัสผ่านสำหรับข้อเสนอ
 
 qRCodeWindow.headline=QR Code
 qRCodeWindow.msg=Please use this QR code for funding your Haveno wallet from your external wallet.
@@ -1494,7 +1512,7 @@ tacWindow.disagree=ฉันไม่เห็นด้วยและออก
 tacWindow.arbitrationSystem=Dispute resolution
 
 tradeDetailsWindow.headline=ซื้อขาย
-tradeDetailsWindow.disputedPayoutTxId=รหัส ID ธุรกรรมการจ่ายเงินที่พิพาท:
+tradeDetailsWindow.disputedPayoutTxId=รหัส ID ธุรกรรมการจ่ายเงินที่พิพาท
 tradeDetailsWindow.tradeDate=วันที่ซื้อขาย
 tradeDetailsWindow.txFee=ค่าธรรมเนียมการขุด
 tradeDetailsWindow.tradePeersOnion=ที่อยู่ของ onion คู่ค้า
@@ -1677,6 +1695,9 @@ popup.accountSigning.unsignedPubKeys.signed=Pubkeys were signed
 popup.accountSigning.unsignedPubKeys.result.signed=Signed pubkeys
 popup.accountSigning.unsignedPubKeys.result.failed=Failed to sign
 
+popup.info.buyerAsTakerWithoutDeposit.headline=ไม่ต้องมีเงินมัดจำจากผู้ซื้อ
+popup.info.buyerAsTakerWithoutDeposit=ข้อเสนอของคุณจะไม่ต้องการเงินมัดจำหรือค่าธรรมเนียมจากผู้ซื้อ XMR\n\nในการยอมรับข้อเสนอของคุณ คุณต้องแบ่งปันรหัสผ่านกับคู่ค้าการค้าของคุณภายนอก Haveno\n\nรหัสผ่านจะถูกสร้างโดยอัตโนมัติและแสดงในรายละเอียดข้อเสนอหลังจากการสร้าง
+
 ####################################################################
 # Notifications
 ####################################################################
@@ -1802,6 +1823,7 @@ navigation.support=\"ช่วยเหลือและสนับสนุ
 
 formatter.formatVolumeLabel={0} จำนวนยอด{1}
 formatter.makerTaker=ผู้สร้าง เป็น {0} {1} / ผู้รับเป็น {2} {3}
+formatter.makerTakerLocked=ผู้สร้าง เป็น {0} {1} / ผู้รับเป็น {2} {3} 🔒
 formatter.youAreAsMaker=You are: {1} {0} (maker) / Taker is: {3} {2}
 formatter.youAreAsTaker=You are: {1} {0} (taker) / Maker is: {3} {2}
 formatter.youAre=คุณคือ {0} {1} ({2} {3})
@@ -1957,9 +1979,9 @@ payment.moneyGram.info=When using MoneyGram the XMR buyer has to send the Author
 payment.westernUnion.info=When using Western Union the XMR buyer has to send the MTCN (tracking number) and a photo of the receipt by email to the XMR seller. The receipt must clearly show the seller's full name, city, country and the amount. The seller's email will be displayed to the buyer during the trade process.
 payment.halCash.info=เมื่อมีการใช้งาน HalCash ผู้ซื้อ XMR จำเป็นต้องส่งรหัส Halcash ให้กับผู้ขายทางข้อความโทรศัพท์มือถือ\n\nโปรดตรวจสอบว่าไม่เกินจำนวนเงินสูงสุดที่ธนาคารของคุณอนุญาตให้คุณส่งด้วย HalCash จำนวนเงินขั้นต่ำในการเบิกถอนคือ 10 EUR และสูงสุดในจำนวนเงิน 600 EUR สำหรับการถอนซ้ำเป็น 3000 EUR ต่อผู้รับและต่อวัน และ 6000 EUR ต่อผู้รับและต่อเดือน โปรดตรวจสอบข้อจำกัดจากทางธนาคารคุณเพื่อให้มั่นใจได้ว่าทางธนาคารได้มีการใช้มาตรฐานข้อกำหนดเดียวกันกับดังที่ระบุไว้ ณ ที่นี่\n\nจำนวนเงินที่ถอนจะต้องเป็นจำนวนเงินหลาย 10 EUR เนื่องจากคุณไม่สามารถถอนเงินอื่น ๆ ออกจากตู้เอทีเอ็มได้ UI ในหน้าจอสร้างข้อเสนอและรับข้อเสนอจะปรับจำนวนเงิน XMR เพื่อให้จำนวนเงิน EUR ถูกต้อง คุณไม่สามารถใช้ราคาตลาดเป็นจำนวนเงิน EUR ซึ่งจะเปลี่ยนแปลงไปตามราคาที่มีการปรับเปลี่ยน\n\nในกรณีที่มีข้อพิพาทผู้ซื้อ XMR ต้องแสดงหลักฐานว่าได้ส่ง EUR แล้ว
 # suppress inspection "UnusedMessageFormatParameter"
-payment.limits.info=Please be aware that all bank transfers carry a certain amount of chargeback risk. To mitigate this risk, Haveno sets per-trade limits based on the estimated level of chargeback risk for the payment method used.\n\nFor this payment method, your per-trade limit for buying and selling is {2}.\n\nThis limit only applies to the size of a single trade—you can place as many trades as you like.\n\nSee more details on the wiki [HYPERLINK:https://haveno.exchange/wiki/Account_limits].
+payment.limits.info=Please be aware that all bank transfers carry a certain amount of chargeback risk. To mitigate this risk, Haveno sets per-trade limits based on the estimated level of chargeback risk for the payment method used.\n\nFor this payment method, your per-trade limit for buying and selling is {2}.\n\nThis limit only applies to the size of a single trade—you can place as many trades as you like.\n\nSee more details on the wiki [HYPERLINK:https://docs.haveno.exchange/the-project/account_limits].
 # suppress inspection "UnusedProperty"
-payment.limits.info.withSigning=To limit chargeback risk, Haveno sets per-trade limits for this payment account type based on the following 2 factors:\n\n1. General chargeback risk for the payment method\n2. Account signing status\n\nThis payment account is not yet signed, so it is limited to buying {0} per trade. After signing, buy limits will increase as follows:\n\n● Before signing, and for 30 days after signing, your per-trade buy limit will be {0}\n● 30 days after signing, your per-trade buy limit will be {1}\n● 60 days after signing, your per-trade buy limit will be {2}\n\nSell limits are not affected by account signing. You can sell {2} in a single trade immediately.\n\nThese limits only apply to the size of a single trade—you can place as many trades as you like. \n\nSee more details on the wiki [HYPERLINK:https://haveno.exchange/wiki/Account_limits].
+payment.limits.info.withSigning=To limit chargeback risk, Haveno sets per-trade limits for this payment account type based on the following 2 factors:\n\n1. General chargeback risk for the payment method\n2. Account signing status\n\nThis payment account is not yet signed, so it is limited to buying {0} per trade. After signing, buy limits will increase as follows:\n\n● Before signing, and for 30 days after signing, your per-trade buy limit will be {0}\n● 30 days after signing, your per-trade buy limit will be {1}\n● 60 days after signing, your per-trade buy limit will be {2}\n\nSell limits are not affected by account signing. You can sell {2} in a single trade immediately.\n\nThese limits only apply to the size of a single trade—you can place as many trades as you like. \n\nSee more details on the wiki [HYPERLINK:https://docs.haveno.exchange/the-project/account_limits].
 
 payment.cashDeposit.info=โปรดยืนยันว่าธนาคารของคุณได้อนุมัติให้คุณสามารถส่งเงินสดให้กับบัญชีบุคคลอื่นได้ ตัวอย่างเช่น บางธนาคารที่ไม่ได้มีการบริการถ่ายโอนเงินสดอย่าง Bank of America และ Wells Fargo
 

core/src/main/resources/i18n/displayStrings_tr.properties

@@ -43,6 +43,8 @@ shared.buyMonero=Monero Satın Al
 shared.sellMonero=Monero Sat
 shared.buyCurrency={0} satın al
 shared.sellCurrency={0} sat
+shared.buyCurrencyLocked={0} satın al 🔒
+shared.sellCurrencyLocked={0} sat 🔒
 shared.buyingXMRWith={0} ile XMR satın alınıyor
 shared.sellingXMRFor={0} karşılığında XMR satılıyor
 shared.buyingCurrency={0} satın alınıyor (XMR satılıyor)
@@ -107,7 +109,7 @@ shared.chooseTradingAccount=İşlem hesabını seç
 shared.faq=SSS sayfasını ziyaret et
 shared.yesCancel=Evet, iptal et
 shared.nextStep=Sonraki adım
-shared.fundFromSavingsWalletButton=Haveno cüzdanından fon transfer et
+shared.fundFromSavingsWalletButton=Haveno cüzdanından fonları uygula
 shared.fundFromExternalWalletButton=Fonlama için harici cüzdanını aç
 shared.openDefaultWalletFailed=Bir Monero cüzdan uygulaması açılamadı. Yüklü olduğundan emin misiniz?
 shared.belowInPercent=Piyasa fiyatının altında %
@@ -198,7 +200,7 @@ shared.total=Toplam
 shared.totalsNeeded=Gereken fonlar
 shared.tradeWalletAddress=İşlem cüzdan adresi
 shared.tradeWalletBalance=İşlem cüzdan bakiyesi
-shared.reserveExactAmount=Sadece gerekli fonları ayırın. Teklifinizin aktif olması için madencilik ücreti ve 10 onay (yaklaşık 20 dakika) gerekebilir.
+shared.reserveExactAmount=Yalnızca gerekli fonları ayırın. Teklifinizin aktif hale gelmesi için bir madencilik ücreti ve yaklaşık 20 dakika gereklidir.
 shared.makerTxFee=Yapıcı: {0}
 shared.takerTxFee=Alıcı: {0}
 shared.iConfirm=Onaylıyorum
@@ -346,6 +348,7 @@ market.trades.showVolumeInUSD=Hacmi USD olarak göster
 offerbook.createOffer=Teklif oluştur
 offerbook.takeOffer=Teklif al
 offerbook.takeOffer.createAccount=Hesap oluştur ve teklifi al
+offerbook.takeOffer.enterChallenge=Teklif şifresini girin
 offerbook.trader=Yatırımcı
 offerbook.offerersBankId=Yapıcının banka kimliği (BIC/SWIFT): {0}
 offerbook.offerersBankName=Yapıcının banka adı: {0}
@@ -357,6 +360,8 @@ offerbook.availableOffersToSell={0} için {1} sat
 offerbook.filterByCurrency=Para birimini seç
 offerbook.filterByPaymentMethod=Ödeme yöntemini seç
 offerbook.matchingOffers=Uygun Teklif
+offerbook.filterNoDeposit=Depozito yok
+offerbook.noDepositOffers=Depozitosuz teklifler (şifre gereklidir)
 offerbook.timeSinceSigning=Hesap bilgisi
 offerbook.timeSinceSigning.info.arbitrator=bir hakem tarafından imzalandı ve eş hesaplarını imzalayabilir
 offerbook.timeSinceSigning.info.peer=bir eş tarafından imzalandı, limitlerin kaldırılması için %d gün bekleniyor
@@ -411,7 +416,7 @@ offerbook.warning.counterpartyTradeRestrictions=Karşı taraf ticaret kısıtlam
 
 offerbook.warning.newVersionAnnouncement=Bu yazılım sürümü ile, ticaret yapan eşler birbirlerinin ödeme hesaplarını doğrulayabilir ve imzalayabilir, böylece güvenilir ödeme hesapları ağı oluşturulabilir.\n\n\
  Doğrulanmış ödeme hesabı olan bir eş ile başarılı bir şekilde ticaret yaptıktan sonra, ödeme hesabınız imzalanır ve ticaret limitleri belirli bir zaman aralığından sonra kaldırılır (bu aralığın uzunluğu doğrulama yöntemine bağlıdır).\n\n\
-  Hesap imzalama hakkında daha fazla bilgi için, lütfen [HYPERLINK:https://haveno.exchange/wiki/Account_limits#Account_signing] belgelere bakın.
+  Hesap imzalama hakkında daha fazla bilgi için, lütfen [HYPERLINK:https://docs.haveno.exchange/the-project/account_limits/#account-signing] belgelere bakın.
 
 popup.warning.tradeLimitDueAccountAgeRestriction.seller=İzin verilen ticaret miktarı, aşağıdaki kriterlere dayanan güvenlik kısıtlamaları nedeniyle {0} ile sınırlıdır:\n\
  - Alıcının hesabı bir hakem veya eş tarafından imzalanmamış\n\
@@ -495,10 +500,10 @@ createOffer.createOfferFundWalletInfo.headline=Teklifinizi finanse edin
 # suppress inspection "TrailingSpacesInProperty"
 createOffer.createOfferFundWalletInfo.tradeAmount=- Ticaret miktarı: {0} \n
 createOffer.createOfferFundWalletInfo.msg=Bu teklife {0} yatırmanız gerekiyor.\n\n\
-  Bu fonlar yerel cüzdanınızda ayrılır ve birisi teklifinizi aldığında multisig bir cüzdana kilitlenir.\n\n\
-  Miktar, şunların toplamıdır:\n\
+  Bu fonlar yerel cüzdanınızda rezerve edilir ve birisi teklifinizi kabul ettiğinde bir multisig cüzdanda kilitlenir.\n\n\
+  Tutarın toplamı şudur:\n\
   {1}\
-  - Güvenlik teminatınız: {2}\n\
+  - Güvenlik depozitonuz: {2}\n\
   - İşlem ücreti: {3}
 
 # only first part "Bir teklif verirken bir hata oluştu:" has been used before. We added now the rest (need update in existing translations!)
@@ -524,7 +529,10 @@ createOffer.setDepositAsBuyer=Alıcı olarak benim güvenlik teminatımı ayarla
 createOffer.setDepositForBothTraders=Tüccarların güvenlik teminatı (%)
 createOffer.securityDepositInfo=Alıcının güvenlik teminatı {0} olacak
 createOffer.securityDepositInfoAsBuyer=Alıcı olarak güvenlik teminatınız {0} olacak
-createOffer.minSecurityDepositUsed=Minimum alıcı güvenlik teminatı kullanıldı
+createOffer.minSecurityDepositUsed=Minimum güvenlik depozitosu kullanılır
+createOffer.buyerAsTakerWithoutDeposit=Alıcıdan depozito gerekmez (şifre korumalı)
+createOffer.myDeposit=Güvenlik depozitam (%)
+createOffer.myDepositInfo=Güvenlik depozitonuz {0} olacaktır.
 
 
 ####################################################################
@@ -550,6 +558,8 @@ takeOffer.fundsBox.networkFee=Toplam madencilik ücretleri
 takeOffer.fundsBox.takeOfferSpinnerInfo=Teklif alınıyor: {0}
 takeOffer.fundsBox.paymentLabel=ID {0} ile Haveno işlemi
 takeOffer.fundsBox.fundsStructure=({0} güvenlik teminatı, {1} işlem ücreti)
+takeOffer.fundsBox.noFundingRequiredTitle=Fonlama gerekmez
+takeOffer.fundsBox.noFundingRequiredDescription=Bu teklifi almak için satıcıdan passphrase'i Haveno dışında alınız.
 takeOffer.success.headline=Teklifi başarıyla aldınız.
 takeOffer.success.info=İşleminizin durumunu \"Portföy/Açık işlemler\" kısmında görebilirsiniz.
 takeOffer.error.message=Teklif alımı sırasında bir hata oluştu.\n\n{0}
@@ -561,7 +571,7 @@ takeOffer.noPriceFeedAvailable=Bu teklifi alamazsınız çünkü piyasa fiyatın
 takeOffer.takeOfferFundWalletInfo.headline=İşleminizi finanse edin
 # suppress inspection "TrailingSpacesInProperty"
 takeOffer.takeOfferFundWalletInfo.tradeAmount=- İşlem miktarı: {0} \n
-takeOffer.takeOfferFundWalletInfo.msg=Bu teklifi almak için {0} yatırmanız gerekiyor.\n\nBu miktar şunların toplamıdır:\n{1}- Güvenlik teminatınız: {2}\n- İşlem ücreti: {3}
+takeOffer.takeOfferFundWalletInfo.msg=Bu teklifi kabul etmek için {0} yatırmanız gerekiyor.\n\nMiktar, şu kalemlerin toplamıdır:\n{1}- Güvenlik depozitonuz: {2}\n- İşlem ücreti: {3}
 takeOffer.alreadyPaidInFunds=Eğer zaten fon yatırdıysanız, \"Fonlar/Fon gönder\" ekranında çekebilirsiniz.
 takeOffer.setAmountPrice=Miktar ayarla
 takeOffer.alreadyFunded.askCancel=Bu teklifi zaten finanse ettiniz.\nŞimdi iptal ederseniz, fonlarınız yerel Haveno cüzdanınızda kalacak ve \"Fonlar/Fon gönder\" ekranında çekilebilir olacaktır.\nİptal etmek istediğinizden emin misiniz?
@@ -1310,6 +1320,8 @@ settings.net.p2pHeader=Haveno ağı
 settings.net.onionAddressLabel=Onion adresim
 settings.net.xmrNodesLabel=Özel Monero düğümleri kullan
 settings.net.moneroPeersLabel=Bağlı eşler
+settings.net.connection=Bağlantı
+settings.net.connected=Bağlı
 settings.net.useTorForXmrJLabel=Monero ağı için Tor kullan
 settings.net.useTorForXmrAfterSyncRadio=Cüzdan senkronize edildikten sonra
 settings.net.useTorForXmrOffRadio=Asla
@@ -1961,6 +1973,7 @@ offerDetailsWindow.confirm.taker=Onayla: {0} monero teklifi al
 offerDetailsWindow.confirm.takerCrypto=Onayla: {0} {1} teklifi al
 offerDetailsWindow.creationDate=Oluşturma tarihi
 offerDetailsWindow.makersOnion=Yapıcı'nın onion adresi
+offerDetailsWindow.challenge=Teklif şifresi
 
 qRCodeWindow.headline=QR Kodu
 qRCodeWindow.msg=Harici cüzdanınızdan Haveno cüzdanınızı finanse etmek için bu QR kodunu kullanın.
@@ -2009,7 +2022,7 @@ tacWindow.disagree=Kabul etmiyorum ve çıkıyorum
 tacWindow.arbitrationSystem=Uyuşmazlık çözümü
 
 tradeDetailsWindow.headline=Ticaret
-tradeDetailsWindow.disputedPayoutTxId=Uyuşmazlık konusu olan ödeme işlem kimliği:
+tradeDetailsWindow.disputedPayoutTxId=Uyuşmazlık konusu olan ödeme işlem kimliği
 tradeDetailsWindow.tradeDate=Ticaret tarihi
 tradeDetailsWindow.txFee=Madencilik ücreti
 tradeDetailsWindow.tradePeersOnion=Ticaret ortaklarının onion adresi
@@ -2258,6 +2271,9 @@ popup.accountSigning.unsignedPubKeys.signed=Pubkey'ler imzalandı
 popup.accountSigning.unsignedPubKeys.result.signed=İmzalanmış pubkey'ler
 popup.accountSigning.unsignedPubKeys.result.failed=İmzalama başarısız oldu
 
+popup.info.buyerAsTakerWithoutDeposit.headline=Alıcıdan depozito gerekmez
+popup.info.buyerAsTakerWithoutDeposit=Teklifiniz, XMR alıcısından güvenlik depozitosu veya ücret talep etmeyecektir.\n\nTeklifinizi kabul etmek için, ticaret ortağınızla Haveno dışında bir şifre paylaşmalısınız.\n\nŞifre otomatik olarak oluşturulur ve oluşturulduktan sonra teklif detaylarında görüntülenir.
+
 popup.info.torMigration.msg=Haveno düğümünüz muhtemelen eski bir Tor v2 adresi kullanıyor. \
   Lütfen Haveno düğümünüzü bir Tor v3 adresine geçirin. \
   Önceden veri dizininizi yedeklediğinizden emin olun.
@@ -2397,6 +2413,7 @@ navigation.support="Destek"
 
 formatter.formatVolumeLabel={0} miktar{1}
 formatter.makerTaker=Yapan olarak {0} {1} / Alan olarak {2} {3}
+formatter.makerTakerLocked=Yapıcı olarak {0} {1} / Alan olarak {2} {3} 🔒
 formatter.youAreAsMaker=Yapan sizsiniz: {1} {0} (maker) / Alan: {3} {2}
 formatter.youAreAsTaker=Alan sizsiniz: {1} {0} (taker) / Yapan: {3} {2}
 formatter.youAre=Şu anda sizsiniz {0} {1} ({2} {3})
@@ -2642,7 +2659,7 @@ payment.limits.info=Lütfen tüm banka transferlerinin belirli bir miktarda geri
   \n\
   Bu limit yalnızca tek bir işlemin boyutuna uygulanır—istediğiniz kadar işlem yapabilirsiniz.\n\
   \n\
-  Daha fazla ayrıntı için wiki sayfasına bakın [HYPERLINK:https://haveno.exchange/wiki/Account_limits].
+  Daha fazla ayrıntı için wiki sayfasına bakın [HYPERLINK:https://docs.haveno.exchange/the-project/account_limits].
 # suppress inspection "UnusedProperty"
 payment.limits.info.withSigning=Geri ödeme riskini sınırlamak için, Haveno, bu ödeme hesabı türü için işlem başına limitler belirler \
   aşağıdaki 2 faktöre dayanır:\n\n\
@@ -2660,7 +2677,7 @@ payment.limits.info.withSigning=Geri ödeme riskini sınırlamak için, Haveno,
   \n\
   Bu limitler yalnızca tek bir işlemin boyutuna uygulanır—istediğiniz kadar işlem yapabilirsiniz. \n\
   \n\
-  Daha fazla ayrıntı için wiki sayfasına bakın [HYPERLINK:https://haveno.exchange/wiki/Account_limits].
+  Daha fazla ayrıntı için wiki sayfasına bakın [HYPERLINK:https://docs.haveno.exchange/the-project/account_limits].
   
 payment.cashDeposit.info=Lütfen bankanızın başka kişilerin hesaplarına nakit yatırma işlemlerine izin verdiğini onaylayın. \
   Örneğin, Bank of America ve Wells Fargo gibi bankalar bu tür yatırımlara artık izin vermemektedir.

core/src/main/resources/i18n/displayStrings_vi.properties

@@ -40,6 +40,8 @@ shared.buyMonero=Mua monero
 shared.sellMonero=Bán monero
 shared.buyCurrency=Mua {0}
 shared.sellCurrency=Bán {0}
+shared.buyCurrencyLocked=Mua {0} 🔒
+shared.sellCurrencyLocked=Bán {0} 🔒
 shared.buyingXMRWith=đang mua XMR với {0}
 shared.sellingXMRFor=đang bán XMR với {0}
 shared.buyingCurrency=đang mua {0} (đang bán XMR)
@@ -103,7 +105,7 @@ shared.faq=Visit FAQ page
 shared.yesCancel=Có, hủy
 shared.nextStep=Bước tiếp theo
 shared.selectTradingAccount=Chọn tài khoản giao dịch
-shared.fundFromSavingsWalletButton=Chuyển tiền từ Ví Haveno
+shared.fundFromSavingsWalletButton=Áp dụng tiền từ ví Haveno
 shared.fundFromExternalWalletButton=Mở ví ngoài để nộp tiền
 shared.openDefaultWalletFailed=Failed to open a Monero wallet application. Are you sure you have one installed?
 shared.belowInPercent=Thấp hơn % so với giá thị trường
@@ -186,7 +188,7 @@ shared.total=Tổng
 shared.totalsNeeded=Số tiền cần
 shared.tradeWalletAddress=Địa chỉ ví giao dịch
 shared.tradeWalletBalance=Số dư ví giao dịch
-shared.reserveExactAmount=Dự trữ chỉ số tiền cần thiết. Có thể yêu cầu một phí đào và 10 xác nhận (~20 phút) trước khi giao dịch của bạn trở nên hiệu lực.
+shared.reserveExactAmount=Chỉ giữ lại số tiền cần thiết. Yêu cầu phí khai thác và khoảng 20 phút trước khi đề nghị của bạn được công khai.
 shared.makerTxFee=Người tạo: {0}
 shared.takerTxFee=Người nhận: {0}
 shared.iConfirm=Tôi xác nhận
@@ -330,6 +332,7 @@ offerbook.createOffer=Tạo chào giá
 offerbook.takeOffer=Nhận chào giá
 offerbook.takeOfferToBuy=Nhận chào giá mua  {0}
 offerbook.takeOfferToSell=Nhận chào giá bán {0}
+offerbook.takeOffer.enterChallenge=Nhập mật khẩu đề nghị
 offerbook.trader=Trader
 offerbook.offerersBankId=ID ngân hàng của người tạo (BIC/SWIFT): {0}
 offerbook.offerersBankName=Tên ngân hàng của người tạo: {0}
@@ -339,7 +342,9 @@ offerbook.offerersAcceptedBankSeats=Các quốc gia có ngân hàng được ch
 offerbook.availableOffers=Các chào giá hiện có
 offerbook.filterByCurrency=Lọc theo tiền tệ
 offerbook.filterByPaymentMethod=Lọc theo phương thức thanh toán
-offerbook.matchingOffers=Offers matching my accounts
+offerbook.matchingOffers=Các ưu đãi phù hợp với tài khoản của tôi
+offerbook.filterNoDeposit=Không đặt cọc
+offerbook.noDepositOffers=Các ưu đãi không yêu cầu đặt cọc (cần mật khẩu)
 offerbook.timeSinceSigning=Account info
 offerbook.timeSinceSigning.info=This account was verified and {0}
 offerbook.timeSinceSigning.info.arbitrator=signed by an arbitrator and can sign peer accounts
@@ -457,7 +462,12 @@ createOffer.placeOfferButton=Kiểm tra:: Đặt báo giá cho {0} monero
 createOffer.createOfferFundWalletInfo.headline=Nộp tiền cho báo giá của bạn
 # suppress inspection "TrailingSpacesInProperty"
 createOffer.createOfferFundWalletInfo.tradeAmount=- Khoản tiền giao dịch: {0} \n
-createOffer.createOfferFundWalletInfo.msg=Bạn cần đặt cọc {0} cho báo giá này.\n\nCác khoản tiền này sẽ được giữ trong ví nội bộ của bạn và sẽ bị khóa vào địa chỉ đặt cọc multisig khi có người nhận báo giá của bạn.\n\nKhoản tiền này là tổng của:\n{1}- tiền gửi đại lý của bạn: {2}\n- Phí giao dịch: {3}\n- Phí đào: {4}\n\nBạn có thể chọn giữa hai phương án khi nộp tiền cho giao dịch:\n- Sử dụng ví Haveno của bạn (tiện lợi, nhưng giao dịch có thể bị kết nối) OR\n- Chuyển từ ví bên ngoài (riêng tư hơn)\n\nBạn sẽ xem các phương án nộp tiền và thông tin chi tiết sau khi đóng cửa sổ này.
+createOffer.createOfferFundWalletInfo.msg=Bạn cần nạp {0} cho lời đề nghị này.\n\n\
+  Số tiền này sẽ được giữ trong ví cục bộ của bạn và sẽ được khóa vào ví multisig ngay khi có người chấp nhận lời đề nghị của bạn.\n\n\
+  Số tiền bao gồm:\n\
+  {1}\
+  - Tiền đặt cọc bảo đảm của bạn: {2}\n\
+  - Phí giao dịch: {3}
 
 # only first part "An error occurred when placing the offer:" has been used before. We added now the rest (need update in existing translations!)
 createOffer.amountPriceBox.error.message=Có lỗi xảy ra khi đặt chào giá:\n\n{0}\n\nKhông còn tiền trong ví của bạn.\nHãy khởi động lại ứng dụng và kiểm tra kết nối mạng.
@@ -479,7 +489,10 @@ createOffer.setDepositAsBuyer=Cài đặt tiền đặt cọc của tôi với v
 createOffer.setDepositForBothTraders=Set both traders' security deposit (%)
 createOffer.securityDepositInfo=Số tiền đặt cọc cho người mua của bạn sẽ là  {0}
 createOffer.securityDepositInfoAsBuyer=Số tiền đặt cọc của bạn với vai trò người mua sẽ là  {0}
-createOffer.minSecurityDepositUsed=Min. buyer security deposit is used
+createOffer.minSecurityDepositUsed=Khoản tiền đặt cọc bảo mật tối thiểu được sử dụng
+createOffer.buyerAsTakerWithoutDeposit=Không cần đặt cọc từ người mua (được bảo vệ bằng mật khẩu)
+createOffer.myDeposit=Tiền đặt cọc bảo mật của tôi (%)
+createOffer.myDepositInfo=Khoản tiền đặt cọc của bạn sẽ là {0}
 
 
 ####################################################################
@@ -503,6 +516,8 @@ takeOffer.fundsBox.networkFee=Tổng phí đào
 takeOffer.fundsBox.takeOfferSpinnerInfo=Chấp nhận đề xuất: {0}
 takeOffer.fundsBox.paymentLabel=giao dịch Haveno có ID {0}
 takeOffer.fundsBox.fundsStructure=({0} tiền gửi đại lý, {1} phí giao dịch, {2} phí đào)
+takeOffer.fundsBox.noFundingRequiredTitle=Không cần tài trợ
+takeOffer.fundsBox.noFundingRequiredDescription=Lấy mật khẩu giao dịch từ người bán ngoài Haveno để nhận đề nghị này.
 takeOffer.success.headline=Bạn đã nhận báo giá thành công.
 takeOffer.success.info=Bạn có thể xem trạng thái giao dịch của bạn tại \"Portfolio/Các giao dịch mở\".
 takeOffer.error.message=Có lỗi xảy ra khi nhận báo giá.\n\n{0}
@@ -513,7 +528,7 @@ takeOffer.noPriceFeedAvailable=Bạn không thể nhận báo giá này do sử
 takeOffer.takeOfferFundWalletInfo.headline=Nộp tiền cho giao dịch của bạn
 # suppress inspection "TrailingSpacesInProperty"
 takeOffer.takeOfferFundWalletInfo.tradeAmount=- Giá trị giao dịch: {0} \n
-takeOffer.takeOfferFundWalletInfo.msg=Bạn cần nộp {0} để nhận báo giá này.\n\nGiá trị này là tổng của:\n{1}- Tiền ứng trước của bạn: {2}\n- phí giao dịch: {3}\n\nBạn có thể chọn một trong hai phương án khi nộp tiền cho giao dịch của bạn:\n- Sử dụng ví Haveno (tiện lợi, nhưng giao dịch có thể bị kết nối) OR\n- Chuyển từ ví ngoài (riêng tư hơn)\n\nBạn sẽ thấy các phương án nộp tiền và thông tin chi tiết sau khi đóng cửa sổ này.
+takeOffer.takeOfferFundWalletInfo.msg=Bạn cần phải deposit {0} để chấp nhận đề nghị này.\n\nSố tiền là tổng của:\n{1}- Khoản tiền đặt cọc của bạn: {2}\n- Phí giao dịch: {3}
 takeOffer.alreadyPaidInFunds=Bạn đã thanh toán, bạn có thể rút số tiền này tại màn hình \"Vốn/Gửi vốn\".
 takeOffer.paymentInfo=Thông tin thanh toán
 takeOffer.setAmountPrice=Cài đặt số tiền
@@ -1037,6 +1052,8 @@ settings.net.p2pHeader=Haveno network
 settings.net.onionAddressLabel=Địa chỉ onion của tôi
 settings.net.xmrNodesLabel=Sử dụng nút Monero thông dụng
 settings.net.moneroPeersLabel=Các đối tác được kết nối
+settings.net.connection=Kết nối
+settings.net.connected=Kết nối
 settings.net.useTorForXmrJLabel=Sử dụng Tor cho mạng Monero
 settings.net.moneroNodesLabel=nút Monero để kết nối
 settings.net.useProvidedNodesRadio=Sử dụng các nút Monero Core đã cung cấp
@@ -1456,6 +1473,7 @@ offerDetailsWindow.confirm.maker=Xác nhận: Đặt chào giá cho {0} monero
 offerDetailsWindow.confirm.taker=Xác nhận: Nhận chào giáo cho {0} monero
 offerDetailsWindow.creationDate=Ngày tạo
 offerDetailsWindow.makersOnion=Địa chỉ onion của người tạo
+offerDetailsWindow.challenge=Mã bảo vệ giao dịch
 
 qRCodeWindow.headline=QR Code
 qRCodeWindow.msg=Please use this QR code for funding your Haveno wallet from your external wallet.
@@ -1496,7 +1514,7 @@ tacWindow.disagree=Tôi không đồng ý và thoát
 tacWindow.arbitrationSystem=Dispute resolution
 
 tradeDetailsWindow.headline=giao dịch
-tradeDetailsWindow.disputedPayoutTxId=ID giao dịch hoàn tiền khiếu nại:
+tradeDetailsWindow.disputedPayoutTxId=ID giao dịch hoàn tiền khiếu nại
 tradeDetailsWindow.tradeDate=Ngày giao dịch
 tradeDetailsWindow.txFee=Phí đào
 tradeDetailsWindow.tradePeersOnion=Địa chỉ onion Đối tác giao dịch
@@ -1679,6 +1697,9 @@ popup.accountSigning.unsignedPubKeys.signed=Pubkeys were signed
 popup.accountSigning.unsignedPubKeys.result.signed=Signed pubkeys
 popup.accountSigning.unsignedPubKeys.result.failed=Failed to sign
 
+popup.info.buyerAsTakerWithoutDeposit.headline=Không cần đặt cọc từ người mua
+popup.info.buyerAsTakerWithoutDeposit=Lời đề nghị của bạn sẽ không yêu cầu khoản đặt cọc bảo mật hoặc phí từ người mua XMR.\n\nĐể chấp nhận lời đề nghị của bạn, bạn phải chia sẻ một mật khẩu với đối tác giao dịch ngoài Haveno.\n\nMật khẩu được tạo tự động và hiển thị trong chi tiết lời đề nghị sau khi tạo.
+
 ####################################################################
 # Notifications
 ####################################################################
@@ -1804,6 +1825,7 @@ navigation.support=\"Hỗ trợ\"
 
 formatter.formatVolumeLabel={0} giá trị {1}
 formatter.makerTaker=Người tạo là {0} {1} / Người nhận là {2} {3}
+formatter.makerTakerLocked=Người tạo là {0} {1} / Người nhận là {2} {3} 🔒
 formatter.youAreAsMaker=You are: {1} {0} (maker) / Taker is: {3} {2}
 formatter.youAreAsTaker=You are: {1} {0} (taker) / Maker is: {3} {2}
 formatter.youAre=Bạn là {0} {1} ({2} {3})
@@ -1959,9 +1981,9 @@ payment.moneyGram.info=When using MoneyGram the XMR buyer has to send the Author
 payment.westernUnion.info=When using Western Union the XMR buyer has to send the MTCN (tracking number) and a photo of the receipt by email to the XMR seller. The receipt must clearly show the seller's full name, city, country and the amount. The seller's email will be displayed to the buyer during the trade process.
 payment.halCash.info=Khi sử dụng HalCash người mua XMR cần phải gửi cho người bán XMR mã HalCash bằng tin nhắn điện thoại.\n\nVui lòng đảm bảo là lượng tiền này không vượt quá số lượng tối đa mà ngân hàng của bạn cho phép gửi khi dùng HalCash. Số lượng rút tối thiểu là 10 EUR và tối đa là 600 EUR. Nếu rút nhiều lần thì giới hạn sẽ là 3000 EUR/ người nhận/ ngày và 6000 EUR/người nhận/tháng. Vui lòng kiểm tra chéo những giới hạn này với ngân hàng của bạn để chắc chắn là họ cũng dùng những giới hạn như ghi ở đây.\n\nSố tiền rút phải là bội số của 10 EUR vì bạn không thể rút các mệnh giá khác từ ATM. Giao diện người dùng ở phần 'tạo chào giá' và 'chấp nhận chào giá' sẽ điều chỉnh lượng btc sao cho lượng EUR tương ứng sẽ chính xác. Bạn không thể dùng giá thị trường vì lượng EUR có thể sẽ thay đổi khi giá thay đổi.\n\nTrường hợp tranh chấp, người mua XMR cần phải cung cấp bằng chứng chứng minh mình đã gửi EUR.
 # suppress inspection "UnusedMessageFormatParameter"
-payment.limits.info=Please be aware that all bank transfers carry a certain amount of chargeback risk. To mitigate this risk, Haveno sets per-trade limits based on the estimated level of chargeback risk for the payment method used.\n\nFor this payment method, your per-trade limit for buying and selling is {2}.\n\nThis limit only applies to the size of a single trade—you can place as many trades as you like.\n\nSee more details on the wiki [HYPERLINK:https://haveno.exchange/wiki/Account_limits].
+payment.limits.info=Please be aware that all bank transfers carry a certain amount of chargeback risk. To mitigate this risk, Haveno sets per-trade limits based on the estimated level of chargeback risk for the payment method used.\n\nFor this payment method, your per-trade limit for buying and selling is {2}.\n\nThis limit only applies to the size of a single trade—you can place as many trades as you like.\n\nSee more details on the wiki [HYPERLINK:https://docs.haveno.exchange/the-project/account_limits].
 # suppress inspection "UnusedProperty"
-payment.limits.info.withSigning=To limit chargeback risk, Haveno sets per-trade limits for this payment account type based on the following 2 factors:\n\n1. General chargeback risk for the payment method\n2. Account signing status\n\nThis payment account is not yet signed, so it is limited to buying {0} per trade. After signing, buy limits will increase as follows:\n\n● Before signing, and for 30 days after signing, your per-trade buy limit will be {0}\n● 30 days after signing, your per-trade buy limit will be {1}\n● 60 days after signing, your per-trade buy limit will be {2}\n\nSell limits are not affected by account signing. You can sell {2} in a single trade immediately.\n\nThese limits only apply to the size of a single trade—you can place as many trades as you like. \n\nSee more details on the wiki [HYPERLINK:https://haveno.exchange/wiki/Account_limits].
+payment.limits.info.withSigning=To limit chargeback risk, Haveno sets per-trade limits for this payment account type based on the following 2 factors:\n\n1. General chargeback risk for the payment method\n2. Account signing status\n\nThis payment account is not yet signed, so it is limited to buying {0} per trade. After signing, buy limits will increase as follows:\n\n● Before signing, and for 30 days after signing, your per-trade buy limit will be {0}\n● 30 days after signing, your per-trade buy limit will be {1}\n● 60 days after signing, your per-trade buy limit will be {2}\n\nSell limits are not affected by account signing. You can sell {2} in a single trade immediately.\n\nThese limits only apply to the size of a single trade—you can place as many trades as you like. \n\nSee more details on the wiki [HYPERLINK:https://docs.haveno.exchange/the-project/account_limits].
 
 payment.cashDeposit.info=Vui lòng xác nhận rằng ngân hàng của bạn cho phép nạp tiền mặt vào tài khoản của người khác. Chẳng hạn, Ngân Hàng Mỹ và Wells Fargo không còn cho phép nạp tiền như vậy nữa.
 

core/src/main/resources/i18n/displayStrings_zh-hans.properties

@@ -40,6 +40,8 @@ shared.buyMonero=买入比特币
 shared.sellMonero=卖出比特币
 shared.buyCurrency=买入 {0}
 shared.sellCurrency=卖出 {0}
+shared.buyCurrencyLocked=买入 {0} 🔒
+shared.sellCurrencyLocked=卖出 {0} 🔒
 shared.buyingXMRWith=用 {0} 买入 XMR
 shared.sellingXMRFor=卖出 XMR 为 {0}
 shared.buyingCurrency=买入 {0}（卖出 XMR）
@@ -103,7 +105,7 @@ shared.faq=访问 FAQ 页面
 shared.yesCancel=是的，取消
 shared.nextStep=下一步
 shared.selectTradingAccount=选择交易账户
-shared.fundFromSavingsWalletButton=从 Haveno 钱包资金划转
+shared.fundFromSavingsWalletButton=从 Haveno 钱包申请资金
 shared.fundFromExternalWalletButton=从您的外部钱包充值
 shared.openDefaultWalletFailed=打开默认的比特币钱包应用程序失败了。您确定您安装了吗？
 shared.belowInPercent=低于市场价格 %
@@ -186,7 +188,7 @@ shared.total=合计
 shared.totalsNeeded=需要资金
 shared.tradeWalletAddress=交易钱包地址
 shared.tradeWalletBalance=交易钱包余额
-shared.reserveExactAmount=仅保留所需的资金。在您的交易生效前可能需要支付挖矿费和10次确认（约20分钟）。
+shared.reserveExactAmount=仅保留必要的资金。需要支付矿工费用，并且大约需要 20 分钟后您的报价才会生效。
 shared.makerTxFee=卖家：{0}
 shared.takerTxFee=买家：{0}
 shared.iConfirm=我确认
@@ -330,6 +332,7 @@ offerbook.createOffer=创建报价
 offerbook.takeOffer=接受报价
 offerbook.takeOfferToBuy=接受报价来收购 {0}
 offerbook.takeOfferToSell=接受报价来出售 {0}
+offerbook.takeOffer.enterChallenge=输入报价密码
 offerbook.trader=商人
 offerbook.offerersBankId=卖家的银行 ID（BIC/SWIFT）：{0}
 offerbook.offerersBankName=卖家的银行名称：{0}
@@ -339,7 +342,9 @@ offerbook.offerersAcceptedBankSeats=接受的银行所在国家（买家）：\n
 offerbook.availableOffers=可用报价
 offerbook.filterByCurrency=以货币筛选
 offerbook.filterByPaymentMethod=以支付方式筛选
-offerbook.matchingOffers=Offers matching my accounts
+offerbook.matchingOffers=匹配我的账户的报价
+offerbook.filterNoDeposit=无押金
+offerbook.noDepositOffers=无押金的报价（需要密码短语）
 offerbook.timeSinceSigning=账户信息
 offerbook.timeSinceSigning.info=此账户已验证，{0}
 offerbook.timeSinceSigning.info.arbitrator=由仲裁员验证，并可以验证伙伴账户
@@ -458,7 +463,12 @@ createOffer.placeOfferButton=复审：报价挂单 {0} 比特币
 createOffer.createOfferFundWalletInfo.headline=为您的报价充值
 # suppress inspection "TrailingSpacesInProperty"
 createOffer.createOfferFundWalletInfo.tradeAmount=- 交易数量：{0}\n
-createOffer.createOfferFundWalletInfo.msg=这个报价您需要 {0} 作为保证金。\n\n这些资金保留在您的本地钱包并会被冻结到多重验证保证金地址直到报价交易成功。\n\n总数量：{1}\n- 保证金：{2}\n- 挂单费：{3}\n- 矿工手续费：{4}\n\n您有两种选项可以充值您的交易：\n- 使用您的 Haveno 钱包（方便，但交易可能会被链接到）或者\n- 从外部钱包转入（或许这样更隐秘一些）\n\n关闭此弹出窗口后，您将看到所有资金选项和详细信息。
+createOffer.createOfferFundWalletInfo.msg=您需要为此报价存入 {0}。\n\n\
+  这些资金将保留在您的本地钱包中，并在有人接受您的报价后锁定到多签钱包中。\n\n\
+  金额是以下各项的总和：\n\
+  {1}\
+  - 您的保证金：{2}\n\
+  - 交易费用：{3}
 
 # only first part "An error occurred when placing the offer:" has been used before. We added now the rest (need update in existing translations!)
 createOffer.amountPriceBox.error.message=提交报价发生错误：\n\n{0}\n\n没有资金从您钱包中扣除。\n请检查您的互联网连接或尝试重启应用程序。
@@ -480,7 +490,10 @@ createOffer.setDepositAsBuyer=设置自己作为买家的保证金（%）
 createOffer.setDepositForBothTraders=设置双方的保证金比例（%）
 createOffer.securityDepositInfo=您的买家的保证金将会是 {0}
 createOffer.securityDepositInfoAsBuyer=您作为买家的保证金将会是 {0}
-createOffer.minSecurityDepositUsed=已使用最低买家保证金
+createOffer.minSecurityDepositUsed=最低安全押金已使用
+createOffer.buyerAsTakerWithoutDeposit=无需买家支付押金（使用口令保护）
+createOffer.myDeposit=我的安全押金 (%)
+createOffer.myDepositInfo=您的保证金为 {0}
 
 
 ####################################################################
@@ -504,6 +517,8 @@ takeOffer.fundsBox.networkFee=总共挖矿手续费
 takeOffer.fundsBox.takeOfferSpinnerInfo=接受报价：{0}
 takeOffer.fundsBox.paymentLabel=Haveno 交易 ID {0}
 takeOffer.fundsBox.fundsStructure=（{0} 保证金，{1} 交易费，{2} 采矿费）
+takeOffer.fundsBox.noFundingRequiredTitle=无需资金
+takeOffer.fundsBox.noFundingRequiredDescription=从卖方处获取交易密码（在Haveno之外）以接受此报价。
 takeOffer.success.headline=你已成功下单一个报价。
 takeOffer.success.info=你可以在“业务/未完成交易”页面内查看您的未完成交易。
 takeOffer.error.message=下单时发生了一个错误。\n\n{0}
@@ -514,7 +529,7 @@ takeOffer.noPriceFeedAvailable=您不能对这笔报价下单，因为它使用
 takeOffer.takeOfferFundWalletInfo.headline=为交易充值
 # suppress inspection "TrailingSpacesInProperty"
 takeOffer.takeOfferFundWalletInfo.tradeAmount=- 交易数量：{0}\n
-takeOffer.takeOfferFundWalletInfo.msg=这个报价您需要付出 {0} 保证金。\n\n这些资金保留在您的本地钱包并会被冻结到多重验证保证金地址直到报价交易成功。\n\n总数量：{1}\n- 保证金：{2}\n- 挂单费：{3}\n\n您有两种选项可以充值您的交易：\n- 使用您的 Haveno 钱包（方便，但交易可能会被链接到）或者\n- 从外部钱包转入（或许这样更隐秘一些）\n\n关闭此弹出窗口后，您将看到所有资金选项和详细信息。
+takeOffer.takeOfferFundWalletInfo.msg=您需要存入 {0} 以接受此报价。\n\n该金额为以下总和：\n{1}- 您的保证金：{2}\n- 交易费用：{3}
 takeOffer.alreadyPaidInFunds=如果你已经支付，你可以在“资金/提现”提现它。
 takeOffer.paymentInfo=付款信息
 takeOffer.setAmountPrice=设置数量
@@ -1038,6 +1053,8 @@ settings.net.p2pHeader=Haveno 网络
 settings.net.onionAddressLabel=我的匿名地址
 settings.net.xmrNodesLabel=使用自定义比特币主节点
 settings.net.moneroPeersLabel=已连接节点
+settings.net.connection=连接
+settings.net.connected=连接
 settings.net.useTorForXmrJLabel=使用 Tor 连接 Monero 网络
 settings.net.moneroNodesLabel=需要连接 Monero
 settings.net.useProvidedNodesRadio=使用公共比特币核心节点
@@ -1458,6 +1475,7 @@ offerDetailsWindow.confirm.maker=确定：发布报价 {0} 比特币
 offerDetailsWindow.confirm.taker=确定：下单买入 {0} 比特币
 offerDetailsWindow.creationDate=创建时间
 offerDetailsWindow.makersOnion=卖家的匿名地址
+offerDetailsWindow.challenge=提供密码
 
 qRCodeWindow.headline=二维码
 qRCodeWindow.msg=请使用二维码从外部钱包充值至 Haveno 钱包
@@ -1498,7 +1516,7 @@ tacWindow.disagree=我不同意并退出
 tacWindow.arbitrationSystem=纠纷解决方案
 
 tradeDetailsWindow.headline=交易
-tradeDetailsWindow.disputedPayoutTxId=纠纷支付交易 ID：
+tradeDetailsWindow.disputedPayoutTxId=纠纷支付交易 ID
 tradeDetailsWindow.tradeDate=交易时间
 tradeDetailsWindow.txFee=矿工手续费
 tradeDetailsWindow.tradePeersOnion=交易伙伴匿名地址
@@ -1686,6 +1704,9 @@ popup.accountSigning.unsignedPubKeys.signed=公钥已被验证
 popup.accountSigning.unsignedPubKeys.result.signed=已验证公钥
 popup.accountSigning.unsignedPubKeys.result.failed=未能验证公钥
 
+popup.info.buyerAsTakerWithoutDeposit.headline=买家无需支付保证金
+popup.info.buyerAsTakerWithoutDeposit=您的报价将不需要来自XMR买家的保证金或费用。\n\n要接受您的报价，您必须与交易伙伴在Haveno外共享一个密码短语。\n\n密码短语会自动生成，并在创建后显示在报价详情中。
+
 ####################################################################
 # Notifications
 ####################################################################
@@ -1811,6 +1832,7 @@ navigation.support=“帮助”
 
 formatter.formatVolumeLabel={0} 数量 {1}
 formatter.makerTaker=卖家 {0} {1} / 买家 {2} {3}
+formatter.makerTakerLocked=卖家 {0} {1} / 买家 {2} {3} 🔒
 formatter.youAreAsMaker=您是 {1} {0} 卖家 / 买家是 {3} {2}
 formatter.youAreAsTaker=您是 {1} {0} 买家 / 卖家是 {3} {2}
 formatter.youAre=您是 {0} {1} （{2} {3}）
@@ -1966,9 +1988,9 @@ payment.moneyGram.info=使用 MoneyGram 时，XMR 买方必须将授权号码和
 payment.westernUnion.info=使用 Western Union 时，XMR 买方必须通过电子邮件将 MTCN（运单号）和收据照片发送给 XMR 卖方。收据上必须清楚地显示卖方的全名、城市、国家或地区和金额。买方将在交易过程中显示卖方的电子邮件。
 payment.halCash.info=使用 HalCash 时，XMR 买方需要通过手机短信向 XMR 卖方发送 HalCash 代码。\n\n请确保不要超过银行允许您用半现金汇款的最高金额。每次取款的最低金额是 10 欧元，最高金额是 10 欧元。金额是 600 欧元。对于重复取款，每天每个接收者 3000 欧元，每月每个接收者 6000 欧元。请与您的银行核对这些限额，以确保它们使用与此处所述相同的限额。\n\n提现金额必须是 10 欧元的倍数，因为您不能从 ATM 机提取其他金额。 创建报价和下单屏幕中的 UI 将调整 XMR 金额，使 EUR 金额正确。你不能使用基于市场的价格，因为欧元的数量会随着价格的变化而变化。\n
 # suppress inspection "UnusedMessageFormatParameter"
-payment.limits.info=请注意，所有银行转账都有一定的退款风险。为了降低这一风险，Haveno 基于使用的付款方式的退款风险。\n\n对于付款方式，您的每笔交易的出售和购买的限额为{2}\n\n限制只应用在单笔交易，你可以尽可能多的进行交易。\n\n在 Haveno Wiki 查看更多信息[HYPERLINK:https://haveno.exchange/wiki/Account_limits]。
+payment.limits.info=请注意，所有银行转账都有一定的退款风险。为了降低这一风险，Haveno 基于使用的付款方式的退款风险。\n\n对于付款方式，您的每笔交易的出售和购买的限额为{2}\n\n限制只应用在单笔交易，你可以尽可能多的进行交易。\n\n在 Haveno Wiki 查看更多信息[HYPERLINK:https://docs.haveno.exchange/the-project/account_limits]。
 # suppress inspection "UnusedProperty"
-payment.limits.info.withSigning=为了降低这一风险，Haveno 基于两个因素对该付款方式每笔交易设置了限制：\n\n1. 使用的付款方法的预估退款风险水平\n2. 您的付款方式的账龄\n\n这个付款账户还没有被验证，所以他每个交易最多购买{0}。在验证之后，购买限制会以以下规则逐渐增加：\n\n●签署前，以及签署后30天内，您的每笔最大交易将限制为{0}\n●签署后30天，每笔最大交易将限制为{1}\n●签署后60天，每笔最大交易将限制为{2}\n\n出售限制不会被账户验证状态限制，你可以理科进行单笔为{2}的交易\n\n限制只应用在单笔交易，你可以尽可能多的进行交易。\n\n在 Haveno Wiki 上查看更多：\nhttps://haveno.exchange/wiki/Account_limits
+payment.limits.info.withSigning=为了降低这一风险，Haveno 基于两个因素对该付款方式每笔交易设置了限制：\n\n1. 使用的付款方法的预估退款风险水平\n2. 您的付款方式的账龄\n\n这个付款账户还没有被验证，所以他每个交易最多购买{0}。在验证之后，购买限制会以以下规则逐渐增加：\n\n●签署前，以及签署后30天内，您的每笔最大交易将限制为{0}\n●签署后30天，每笔最大交易将限制为{1}\n●签署后60天，每笔最大交易将限制为{2}\n\n出售限制不会被账户验证状态限制，你可以理科进行单笔为{2}的交易\n\n限制只应用在单笔交易，你可以尽可能多的进行交易。\n\n在 Haveno Wiki 上查看更多：\nhttps://docs.haveno.exchange/the-project/account_limits
 
 payment.cashDeposit.info=请确认您的银行允许您将现金存款汇入他人账户。例如，美国银行和富国银行不再允许此类存款。
 

core/src/main/resources/i18n/displayStrings_zh-hant.properties

@@ -40,6 +40,8 @@ shared.buyMonero=買入比特幣
 shared.sellMonero=賣出比特幣
 shared.buyCurrency=買入 {0}
 shared.sellCurrency=賣出 {0}
+shared.buyCurrencyLocked=買入 {0} 🔒
+shared.sellCurrencyLocked=賣出 {0} 🔒
 shared.buyingXMRWith=用 {0} 買入 XMR
 shared.sellingXMRFor=賣出 XMR 為 {0}
 shared.buyingCurrency=買入 {0}（賣出 XMR）
@@ -103,7 +105,7 @@ shared.faq=訪問 FAQ 頁面
 shared.yesCancel=是的，取消
 shared.nextStep=下一步
 shared.selectTradingAccount=選擇交易賬户
-shared.fundFromSavingsWalletButton=從 Haveno 錢包資金劃轉
+shared.fundFromSavingsWalletButton=從 Haveno 錢包申請資金
 shared.fundFromExternalWalletButton=從您的外部錢包充值
 shared.openDefaultWalletFailed=打開默認的比特幣錢包應用程序失敗了。您確定您安裝了嗎？
 shared.belowInPercent=低於市場價格 %
@@ -186,7 +188,7 @@ shared.total=合計
 shared.totalsNeeded=需要資金
 shared.tradeWalletAddress=交易錢包地址
 shared.tradeWalletBalance=交易錢包餘額
-shared.reserveExactAmount=僅保留所需的資金。在您的交易生效前可能需要支付礦工費和 10 次確認（約20分鐘）。
+shared.reserveExactAmount=僅保留必要的資金。需支付礦工費，約 20 分鐘後您的報價才會上線。
 shared.makerTxFee=賣家：{0}
 shared.takerTxFee=買家：{0}
 shared.iConfirm=我確認
@@ -330,6 +332,7 @@ offerbook.createOffer=創建報價
 offerbook.takeOffer=接受報價
 offerbook.takeOfferToBuy=接受報價來收購 {0}
 offerbook.takeOfferToSell=接受報價來出售 {0}
+offerbook.takeOffer.enterChallenge=輸入報價密碼
 offerbook.trader=商人
 offerbook.offerersBankId=賣家的銀行 ID（BIC/SWIFT）：{0}
 offerbook.offerersBankName=賣家的銀行名稱：{0}
@@ -339,7 +342,9 @@ offerbook.offerersAcceptedBankSeats=接受的銀行所在國家（買家）：\n
 offerbook.availableOffers=可用報價
 offerbook.filterByCurrency=以貨幣篩選
 offerbook.filterByPaymentMethod=以支付方式篩選
-offerbook.matchingOffers=Offers matching my accounts
+offerbook.matchingOffers=符合我的帳戶的報價
+offerbook.filterNoDeposit=無押金
+offerbook.noDepositOffers=無押金的報價（需要密碼短語）
 offerbook.timeSinceSigning=賬户信息
 offerbook.timeSinceSigning.info=此賬户已驗證，{0}
 offerbook.timeSinceSigning.info.arbitrator=由仲裁員驗證，並可以驗證夥伴賬户
@@ -458,7 +463,12 @@ createOffer.placeOfferButton=複審：報價掛單 {0} 比特幣
 createOffer.createOfferFundWalletInfo.headline=為您的報價充值
 # suppress inspection "TrailingSpacesInProperty"
 createOffer.createOfferFundWalletInfo.tradeAmount=- 交易數量：{0}\n
-createOffer.createOfferFundWalletInfo.msg=這個報價您需要 {0} 作為保證金。\n\n這些資金保留在您的本地錢包並會被凍結到多重驗證保證金地址直到報價交易成功。\n\n總數量：{1}\n- 保證金：{2}\n- 掛單費：{3}\n- 礦工手續費：{4}\n\n您有兩種選項可以充值您的交易：\n- 使用您的 Haveno 錢包（方便，但交易可能會被鏈接到）或者\n- 從外部錢包轉入（或許這樣更隱祕一些）\n\n關閉此彈出窗口後，您將看到所有資金選項和詳細信息。
+createOffer.createOfferFundWalletInfo.msg=您需要為此報價存入 {0}。\n\n\
+  這些資金會保留在您的本地錢包中，並在有人接受您的報價後鎖定到多重簽名錢包中。\n\n\
+  金額總和為：\n\
+  {1}\
+  - 您的保證金：{2}\n\
+  - 交易費：{3}
 
 # only first part "An error occurred when placing the offer:" has been used before. We added now the rest (need update in existing translations!)
 createOffer.amountPriceBox.error.message=提交報價發生錯誤：\n\n{0}\n\n沒有資金從您錢包中扣除。\n請檢查您的互聯網連接或嘗試重啟應用程序。
@@ -480,7 +490,10 @@ createOffer.setDepositAsBuyer=設置自己作為買家的保證金（%）
 createOffer.setDepositForBothTraders=設置雙方的保證金比例（%）
 createOffer.securityDepositInfo=您的買家的保證金將會是 {0}
 createOffer.securityDepositInfoAsBuyer=您作為買家的保證金將會是 {0}
-createOffer.minSecurityDepositUsed=已使用最低買家保證金
+createOffer.minSecurityDepositUsed=最低保證金已使用
+createOffer.buyerAsTakerWithoutDeposit=買家無需支付保證金（通行密碼保護）
+createOffer.myDeposit=我的保證金（%）
+createOffer.myDepositInfo=您的保證金將為 {0}
 
 
 ####################################################################
@@ -504,6 +517,8 @@ takeOffer.fundsBox.networkFee=總共挖礦手續費
 takeOffer.fundsBox.takeOfferSpinnerInfo=接受報價：{0}
 takeOffer.fundsBox.paymentLabel=Haveno 交易 ID {0}
 takeOffer.fundsBox.fundsStructure=（{0} 保證金，{1} 交易費，{2} 採礦費）
+takeOffer.fundsBox.noFundingRequiredTitle=無需資金
+takeOffer.fundsBox.noFundingRequiredDescription=從賣家那裡在 Haveno 之外獲取優惠密碼以接受此優惠。
 takeOffer.success.headline=你已成功下單一個報價。
 takeOffer.success.info=你可以在“業務/未完成交易”頁面內查看您的未完成交易。
 takeOffer.error.message=下單時發生了一個錯誤。\n\n{0}
@@ -514,7 +529,7 @@ takeOffer.noPriceFeedAvailable=您不能對這筆報價下單，因為它使用
 takeOffer.takeOfferFundWalletInfo.headline=為交易充值
 # suppress inspection "TrailingSpacesInProperty"
 takeOffer.takeOfferFundWalletInfo.tradeAmount=- 交易數量：{0}\n
-takeOffer.takeOfferFundWalletInfo.msg=這個報價您需要付出 {0} 保證金。\n\n這些資金保留在您的本地錢包並會被凍結到多重驗證保證金地址直到報價交易成功。\n\n總數量：{1}\n- 保證金：{2}\n- 掛單費：{3}\n\n您有兩種選項可以充值您的交易：\n- 使用您的 Haveno 錢包（方便，但交易可能會被鏈接到）或者\n- 從外部錢包轉入（或許這樣更隱祕一些）\n\n關閉此彈出窗口後，您將看到所有資金選項和詳細信息。
+takeOffer.takeOfferFundWalletInfo.msg=您需要存入 {0} 才能接受此報價。\n\n該金額是以下總和：\n{1}- 您的保證金：{2}\n- 交易費用：{3}
 takeOffer.alreadyPaidInFunds=如果你已經支付，你可以在“資金/提現”提現它。
 takeOffer.paymentInfo=付款信息
 takeOffer.setAmountPrice=設置數量
@@ -1038,6 +1053,8 @@ settings.net.p2pHeader=Haveno 網絡
 settings.net.onionAddressLabel=我的匿名地址
 settings.net.xmrNodesLabel=使用自定义Monero节点
 settings.net.moneroPeersLabel=已連接節點
+settings.net.connection=連接
+settings.net.connected=連接完成
 settings.net.useTorForXmrJLabel=使用 Tor 連接 Monero 網絡
 settings.net.moneroNodesLabel=需要連接 Monero
 settings.net.useProvidedNodesRadio=使用公共比特幣核心節點
@@ -1458,6 +1475,7 @@ offerDetailsWindow.confirm.maker=確定：發佈報價 {0} 比特幣
 offerDetailsWindow.confirm.taker=確定：下單買入 {0} 比特幣
 offerDetailsWindow.creationDate=創建時間
 offerDetailsWindow.makersOnion=賣家的匿名地址
+offerDetailsWindow.challenge=提供密碼
 
 qRCodeWindow.headline=二維碼
 qRCodeWindow.msg=請使用二維碼從外部錢包充值至 Haveno 錢包
@@ -1498,7 +1516,7 @@ tacWindow.disagree=我不同意並退出
 tacWindow.arbitrationSystem=糾紛解決方案
 
 tradeDetailsWindow.headline=交易
-tradeDetailsWindow.disputedPayoutTxId=糾紛支付交易 ID：
+tradeDetailsWindow.disputedPayoutTxId=糾紛支付交易 ID
 tradeDetailsWindow.tradeDate=交易時間
 tradeDetailsWindow.txFee=礦工手續費
 tradeDetailsWindow.tradePeersOnion=交易夥伴匿名地址
@@ -1680,6 +1698,9 @@ popup.accountSigning.unsignedPubKeys.signed=公鑰已被驗證
 popup.accountSigning.unsignedPubKeys.result.signed=已驗證公鑰
 popup.accountSigning.unsignedPubKeys.result.failed=未能驗證公鑰
 
+popup.info.buyerAsTakerWithoutDeposit.headline=買家無需支付保證金
+popup.info.buyerAsTakerWithoutDeposit=您的報價不需要來自XMR買家的保證金或費用。\n\n要接受您的報價，您必須與您的交易夥伴在Haveno之外分享密碼短語。\n\n密碼短語會自動生成並在報價創建後顯示在報價詳情中。
+
 ####################################################################
 # Notifications
 ####################################################################
@@ -1805,6 +1826,7 @@ navigation.support=“幫助”
 
 formatter.formatVolumeLabel={0} 數量 {1}
 formatter.makerTaker=賣家 {0} {1} / 買家 {2} {3}
+formatter.makerTakerLocked=賣家 {0} {1} / 買家 {2} {3} 🔒
 formatter.youAreAsMaker=You are: {1} {0} (maker) / Taker is: {3} {2}
 formatter.youAreAsTaker=You are: {1} {0} (taker) / Maker is: {3} {2}
 formatter.youAre=您是 {0} {1} （{2} {3}）
@@ -1960,9 +1982,9 @@ payment.moneyGram.info=使用 MoneyGram 時，XMR 買方必須將授權號碼和
 payment.westernUnion.info=使用 Western Union 時，XMR 買方必須通過電子郵件將 MTCN（運單號）和收據照片發送給 XMR 賣方。收據上必須清楚地顯示賣方的全名、城市、國家或地區和金額。買方將在交易過程中顯示賣方的電子郵件。
 payment.halCash.info=使用 HalCash 時，XMR 買方需要通過手機短信向 XMR 賣方發送 HalCash 代碼。\n\n請確保不要超過銀行允許您用半現金匯款的最高金額。每次取款的最低金額是 10 歐元，最高金額是 10 歐元。金額是 600 歐元。對於重複取款，每天每個接收者 3000 歐元，每月每個接收者 6000 歐元。請與您的銀行核對這些限額，以確保它們使用與此處所述相同的限額。\n\n提現金額必須是 10 歐元的倍數，因為您不能從 ATM 機提取其他金額。 創建報價和下單屏幕中的 UI 將調整 XMR 金額，使 EUR 金額正確。你不能使用基於市場的價格，因為歐元的數量會隨着價格的變化而變化。\n
 # suppress inspection "UnusedMessageFormatParameter"
-payment.limits.info=請注意，所有銀行轉賬都有一定的退款風險。為了降低這一風險，Haveno 基於使用的付款方式的退款風險。\n\n對於付款方式，您的每筆交易的出售和購買的限額為{2}\n\n限制只應用在單筆交易，你可以儘可能多的進行交易。\n\n在 Haveno Wiki 查看更多信息[HYPERLINK:https://haveno.exchange/wiki/Account_limits]。
+payment.limits.info=請注意，所有銀行轉賬都有一定的退款風險。為了降低這一風險，Haveno 基於使用的付款方式的退款風險。\n\n對於付款方式，您的每筆交易的出售和購買的限額為{2}\n\n限制只應用在單筆交易，你可以儘可能多的進行交易。\n\n在 Haveno Wiki 查看更多信息[HYPERLINK:https://docs.haveno.exchange/the-project/account_limits]。
 # suppress inspection "UnusedProperty"
-payment.limits.info.withSigning=為了降低這一風險，Haveno 基於兩個因素對該付款方式每筆交易設置了限制：\n\n1. 使用的付款方法的預估退款風險水平\n2. 您的付款方式的賬齡\n\n這個付款賬户還沒有被驗證，所以他每個交易最多購買{0}。在驗證之後，購買限制會以以下規則逐漸增加：\n\n●簽署前，以及簽署後30天內，您的每筆最大交易將限制為{0}\n●簽署後30天，每筆最大交易將限制為{1}\n●簽署後60天，每筆最大交易將限制為{2}\n\n出售限制不會被賬户驗證狀態限制，你可以理科進行單筆為{2}的交易\n\n限制只應用在單筆交易，你可以儘可能多的進行交易。\n\n在 Haveno Wiki 上查看更多：\nhttps://haveno.exchange/wiki/Account_limits
+payment.limits.info.withSigning=為了降低這一風險，Haveno 基於兩個因素對該付款方式每筆交易設置了限制：\n\n1. 使用的付款方法的預估退款風險水平\n2. 您的付款方式的賬齡\n\n這個付款賬户還沒有被驗證，所以他每個交易最多購買{0}。在驗證之後，購買限制會以以下規則逐漸增加：\n\n●簽署前，以及簽署後30天內，您的每筆最大交易將限制為{0}\n●簽署後30天，每筆最大交易將限制為{1}\n●簽署後60天，每筆最大交易將限制為{2}\n\n出售限制不會被賬户驗證狀態限制，你可以理科進行單筆為{2}的交易\n\n限制只應用在單筆交易，你可以儘可能多的進行交易。\n\n在 Haveno Wiki 上查看更多：\nhttps://docs.haveno.exchange/the-project/account_limits
 
 payment.cashDeposit.info=請確認您的銀行允許您將現金存款匯入他人賬户。例如，美國銀行和富國銀行不再允許此類存款。
 

daemon/src/main/java/haveno/daemon/grpc/GrpcOffersService.java

@@ -150,10 +150,12 @@ class GrpcOffersService extends OffersImplBase {
                     req.getMarketPriceMarginPct(),
                     req.getAmount(),
                     req.getMinAmount(),
-                    req.getBuyerSecurityDepositPct(),
+                    req.getSecurityDepositPct(),
                     req.getTriggerPrice(),
                     req.getReserveExactAmount(),
                     req.getPaymentAccountId(),
+                    req.getIsPrivateOffer(),
+                    req.getBuyerAsTakerWithoutDeposit(),
                     offer -> {
                         // This result handling consumer's accept operation will return
                         // the new offer to the gRPC client after async placement is done.
@@ -202,9 +204,9 @@ class GrpcOffersService extends OffersImplBase {
                         new HashMap<>() {{
                             put(getGetOfferMethod().getFullMethodName(), new GrpcCallRateMeter(Config.baseCurrencyNetwork().isTestnet() ? 10 : 1, SECONDS));
                             put(getGetMyOfferMethod().getFullMethodName(), new GrpcCallRateMeter(Config.baseCurrencyNetwork().isTestnet() ? 10 : 1, SECONDS));
-                            put(getGetOffersMethod().getFullMethodName(), new GrpcCallRateMeter(Config.baseCurrencyNetwork().isTestnet() ? 20 : 1, SECONDS));
-                            put(getGetMyOffersMethod().getFullMethodName(), new GrpcCallRateMeter(Config.baseCurrencyNetwork().isTestnet() ? 20 : 3, Config.baseCurrencyNetwork().isTestnet() ? SECONDS : MINUTES));
-                            put(getPostOfferMethod().getFullMethodName(), new GrpcCallRateMeter(Config.baseCurrencyNetwork().isTestnet() ? 20 : 3, Config.baseCurrencyNetwork().isTestnet() ? SECONDS : MINUTES));
+                            put(getGetOffersMethod().getFullMethodName(), new GrpcCallRateMeter(Config.baseCurrencyNetwork().isTestnet() ? 30 : 1, SECONDS));
+                            put(getGetMyOffersMethod().getFullMethodName(), new GrpcCallRateMeter(Config.baseCurrencyNetwork().isTestnet() ? 30 : 3, Config.baseCurrencyNetwork().isTestnet() ? SECONDS : MINUTES));
+                            put(getPostOfferMethod().getFullMethodName(), new GrpcCallRateMeter(Config.baseCurrencyNetwork().isTestnet() ? 30 : 3, Config.baseCurrencyNetwork().isTestnet() ? SECONDS : MINUTES));
                             put(getCancelOfferMethod().getFullMethodName(), new GrpcCallRateMeter(Config.baseCurrencyNetwork().isTestnet() ? 10 : 3, Config.baseCurrencyNetwork().isTestnet() ? SECONDS : MINUTES));
                         }}
                 )));

daemon/src/main/java/haveno/daemon/grpc/GrpcTradesService.java

@@ -138,6 +138,7 @@ class GrpcTradesService extends TradesImplBase {
             coreApi.takeOffer(req.getOfferId(),
                     req.getPaymentAccountId(),
                     req.getAmount(),
+                    req.getChallenge(),
                     trade -> {
                         TradeInfo tradeInfo = toTradeInfo(trade);
                         var reply = TakeOfferReply.newBuilder()