@tap-payments/auth-jsconnect 1.0.38 → 1.0.40

package/build/@types/app.d.ts

@@ -99,13 +99,13 @@ export interface Activity {
 }
 export interface SalesChannel {
     id: number;
-    name: string;
-    nameEn: string;
+    titleAr: string;
+    title: string;
 }
 export interface SourceOfIncome {
     id: number;
-    name: string;
-    nameEn: string;
+    titleAr: string;
+    title: string;
 }
 export interface AppInfo {
     name: string;

package/build/constants/app.js

@@ -77,7 +77,7 @@ export var BUSINESS_SCREENS_NAVIGATION = [
     {
         name: 'BUSINESS_BUSINESS_TYPE_STEP',
         next: 'BUSINESS_CONFIRM_STEP',
-        prev: 'BUSINESS_OTP_STEP',
+        prev: 'BUSINESS_IDBOD_STEP',
         order: 2
     },
     {

package/build/constants/dummy.d.ts

@@ -338,6 +338,6 @@ export declare const SALES_CHANNELS: {
 }[];
 export declare const SOURCE_OF_INCOME: {
     id: number;
-    name: string;
-    nameEn: string;
+    titleAr: string;
+    title: string;
 }[];

package/build/constants/dummy.js

@@ -6425,10 +6425,10 @@ export var SALES_CHANNELS = [
     { id: 5, nameEn: 'Call Center', name: 'مركز اتصال' }
 ];
 export var SOURCE_OF_INCOME = [
-    { id: 1, name: 'راتب', nameEn: 'Salary' },
-    { id: 2, name: 'تمويل', nameEn: 'Investment' },
-    { id: 3, name: 'ورث', nameEn: 'Inheritance / inherit' },
-    { id: 4, name: 'اسهم', nameEn: 'Stocks' },
-    { id: 5, name: 'تجارة', nameEn: 'Trading' },
-    { id: 6, name: 'غير ذلك', nameEn: 'Other' }
+    { id: 1, titleAr: 'راتب', title: 'Salary' },
+    { id: 2, titleAr: 'تمويل', title: 'Investment' },
+    { id: 3, titleAr: 'ورث', title: 'Inheritance / inherit' },
+    { id: 4, titleAr: 'اسهم', title: 'Stocks' },
+    { id: 5, titleAr: 'تجارة', title: 'Trading' },
+    { id: 6, titleAr: 'غير ذلك', title: 'Other' }
 ];

package/build/features/app/business/businessStore.d.ts

@@ -57,11 +57,8 @@ export declare const updateCustomersInfo: import("@reduxjs/toolkit").AsyncThunk<
         expectedSalesRange: import("../../../@types").ExpectedSaleRange | undefined;
         refundPolicy: boolean;
         transactionPolicy: boolean;
-        isResend: boolean;
     };
-}, CustomersFormValues & {
-    isResend: boolean;
-}, {}>;
+}, CustomersFormValues, {}>;
 export declare const updateLeadSuccess: import("@reduxjs/toolkit").AsyncThunk<{
     response: any;
     formData: void;
@@ -91,8 +88,9 @@ export interface BusinessState extends SharedState<BusinessData> {
 export declare const businessSlice: import("@reduxjs/toolkit").Slice<BusinessState, {
     clearError: (state: BusinessState) => void;
     stopLoader: (state: BusinessState) => void;
+    resetOTPScreen: (state: BusinessState) => void;
 }, "business/store">;
-export declare const clearError: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, stopLoader: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
+export declare const clearError: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, stopLoader: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetOTPScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
 declare const _default: import("redux").Reducer<BusinessState, import("redux").AnyAction>;
 export default _default;
 export declare const businessSelector: (state: RootState) => BusinessState;

package/build/features/app/business/businessStore.js

@@ -308,7 +308,7 @@ export var updateCustomersInfo = createAsyncThunk('updateCustomersInfo', functio
                 return [4, API.entityService.updateEntityInfo(requestBody, { headers: headers })];
             case 1:
                 data = (_e.sent()).data;
-                if (!data.errors && !params.isResend) {
+                if (!data.errors) {
                     thunkApi.dispatch(handleNextScreenStep());
                     (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, requestBody);
                 }
@@ -393,6 +393,9 @@ export var businessSlice = createSlice({
         },
         stopLoader: function (state) {
             state.loading = false;
+        },
+        resetOTPScreen: function (state) {
+            state.data.otpData.otp = '';
         }
     },
     extraReducers: function (builder) {
@@ -449,8 +452,9 @@ export var businessSlice = createSlice({
             state.loading = false;
             state.error = action.error.message;
         })
-            .addCase(updateLeadIdentity.pending, function (state) {
-            state.loading = true;
+            .addCase(updateLeadIdentity.pending, function (state, action) {
+            var _a;
+            state.loading = ((_a = action.meta.arg) === null || _a === void 0 ? void 0 : _a.isResend) ? false : true;
             state.error = null;
         })
             .addCase(updateLeadIdentity.fulfilled, function (state, action) {
@@ -558,9 +562,9 @@ export var businessSlice = createSlice({
             state.loading = false;
             state.error = null;
             var _c = action.payload, data = _c.data, channelsData = _c.channelsData;
-            var description = (((_a = data === null || data === void 0 ? void 0 : data.errors) === null || _a === void 0 ? void 0 : _a[0]) || ((_b = channelsData === null || channelsData === void 0 ? void 0 : channelsData.errors) === null || _b === void 0 ? void 0 : _b[0]) || {}).description;
-            if (description) {
-                state.error = description;
+            var message = (((_a = data === null || data === void 0 ? void 0 : data.errors) === null || _a === void 0 ? void 0 : _a[0]) || ((_b = channelsData === null || channelsData === void 0 ? void 0 : channelsData.errors) === null || _b === void 0 ? void 0 : _b[0]) || {}).message;
+            if (message) {
+                state.error = message;
                 return;
             }
             if ((data === null || data === void 0 ? void 0 : data.status) === 'ALREADY_TAKEN') {
@@ -640,6 +644,6 @@ export var businessSlice = createSlice({
         });
     }
 });
-export var clearError = (_a = businessSlice.actions, _a.clearError), stopLoader = _a.stopLoader;
+export var clearError = (_a = businessSlice.actions, _a.clearError), stopLoader = _a.stopLoader, resetOTPScreen = _a.resetOTPScreen;
 export default businessSlice.reducer;
 export var businessSelector = function (state) { return state.business; };

package/build/features/app/connect/connectStore.js

@@ -486,8 +486,9 @@ export var connectSlice = createSlice({
             state.data.mobileData.responseBody = response;
             state.data.otpData.isAbsher = false;
         })
-            .addCase(createMobileAuth.pending, function (state) {
-            state.loading = true;
+            .addCase(createMobileAuth.pending, function (state, action) {
+            var _a;
+            state.loading = ((_a = action.meta.arg) === null || _a === void 0 ? void 0 : _a.isResend) ? false : true;
             state.error = null;
         })
             .addCase(createMobileAuth.rejected, function (state, action) {
@@ -508,8 +509,9 @@ export var connectSlice = createSlice({
             state.data.nidData.responseBody = response;
             state.data.otpData.isAbsher = true;
         })
-            .addCase(createNIDAuth.pending, function (state) {
-            state.loading = true;
+            .addCase(createNIDAuth.pending, function (state, action) {
+            var _a;
+            state.loading = ((_a = action.meta.arg) === null || _a === void 0 ? void 0 : _a.isResend) ? false : true;
             state.error = null;
         })
             .addCase(createNIDAuth.rejected, function (state, action) {

package/build/features/business/screens/Activities/Activities.js

@@ -25,7 +25,7 @@ import SalesChannels from './SalesChannels';
 import { ScreenContainer } from '../../../shared/Containers';
 import Collapse from '../../../../components/Collapse';
 import OperationStartDate from './OperationStartDate';
-import { businessSelector, updateActivitiesInfo } from '../../../app/business/businessStore';
+import { businessSelector, clearError, updateActivitiesInfo } from '../../../app/business/businessStore';
 import { ActivitiesValidationSchema } from './validation';
 var FormStyled = styled(Form)(function () { return ({
     display: 'flex',
@@ -38,8 +38,8 @@ var Activities = function () {
     var dispatch = useAppDispatch();
     var isAr = useLanguage().isAr;
     var t = useTranslation().t;
-    var data = useSelector(businessSelector).data;
-    var response = data.businessInfo.responseBody;
+    var _d = useSelector(businessSelector), data = _d.data, loading = _d.loading, error = _d.error;
+    var businessTypeResponse = data.businessTypeData.responseBody;
     var methods = useForm({
         resolver: yupResolver(ActivitiesValidationSchema),
         defaultValues: data.activitiesData,
@@ -55,10 +55,15 @@ var Activities = function () {
     var onBack = function () {
         dispatch(handlePrevScreenStep());
     };
+    React.useEffect(function () {
+        if (error)
+            dispatch(clearError());
+    }, [methods.formState.isValid]);
     var handleMenuClick = function () {
         anchorEl ? setAnchorEl(false) : setAnchorEl(true);
     };
-    var activities_list = ((_a = response === null || response === void 0 ? void 0 : response.activities) === null || _a === void 0 ? void 0 : _a.length) > 0;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsxs(Collapse, __assign({ in: !collapse }, { children: [!!activities_list && (_jsx(ActivitiesList, { onListOpen: function () { return handleMenuClick(); }, onListClose: function () { return handleMenuClick(); } })), _jsx(Collapse, __assign({ in: !anchorEl }, { children: _jsx(SalesChannels, {}) }))] })), _jsx(Collapse, __assign({ in: !anchorEl }, { children: _jsx(OperationStartDate, { onDateClicked: handleCollapseOpenClose }) })), _jsx(Collapse, __assign({ in: !collapse && !anchorEl }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disabled: !methods.formState.isValid }, { children: t('next') })) }))] })) })) }));
+    var activities_list = ((_a = businessTypeResponse === null || businessTypeResponse === void 0 ? void 0 : businessTypeResponse.activities) === null || _a === void 0 ? void 0 : _a.length) > 0;
+    var disabled = !methods.formState.isValid || !!error;
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsxs(Collapse, __assign({ in: !collapse }, { children: [!!activities_list && (_jsx(ActivitiesList, { onListOpen: function () { return handleMenuClick(); }, onListClose: function () { return handleMenuClick(); } })), _jsx(Collapse, __assign({ in: !anchorEl }, { children: _jsx(SalesChannels, {}) }))] })), _jsx(Collapse, __assign({ in: !anchorEl }, { children: _jsx(OperationStartDate, { onDateClicked: handleCollapseOpenClose }) })), _jsx(Collapse, __assign({ in: !collapse && !anchorEl }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disabled: disabled, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
 };
 export default Activities;

package/build/features/business/screens/Activities/ActivitiesList.js

@@ -94,7 +94,7 @@ var ActivitiesList = function (_a) {
         if (((_a = response === null || response === void 0 ? void 0 : response.activities) === null || _a === void 0 ? void 0 : _a.length) > 0) {
             setActivitiesMenuList(response === null || response === void 0 ? void 0 : response.activities);
         }
-    }, [response === null || response === void 0 ? void 0 : response.activities]);
+    }, []);
     var onOpenList = function (event) {
         var _a;
         setAnchorEl(event.currentTarget);

package/build/features/business/screens/Activities/OperationStartDate.js

@@ -1,14 +1,3 @@
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { InputLabelStyled } from './ActivitiesList';
 import { useTranslation } from 'react-i18next';
@@ -26,6 +15,6 @@ var OperationStartDate = function (_a) {
         oDateControl.field.onChange(data);
     };
     var dateValue = (_b = oDateControl === null || oDateControl === void 0 ? void 0 : oDateControl.field) === null || _b === void 0 ? void 0 : _b.value;
-    return (_jsxs(ScreenContainer, __assign({ sx: { mb: 5 } }, { children: [_jsxs(InputLabelStyled, { children: [t('business_start_date'), _jsx(MandatoryStyled, { children: "*" })] }), _jsx(DatePicker, { readOnly: true, defaultValue: dateValue ? new Date(dateValue) : new Date(), dir: 'ltr', locale: 'en', onClick: function () { return onDateClicked === null || onDateClicked === void 0 ? void 0 : onDateClicked(true); }, onDatePicked: function () { return onDateClicked === null || onDateClicked === void 0 ? void 0 : onDateClicked(false); }, onDateChange: handleOperationStartDateChange })] })));
+    return (_jsxs(ScreenContainer, { children: [_jsxs(InputLabelStyled, { children: [t('business_start_date'), _jsx(MandatoryStyled, { children: "*" })] }), _jsx(DatePicker, { readOnly: true, defaultValue: dateValue ? new Date(dateValue) : new Date(), dir: 'ltr', locale: 'en', onClick: function () { return onDateClicked === null || onDateClicked === void 0 ? void 0 : onDateClicked(true); }, onDatePicked: function () { return onDateClicked === null || onDateClicked === void 0 ? void 0 : onDateClicked(false); }, onDateChange: handleOperationStartDateChange })] }));
 };
 export default OperationStartDate;

package/build/features/business/screens/Activities/SalesChannels.js

@@ -105,6 +105,6 @@ var SalesChannels = function () {
         if (channelsChecked)
             return !!(channelsChecked === null || channelsChecked === void 0 ? void 0 : channelsChecked.find(function (channel) { return channel.id === (item === null || item === void 0 ? void 0 : item.id); }));
     };
-    return (_jsxs(ScreenContainer, { children: [_jsxs(InputLabelStyled, { children: [t('channel_of_service'), " ", _jsx(MandatoryStyled, { children: "*" })] }), channelsMenuList.map(function (channel) { return (_jsxs(ContainerStyled, { children: [_jsx(CheckBoxStyled, { id: channel.id.toString(), disableRipple: true, disableFocusRipple: true, focusRipple: false, checked: getSelectedChannelsFlag(channel), onChange: handleSalesChannelChange }), _jsxs(TextStyled, { children: [isAr ? channel.name : channel.nameEn, " "] })] }, channel.id)); }), _jsx(CollapseStyled, __assign({ in: !!warningMessage }, { children: _jsx(Warning, __assign({ warningType: 'alert' }, { children: t(warningMessage) })) }))] }));
+    return (_jsxs(ScreenContainer, { children: [_jsxs(InputLabelStyled, { children: [t('channel_of_service'), " ", _jsx(MandatoryStyled, { children: "*" })] }), channelsMenuList.map(function (channel) { return (_jsxs(ContainerStyled, { children: [_jsx(CheckBoxStyled, { id: channel.id.toString(), disableRipple: true, disableFocusRipple: true, focusRipple: false, checked: getSelectedChannelsFlag(channel), onChange: handleSalesChannelChange }), _jsxs(TextStyled, { children: [isAr ? channel.titleAr : channel.title, " "] })] }, channel.id)); }), _jsx(CollapseStyled, __assign({ in: !!warningMessage }, { children: _jsx(Warning, __assign({ warningType: 'alert' }, { children: t(warningMessage) })) }))] }));
 };
 export default SalesChannels;

package/build/features/business/screens/Customers/Customers.js

@@ -57,7 +57,7 @@ var Customers = function (_a) {
     });
     var onSubmit = function (data) {
         console.log('data', data);
-        dispatch(updateCustomersInfo(__assign(__assign({}, data), { isResend: false })));
+        dispatch(updateCustomersInfo(__assign({}, data)));
     };
     var onBack = function () {
         dispatch(handlePrevScreenStep());

package/build/features/business/screens/OTP/OTP.js

@@ -23,7 +23,7 @@ import { useLanguage } from '../../../../hooks';
 import Form from '../../../../components/Form';
 import Text from '../../../../components/Text';
 import { ScreenContainer } from '../../../shared/Containers';
-import { businessSelector, clearError, verifyLeadOTP } from '../../../app/business/businessStore';
+import { businessSelector, clearError, resetOTPScreen, verifyLeadOTP } from '../../../app/business/businessStore';
 import Button from '../../../shared/Button';
 import { maskID } from '../../../../utils';
 import { OTPValidation } from './validation';
@@ -41,7 +41,7 @@ var OTPTitleContainerStyled = styled(Box)(function (_a) {
 });
 var OTPTitleStyled = styled(Text)(function (_a) {
     var theme = _a.theme;
-    return (__assign(__assign({}, theme.typography.body1), { fontWeight: theme.typography.fontWeightLight, color: theme.palette.text.primary, marginBlock: theme.spacing(1.75), marginInlineStart: theme.spacing(2.5), lineHeight: 1.75 }));
+    return (__assign(__assign({}, theme.typography.body1), { fontWeight: theme.typography.fontWeightLight, color: theme.palette.text.primary, marginBlock: theme.spacing(1.75), marginInline: theme.spacing(2.5), lineHeight: 1.75, whiteSpace: 'pre-line' }));
 });
 var FormStyled = styled(Form)(function () { return ({
     display: 'flex',
@@ -60,6 +60,9 @@ var OTP = function (_a) {
     React.useEffect(function () {
         if (error)
             dispatch(clearError());
+        return function () {
+            dispatch(resetOTPScreen());
+        };
     }, [methods.formState.isValid]);
     var onSubmit = function (formData) {
         dispatch(verifyLeadOTP(formData));

package/build/features/business/screens/Verify/Verify.js

@@ -24,7 +24,7 @@ import { maskPhone } from '../../../../utils';
 import Form from '../../../../components/Form';
 import Text from '../../../../components/Text';
 import { ScreenContainer } from '../../../shared/Containers';
-import { businessSelector, clearError, verifyLeadOTP } from '../../../app/business/businessStore';
+import { businessSelector, clearError, resetOTPScreen, verifyLeadOTP } from '../../../app/business/businessStore';
 import Button from '../../../shared/Button';
 import { OTPValidation } from './validation';
 import OTPInput from './OTPInput';
@@ -61,6 +61,9 @@ var VerifyNumber = function (_a) {
     React.useEffect(function () {
         if (error)
             dispatch(clearError());
+        return function () {
+            dispatch(resetOTPScreen());
+        };
     }, [methods.formState.isValid]);
     var onSubmit = function (formData) {
         dispatch(verifyLeadOTP(formData));

package/build/features/connect/screens/Merchant/BrandName.js

@@ -11,6 +11,7 @@ var __assign = (this && this.__assign) || function () {
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
+import { useSelector } from 'react-redux';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import Box from '@mui/material/Box';
@@ -24,7 +25,7 @@ import ClearIcon from '../../../shared/ClearIcon';
 import Tooltip from '../../../../components/Tooltip';
 import { removeAllOtherThanCharsNumbersAndSpace } from '../../../../utils';
 import CheckIcon from '../../../shared/CheckIcon';
-import { checkBrandNameAvailability } from '../../../app/connect/connectStore';
+import { checkBrandNameAvailability, connectSelector } from '../../../app/connect/connectStore';
 import { useAppDispatch } from '../../../../hooks';
 import { debounce } from 'lodash-es';
 var LabelContainerStyled = styled(Box)(function (_a) {
@@ -66,6 +67,7 @@ var BrandName = function (_a) {
     var brandControl = useController({ control: control, name: 'brandName' });
     var brandNameValue = brandControl.field.value;
     var error = (_b = brandControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
+    var data = useSelector(connectSelector).data;
     var checkBrand = debounce(function (value) {
         dispatch(checkBrandNameAvailability(value));
     }, 500);
@@ -75,9 +77,11 @@ var BrandName = function (_a) {
         brandControl.field.onChange(value);
     };
     React.useEffect(function () {
+        var _a;
         var isValid = brandNameValue && !error && brandNameValue.length > 2;
+        var brandName = brandNameValue + ((_a = data.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2);
         if (isValid)
-            checkBrand(brandNameValue);
+            checkBrand(brandName);
     }, [brandNameValue, error]);
     var clearBrandName = function () {
         brandControl.field.onChange('');

package/build/features/individual/screens/AdditionalIndividualInfo/AdditionalIndividualInfo.js

@@ -69,7 +69,7 @@ var AdditionalIndividualInfo = function (_a) {
     };
     var handleSelectSource = function (country) {
         var _a;
-        if (((_a = country.nameEn) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === 'salary')
+        if (((_a = country.title) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === 'salary')
             setEmployerFieldsActive(true);
         else {
             setEmployerFieldsActive(false);

package/build/features/individual/screens/AdditionalIndividualInfo/SourceOfIncome.js

@@ -81,7 +81,7 @@ var SourceOfIncome = function (_a) {
     var source = sourceIncomeControl.field.value;
     var error = (_b = sourceIncomeControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
     return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ sx: { pb: 2.5 } }, { children: [_jsx(Input, { required: true, label: t('tap_js_source_of_income'), readOnly: true, onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_any_source_of_income'), value: (isAr ? source === null || source === void 0 ? void 0 : source.name : source === null || source === void 0 ? void 0 : source.nameEn) || '', warningMessage: error && t(error) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleListStyled, { searchKeyPath: 'nameEn', list: sourceList, onSelectItem: onSelectItem, renderItem: function (item) {
-                            return (_jsxs(_Fragment, { children: [_jsx(Container, { children: _jsx(IncomeText, __assign({ isSelected: item.id === (source === null || source === void 0 ? void 0 : source.id) }, { children: isAr ? item.name : item === null || item === void 0 ? void 0 : item.nameEn })) }), item.id === (source === null || source === void 0 ? void 0 : source.id) && _jsx(CheckIconStyled, {})] }));
+                            return (_jsxs(_Fragment, { children: [_jsx(Container, { children: _jsx(IncomeText, __assign({ isSelected: item.id === (source === null || source === void 0 ? void 0 : source.id) }, { children: isAr ? item.titleAr : item === null || item === void 0 ? void 0 : item.title })) }), item.id === (source === null || source === void 0 ? void 0 : source.id) && _jsx(CheckIconStyled, {})] }));
                         } }) }))] })) })));
 };
 export default React.memo(SourceOfIncome);

package/build/features/shared/Button/Button.js

@@ -21,7 +21,7 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Fragment } from 'react';
+import React, { Fragment } from 'react';
 import Button from '../../../components/Button';
 import Icon from '../../../components/Icon';
 import { styled } from '@mui/material/styles';
@@ -84,6 +84,16 @@ var BackButtonStyled = styled(Button, { shouldForwardProp: function (prop) { ret
 });
 export default function CustomButton(_a) {
     var children = _a.children, disabled = _a.disabled, isAr = _a.isAr, loading = _a.loading, disableBack = _a.disableBack, onBackClicked = _a.onBackClicked, error = _a.error, props = __rest(_a, ["children", "disabled", "isAr", "loading", "disableBack", "onBackClicked", "error"]);
-    var isBackEnabled = !disableBack && !loading;
-    return (_jsxs(Fragment, { children: [_jsx(Collapse, __assign({ in: !!error }, { children: _jsx(Warning, __assign({ sx: { mb: 1 }, warningType: 'error' }, { children: error })) })), _jsxs(ButtonBoxStyled, { children: [isBackEnabled && (_jsx(BackButtonStyled, __assign({ onClick: function () { return onBackClicked === null || onBackClicked === void 0 ? void 0 : onBackClicked(); }, isAr: isAr, type: 'reset', startIcon: _jsx(BackIconStyled, { isAr: isAr, src: ICONS_NAMES.WHITE_ARROW }) }, props))), _jsx(ButtonStyled, __assign({ disabled: disabled, isLoading: loading, type: !loading ? 'submit' : 'button', isBack: isBackEnabled, endIcon: !loading && _jsx(IconStyled, { isAr: isAr, src: ICONS_NAMES.WHITE_ARROW }) }, props, { children: !loading ? (_jsxs(Text, __assign({ sx: { marginInlineEnd: isBackEnabled ? '-24px' : '-15px' } }, { children: [" ", children] }))) : (_jsx(Loader, { innerColor: 'white', outerColor: 'white', size: 25, toggleAnimation: !!loading })) }))] })] }));
+    var _b = React.useState(false), btnLoading = _b[0], setBtnLoading = _b[1];
+    var isBackEnabled = !disableBack && !btnLoading;
+    React.useEffect(function () {
+        if (loading)
+            setBtnLoading(true);
+        if (error)
+            setBtnLoading(false);
+    }, [loading, error]);
+    React.useEffect(function () {
+        setBtnLoading(false);
+    }, []);
+    return (_jsxs(Fragment, { children: [_jsx(Collapse, __assign({ in: !!error }, { children: _jsx(Warning, __assign({ sx: { mb: 1 }, warningType: 'error' }, { children: error })) })), _jsxs(ButtonBoxStyled, { children: [isBackEnabled && (_jsx(BackButtonStyled, __assign({ onClick: function () { return onBackClicked === null || onBackClicked === void 0 ? void 0 : onBackClicked(); }, isAr: isAr, type: 'reset', startIcon: _jsx(BackIconStyled, { isAr: isAr, src: ICONS_NAMES.WHITE_ARROW }) }, props))), _jsx(ButtonStyled, __assign({ disabled: disabled, isLoading: btnLoading, type: !btnLoading ? 'submit' : 'button', isBack: isBackEnabled, endIcon: !btnLoading && _jsx(IconStyled, { isAr: isAr, src: ICONS_NAMES.WHITE_ARROW }) }, props, { children: !btnLoading ? (_jsxs(Text, __assign({ sx: { marginInlineEnd: isBackEnabled ? '-24px' : '-15px' } }, { children: [" ", children] }))) : (_jsx(Loader, { innerColor: 'white', outerColor: 'white', size: 15, toggleAnimation: !!loading })) }))] })] }));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tap-payments/auth-jsconnect",
-	"version": "1.0.38",
+	"version": "1.0.40",
 	"description": "connect library, auth",
 	"private": false,
 	"main": "build/index.js",