From 27fdf87e845d952273d25baa81e75f6c82f1675b Mon Sep 17 00:00:00 2001
From: napoly <napolytan@protonmail.com>
Date: Sun, 13 Nov 2022 14:20:50 +0100
Subject: [PATCH] fix dispute deposit transaction IDs in legacy UI

---
 core/src/main/resources/i18n/displayStrings.properties   | 2 --
 .../src/main/resources/i18n/displayStrings_cs.properties | 2 --
 .../src/main/resources/i18n/displayStrings_de.properties | 2 --
 .../src/main/resources/i18n/displayStrings_es.properties | 2 --
 .../src/main/resources/i18n/displayStrings_fa.properties | 2 --
 .../src/main/resources/i18n/displayStrings_fr.properties | 2 --
 .../src/main/resources/i18n/displayStrings_it.properties | 2 --
 .../src/main/resources/i18n/displayStrings_ja.properties | 2 --
 .../main/resources/i18n/displayStrings_pt-br.properties  | 2 --
 .../src/main/resources/i18n/displayStrings_pt.properties | 2 --
 .../src/main/resources/i18n/displayStrings_ru.properties | 2 --
 .../src/main/resources/i18n/displayStrings_th.properties | 2 --
 .../src/main/resources/i18n/displayStrings_vi.properties | 2 --
 .../resources/i18n/displayStrings_zh-hans.properties     | 2 --
 .../resources/i18n/displayStrings_zh-hant.properties     | 2 --
 .../desktop/main/overlays/windows/ContractWindow.java    | 9 ++-------
 16 files changed, 2 insertions(+), 37 deletions(-)

diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties
index 5731d18ae5..fef9445bfe 100644
--- a/core/src/main/resources/i18n/displayStrings.properties
+++ b/core/src/main/resources/i18n/displayStrings.properties
@@ -173,8 +173,6 @@ shared.tradeAmount=Trade amount
 shared.tradeVolume=Trade volume
 shared.invalidKey=The key you entered was not correct.
 shared.enterPrivKey=Enter private key to unlock
-shared.makerFeeTxId=Maker fee transaction ID
-shared.takerFeeTxId=Taker fee transaction ID
 shared.payoutTxId=Payout transaction ID
 shared.contractAsJson=Contract in JSON format
 shared.viewContractAsJson=View contract in JSON format
diff --git a/core/src/main/resources/i18n/displayStrings_cs.properties b/core/src/main/resources/i18n/displayStrings_cs.properties
index b49e84ee65..9dc05992d6 100644
--- a/core/src/main/resources/i18n/displayStrings_cs.properties
+++ b/core/src/main/resources/i18n/displayStrings_cs.properties
@@ -165,8 +165,6 @@ shared.tradeAmount=Výše obchodu
 shared.tradeVolume=Objem obchodu
 shared.invalidKey=Vložený klíč není správný
 shared.enterPrivKey=Pro odemknutí vložte privátní klíč
-shared.makerFeeTxId=ID transakčního poplatku tvůrce
-shared.takerFeeTxId=ID transakčního poplatku příjemce
 shared.payoutTxId=ID platební transakce
 shared.contractAsJson=Kontakt v JSON formátu
 shared.viewContractAsJson=Zobrazit kontrakt v JSON formátu
diff --git a/core/src/main/resources/i18n/displayStrings_de.properties b/core/src/main/resources/i18n/displayStrings_de.properties
index 48f2542c85..b6a45435a4 100644
--- a/core/src/main/resources/i18n/displayStrings_de.properties
+++ b/core/src/main/resources/i18n/displayStrings_de.properties
@@ -165,8 +165,6 @@ shared.tradeAmount=Handelsbetrag
 shared.tradeVolume=Handelsvolumen
 shared.invalidKey=Der eingegebene Schlüssel war nicht korrekt.
 shared.enterPrivKey=Privaten Schlüssel zum Entsperren eingeben
-shared.makerFeeTxId=Transaktions-ID der Erstellergebühr
-shared.takerFeeTxId=Transaktions-ID der Abnehmergebühr
 shared.payoutTxId=Transaktions-ID der Auszahlung
 shared.contractAsJson=Vertrag im JSON-Format
 shared.viewContractAsJson=Vertrag im JSON-Format ansehen
diff --git a/core/src/main/resources/i18n/displayStrings_es.properties b/core/src/main/resources/i18n/displayStrings_es.properties
index e3b5d22dd0..3108a1ee4b 100644
--- a/core/src/main/resources/i18n/displayStrings_es.properties
+++ b/core/src/main/resources/i18n/displayStrings_es.properties
@@ -165,8 +165,6 @@ shared.tradeAmount=Cantidad de intercambio
 shared.tradeVolume=Volumen de intercambio
 shared.invalidKey=La clave que ha introducido no es correcta.
 shared.enterPrivKey=Introducir clave privada para desbloquear
-shared.makerFeeTxId=ID de transacción de comisión del creador
-shared.takerFeeTxId=ID de transacción de comisión del tomador
 shared.payoutTxId=ID de transacción de pago
 shared.contractAsJson=Contrato en formato JSON
 shared.viewContractAsJson=Ver contrato en formato JSON
diff --git a/core/src/main/resources/i18n/displayStrings_fa.properties b/core/src/main/resources/i18n/displayStrings_fa.properties
index 2ff9ae40cb..7cf2ee7340 100644
--- a/core/src/main/resources/i18n/displayStrings_fa.properties
+++ b/core/src/main/resources/i18n/displayStrings_fa.properties
@@ -165,8 +165,6 @@ shared.tradeAmount=مقدار معامله
 shared.tradeVolume=حجم معامله
 shared.invalidKey=کلید وارد شده صحیح نیست.
 shared.enterPrivKey=کلید خصوصی را برای بازگشایی وارد کنید
-shared.makerFeeTxId=شناسه تراکنش کارمزد سفارش‌گذار
-shared.takerFeeTxId=شناسه تراکنش کارمزد پذیرنده
 shared.payoutTxId=شناسه تراکنش پرداخت
 shared.contractAsJson=قرارداد در قالب JSON
 shared.viewContractAsJson=مشاهده‌ی قرارداد در قالب JSON:
diff --git a/core/src/main/resources/i18n/displayStrings_fr.properties b/core/src/main/resources/i18n/displayStrings_fr.properties
index 40906dfd7e..c6b1d1b7d1 100644
--- a/core/src/main/resources/i18n/displayStrings_fr.properties
+++ b/core/src/main/resources/i18n/displayStrings_fr.properties
@@ -165,8 +165,6 @@ shared.tradeAmount=Montant de l'échange
 shared.tradeVolume=Volume d'échange
 shared.invalidKey=La clé que vous avez entrée n'était pas correcte.
 shared.enterPrivKey=Entrer la clé privée pour déverrouiller
-shared.makerFeeTxId=Maker fee transaction ID
-shared.takerFeeTxId=Taker fee transaction ID
 shared.payoutTxId=ID du versement de la transaction
 shared.contractAsJson=Contrat au format JSON
 shared.viewContractAsJson=Voir le contrat en format JSON
diff --git a/core/src/main/resources/i18n/displayStrings_it.properties b/core/src/main/resources/i18n/displayStrings_it.properties
index 7e08e1f228..55a62063e1 100644
--- a/core/src/main/resources/i18n/displayStrings_it.properties
+++ b/core/src/main/resources/i18n/displayStrings_it.properties
@@ -165,8 +165,6 @@ shared.tradeAmount=Importo dello scambio
 shared.tradeVolume=Volume di scambio
 shared.invalidKey=La chiave inserita non è valida.
 shared.enterPrivKey=Inserisci la chiave privata per sbloccare
-shared.makerFeeTxId=ID Transazione della tassa del creatore dell'offerta
-shared.takerFeeTxId=ID Transazione della commissione del creatore dell'offerta
 shared.payoutTxId=ID transazione di pagamento
 shared.contractAsJson=Contratto in formato JSON
 shared.viewContractAsJson=Visualizza il contratto in formato JSON
diff --git a/core/src/main/resources/i18n/displayStrings_ja.properties b/core/src/main/resources/i18n/displayStrings_ja.properties
index 4a217ea632..98539d4272 100644
--- a/core/src/main/resources/i18n/displayStrings_ja.properties
+++ b/core/src/main/resources/i18n/displayStrings_ja.properties
@@ -165,8 +165,6 @@ shared.tradeAmount=取引額
 shared.tradeVolume=取引量
 shared.invalidKey=入力されたキーが正しくありません
 shared.enterPrivKey=アンロックの為にプライベートキーを入力
-shared.makerFeeTxId=メイカー手数料トランザクションID
-shared.takerFeeTxId=テイカー手数料トランザクションID
 shared.payoutTxId=支払いトランザクションID
 shared.contractAsJson=JSON形式の契約
 shared.viewContractAsJson=JSON形式で見る
diff --git a/core/src/main/resources/i18n/displayStrings_pt-br.properties b/core/src/main/resources/i18n/displayStrings_pt-br.properties
index c1919e3751..168af59d03 100644
--- a/core/src/main/resources/i18n/displayStrings_pt-br.properties
+++ b/core/src/main/resources/i18n/displayStrings_pt-br.properties
@@ -165,8 +165,6 @@ shared.tradeAmount=Quantidade negociada
 shared.tradeVolume=Volume de negociação
 shared.invalidKey=A chave que você inseriu não estava correta
 shared.enterPrivKey=Insira a chave privada para destravar
-shared.makerFeeTxId=ID de transação da taxa do ofertante
-shared.takerFeeTxId=ID de transação da taxa do aceitador
 shared.payoutTxId=ID da transação de pagamento
 shared.contractAsJson=Contrato em formato JSON
 shared.viewContractAsJson=Ver contrato em formato JSON
diff --git a/core/src/main/resources/i18n/displayStrings_pt.properties b/core/src/main/resources/i18n/displayStrings_pt.properties
index 04b75febf1..0b5190153c 100644
--- a/core/src/main/resources/i18n/displayStrings_pt.properties
+++ b/core/src/main/resources/i18n/displayStrings_pt.properties
@@ -165,8 +165,6 @@ shared.tradeAmount=Quantia de negócio
 shared.tradeVolume=Volume de negócio
 shared.invalidKey=A chave que você inseriu não estava correta
 shared.enterPrivKey=Coloque a chave privada para desbloquear
-shared.makerFeeTxId=ID de transação da taxa de ofertante
-shared.takerFeeTxId=ID de transação da taxa de aceitador
 shared.payoutTxId=ID de transação de pagamento
 shared.contractAsJson=Contrato em formato JSON
 shared.viewContractAsJson=Ver contrato em formato JSON
diff --git a/core/src/main/resources/i18n/displayStrings_ru.properties b/core/src/main/resources/i18n/displayStrings_ru.properties
index c93b0a42c8..29df20d1ce 100644
--- a/core/src/main/resources/i18n/displayStrings_ru.properties
+++ b/core/src/main/resources/i18n/displayStrings_ru.properties
@@ -165,8 +165,6 @@ shared.tradeAmount=Сумма сделки
 shared.tradeVolume=Объём сделки
 shared.invalidKey=Введён неправильный ключ.
 shared.enterPrivKey=Введите приватный ключ для разблокировки
-shared.makerFeeTxId=Идентификатор транзакции комиссии мейкера
-shared.takerFeeTxId=Идентификатор транзакции комиссии тейкера
 shared.payoutTxId=Идентификатор транзакции выплаты
 shared.contractAsJson=Контракт в формате JSON
 shared.viewContractAsJson=Просмотреть контракт в формате JSON
diff --git a/core/src/main/resources/i18n/displayStrings_th.properties b/core/src/main/resources/i18n/displayStrings_th.properties
index 43596576b1..133d68bba6 100644
--- a/core/src/main/resources/i18n/displayStrings_th.properties
+++ b/core/src/main/resources/i18n/displayStrings_th.properties
@@ -165,8 +165,6 @@ shared.tradeAmount=ยอดจำนวนการซื้อขาย
 shared.tradeVolume=ปริมาณการซื้อขาย
 shared.invalidKey=คีย์ที่คุณป้อนไม่ถูกต้อง
 shared.enterPrivKey=ป้อนคีย์ส่วนตัวเพื่อปลดล็อก
-shared.makerFeeTxId=ID ธุรกรรมของผู้ทำ
-shared.takerFeeTxId=ID การทำธุรกรรมของผู้รับ
 shared.payoutTxId=ID ธุรกรรมการชำระเงิน
 shared.contractAsJson=สัญญาในรูปแบบ JSON
 shared.viewContractAsJson=ดูสัญญาในรูปแบบ JSON:
diff --git a/core/src/main/resources/i18n/displayStrings_vi.properties b/core/src/main/resources/i18n/displayStrings_vi.properties
index bf53dc388f..4fc7da57d4 100644
--- a/core/src/main/resources/i18n/displayStrings_vi.properties
+++ b/core/src/main/resources/i18n/displayStrings_vi.properties
@@ -165,8 +165,6 @@ shared.tradeAmount=Khoản tiền giao dịch
 shared.tradeVolume=Khối lượng giao dịch
 shared.invalidKey=Mã khóa bạn vừa nhập không đúng.
 shared.enterPrivKey=Nhập Private key để mở khóa
-shared.makerFeeTxId=ID giao dịch thu phí của người tạo
-shared.takerFeeTxId=ID giao dịch thu phí của người nhận
 shared.payoutTxId=ID giao dịch chi trả
 shared.contractAsJson=Hợp đồng định dạng JSON
 shared.viewContractAsJson=Xem hợp đồng định dạng JSON
diff --git a/core/src/main/resources/i18n/displayStrings_zh-hans.properties b/core/src/main/resources/i18n/displayStrings_zh-hans.properties
index 4945a0e265..5d32e1b6b5 100644
--- a/core/src/main/resources/i18n/displayStrings_zh-hans.properties
+++ b/core/src/main/resources/i18n/displayStrings_zh-hans.properties
@@ -165,8 +165,6 @@ shared.tradeAmount=交易金额
 shared.tradeVolume=交易总量
 shared.invalidKey=您输入的密码不正确。
 shared.enterPrivKey=输入私钥解锁
-shared.makerFeeTxId=挂单费交易 ID
-shared.takerFeeTxId=买单费交易 ID
 shared.payoutTxId=支出交易 ID
 shared.contractAsJson=JSON 格式的合同
 shared.viewContractAsJson=查看 JSON 格式的合同
diff --git a/core/src/main/resources/i18n/displayStrings_zh-hant.properties b/core/src/main/resources/i18n/displayStrings_zh-hant.properties
index 438fb4c1af..84194542b5 100644
--- a/core/src/main/resources/i18n/displayStrings_zh-hant.properties
+++ b/core/src/main/resources/i18n/displayStrings_zh-hant.properties
@@ -165,8 +165,6 @@ shared.tradeAmount=交易金額
 shared.tradeVolume=交易總量
 shared.invalidKey=您輸入的密碼不正確。
 shared.enterPrivKey=輸入私鑰解鎖
-shared.makerFeeTxId=掛單費交易 ID
-shared.takerFeeTxId=買單費交易 ID
 shared.payoutTxId=支出交易 ID
 shared.contractAsJson=JSON 格式的合同
 shared.viewContractAsJson=查看 JSON 格式的合同
diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/ContractWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/ContractWindow.java
index aa57cb4c88..6345e13d4f 100644
--- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/ContractWindow.java
+++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/ContractWindow.java
@@ -262,13 +262,8 @@ public class ContractWindow extends Overlay<ContractWindow> {
             }
         }
 
-        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) {
-            addLabelTxIdTextField(gridPane, ++rowIndex, Res.get("shared.makerDepositTransactionId"), contract.getMakerDepositTxHash());
-            addLabelTxIdTextField(gridPane, ++rowIndex, Res.get("shared.takerDepositTransactionId"), contract.getTakerDepositTxHash());
-        }
+        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());