From 8dfc58657a4ea3b4714ad7b3be11611b1d31c185 Mon Sep 17 00:00:00 2001
From: Alexander Saiannyi <alexander.saiannyi@bigcommerce.com>
Date: Thu, 30 Apr 2026 21:40:48 +0200
Subject: [PATCH]  fix(storefront): TRAC-633 show ship-to address only fo
 completed or shipped orders

---
 CHANGELOG.md                                     |  1 +
 lang/en.json                                     |  2 +-
 templates/components/account/order-contents.html | 14 ++++++--------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c05a59beca..f4f381aea6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## Draft
+- Update shipping message for order page [#2647](https://github.com/bigcommerce/cornerstone/pull/2647)
 
 ## 6.19.1 (04-09-2026)
 - Update stencil-utils versionto 6.23.0 [#2638](https://github.com/bigcommerce/cornerstone/pull/2638)
diff --git a/lang/en.json b/lang/en.json
index d7c996e1ad..6234f8b366 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -360,7 +360,7 @@
                 "heading": "Order #{number}",
                 "order_contents": "Order Contents",
                 "ship_to": "Ship To",
-                "ship_to_multi": "Items shipped to {street}, {city}, {state}, {zip}, {country}",
+                "ship_to_multi": "Ship to {street}, {city}, {state}, {zip}, {country}",
                 "ship_to_multi_text": "Order will be shipped to multiple addresses",
                 "pickup_details": "Pickup Details",
                 "bill_to": "Bill To",
diff --git a/templates/components/account/order-contents.html b/templates/components/account/order-contents.html
index 7f7cc345d9..a48685bd01 100644
--- a/templates/components/account/order-contents.html
+++ b/templates/components/account/order-contents.html
@@ -2,15 +2,13 @@ <h3 class="account-heading">{{lang 'account.orders.details.order_contents'}}</h3
 
 <ul class="account-list">
     {{#each order.items}}
-        {{#if shipping_rows.length}}
-            {{#each shipping_rows}}
-                {{#if is_shipping}}
-                    <li class="account-listShipping">
-                        <h5 class="account-listShipping-title">{{lang 'account.orders.details.ship_to_multi' street=address city=city state=state zip=zip country=country}}</h5>
-                    </li>
-                {{/if}}
-            {{/each}}
+    {{#each shipping_rows}}
+        {{#if is_shipping}}
+            <li class="account-listShipping">
+                <h5 class="account-listShipping-title">{{lang 'account.orders.details.ship_to_multi' street=address city=city state=state zip=zip country=country}}</h5>
+            </li>
         {{/if}}
+    {{/each}}
     <li class="account-listItem">
         <div class="account-product account-product--alignMiddle">
             <div class="account-product-checkItem">