From 3a40cb83bf32a9830402a412be5eb3972e74ac8a Mon Sep 17 00:00:00 2001
From: Joseph Petersen <josephp90@gmail.com>
Date: Sat, 1 Feb 2020 22:15:27 +0100
Subject: [PATCH] fix `fullAddressPart2` state if empty should not show in
 address line (#62)

* not all countries have states

* semi colons
---
 src/models/view/identityView.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/models/view/identityView.ts b/src/models/view/identityView.ts
index 65fdbcde0e2..487a59bf1a8 100644
--- a/src/models/view/identityView.ts
+++ b/src/models/view/identityView.ts
@@ -108,8 +108,13 @@ export class IdentityView implements View {
             return null;
         }
         const city = this.city || '-';
-        const state = this.state || '-';
+        const state = this.state;
         const postalCode = this.postalCode || '-';
-        return city + ', ' + state + ', ' + postalCode;
+        let addressPart2 = city;
+        if (!Utils.isNullOrWhitespace(state)) {
+            addressPart2 += ', ' + state;
+        }
+        addressPart2 += ', ' + postalCode;
+        return addressPart2;
     }
 }