Merge branch 'main' into app-users-orgs-and-more

packages/ui/src/components/billing/PurchaseModal.vue

@@ -709,7 +709,7 @@ const customNotAllowedToContinue = computed(
     (!customMatchingProduct.value || customLoading.value || customOutOfStock.value),
 )
 const upgradeNotAllowedToContinue = computed(
-  () => props.existingSubscription && (!hasUpgradeCapacityForConfig.value || customLoading.value),
+  () => props.existingSubscription && (customOutOfStock.value || customLoading.value),
 )
 
 const customServerConfig = reactive({
@@ -1009,11 +1009,6 @@ async function submitPayment() {
   paymentLoading.value = false
 }
 
-const hasUpgradeCapacityForConfig = computed(() => {
-  // TODO: Check for upgrade capacity here when Pyro provides route
-  return props.existingPlan
-})
-
 defineExpose({
   show: () => {
     if (props.customServer) {