Check if makerPaymentMethodId is available falling back to the payloa…

…d object if not This is the case for old dispute cases
bisq-network · Jun 28, 2021 · 3d88f9f · 3d88f9f
1 parent e5765ae
commit 3d88f9f
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/core/src/main/java/bisq/core/trade/Contract.java b/core/src/main/java/bisq/core/trade/Contract.java
@@ -40,6 +40,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Objects;
 import java.util.Optional;
 
 import lombok.EqualsAndHashCode;
@@ -296,7 +297,8 @@ public byte[] getHashOfPeersPaymentAccountPayload(PubKeyRing myPubKeyRing) {
     }
 
     public String getPaymentMethodId() {
-        return makerPaymentMethodId;
+        // Either makerPaymentMethodId is set or available in makerPaymentAccountPayload
+        return makerPaymentMethodId != null ? makerPaymentMethodId : Objects.requireNonNull(makerPaymentAccountPayload).getPaymentMethodId();
     }
 
     public Coin getTradeAmount() {