Merge pull request #2666 from appwrite/fix-retry-payment-model

Fix: retry payment model while adding new payment method

Author: lohanidamodar

src/routes/(console)/organization-[organization]/billing/retryPaymentModal.svelte

@@ -55,7 +55,7 @@
     async function handleSubmit() {
         isButtonDisabled = true;
         try {
-            if (paymentMethodId === null) {
+            if (paymentMethodId === null || paymentMethodId === '$new') {
                 try {
                     if (showState && !state) {
                         throw Error('Please select a state');
@@ -65,13 +65,17 @@
                         method = await setPaymentMethod(paymentMethod.id, name, state);
                     } else {
                         const card = await submitStripeCard(name, $organization.$id);
-                        if (card && Object.hasOwn(card, 'id')) {
+                        // When Stripe returns an expanded PaymentMethod for US cards, we need state.
+                        if (Object.hasOwn(card, 'id') && (card as PaymentMethod)?.card) {
                             if ((card as PaymentMethod).card?.country === 'US') {
                                 paymentMethod = card as PaymentMethod;
                                 showState = true;
                                 return;
                             }
-                        } else if (card && Object.hasOwn(card, '$id')) {
+                        }
+
+                        // Otherwise, we expect an Appwrite PaymentMethodData with `$id`.
+                        if (Object.hasOwn(card, '$id')) {
                             method = card as PaymentMethodData;
                         }
                     }