mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-23 15:00:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2423 from ManfredKarrer/add-beam-popup

Browse source 
Add info popup for BEAM accounts. Improve GRIN info popup text.
This commit is contained in:
Manfred Karrer 2019-02-16 19:46:23 -05:00 • committed by GitHub
commit 5d157832be
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets/src/main/java/bisq/asset/coins/Beam.java
View file

@ -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})$"));

19
core/src/main/resources/i18n/displayStrings.properties
View file

@ -1087,12 +1087,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 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 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 \
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 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