@frontegg/redux-store 5.9.1 → 5.13.0

package/node/subscriptions/index.js

@@ -15,7 +15,7 @@ function createModuleCaseReducers() {
         },
         setError: {
             prepare: (payload) => ({ payload }),
-            reducer: (state, action) => (Object.assign(Object.assign({}, state), { error: action.payload, loading: false })),
+            reducer: (state, action) => (Object.assign(Object.assign({}, state), { error: action.payload, loading: false, fetching: false })),
         },
         setState: {
             prepare: (payload) => ({ payload }),
@@ -39,25 +39,24 @@ function createKeyCaseErrorReducer(key) {
 const plansInitialState = {
     loading: false,
     error: null,
+    fetching: true,
     plans: [],
 };
 const { actions: sliceActions$1, reducer: reducer$7, name: name$6 } = toolkit.createSlice({
     name: `${constants.subscriptionsStoreName}/plans`,
     initialState: plansInitialState,
-    reducers: Object.assign(Object.assign({}, createModuleCaseReducers()), { setPlans: {
-            prepare: (payload) => ({ payload }),
-            reducer: (state, action) => (Object.assign(Object.assign({}, state), { plans: action.payload })),
-        } }),
+    reducers: Object.assign({}, createModuleCaseReducers()),
 });
 const actions$7 = Object.assign({ loadPlans: toolkit.createAction(`${name$6}/loadPlans`) }, sliceActions$1);
 
 const configInitialState = {
     loading: false,
     error: null,
+    fetching: true,
     config: null,
 };
 const reducers$5 = Object.assign({}, createModuleCaseReducers());
-const { actions: configActions, reducer: reducer$6, name: name$5 } = toolkit.createSlice({
+const { actions: configActions, reducer: reducer$6, name: name$5, } = toolkit.createSlice({
     name: `${constants.subscriptionsStoreName}/config`,
     initialState: configInitialState,
     reducers: reducers$5,
@@ -67,6 +66,7 @@ const actions$6 = Object.assign({ loadPaymentConfiguration: toolkit.createAction
 const initialBillingInformationState = {
     loading: false,
     error: null,
+    fetching: true,
     externallyManaged: false,
     defaultPlanId: null,
     cancellation: {
@@ -92,12 +92,13 @@ const actions$5 = Object.assign({ loadBillingInformation: toolkit.createAction(`
 const initialPaymentMethodState = {
     loading: false,
     error: null,
+    fetching: true,
 };
 const reducers$3 = Object.assign(Object.assign({}, createModuleCaseReducers()), { setState: {
         prepare: (payload) => ({ payload }),
         reducer: (state, action) => (Object.assign(Object.assign({}, state), action.payload)),
     } });
-const { reducer: reducer$4, actions: paymentActions, name: name$3 } = toolkit.createSlice({
+const { reducer: reducer$4, actions: paymentActions, name: name$3, } = toolkit.createSlice({
     name: `${constants.subscriptionsStoreName}/billing/payment`,
     initialState: initialPaymentMethodState,
     reducers: reducers$3,
@@ -107,16 +108,14 @@ const actions$4 = Object.assign({ loadPaymentMethod: toolkit.createAction(`${nam
 const initialInvoicesState = {
     loading: false,
     error: null,
+    fetching: true,
     invoices: [],
     invoiceDownload: {
         loading: false,
         error: null
     }
 };
-const reducers$2 = Object.assign(Object.assign({}, createModuleCaseReducers()), { setInvoices: {
-        prepare: (payload) => ({ payload }),
-        reducer: (state, action) => (Object.assign(Object.assign({}, state), { invoices: action.payload })),
-    }, setInvoiceDownloadState: {
+const reducers$2 = Object.assign(Object.assign({}, createModuleCaseReducers()), { setInvoiceDownloadState: {
         prepare: (payload) => ({ payload }),
         reducer: (state, action) => (Object.assign(Object.assign({}, state), { invoiceDownload: Object.assign(Object.assign({}, state.invoiceDownload), action.payload) })),
     } });
@@ -375,7 +374,7 @@ function* loadSummaries(tenantId) {
         const { currentPlanId, subscriptionId, externallyManaged, defaultPlanId } = yield effects.call(restApi.api.subscriptions.getSubscriptionSummaries, tenantId);
         const subscriptionResponse = yield effects.call(restApi.api.subscriptions.getSubscription, subscriptionId);
         const planResponse = yield effects.call(restApi.api.subscriptions.getSubscriptionPlan, currentPlanId);
-        yield effects.put(actions$5.setBillingInformation(Object.assign(Object.assign({ loading: false, externallyManaged,
+        yield effects.put(actions$5.setBillingInformation(Object.assign(Object.assign({ loading: false, fetching: false, externallyManaged,
             defaultPlanId }, (subscriptionResponse
             ? {
                 subscription: {
@@ -479,6 +478,7 @@ function* loadSummariesMock() {
     yield effects.delay(500);
     yield effects.put(actions$5.setBillingInformation({
         loading: false,
+        fetching: false,
         externallyManaged: false,
         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 }),
         plan: Object.assign(Object.assign({}, planResponseMock[0]), { price: toPrice((_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' }),
@@ -501,15 +501,11 @@ function* loadPaymentMethod() {
     try {
         const paymentMethods = yield effects.call(restApi.api.subscriptions.getPaymentMethods);
         const paymentMethod = paymentMethods[0];
-        if (paymentMethod) {
-            yield effects.put(actions$4.setState({
-                paymentMethod,
-                loading: false,
-            }));
-        }
-        else {
-            yield effects.put(actions$4.setLoading(false));
-        }
+        yield effects.put(actions$4.setState({
+            paymentMethod,
+            loading: false,
+            fetching: false,
+        }));
     }
     catch (e) {
         yield effects.put(actions$4.setError(e.message));
@@ -553,6 +549,7 @@ function* loadPaymentMethodMock() {
     yield effects.put(actions$4.setState({
         paymentMethod,
         loading: false,
+        fetching: false,
     }));
 }
 function* subscriptionsPaymentMethodSagasMock() {
@@ -567,20 +564,22 @@ function* subscriptionInvoicesSagas() {
 function* loadInvoices() {
     yield effects.put(actions$3.setLoading(true));
     try {
-        const invoices = yield effects.call(restApi.api.subscriptions.getSubscriptionInvoices);
+        const responseInvoices = yield effects.call(restApi.api.subscriptions.getSubscriptionInvoices);
+        const invoices = responseInvoices.map((invoice) => ({
+            id: invoice.id,
+            externalId: invoice.externalId,
+            subscriptionId: invoice.subscriptionId,
+            paymentDate: new Date(Date.parse(invoice.paymentDate)),
+            totalAmount: +((invoice.totalAmount || 0) / 100).toFixed(2),
+            currency: invoice.currency || 'usd',
+            paid: invoice.paid || false,
+            receiptNumber: invoice.receiptNumber,
+        }));
         yield effects.put(actions$3.setState({
-            invoices: invoices.map((invoice) => ({
-                id: invoice.id,
-                externalId: invoice.externalId,
-                subscriptionId: invoice.subscriptionId,
-                paymentDate: new Date(Date.parse(invoice.paymentDate)),
-                totalAmount: +((invoice.totalAmount || 0) / 100).toFixed(2),
-                currency: invoice.currency || 'usd',
-                paid: invoice.paid || false,
-                receiptNumber: invoice.receiptNumber,
-            })),
+            loading: false,
+            fetching: false,
+            invoices,
         }));
-        yield effects.put(actions$3.setLoading(false));
     }
     catch (e) {
         yield effects.put(actions$3.setError(e.message));
@@ -608,7 +607,11 @@ function* loadInvoicesMock() {
     yield effects.put(actions$3.setLoading(true));
     yield effects.delay(500);
     const selectPlanTitle = 'Premium';
-    yield effects.put(actions$3.setInvoices(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$3.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$3.setLoading(false));
 }
 function* subscriptionInvoicesSagasMock() {
@@ -750,7 +753,7 @@ function* loadPlans() {
     yield effects.put(actions$7.setLoading(true));
     try {
         const products = yield effects.call(restApi.api.subscriptions.getSubscriptionPlans);
-        yield effects.put(actions$7.setPlans(products.map((item) => {
+        const plans = products.map((item) => {
             var _a, _b;
             return ({
                 id: item.id,
@@ -760,8 +763,12 @@ function* loadPlans() {
                 currency: ((_b = item.price) === null || _b === void 0 ? void 0 : _b.currency) || 'usd',
                 recurringInterval: 'month',
             });
-        })));
-        yield effects.put(actions$7.setLoading(false));
+        });
+        yield effects.put(actions$7.setState({
+            fetching: false,
+            loading: false,
+            plans,
+        }));
     }
     catch (e) {
         yield effects.put(actions$7.setError(e.message));
@@ -773,11 +780,14 @@ function* loadPlans() {
 function* loadPlansMock() {
     yield effects.put(actions$7.setLoading(true));
     yield effects.delay(500);
-    yield effects.put(actions$7.setPlans(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' }));
-    })));
-    yield effects.put(actions$7.setLoading(false));
+    yield effects.put(actions$7.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' }));
+        }),
+    }));
 }
 function* plansSagasMock() {
     yield effects.takeEvery(actions$7.loadPlans, loadPlansMock);
@@ -814,6 +824,7 @@ function* loadStripePaymentConfiguration() {
         const response = yield effects.call(restApi.api.subscriptions.getStripePaymentProviderConfiguration);
         yield effects.put(actions$6.setState({
             loading: false,
+            fetching: false,
             config: {
                 paymentProvider: exports.PaymentProvider.STRIPE,
                 apiKey: response.publishableKey
@@ -832,6 +843,7 @@ function* loadPaymentConfigurationMock() {
     yield effects.delay(500);
     yield effects.put(actions$6.setState({
         loading: false,
+        fetching: false,
         config: {
             paymentProvider: exports.PaymentProvider.STRIPE,
             apiKey: ''

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@frontegg/redux-store",
   "libName": "FronteggReduxStore",
-  "version": "5.9.1",
+  "version": "5.13.0",
   "author": "Frontegg LTD",
   "main": "./node/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
   "dependencies": {
-    "@frontegg/rest-api": "2.10.49",
+    "@frontegg/rest-api": "2.10.50",
     "@reduxjs/toolkit": "^1.5.0",
     "redux-saga": "^1.1.0",
     "tslib": "^2.3.1",

package/subscriptions/Billing/Information/interfaces.d.ts

@@ -2,6 +2,7 @@ import { Plan, Subscription } from '../../general.interfaces';
 export interface BillingInformationState {
     loading: boolean;
     error: string | null;
+    fetching: boolean;
     externallyManaged: boolean;
     defaultPlanId: string | null;
     subscription?: Subscription;

package/subscriptions/Billing/Invoices/index.d.ts

@@ -1,9 +1,7 @@
 import { DownloadInvoiceActionPayload, InvoicesState } from './interfaces';
-import { Invoice } from '../../general.interfaces';
 export declare const initialInvoicesState: InvoicesState;
 declare const reducer: import("redux").Reducer<InvoicesState, import("redux").AnyAction>;
 declare const actions: {
-    setInvoices: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[Invoice[]], Invoice[], string, never, never>;
     setInvoiceDownloadState: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[{
         loading: boolean;
         error: string | null;

package/subscriptions/Billing/Invoices/interfaces.d.ts

@@ -2,6 +2,7 @@ import { Invoice } from '../../general.interfaces';
 export interface InvoicesState {
     loading: boolean;
     error: string | null;
+    fetching: boolean;
     invoices: Invoice[];
     invoiceDownload: {
         loading: boolean;

package/subscriptions/Billing/PaymentMethod/interfaces.d.ts

@@ -14,6 +14,7 @@ export declare type PaymentMethod = {
 export interface PaymentMethodState {
     loading: boolean;
     error: string | null;
+    fetching: boolean;
     paymentMethod?: PaymentMethod;
 }
 export interface PaymentMethodActions {

package/subscriptions/Billing/index.d.ts

@@ -3,7 +3,6 @@ import { BillingState } from './interfaces';
 export declare const billingInitialState: BillingState;
 export declare const billingActions: {
     invoices: {
-        setInvoices: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[import("..").Invoice[]], import("..").Invoice[], string, never, never>;
         setInvoiceDownloadState: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[{
             loading: boolean;
             error: string | null;

package/subscriptions/Config/interfaces.d.ts

@@ -7,6 +7,7 @@ declare type PaymentProviderCustomConfig = StripePaymentProviderConfig;
 export declare type PaymentProviderConfigState = {
     loading: boolean;
     error: string | null;
+    fetching: boolean;
     config: PaymentProviderCustomConfig | null;
 };
 export interface PaymentProviderConfigActions {

package/subscriptions/Plans/index.d.ts

@@ -1,9 +1,7 @@
 import { PlansState } from './interfaces';
-import { Plan } from '../general.interfaces';
 export declare const plansInitialState: PlansState;
 declare const reducer: import("redux").Reducer<PlansState, import("redux").AnyAction>;
 declare const actions: {
-    setPlans: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[Plan[]], Plan[], string, never, never>;
     setLoading: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[boolean], boolean, string, never, never>;
     setError: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[string | null], string | null, string, never, never>;
     setState: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[Partial<PlansState>], Partial<PlansState>, string, never, never>;

package/subscriptions/Plans/interfaces.d.ts

@@ -2,6 +2,7 @@ import { Plan } from '../general.interfaces';
 export interface PlansState {
     loading: boolean;
     error: string | null;
+    fetching: boolean;
     plans: Plan[];
 }
 export interface PlansActions {

package/subscriptions/index.d.ts

@@ -22,7 +22,6 @@ declare const _default: {
         };
         billing: {
             invoices: {
-                setInvoices: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[import("./general.interfaces").Invoice[]], import("./general.interfaces").Invoice[], string, never, never>;
                 setInvoiceDownloadState: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[{
                     loading: boolean;
                     error: string | null;
@@ -65,7 +64,6 @@ declare const _default: {
             };
         };
         plans: {
-            setPlans: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[import("./general.interfaces").Plan[]], import("./general.interfaces").Plan[], string, never, never>;
             setLoading: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[boolean], boolean, string, never, never>;
             setError: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[string | null], string | null, string, never, never>;
             setState: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[Partial<import("./interfaces").PlansState>], Partial<import("./interfaces").PlansState>, string, never, never>;

package/subscriptions/index.js

@@ -12,7 +12,7 @@ function createModuleCaseReducers() {
         },
         setError: {
             prepare: (payload) => ({ payload }),
-            reducer: (state, action) => (Object.assign(Object.assign({}, state), { error: action.payload, loading: false })),
+            reducer: (state, action) => (Object.assign(Object.assign({}, state), { error: action.payload, loading: false, fetching: false })),
         },
         setState: {
             prepare: (payload) => ({ payload }),
@@ -36,25 +36,24 @@ function createKeyCaseErrorReducer(key) {
 const plansInitialState = {
     loading: false,
     error: null,
+    fetching: true,
     plans: [],
 };
 const { actions: sliceActions$1, reducer: reducer$7, name: name$6 } = createSlice({
     name: `${subscriptionsStoreName}/plans`,
     initialState: plansInitialState,
-    reducers: Object.assign(Object.assign({}, createModuleCaseReducers()), { setPlans: {
-            prepare: (payload) => ({ payload }),
-            reducer: (state, action) => (Object.assign(Object.assign({}, state), { plans: action.payload })),
-        } }),
+    reducers: Object.assign({}, createModuleCaseReducers()),
 });
 const actions$7 = Object.assign({ loadPlans: createAction(`${name$6}/loadPlans`) }, sliceActions$1);
 
 const configInitialState = {
     loading: false,
     error: null,
+    fetching: true,
     config: null,
 };
 const reducers$5 = Object.assign({}, createModuleCaseReducers());
-const { actions: configActions, reducer: reducer$6, name: name$5 } = createSlice({
+const { actions: configActions, reducer: reducer$6, name: name$5, } = createSlice({
     name: `${subscriptionsStoreName}/config`,
     initialState: configInitialState,
     reducers: reducers$5,
@@ -64,6 +63,7 @@ const actions$6 = Object.assign({ loadPaymentConfiguration: createAction(`${name
 const initialBillingInformationState = {
     loading: false,
     error: null,
+    fetching: true,
     externallyManaged: false,
     defaultPlanId: null,
     cancellation: {
@@ -89,12 +89,13 @@ const actions$5 = Object.assign({ loadBillingInformation: createAction(`${name$4
 const initialPaymentMethodState = {
     loading: false,
     error: null,
+    fetching: true,
 };
 const reducers$3 = Object.assign(Object.assign({}, createModuleCaseReducers()), { setState: {
         prepare: (payload) => ({ payload }),
         reducer: (state, action) => (Object.assign(Object.assign({}, state), action.payload)),
     } });
-const { reducer: reducer$4, actions: paymentActions, name: name$3 } = createSlice({
+const { reducer: reducer$4, actions: paymentActions, name: name$3, } = createSlice({
     name: `${subscriptionsStoreName}/billing/payment`,
     initialState: initialPaymentMethodState,
     reducers: reducers$3,
@@ -104,16 +105,14 @@ const actions$4 = Object.assign({ loadPaymentMethod: createAction(`${name$3}/loa
 const initialInvoicesState = {
     loading: false,
     error: null,
+    fetching: true,
     invoices: [],
     invoiceDownload: {
         loading: false,
         error: null
     }
 };
-const reducers$2 = Object.assign(Object.assign({}, createModuleCaseReducers()), { setInvoices: {
-        prepare: (payload) => ({ payload }),
-        reducer: (state, action) => (Object.assign(Object.assign({}, state), { invoices: action.payload })),
-    }, setInvoiceDownloadState: {
+const reducers$2 = Object.assign(Object.assign({}, createModuleCaseReducers()), { setInvoiceDownloadState: {
         prepare: (payload) => ({ payload }),
         reducer: (state, action) => (Object.assign(Object.assign({}, state), { invoiceDownload: Object.assign(Object.assign({}, state.invoiceDownload), action.payload) })),
     } });
@@ -372,7 +371,7 @@ function* loadSummaries(tenantId) {
         const { currentPlanId, subscriptionId, externallyManaged, defaultPlanId } = yield call(api.subscriptions.getSubscriptionSummaries, tenantId);
         const subscriptionResponse = yield call(api.subscriptions.getSubscription, subscriptionId);
         const planResponse = yield call(api.subscriptions.getSubscriptionPlan, currentPlanId);
-        yield put(actions$5.setBillingInformation(Object.assign(Object.assign({ loading: false, externallyManaged,
+        yield put(actions$5.setBillingInformation(Object.assign(Object.assign({ loading: false, fetching: false, externallyManaged,
             defaultPlanId }, (subscriptionResponse
             ? {
                 subscription: {
@@ -476,6 +475,7 @@ function* loadSummariesMock() {
     yield delay(500);
     yield put(actions$5.setBillingInformation({
         loading: false,
+        fetching: false,
         externallyManaged: false,
         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 }),
         plan: Object.assign(Object.assign({}, planResponseMock[0]), { price: toPrice((_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' }),
@@ -498,15 +498,11 @@ function* loadPaymentMethod() {
     try {
         const paymentMethods = yield call(api.subscriptions.getPaymentMethods);
         const paymentMethod = paymentMethods[0];
-        if (paymentMethod) {
-            yield put(actions$4.setState({
-                paymentMethod,
-                loading: false,
-            }));
-        }
-        else {
-            yield put(actions$4.setLoading(false));
-        }
+        yield put(actions$4.setState({
+            paymentMethod,
+            loading: false,
+            fetching: false,
+        }));
     }
     catch (e) {
         yield put(actions$4.setError(e.message));
@@ -550,6 +546,7 @@ function* loadPaymentMethodMock() {
     yield put(actions$4.setState({
         paymentMethod,
         loading: false,
+        fetching: false,
     }));
 }
 function* subscriptionsPaymentMethodSagasMock() {
@@ -564,20 +561,22 @@ function* subscriptionInvoicesSagas() {
 function* loadInvoices() {
     yield put(actions$3.setLoading(true));
     try {
-        const invoices = yield call(api.subscriptions.getSubscriptionInvoices);
+        const responseInvoices = yield call(api.subscriptions.getSubscriptionInvoices);
+        const invoices = responseInvoices.map((invoice) => ({
+            id: invoice.id,
+            externalId: invoice.externalId,
+            subscriptionId: invoice.subscriptionId,
+            paymentDate: new Date(Date.parse(invoice.paymentDate)),
+            totalAmount: +((invoice.totalAmount || 0) / 100).toFixed(2),
+            currency: invoice.currency || 'usd',
+            paid: invoice.paid || false,
+            receiptNumber: invoice.receiptNumber,
+        }));
         yield put(actions$3.setState({
-            invoices: invoices.map((invoice) => ({
-                id: invoice.id,
-                externalId: invoice.externalId,
-                subscriptionId: invoice.subscriptionId,
-                paymentDate: new Date(Date.parse(invoice.paymentDate)),
-                totalAmount: +((invoice.totalAmount || 0) / 100).toFixed(2),
-                currency: invoice.currency || 'usd',
-                paid: invoice.paid || false,
-                receiptNumber: invoice.receiptNumber,
-            })),
+            loading: false,
+            fetching: false,
+            invoices,
         }));
-        yield put(actions$3.setLoading(false));
     }
     catch (e) {
         yield put(actions$3.setError(e.message));
@@ -605,7 +604,11 @@ function* loadInvoicesMock() {
     yield put(actions$3.setLoading(true));
     yield delay(500);
     const selectPlanTitle = 'Premium';
-    yield put(actions$3.setInvoices(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 put(actions$3.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 put(actions$3.setLoading(false));
 }
 function* subscriptionInvoicesSagasMock() {
@@ -747,7 +750,7 @@ function* loadPlans() {
     yield put(actions$7.setLoading(true));
     try {
         const products = yield call(api.subscriptions.getSubscriptionPlans);
-        yield put(actions$7.setPlans(products.map((item) => {
+        const plans = products.map((item) => {
             var _a, _b;
             return ({
                 id: item.id,
@@ -757,8 +760,12 @@ function* loadPlans() {
                 currency: ((_b = item.price) === null || _b === void 0 ? void 0 : _b.currency) || 'usd',
                 recurringInterval: 'month',
             });
-        })));
-        yield put(actions$7.setLoading(false));
+        });
+        yield put(actions$7.setState({
+            fetching: false,
+            loading: false,
+            plans,
+        }));
     }
     catch (e) {
         yield put(actions$7.setError(e.message));
@@ -770,11 +777,14 @@ function* loadPlans() {
 function* loadPlansMock() {
     yield put(actions$7.setLoading(true));
     yield delay(500);
-    yield put(actions$7.setPlans(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' }));
-    })));
-    yield put(actions$7.setLoading(false));
+    yield put(actions$7.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' }));
+        }),
+    }));
 }
 function* plansSagasMock() {
     yield takeEvery(actions$7.loadPlans, loadPlansMock);
@@ -811,6 +821,7 @@ function* loadStripePaymentConfiguration() {
         const response = yield call(api.subscriptions.getStripePaymentProviderConfiguration);
         yield put(actions$6.setState({
             loading: false,
+            fetching: false,
             config: {
                 paymentProvider: PaymentProvider.STRIPE,
                 apiKey: response.publishableKey
@@ -829,6 +840,7 @@ function* loadPaymentConfigurationMock() {
     yield delay(500);
     yield put(actions$6.setState({
         loading: false,
+        fetching: false,
         config: {
             paymentProvider: PaymentProvider.STRIPE,
             apiKey: ''

package/subscriptions/reducer.d.ts

@@ -10,7 +10,6 @@ declare const actions: {
     };
     billing: {
         invoices: {
-            setInvoices: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[import("./general.interfaces").Invoice[]], import("./general.interfaces").Invoice[], string, never, never>;
             setInvoiceDownloadState: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[{
                 loading: boolean;
                 error: string | null;
@@ -53,7 +52,6 @@ declare const actions: {
         };
     };
     plans: {
-        setPlans: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[import("./general.interfaces").Plan[]], import("./general.interfaces").Plan[], string, never, never>;
         setLoading: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[boolean], boolean, string, never, never>;
         setError: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[string | null], string | null, string, never, never>;
         setState: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[Partial<import("./interfaces").PlansState>], Partial<import("./interfaces").PlansState>, string, never, never>;

package/subscriptions/utils.d.ts

@@ -1,6 +1,7 @@
 import { AnyAction, PayloadAction } from '@reduxjs/toolkit';
 export interface ModuleCaseState {
     loading: boolean;
+    fetching: boolean;
     error: string | null;
 }
 export declare type ModuleCaseActions = {
@@ -24,6 +25,7 @@ export declare function createModuleCaseReducers<State>(): {
         reducer: (state: State, action: PayloadAction<string | null>) => State & {
             error: string | null;
             loading: boolean;
+            fetching: boolean;
         };
     };
     setState: {