mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 15:10:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6072 from jmacxx/5396_privacy_enhancement

Browse source 
[1.8.3 fix] Get payment method ID from offerPayload pt.II
This commit is contained in:
Christoph Atteneder 2022-02-23 15:42:54 +01:00 • committed by GitHub
commit 07f0e70731
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/src/main/java/bisq/core/trade/model/bisq_v1/Contract.java
View file

@ -151,12 +151,12 @@ public final class Contract implements NetworkPayload {
this.makerPaymentMethodId = makerPaymentMethodId; this.makerPaymentMethodId = makerPaymentMethodId;
this.takerPaymentMethodId = takerPaymentMethodId; this.takerPaymentMethodId = takerPaymentMethodId;
// Either makerPaymentAccountPayload is set or makerPaymentMethodId // Either makerPaymentMethodId is set, or obtained from offerPayload.
if (makerPaymentMethodId == null) { if (makerPaymentMethodId == null) {
makerPaymentMethodId = checkNotNull(makerPaymentAccountPayload).getPaymentMethodId(); makerPaymentMethodId = checkNotNull(offerPayload).getPaymentMethodId();
} }
if (takerPaymentMethodId == null) { if (takerPaymentMethodId == null) {
takerPaymentMethodId = checkNotNull(takerPaymentAccountPayload).getPaymentMethodId(); takerPaymentMethodId = checkNotNull(offerPayload).getPaymentMethodId();
} }
checkNotNull(makerPaymentMethodId); checkNotNull(makerPaymentMethodId);
checkNotNull(takerPaymentMethodId); checkNotNull(takerPaymentMethodId);