From 6c6573bf9624d8ef868348c0c17b5ff3140960ee Mon Sep 17 00:00:00 2001
From: Tharaa <tharaa.elmorssi@bigcommerce.com>
Date: Thu, 30 Jan 2020 17:04:59 +1100
Subject: [PATCH] PAYMENTS-5111 Proper address formatting without any
 additional commas in My Account Payment Methods

---
 CHANGELOG.md                                           | 2 +-
 templates/components/account/payment-methods-list.html | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 205f94cb14..bdac49926f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 ## Draft
 - Add translation key for "read more" blog post link [#1625](https://github.com/bigcommerce/cornerstone/pull/1625)
 - Update My Account Payment Methods template to expose all new savable payment methods [1603](https://github.com/bigcommerce/cornerstone/pull/1603)
-
+- Proper address formatting without any additional commas in My Account Payment Methods [1626](https://github.com/bigcommerce/cornerstone/pull/1626)
 
 ## 4.3.1 (2020-01-17)
 - Resolve visual regression in error modal icon animation [#1619](https://github.com/bigcommerce/cornerstone/pull/1619)
diff --git a/templates/components/account/payment-methods-list.html b/templates/components/account/payment-methods-list.html
index 6e1f492953..93bfe3aa93 100644
--- a/templates/components/account/payment-methods-list.html
+++ b/templates/components/account/payment-methods-list.html
@@ -52,7 +52,13 @@ <h4 class="paymentMethodsTitle">
                                 {{!-- If there is an address STARTS --}}
                                 <p class="methodDetails">
                                     <span class="methodDetails-label">{{lang 'account.payment_methods.billing_address'}}:</span>
-                                    <span class="methodDetails-description">{{billing_address.address1}}, {{billing_address.address2}}, {{billing_address.city}}, {{billing_address.state}}, {{billing_address.zip}}, {{billing_address.country}}</span>
+                                    <span class="methodDetails-description">
+                                        <span>{{billing_address.address1}}, </span>
+                                        {{#if billing_address.address2}}
+                                            <span>{{billing_address.address2}}, </span>
+                                        {{/if}}
+                                        <span>{{billing_address.city}}, {{billing_address.state}} {{billing_address.zip}} {{billing_address.country}}</span>
+                                    </span>
                                 </p>
                                 {{!-- If there is an address ENDS --}}