@tap-payments/auth-jsconnect 2.3.0 → 2.3.1

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

@@ -228,7 +228,7 @@ export var createNIDAuth = createAsyncThunk('createNIDAuth', function (params, t
     });
 }); });
 export var verifyAuth = createAsyncThunk('connect/verifyAuth', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, connect, settings, startWithNID, _b, mobileData, nidData, responseBody, stepName, payload, data, lead_id, leadResponse, channels, brands, err_1, countryCode, phone;
+    var _a, connect, settings, startWithNID, _b, mobileData, nidData, responseBody, stepName, payload, data, lead_id, leadResponse, channels, brand, err_1, brands, err_2, countryCode, phone;
     var _c, _d, _e, _f;
     return __generator(this, function (_g) {
         switch (_g.label) {
@@ -274,15 +274,25 @@ export var verifyAuth = createAsyncThunk('connect/verifyAuth', function (params,
                 _g.label = 4;
             case 4:
                 _g.trys.push([4, 6, , 7]);
-                return [4, API.brandService.getBrandList({ individual_id: leadResponse.individual_id })];
+                return [4, API.brandService.retrieveBrand(leadResponse.brand.id)];
             case 5:
-                brands = (_g.sent()).brands;
-                leadResponse.brand_list = fixBrandList(brands, channels);
+                brand = (_g.sent()).brand;
+                leadResponse.brand = __assign(__assign({}, leadResponse.brand), brand);
                 return [3, 7];
             case 6:
                 err_1 = _g.sent();
                 return [3, 7];
             case 7:
+                _g.trys.push([7, 9, , 10]);
+                return [4, API.brandService.getBrandList({ individual_id: leadResponse.individual_id })];
+            case 8:
+                brands = (_g.sent()).brands;
+                leadResponse.brand_list = fixBrandList(brands, channels);
+                return [3, 10];
+            case 9:
+                err_2 = _g.sent();
+                return [3, 10];
+            case 10:
                 countryCode = settings.data.businessCountry;
                 phone = (leadResponse.contact || {}).phone;
                 if (phone === null || phone === void 0 ? void 0 : phone.country_code)
@@ -294,7 +304,7 @@ export var verifyAuth = createAsyncThunk('connect/verifyAuth', function (params,
     });
 }); });
 export var verifyPACI = createAsyncThunk('connect/verifyPACI', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connect, responseBody, expiry, interval, maxCalls, count, authResponse, isSuccess, lead_id, leadResponse, countryCode, channels, brands, err_2, phone;
+    var _a, settings, connect, responseBody, expiry, interval, maxCalls, count, authResponse, isSuccess, lead_id, leadResponse, countryCode, channels, brand, err_3, brands, err_4, phone;
     var _b, _c, _d, _e, _f;
     return __generator(this, function (_g) {
         switch (_g.label) {
@@ -307,15 +317,15 @@ export var verifyPACI = createAsyncThunk('connect/verifyPACI', function (params,
                 count = 1;
                 _g.label = 1;
             case 1:
-                if (!(count <= maxCalls)) return [3, 13];
+                if (!(count <= maxCalls)) return [3, 16];
                 if (thunkApi.signal.aborted) {
-                    return [3, 13];
+                    return [3, 16];
                 }
                 return [4, API.authService.getVerifyAuth(responseBody === null || responseBody === void 0 ? void 0 : responseBody.auth_token)];
             case 2:
                 authResponse = _g.sent();
                 isSuccess = ((_b = authResponse.status) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === 'success';
-                if (!isSuccess) return [3, 10];
+                if (!isSuccess) return [3, 13];
                 lead_id = authResponse.lead_id;
                 if (!lead_id)
                     throw new Error('Lead id is missing');
@@ -332,18 +342,28 @@ export var verifyPACI = createAsyncThunk('connect/verifyPACI', function (params,
                 _g.label = 5;
             case 5:
                 _g.trys.push([5, 7, , 8]);
-                return [4, API.brandService.getBrandList({ individual_id: leadResponse.individual_id })];
+                return [4, API.brandService.retrieveBrand(leadResponse.brand.id)];
             case 6:
-                brands = (_g.sent()).brands;
-                leadResponse.brand_list = fixBrandList(brands, channels);
+                brand = (_g.sent()).brand;
+                leadResponse.brand = __assign(__assign({}, leadResponse.brand), brand);
                 return [3, 8];
             case 7:
-                err_2 = _g.sent();
+                err_3 = _g.sent();
                 return [3, 8];
             case 8:
+                _g.trys.push([8, 10, , 11]);
+                return [4, API.brandService.getBrandList({ individual_id: leadResponse.individual_id })];
+            case 9:
+                brands = (_g.sent()).brands;
+                leadResponse.brand_list = fixBrandList(brands, channels);
+                return [3, 11];
+            case 10:
+                err_4 = _g.sent();
+                return [3, 11];
+            case 11:
                 (_d = params.onSuccess) === null || _d === void 0 ? void 0 : _d.call(params);
                 return [4, sleep(3000)];
-            case 9:
+            case 12:
                 _g.sent();
                 phone = (leadResponse.contact || {}).phone;
                 if (phone === null || phone === void 0 ? void 0 : phone.country_code)
@@ -351,25 +371,26 @@ export var verifyPACI = createAsyncThunk('connect/verifyPACI', function (params,
                 (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, {});
                 thunkApi.dispatch(handleNextScreenStep());
                 return [2, { authResponse: authResponse, leadResponse: leadResponse, countryCode: countryCode }];
-            case 10: return [4, sleep(interval * 1000)];
-            case 11:
+            case 13: return [4, sleep(interval * 1000)];
+            case 14:
                 _g.sent();
-                _g.label = 12;
-            case 12:
+                _g.label = 15;
+            case 15:
                 count++;
                 return [3, 1];
-            case 13: throw new Error('paci_verification_failed');
+            case 16: throw new Error('paci_verification_failed');
         }
     });
 }); });
 export var updateLeadIndividual = createAsyncThunk('updateLeadIndividual', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connect, lead_id, phoneCountry, payload, leadResponse, brand;
+    var _a, settings, connect, lead_id, brandData, phoneCountry, payload, leadResponse;
     var _b, _c, _d, _e, _f;
     return __generator(this, function (_g) {
         switch (_g.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, connect = _a.connect;
                 lead_id = (connect.data.otpData.responseBody || {}).lead_id;
+                brandData = (connect.data.brandData.responseBody || {}).brandData;
                 phoneCountry = (_c = (_b = params.countryCode) === null || _b === void 0 ? void 0 : _b.idd_prefix) === null || _c === void 0 ? void 0 : _c.toString();
                 payload = {
                     id: lead_id || '',
@@ -382,19 +403,33 @@ export var updateLeadIndividual = createAsyncThunk('updateLeadIndividual', funct
                 return [4, API.leadService.updateLead(payload)];
             case 1:
                 leadResponse = _g.sent();
-                if (!leadResponse.brand) return [3, 3];
-                return [4, API.brandService.retrieveBrand(leadResponse.brand.id)];
-            case 2:
-                brand = (_g.sent()).brand;
-                leadResponse.brand = __assign(__assign({}, leadResponse.brand), brand);
-                _g.label = 3;
-            case 3:
+                leadResponse.brand = __assign(__assign({}, leadResponse.brand), brandData);
                 (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, params);
                 thunkApi.dispatch(handleNextScreenStep());
                 return [2, { leadResponse: leadResponse, formData: params }];
         }
     });
 }); });
+export var retrieveLead = createAsyncThunk('connect/retrieveLead', function (leadId, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var settings, data, countryCode, phone;
+    var _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
+            case 0:
+                settings = thunkApi.getState().settings;
+                return [4, API.leadService.retrieveLead(leadId)];
+            case 1:
+                data = (_b.sent()).data;
+                if ((_a = data.errors) === null || _a === void 0 ? void 0 : _a.length)
+                    throw new Error(data.errors[0].description);
+                countryCode = settings.data.businessCountry;
+                phone = (data.contact || {}).phone;
+                if (phone === null || phone === void 0 ? void 0 : phone.country_code)
+                    countryCode = findCountryByIddPrefix(settings.data.countries, phone.country_code);
+                return [2, { data: data, countryCode: countryCode }];
+        }
+    });
+}); });
 export var retrieveSegmentDataList = createAsyncThunk('connectRetrieveSegmentDataList', function () { return __awaiter(void 0, void 0, void 0, function () {
     var dataBody, _a, segmentLocation, segmentProfit, segmentTech;
     return __generator(this, function (_b) {
@@ -420,7 +455,7 @@ export var retrieveSegmentDataList = createAsyncThunk('connectRetrieveSegmentDat
     });
 }); });
 export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connect, responseBody, leadBrandId, isNewBrand, brandName, salesChannels, selectedBrandItem, brandLogoId, termAndConditionChecked, getAddress, channel_services, payload_1, brandReqBody_1, brand_1, _b, segmentLocation, segmentProfit, segmentTech, err_3, teamSize, err_4, brandNameBody, payload, lead, brandReqBody, brand, _c, segmentLocation, segmentProfit, segmentTech, err_5, teamSize, err_6;
+    var _a, settings, connect, responseBody, leadBrandId, isNewBrand, brandName, salesChannels, selectedBrandItem, brandLogoId, termAndConditionChecked, getAddress, channel_services, payload_1, brandReqBody_1, brand_1, _b, segmentLocation, segmentProfit, segmentTech, err_5, teamSize, err_6, brandNameBody, payload, lead, brandReqBody, brand, _c, segmentLocation, segmentProfit, segmentTech, err_7, teamSize, err_8;
     var _d, _e, _f, _g, _h;
     return __generator(this, function (_j) {
         switch (_j.label) {
@@ -452,6 +487,7 @@ export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (param
                     brand: {
                         id: (selectedBrandItem === null || selectedBrandItem === void 0 ? void 0 : selectedBrandItem.id) || ''
                     },
+                    terms_conditions_accepted: termAndConditionChecked,
                     id: (responseBody === null || responseBody === void 0 ? void 0 : responseBody.lead_id) || '',
                     step_name: CONNECT_STEP_NAMES.UPDATE_LEAD_BRAND
                 };
@@ -480,7 +516,7 @@ export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (param
                 brand_1.segment_tech_list = segmentTech;
                 return [3, 7];
             case 6:
-                err_3 = _j.sent();
+                err_5 = _j.sent();
                 return [3, 7];
             case 7:
                 _j.trys.push([7, 9, , 10]);
@@ -490,7 +526,7 @@ export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (param
                 brand_1.team_size_list = teamSize.list;
                 return [3, 10];
             case 9:
-                err_4 = _j.sent();
+                err_6 = _j.sent();
                 return [3, 10];
             case 10:
                 sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep()); });
@@ -501,12 +537,12 @@ export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (param
                     id: '',
                     name: {
                         en: brandName,
-                        ar: brandName,
-                        zh: brandName
+                        ar: brandName
                     }
                 };
                 payload = {
                     brand: brandNameBody,
+                    terms_conditions_accepted: termAndConditionChecked,
                     id: (responseBody === null || responseBody === void 0 ? void 0 : responseBody.lead_id) || '',
                     step_name: CONNECT_STEP_NAMES.UPDATE_LEAD_BRAND,
                     encryption_contract: ['brand.name.en', 'brand.name.ar', 'brand.name.zh']
@@ -538,7 +574,7 @@ export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (param
                 brand.segment_tech_list = segmentTech;
                 return [3, 17];
             case 16:
-                err_5 = _j.sent();
+                err_7 = _j.sent();
                 return [3, 17];
             case 17:
                 _j.trys.push([17, 19, , 20]);
@@ -548,7 +584,7 @@ export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (param
                 brand.team_size_list = teamSize.list;
                 return [3, 20];
             case 19:
-                err_6 = _j.sent();
+                err_8 = _j.sent();
                 return [3, 20];
             case 20:
                 sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep()); });
@@ -811,13 +847,14 @@ export var connectSlice = createSlice({
                 var isBrandExist = brand_list.find(function (item) { return item.id === (brand === null || brand === void 0 ? void 0 : brand.id); });
                 brandList = __spreadArray([], brand_list, true);
                 if (!isBrandExist && brand)
-                    brandList = __spreadArray(__spreadArray([], brandList, true), [__assign(__assign({}, brand), { channel_services: [] })], false);
+                    brandList = __spreadArray(__spreadArray([], brandList, true), [__assign(__assign({}, brand), { channel_services: (brand === null || brand === void 0 ? void 0 : brand.channel_services) || [] })], false);
                 brandList = __spreadArray(__spreadArray([], brandList, true), [OTHER_BRAND], false);
                 state.data.brandData.selectedBrandItem = brandList[0];
             }
             state.data.brandData.responseBody = {
                 brand_list: brandList,
-                channel_list: channel_list
+                channel_list: channel_list,
+                brandData: brand
             };
             state.data.otpData.responseBody = __assign(__assign({}, authResponse), { is_new_individual: is_new_individual, lead_id: id, brand_id: brand === null || brand === void 0 ? void 0 : brand.id, name: name, contact: contact });
         })
@@ -853,13 +890,14 @@ export var connectSlice = createSlice({
                 var isBrandExist = brand_list.find(function (item) { return item.id === (brand === null || brand === void 0 ? void 0 : brand.id); });
                 brandList = __spreadArray([], brand_list, true);
                 if (!isBrandExist && brand)
-                    brandList = __spreadArray(__spreadArray([], brandList, true), [__assign(__assign({}, brand), { channel_services: [] })], false);
+                    brandList = __spreadArray(__spreadArray([], brandList, true), [__assign(__assign({}, brand), { channel_services: (brand === null || brand === void 0 ? void 0 : brand.channel_services) || [] })], false);
                 brandList = __spreadArray(__spreadArray([], brandList, true), [OTHER_BRAND], false);
                 state.data.brandData.selectedBrandItem = brandList[0];
             }
             state.data.brandData.responseBody = {
                 brand_list: brandList,
-                channel_list: channel_list
+                channel_list: channel_list,
+                brandData: brand
             };
             state.data.otpData.responseBody = __assign(__assign({}, authResponse), { is_new_individual: is_new_individual, lead_id: id, brand_id: brand === null || brand === void 0 ? void 0 : brand.id, name: name, contact: contact });
         })
@@ -904,7 +942,7 @@ export var connectSlice = createSlice({
             state.loading = false;
             state.error = null;
             var _d = action.payload, formData = _d.formData, leadResponse = _d.leadResponse;
-            var brand = leadResponse.brand, rest = __rest(leadResponse, ["brand"]);
+            var brand = leadResponse.brand, terms_conditions_accepted = leadResponse.terms_conditions_accepted, rest = __rest(leadResponse, ["brand", "terms_conditions_accepted"]);
             if (brand) {
                 var channel_services = brand.channel_services, terms = brand.terms;
                 state.data.brandData.salesChannels = channel_services || [];
@@ -912,7 +950,7 @@ export var connectSlice = createSlice({
                     var term = _a.term, agree = _a.agree;
                     return term === 'general' && agree === true;
                 });
-                state.data.brandData.termAndConditionChecked = !!termAndCondition;
+                state.data.brandData.termAndConditionChecked = !!termAndCondition || terms_conditions_accepted;
             }
             var selectedBrand = ((_b = (_a = state.data.brandData) === null || _a === void 0 ? void 0 : _a.responseBody) === null || _b === void 0 ? void 0 : _b.brand_list[0]) || leadResponse.brand;
             state.data.brandData.brandName = (_c = selectedBrand === null || selectedBrand === void 0 ? void 0 : selectedBrand.name) === null || _c === void 0 ? void 0 : _c.en;
@@ -1035,6 +1073,43 @@ export var connectSlice = createSlice({
             .addCase(updateLeadSuccess.rejected, function (state, action) {
             state.loading = false;
             state.error = action.error.message;
+        })
+            .addCase(retrieveLead.fulfilled, function (state, action) {
+            var _a;
+            state.customLoading = false;
+            state.error = null;
+            var _b = action.payload, data = _b.data, countryCode = _b.countryCode;
+            var _c = data || {}, name = _c.name, contact = _c.contact, brand = _c.brand, identification = _c.identification, date_of_birth = _c.date_of_birth;
+            var _d = contact || {}, email = _d.email, phone = _d.phone;
+            var fullName = concatenateObjectValues(name, ['first', 'middle', 'last']);
+            if (!!fullName) {
+                var capitalizedName = capitalizeTheFirstLetterOfEachWord(fullName);
+                state.data.individualData.name = capitalizedName;
+            }
+            if (email)
+                state.data.individualData.email = email;
+            if (phone === null || phone === void 0 ? void 0 : phone.number) {
+                state.data.mobileData.mobile = phone.number;
+                state.data.individualData.mobile = phone.number;
+            }
+            if (!!countryCode) {
+                state.data.mobileData.countryCode = countryCode;
+                state.data.individualData.countryCode = countryCode;
+            }
+            if ((_a = brand === null || brand === void 0 ? void 0 : brand.name) === null || _a === void 0 ? void 0 : _a.en)
+                state.data.brandData.brandName = brand.name.en;
+            if (identification === null || identification === void 0 ? void 0 : identification.id)
+                state.data.nidData.nid = identification === null || identification === void 0 ? void 0 : identification.id;
+            if (date_of_birth)
+                state.data.nidData.dob = date_of_birth;
+        })
+            .addCase(retrieveLead.pending, function (state) {
+            state.customLoading = true;
+            state.error = null;
+        })
+            .addCase(retrieveLead.rejected, function (state, action) {
+            state.customLoading = false;
+            state.error = action.error.message;
         });
     }
 });

package/build/features/app/connectExpress/connectExpressStore.js

@@ -699,8 +699,7 @@ export var updateLeadBusinessDataAsync = createAsyncThunk('updateLeadBusinessDat
                     brandNameBody = {
                         name: {
                             en: brandName,
-                            ar: brandName,
-                            zh: brandName
+                            ar: brandName
                         }
                     };
                     payload = {

package/build/features/app/entity/entityStore.js

@@ -396,7 +396,7 @@ export var updateEntityCapital = createAsyncThunk('entityUpdateEntityCapital', f
                         return ({ id: id, action: 'add' });
                     });
                     payload = __assign({ id: id, activities: isActivitiesNonEditable || (activityIds === null || activityIds === void 0 ? void 0 : activityIds.length) === 0 ? undefined : activityIds }, (!isCapitalNonEditable && {
-                        capital: __assign({ paid: isCapitalPaidNonEditable ? undefined : removeAllCharsFromNumber(capitalPaid) }, (!((isCapitalShareCountNonEditable && isCapitalShareValueNonEditable) || !hasCapitalShares) && {
+                        capital: __assign({ paid: isCapitalPaidNonEditable || !capitalPaid ? undefined : removeAllCharsFromNumber(capitalPaid) }, (!((isCapitalShareCountNonEditable && isCapitalShareValueNonEditable) || !hasCapitalShares) && {
                             shares: {
                                 count: isCapitalShareCountNonEditable ? undefined : capitalShareCount,
                                 value: isCapitalShareValueNonEditable ? undefined : removeAllCharsFromNumber(capitalShareValue)

package/build/features/brand/screens/BrandActivities/validation.d.ts

@@ -1,20 +1,20 @@
 import * as yup from 'yup';
 export declare const BrandActivitiesValidationSchema: () => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     activities: yup.ArraySchema<yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-        ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+        ar: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
+        en: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
     }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-        ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+        ar: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
+        en: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
     }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-        ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+        ar: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
+        en: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
     }>>>, import("yup/lib/types").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-        ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+        ar: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
+        en: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
     }>>[] | undefined, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-        ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+        ar: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
+        en: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
     }>>[] | undefined>;
     customerLocations: import("yup/lib/array").RequiredArraySchema<yup.AnySchema<any, any, any>, import("yup/lib/types").AnyObject, any[] | undefined>;
     expectedCustomers: any;
@@ -24,20 +24,20 @@ export declare const BrandActivitiesValidationSchema: () => yup.ObjectSchema<imp
     transactionPolicy: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, true>;
 }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     activities: yup.ArraySchema<yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-        ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+        ar: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
+        en: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
     }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-        ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+        ar: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
+        en: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
     }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-        ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+        ar: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
+        en: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
     }>>>, import("yup/lib/types").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-        ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+        ar: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
+        en: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
     }>>[] | undefined, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-        ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+        ar: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
+        en: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
     }>>[] | undefined>;
     customerLocations: import("yup/lib/array").RequiredArraySchema<yup.AnySchema<any, any, any>, import("yup/lib/types").AnyObject, any[] | undefined>;
     expectedCustomers: any;
@@ -47,20 +47,20 @@ export declare const BrandActivitiesValidationSchema: () => yup.ObjectSchema<imp
     transactionPolicy: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, true>;
 }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     activities: yup.ArraySchema<yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-        ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+        ar: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
+        en: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
     }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-        ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+        ar: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
+        en: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
     }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-        ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+        ar: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
+        en: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
     }>>>, import("yup/lib/types").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-        ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+        ar: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
+        en: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
     }>>[] | undefined, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-        ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+        ar: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
+        en: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
     }>>[] | undefined>;
     customerLocations: import("yup/lib/array").RequiredArraySchema<yup.AnySchema<any, any, any>, import("yup/lib/types").AnyObject, any[] | undefined>;
     expectedCustomers: any;

package/build/features/brand/screens/BrandActivities/validation.js

@@ -10,8 +10,8 @@ export var BrandActivitiesValidationSchema = function () {
             .array()
             .min(1, 'activities_list_alert')
             .of(yup.object().shape({
-            ar: yup.string(),
-            en: yup.string()
+            ar: yup.string().nullable(),
+            en: yup.string().nullable()
         })),
         customerLocations: yup.array().required('please_choose_base'),
         expectedCustomers: yup.object().shape(objectElements).required('select_expected_customers_serve'),

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

@@ -12,12 +12,12 @@ var __assign = (this && this.__assign) || function () {
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
-import DatePicker from '../../../../components/DatePicker';
 import Text from '../../../../components/Text';
 import { ScreenContainer } from '../../../shared/Containers';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { businessSelector, clearError } from '../../../app/business/businessStore';
 import { alpha, styled } from '@mui/material/styles';
+import Calender from '../../../shared/Calender';
 export var InputLabelStyled = styled(Text)(function (_a) {
     var theme = _a.theme;
     return (__assign({ margin: theme.spacing(2.5, 2.5, 1.5, 2.5), color: alpha(theme.palette.text.primary, 0.6) }, theme.typography.caption));
@@ -40,6 +40,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, { children: [_jsxs(InputLabelStyled, { children: [t('business_start_date'), _jsx(MandatoryStyled, { children: "*" })] }), _jsx(DatePicker, { readOnly: true, defaultValue: dateValue ? new Date(dateValue) : undefined, 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(Calender, { defaultValue: dateValue ? new Date(dateValue) : undefined, onDateClicked: onDateClicked, onDateChange: handleOperationStartDateChange })] }));
 };
 export default OperationStartDate;