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

Fix incorrect tx link to tx explorer - update translations

Browse source
This commit is contained in:
xyzmaker123 2021-06-15 12:27:06 +02:00
parent 88a58ff462
commit cfdd4b4757
No known key found for this signature in database
GPG key ID: 47689699B7B0AAFC
3 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3095,6 +3095,10 @@ addressTextField.copyToClipboard=Copy address to clipboard
addressTextField.addressCopiedToClipboard=Address has been copied to clipboard
addressTextField.openWallet.failed=Opening a default Bitcoin wallet application has failed. Perhaps you don't have one installed?
explorerAddressTextField.copyToClipboard=Copy address to clipboard
explorerAddressTextField.blockExplorerIcon.tooltip=Open a blockchain explorer with this address
explorerAddressTextField.missingTx.warning.tooltip=Missing required address
peerInfoIcon.tooltip={0}\nTag: {1}
txIdTextField.copyIcon.tooltip=Copy transaction ID to clipboard

22
desktop/src/main/java/bisq/desktop/components/ExplorerAddressTextField.java
View file

@ -62,11 +62,11 @@ public class ExplorerAddressTextField extends AnchorPane {
copyIcon = new Label();
copyIcon.setLayoutY(3);
copyIcon.getStyleClass().addAll("icon", "highlight");
copyIcon.setTooltip(new Tooltip(Res.get("txIdTextField.copyIcon.tooltip")));
copyIcon.setTooltip(new Tooltip(Res.get("explorerAddressTextField.copyToClipboard")));
AwesomeDude.setIcon(copyIcon, AwesomeIcon.COPY);
AnchorPane.setRightAnchor(copyIcon, 30.0);
Tooltip tooltip = new Tooltip(Res.get("txIdTextField.blockExplorerIcon.tooltip"));
Tooltip tooltip = new Tooltip(Res.get("explorerAddressTextField.blockExplorerIcon.tooltip"));
blockExplorerIcon = new Label();
blockExplorerIcon.getStyleClass().addAll("icon", "highlight");
@ -79,7 +79,7 @@ public class ExplorerAddressTextField extends AnchorPane {
missingAddressWarningIcon = new Label();
missingAddressWarningIcon.getStyleClass().addAll("icon", "error-icon");
AwesomeDude.setIcon(missingAddressWarningIcon, AwesomeIcon.WARNING_SIGN);
missingAddressWarningIcon.setTooltip(new Tooltip(Res.get("txIdTextField.missingTx.warning.tooltip")));
missingAddressWarningIcon.setTooltip(new Tooltip(Res.get("explorerAddressTextField.missingTx.warning.tooltip")));
missingAddressWarningIcon.setMinWidth(20);
AnchorPane.setRightAnchor(missingAddressWarningIcon, 52.0);
AnchorPane.setTopAnchor(missingAddressWarningIcon, 4.0);
@ -96,8 +96,8 @@ public class ExplorerAddressTextField extends AnchorPane {
getChildren().addAll(textField, missingAddressWarningIcon, blockExplorerIcon, copyIcon);
}
public void setup(@Nullable String addressId) {
if (addressId == null) {
public void setup(@Nullable String address) {
if (address == null) {
textField.setText(Res.get("shared.na"));
textField.setId("address-text-field-error");
blockExplorerIcon.setVisible(false);
@ -109,10 +109,10 @@ public class ExplorerAddressTextField extends AnchorPane {
return;
}
textField.setText(addressId);
textField.setOnMouseClicked(mouseEvent -> openBlockExplorer(addressId));
blockExplorerIcon.setOnMouseClicked(mouseEvent -> openBlockExplorer(addressId));
copyIcon.setOnMouseClicked(e -> Utilities.copyToClipboard(addressId));
textField.setText(address);
textField.setOnMouseClicked(mouseEvent -> openBlockExplorer(address));
blockExplorerIcon.setOnMouseClicked(mouseEvent -> openBlockExplorer(address));
copyIcon.setOnMouseClicked(e -> Utilities.copyToClipboard(address));
}
public void cleanup() {
@ -126,12 +126,12 @@ public class ExplorerAddressTextField extends AnchorPane {
// Private
///////////////////////////////////////////////////////////////////////////////////////////
private void openBlockExplorer(String addressId) {
private void openBlockExplorer(String address) {
if (preferences != null) {
BlockChainExplorer blockChainExplorer = isBsq ?
preferences.getBsqBlockChainExplorer() :
preferences.getBlockChainExplorer();
GUIUtil.openWebPage(blockChainExplorer.addressUrl + addressId, false);
GUIUtil.openWebPage(blockChainExplorer.addressUrl + address, false);
}
}
}

3
desktop/src/main/java/bisq/desktop/main/overlays/windows/ContractWindow.java
View file

@ -18,8 +18,6 @@
package bisq.desktop.main.overlays.windows;
import bisq.desktop.components.BisqTextArea;
import bisq.desktop.components.ExplorerAddressTextField;
import bisq.desktop.components.TxIdTextField;
import bisq.desktop.main.MainView;
import bisq.desktop.main.overlays.Overlay;
import bisq.desktop.util.DisplayUtils;
@ -47,7 +45,6 @@ import bisq.network.p2p.NodeAddress;
import bisq.common.UserThread;
import bisq.common.crypto.PubKeyRing;
import bisq.common.util.Tuple2;
import org.bitcoinj.core.Utils;