@frontegg/redux-store 5.29.0 → 5.31.0

package/node/subscriptions/index.js

@@ -47,7 +47,7 @@ const { actions: sliceActions$2, reducer: reducer$8, name: name$7 } = toolkit.cr
     initialState: plansInitialState,
     reducers: Object.assign({}, createModuleCaseReducers()),
 });
-const actions$8 = Object.assign({ loadPlans: toolkit.createAction(`${name$7}/loadPlans`) }, sliceActions$2);
+const actions$9 = Object.assign({ loadPlans: toolkit.createAction(`${name$7}/loadPlans`) }, sliceActions$2);
 
 const configInitialState = {
     loading: false,
@@ -61,7 +61,7 @@ const { actions: configActions, reducer: reducer$7, name: name$6, } = toolkit.cr
     initialState: configInitialState,
     reducers: reducers$6,
 });
-const actions$7 = Object.assign({ loadPaymentConfiguration: toolkit.createAction(`${name$6}/loadPaymentConfiguration`) }, configActions);
+const actions$8 = Object.assign({ loadPaymentConfiguration: toolkit.createAction(`${name$6}/loadPaymentConfiguration`) }, configActions);
 
 const initialBillingInformationState = {
     loading: false,
@@ -82,7 +82,7 @@ const { reducer: reducer$6, actions: overviewActions, name: name$5, } = toolkit.
     initialState: initialBillingInformationState,
     reducers: reducers$5,
 });
-const actions$6 = Object.assign({ loadBillingInformation: toolkit.createAction(`${name$5}/loadBillingInformation`), cancelSubscription: toolkit.createAction(`${name$5}/cancelSubscription`), renewSubscription: toolkit.createAction(`${name$5}/renewSubscription`) }, overviewActions);
+const actions$7 = Object.assign({ loadBillingInformation: toolkit.createAction(`${name$5}/loadBillingInformation`), cancelSubscription: toolkit.createAction(`${name$5}/cancelSubscription`), renewSubscription: toolkit.createAction(`${name$5}/renewSubscription`) }, overviewActions);
 
 const initialPaymentMethodState = {
     loading: false,
@@ -98,7 +98,7 @@ const { reducer: reducer$5, actions: paymentActions, name: name$4, } = toolkit.c
     initialState: initialPaymentMethodState,
     reducers: reducers$4,
 });
-const actions$5 = Object.assign({ loadPaymentMethod: toolkit.createAction(`${name$4}/loadPaymentMethod`), submitPaymentMethod: toolkit.createAction(`${name$4}/submitPaymentMethod`), submitPaymentMethodError: toolkit.createAction(`${name$4}/submitPaymentMethodError`), submitPaymentMethodSuccess: toolkit.createAction(`${name$4}/submitPaymentMethodSuccess`), updatePaymentMethodBillingDetails: toolkit.createAction(`${name$4}/updateBillingDetails`, (payload) => ({ payload })) }, paymentActions);
+const actions$6 = Object.assign({ loadPaymentMethod: toolkit.createAction(`${name$4}/loadPaymentMethod`), submitPaymentMethod: toolkit.createAction(`${name$4}/submitPaymentMethod`), submitPaymentMethodError: toolkit.createAction(`${name$4}/submitPaymentMethodError`), submitPaymentMethodSuccess: toolkit.createAction(`${name$4}/submitPaymentMethodSuccess`), updatePaymentMethodBillingDetails: toolkit.createAction(`${name$4}/updateBillingDetails`, (payload) => ({ payload })) }, paymentActions);
 
 const initialInvoicesState = {
     loading: false,
@@ -119,7 +119,11 @@ const { reducer: reducer$4, actions: sliceActions$1, name: name$3, } = toolkit.c
     initialState: initialInvoicesState,
     reducers: reducers$3,
 });
-const actions$4 = Object.assign({ loadInvoices: toolkit.createAction(`${name$3}/loadInvoices`), downloadInvoice: toolkit.createAction(`${name$3}/downloadInvoice`, (payload) => ({ payload })) }, sliceActions$1);
+const actions$5 = Object.assign({ loadInvoices: toolkit.createAction(`${name$3}/loadInvoices`), downloadInvoice: toolkit.createAction(`${name$3}/downloadInvoice`, (payload) => ({ payload })) }, sliceActions$1);
+
+const actions$4 = {
+    load: toolkit.createAction(`${constants.subscriptionsStoreName}/subscription/load`),
+};
 
 const billingInitialState = {
     information: initialBillingInformationState,
@@ -127,9 +131,10 @@ const billingInitialState = {
     paymentMethod: initialPaymentMethodState,
 };
 const billingActions = {
-    invoices: actions$4,
-    information: actions$6,
-    paymentMethod: actions$5,
+    invoices: actions$5,
+    information: actions$7,
+    paymentMethod: actions$6,
+    subscription: actions$4,
 };
 const billingReducer = toolkit.combineReducers({
     invoices: reducer$4,
@@ -179,10 +184,7 @@ const initialSubscriptionStripeState = {
     error: null,
     cardSetupIntentSecret: null,
 };
-const reducers$1 = Object.assign(Object.assign({}, createModuleCaseReducers()), { setStripeState: {
-        prepare: (payload) => ({ payload }),
-        reducer: (state, action) => (Object.assign(Object.assign({}, state), action.payload)),
-    } });
+const reducers$1 = Object.assign({}, createModuleCaseReducers());
 const { reducer: reducer$2, actions: reducerActions, name: name$1, } = toolkit.createSlice({
     name: `${constants.subscriptionsStoreName}/stripe`,
     initialState: initialSubscriptionStripeState,
@@ -213,9 +215,9 @@ const initialState = {
     managedSubscriptions: managedSubscriptionsInitialState,
 };
 const actions = {
-    config: actions$7,
+    config: actions$8,
     billing: billingActions,
-    plans: actions$8,
+    plans: actions$9,
     checkout: actions$3,
     stripe: actions$2,
     managedSubscriptions: actions$1,
@@ -360,49 +362,48 @@ const paymentMethodsMock = [
 ];
 
 function* subscriptionBillingInformationSagas() {
-    yield effects.takeEvery(actions$6.loadBillingInformation, loadBillingInformation);
-    yield effects.takeEvery(actions$6.cancelSubscription, cancelSubscription);
-    yield effects.takeEvery(actions$6.renewSubscription, renewSubscription);
+    yield effects.takeEvery(actions$7.loadBillingInformation, loadBillingInformation);
+    yield effects.takeEvery(actions$7.cancelSubscription, cancelSubscription);
+    yield effects.takeEvery(actions$7.renewSubscription, renewSubscription);
     yield effects.takeEvery(actions$3.checkoutEvent, checkoutEvent$2);
 }
 function* loadBillingInformation() {
     const paymentProvider = yield effects.select((state) => { var _a; return (_a = state.subscriptions.config.config) === null || _a === void 0 ? void 0 : _a.paymentProvider; });
     const tenantId = yield effects.select((state) => { var _a, _b, _c; return (_c = (_b = (_a = state.auth) === null || _a === void 0 ? void 0 : _a.profileState) === null || _b === void 0 ? void 0 : _b.profile) === null || _c === void 0 ? void 0 : _c.tenantId; });
-    yield effects.put(actions$6.setLoading(true));
     if (!paymentProvider || !tenantId) {
-        yield effects.put(actions$6.setError(!paymentProvider ? 'Internal feature failure' : 'Not authorized'));
+        yield effects.put(actions$7.setError(!paymentProvider ? 'Internal feature failure' : 'Not authorized'));
         return;
     }
-    try {
-        yield loadSummaries(tenantId);
-    }
-    catch (e) {
-        yield effects.put(actions$6.setError(e.message));
-    }
+    yield loadSummaries(tenantId);
 }
 function* loadSummaries(tenantId) {
     var _a, _b;
-    yield effects.put(actions$6.setLoading(true));
+    yield effects.put(actions$7.setLoading(true));
     try {
         const summary = yield effects.call(restApi.api.subscriptions.getSubscriptionSummaries, tenantId);
-        const { currentPlanId, subscriptionId, } = summary;
-        const subscriptionResponse = yield effects.call(restApi.api.subscriptions.getManagedSubscription, subscriptionId);
-        const planResponse = yield effects.call(restApi.api.subscriptions.getSubscriptionPlan, currentPlanId);
-        yield effects.put(actions$6.setState(Object.assign(Object.assign({ loading: false, fetching: false, summary }, (subscriptionResponse
+        const { currentPlanId, externallyManaged, subscriptionId } = summary;
+        let subscriptionResponse = null;
+        let planResponse;
+        if (!externallyManaged) {
+            [subscriptionResponse, planResponse] = yield effects.all([
+                effects.call(restApi.api.subscriptions.getManagedSubscription, subscriptionId),
+                effects.call(restApi.api.subscriptions.getSubscriptionPlan, currentPlanId),
+            ]);
+        }
+        else {
+            planResponse = yield effects.call(restApi.api.subscriptions.getSubscriptionPlan, currentPlanId);
+        }
+        yield effects.put(actions$7.setState(Object.assign(Object.assign({ loading: false, fetching: false, summary }, (subscriptionResponse
             ? {
                 subscription: {
                     id: subscriptionResponse.id,
                     externalId: subscriptionResponse.externalId,
-                    startDate: new Date(subscriptionResponse.startDate),
-                    currentPeriodStart: new Date(subscriptionResponse.currentPeriodStart),
-                    currentPeriodEnd: new Date(subscriptionResponse.currentPeriodEnd),
+                    startDate: subscriptionResponse.startDate,
+                    currentPeriodStart: subscriptionResponse.currentPeriodStart,
+                    currentPeriodEnd: subscriptionResponse.currentPeriodEnd,
                     status: toSubscriptionStatus(subscriptionResponse.status),
                     cancellation: subscriptionResponse.cancellation && toSubscriptionCancellation(subscriptionResponse.cancellation),
-                    items: subscriptionResponse.items.map((subscriptionItem) => ({
-                        id: subscriptionItem.id,
-                        planId: subscriptionItem.planId,
-                    })),
-                    trialEnd: subscriptionResponse.trialEnd ? new Date(subscriptionResponse.trialEnd) : null,
+                    trialEnd: subscriptionResponse.trialEnd ? subscriptionResponse.trialEnd : null,
                 },
             }
             : {})), (planResponse
@@ -419,34 +420,33 @@ function* loadSummaries(tenantId) {
             : {}))));
     }
     catch (e) {
-        yield effects.put(actions$6.setError(e.message));
+        yield effects.put(actions$7.setError(e.message));
     }
 }
 function* cancelSubscription() {
-    var _a;
-    const overview = yield effects.select((state) => state.subscriptions.billing.information);
-    if (!overview.subscription) {
+    const { summary, subscription } = yield effects.select((state) => state.subscriptions.billing.information);
+    if (!subscription) {
         return;
     }
-    if ((_a = overview.summary) === null || _a === void 0 ? void 0 : _a.externallyManaged) {
-        yield effects.put(actions$6.setCancellationError('Billing is externally managed'));
+    if (summary === null || summary === void 0 ? void 0 : summary.externallyManaged) {
+        yield effects.put(actions$7.setCancellationError('Billing is externally managed'));
         return;
     }
-    const { id: subscriptionId, cancellation, status } = overview.subscription || {};
+    const { id: subscriptionId, cancellation, status } = subscription || {};
     const isCancellable = !cancellation && status === exports.SubscriptionStatus.ACTIVE;
     if (isCancellable) {
         try {
-            yield effects.put(actions$6.setCancellationLoading(true));
+            yield effects.put(actions$7.setCancellationLoading(true));
             yield effects.call(restApi.api.subscriptions.cancelManagedSubscription, subscriptionId);
-            yield effects.put(actions$6.setState({
-                subscription: Object.assign(Object.assign({}, overview.subscription), { cancellation: {
+            yield effects.put(actions$7.setState({
+                subscription: Object.assign(Object.assign({}, subscription), { cancellation: {
                         policy: exports.SubscriptionCancellationPolicy.AT_PERIOD_END,
                     } }),
             }));
-            yield effects.put(actions$6.setCancellationLoading(false));
+            yield effects.put(actions$7.setCancellationLoading(false));
         }
         catch (e) {
-            yield effects.put(actions$6.setCancellationError(e.message));
+            yield effects.put(actions$7.setCancellationError(e.message));
         }
     }
 }
@@ -457,22 +457,22 @@ function* renewSubscription() {
         return;
     }
     if ((_a = overview.summary) === null || _a === void 0 ? void 0 : _a.externallyManaged) {
-        yield effects.put(actions$6.setCancellationError('Billing is externally managed'));
+        yield effects.put(actions$7.setCancellationError('Billing is externally managed'));
         return;
     }
     const { id: subscriptionId, cancellation } = overview.subscription || {};
     const renewable = (cancellation === null || cancellation === void 0 ? void 0 : cancellation.policy) === exports.SubscriptionCancellationPolicy.AT_PERIOD_END;
     if (renewable) {
         try {
-            yield effects.put(actions$6.setRenewalLoading(true));
+            yield effects.put(actions$7.setRenewalLoading(true));
             yield effects.call(restApi.api.subscriptions.renewManagedSubscription, subscriptionId);
-            yield effects.put(actions$6.setState({
+            yield effects.put(actions$7.setState({
                 subscription: Object.assign(Object.assign({}, overview.subscription), { cancellation: null }),
             }));
-            yield effects.put(actions$6.setRenewalLoading(false));
+            yield effects.put(actions$7.setRenewalLoading(false));
         }
         catch (e) {
-            yield effects.put(actions$6.setCancellationError(e.message));
+            yield effects.put(actions$7.setCancellationError(e.message));
         }
     }
 }
@@ -485,14 +485,13 @@ function* checkoutEvent$2({ payload }) {
  *  Preview Sagas
  *********************************/
 function* loadBillingInformationMock() {
-    yield effects.put(actions$6.setLoading(true));
     yield loadSummariesMock();
 }
 function* loadSummariesMock() {
     var _a, _b;
-    yield effects.put(actions$6.setLoading(true));
+    yield effects.put(actions$7.setLoading(true));
     yield effects.delay(500);
-    yield effects.put(actions$6.setState({
+    yield effects.put(actions$7.setState({
         loading: false,
         fetching: false,
         summary: {
@@ -504,35 +503,35 @@ function* loadSummariesMock() {
             currentPlanId: planResponseMock[0].id,
             defaultPlanId: planResponseMock[0].id,
         },
-        subscription: Object.assign(Object.assign({}, subscriptionResponseMock), { startDate: new Date(subscriptionResponseMock.startDate), currentPeriodStart: new Date(subscriptionResponseMock.currentPeriodStart), currentPeriodEnd: new Date(subscriptionResponseMock.currentPeriodEnd), status: toSubscriptionStatus(subscriptionResponseMock.status), cancellation: subscriptionResponseMock.cancellation && toSubscriptionCancellation(subscriptionResponseMock.cancellation), items: subscriptionResponseMock.items, trialEnd: null }),
+        subscription: Object.assign(Object.assign({}, subscriptionResponseMock), { startDate: subscriptionResponseMock.startDate, currentPeriodStart: subscriptionResponseMock.currentPeriodStart, currentPeriodEnd: subscriptionResponseMock.currentPeriodEnd, status: toSubscriptionStatus(subscriptionResponseMock.status), cancellation: subscriptionResponseMock.cancellation && toSubscriptionCancellation(subscriptionResponseMock.cancellation), trialEnd: null }),
         plan: Object.assign(Object.assign({}, planResponseMock[0]), { price: (_a = planResponseMock[0].price) === null || _a === void 0 ? void 0 : _a.amount, currency: (_b = planResponseMock[0].price) === null || _b === void 0 ? void 0 : _b.currency, recurringInterval: 'month' }),
     }));
 }
 function* subscriptionBillingInformationSagasMock() {
-    yield effects.takeEvery(actions$6.loadBillingInformation, loadBillingInformationMock);
+    yield effects.takeEvery(actions$7.loadBillingInformation, loadBillingInformationMock);
 }
 
 function* subscriptionsPaymentMethodSagas() {
-    yield effects.takeEvery(actions$5.loadPaymentMethod, loadPaymentMethod);
-    yield effects.takeEvery(actions$5.submitPaymentMethod, submitPaymentMethod);
-    yield effects.takeEvery(actions$5.submitPaymentMethodError, submitPaymentMethodError);
-    yield effects.takeEvery(actions$5.submitPaymentMethodSuccess, submitPaymentMethodSuccess);
-    yield effects.takeEvery(actions$5.updatePaymentMethodBillingDetails, updateBillingDetails);
+    yield effects.takeEvery(actions$6.loadPaymentMethod, loadPaymentMethod);
+    yield effects.takeEvery(actions$6.submitPaymentMethod, submitPaymentMethod);
+    yield effects.takeEvery(actions$6.submitPaymentMethodError, submitPaymentMethodError);
+    yield effects.takeEvery(actions$6.submitPaymentMethodSuccess, submitPaymentMethodSuccess);
+    yield effects.takeEvery(actions$6.updatePaymentMethodBillingDetails, updateBillingDetails);
     yield effects.takeEvery(actions$3.checkoutEvent, checkoutEvent$1);
 }
 function* loadPaymentMethod() {
-    yield effects.put(actions$5.setLoading(true));
+    yield effects.put(actions$6.setLoading(true));
     try {
         const paymentMethods = yield effects.call(restApi.api.subscriptions.getPaymentMethods);
         const paymentMethod = paymentMethods[0];
-        yield effects.put(actions$5.setState({
+        yield effects.put(actions$6.setState({
             paymentMethod,
             loading: false,
             fetching: false,
         }));
     }
     catch (e) {
-        yield effects.put(actions$5.setError(e.message));
+        yield effects.put(actions$6.setError(e.message));
     }
 }
 function* checkoutEvent$1({ payload }) {
@@ -541,7 +540,7 @@ function* checkoutEvent$1({ payload }) {
     }
 }
 function* updateBillingDetails({ payload, }) {
-    yield effects.put(actions$5.setLoading(true));
+    yield effects.put(actions$6.setLoading(true));
     const { id, email, address, callback } = payload;
     try {
         yield effects.call(restApi.api.subscriptions.updatePaymentMethodBillingDetails, id, Object.assign({ email }, address));
@@ -549,44 +548,44 @@ function* updateBillingDetails({ payload, }) {
         callback === null || callback === void 0 ? void 0 : callback(true);
     }
     catch (e) {
-        yield effects.put(actions$5.setError(e.message));
+        yield effects.put(actions$6.setError(e.message));
         callback === null || callback === void 0 ? void 0 : callback(false);
     }
-    yield effects.put(actions$5.setLoading(false));
+    yield effects.put(actions$6.setLoading(false));
 }
 function* submitPaymentMethod() {
-    yield effects.put(actions$5.setLoading(true));
+    yield effects.put(actions$6.setLoading(true));
 }
 function* submitPaymentMethodError({ payload: error }) {
-    yield effects.put(actions$5.setError(error));
+    yield effects.put(actions$6.setError(error));
 }
 function* submitPaymentMethodSuccess() {
-    yield effects.put(actions$5.loadPaymentMethod());
+    yield effects.put(actions$6.loadPaymentMethod());
 }
 /*********************************
  *  Preview Sagas
  *********************************/
 function* loadPaymentMethodMock() {
-    yield effects.put(actions$5.setLoading(true));
+    yield effects.put(actions$6.setLoading(true));
     yield effects.delay(500);
     const paymentMethod = paymentMethodsMock[0];
-    yield effects.put(actions$5.setState({
+    yield effects.put(actions$6.setState({
         paymentMethod,
         loading: false,
         fetching: false,
     }));
 }
 function* subscriptionsPaymentMethodSagasMock() {
-    yield effects.takeEvery(actions$5.loadPaymentMethod, loadPaymentMethodMock);
+    yield effects.takeEvery(actions$6.loadPaymentMethod, loadPaymentMethodMock);
 }
 
 function* subscriptionInvoicesSagas() {
-    yield effects.takeEvery(actions$4.loadInvoices, loadInvoices);
-    yield effects.takeEvery(actions$4.downloadInvoice, downloadInvoice);
+    yield effects.takeEvery(actions$5.loadInvoices, loadInvoices);
+    yield effects.takeEvery(actions$5.downloadInvoice, downloadInvoice);
     yield effects.takeEvery(actions$3.checkoutEvent, checkoutEvent);
 }
 function* loadInvoices() {
-    yield effects.put(actions$4.setLoading(true));
+    yield effects.put(actions$5.setLoading(true));
     try {
         const responseInvoices = yield effects.call(restApi.api.subscriptions.getSubscriptionInvoices);
         const invoices = responseInvoices.map((invoice) => ({
@@ -599,24 +598,24 @@ function* loadInvoices() {
             paid: invoice.paid || false,
             receiptNumber: invoice.receiptNumber,
         }));
-        yield effects.put(actions$4.setState({
+        yield effects.put(actions$5.setState({
             loading: false,
             fetching: false,
             invoices,
         }));
     }
     catch (e) {
-        yield effects.put(actions$4.setError(e.message));
+        yield effects.put(actions$5.setError(e.message));
     }
 }
 function* downloadInvoice({ payload }) {
-    yield effects.put(actions$4.setInvoiceDownloadState({ loading: true, error: null }));
+    yield effects.put(actions$5.setInvoiceDownloadState({ loading: true, error: null }));
     try {
         yield effects.call(restApi.api.subscriptions.getSubscriptionInvoicePdf, payload.invoiceId, payload.filename);
-        yield effects.put(actions$4.setInvoiceDownloadState({ loading: false, error: null }));
+        yield effects.put(actions$5.setInvoiceDownloadState({ loading: false, error: null }));
     }
     catch (e) {
-        yield effects.put(actions$4.setInvoiceDownloadState({ loading: false, error: e.message || null }));
+        yield effects.put(actions$5.setInvoiceDownloadState({ loading: false, error: e.message || null }));
     }
 }
 function* checkoutEvent({ payload }) {
@@ -628,18 +627,35 @@ function* checkoutEvent({ payload }) {
  *  Preview Sagas
  *********************************/
 function* loadInvoicesMock() {
-    yield effects.put(actions$4.setLoading(true));
+    yield effects.put(actions$5.setLoading(true));
     yield effects.delay(500);
     const selectPlanTitle = 'Premium';
-    yield effects.put(actions$4.setState({
+    yield effects.put(actions$5.setState({
         loading: false,
         fetching: false,
         invoices: invoicesMock.map((invoice) => (Object.assign(Object.assign({}, invoice), { selectedPlan: selectPlanTitle, paymentDate: new Date(Date.parse(invoice.paymentDate)), totalAmount: +((invoice.totalAmount || 0) / 100).toFixed(2) }))),
     }));
-    yield effects.put(actions$4.setLoading(false));
+    yield effects.put(actions$5.setLoading(false));
 }
 function* subscriptionInvoicesSagasMock() {
-    yield effects.takeEvery(actions$4.loadInvoices, loadInvoicesMock);
+    yield effects.takeEvery(actions$5.loadInvoices, loadInvoicesMock);
+}
+
+function* subscriptionSagas() {
+    yield effects.takeEvery(actions$4.load, loadSubscription);
+}
+function* loadSubscription() {
+    const profile = yield effects.select((state) => { var _a, _b; return (_b = (_a = state.auth) === null || _a === void 0 ? void 0 : _a.profileState) === null || _b === void 0 ? void 0 : _b.profile; });
+    yield loadSummaries(profile.tenantId);
+}
+/*********************************
+ *  Preview Sagas
+ *********************************/
+function* loadMock() {
+    yield loadSummariesMock();
+}
+function* subscriptionSagasMock() {
+    yield effects.takeEvery(actions$4.load, loadMock);
 }
 
 function* billingSagas() {
@@ -647,6 +663,7 @@ function* billingSagas() {
         effects.call(subscriptionBillingInformationSagas),
         effects.call(subscriptionsPaymentMethodSagas),
         effects.call(subscriptionInvoicesSagas),
+        effects.call(subscriptionSagas),
     ]);
 }
 function* billingSagasMock() {
@@ -654,6 +671,7 @@ function* billingSagasMock() {
         effects.call(subscriptionBillingInformationSagasMock),
         effects.call(subscriptionsPaymentMethodSagasMock),
         effects.call(subscriptionInvoicesSagasMock),
+        effects.call(subscriptionSagasMock),
     ]);
 }
 
@@ -666,18 +684,6 @@ function* checkoutSagas() {
     yield effects.takeEvery(actions$3.errorCheckout, errorCheckout);
 }
 function* checkoutPlan({ payload: planId }) {
-    const { subscription, summary } = yield effects.select((state) => state.subscriptions.billing.information);
-    const isTrialing = (subscription === null || subscription === void 0 ? void 0 : subscription.trialEnd) || (subscription === null || subscription === void 0 ? void 0 : subscription.status) === exports.SubscriptionStatus.TRIALING;
-    const hasPaymentMethod = !!(summary === null || summary === void 0 ? void 0 : summary.paymentMethodId);
-    if (isTrialing && hasPaymentMethod) {
-        yield effects.put(actions$3.setState({
-            checkoutPlanId: null,
-            loading: false,
-            status: exports.CheckoutStatus.CONFIRM,
-        }));
-        yield effects.put(actions$3.checkoutEvent(exports.CheckoutEvent.CONFIRMED));
-        return;
-    }
     yield effects.put(actions$3.setState({
         checkoutPlanId: planId,
         loading: false,
@@ -693,18 +699,29 @@ function* resetCheckout() {
     }));
 }
 function* confirmPlan({ payload: paymentMethodId }) {
-    const { subscription, status, planId } = yield effects.select(({ subscriptions: { billing: { information }, checkout, }, }) => ({
-        subscription: information.subscription,
-        status: checkout.status,
-        planId: checkout.checkoutPlanId,
+    const { checkout: { status, checkoutPlanId, }, subscription, summary } = yield effects.select(({ subscriptions: { billing: { information: { summary, subscription } }, checkout, }, }) => ({
+        subscription,
+        summary,
+        checkout,
     }));
-    if (!planId || !subscription) {
+    const isTrialing = (subscription === null || subscription === void 0 ? void 0 : subscription.trialEnd) || (subscription === null || subscription === void 0 ? void 0 : subscription.status) === exports.SubscriptionStatus.TRIALING;
+    const hasPaymentMethod = !!(summary === null || summary === void 0 ? void 0 : summary.paymentMethodId);
+    if (!checkoutPlanId || !subscription) {
         yield effects.put(actions$3.setState({
             loading: false,
             status: exports.CheckoutStatus.ERROR,
         }));
         return;
     }
+    if (isTrialing && hasPaymentMethod) {
+        yield effects.put(actions$3.setState({
+            checkoutPlanId: null,
+            loading: false,
+            status: exports.CheckoutStatus.CONFIRM,
+        }));
+        yield effects.put(actions$3.checkoutEvent(exports.CheckoutEvent.CONFIRMED));
+        return;
+    }
     if (status === exports.CheckoutStatus.CHECKOUT) {
         yield effects.put(actions$3.setState({
             loading: true,
@@ -713,7 +730,7 @@ function* confirmPlan({ payload: paymentMethodId }) {
         try {
             yield effects.call(restApi.api.subscriptions.updateManagedSubscription, subscription.id, {
                 paymentMethodId,
-                planId,
+                planId: checkoutPlanId,
             });
             yield effects.put(actions$3.setState({
                 checkoutPlanId: null,
@@ -775,10 +792,10 @@ function* checkoutSagasMock() {
 }
 
 function* plansSagas() {
-    yield effects.takeEvery(actions$8.loadPlans, loadPlans);
+    yield effects.takeEvery(actions$9.loadPlans, loadPlans);
 }
 function* loadPlans() {
-    yield effects.put(actions$8.setLoading(true));
+    yield effects.put(actions$9.setLoading(true));
     try {
         const products = yield effects.call(restApi.api.subscriptions.getSubscriptionPlans);
         const plans = products.map((item) => {
@@ -787,38 +804,38 @@ function* loadPlans() {
                 id: item.id,
                 name: item.name,
                 description: item.description,
-                price: +((((_a = item.price) === null || _a === void 0 ? void 0 : _a.amount) || 0) / 100).toFixed(2),
+                price: ((_a = item.price) === null || _a === void 0 ? void 0 : _a.amount) || 0,
                 currency: ((_b = item.price) === null || _b === void 0 ? void 0 : _b.currency) || 'usd',
                 recurringInterval: 'month',
             });
         });
-        yield effects.put(actions$8.setState({
+        yield effects.put(actions$9.setState({
             fetching: false,
             loading: false,
             plans,
         }));
     }
     catch (e) {
-        yield effects.put(actions$8.setError(e.message));
+        yield effects.put(actions$9.setError(e.message));
     }
 }
 /*********************************
  *  Preview Sagas
  *********************************/
 function* loadPlansMock() {
-    yield effects.put(actions$8.setLoading(true));
+    yield effects.put(actions$9.setLoading(true));
     yield effects.delay(500);
-    yield effects.put(actions$8.setState({
+    yield effects.put(actions$9.setState({
         fetching: false,
         loading: false,
         plans: planResponseMock.map((item) => {
             var _a, _b;
-            return (Object.assign(Object.assign({}, item), { price: +((((_a = item.price) === null || _a === void 0 ? void 0 : _a.amount) || 0) / 100).toFixed(2), currency: ((_b = item.price) === null || _b === void 0 ? void 0 : _b.currency) || 'usd', recurringInterval: 'month' }));
+            return (Object.assign(Object.assign({}, item), { price: ((_a = item.price) === null || _a === void 0 ? void 0 : _a.amount) || 0, currency: ((_b = item.price) === null || _b === void 0 ? void 0 : _b.currency) || 'usd', recurringInterval: 'month' }));
         }),
     }));
 }
 function* plansSagasMock() {
-    yield effects.takeEvery(actions$8.loadPlans, loadPlansMock);
+    yield effects.takeEvery(actions$9.loadPlans, loadPlansMock);
 }
 
 exports.PaymentMethodType = void 0;
@@ -828,10 +845,10 @@ exports.PaymentMethodType = void 0;
 })(exports.PaymentMethodType || (exports.PaymentMethodType = {}));
 
 function* configSagas() {
-    yield effects.takeEvery(actions$7.loadPaymentConfiguration, loadPaymentConfiguration);
+    yield effects.takeEvery(actions$8.loadPaymentConfiguration, loadPaymentConfiguration);
 }
 function* loadPaymentConfiguration() {
-    yield effects.put(actions$7.setLoading(true));
+    yield effects.put(actions$8.setLoading(true));
     try {
         const response = yield effects.call(restApi.api.subscriptions.getPaymentProviders) || [];
         const stripePaymentProvider = response.find((paymentProvider) => paymentProvider.status === '1' && paymentProvider.providerType === restApi.ProviderType.Stripe);
@@ -839,18 +856,18 @@ function* loadPaymentConfiguration() {
             yield loadStripePaymentConfiguration();
         }
         else {
-            yield effects.put(actions$7.setError('Payment provider not configured'));
+            yield effects.put(actions$8.setError('Payment provider not configured'));
         }
     }
     catch (e) {
-        yield effects.put(actions$7.setError(e.message));
+        yield effects.put(actions$8.setError(e.message));
     }
 }
 function* loadStripePaymentConfiguration() {
-    yield effects.put(actions$7.setLoading(true));
+    yield effects.put(actions$8.setLoading(true));
     try {
         const response = yield effects.call(restApi.api.subscriptions.getStripePaymentProviderConfiguration);
-        yield effects.put(actions$7.setState({
+        yield effects.put(actions$8.setState({
             loading: false,
             fetching: false,
             config: {
@@ -860,16 +877,16 @@ function* loadStripePaymentConfiguration() {
         }));
     }
     catch (e) {
-        yield effects.put(actions$7.setError(e.message));
+        yield effects.put(actions$8.setError(e.message));
     }
 }
 /*********************************
  *  Preview Sagas
  *********************************/
 function* loadPaymentConfigurationMock() {
-    yield effects.put(actions$7.setLoading(true));
+    yield effects.put(actions$8.setLoading(true));
     yield effects.delay(500);
-    yield effects.put(actions$7.setState({
+    yield effects.put(actions$8.setState({
         loading: false,
         fetching: false,
         config: {
@@ -879,25 +896,27 @@ function* loadPaymentConfigurationMock() {
     }));
 }
 function* configSagasMock() {
-    yield effects.takeEvery(actions$7.loadPaymentConfiguration, loadPaymentConfigurationMock);
+    yield effects.takeEvery(actions$8.loadPaymentConfiguration, loadPaymentConfigurationMock);
 }
 
 function* subscriptionStripeSagas() {
     yield effects.takeEvery(actions$2.createCardSetupIntentSecret, createCardSetupIntentSecret);
 }
 function* createCardSetupIntentSecret({ payload }) {
-    yield effects.put(actions$2.setStripeState({
+    yield effects.put(actions$2.setState({
         loading: true,
         error: null,
-        cardSetupIntentSecret: null
+        cardSetupIntentSecret: null,
     }));
     try {
-        const { setupIntentSecret } = yield effects.call(restApi.api.subscriptions.createStripePaymentMethodSetupIntentSecret, {
-            paymentMethodId: payload || undefined
-        });
-        yield effects.put(actions$2.setStripeState({
+        const request = {};
+        if (payload) {
+            request.paymentMethodId = payload;
+        }
+        const { setupIntentSecret } = yield effects.call(restApi.api.subscriptions.createStripePaymentMethodSetupIntentSecret, request);
+        yield effects.put(actions$2.setState({
             cardSetupIntentSecret: setupIntentSecret,
-            loading: false
+            loading: false,
         }));
     }
     catch (e) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@frontegg/redux-store",
   "libName": "FronteggReduxStore",
-  "version": "5.29.0",
+  "version": "5.31.0",
   "author": "Frontegg LTD",
   "main": "./node/index.js",
   "module": "./index.js",