Release/v1.5.5

build.gradle

@@ -386,7 +386,7 @@ configure(project(':desktop')) {
     apply plugin: 'witness'
     apply from: '../gradle/witness/gradle-witness.gradle'
 
-    version = '1.5.4-SNAPSHOT'
+    version = '1.5.5-SNAPSHOT'
 
     mainClassName = 'bisq.desktop.app.BisqAppMain'
 

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

@@ -30,14 +30,14 @@ public class Version {
     // VERSION = 0.5.0 introduces proto buffer for the P2P network and local DB and is a not backward compatible update
     // Therefore all sub versions start again with 1
     // We use semantic versioning with major, minor and patch
-    public static final String VERSION = "1.5.4";
+    public static final String VERSION = "1.5.5";
 
     /**
      * Holds a list of the tagged resource files for optimizing the getData requests.
      * This must not contain each version but only those where we add new version-tagged resource files for
      * historical data stores.
      */
-    public static final List<String> HISTORICAL_RESOURCE_FILE_VERSION_TAGS = Arrays.asList("1.4.0", "1.5.0", "1.5.2");
+    public static final List<String> HISTORICAL_RESOURCE_FILE_VERSION_TAGS = Arrays.asList("1.4.0", "1.5.0", "1.5.2", "1.5.5");
 
     public static int getMajorVersion(String version) {
         return getSubVersion(version, 0);

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

@@ -661,8 +661,8 @@ portfolio.pending.step2_buyer.amazonGiftCard=Please purchase an Amazon eGift Car
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal=Please send {0} by \"US Postal Money Order\" to the BTC seller.\n\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.cashByMail=Please send {0} using \"Cash by Mail\" to the BTC seller.  \
-  Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat.\
+portfolio.pending.step2_buyer.cashByMail=Please send {0} using \"Cash by Mail\" to the BTC seller. \
+  Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. \
   See more details about Cash by Mail on the Bisq wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.pay=Please pay {0} via the specified payment method to the BTC seller. You''ll find the seller's account details on the next screen.\n\n
@@ -3326,14 +3326,23 @@ payment.cashByMail.info=Trading using cash-by-mail (CBM) on Bisq requires that y
   ● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n\
   ● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n\
   ● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\
-  ● MEDIATORS CANNOT MAKE JUDGEMENTS IN CBM DISPUTES. But they can help with smaller problems such as technical difficulties not related to scam attempts.\n\
+  \n\
+  CBM trades put the onus to act honestly squarely on both peers.\n\
+  \n\
+  ● CBM trades have less verifiable actions than other fiat trades. This makes handling dispute much harder.\n\
+  ● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n\
+  ● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n\
+  ● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Bisq 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n\
+  ● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n\
+  ● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n\
+  ● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Bisq DAO will NOT be considered.\n\
   \n\
   To be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\
   \n\
   If you do not understand these requirements, do not trade using CBM on Bisq.
 
 payment.cashByMail.contact=Contact info
-payment.cashByMail.contact.prompt=Your contact information such as name or nym
+payment.cashByMail.contact.prompt=Name or nym envelope should be addressed to
 payment.f2f.contact=Contact info
 payment.f2f.contact.prompt=How would you like to be contacted by the trading peer? (email address, phone number,...)
 payment.f2f.city=City for 'Face to face' meeting