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

Fix incorrect tx link to tx explorer - fixes #5548 #5563

Merged
merged 4 commits into from Jun 22, 2021
Merged

Fix incorrect tx link to tx explorer - fixes #5548 #5563

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0eacc15
Fix incorrect tx link to tx explorer - fixes #5548
Jun 10, 2021
88a58ff
Fix incorrect tx link to tx explorer - another approach
Jun 11, 2021
cfdd4b4
Fix incorrect tx link to tx explorer - update translations
Jun 15, 2021
12a7fd6
Fix incorrect tx link to tx explorer - use @Setter
Jun 17, 2021
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
5 changes: 4 additions & 1 deletion desktop/src/main/java/bisq/desktop/components/TxIdTextField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ public static void setWalletService(BtcWalletService walletService) {
private TxConfidenceListener txConfidenceListener;
@Setter
private boolean isBsq;
@Setter
private boolean isAddress = false;
This conversation was marked as resolved.
Show resolved Hide resolved


///////////////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -173,7 +175,8 @@ private void openBlockExplorer(String txId) {
BlockChainExplorer blockChainExplorer = isBsq ?
preferences.getBsqBlockChainExplorer() :
preferences.getBlockChainExplorer();
GUIUtil.openWebPage(blockChainExplorer.txUrl + txId, false);
String url = this.isAddress ? blockChainExplorer.addressUrl : blockChainExplorer.txUrl;
GUIUtil.openWebPage(url + txId, false);
This conversation was marked as resolved.
Show resolved Hide resolved
}
}

Expand Down
5 changes: 4 additions & 1 deletion desktop/src/main/java/bisq/desktop/main/overlays/windows/ContractWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package bisq.desktop.main.overlays.windows;

import bisq.desktop.components.BisqTextArea;
import bisq.desktop.components.TxIdTextField;
import bisq.desktop.main.MainView;
import bisq.desktop.main.overlays.Overlay;
import bisq.desktop.util.DisplayUtils;
Expand Down Expand Up @@ -45,6 +46,7 @@

import bisq.common.UserThread;
import bisq.common.crypto.PubKeyRing;
import bisq.common.util.Tuple2;

import org.bitcoinj.core.Utils;

Expand Down Expand Up @@ -256,8 +258,9 @@ private void addContent() {
addLabelTxIdTextField(gridPane, ++rowIndex, Res.get("shared.delayedPayoutTxId"), dispute.getDelayedPayoutTxId());

if (dispute.getDonationAddressOfDelayedPayoutTx() != null) {
addLabelTxIdTextField(gridPane, ++rowIndex, Res.get("shared.delayedPayoutTxReceiverAddress"),
Tuple2<Label, TxIdTextField> field = addLabelTxIdTextField(gridPane, ++rowIndex, Res.get("shared.delayedPayoutTxReceiverAddress"),
dispute.getDonationAddressOfDelayedPayoutTx());
field.second.setAddress(true);
This conversation was marked as resolved.
Show resolved Hide resolved
}

if (dispute.getPayoutTxSerialized() != null)
Expand Down