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 transaction IDs in legacy UI trade info views #482

Merged
merged 1 commit into from
Nov 13, 2022
Merged

fix transaction IDs in legacy UI trade info views #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 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 @@ -115,7 +115,10 @@ shared.enterPercentageValue=Enter % value
shared.OR=OR
shared.notEnoughFunds=You don''t have enough funds in your Haveno wallet for this transaction—{0} is needed but only {1} is available.\n\nPlease add funds from an external wallet, or fund your Haveno wallet at Funds > Receive Funds.
shared.waitingForFunds=Waiting for funds...
shared.depositTransactionId=Deposit transaction ID
shared.yourDepositTransactionId=Your deposit transaction ID
shared.peerDepositTransactionId=Peer's deposit transaction ID
shared.makerDepositTransactionId=Maker's deposit transaction ID
shared.takerDepositTransactionId=Taker's deposit transaction ID
shared.TheBTCBuyer=The XMR buyer
shared.You=You
shared.sendingConfirmation=Sending confirmation...
Expand Down Expand Up @@ -251,7 +254,7 @@ mainView.marketPrice.tooltip.bisqInternalPrice=There is no market price from ext
mainView.marketPrice.tooltip=Market price is provided by {0}{1}\nLast update: {2}\nProvider node URL: {3}
mainView.balance.available=Available balance
mainView.balance.reserved=Reserved in offers
mainView.balance.pending=Pending balance
mainView.balance.pending=Pending balance
mainView.balance.reserved.short=Reserved
mainView.balance.pending.short=Pending

Expand Down
1 change: 0 additions & 1 deletion core/src/main/resources/i18n/displayStrings_cs.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ shared.enterPercentageValue=Zadejte % hodnotu
shared.OR=NEBO
shared.notEnoughFunds=Ve své peněžence Bisq nemáte pro tuto transakci dostatek prostředků — je potřeba {0}, ale k dispozici je pouze {1}.\n\nPřidejte prostředky z externí peněženky nebo financujte svou peněženku Bisq v části Prostředky > Přijmout prostředky.
shared.waitingForFunds=Čekání na finance...
shared.depositTransactionId=ID vkladové transakce
shared.TheBTCBuyer=BTC kupující
shared.You=Vy
shared.sendingConfirmation=Posílám potvrzení...
Expand Down
1 change: 0 additions & 1 deletion core/src/main/resources/i18n/displayStrings_de.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ shared.enterPercentageValue=%-Wert eingeben
shared.OR=ODER
shared.notEnoughFunds=Für diese Transaktion haben Sie nicht genug Gelder in Ihrem Bisq-Wallet—{0} werden benötigt, aber nur {1} sind verfügbar.\n\nBitte fügen Sie Gelder aus einer externen Wallet hinzu, oder senden Sie Gelder an Ihr Bisq-Wallet unter Gelder > Gelder erhalten.
shared.waitingForFunds=Warte auf Gelder...
shared.depositTransactionId=Kautionstransaktions-ID
shared.TheBTCBuyer=Der BTC-Käufer
shared.You=Sie
shared.sendingConfirmation=Sende Bestätigung...
Expand Down
1 change: 0 additions & 1 deletion core/src/main/resources/i18n/displayStrings_es.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ shared.enterPercentageValue=Introduzca valor %
shared.OR=ó
shared.notEnoughFunds=No tiene suficientes fondos en su monedero bisq para esta transacción. Necesita {0} pero solo tiene {1} disponibles.\n\nPor favor deposite desde un monedero externo o agregue fondos a su monedero Bisq en Fondos > Recibir Fondos.
shared.waitingForFunds=Esperando fondos...
shared.depositTransactionId=ID de transacción del depósito
shared.TheBTCBuyer=El comprador de BTC
shared.You=Usted
shared.sendingConfirmation=Enviando confirmación...
Expand Down
1 change: 0 additions & 1 deletion core/src/main/resources/i18n/displayStrings_fa.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ shared.enterPercentageValue=ارزش ٪ را وارد کنید
shared.OR=یا
shared.notEnoughFunds=You don''t have enough funds in your Bisq wallet for this transaction—{0} is needed but only {1} is available.\n\nPlease add funds from an external wallet, or fund your Bisq wallet at Funds > Receive Funds.
shared.waitingForFunds=در انتظار دریافت وجه...
shared.depositTransactionId=شناسه تراکنش وجه دریافتی
shared.TheBTCBuyer=خریدار بیتکوین
shared.You=شما
shared.sendingConfirmation=در حال ارسال تاییدیه...
Expand Down
1 change: 0 additions & 1 deletion core/src/main/resources/i18n/displayStrings_fr.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ shared.enterPercentageValue=Entrez la valeur en %
shared.OR=OU
shared.notEnoughFunds=Il n'y a pas suffisamment de fonds dans votre portefeuille Bisq pour payer cette transaction. La transaction a besoin de {0} Votre solde disponible est de {1}. \n\nVeuillez ajouter des fonds à partir d'un portefeuille Bitcoin externe ou recharger votre portefeuille Bisq dans «Fonds / Dépôts > Recevoir des Fonds».
shared.waitingForFunds=En attente des fonds...
shared.depositTransactionId=ID de la transaction de dépôt
shared.TheBTCBuyer=L'acheteur de BTC
shared.You=Vous
shared.sendingConfirmation=Envoi de la confirmation...
Expand Down
1 change: 0 additions & 1 deletion core/src/main/resources/i18n/displayStrings_it.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ shared.enterPercentageValue=Immetti il valore %
shared.OR=OPPURE
shared.notEnoughFunds=You don''t have enough funds in your Bisq wallet for this transaction—{0} is needed but only {1} is available.\n\nPlease add funds from an external wallet, or fund your Bisq wallet at Funds > Receive Funds.
shared.waitingForFunds=In attesa dei fondi...
shared.depositTransactionId=ID transazione di deposito
shared.TheBTCBuyer=L'acquirente di BTC
shared.You=Tu
shared.sendingConfirmation=Invio della conferma in corso...
Expand Down
1 change: 0 additions & 1 deletion core/src/main/resources/i18n/displayStrings_ja.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ shared.enterPercentageValue=%を入力
shared.OR=または
shared.notEnoughFunds=このトランザクションには、Bisqウォレットに資金が足りません。\n{0}が必要ですが、Bisqウォレットには{1}しかありません。\n\n外部のビットコインウォレットから入金するか、または「資金 > 資金の受取」でBisqウォレットに入金してください。
shared.waitingForFunds=資金を待っています
shared.depositTransactionId=入金トランザクションID
shared.TheBTCBuyer=BTC買い手
shared.You=あなた
shared.sendingConfirmation=承認を送信中
Expand Down
1 change: 0 additions & 1 deletion core/src/main/resources/i18n/displayStrings_pt-br.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ shared.enterPercentageValue=Insira a %
shared.OR=OU
shared.notEnoughFunds=You don''t have enough funds in your Bisq wallet for this transaction—{0} is needed but only {1} is available.\n\nPlease add funds from an external wallet, or fund your Bisq wallet at Funds > Receive Funds.
shared.waitingForFunds=Aguardando pagamento...
shared.depositTransactionId=ID da Transação de depósito
shared.TheBTCBuyer=O comprador de BTC
shared.You=Você
shared.sendingConfirmation=Enviando confirmação...
Expand Down
1 change: 0 additions & 1 deletion core/src/main/resources/i18n/displayStrings_pt.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ shared.enterPercentageValue=Insira % do valor
shared.OR=OU
shared.notEnoughFunds=You don''t have enough funds in your Bisq wallet for this transaction—{0} is needed but only {1} is available.\n\nPlease add funds from an external wallet, or fund your Bisq wallet at Funds > Receive Funds.
shared.waitingForFunds=Esperando pelos fundos...
shared.depositTransactionId=ID da transação de depósito
shared.TheBTCBuyer=O comprador de BTC
shared.You=Você
shared.sendingConfirmation=Enviando confirmação...
Expand Down
1 change: 0 additions & 1 deletion core/src/main/resources/i18n/displayStrings_ru.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ shared.enterPercentageValue=Ввести величину в %
shared.OR=ИЛИ
shared.notEnoughFunds=You don''t have enough funds in your Bisq wallet for this transaction—{0} is needed but only {1} is available.\n\nPlease add funds from an external wallet, or fund your Bisq wallet at Funds > Receive Funds.
shared.waitingForFunds=Ожидание средств...
shared.depositTransactionId=Идентификатор зачисления на счёт
shared.TheBTCBuyer=Покупатель ВТС
shared.You=Вы
shared.sendingConfirmation=Отправка подтверждения...
Expand Down
1 change: 0 additions & 1 deletion core/src/main/resources/i18n/displayStrings_th.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ shared.enterPercentageValue=เข้าสู่ % ตามมูลค่า
shared.OR=หรือ
shared.notEnoughFunds=You don''t have enough funds in your Bisq wallet for this transaction—{0} is needed but only {1} is available.\n\nPlease add funds from an external wallet, or fund your Bisq wallet at Funds > Receive Funds.
shared.waitingForFunds=กำลังรอเงิน ...
shared.depositTransactionId=รหัสธุรกรรมการฝากเงิน (transaction ID)
shared.TheBTCBuyer=ผู้ซื้อ BTC
shared.You=คุณ
shared.sendingConfirmation=กำลังส่งการยืนยัน ...
Expand Down
1 change: 0 additions & 1 deletion core/src/main/resources/i18n/displayStrings_vi.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ shared.enterPercentageValue=Nhập giá trị %
shared.OR=HOẶC
shared.notEnoughFunds=You don''t have enough funds in your Bisq wallet for this transaction—{0} is needed but only {1} is available.\n\nPlease add funds from an external wallet, or fund your Bisq wallet at Funds > Receive Funds.
shared.waitingForFunds=Đợi nộp tiền...
shared.depositTransactionId=ID giao dịch gửi tiền
shared.TheBTCBuyer=Người mua BTC
shared.You=Bạn
shared.sendingConfirmation=Gửi xác nhận...
Expand Down
1 change: 0 additions & 1 deletion core/src/main/resources/i18n/displayStrings_zh-hans.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ shared.enterPercentageValue=输入 % 值
shared.OR=或者
shared.notEnoughFunds=您的 Bisq 钱包中没有足够的资金去支付这一交易 需要{0} 您可用余额为 {1}。\n\n请从外部比特币钱包注入资金或在“资金/存款”充值到您的 Bisq 钱包。
shared.waitingForFunds=等待资金充值...
shared.depositTransactionId=存款交易 ID
shared.TheBTCBuyer=BTC 买家
shared.You=您
shared.sendingConfirmation=发送确认...
Expand Down
1 change: 0 additions & 1 deletion core/src/main/resources/i18n/displayStrings_zh-hant.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ shared.enterPercentageValue=輸入 % 值
shared.OR=或者
shared.notEnoughFunds=您的 Bisq 錢包中沒有足夠的資金去支付這一交易 需要{0} 您可用餘額為 {1}。\n\n請從外部比特幣錢包注入資金或在“資金/存款”充值到您的 Bisq 錢包。
shared.waitingForFunds=等待資金充值...
shared.depositTransactionId=存款交易 ID
shared.TheBTCBuyer=BTC 買家
shared.You=您
shared.sendingConfirmation=發送確認...
Expand Down
6 changes: 4 additions & 2 deletions 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 @@ -265,8 +265,10 @@ private void addContent() {
addLabelTxIdTextField(gridPane, ++rowIndex, Res.get("shared.makerFeeTxId"), offer.getOfferFeePaymentTxId());
addLabelTxIdTextField(gridPane, ++rowIndex, Res.get("shared.takerFeeTxId"), "TAKER FEE TX ID NOT PART OF CONTRACT"); // TODO (woodser): should taker fee tx id be part of contract?

if (dispute.getDepositTxSerialized() != null)
Copy link
Contributor

@woodser woodser Nov 12, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This removes the deposit tx hash from the contract window. Per our conversation, this view was to show the maker and taker deposit tx hashes using e.g. contract.getMakerDepositTxHash().

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah I misunderstood. Thought there's going to be a follow up PR. Please check again.

addLabelTxIdTextField(gridPane, ++rowIndex, Res.get("shared.depositTransactionId"), dispute.getDepositTxId());
if (dispute.getDepositTxSerialized() != null) {
addLabelTxIdTextField(gridPane, ++rowIndex, Res.get("shared.makerDepositTransactionId"), contract.getMakerDepositTxHash());
addLabelTxIdTextField(gridPane, ++rowIndex, Res.get("shared.takerDepositTransactionId"), contract.getTakerDepositTxHash());
}

if (dispute.getDelayedPayoutTxId() != null)
addLabelTxIdTextField(gridPane, ++rowIndex, Res.get("shared.delayedPayoutTxId"), dispute.getDelayedPayoutTxId());
Expand Down
13 changes: 3 additions & 10 deletions desktop/src/main/java/bisq/desktop/main/overlays/windows/TradeDetailsWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
package bisq.desktop.main.overlays.windows;

import bisq.desktop.components.HavenoTextArea;
import bisq.desktop.components.TextFieldWithCopyIcon;
import bisq.desktop.components.TxIdTextField;
import bisq.desktop.main.MainView;
import bisq.desktop.main.overlays.Overlay;
import bisq.desktop.util.DisplayUtils;
Expand All @@ -33,9 +31,9 @@
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.support.dispute.agent.DisputeAgentLookupMap;
import bisq.core.support.dispute.arbitration.ArbitrationManager;
import bisq.core.trade.TradeManager;
import bisq.core.trade.Contract;
import bisq.core.trade.Trade;
import bisq.core.trade.TradeManager;
import bisq.core.trade.txproof.AssetTxProofResult;
import bisq.core.util.FormattingUtils;
import bisq.core.util.VolumeUtil;
Expand All @@ -46,9 +44,6 @@
import bisq.common.UserThread;
import bisq.common.util.Tuple3;

import org.bitcoinj.core.Transaction;
import org.bitcoinj.core.Utils;

import javax.inject.Inject;
import javax.inject.Named;

Expand Down Expand Up @@ -273,13 +268,11 @@ private void addContent() {
Res.get(contract.getPaymentMethodId()));
}

addLabelTxIdTextField(gridPane, ++rowIndex, Res.get("shared.makerFeeTxId"), offer.getOfferFeePaymentTxId());

if (trade.getMakerDepositTx() != null)
addLabelTxIdTextField(gridPane, ++rowIndex, Res.get("shared.depositTransactionId"), // TODO (woodser): separate UI labels for deposit tx ids
addLabelTxIdTextField(gridPane, ++rowIndex, Res.get("shared.makerDepositTransactionId"),
trade.getMakerDepositTx().getHash());
if (trade.getTakerDepositTx() != null)
addLabelTxIdTextField(gridPane, ++rowIndex, Res.get("shared.depositTransactionId"), // TODO (woodser): separate UI labels for deposit tx ids
addLabelTxIdTextField(gridPane, ++rowIndex, Res.get("shared.takerDepositTransactionId"),
trade.getTakerDepositTx().getHash());

if (trade.getPayoutTxId() != null)
Expand Down
12 changes: 5 additions & 7 deletions desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/TradeStepView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,8 +335,7 @@ protected void addTradeInfoBlock() {

// self's deposit tx id
final Tuple3<Label, TxIdTextField, VBox> labelSelfTxIdTextFieldVBoxTuple3 =
addTopLabelTxIdTextField(gridPane, gridRow,
"Your " + Res.get("shared.depositTransactionId").toLowerCase(),
addTopLabelTxIdTextField(gridPane, gridRow, Res.get("shared.yourDepositTransactionId"),
Layout.COMPACT_FIRST_ROW_DISTANCE);

GridPane.setColumnSpan(labelSelfTxIdTextFieldVBoxTuple3.third, 2);
Expand All @@ -350,8 +349,7 @@ protected void addTradeInfoBlock() {

// peer's deposit tx id
final Tuple3<Label, TxIdTextField, VBox> labelPeerTxIdTextFieldVBoxTuple3 =
addTopLabelTxIdTextField(gridPane, ++gridRow,
"Peer's " + Res.get("shared.depositTransactionId").toLowerCase(),
addTopLabelTxIdTextField(gridPane, ++gridRow, Res.get("shared.peerDepositTransactionId"),
-Layout.GROUP_DISTANCE_WITHOUT_SEPARATOR);

GridPane.setColumnSpan(labelPeerTxIdTextFieldVBoxTuple3.third, 2);
Expand Down Expand Up @@ -644,7 +642,7 @@ private void openMediationResultPopup(String headLine) {
}

Optional<Dispute> optionalDispute = model.dataModel.mediationManager.findDispute(trade.getId());
if (!optionalDispute.isPresent()) {
if (optionalDispute.isEmpty()) {
return;
}

Expand All @@ -656,14 +654,14 @@ private void openMediationResultPopup(String headLine) {
log.error("trade.getMakerDepositTx() was null at openMediationResultPopup. " +
"We add the trade to failed trades. TradeId={}", trade.getId());
//model.dataModel.addTradeToFailedTrades(); // TODO (woodser): new way to move trade to failed trades?
model.dataModel.onMoveInvalidTradeToFailedTrades(trade);;
model.dataModel.onMoveInvalidTradeToFailedTrades(trade);
new Popup().warning(Res.get("portfolio.pending.mediationResult.error.depositTxNull")).show(); // TODO (woodser): separate error messages for maker/taker
return;
} else if (trade instanceof TakerTrade && trade.getTakerDepositTx() == null) {
log.error("trade.getTakerDepositTx() was null at openMediationResultPopup. " +
"We add the trade to failed trades. TradeId={}", trade.getId());
//model.dataModel.addTradeToFailedTrades();
model.dataModel.onMoveInvalidTradeToFailedTrades(trade);;
model.dataModel.onMoveInvalidTradeToFailedTrades(trade);
new Popup().warning(Res.get("portfolio.pending.mediationResult.error.depositTxNull")).show();
return;
}
Expand Down