diff --git a/src/routes/(console)/account/payments/paymentMethods.svelte b/src/routes/(console)/account/payments/paymentMethods.svelte index de20933c9..2c815ecce 100644 --- a/src/routes/(console)/account/payments/paymentMethods.svelte +++ b/src/routes/(console)/account/payments/paymentMethods.svelte @@ -41,11 +41,15 @@ (method: PaymentMethodData) => !!method?.last4 ); - $: hasLinkedOrgs = filteredMethods.some((method) => - orgList.some( - (org) => method.$id === org.paymentMethodId || method.$id === org.backupPaymentMethodId - ) + + const isMethodLinkedToOrg = (methodId: string, org: Organization) => + methodId === org.paymentMethodId || methodId === org.backupPaymentMethodId; + + + $: linkedMethodIds = new Set( + orgList.flatMap(org => [org.paymentMethodId, org.backupPaymentMethodId].filter(Boolean)) ); + $: hasLinkedOrgs = filteredMethods.some(method => linkedMethodIds.has(method.$id)); $: hasPaymentError = filteredMethods.some((method) => method?.lastError || method?.expired); @@ -75,10 +79,8 @@