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

Merge remote-tracking branch 'bisq/master' into use-https-for-xmr-explorer-api

Browse source
This commit is contained in:
wiz 2020-09-08 20:19:20 +09:00
commit a2c6f279a6
No known key found for this signature in database
GPG key ID: A394E332255A6173
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/src/main/java/bisq/core/user/Preferences.java
View file

@ -124,8 +124,8 @@ public final class Preferences implements PersistedDataHost, BridgeAddressProvid
));
private static final ArrayList<String> XMR_TX_PROOF_SERVICES_CLEAR_NET = new ArrayList<>(Arrays.asList(
"78.47.61.90:8081", // @emzy
"explorer.monero.wiz.biz" // @wiz
"xmrblocks.monero.emzy.de", // @emzy
"node77.monero.wiz.biz" // @wiz
));
private static final ArrayList<String> XMR_TX_PROOF_SERVICES = new ArrayList<>(Arrays.asList(
"monero3bec7m26vx6si6qo7q7imlaoz45ot5m2b5z2ppgoooo6jx2rqd.onion", // @emzy

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

@ -2551,8 +2551,9 @@ showWalletDataWindow.walletData=Wallet data
showWalletDataWindow.includePrivKeys=Include private keys
setXMRTxKeyWindow.headline=Prove sending of XMR
setXMRTxKeyWindow.txHash=Transaction ID
setXMRTxKeyWindow.txKey=Transaction key
setXMRTxKeyWindow.note=Adding tx info below enables auto-confirm for quicker trades. See more: https://bisq.wiki/Trading_Monero
setXMRTxKeyWindow.txHash=Transaction ID (optional)
setXMRTxKeyWindow.txKey=Transaction key (optional)
# We do not translate the tac because of the legal nature. We would need translations checked by lawyers
# in each language which is too expensive atm.

2
desktop/src/main/java/bisq/desktop/main/overlays/windows/SetXmrTxKeyWindow.java
View file

@ -36,6 +36,7 @@ import lombok.Getter;
import javax.annotation.Nullable;
import static bisq.common.app.DevEnv.isDevMode;
import static bisq.desktop.util.FormBuilder.addMultilineLabel;
import static bisq.desktop.util.FormBuilder.addInputTextField;
import static javafx.beans.binding.Bindings.createBooleanBinding;
@ -114,6 +115,7 @@ public class SetXmrTxKeyWindow extends Overlay<SetXmrTxKeyWindow> {
}
private void addContent() {
addMultilineLabel(gridPane, ++rowIndex, Res.get("setXMRTxKeyWindow.note"), 0);
txHashInputTextField = addInputTextField(gridPane, ++rowIndex, Res.get("setXMRTxKeyWindow.txHash"), 10);
txKeyInputTextField = addInputTextField(gridPane, ++rowIndex, Res.get("setXMRTxKeyWindow.txKey"));
}