From f764e9feb07f1cae45309b6271ef84862ee7d8b4 Mon Sep 17 00:00:00 2001
From: ghubstan <36207203+ghubstan@users.noreply.github.com>
Date: Fri, 30 Oct 2020 11:15:39 -0300
Subject: [PATCH] Simplify TradeUtil#getPaymentMethodNameWithCountryCode

These changes were requested in review of PR
https://github.com/bisq-network/bisq/pull/4699
---
 core/src/main/java/bisq/core/trade/TradeUtil.java | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/core/src/main/java/bisq/core/trade/TradeUtil.java b/core/src/main/java/bisq/core/trade/TradeUtil.java
index cd4fd074aa..a026f6ab98 100644
--- a/core/src/main/java/bisq/core/trade/TradeUtil.java
+++ b/core/src/main/java/bisq/core/trade/TradeUtil.java
@@ -164,14 +164,13 @@ public class TradeUtil {
     }
 
     public String getPaymentMethodNameWithCountryCode(Trade trade) {
-        String paymentMethodDescription = "";
-        if (trade != null) {
-            Offer offer = trade.getOffer();
-            checkNotNull(offer);
-            checkNotNull(offer.getPaymentMethod());
-            paymentMethodDescription = offer.getPaymentMethodNameWithCountryCode();
-        }
-        return paymentMethodDescription;
+        if (trade == null)
+            return "";
+
+        Offer offer = trade.getOffer();
+        checkNotNull(offer);
+        checkNotNull(offer.getPaymentMethod());
+        return offer.getPaymentMethodNameWithCountryCode();
     }
 
     /**