Merge pull request #5028 from FlowFuse/5027-fix-initial-team-select

Fix invalid check for billing enablement
FlowFuse · Jan 17, 2025 · 033145d · 033145d
2 parents 46cdfcc + 9a85f8f
commit 033145d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/frontend/src/components/TeamTypeTile.vue b/frontend/src/components/TeamTypeTile.vue
@@ -50,7 +50,7 @@ export default {
     computed: {
         ...mapState('account', ['user', 'teams']),
         pricing: function () {
-            const billing = this.teamType.properties?.billing.description?.split('/')
+            const billing = this.teamType.properties?.billing?.description?.split('/')
             const price = {}
             if (typeof billing !== 'undefined') {
                 price.value = billing[0]

diff --git a/frontend/src/store/account.js b/frontend/src/store/account.js
@@ -434,7 +434,7 @@ const actions = {
                 return
             }
         } else {
-            if (!currentTeam || currentTeam.id === team?.id) {
+            if ((!currentTeam && !team) || currentTeam?.id === team?.id) {
                 state.commit('clearPendingTeamChange')
                 return
             }