From 966502247bf495283d2cac02a5def7e6fb32db51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Louck=C3=BD?= Date: Sat, 23 Jan 2021 19:21:49 +0100 Subject: [PATCH 1/4] Fix spaces in "Cash by Mail" --- core/src/main/resources/i18n/displayStrings.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index ce288a46588..9c2c20bd158 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/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 From 803d373e44d105a0e98bfaf099917e08898c3965 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Louck=C3=BD?= Date: Sat, 23 Jan 2021 23:01:42 +0100 Subject: [PATCH 2/4] Add details about mediation in "Cash by mail" --- .../src/main/resources/i18n/displayStrings.properties | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index 9c2c20bd158..b74f2daf6bf 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -3326,7 +3326,16 @@ 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 lose both trading and 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\ From fafa81811b58752ed9b8750fe3b7d6e0428f4c66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Louck=C3=BD?= Date: Sat, 23 Jan 2021 23:46:09 +0100 Subject: [PATCH 3/4] Fix wording --- core/src/main/resources/i18n/displayStrings.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index b74f2daf6bf..ba61d8d0c5f 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -3333,7 +3333,7 @@ payment.cashByMail.info=Trading using cash-by-mail (CBM) on Bisq requires that y ● 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 lose both trading and deposit funds.\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\ From e2de30a6e4e756a5080e811907ea2e5b7a131dbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Louck=C3=BD?= Date: Sat, 23 Jan 2021 23:46:48 +0100 Subject: [PATCH 4/4] Resolve unintended ellipsis. Make popup wider. --- .../main/account/content/fiataccounts/FiatAccountsView.java | 2 +- desktop/src/main/java/bisq/desktop/main/overlays/Overlay.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java b/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java index 75e4d59d6e4..7330a398de9 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java +++ b/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java @@ -251,7 +251,7 @@ private void onSaveNewAccount(PaymentAccount paymentAccount) { } else if (paymentAccount instanceof CashByMailAccount) { // CashByMail has no chargeback risk so we don't show the text from payment.limits.info. new Popup().information(Res.get("payment.cashByMail.info")) - .width(700) + .width(850) .closeButtonText(Res.get("shared.cancel")) .actionButtonText(Res.get("shared.iUnderstand")) .onAction(() -> doSaveNewAccount(paymentAccount)) diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/Overlay.java b/desktop/src/main/java/bisq/desktop/main/overlays/Overlay.java index b43aaab917e..ec724eb2c63 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/Overlay.java +++ b/desktop/src/main/java/bisq/desktop/main/overlays/Overlay.java @@ -189,7 +189,7 @@ protected enum Type { protected Timer centerTime; protected Type type = Type.Undefined; - protected int maxChar = 1800; + protected int maxChar = 2200; private T cast() { //noinspection unchecked