From 52f2ed6e84d2e23eae5d6aad65421084dd40472f Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Thu, 4 Jul 2024 10:52:18 +0100
Subject: [PATCH] Fix race condition in loading application status

---
 .../team/Applications/components/compact/InstanceTile.vue    | 2 +-
 frontend/src/pages/team/Applications/index.vue               | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/frontend/src/pages/team/Applications/components/compact/InstanceTile.vue b/frontend/src/pages/team/Applications/components/compact/InstanceTile.vue
index 75d7824640..4ac90fc1ab 100644
--- a/frontend/src/pages/team/Applications/components/compact/InstanceTile.vue
+++ b/frontend/src/pages/team/Applications/components/compact/InstanceTile.vue
@@ -2,7 +2,7 @@
     <div class="instance-tile">
         <div class="status">
             <InstanceStatusBadge
-                :status="localInstance.meta.state"
+                :status="localInstance.meta?.state"
                 text=""
                 :pendingStateChange="localInstance.pendingStateChange"
                 :optimisticStateChange="localInstance.optimisticStateChange"
diff --git a/frontend/src/pages/team/Applications/index.vue b/frontend/src/pages/team/Applications/index.vue
index c5e4d4ec44..c3a1628fb4 100644
--- a/frontend/src/pages/team/Applications/index.vue
+++ b/frontend/src/pages/team/Applications/index.vue
@@ -142,9 +142,6 @@ export default {
 
                 const applicationsPromise = teamApi.getTeamApplications(this.team.id, { associationsLimit: ASSOCIATIONS_LIMIT })
 
-                // Not waited for as it can resolve in any order
-                this.updateApplicationAssociationStatuses()
-
                 const applications = (await applicationsPromise).applications
                 applications.forEach((applicationData) => {
                     const application = applicationsMap.get(applicationData.id) || {}
@@ -179,6 +176,8 @@ export default {
                     })
                 })
                 this.applications = applicationsMap
+                // Only update statuses *after* populating this.applications
+                this.updateApplicationAssociationStatuses()
             }
             this.loading = false
         },