Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add info popup for BEAM accounts. Improve GRIN info popup text. #2423

Merged
merged 2 commits into from
Feb 17, 2019
Merged

Add info popup for BEAM accounts. Improve GRIN info popup text. #2423

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c619860
Add info popup for BEAM accounts. Improve GRIN info popup text.
ManfredKarrer Feb 15, 2019
6a41517
Improve text
ManfredKarrer Feb 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions assets/src/main/java/bisq/asset/coins/Beam.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package bisq.asset.coins;

import bisq.asset.AltCoinAccountDisclaimer;
import bisq.asset.Coin;
import bisq.asset.RegexAddressValidator;

Expand All @@ -30,6 +31,7 @@
* 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})$"));
Expand Down
19 changes: 15 additions & 4 deletions core/src/main/resources/i18n/displayStrings.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down