@pelcro/react-pelcro-js 3.26.0-beta.56 → 3.26.0-beta.58

package/dist/index.cjs.js

@@ -9926,6 +9926,19 @@ function generatePassword() {
   }
   return retVal;
 }
+const refreshUser = () => {
+  var _window$Pelcro6, _window$Pelcro6$user, _window$Pelcro6$user$;
+  window.Pelcro.user.refresh({
+    auth_token: (_window$Pelcro6 = window.Pelcro) === null || _window$Pelcro6 === void 0 ? void 0 : (_window$Pelcro6$user = _window$Pelcro6.user) === null || _window$Pelcro6$user === void 0 ? void 0 : (_window$Pelcro6$user$ = _window$Pelcro6$user.read()) === null || _window$Pelcro6$user$ === void 0 ? void 0 : _window$Pelcro6$user$.auth_token
+  }, (err, res) => {
+    if (err) {
+      console.error(err);
+    }
+    if (res) {
+      return res.data;
+    }
+  });
+};
 
 const resources = {
   en: {
@@ -19655,6 +19668,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
             content: t("messages.sourceCreated")
           }
         });
+        refreshUser();
         onSuccess(res);
       });
     }
@@ -19709,6 +19723,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
                   }
                 });
               }
+              refreshUser();
               onSuccess(res);
             });
           }, 2000);
@@ -19770,6 +19785,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
             content: t("messages.sourceUpdated")
           }
         });
+        refreshUser();
         onSuccess(res);
       });
     }
@@ -20356,6 +20372,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
             type: LOADING,
             payload: false
           });
+          refreshUser();
           onSuccess(res);
           return;
         }
@@ -20371,6 +20388,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
               content: t("messages.sourceCreated")
             }
           });
+          refreshUser();
           onSuccess(res);
           return;
         }
@@ -20390,6 +20408,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
               content: t("messages.sourceUpdated")
             }
           });
+          refreshUser();
           onSuccess(res);
           return;
         }
@@ -20417,6 +20436,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
                   }
                 });
               }
+              refreshUser();
               onSuccess(res);
             });
           }, 2000);
@@ -20448,7 +20468,8 @@ const PaymentMethodContainerWithoutStripe = _ref => {
         gift_message: giftRecipient === null || giftRecipient === void 0 ? void 0 : giftRecipient.giftMessage,
         address_id: product.address_required ? selectedAddressId : null
       }, (err, res) => {
-        if (res.data.setup_intent) {
+        var _res$data;
+        if (res !== null && res !== void 0 && (_res$data = res.data) !== null && _res$data !== void 0 && _res$data.setup_intent) {
           return confirmStripeIntentSetup(res, "subCreate");
         }
         confirmStripeCardPayment(res, err, true);
@@ -20737,7 +20758,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
         auth_token: window.Pelcro.user.read().auth_token,
         token: source.id
       }, (err, res) => {
-        var _res$data, _res$data$setup_inten, _res$data2, _res$data2$setup_inte;
+        var _res$data2, _res$data2$setup_inte, _res$data3, _res$data3$setup_inte;
         if (err) {
           dispatch({
             type: DISABLE_SUBMIT,
@@ -20756,7 +20777,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
             }
           });
         }
-        if (((_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$setup_inten = _res$data.setup_intent) === null || _res$data$setup_inten === void 0 ? void 0 : _res$data$setup_inten.status) === "requires_action" || ((_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : (_res$data2$setup_inte = _res$data2.setup_intent) === null || _res$data2$setup_inte === void 0 ? void 0 : _res$data2$setup_inte.status) === "requires_confirmation") {
+        if (((_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : (_res$data2$setup_inte = _res$data2.setup_intent) === null || _res$data2$setup_inte === void 0 ? void 0 : _res$data2$setup_inte.status) === "requires_action" || ((_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : (_res$data3$setup_inte = _res$data3.setup_intent) === null || _res$data3$setup_inte === void 0 ? void 0 : _res$data3$setup_inte.status) === "requires_confirmation") {
           confirmStripeIntentSetup(res, "create");
         } else {
           dispatch({
@@ -20770,6 +20791,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
               content: t("messages.sourceCreated")
             }
           });
+          refreshUser();
           onSuccess(res);
         }
       });
@@ -20792,7 +20814,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
       exp_year: year,
       is_default: isDefault
     }, (err, res) => {
-      var _res$data3, _res$data3$setup_inte, _res$data4, _res$data4$setup_inte;
+      var _res$data4, _res$data4$setup_inte, _res$data5, _res$data5$setup_inte;
       dispatch({
         type: DISABLE_SUBMIT,
         payload: false
@@ -20811,7 +20833,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
           }
         });
       }
-      if (((_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : (_res$data3$setup_inte = _res$data3.setup_intent) === null || _res$data3$setup_inte === void 0 ? void 0 : _res$data3$setup_inte.status) === "requires_action" || ((_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : (_res$data4$setup_inte = _res$data4.setup_intent) === null || _res$data4$setup_inte === void 0 ? void 0 : _res$data4$setup_inte.status) === "requires_confirmation") {
+      if (((_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : (_res$data4$setup_inte = _res$data4.setup_intent) === null || _res$data4$setup_inte === void 0 ? void 0 : _res$data4$setup_inte.status) === "requires_action" || ((_res$data5 = res.data) === null || _res$data5 === void 0 ? void 0 : (_res$data5$setup_inte = _res$data5.setup_intent) === null || _res$data5$setup_inte === void 0 ? void 0 : _res$data5$setup_inte.status) === "requires_confirmation") {
         confirmStripeIntentSetup(res, "update");
       } else {
         dispatch({
@@ -20821,6 +20843,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
             content: t("messages.sourceUpdated")
           }
         });
+        refreshUser();
         onSuccess(res);
       }
     });
@@ -20853,7 +20876,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
         auth_token: window.Pelcro.user.read().auth_token,
         token: source.id
       }, (err, res) => {
-        var _res$data5, _res$data5$setup_inte, _res$data6, _res$data6$setup_inte;
+        var _res$data6, _res$data6$setup_inte, _res$data7, _res$data7$setup_inte;
         if (err) {
           onFailure(err);
           return dispatch({
@@ -20864,7 +20887,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
             }
           });
         }
-        if (((_res$data5 = res.data) === null || _res$data5 === void 0 ? void 0 : (_res$data5$setup_inte = _res$data5.setup_intent) === null || _res$data5$setup_inte === void 0 ? void 0 : _res$data5$setup_inte.status) === "requires_action" || ((_res$data6 = res.data) === null || _res$data6 === void 0 ? void 0 : (_res$data6$setup_inte = _res$data6.setup_intent) === null || _res$data6$setup_inte === void 0 ? void 0 : _res$data6$setup_inte.status) === "requires_confirmation") {
+        if (((_res$data6 = res.data) === null || _res$data6 === void 0 ? void 0 : (_res$data6$setup_inte = _res$data6.setup_intent) === null || _res$data6$setup_inte === void 0 ? void 0 : _res$data6$setup_inte.status) === "requires_action" || ((_res$data7 = res.data) === null || _res$data7 === void 0 ? void 0 : (_res$data7$setup_inte = _res$data7.setup_intent) === null || _res$data7$setup_inte === void 0 ? void 0 : _res$data7$setup_inte.status) === "requires_confirmation") {
           confirmStripeIntentSetup(res, "replace", paymentMethodId);
         } else {
           setTimeout(() => {
@@ -20890,6 +20913,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
                   }
                 });
               }
+              refreshUser();
               onSuccess(res);
             });
           }, 2000);
@@ -21029,12 +21053,12 @@ const PaymentMethodContainerWithoutStripe = _ref => {
         coupon_code: state === null || state === void 0 ? void 0 : state.couponCode,
         address_id: selectedAddressId
       }, (error, res) => {
-        var _res$data7, _res$data8;
+        var _res$data8, _res$data9;
         if (error) {
           return reject(error);
         }
-        const taxAmount = (_res$data7 = res.data) === null || _res$data7 === void 0 ? void 0 : _res$data7.taxes;
-        const totalAmountWithTax = (_res$data8 = res.data) === null || _res$data8 === void 0 ? void 0 : _res$data8.total;
+        const taxAmount = (_res$data8 = res.data) === null || _res$data8 === void 0 ? void 0 : _res$data8.taxes;
+        const totalAmountWithTax = (_res$data9 = res.data) === null || _res$data9 === void 0 ? void 0 : _res$data9.total;
         resolve({
           totalAmountWithTax,
           taxAmount
@@ -29642,17 +29666,21 @@ const AddressSelectModal = _ref => {
 AddressSelectModal.viewId = "address-select";
 
 const moveDefaultPaymentMethodToStart = paymentMethods => {
-  var _window$Pelcro$user$r;
-  const defaultPaymentMethod = (_window$Pelcro$user$r = window.Pelcro.user.read()) === null || _window$Pelcro$user$r === void 0 ? void 0 : _window$Pelcro$user$r.source;
+  const defaultPaymentMethod = getDefaultPaymentMethod(paymentMethods);
   const paymentMethodsWithoutDefault = paymentMethods.filter(paymentMethod => paymentMethod.id !== defaultPaymentMethod.id);
   if (defaultPaymentMethod.status !== "chargeable") {
     return paymentMethodsWithoutDefault;
   }
   return [defaultPaymentMethod, ...paymentMethodsWithoutDefault];
 };
+const getDefaultPaymentMethod = paymentMethods => {
+  const defaultPaymentMethod = paymentMethods.find(paymentMethod => paymentMethod.is_default);
+  return defaultPaymentMethod;
+};
 const initialState$5 = {
   paymentMethods: [],
   selectedPaymentMethodId: null,
+  skeletonLoader: true,
   isSubmitting: false,
   alert: {
     type: "error",
@@ -29683,12 +29711,11 @@ const PaymentMethodSelectContainer = _ref => {
     });
     return onSuccess(selectedPaymentMethodId);
   };
-  const getInitialSelectedMethodId = () => {
-    var _window$Pelcro$user$r2;
+  const getInitialSelectedMethodId = paymentMethods => {
     if (selectedPaymentMethodIdFromStore) {
       return selectedPaymentMethodIdFromStore;
     }
-    const defaultMethod = (_window$Pelcro$user$r2 = window.Pelcro.user.read()) === null || _window$Pelcro$user$r2 === void 0 ? void 0 : _window$Pelcro$user$r2.source;
+    const defaultMethod = getDefaultPaymentMethod(paymentMethods);
     if (defaultMethod && defaultMethod.status === "chargeable") {
       return String(defaultMethod.id);
     }
@@ -29705,7 +29732,12 @@ const PaymentMethodSelectContainer = _ref => {
         return lib_7({
           ...state,
           paymentMethods: moveDefaultPaymentMethodToStart(action.payload),
-          selectedPaymentMethodId: getInitialSelectedMethodId()
+          selectedPaymentMethodId: getInitialSelectedMethodId(action.payload)
+        });
+      case SKELETON_LOADER:
+        return lib_7({
+          ...state,
+          skeletonLoader: action.payload
         });
       case HANDLE_SUBMIT:
         return lib_5({
@@ -29717,10 +29749,23 @@ const PaymentMethodSelectContainer = _ref => {
     }
   }, initialState$5);
   React.useEffect(() => {
-    var _window$Pelcro$user$r3;
-    dispatch({
-      type: LOAD_PAYMENT_METHODS,
-      payload: (_window$Pelcro$user$r3 = window.Pelcro.user.read().sources) !== null && _window$Pelcro$user$r3 !== void 0 ? _window$Pelcro$user$r3 : []
+    window.Pelcro.paymentMethods.list({
+      auth_token: window.Pelcro.user.read().auth_token
+    }, (err, res) => {
+      if (err) {
+        return console.error(err);
+      }
+      if (res) {
+        var _res$data;
+        dispatch({
+          type: LOAD_PAYMENT_METHODS,
+          payload: (_res$data = res.data) !== null && _res$data !== void 0 ? _res$data : []
+        });
+        dispatch({
+          type: SKELETON_LOADER,
+          payload: false
+        });
+      }
     });
   }, []);
   return /*#__PURE__*/React__default['default'].createElement("div", {
@@ -29749,7 +29794,8 @@ const PaymentMethodSelectList = () => {
     dispatch,
     state: {
       paymentMethods,
-      selectedPaymentMethodId
+      selectedPaymentMethodId,
+      skeletonLoader
     }
   } = React.useContext(store$5);
   const handlePaymentMethodSelect = event => {
@@ -29758,7 +29804,9 @@ const PaymentMethodSelectList = () => {
       payload: event.target.value
     });
   };
-  return /*#__PURE__*/React__default['default'].createElement("div", {
+  return /*#__PURE__*/React__default['default'].createElement("div", null, skeletonLoader ? /*#__PURE__*/React__default['default'].createElement("div", {
+    className: "plc-w-full plc-h-20 plc-bg-gray-300 plc-rounded-md plc-animate-pulse"
+  }) : /*#__PURE__*/React__default['default'].createElement("div", {
     className: "plc-px-3 plc-py-2 plc-space-y-4 plc-overflow-y-scroll plc-max-h-80 pelcro-payment-method-select-wrapper"
   }, paymentMethods.map(paymentMethod => {
     var _paymentMethod$proper, _paymentMethod$proper2, _paymentMethod$proper3, _paymentMethod$proper4;
@@ -29781,7 +29829,7 @@ const PaymentMethodSelectList = () => {
     }, "\u2022\u2022\u2022\u2022 \u2022\u2022\u2022\u2022 ", (_paymentMethod$proper2 = paymentMethod.properties) === null || _paymentMethod$proper2 === void 0 ? void 0 : _paymentMethod$proper2.last4), /*#__PURE__*/React__default['default'].createElement("p", {
       className: "plc-text-sm plc-text-gray-500"
     }, t("select.expires"), " ", (_paymentMethod$proper3 = paymentMethod.properties) === null || _paymentMethod$proper3 === void 0 ? void 0 : _paymentMethod$proper3.exp_month, "/", (_paymentMethod$proper4 = paymentMethod.properties) === null || _paymentMethod$proper4 === void 0 ? void 0 : _paymentMethod$proper4.exp_year))));
-  }));
+  })));
 };
 
 const PaymentMethodSelectSubmit = _ref => {
@@ -29883,7 +29931,7 @@ const initialState$4 = {
   paymentMethods: [],
   selectedPaymentMethodId: null,
   isSubmitting: false,
-  disableSubmit: false,
+  disableSubmit: true,
   isLoading: false,
   skeletonLoader: true,
   showPaymentMethodSelect: false,
@@ -29929,6 +29977,10 @@ const PaymentMethodDeleteContainer = _ref => {
             payload: true
           });
         }
+        dispatch({
+          type: DISABLE_SUBMIT,
+          payload: false
+        });
       }
     });
   }, [paymentMethodToDelete]); // eslint-disable-line react-hooks/exhaustive-deps
@@ -29942,15 +29994,15 @@ const PaymentMethodDeleteContainer = _ref => {
       payment_method_id: paymentMethodId,
       is_default: true
     }, (err, res) => {
-      dispatch({
-        type: DISABLE_SUBMIT,
-        payload: false
-      });
-      dispatch({
-        type: LOADING,
-        payload: false
-      });
       if (err) {
+        dispatch({
+          type: DISABLE_SUBMIT,
+          payload: false
+        });
+        dispatch({
+          type: LOADING,
+          payload: false
+        });
         console.log(err);
         onFailure(err);
         return dispatch({
@@ -30164,7 +30216,7 @@ const PaymentMethodDeleteSubmit = _ref => {
     dispatch,
     state: {
       isLoading,
-      isDisabled,
+      disableSubmit,
       showPaymentMethodSelect,
       selectedPaymentMethodId
     }
@@ -30176,7 +30228,7 @@ const PaymentMethodDeleteSubmit = _ref => {
       });
       onClick === null || onClick === void 0 ? void 0 : onClick();
     },
-    disabled: showPaymentMethodSelect ? isDisabled || !selectedPaymentMethodId : isDisabled,
+    disabled: showPaymentMethodSelect ? !selectedPaymentMethodId : disableSubmit,
     isLoading: isLoading,
     className: "plc-w-full"
   }, otherProps), name !== null && name !== void 0 ? name : t("delete.buttons.delete"));

package/dist/index.esm.js

@@ -9896,6 +9896,19 @@ function generatePassword() {
   }
   return retVal;
 }
+const refreshUser = () => {
+  var _window$Pelcro6, _window$Pelcro6$user, _window$Pelcro6$user$;
+  window.Pelcro.user.refresh({
+    auth_token: (_window$Pelcro6 = window.Pelcro) === null || _window$Pelcro6 === void 0 ? void 0 : (_window$Pelcro6$user = _window$Pelcro6.user) === null || _window$Pelcro6$user === void 0 ? void 0 : (_window$Pelcro6$user$ = _window$Pelcro6$user.read()) === null || _window$Pelcro6$user$ === void 0 ? void 0 : _window$Pelcro6$user$.auth_token
+  }, (err, res) => {
+    if (err) {
+      console.error(err);
+    }
+    if (res) {
+      return res.data;
+    }
+  });
+};
 
 const resources = {
   en: {
@@ -19625,6 +19638,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
             content: t("messages.sourceCreated")
           }
         });
+        refreshUser();
         onSuccess(res);
       });
     }
@@ -19679,6 +19693,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
                   }
                 });
               }
+              refreshUser();
               onSuccess(res);
             });
           }, 2000);
@@ -19740,6 +19755,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
             content: t("messages.sourceUpdated")
           }
         });
+        refreshUser();
         onSuccess(res);
       });
     }
@@ -20326,6 +20342,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
             type: LOADING,
             payload: false
           });
+          refreshUser();
           onSuccess(res);
           return;
         }
@@ -20341,6 +20358,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
               content: t("messages.sourceCreated")
             }
           });
+          refreshUser();
           onSuccess(res);
           return;
         }
@@ -20360,6 +20378,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
               content: t("messages.sourceUpdated")
             }
           });
+          refreshUser();
           onSuccess(res);
           return;
         }
@@ -20387,6 +20406,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
                   }
                 });
               }
+              refreshUser();
               onSuccess(res);
             });
           }, 2000);
@@ -20418,7 +20438,8 @@ const PaymentMethodContainerWithoutStripe = _ref => {
         gift_message: giftRecipient === null || giftRecipient === void 0 ? void 0 : giftRecipient.giftMessage,
         address_id: product.address_required ? selectedAddressId : null
       }, (err, res) => {
-        if (res.data.setup_intent) {
+        var _res$data;
+        if (res !== null && res !== void 0 && (_res$data = res.data) !== null && _res$data !== void 0 && _res$data.setup_intent) {
           return confirmStripeIntentSetup(res, "subCreate");
         }
         confirmStripeCardPayment(res, err, true);
@@ -20707,7 +20728,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
         auth_token: window.Pelcro.user.read().auth_token,
         token: source.id
       }, (err, res) => {
-        var _res$data, _res$data$setup_inten, _res$data2, _res$data2$setup_inte;
+        var _res$data2, _res$data2$setup_inte, _res$data3, _res$data3$setup_inte;
         if (err) {
           dispatch({
             type: DISABLE_SUBMIT,
@@ -20726,7 +20747,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
             }
           });
         }
-        if (((_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$setup_inten = _res$data.setup_intent) === null || _res$data$setup_inten === void 0 ? void 0 : _res$data$setup_inten.status) === "requires_action" || ((_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : (_res$data2$setup_inte = _res$data2.setup_intent) === null || _res$data2$setup_inte === void 0 ? void 0 : _res$data2$setup_inte.status) === "requires_confirmation") {
+        if (((_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : (_res$data2$setup_inte = _res$data2.setup_intent) === null || _res$data2$setup_inte === void 0 ? void 0 : _res$data2$setup_inte.status) === "requires_action" || ((_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : (_res$data3$setup_inte = _res$data3.setup_intent) === null || _res$data3$setup_inte === void 0 ? void 0 : _res$data3$setup_inte.status) === "requires_confirmation") {
           confirmStripeIntentSetup(res, "create");
         } else {
           dispatch({
@@ -20740,6 +20761,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
               content: t("messages.sourceCreated")
             }
           });
+          refreshUser();
           onSuccess(res);
         }
       });
@@ -20762,7 +20784,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
       exp_year: year,
       is_default: isDefault
     }, (err, res) => {
-      var _res$data3, _res$data3$setup_inte, _res$data4, _res$data4$setup_inte;
+      var _res$data4, _res$data4$setup_inte, _res$data5, _res$data5$setup_inte;
       dispatch({
         type: DISABLE_SUBMIT,
         payload: false
@@ -20781,7 +20803,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
           }
         });
       }
-      if (((_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : (_res$data3$setup_inte = _res$data3.setup_intent) === null || _res$data3$setup_inte === void 0 ? void 0 : _res$data3$setup_inte.status) === "requires_action" || ((_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : (_res$data4$setup_inte = _res$data4.setup_intent) === null || _res$data4$setup_inte === void 0 ? void 0 : _res$data4$setup_inte.status) === "requires_confirmation") {
+      if (((_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : (_res$data4$setup_inte = _res$data4.setup_intent) === null || _res$data4$setup_inte === void 0 ? void 0 : _res$data4$setup_inte.status) === "requires_action" || ((_res$data5 = res.data) === null || _res$data5 === void 0 ? void 0 : (_res$data5$setup_inte = _res$data5.setup_intent) === null || _res$data5$setup_inte === void 0 ? void 0 : _res$data5$setup_inte.status) === "requires_confirmation") {
         confirmStripeIntentSetup(res, "update");
       } else {
         dispatch({
@@ -20791,6 +20813,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
             content: t("messages.sourceUpdated")
           }
         });
+        refreshUser();
         onSuccess(res);
       }
     });
@@ -20823,7 +20846,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
         auth_token: window.Pelcro.user.read().auth_token,
         token: source.id
       }, (err, res) => {
-        var _res$data5, _res$data5$setup_inte, _res$data6, _res$data6$setup_inte;
+        var _res$data6, _res$data6$setup_inte, _res$data7, _res$data7$setup_inte;
         if (err) {
           onFailure(err);
           return dispatch({
@@ -20834,7 +20857,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
             }
           });
         }
-        if (((_res$data5 = res.data) === null || _res$data5 === void 0 ? void 0 : (_res$data5$setup_inte = _res$data5.setup_intent) === null || _res$data5$setup_inte === void 0 ? void 0 : _res$data5$setup_inte.status) === "requires_action" || ((_res$data6 = res.data) === null || _res$data6 === void 0 ? void 0 : (_res$data6$setup_inte = _res$data6.setup_intent) === null || _res$data6$setup_inte === void 0 ? void 0 : _res$data6$setup_inte.status) === "requires_confirmation") {
+        if (((_res$data6 = res.data) === null || _res$data6 === void 0 ? void 0 : (_res$data6$setup_inte = _res$data6.setup_intent) === null || _res$data6$setup_inte === void 0 ? void 0 : _res$data6$setup_inte.status) === "requires_action" || ((_res$data7 = res.data) === null || _res$data7 === void 0 ? void 0 : (_res$data7$setup_inte = _res$data7.setup_intent) === null || _res$data7$setup_inte === void 0 ? void 0 : _res$data7$setup_inte.status) === "requires_confirmation") {
           confirmStripeIntentSetup(res, "replace", paymentMethodId);
         } else {
           setTimeout(() => {
@@ -20860,6 +20883,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
                   }
                 });
               }
+              refreshUser();
               onSuccess(res);
             });
           }, 2000);
@@ -20999,12 +21023,12 @@ const PaymentMethodContainerWithoutStripe = _ref => {
         coupon_code: state === null || state === void 0 ? void 0 : state.couponCode,
         address_id: selectedAddressId
       }, (error, res) => {
-        var _res$data7, _res$data8;
+        var _res$data8, _res$data9;
         if (error) {
           return reject(error);
         }
-        const taxAmount = (_res$data7 = res.data) === null || _res$data7 === void 0 ? void 0 : _res$data7.taxes;
-        const totalAmountWithTax = (_res$data8 = res.data) === null || _res$data8 === void 0 ? void 0 : _res$data8.total;
+        const taxAmount = (_res$data8 = res.data) === null || _res$data8 === void 0 ? void 0 : _res$data8.taxes;
+        const totalAmountWithTax = (_res$data9 = res.data) === null || _res$data9 === void 0 ? void 0 : _res$data9.total;
         resolve({
           totalAmountWithTax,
           taxAmount
@@ -29612,17 +29636,21 @@ const AddressSelectModal = _ref => {
 AddressSelectModal.viewId = "address-select";
 
 const moveDefaultPaymentMethodToStart = paymentMethods => {
-  var _window$Pelcro$user$r;
-  const defaultPaymentMethod = (_window$Pelcro$user$r = window.Pelcro.user.read()) === null || _window$Pelcro$user$r === void 0 ? void 0 : _window$Pelcro$user$r.source;
+  const defaultPaymentMethod = getDefaultPaymentMethod(paymentMethods);
   const paymentMethodsWithoutDefault = paymentMethods.filter(paymentMethod => paymentMethod.id !== defaultPaymentMethod.id);
   if (defaultPaymentMethod.status !== "chargeable") {
     return paymentMethodsWithoutDefault;
   }
   return [defaultPaymentMethod, ...paymentMethodsWithoutDefault];
 };
+const getDefaultPaymentMethod = paymentMethods => {
+  const defaultPaymentMethod = paymentMethods.find(paymentMethod => paymentMethod.is_default);
+  return defaultPaymentMethod;
+};
 const initialState$5 = {
   paymentMethods: [],
   selectedPaymentMethodId: null,
+  skeletonLoader: true,
   isSubmitting: false,
   alert: {
     type: "error",
@@ -29653,12 +29681,11 @@ const PaymentMethodSelectContainer = _ref => {
     });
     return onSuccess(selectedPaymentMethodId);
   };
-  const getInitialSelectedMethodId = () => {
-    var _window$Pelcro$user$r2;
+  const getInitialSelectedMethodId = paymentMethods => {
     if (selectedPaymentMethodIdFromStore) {
       return selectedPaymentMethodIdFromStore;
     }
-    const defaultMethod = (_window$Pelcro$user$r2 = window.Pelcro.user.read()) === null || _window$Pelcro$user$r2 === void 0 ? void 0 : _window$Pelcro$user$r2.source;
+    const defaultMethod = getDefaultPaymentMethod(paymentMethods);
     if (defaultMethod && defaultMethod.status === "chargeable") {
       return String(defaultMethod.id);
     }
@@ -29675,7 +29702,12 @@ const PaymentMethodSelectContainer = _ref => {
         return lib_7({
           ...state,
           paymentMethods: moveDefaultPaymentMethodToStart(action.payload),
-          selectedPaymentMethodId: getInitialSelectedMethodId()
+          selectedPaymentMethodId: getInitialSelectedMethodId(action.payload)
+        });
+      case SKELETON_LOADER:
+        return lib_7({
+          ...state,
+          skeletonLoader: action.payload
         });
       case HANDLE_SUBMIT:
         return lib_5({
@@ -29687,10 +29719,23 @@ const PaymentMethodSelectContainer = _ref => {
     }
   }, initialState$5);
   useEffect(() => {
-    var _window$Pelcro$user$r3;
-    dispatch({
-      type: LOAD_PAYMENT_METHODS,
-      payload: (_window$Pelcro$user$r3 = window.Pelcro.user.read().sources) !== null && _window$Pelcro$user$r3 !== void 0 ? _window$Pelcro$user$r3 : []
+    window.Pelcro.paymentMethods.list({
+      auth_token: window.Pelcro.user.read().auth_token
+    }, (err, res) => {
+      if (err) {
+        return console.error(err);
+      }
+      if (res) {
+        var _res$data;
+        dispatch({
+          type: LOAD_PAYMENT_METHODS,
+          payload: (_res$data = res.data) !== null && _res$data !== void 0 ? _res$data : []
+        });
+        dispatch({
+          type: SKELETON_LOADER,
+          payload: false
+        });
+      }
     });
   }, []);
   return /*#__PURE__*/React__default.createElement("div", {
@@ -29719,7 +29764,8 @@ const PaymentMethodSelectList = () => {
     dispatch,
     state: {
       paymentMethods,
-      selectedPaymentMethodId
+      selectedPaymentMethodId,
+      skeletonLoader
     }
   } = useContext(store$5);
   const handlePaymentMethodSelect = event => {
@@ -29728,7 +29774,9 @@ const PaymentMethodSelectList = () => {
       payload: event.target.value
     });
   };
-  return /*#__PURE__*/React__default.createElement("div", {
+  return /*#__PURE__*/React__default.createElement("div", null, skeletonLoader ? /*#__PURE__*/React__default.createElement("div", {
+    className: "plc-w-full plc-h-20 plc-bg-gray-300 plc-rounded-md plc-animate-pulse"
+  }) : /*#__PURE__*/React__default.createElement("div", {
     className: "plc-px-3 plc-py-2 plc-space-y-4 plc-overflow-y-scroll plc-max-h-80 pelcro-payment-method-select-wrapper"
   }, paymentMethods.map(paymentMethod => {
     var _paymentMethod$proper, _paymentMethod$proper2, _paymentMethod$proper3, _paymentMethod$proper4;
@@ -29751,7 +29799,7 @@ const PaymentMethodSelectList = () => {
     }, "\u2022\u2022\u2022\u2022 \u2022\u2022\u2022\u2022 ", (_paymentMethod$proper2 = paymentMethod.properties) === null || _paymentMethod$proper2 === void 0 ? void 0 : _paymentMethod$proper2.last4), /*#__PURE__*/React__default.createElement("p", {
       className: "plc-text-sm plc-text-gray-500"
     }, t("select.expires"), " ", (_paymentMethod$proper3 = paymentMethod.properties) === null || _paymentMethod$proper3 === void 0 ? void 0 : _paymentMethod$proper3.exp_month, "/", (_paymentMethod$proper4 = paymentMethod.properties) === null || _paymentMethod$proper4 === void 0 ? void 0 : _paymentMethod$proper4.exp_year))));
-  }));
+  })));
 };
 
 const PaymentMethodSelectSubmit = _ref => {
@@ -29853,7 +29901,7 @@ const initialState$4 = {
   paymentMethods: [],
   selectedPaymentMethodId: null,
   isSubmitting: false,
-  disableSubmit: false,
+  disableSubmit: true,
   isLoading: false,
   skeletonLoader: true,
   showPaymentMethodSelect: false,
@@ -29899,6 +29947,10 @@ const PaymentMethodDeleteContainer = _ref => {
             payload: true
           });
         }
+        dispatch({
+          type: DISABLE_SUBMIT,
+          payload: false
+        });
       }
     });
   }, [paymentMethodToDelete]); // eslint-disable-line react-hooks/exhaustive-deps
@@ -29912,15 +29964,15 @@ const PaymentMethodDeleteContainer = _ref => {
       payment_method_id: paymentMethodId,
       is_default: true
     }, (err, res) => {
-      dispatch({
-        type: DISABLE_SUBMIT,
-        payload: false
-      });
-      dispatch({
-        type: LOADING,
-        payload: false
-      });
       if (err) {
+        dispatch({
+          type: DISABLE_SUBMIT,
+          payload: false
+        });
+        dispatch({
+          type: LOADING,
+          payload: false
+        });
         console.log(err);
         onFailure(err);
         return dispatch({
@@ -30134,7 +30186,7 @@ const PaymentMethodDeleteSubmit = _ref => {
     dispatch,
     state: {
       isLoading,
-      isDisabled,
+      disableSubmit,
       showPaymentMethodSelect,
       selectedPaymentMethodId
     }
@@ -30146,7 +30198,7 @@ const PaymentMethodDeleteSubmit = _ref => {
       });
       onClick === null || onClick === void 0 ? void 0 : onClick();
     },
-    disabled: showPaymentMethodSelect ? isDisabled || !selectedPaymentMethodId : isDisabled,
+    disabled: showPaymentMethodSelect ? !selectedPaymentMethodId : disableSubmit,
     isLoading: isLoading,
     className: "plc-w-full"
   }, otherProps), name !== null && name !== void 0 ? name : t("delete.buttons.delete"));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pelcro/react-pelcro-js",
   "description": "Pelcro's React UI Elements",
-  "version": "3.26.0-beta.56",
+  "version": "3.26.0-beta.58",
   "license": "MIT",
   "private": false,
   "main": "dist/index.cjs.js",