diff --git a/package-lock.json b/package-lock.json
index 317db549..f5338aa6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,7 @@
         "@capacitor/core": "^2.4.7",
         "@casl/ability": "^6.0.0",
         "@hotwax/app-version-info": "^1.0.0",
-        "@hotwax/apps-theme": "^1.2.6",
+        "@hotwax/apps-theme": "^1.2.8",
         "@hotwax/dxp-components": "^1.16.0",
         "@hotwax/oms-api": "^1.16.0",
         "@ionic/core": "^7.6.0",
@@ -2795,9 +2795,9 @@
       "integrity": "sha512-PnJTqTbFvvl9N23yi1DjL4aNmTkpYFrayyoJyfH1qDJXADFbQ9kB7gJmKcfiPpyYMGR86Yf3Is5ct0+wReUJGQ=="
     },
     "node_modules/@hotwax/apps-theme": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/@hotwax/apps-theme/-/apps-theme-1.2.6.tgz",
-      "integrity": "sha512-zpUjGoY7LBlKeiP0V7tonrmoey8HQ5THQmyixQ+IDtrjmEJNBjynW/Ef3gC0FUNNPuVqxWPZdT5CVgaETLGTwg=="
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@hotwax/apps-theme/-/apps-theme-1.2.8.tgz",
+      "integrity": "sha512-6ZE2y4DKWcDdYNToPv7L6oYM71NS4zgxfoncIUvSvA9BYqi3MavfC36Z6ujHBEB/PsUhcbU8DOdpakTvyL5aGw=="
     },
     "node_modules/@hotwax/dxp-components": {
       "version": "1.16.0",
diff --git a/package.json b/package.json
index 7a74ec07..6ab07326 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "@capacitor/core": "^2.4.7",
     "@casl/ability": "^6.0.0",
     "@hotwax/app-version-info": "^1.0.0",
-    "@hotwax/apps-theme": "^1.2.6",
+    "@hotwax/apps-theme": "^1.2.8",
     "@hotwax/dxp-components": "^1.16.0",
     "@hotwax/oms-api": "^1.16.0",
     "@ionic/core": "^7.6.0",
diff --git a/src/views/Completed.vue b/src/views/Completed.vue
index 3a3a15e6..fe072cd2 100644
--- a/src/views/Completed.vue
+++ b/src/views/Completed.vue
@@ -44,7 +44,7 @@
         </div>
         <div class="results">
           <ion-button :disabled="isShipNowDisabled || !hasAnyPackedShipment() || hasAnyMissingInfo() || (hasAnyShipmentTrackingInfoMissing() && !hasPermission(Actions.APP_FORCE_SHIP_ORDER))" expand="block" class="bulk-action desktop-only" fill="outline" size="large" @click="bulkShipOrders()">{{ translate("Ship") }}</ion-button>
-          <ion-card class="order" v-for="(order, index) in getCompletedOrders()" :key="index">
+          <ion-card class="order" v-for="(order, index) in completedOrdersList" :key="index">
             <div class="order-header">
               <div class="order-primary-info">
                 <ion-label>
@@ -256,7 +256,8 @@ export default defineComponent({
       shipmentMethods: [] as Array<any>,
       carrierPartyIds: [] as Array<any>,
       searchedQuery: '',
-      isScrollingEnabled: false
+      isScrollingEnabled: false,
+      completedOrdersList: [] as any
     }
   },
   computed: {
@@ -275,6 +276,7 @@ export default defineComponent({
   async mounted() {
     await Promise.all([this.initialiseOrderQuery(), this.fetchShipmentMethods(), this.fetchCarrierPartyIds()]);
     emitter.on('updateOrderQuery', this.updateOrderQuery)
+    this.completedOrdersList = JSON.parse(JSON.stringify(this?.completedOrders.list)).slice(0, (this.completedOrders.query.viewIndex + 1) * (process.env.VUE_APP_VIEW_SIZE as any));
   },
   unmounted() {
     this.store.dispatch('order/clearCompletedOrders')
@@ -305,9 +307,6 @@ export default defineComponent({
       const updatedItem = updatedOrder.items.find((item: any) => item.orderItemSeqId === orderItem.orderItemSeqId)
       updatedItem.showKitComponents = orderItem.showKitComponents ? false : true
     },
-    getCompletedOrders() {
-      return JSON.parse(JSON.stringify(this.completedOrders.list)).slice(0, (this.completedOrders.query.viewIndex + 1) * (process.env.VUE_APP_VIEW_SIZE as any));
-    },
     enableScrolling() {
       const parentElement = (this as any).$refs.contentRef.$el
       const scrollEl = parentElement.shadowRoot.querySelector("main[part='scroll']")