From c619860d4d95f09aac48a2af75537ecdb5c42539 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Fri, 15 Feb 2019 13:20:01 -0500 Subject: [PATCH 1/2] Add info popup for BEAM accounts. Improve GRIN info popup text. --- .../src/main/java/bisq/asset/coins/Beam.java | 2 ++ .../resources/i18n/displayStrings.properties | 19 +++++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/assets/src/main/java/bisq/asset/coins/Beam.java b/assets/src/main/java/bisq/asset/coins/Beam.java index ae233aad84..99fa273e02 100644 --- a/assets/src/main/java/bisq/asset/coins/Beam.java +++ b/assets/src/main/java/bisq/asset/coins/Beam.java @@ -17,6 +17,7 @@ package bisq.asset.coins; +import bisq.asset.AltCoinAccountDisclaimer; import bisq.asset.Coin; import bisq.asset.RegexAddressValidator; @@ -30,6 +31,7 @@ import bisq.asset.RegexAddressValidator; * but it's a more complex test, requiring cryptographic code. * */ +@AltCoinAccountDisclaimer("account.altcoin.popup.beam.msg") public class Beam extends Coin { public Beam() { super("Beam", "BEAM", new RegexAddressValidator("^([0-9a-f]{1,80})$")); diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index 4a1825cfc9..a336433561 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -1075,12 +1075,23 @@ account.altcoin.popup.ZEC.msg=When using Zcash you can only use the transparent the z-addresses (private), because the arbitrator would not be able to verify the transaction with z-addresses. account.altcoin.popup.XZC.msg=When using Zcoin you can only use the transparent (traceable) addresses not \ the untraceable addresses, because the arbitrator would not be able to verify the transaction with untraceable addresses at a block explorer. -account.altcoin.popup.grin.msg=Bisq supports only the Grinbox (Wallet713) wallet URL format. Please be sure that you use the \ - latest Grinbox release and understand the process of transferring and receiving GRIN. \ - The GRIN sender is required to provide a proof that they sent GRIN successfully. If they cannot provide the proof a \ - potential dispute will be resolved in favor to the GRIN receiver. \n\n\ +account.altcoin.popup.grin.msg=GRIN requires an interactive process between the sender and receiver to create the \ + transaction. Be sure to follow the instructions from the GRIN project web page to reliably send and receive GRIN \ + (the receiver need to be online or at least be online in a certain time frame). \n\n\ + Bisq supports only the Grinbox (Wallet713) wallet URL format. \n\n\ + The GRIN sender is required to provide a proof that they have sent GRIN successfully. If they cannot provide that proof, a \ + potential dispute will be resolved in favor to the GRIN receiver. Please be sure that you use the \ + latest Grinbox software which supports the transaction proof and that you understand the process of transferring and \ + receiving GRIN as well as how to create the proof. \n\n\ See https://github.com/vault713/wallet713/blob/master/docs/usage.md#transaction-proofs-grinbox-only for more \ information about the Grinbox proof tool. +account.altcoin.popup.beam.msg=BEAM requires an interactive process between the sender and receiver to create the \ + transaction. \n\n\ + Be sure to follow the instructions from the BEAM project web page to reliably send and receive BEAM \ + (the receiver need to be online or at least be online in a certain time frame). \n\n\ + The BEAM sender is required to provide a proof that they sent BEAM successfully. \ + Be sure to use wallet software which can produce such a proof. If they cannot provide the proof a potential \ + dispute will be resolved in favor to the BEAM receiver. account.fiat.yourFiatAccounts=Your national currency accounts From 6a41517ad3744e1b9c2e9e9b0635e3f97bdd59c2 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Sat, 16 Feb 2019 19:37:13 -0500 Subject: [PATCH 2/2] Improve text --- .../main/resources/i18n/displayStrings.properties | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index a336433561..df64405946 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -1077,10 +1077,10 @@ account.altcoin.popup.XZC.msg=When using Zcoin you can only use the transparent the untraceable addresses, because the arbitrator would not be able to verify the transaction with untraceable addresses at a block explorer. account.altcoin.popup.grin.msg=GRIN requires an interactive process between the sender and receiver to create the \ transaction. Be sure to follow the instructions from the GRIN project web page to reliably send and receive GRIN \ - (the receiver need to be online or at least be online in a certain time frame). \n\n\ + (the receiver needs to be online or at least be online during a certain time frame). \n\n\ Bisq supports only the Grinbox (Wallet713) wallet URL format. \n\n\ - The GRIN sender is required to provide a proof that they have sent GRIN successfully. If they cannot provide that proof, a \ - potential dispute will be resolved in favor to the GRIN receiver. Please be sure that you use the \ + The GRIN sender is required to provide proof that they have sent GRIN successfully. If the wallet cannot provide that proof, a \ + potential dispute will be resolved in favor of the GRIN receiver. Please be sure that you use the \ latest Grinbox software which supports the transaction proof and that you understand the process of transferring and \ receiving GRIN as well as how to create the proof. \n\n\ See https://github.com/vault713/wallet713/blob/master/docs/usage.md#transaction-proofs-grinbox-only for more \ @@ -1088,10 +1088,10 @@ account.altcoin.popup.grin.msg=GRIN requires an interactive process between the account.altcoin.popup.beam.msg=BEAM requires an interactive process between the sender and receiver to create the \ transaction. \n\n\ Be sure to follow the instructions from the BEAM project web page to reliably send and receive BEAM \ - (the receiver need to be online or at least be online in a certain time frame). \n\n\ - The BEAM sender is required to provide a proof that they sent BEAM successfully. \ - Be sure to use wallet software which can produce such a proof. If they cannot provide the proof a potential \ - dispute will be resolved in favor to the BEAM receiver. + (the receiver needs to be online or at least be online during a certain time frame). \n\n\ + The BEAM sender is required to provide proof that they sent BEAM successfully. \ + Be sure to use wallet software which can produce such a proof. If the wallet cannot provide the proof a potential \ + dispute will be resolved in favor of the BEAM receiver. account.fiat.yourFiatAccounts=Your national currency accounts