From 70752a1ffd56d41c53d90a21faae3de220592f8c Mon Sep 17 00:00:00 2001
From: jmacxx <47253594+jmacxx@users.noreply.github.com>
Date: Mon, 21 Feb 2022 23:13:16 -0600
Subject: [PATCH] Get payment method ID from offerPayload.

Another problem with closed trades older than v1.7.0.
The payment method ID can always be obtained from offerPayload.
---
 .../main/java/bisq/core/trade/model/bisq_v1/Contract.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/bisq/core/trade/model/bisq_v1/Contract.java b/core/src/main/java/bisq/core/trade/model/bisq_v1/Contract.java
index b7d458e757..5bf915c6f0 100644
--- a/core/src/main/java/bisq/core/trade/model/bisq_v1/Contract.java
+++ b/core/src/main/java/bisq/core/trade/model/bisq_v1/Contract.java
@@ -151,12 +151,12 @@ public final class Contract implements NetworkPayload {
         this.makerPaymentMethodId = makerPaymentMethodId;
         this.takerPaymentMethodId = takerPaymentMethodId;
 
-        // Either makerPaymentAccountPayload is set or makerPaymentMethodId
+        // Either makerPaymentMethodId is set, or obtained from offerPayload.
         if (makerPaymentMethodId == null) {
-            makerPaymentMethodId = checkNotNull(makerPaymentAccountPayload).getPaymentMethodId();
+            makerPaymentMethodId = checkNotNull(offerPayload).getPaymentMethodId();
         }
         if (takerPaymentMethodId == null) {
-            takerPaymentMethodId = checkNotNull(takerPaymentAccountPayload).getPaymentMethodId();
+            takerPaymentMethodId = checkNotNull(offerPayload).getPaymentMethodId();
         }
         checkNotNull(makerPaymentMethodId);
         checkNotNull(takerPaymentMethodId);