@tap-payments/auth-jsconnect 2.0.121-test → 2.0.123-test

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. package/build/constants/validation.js +1 -1
  2. package/build/features/app/business/businessStore.js +4 -6
  3. package/build/features/app/connect/connectStore.d.ts +2 -1
  4. package/build/features/app/connect/connectStore.js +63 -21
  5. package/build/features/app/entity/entityStore.js +3 -2
  6. package/build/features/connect/screens/CivilID/CivilID.js +4 -1
  7. package/build/features/connect/screens/Individual/Individual.js +1 -1
  8. package/build/features/connect/screens/Merchant/Merchant.js +1 -1
  9. package/build/features/connect/screens/Mobile/Mobile.js +4 -1
  10. package/build/features/connect/screens/NID/NID.js +4 -1
  11. package/package.json +1 -1
package/build/constants/validation.js CHANGED
@@ -16,7 +16,7 @@ export var REGEX_BENEFICIARY_NAME = /^([\u0600-\u065F\u066A-\u06EF\u06FA-\u06FFa
16
16
  export var REGEX_ALPHANUMERIC = /^[a-zA-Z0-9!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/? ]*$/g;
17
17
  export var REGEX_BRAND_NAME = /^(([a-zA-Z0-9])+\s)*[a-zA-Z0-9]+$/;
18
18
  export var EMAIL_MAX_LENGTH = 50;
19
- export var LINKEDIN_URL = /^((http|https):\/\/)(www.linkedin.com\/)in(\/)[a-zA-Z0-9-\/]+$/;
19
+ export var LINKEDIN_URL = /[a-zA-Z0-9-\/:._]+$/;
20
20
  export var SOCIAL_USERNAME = /^[A-Za-z-0-9\d._]{3,}$/;
21
21
  export var DIGITS_ONLY = /^\d+$/;
22
22
  export var REGEX_PHONE_APP_NAME = /^[a-zA-Z0-9[._-]*$/;
package/build/features/app/business/businessStore.js CHANGED
@@ -773,7 +773,7 @@ export var businessSlice = createSlice({
773
773
  var _a;
774
774
  return (_a = brandInfo === null || brandInfo === void 0 ? void 0 : brandInfo.activities) === null || _a === void 0 ? void 0 : _a.find(function (value) { return activity.id === value.id; });
775
775
  });
776
- var defaultActivities = (activities === null || activities === void 0 ? void 0 : activities[0]) ? [activities === null || activities === void 0 ? void 0 : activities[0]] : [];
776
+ var defaultActivities = (activities === null || activities === void 0 ? void 0 : activities.length) ? [activities[0]] : [];
777
777
  state.data.activitiesData.activities = (selectedActivity === null || selectedActivity === void 0 ? void 0 : selectedActivity.length) > 0 ? selectedActivity : defaultActivities;
778
778
  state.data.businessTypeData.responseBody = __assign(__assign({}, state.data.businessTypeData.responseBody), { entity_id: entity === null || entity === void 0 ? void 0 : entity.id, activities: activities });
779
779
  state.data.businessTypeData.entityLegalName = (business_name === null || business_name === void 0 ? void 0 : business_name.en) || '';
@@ -846,7 +846,8 @@ export var businessSlice = createSlice({
846
846
  var _a;
847
847
  return (_a = brandInfo === null || brandInfo === void 0 ? void 0 : brandInfo.activities) === null || _a === void 0 ? void 0 : _a.find(function (value) { return value.id === activity.id; });
848
848
  });
849
- state.data.activitiesData.activities = (selectedActivity === null || selectedActivity === void 0 ? void 0 : selectedActivity.length) > 0 ? selectedActivity : [activities === null || activities === void 0 ? void 0 : activities[0]];
849
+ var defaultActivities = (activities === null || activities === void 0 ? void 0 : activities.length) ? [activities[0]] : [];
850
+ state.data.activitiesData.activities = (selectedActivity === null || selectedActivity === void 0 ? void 0 : selectedActivity.length) > 0 ? selectedActivity : defaultActivities;
850
851
  state.data.businessTypeData.responseBody = __assign(__assign({}, state.data.businessTypeData.responseBody), { entity_id: entity === null || entity === void 0 ? void 0 : entity.id, activities: activities });
851
852
  state.data.businessTypeData.entityLegalName = (business_name === null || business_name === void 0 ? void 0 : business_name.en) || '';
852
853
  if (!!(entity === null || entity === void 0 ? void 0 : entity.license)) {
@@ -1021,7 +1022,7 @@ export var businessSlice = createSlice({
1021
1022
  state.data.activitiesData.operationStartDate = convertNumbers2English(formattedDate);
1022
1023
  }
1023
1024
  var activities = entity_activities || [];
1024
- var selectedActivity = activities === null || activities === void 0 ? void 0 : activities[0];
1025
+ var selectedActivity = activities[0];
1025
1026
  if (!!selectedActivity)
1026
1027
  state.data.activitiesData.activities = [selectedActivity];
1027
1028
  state.data.businessTypeData.responseBody = __assign(__assign(__assign(__assign(__assign({}, data), state.data.businessTypeData.responseBody), { activities: activities }), accountData), documentData);
@@ -1054,10 +1055,7 @@ export var businessSlice = createSlice({
1054
1055
  state.error = null;
1055
1056
  var _a = action.payload, data = _a.data, formData = _a.formData;
1056
1057
  state.data.activitiesData = formData;
1057
- console.log('updateActivitiesInfo', state.data.activitiesData.responseBody);
1058
- console.log('updateActivitiesInfo', data);
1059
1058
  state.data.activitiesData.responseBody = __assign(__assign({}, data), state.data.activitiesData.responseBody);
1060
- console.log('updateActivitiesInfo', state.data.activitiesData.responseBody);
1061
1059
  })
1062
1060
  .addCase(updateActivitiesInfo.rejected, function (state, action) {
1063
1061
  state.loading = false;
package/build/features/app/connect/connectStore.d.ts CHANGED
@@ -96,8 +96,9 @@ export declare const connectSlice: import("@reduxjs/toolkit").Slice<ConnectState
96
96
  resetIndividualScreen: (state: ConnectState) => void;
97
97
  resetMerchantScreen: (state: ConnectState) => void;
98
98
  setDefaultCountryCode: (state: ConnectState, action: ActionState<CountryCode>) => void;
99
+ resetStore: (state: ConnectState) => void;
99
100
  }, "connect/store">;
100
- export declare const clearError: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, stopLoader: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetMobileScreen: import("@reduxjs/toolkit").ActionCreatorWithPayload<CountryCode, string>, resetOTPScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetIndividualScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetMerchantScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetNIDScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetCivilScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, setDefaultCountryCode: import("@reduxjs/toolkit").ActionCreatorWithPayload<CountryCode, string>;
101
+ export declare const clearError: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, stopLoader: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetMobileScreen: import("@reduxjs/toolkit").ActionCreatorWithPayload<CountryCode, string>, resetOTPScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetIndividualScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetMerchantScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetNIDScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetCivilScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetStore: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, setDefaultCountryCode: import("@reduxjs/toolkit").ActionCreatorWithPayload<CountryCode, string>;
101
102
  declare const _default: import("redux").Reducer<ConnectState, import("redux").AnyAction>;
102
103
  export default _default;
103
104
  export declare const connectSelector: (state: RootState) => ConnectState;
package/build/features/app/connect/connectStore.js CHANGED
@@ -56,6 +56,15 @@ var __rest = (this && this.__rest) || function (s, e) {
56
56
  }
57
57
  return t;
58
58
  };
59
+ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
60
+ if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
61
+ if (ar || !(i in from)) {
62
+ if (!ar) ar = Array.prototype.slice.call(from, 0, i);
63
+ ar[i] = from[i];
64
+ }
65
+ }
66
+ return to.concat(ar || Array.prototype.slice.call(from));
67
+ };
59
68
  var _a;
60
69
  import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
61
70
  import { handleNextScreenStep } from '../../../app/settings';
@@ -425,10 +434,10 @@ export var updateLeadIndividual = createAsyncThunk('updateLeadIndividual', funct
425
434
  });
426
435
  }); });
427
436
  export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
428
- var _a, settings, connect, responseBody, isNewBrand, brandName, salesChannels, selectedBrandItem, getAddress, channel_services, brandReqBody_1, brand_1, brandNameBody, payload, lead, brandReqBody, brand;
429
- var _b, _c, _d, _e, _f;
430
- return __generator(this, function (_g) {
431
- switch (_g.label) {
437
+ var _a, settings, connect, responseBody, isNewBrand, brandName, salesChannels, selectedBrandItem, getAddress, channel_services, payload_1, lead_1, brandReqBody_1, brand_1, brandNameBody, payload, lead, brandReqBody, brand;
438
+ var _b, _c, _d, _e, _f, _g;
439
+ return __generator(this, function (_h) {
440
+ switch (_h.label) {
432
441
  case 0:
433
442
  _a = thunkApi.getState(), settings = _a.settings, connect = _a.connect;
434
443
  responseBody = connect.data.otpData.responseBody;
@@ -450,20 +459,30 @@ export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (param
450
459
  })
451
460
  };
452
461
  });
453
- if (!!isNewBrand) return [3, 2];
462
+ if (!!isNewBrand) return [3, 3];
463
+ payload_1 = {
464
+ brand: {
465
+ id: (selectedBrandItem === null || selectedBrandItem === void 0 ? void 0 : selectedBrandItem.id) || ''
466
+ },
467
+ id: (responseBody === null || responseBody === void 0 ? void 0 : responseBody.lead_id) || '',
468
+ step_name: CONNECT_STEP_NAMES.UPDATE_LEAD_BRAND
469
+ };
470
+ return [4, API.leadService.updateLead(payload_1)];
471
+ case 1:
472
+ lead_1 = _h.sent();
454
473
  brandReqBody_1 = {
455
- id: (selectedBrandItem === null || selectedBrandItem === void 0 ? void 0 : selectedBrandItem.id) || '',
474
+ id: ((_b = lead_1.brand) === null || _b === void 0 ? void 0 : _b.id) || '',
456
475
  channel_services: channel_services,
457
476
  step_name: CONNECT_STEP_NAMES.UPDATE_BRAND_INFO
458
477
  };
459
478
  return [4, API.brandService.updateBrandInfo(brandReqBody_1)];
460
- case 1:
461
- brand_1 = _g.sent();
479
+ case 2:
480
+ brand_1 = _h.sent();
462
481
  thunkApi.dispatch(updateLeadSuccess());
463
482
  thunkApi.dispatch(handleNextScreenStep());
464
- (_c = (_b = settings.data.appConfig).onStepCompleted) === null || _c === void 0 ? void 0 : _c.call(_b, settings.data.activeScreen.name, params);
483
+ (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, params);
465
484
  return [2, { response: brand_1, formData: params }];
466
- case 2:
485
+ case 3:
467
486
  brandNameBody = {
468
487
  name: {
469
488
  en: brandName,
@@ -478,20 +497,20 @@ export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (param
478
497
  encryption_contract: ['brand.name.en', 'brand.name.ar', 'brand.name.zh']
479
498
  };
480
499
  return [4, API.leadService.updateLead(payload)];
481
- case 3:
482
- lead = _g.sent();
500
+ case 4:
501
+ lead = _h.sent();
483
502
  brandReqBody = {
484
- id: ((_d = lead.brand) === null || _d === void 0 ? void 0 : _d.id) || '',
503
+ id: ((_e = lead.brand) === null || _e === void 0 ? void 0 : _e.id) || '',
485
504
  channel_services: channel_services,
486
505
  term: ['agree'],
487
506
  step_name: CONNECT_STEP_NAMES.UPDATE_BRAND_INFO
488
507
  };
489
508
  return [4, API.brandService.updateBrandInfo(brandReqBody)];
490
- case 4:
491
- brand = _g.sent();
509
+ case 5:
510
+ brand = _h.sent();
492
511
  thunkApi.dispatch(updateLeadSuccess());
493
512
  thunkApi.dispatch(handleNextScreenStep());
494
- (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, params);
513
+ (_g = (_f = settings.data.appConfig).onStepCompleted) === null || _g === void 0 ? void 0 : _g.call(_f, settings.data.activeScreen.name, params);
495
514
  return [2, { response: brand, formData: params }];
496
515
  }
497
516
  });
@@ -635,6 +654,10 @@ export var connectSlice = createSlice({
635
654
  setDefaultCountryCode: function (state, action) {
636
655
  state.data.mobileData.countryCode = action.payload;
637
656
  state.data.individualData.countryCode = action.payload;
657
+ },
658
+ resetStore: function (state) {
659
+ var countryCode = state.data.mobileData.countryCode;
660
+ state.data = __assign(__assign({}, initialState.data), { mobileData: __assign(__assign({}, initialState.data.mobileData), { countryCode: countryCode }), individualData: __assign(__assign({}, initialState.data.individualData), { countryCode: countryCode }) });
638
661
  }
639
662
  },
640
663
  extraReducers: function (builder) {
@@ -725,11 +748,19 @@ export var connectSlice = createSlice({
725
748
  if ((_a = brand === null || brand === void 0 ? void 0 : brand.name) === null || _a === void 0 ? void 0 : _a.en)
726
749
  state.data.brandData.brandName = brand.name.en;
727
750
  if (!isNewUser) {
751
+ var brandList = [];
752
+ if ((brand_list === null || brand_list === void 0 ? void 0 : brand_list.length) > 0) {
753
+ var isBrandExist = brand_list.find(function (item) { return item.id === (brand === null || brand === void 0 ? void 0 : brand.id); });
754
+ brandList = __spreadArray([], brand_list, true);
755
+ if (!isBrandExist)
756
+ brandList = __spreadArray(__spreadArray([], brandList, true), [__assign(__assign({}, brand), { channel_services: [] })], false);
757
+ brandList = __spreadArray(__spreadArray([], brandList, true), [OTHER_BRAND], false);
758
+ state.data.brandData.selectedBrandItem = brandList[0];
759
+ }
728
760
  state.data.brandData.responseBody = {
729
- brand_list: (brand_list === null || brand_list === void 0 ? void 0 : brand_list.length) ? brand_list.concat(OTHER_BRAND) : [],
761
+ brand_list: brandList,
730
762
  channel_list: channel_list
731
763
  };
732
- state.data.brandData.selectedBrandItem = (brand_list === null || brand_list === void 0 ? void 0 : brand_list[0]) || {};
733
764
  }
734
765
  state.data.otpData.responseBody = __assign(__assign({}, authResponse), { is_new_individual: is_new_individual, lead_id: id, name: name, contact: contact, userInfoMissed: userInfoMissed });
735
766
  })
@@ -761,11 +792,19 @@ export var connectSlice = createSlice({
761
792
  if ((_a = brand === null || brand === void 0 ? void 0 : brand.name) === null || _a === void 0 ? void 0 : _a.en)
762
793
  state.data.brandData.brandName = brand.name.en;
763
794
  if (!isNewUser) {
795
+ var brandList = [];
796
+ if ((brand_list === null || brand_list === void 0 ? void 0 : brand_list.length) > 0) {
797
+ var isBrandExist = brand_list.find(function (item) { return item.id === (brand === null || brand === void 0 ? void 0 : brand.id); });
798
+ brandList = __spreadArray([], brand_list, true);
799
+ if (!isBrandExist)
800
+ brandList = __spreadArray(__spreadArray([], brandList, true), [__assign(__assign({}, brand), { channel_services: [] })], false);
801
+ brandList = __spreadArray(__spreadArray([], brandList, true), [OTHER_BRAND], false);
802
+ state.data.brandData.selectedBrandItem = brandList[0];
803
+ }
764
804
  state.data.brandData.responseBody = {
765
- brand_list: (brand_list === null || brand_list === void 0 ? void 0 : brand_list.length) ? brand_list.concat(OTHER_BRAND) : [],
805
+ brand_list: brandList,
766
806
  channel_list: channel_list
767
807
  };
768
- state.data.brandData.selectedBrandItem = (brand_list === null || brand_list === void 0 ? void 0 : brand_list[0]) || {};
769
808
  }
770
809
  state.data.otpData.responseBody = __assign(__assign({}, authResponse), { is_new_individual: is_new_individual, lead_id: id, name: name, contact: contact, userInfoMissed: userInfoMissed });
771
810
  })
@@ -832,7 +871,10 @@ export var connectSlice = createSlice({
832
871
  state.data.brandData.termAndConditionChecked = !!termAndCondition;
833
872
  }
834
873
  if (brand_list) {
874
+ var isBrandExist = brand_list.find(function (item) { return item.id === (brand === null || brand === void 0 ? void 0 : brand.id); });
835
875
  state.data.brandData.responseBody = { brand_list: brand_list.concat(OTHER_BRAND) };
876
+ if (!isBrandExist)
877
+ state.data.brandData.responseBody.brand_list = brand_list.concat(__assign(__assign({}, brand), { channel_services: [] }), OTHER_BRAND);
836
878
  state.data.brandData.selectedBrandItem = brand_list[0];
837
879
  }
838
880
  if (channel_list) {
@@ -911,6 +953,6 @@ export var connectSlice = createSlice({
911
953
  });
912
954
  }
913
955
  });
914
- export var clearError = (_a = connectSlice.actions, _a.clearError), stopLoader = _a.stopLoader, resetMobileScreen = _a.resetMobileScreen, resetOTPScreen = _a.resetOTPScreen, resetIndividualScreen = _a.resetIndividualScreen, resetMerchantScreen = _a.resetMerchantScreen, resetNIDScreen = _a.resetNIDScreen, resetCivilScreen = _a.resetCivilScreen, setDefaultCountryCode = _a.setDefaultCountryCode;
956
+ export var clearError = (_a = connectSlice.actions, _a.clearError), stopLoader = _a.stopLoader, resetMobileScreen = _a.resetMobileScreen, resetOTPScreen = _a.resetOTPScreen, resetIndividualScreen = _a.resetIndividualScreen, resetMerchantScreen = _a.resetMerchantScreen, resetNIDScreen = _a.resetNIDScreen, resetCivilScreen = _a.resetCivilScreen, resetStore = _a.resetStore, setDefaultCountryCode = _a.setDefaultCountryCode;
915
957
  export default connectSlice.reducer;
916
958
  export var connectSelector = function (state) { return state.connect; };
package/build/features/app/entity/entityStore.js CHANGED
@@ -391,7 +391,7 @@ export var entitySlice = createSlice({
391
391
  var _a;
392
392
  return (_a = brand === null || brand === void 0 ? void 0 : brand.activities) === null || _a === void 0 ? void 0 : _a.find(function (value) { return value.id === activity.id; });
393
393
  });
394
- var defaultActivities = (activities === null || activities === void 0 ? void 0 : activities[0]) ? [activities === null || activities === void 0 ? void 0 : activities[0]] : [];
394
+ var defaultActivities = (activities === null || activities === void 0 ? void 0 : activities.length) ? [activities[0]] : [];
395
395
  state.data.entityData.activities = (selectedActivity === null || selectedActivity === void 0 ? void 0 : selectedActivity.length) > 0 ? selectedActivity : defaultActivities;
396
396
  state.data.entityData.responseBody = __assign(__assign({}, state.data.entityData.responseBody), { entity_id: entity === null || entity === void 0 ? void 0 : entity.id, activities: activities, operationStartDate: startDate || issuingDate, selectedActivities: (selectedActivity === null || selectedActivity === void 0 ? void 0 : selectedActivity.length) > 0 ? selectedActivity : defaultActivities });
397
397
  })
@@ -450,7 +450,8 @@ export var entitySlice = createSlice({
450
450
  var _a;
451
451
  return (_a = brand === null || brand === void 0 ? void 0 : brand.activities) === null || _a === void 0 ? void 0 : _a.find(function (value) { return value.id === activity.id; });
452
452
  });
453
- state.data.entityData.responseBody = __assign(__assign({}, state.data.entityData.responseBody), { entity_id: entity === null || entity === void 0 ? void 0 : entity.id, activities: activities, selectedActivities: (selectedActivity === null || selectedActivity === void 0 ? void 0 : selectedActivity.length) > 0 ? selectedActivity : [activities === null || activities === void 0 ? void 0 : activities[0]], operationStartDate: startDate || issuingDate });
453
+ var defaultActivities = (activities === null || activities === void 0 ? void 0 : activities.length) ? [activities[0]] : [];
454
+ state.data.entityData.responseBody = __assign(__assign({}, state.data.entityData.responseBody), { entity_id: entity === null || entity === void 0 ? void 0 : entity.id, activities: activities, selectedActivities: (selectedActivity === null || selectedActivity === void 0 ? void 0 : selectedActivity.length) > 0 ? selectedActivity : defaultActivities, operationStartDate: startDate || issuingDate });
454
455
  })
455
456
  .addCase(verifyEntityLeadOTP.rejected, function (state, action) {
456
457
  state.loading = false;
package/build/features/connect/screens/CivilID/CivilID.js CHANGED
@@ -29,7 +29,7 @@ import { yupResolver } from '@hookform/resolvers/yup';
29
29
  import { civilIDValidationSchema } from './validation';
30
30
  import { useAppDispatch, useLanguage, useAppSelector, useSetFromDefaultValues } from '../../../../hooks';
31
31
  import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
32
- import { clearError, connectSelector, createCivilIdAuth, resetMobileScreen } from '../../../app/connect/connectStore';
32
+ import { clearError, connectSelector, createCivilIdAuth, resetMobileScreen, resetStore } from '../../../app/connect/connectStore';
33
33
  import Form from '../../../../components/Form';
34
34
  import Button, { MobileButton } from '../../../shared/Button';
35
35
  import { ScreenContainer } from '../../../shared/Containers';
@@ -93,6 +93,9 @@ var CivilID = function (_a) {
93
93
  var onBack = function () {
94
94
  dispatch(handlePrevScreenStep('CONNECT_MOBILE_STEP'));
95
95
  };
96
+ React.useEffect(function () {
97
+ dispatch(resetStore());
98
+ }, []);
96
99
  var disabled = !methods.formState.isValid || !!error;
97
100
  return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(IDNumber, { sx: { mb: methods.formState.isValid ? 7.5 : 0, transition: 'mb 0.3s' } }), _jsx(Button, __assign({ loading: loading, isAr: isAr, disableBack: true, disabled: disabled || settingsStore.loading, error: t(error || '') }, { children: t('next') })), _jsxs(Collapse, __assign({ in: !methods.formState.isValid }, { children: [_jsxs(OrBoxStyled, { children: [_jsx(DividerStyled, {}), _jsx(TextStyled, { children: t('or') }), _jsx(DividerStyled, {})] }), _jsx(MobileButton, __assign({ onClick: function () { return onBack(); }, disabled: loading || settingsStore.loading }, { children: t('mobile_button_label') }))] }))] })) })) }));
98
101
  };
package/build/features/connect/screens/Individual/Individual.js CHANGED
@@ -72,7 +72,7 @@ var Individual = function (_a) {
72
72
  var _a;
73
73
  dispatch(resetIndividualScreen());
74
74
  var code = (_a = settingsData.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2;
75
- var screen = isKW(code) ? 'CONNECT_CIVIL_ID_STEP' : startWithNID ? 'CONNECT_NID_STEP' : 'CONNECT_MOBILE_STEP';
75
+ var screen = startWithNID ? (isKW(code) ? 'CONNECT_CIVIL_ID_STEP' : 'CONNECT_NID_STEP') : 'CONNECT_MOBILE_STEP';
76
76
  dispatch(handlePrevScreenStep(screen));
77
77
  };
78
78
  React.useEffect(function () {
package/build/features/connect/screens/Merchant/Merchant.js CHANGED
@@ -65,7 +65,7 @@ var Merchant = function (_a) {
65
65
  return;
66
66
  }
67
67
  var code = (_a = settingsData.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2;
68
- var screen = isKW(code) ? 'CONNECT_CIVIL_ID_STEP' : startWithNID ? 'CONNECT_NID_STEP' : 'CONNECT_MOBILE_STEP';
68
+ var screen = startWithNID ? (isKW(code) ? 'CONNECT_CIVIL_ID_STEP' : 'CONNECT_NID_STEP') : 'CONNECT_MOBILE_STEP';
69
69
  dispatch(handlePrevScreenStep(screen));
70
70
  };
71
71
  React.useEffect(function () {
package/build/features/connect/screens/Mobile/Mobile.js CHANGED
@@ -33,7 +33,7 @@ import Button, { AbsherButton, MobileButton } from '../../../shared/Button';
33
33
  import { useAppDispatch, useAppSelector, useSetFromDefaultValues } from '../../../../hooks';
34
34
  import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
35
35
  import ScreenContainer from '../../../shared/Containers/ScreenContainer';
36
- import { clearError, connectSelector, createMobileAuth, resetNIDScreen, resetCivilScreen, resetOTPScreen } from '../../../app/connect/connectStore';
36
+ import { clearError, connectSelector, createMobileAuth, resetNIDScreen, resetCivilScreen, resetOTPScreen, resetStore } from '../../../app/connect/connectStore';
37
37
  import { useLanguage } from '../../../../hooks';
38
38
  import Divider from '@mui/material/Divider';
39
39
  import { isKW } from '../../../../utils';
@@ -119,6 +119,9 @@ var Mobile = function (_a) {
119
119
  var onBack = function () {
120
120
  dispatch(handlePrevScreenStep(isKWCountry ? 'CONNECT_CIVIL_ID_STEP' : 'CONNECT_NID_STEP'));
121
121
  };
122
+ React.useEffect(function () {
123
+ dispatch(resetStore());
124
+ }, []);
122
125
  var isBusinessListActive = listType === ListType.BusinessList;
123
126
  var isCountryListActive = listType === ListType.CountryCodeList;
124
127
  var listActive = isBusinessListActive || isCountryListActive;
package/build/features/connect/screens/NID/NID.js CHANGED
@@ -18,7 +18,7 @@ import { yupResolver } from '@hookform/resolvers/yup';
18
18
  import { NIDValidationSchema } from './validation';
19
19
  import { useAppDispatch, useLanguage, useAppSelector } from '../../../../hooks';
20
20
  import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
21
- import { clearError, connectSelector, createNIDAuth, resetMobileScreen } from '../../../app/connect/connectStore';
21
+ import { clearError, connectSelector, createNIDAuth, resetMobileScreen, resetStore } from '../../../app/connect/connectStore';
22
22
  import Form from '../../../../components/Form';
23
23
  import Button, { MobileButton } from '../../../shared/Button';
24
24
  import { ScreenContainer } from '../../../shared/Containers';
@@ -85,6 +85,9 @@ var NID = function (_a) {
85
85
  var onBack = function () {
86
86
  dispatch(handlePrevScreenStep('CONNECT_MOBILE_STEP'));
87
87
  };
88
+ React.useEffect(function () {
89
+ dispatch(resetStore());
90
+ }, []);
88
91
  var disabled = !methods.formState.isValid || !!error;
89
92
  return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Collapse, __assign({ in: !collapse }, { children: _jsx(IDNumber, { show: !collapse }) })), _jsx(DOB, { onDateClicked: handleCollapseOpenClose }), _jsxs(Collapse, __assign({ in: !collapse }, { children: [_jsx(Button, __assign({ loading: loading, isAr: isAr, disableBack: true, disabled: disabled || settingsStore.loading, error: t(error || '') }, { children: t('next') })), _jsxs(Collapse, __assign({ in: !methods.formState.isValid }, { children: [_jsxs(OrBoxStyled, { children: [_jsx(DividerStyled, {}), _jsx(TextStyled, { children: t('or') }), _jsx(DividerStyled, {})] }), _jsx(MobileButton, __assign({ onClick: function () { return onBack(); }, disabled: loading || settingsStore.loading }, { children: t('mobile_button_label') }))] }))] }))] })) })) }));
90
93
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tap-payments/auth-jsconnect",
3
- "version": "2.0.121-test",
3
+ "version": "2.0.123-test",
4
4
  "description": "connect library, auth",
5
5
  "private": false,
6
6
  "main": "build/index.js",