From bf94e64ee533b9f119ac2fc18a1284bfae9cd881 Mon Sep 17 00:00:00 2001
From: mfaris9 <michael.faris@bigcommerce.com>
Date: Wed, 6 May 2026 15:30:51 -0400
Subject: [PATCH 1/2] fix(storefront): LTRAC-648 fix shipment info showing for
 cancelled orders

---
 .../components/account/order-contents.html     | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/templates/components/account/order-contents.html b/templates/components/account/order-contents.html
index 7f7cc345d9..411e9e0e4b 100644
--- a/templates/components/account/order-contents.html
+++ b/templates/components/account/order-contents.html
@@ -2,14 +2,16 @@ <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}}
+        {{#if ../order.is_complete}}
+            {{#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}}
+            {{/if}}
         {{/if}}
     <li class="account-listItem">
         <div class="account-product account-product--alignMiddle">

From 1f167fb7cb65870c4f9edc2fc8f99571479c9d39 Mon Sep 17 00:00:00 2001
From: mfaris9 <michael.faris@bigcommerce.com>
Date: Wed, 6 May 2026 18:16:27 -0400
Subject: [PATCH 2/2] fix(cornerstone): LTRAC-633 update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c05a59beca..e74c48430f 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
+- Fix shipment info showing for cancelled orders [#2654](https://github.com/bigcommerce/cornerstone/pull/2654)
 
 ## 6.19.1 (04-09-2026)
 - Update stencil-utils versionto 6.23.0 [#2638](https://github.com/bigcommerce/cornerstone/pull/2638)