@tap-payments/auth-jsconnect 2.8.45-test → 2.8.48-development

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 (18) hide show
  1. package/build/features/app/bank/bankStore.js +6 -5
  2. package/build/features/app/brand/brandStore.js +90 -68
  3. package/build/features/app/entity/entityStore.d.ts +5 -1
  4. package/build/features/app/entity/entityStore.js +55 -42
  5. package/build/features/app/individual/individualStore.d.ts +1 -1
  6. package/build/features/app/individual/individualStore.js +27 -18
  7. package/build/features/app/tax/taxStore.js +1 -0
  8. package/build/features/bank/screens/BankDetails/BankDetails.js +0 -1
  9. package/build/features/brand/screens/BrandActivities/BrandActivities.js +37 -9
  10. package/build/features/brand/screens/BrandInfo/BrandInfo.js +15 -3
  11. package/build/features/brand/screens/BrandSegmentInfo/BrandSegmentInfo.js +11 -4
  12. package/build/features/entity/screens/EntityCapital/EntityCapital.js +23 -8
  13. package/build/features/entity/screens/EntityName/EntityName.js +24 -13
  14. package/build/features/individual/screens/AdditionalIndividualInfo/AdditionalIndividualInfo.js +34 -9
  15. package/build/features/individual/screens/IndividualPersonalInfo/IndividualPersonalInfo.js +59 -18
  16. package/build/hooks/useFormDirtyCheck.d.ts +5 -1
  17. package/build/hooks/useFormDirtyCheck.js +47 -10
  18. package/package.json +2 -2
package/build/features/app/bank/bankStore.js CHANGED
@@ -255,14 +255,15 @@ export var createBankAccount = createAsyncThunk('createBankAccount', function (_
255
255
  isConfirmPolicyNonEditable = hasNoneEditableValue(data_status, 'is_acknowledged');
256
256
  documentResponse = undefined;
257
257
  data = bank_account || {};
258
- hasDocument = (bankStatementId || []).length > 0;
258
+ hasDocument = !isBankStatementIdNonEditable && (bankStatementId || []).length > 0;
259
259
  documentId = document === null || document === void 0 ? void 0 : document.id;
260
260
  requestBody = {
261
261
  wallet_id: wallet_id,
262
262
  bank_account: __assign(__assign({ iban: isIBANNonEditable || isIBANMasked ? undefined : iban, beneficiary_name: isBeneficiaryNameNonEditable ? undefined : beneficiaryName, bank_name: isBankNameNonEditable ? undefined : bankName }, (!isConfirmPolicyNonEditable && {
263
263
  acknowledged_by: recipient === null || recipient === void 0 ? void 0 : recipient.id,
264
264
  is_acknowledged: confirmPolicy
265
- })), (!(isBankStatementIdNonEditable || documentId || !hasDocument) && {
265
+ })), (!documentId &&
266
+ hasDocument && {
266
267
  document: {
267
268
  type: DocumentPurpose.BANK_STATEMENT,
268
269
  files: bankStatementId || []
@@ -271,13 +272,13 @@ export var createBankAccount = createAsyncThunk('createBankAccount', function (_
271
272
  step_name: BANK_STEP_NAMES.BANK_INFO,
272
273
  encryption_contract: ['bank_account.iban', 'bank_account.beneficiary_name', 'bank_account.bank_name']
273
274
  };
274
- if (!isDirty) return [3, 2];
275
+ if (!(isDirty || (!documentId && hasDocument))) return [3, 2];
275
276
  return [4, API.entityService.createBankAccount(requestBody)];
276
277
  case 1:
277
278
  data = _g.sent();
278
279
  _g.label = 2;
279
280
  case 2:
280
- if (!(!isBankStatementIdNonEditable && documentId && hasDocument)) return [3, 4];
281
+ if (!(documentId && hasDocument)) return [3, 4];
281
282
  documentBody = {
282
283
  id: documentId,
283
284
  files: bankStatementId || []
@@ -517,7 +518,7 @@ export var bankSlice = createSlice({
517
518
  state.loading = false;
518
519
  state.error = null;
519
520
  var _a = action.payload, data = _a.data, formData = _a.formData;
520
- state.data.bankData = formData;
521
+ state.data.bankData = __assign(__assign({}, formData), { bankStatementId: undefined });
521
522
  state.data.bankData.responseBody = data;
522
523
  })
523
524
  .addCase(createBankAccount.rejected, function (state, action) {
package/build/features/app/brand/brandStore.js CHANGED
@@ -294,12 +294,12 @@ export var checkBrandNameAvailability = createAsyncThunk('checkBrandNameAvailabi
294
294
  });
295
295
  });
296
296
  export var updateBrand = createAsyncThunk('brandUpdateBrand', function (_a, thunkApi) {
297
- var formData = _a.formData, originalFormData = _a.originalFormData;
297
+ var formData = _a.formData, originalFormData = _a.originalFormData, isDirty = _a.isDirty;
298
298
  return __awaiter(void 0, void 0, void 0, function () {
299
- var _b, settings, brand, brandRes, _c, id, data_status, isNameENNonEditable, isNameARNonEditable, isChannelServicesNonEditable, salesChannels, brandName, brandLogoId, getAddress, channel_services, brandNameIsEditable, requestBody, _d, brandData, teamSizeList, _e, segmentLocation, segmentProfit, segmentTech;
300
- var _f, _g;
301
- return __generator(this, function (_h) {
302
- switch (_h.label) {
299
+ var _b, settings, brand, brandRes, _c, id, data_status, isNameENNonEditable, isNameARNonEditable, isChannelServicesNonEditable, salesChannels, brandName, brandLogoId, brandData, getAddress, channel_services, brandNameIsEditable, requestBody, brand_1, _d, teamSizeList, _e, segmentLocation, segmentProfit, segmentTech, _f, _g, _h;
300
+ var _j, _k;
301
+ return __generator(this, function (_l) {
302
+ switch (_l.label) {
303
303
  case 0:
304
304
  _b = thunkApi.getState(), settings = _b.settings, brand = _b.brand;
305
305
  brandRes = (brand.data.verify.responseBody || {}).brand;
@@ -308,6 +308,7 @@ export var updateBrand = createAsyncThunk('brandUpdateBrand', function (_a, thun
308
308
  isNameARNonEditable = hasNoneEditableValue(data_status, 'name.ar');
309
309
  isChannelServicesNonEditable = hasNoneEditableValue(data_status, 'channel_services');
310
310
  salesChannels = formData.salesChannels, brandName = formData.brandName, brandLogoId = formData.brandLogoId;
311
+ brandData = brandRes;
311
312
  getAddress = function (value, isTwitter, isWeb) {
312
313
  if (isTwitter)
313
314
  return '@' + value.replaceAll('@', '');
@@ -334,17 +335,23 @@ export var updateBrand = createAsyncThunk('brandUpdateBrand', function (_a, thun
334
335
  ar: !isNameARNonEditable ? brandName : undefined
335
336
  }
336
337
  })), { logo: brandLogoId, channel_services: channel_services });
337
- return [4, Promise.all([
338
- API.brandService.updateBrandInfo(requestBody),
339
- API.dataService.getTeamSize({ page: 0 })
340
- ])];
338
+ if (!isDirty) return [3, 2];
339
+ return [4, API.brandService.updateBrandInfo(requestBody)];
341
340
  case 1:
342
- _d = _h.sent(), brandData = _d[0].brand, teamSizeList = _d[1];
343
- return [4, thunkApi.dispatch(retrieveSegmentDataList()).unwrap()];
341
+ brand_1 = (_l.sent()).brand;
342
+ brandData = brand_1;
343
+ _l.label = 2;
344
344
  case 2:
345
- _e = _h.sent(), segmentLocation = _e.segmentLocation, segmentProfit = _e.segmentProfit, segmentTech = _e.segmentTech;
345
+ _g = (_f = Promise).all;
346
+ _h = [API.dataService.getTeamSize({ page: 0 })];
347
+ return [4, thunkApi.dispatch(retrieveSegmentDataList()).unwrap()];
348
+ case 3: return [4, _g.apply(_f, [_h.concat([
349
+ _l.sent()
350
+ ])])];
351
+ case 4:
352
+ _d = _l.sent(), teamSizeList = _d[0], _e = _d[1], segmentLocation = _e.segmentLocation, segmentProfit = _e.segmentProfit, segmentTech = _e.segmentTech;
346
353
  sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep()); });
347
- (_g = (_f = settings.data.appConfig).onStepCompleted) === null || _g === void 0 ? void 0 : _g.call(_f, settings.data.activeScreen.name, id);
354
+ (_k = (_j = settings.data.appConfig).onStepCompleted) === null || _k === void 0 ? void 0 : _k.call(_j, settings.data.activeScreen.name, id);
348
355
  return [2, {
349
356
  data: __assign({}, brandData),
350
357
  formData: originalFormData,
@@ -358,9 +365,9 @@ export var updateBrand = createAsyncThunk('brandUpdateBrand', function (_a, thun
358
365
  });
359
366
  });
360
367
  export var updateSegmentBrand = createAsyncThunk('brandUpdateBrandSegment', function (_a, thunkApi) {
361
- var formData = _a.formData, originalFormData = _a.originalFormData;
368
+ var formData = _a.formData, originalFormData = _a.originalFormData, isDirty = _a.isDirty;
362
369
  return __awaiter(void 0, void 0, void 0, function () {
363
- var _b, settings, brand, _c, brandRes, entityInfoId, _d, id, data_status, isSegmentLocationNonEditable, isSegmentProfitNonEditable, isSegmentTechNonEditable, isSegmentTeamsNonEditable, segmentLocation, segmentProfit, segmentTech, teamSize, segmentLocationId, segmentProfitId, segmentTechId, teamSizeId, hasSegment, requestBody, entityData, brandData, entity, activityList;
370
+ var _b, settings, brand, _c, brandRes, entityInfoId, _d, id, data_status, isSegmentLocationNonEditable, isSegmentProfitNonEditable, isSegmentTechNonEditable, isSegmentTeamsNonEditable, segmentLocation, segmentProfit, segmentTech, teamSize, segmentLocationId, segmentProfitId, segmentTechId, teamSizeId, hasSegment, requestBody, entityData, brandData, brand_2, entity, activityList;
364
371
  var _e, _f;
365
372
  return __generator(this, function (_g) {
366
373
  switch (_g.label) {
@@ -382,27 +389,32 @@ export var updateSegmentBrand = createAsyncThunk('brandUpdateBrandSegment', func
382
389
  segment: { location_type: segmentLocationId, profit_type: segmentProfitId, tech_type: segmentTechId, team: teamSizeId }
383
390
  }));
384
391
  entityData = undefined;
392
+ brandData = brandRes;
393
+ if (!isDirty) return [3, 2];
385
394
  return [4, API.brandService.updateBrandInfo(requestBody)];
386
395
  case 1:
387
- brandData = (_g.sent()).brand;
388
- if (!entityInfoId) return [3, 3];
389
- return [4, API.entityService.retrieveEntity(entityInfoId)];
396
+ brand_2 = (_g.sent()).brand;
397
+ brandData = brand_2;
398
+ _g.label = 2;
390
399
  case 2:
400
+ if (!entityInfoId) return [3, 4];
401
+ return [4, API.entityService.retrieveEntity(entityInfoId)];
402
+ case 3:
391
403
  entity = (_g.sent()).entity;
392
404
  entityData = entity;
393
- _g.label = 3;
394
- case 3:
405
+ _g.label = 4;
406
+ case 4:
395
407
  if (entityData === null || entityData === void 0 ? void 0 : entityData.activities) {
396
408
  entityData = __assign(__assign({}, entityData), { entity_activities: entityData.activities });
397
409
  }
398
- if (!!(entityData === null || entityData === void 0 ? void 0 : entityData.activities)) return [3, 5];
410
+ if (!!(entityData === null || entityData === void 0 ? void 0 : entityData.activities)) return [3, 6];
399
411
  return [4, API.dataService.getActivities()];
400
- case 4:
412
+ case 5:
401
413
  activityList = (_g.sent()).list;
402
414
  entityData = __assign(__assign({}, entityData), { entity_activities: activityList });
403
- _g.label = 5;
404
- case 5: return [4, thunkApi.dispatch(retrieveDataList())];
405
- case 6:
415
+ _g.label = 6;
416
+ case 6: return [4, thunkApi.dispatch(retrieveDataList())];
417
+ case 7:
406
418
  _g.sent();
407
419
  sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep()); });
408
420
  (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, id);
@@ -423,9 +435,9 @@ export var retrieveEntityList = createAsyncThunk('retrieveEntityList', function
423
435
  });
424
436
  }); });
425
437
  export var updateBrandActivities = createAsyncThunk('brandUpdateBrandActivities', function (_a, thunkApi) {
426
- var formData = _a.formData, originalFormData = _a.originalFormData;
438
+ var formData = _a.formData, originalFormData = _a.originalFormData, isDirty = _a.isDirty;
427
439
  return __awaiter(void 0, void 0, void 0, function () {
428
- var _b, settings, brand, _c, brandRes, recipient, _d, data_status, id, brandActivities, terms, isActivitiesNonEditable, isCustomerBaseLocationNonEditable, isCustomerBaseNonEditable, isTermsNonEditable, isSalesRangeNonEditable, activities, customerLocations, expectedCustomer, expectedSale, termAndConditionChecked, refundPolicy, transactionPolicy, isTermsUndefined, isAllTermsAgreed, isTermsAvailable, removedActivities, payload, requestBody, customerLocation, customerBaseId, salesId, customerBase, brandData;
440
+ var _b, settings, brand, _c, brandRes, recipient, _d, data_status, id, brandActivities, terms, isActivitiesNonEditable, isCustomerBaseLocationNonEditable, isCustomerBaseNonEditable, isTermsNonEditable, isSalesRangeNonEditable, activities, customerLocations, expectedCustomer, expectedSale, termAndConditionChecked, refundPolicy, transactionPolicy, isTermsUndefined, isAllTermsAgreed, isTermsAvailable, brandData, removedActivities, payload, requestBody, customerLocation, customerBaseId, salesId, customerBase, brand_3;
429
441
  var _e, _f, _g;
430
442
  return __generator(this, function (_h) {
431
443
  switch (_h.label) {
@@ -442,9 +454,10 @@ export var updateBrandActivities = createAsyncThunk('brandUpdateBrandActivities'
442
454
  isTermsUndefined = termAndConditionChecked === undefined && refundPolicy === undefined && transactionPolicy === undefined;
443
455
  isAllTermsAgreed = ((_e = terms === null || terms === void 0 ? void 0 : terms.filter(function (t) { return t === null || t === void 0 ? void 0 : t.agree; })) === null || _e === void 0 ? void 0 : _e.length) === 3;
444
456
  isTermsAvailable = !(isTermsNonEditable && isTermsUndefined) && !isAllTermsAgreed;
457
+ brandData = brandRes;
445
458
  removedActivities = (activities === null || activities === void 0 ? void 0 : activities.length) > 0 &&
446
459
  (brandActivities || []).filter(function (brandActivity) { return !(activities || []).some(function (activity) { return activity.id === brandActivity.id; }); });
447
- if (!(!isActivitiesNonEditable && (removedActivities === null || removedActivities === void 0 ? void 0 : removedActivities.length) > 0)) return [3, 2];
460
+ if (!(!isActivitiesNonEditable && (removedActivities === null || removedActivities === void 0 ? void 0 : removedActivities.length) > 0 && isDirty)) return [3, 2];
448
461
  payload = {
449
462
  id: id,
450
463
  activities: removedActivities.map(function (a) { return ({
@@ -471,9 +484,13 @@ export var updateBrandActivities = createAsyncThunk('brandUpdateBrandActivities'
471
484
  if (salesId && !isSalesRangeNonEditable) {
472
485
  requestBody = __assign(__assign({}, requestBody), { operations: __assign(__assign({}, requestBody.operations), { sales: salesId }) });
473
486
  }
487
+ if (!isDirty) return [3, 4];
474
488
  return [4, API.brandService.updateBrandInfo(requestBody)];
475
489
  case 3:
476
- brandData = (_h.sent()).data;
490
+ brand_3 = (_h.sent()).brand;
491
+ brandData = brand_3;
492
+ _h.label = 4;
493
+ case 4:
477
494
  thunkApi.dispatch(handleNextScreenStep());
478
495
  (_g = (_f = settings.data.appConfig).onStepCompleted) === null || _g === void 0 ? void 0 : _g.call(_f, settings.data.activeScreen.name, id);
479
496
  return [2, { data: __assign({}, brandData), formData: originalFormData }];
@@ -625,18 +642,15 @@ export var brandSlice = createSlice({
625
642
  state.customLoading = true;
626
643
  })
627
644
  .addCase(verifyLeadToken.fulfilled, function (state, action) {
628
- var _a, _b;
645
+ var _a, _b, _c;
629
646
  state.error = null;
630
647
  state.customLoading = false;
631
- var _c = action.payload, data = _c.data, brand = _c.brandData, token = _c.token, salesChannels = _c.salesChannels, entityInfoId = _c.entityInfoId;
648
+ var _d = action.payload, data = _d.data, brand = _d.brandData, token = _d.token, salesChannels = _d.salesChannels, entityInfoId = _d.entityInfoId;
632
649
  state.data.brandData.brandName = (((_a = brand === null || brand === void 0 ? void 0 : brand.name) === null || _a === void 0 ? void 0 : _a.en) || '').trim();
633
- (_b = brand === null || brand === void 0 ? void 0 : brand.terms) === null || _b === void 0 ? void 0 : _b.forEach(function (element) {
634
- if ((element === null || element === void 0 ? void 0 : element.term) === 'general') {
635
- state.data.brandActivities.termAndConditionChecked = element.agree;
636
- state.data.brandActivities.transactionPolicy = element.agree;
637
- state.data.brandActivities.refundPolicy = element.agree;
638
- }
639
- });
650
+ var termFlag = ((_c = (_b = brand === null || brand === void 0 ? void 0 : brand.terms) === null || _b === void 0 ? void 0 : _b.find(function (element) { return (element === null || element === void 0 ? void 0 : element.term) === 'general'; })) === null || _c === void 0 ? void 0 : _c.agree) || false;
651
+ state.data.brandActivities.termAndConditionChecked = termFlag;
652
+ state.data.brandActivities.transactionPolicy = termFlag;
653
+ state.data.brandActivities.refundPolicy = termFlag;
640
654
  var mappedSalesChannels = mapSalesChannel((brand === null || brand === void 0 ? void 0 : brand.channel_services) || []);
641
655
  state.data.brandData.salesChannels = mappedSalesChannels;
642
656
  state.data.verify.responseBody = __assign(__assign(__assign({}, data), state.data.verify.responseBody), { brand: brand, board_id: data.id, channel_list: (salesChannels === null || salesChannels === void 0 ? void 0 : salesChannels.list) || [], salesChannels: mappedSalesChannels, entityInfoId: entityInfoId });
@@ -662,22 +676,19 @@ export var brandSlice = createSlice({
662
676
  state.error = null;
663
677
  })
664
678
  .addCase(verifyBrandLeadOTP.fulfilled, function (state, action) {
665
- var _a, _b;
679
+ var _a, _b, _c;
666
680
  state.loading = false;
667
681
  state.error = null;
668
- var _c = action.payload, data = _c.data, brand = _c.brandData, formData = _c.formData, salesChannels = _c.salesChannels, entityInfoId = _c.entityInfoId;
682
+ var _d = action.payload, data = _d.data, brand = _d.brandData, formData = _d.formData, salesChannels = _d.salesChannels, entityInfoId = _d.entityInfoId;
669
683
  state.data.otpData = formData;
670
684
  state.data.otpData.responseBody = data;
671
685
  state.data.brandData.brandName = (((_a = brand === null || brand === void 0 ? void 0 : brand.name) === null || _a === void 0 ? void 0 : _a.en) || '').trim();
672
686
  var mappedSalesChannels = mapSalesChannel((brand === null || brand === void 0 ? void 0 : brand.channel_services) || []);
673
687
  state.data.brandData.salesChannels = mappedSalesChannels;
674
- (_b = brand === null || brand === void 0 ? void 0 : brand.terms) === null || _b === void 0 ? void 0 : _b.forEach(function (element) {
675
- if ((element === null || element === void 0 ? void 0 : element.term) === 'general') {
676
- state.data.brandActivities.termAndConditionChecked = element.agree;
677
- state.data.brandActivities.transactionPolicy = element.agree;
678
- state.data.brandActivities.refundPolicy = element.agree;
679
- }
680
- });
688
+ var termFlag = ((_c = (_b = brand === null || brand === void 0 ? void 0 : brand.terms) === null || _b === void 0 ? void 0 : _b.find(function (element) { return (element === null || element === void 0 ? void 0 : element.term) === 'general'; })) === null || _c === void 0 ? void 0 : _c.agree) || false;
689
+ state.data.brandActivities.termAndConditionChecked = termFlag;
690
+ state.data.brandActivities.transactionPolicy = termFlag;
691
+ state.data.brandActivities.refundPolicy = termFlag;
681
692
  state.data.verify.responseBody = __assign(__assign(__assign({}, data), state.data.verify.responseBody), { brand: brand, board_id: data.id, channel_list: (salesChannels === null || salesChannels === void 0 ? void 0 : salesChannels.list) || [], salesChannels: mappedSalesChannels, entityInfoId: entityInfoId });
682
693
  })
683
694
  .addCase(verifyBrandLeadOTP.rejected, function (state, action) {
@@ -707,27 +718,32 @@ export var brandSlice = createSlice({
707
718
  var _a = action.payload, data = _a.data, formData = _a.formData, segmentLocationList = _a.segmentLocationList, segmentProfitList = _a.segmentProfitList, segmentTechList = _a.segmentTechList, teamSizeList = _a.teamSizeList;
708
719
  var segment = data.segment;
709
720
  state.data.brandData = formData;
710
- var selectedSegmentLocation = segmentLocationList === null || segmentLocationList === void 0 ? void 0 : segmentLocationList.find(function (location) {
721
+ var selectedSegmentLocation = (segmentLocationList === null || segmentLocationList === void 0 ? void 0 : segmentLocationList.find(function (location) {
711
722
  var _a;
712
723
  return location.id === ((_a = segment === null || segment === void 0 ? void 0 : segment.location_type) === null || _a === void 0 ? void 0 : _a.id);
713
- });
714
- var selectedSegmentProfit = segmentProfitList === null || segmentProfitList === void 0 ? void 0 : segmentProfitList.find(function (profit) {
724
+ })) || (segmentLocationList === null || segmentLocationList === void 0 ? void 0 : segmentLocationList[0]);
725
+ var selectedSegmentProfit = (segmentProfitList === null || segmentProfitList === void 0 ? void 0 : segmentProfitList.find(function (profit) {
715
726
  var _a;
716
727
  return profit.id === ((_a = segment === null || segment === void 0 ? void 0 : segment.profit_type) === null || _a === void 0 ? void 0 : _a.id);
717
- });
718
- var selectedSegmentTech = segmentTechList === null || segmentTechList === void 0 ? void 0 : segmentTechList.find(function (tech) {
728
+ })) || (segmentProfitList === null || segmentProfitList === void 0 ? void 0 : segmentProfitList[0]);
729
+ var selectedSegmentTech = (segmentTechList === null || segmentTechList === void 0 ? void 0 : segmentTechList.find(function (tech) {
719
730
  var _a;
720
731
  return tech.id === ((_a = segment === null || segment === void 0 ? void 0 : segment.tech_type) === null || _a === void 0 ? void 0 : _a.id);
721
- });
732
+ })) || (segmentTechList === null || segmentTechList === void 0 ? void 0 : segmentTechList[1]);
722
733
  var selectedTeamSize = teamSizeList === null || teamSizeList === void 0 ? void 0 : teamSizeList.find(function (team) {
723
734
  var _a;
724
735
  return team.id === ((_a = segment === null || segment === void 0 ? void 0 : segment.team) === null || _a === void 0 ? void 0 : _a.id);
725
736
  });
726
- state.data.brandSegmentData.segmentLocation = selectedSegmentLocation || (segmentLocationList === null || segmentLocationList === void 0 ? void 0 : segmentLocationList[0]);
727
- state.data.brandSegmentData.segmentProfit = selectedSegmentProfit || (segmentProfitList === null || segmentProfitList === void 0 ? void 0 : segmentProfitList[0]);
728
- state.data.brandSegmentData.segmentTech = selectedSegmentTech || (segmentTechList === null || segmentTechList === void 0 ? void 0 : segmentTechList[1]);
737
+ state.data.brandSegmentData.segmentLocation = selectedSegmentLocation;
738
+ state.data.brandSegmentData.segmentProfit = selectedSegmentProfit;
739
+ state.data.brandSegmentData.segmentTech = selectedSegmentTech;
729
740
  state.data.brandSegmentData.teamSize = selectedTeamSize;
730
- state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { teamSizeList: teamSizeList, segmentLocationList: segmentLocationList, segmentProfitList: segmentProfitList, segmentTechList: segmentTechList });
741
+ state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { brand: data, teamSizeList: teamSizeList, segmentLocationList: segmentLocationList, segmentProfitList: segmentProfitList, segmentTechList: segmentTechList, segmentDefaultValues: {
742
+ segmentLocation: selectedSegmentLocation,
743
+ segmentProfit: selectedSegmentProfit,
744
+ segmentTech: selectedSegmentTech,
745
+ teamSize: selectedTeamSize
746
+ } });
731
747
  })
732
748
  .addCase(updateBrand.rejected, function (state, action) {
733
749
  state.loading = false;
@@ -738,9 +754,10 @@ export var brandSlice = createSlice({
738
754
  state.error = null;
739
755
  })
740
756
  .addCase(updateSegmentBrand.fulfilled, function (state, action) {
757
+ var _a;
741
758
  state.loading = false;
742
759
  state.error = null;
743
- var _a = action.payload, data = _a.data, entityData = _a.entityData, formData = _a.formData;
760
+ var _b = action.payload, data = _b.data, entityData = _b.entityData, formData = _b.formData;
744
761
  var activities = data.activities, operations = data.operations, terms = data.terms;
745
762
  var entity_activities = (entityData || {}).entity_activities;
746
763
  var selectedActivity = entity_activities === null || entity_activities === void 0 ? void 0 : entity_activities.filter(function (activity) {
@@ -748,22 +765,27 @@ export var brandSlice = createSlice({
748
765
  });
749
766
  state.data.brandSegmentData = formData;
750
767
  state.data.brandActivities.activities = (selectedActivity === null || selectedActivity === void 0 ? void 0 : selectedActivity.length) > 0 ? selectedActivity : [];
751
- var _b = operations || {}, customer_base = _b.customer_base, sales = _b.sales;
752
- var _c = customer_base || {}, locations = _c.locations, customerBase = __rest(_c, ["locations"]);
768
+ var _c = operations || {}, customer_base = _c.customer_base, sales = _c.sales;
769
+ var _d = customer_base || {}, locations = _d.locations, customerBase = __rest(_d, ["locations"]);
753
770
  if (locations && locations.length)
754
771
  state.data.brandActivities.customerLocations = locations;
755
772
  if (!!sales)
756
773
  state.data.brandActivities.expectedSale = sales;
757
774
  if (!!customerBase)
758
775
  state.data.brandActivities.expectedCustomer = customerBase;
759
- terms === null || terms === void 0 ? void 0 : terms.forEach(function (element) {
760
- if ((element === null || element === void 0 ? void 0 : element.term) === 'general') {
761
- state.data.brandActivities.termAndConditionChecked = element.agree;
762
- state.data.brandActivities.transactionPolicy = element.agree;
763
- state.data.brandActivities.refundPolicy = element.agree;
764
- }
765
- });
766
- state.data.verify.responseBody = __assign(__assign(__assign({}, state.data.verify.responseBody), { activities: entity_activities }), (entityData && { entity: entityData }));
776
+ var termFlag = ((_a = terms === null || terms === void 0 ? void 0 : terms.find(function (element) { return (element === null || element === void 0 ? void 0 : element.term) === 'general'; })) === null || _a === void 0 ? void 0 : _a.agree) || false;
777
+ state.data.brandActivities.termAndConditionChecked = termFlag;
778
+ state.data.brandActivities.transactionPolicy = termFlag;
779
+ state.data.brandActivities.refundPolicy = termFlag;
780
+ state.data.verify.responseBody = __assign(__assign(__assign(__assign({}, state.data.verify.responseBody), { activities: entity_activities }), (entityData && { entity: entityData })), { activitiesDefaultValues: {
781
+ activities: selectedActivity,
782
+ customerLocations: locations,
783
+ expectedSale: sales,
784
+ expectedCustomer: customerBase,
785
+ termAndConditionChecked: termFlag,
786
+ transactionPolicy: termFlag,
787
+ refundPolicy: termFlag
788
+ }, segmentDefaultValues: formData });
767
789
  })
768
790
  .addCase(updateSegmentBrand.rejected, function (state, action) {
769
791
  state.loading = false;
package/build/features/app/entity/entityStore.d.ts CHANGED
@@ -74,7 +74,11 @@ export declare const retrieveBoardDetails: import("@reduxjs/toolkit").AsyncThunk
74
74
  rejectedMeta?: unknown;
75
75
  }>;
76
76
  export declare const updateEntityName: import("@reduxjs/toolkit").AsyncThunk<{
77
- data: any;
77
+ data: {
78
+ entity: any;
79
+ documentData: any;
80
+ activityList: any;
81
+ };
78
82
  formData: EntityNameFormValues;
79
83
  }, AsyncThunkParams<EntityNameFormValues>, {
80
84
  state?: unknown;
package/build/features/app/entity/entityStore.js CHANGED
@@ -247,15 +247,16 @@ export var retrieveBoardDetails = createAsyncThunk('entityRetrieveEntityInfo', f
247
247
  });
248
248
  });
249
249
  export var updateEntityName = createAsyncThunk('entityUpdateEntityName', function (_a, thunkApi) {
250
- var formData = _a.formData, originalFormData = _a.originalFormData;
250
+ var formData = _a.formData, originalFormData = _a.originalFormData, isDirty = _a.isDirty;
251
251
  return __awaiter(void 0, void 0, void 0, function () {
252
- var _b, settings, entity, _c, id, data_status, data_verification, documents, issuingDate, expiryDate, licenseType, licenseNumber, articleId, unifiedNumber, legalName, certificateId, entityType, issueDate, expDate, isFL, isLegalNameENNonEditable, isLegalNameARNonEditable, isLicenseTypeNonEditable, isEntityTypeNonEditable, isLicenseNumberNonEditable, isUnifiedNumberNonEditable, isIssuingDateNonEditable, isExpiryDateNonEditable, isDocumentsNonEditable, isAOAFileNonEditable, isEntityTypeVerified, isLicenseNonEditable, isLicenseAvailable, payload, data, documentResponse, document, documentBody, documentBody, list;
253
- var _d, _e, _f;
254
- return __generator(this, function (_g) {
255
- switch (_g.label) {
252
+ var _b, settings, entity, entityRes, _c, id, data_status, data_verification, documents, issuingDate, expiryDate, licenseType, licenseNumber, articleId, unifiedNumber, legalName, certificateId, entityType, issueDate, expDate, isFL, isLegalNameENNonEditable, isLegalNameARNonEditable, isLicenseTypeNonEditable, isEntityTypeNonEditable, isLicenseNumberNonEditable, isUnifiedNumberNonEditable, isIssuingDateNonEditable, isExpiryDateNonEditable, isDocumentsNonEditable, isAOAFileNonEditable, isEntityTypeVerified, isLicenseNonEditable, isLicenseAvailable, payload, entityData, documentData, activityList, entity_1, documentResponse, document, documentBody, documentBody, entity_2, list;
253
+ var _d, _e;
254
+ return __generator(this, function (_f) {
255
+ switch (_f.label) {
256
256
  case 0:
257
257
  _b = thunkApi.getState(), settings = _b.settings, entity = _b.entity;
258
- _c = ((_d = entity.data.verify.responseBody) === null || _d === void 0 ? void 0 : _d.entity) || {}, id = _c.id, data_status = _c.data_status, data_verification = _c.data_verification, documents = _c.documents;
258
+ entityRes = (entity.data.verify.responseBody || {}).entity;
259
+ _c = entityRes || {}, id = _c.id, data_status = _c.data_status, data_verification = _c.data_verification, documents = _c.documents;
259
260
  issuingDate = formData.issuingDate, expiryDate = formData.expiryDate, licenseType = formData.licenseType, licenseNumber = formData.licenseNumber, articleId = formData.articleId, unifiedNumber = formData.unifiedNumber, legalName = formData.legalName, certificateId = formData.certificateId, entityType = formData.entityType;
260
261
  issueDate = issuingDate && new Date(issuingDate).getTime();
261
262
  expDate = expiryDate && new Date(expiryDate).getTime();
@@ -295,22 +296,27 @@ export var updateEntityName = createAsyncThunk('entityUpdateEntityName', functio
295
296
  'license.additional_info.unified_number',
296
297
  'type'
297
298
  ] });
299
+ entityData = entityRes, activityList = undefined;
300
+ if (!isDirty) return [3, 2];
298
301
  return [4, API.entityService.updateEntity(payload)];
299
302
  case 1:
300
- data = _g.sent();
303
+ entity_1 = (_f.sent()).entity;
304
+ entityData = entity_1;
305
+ _f.label = 2;
306
+ case 2:
301
307
  documentResponse = undefined;
302
308
  document = getRecentDocumentBasedOnPurpose(documents, DocumentPurpose.CR);
303
- if (!(!isDocumentsNonEditable && (certificateId || []).length > 0)) return [3, 7];
304
- if (!(document === null || document === void 0 ? void 0 : document.id)) return [3, 3];
309
+ if (!(!isDocumentsNonEditable && (certificateId || []).length > 0)) return [3, 8];
310
+ if (!(document === null || document === void 0 ? void 0 : document.id)) return [3, 4];
305
311
  documentBody = {
306
312
  id: document.id,
307
313
  images: certificateId
308
314
  };
309
315
  return [4, API.documentService.addFilesToExistingDocument(documentBody)];
310
- case 2:
311
- documentResponse = _g.sent();
312
- return [3, 5];
313
316
  case 3:
317
+ documentResponse = _f.sent();
318
+ return [3, 6];
319
+ case 4:
314
320
  documentBody = {
315
321
  entity_id: id || '',
316
322
  documents: [
@@ -321,45 +327,48 @@ export var updateEntityName = createAsyncThunk('entityUpdateEntityName', functio
321
327
  ]
322
328
  };
323
329
  return [4, API.documentService.updateDocumentInfo(documentBody)];
324
- case 4:
325
- documentResponse = _g.sent();
326
- _g.label = 5;
327
- case 5: return [4, API.entityService.retrieveEntity(id)];
328
- case 6:
329
- data = _g.sent();
330
- data.documentData = documentResponse;
331
- _g.label = 7;
332
- case 7: return [4, API.dataService.getActivitiesIsIc()];
333
- case 8:
334
- list = (_g.sent()).list;
335
- data.activityList = list;
330
+ case 5:
331
+ documentResponse = _f.sent();
332
+ _f.label = 6;
333
+ case 6: return [4, API.entityService.retrieveEntity(id)];
334
+ case 7:
335
+ entity_2 = (_f.sent()).entity;
336
+ entityData = entity_2;
337
+ documentData = documentResponse;
338
+ _f.label = 8;
339
+ case 8: return [4, API.dataService.getActivitiesIsIc()];
340
+ case 9:
341
+ list = (_f.sent()).list;
342
+ activityList = list;
336
343
  sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep()); });
337
- (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, id);
338
- return [2, { data: data, formData: originalFormData }];
344
+ (_e = (_d = settings.data.appConfig).onStepCompleted) === null || _e === void 0 ? void 0 : _e.call(_d, settings.data.activeScreen.name, id);
345
+ return [2, { data: { entity: entityData, documentData: documentData, activityList: activityList }, formData: originalFormData }];
339
346
  }
340
347
  });
341
348
  });
342
349
  });
343
350
  export var updateEntityCapital = createAsyncThunk('entityUpdateEntityCapital', function (_a, thunkApi) {
344
- var formData = _a.formData, originalFormData = _a.originalFormData;
351
+ var formData = _a.formData, originalFormData = _a.originalFormData, isDirty = _a.isDirty;
345
352
  return __awaiter(void 0, void 0, void 0, function () {
346
- var _b, settings, entity, _c, id, data_status, entityActivities, isCapitalPaidNonEditable, isCapitalShareCountNonEditable, isCapitalShareValueNonEditable, isActivitiesNonEditable, capitalShareCount, capitalShareValue, activities, capitalPaid, hasCapitalShares, isCapitalNonEditable, removedActivities, payload_1, activityIds, payload, data;
347
- var _d, _e, _f;
348
- return __generator(this, function (_g) {
349
- switch (_g.label) {
353
+ var _b, settings, entity, entityRes, _c, id, data_status, entityActivities, isCapitalPaidNonEditable, isCapitalShareCountNonEditable, isCapitalShareValueNonEditable, isActivitiesNonEditable, capitalShareCount, capitalShareValue, activities, capitalPaid, entityData, hasCapitalShares, isCapitalNonEditable, removedActivities, payload_1, activityIds, payload, entity_3;
354
+ var _d, _e;
355
+ return __generator(this, function (_f) {
356
+ switch (_f.label) {
350
357
  case 0:
351
358
  _b = thunkApi.getState(), settings = _b.settings, entity = _b.entity;
352
- _c = ((_d = entity.data.verify.responseBody) === null || _d === void 0 ? void 0 : _d.entity) || {}, id = _c.id, data_status = _c.data_status, entityActivities = _c.activities;
359
+ entityRes = (entity.data.verify.responseBody || {}).entity;
360
+ _c = entityRes || {}, id = _c.id, data_status = _c.data_status, entityActivities = _c.activities;
353
361
  isCapitalPaidNonEditable = hasNoneEditableValue(data_status === null || data_status === void 0 ? void 0 : data_status.capital, 'paid');
354
362
  isCapitalShareCountNonEditable = hasNoneEditableValue(data_status === null || data_status === void 0 ? void 0 : data_status.capital, 'shares.count');
355
363
  isCapitalShareValueNonEditable = hasNoneEditableValue(data_status === null || data_status === void 0 ? void 0 : data_status.capital, 'shares.value');
356
364
  isActivitiesNonEditable = hasNoneEditableValue(data_status, 'activities');
357
365
  capitalShareCount = formData.capitalShareCount, capitalShareValue = formData.capitalShareValue, activities = formData.activities, capitalPaid = formData.capitalPaid;
366
+ entityData = entityRes;
358
367
  hasCapitalShares = capitalShareCount || capitalShareValue;
359
368
  isCapitalNonEditable = (isCapitalPaidNonEditable && isCapitalShareCountNonEditable && isCapitalShareValueNonEditable) || (!capitalPaid && !hasCapitalShares);
360
369
  removedActivities = (activities === null || activities === void 0 ? void 0 : activities.length) > 0 &&
361
370
  (entityActivities || []).filter(function (entityActivity) { return !(activities || []).some(function (activity) { return activity.id === entityActivity.id; }); });
362
- if (!(!isActivitiesNonEditable && (removedActivities === null || removedActivities === void 0 ? void 0 : removedActivities.length) > 0)) return [3, 2];
371
+ if (!(!isActivitiesNonEditable && (removedActivities === null || removedActivities === void 0 ? void 0 : removedActivities.length) > 0 && isDirty)) return [3, 2];
363
372
  payload_1 = {
364
373
  id: id,
365
374
  activities: removedActivities.map(function (a) { return ({
@@ -368,8 +377,8 @@ export var updateEntityCapital = createAsyncThunk('entityUpdateEntityCapital', f
368
377
  };
369
378
  return [4, API.entityService.removeEntityActivities(payload_1)];
370
379
  case 1:
371
- _g.sent();
372
- _g.label = 2;
380
+ _f.sent();
381
+ _f.label = 2;
373
382
  case 2:
374
383
  activityIds = (activities || []).map(function (_a) {
375
384
  var id = _a.id;
@@ -383,12 +392,16 @@ export var updateEntityCapital = createAsyncThunk('entityUpdateEntityCapital', f
383
392
  }
384
393
  }))
385
394
  }));
395
+ if (!isDirty) return [3, 4];
386
396
  return [4, API.entityService.updateEntity(payload)];
387
397
  case 3:
388
- data = _g.sent();
398
+ entity_3 = (_f.sent()).entity;
399
+ entityData = entity_3;
400
+ _f.label = 4;
401
+ case 4:
389
402
  thunkApi.dispatch(handleNextScreenStep());
390
- (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, id);
391
- return [2, { data: data, formData: originalFormData }];
403
+ (_e = (_d = settings.data.appConfig).onStepCompleted) === null || _e === void 0 ? void 0 : _e.call(_d, settings.data.activeScreen.name, id);
404
+ return [2, { data: entityData, formData: originalFormData }];
392
405
  }
393
406
  });
394
407
  });
@@ -642,12 +655,12 @@ export var entitySlice = createSlice({
642
655
  state.loading = false;
643
656
  state.error = null;
644
657
  var _a = action.payload, data = _a.data, formData = _a.formData;
645
- var _b = data || {}, activityList = _b.activityList, rest = __rest(_b, ["activityList"]);
658
+ var _b = data || {}, entity = _b.entity, activityList = _b.activityList, rest = __rest(_b, ["entity", "activityList"]);
646
659
  state.data.entityNameData = __assign(__assign({}, formData), { certificateId: undefined });
647
660
  state.data.entityNameData.responseBody = __assign(__assign({}, state.data.entityNameData.responseBody), { rest: rest });
648
- state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { entity: data === null || data === void 0 ? void 0 : data.entity, activityList: activityList });
649
- if (rest === null || rest === void 0 ? void 0 : rest.activities)
650
- state.data.entityCapitalData = __assign(__assign({}, state.data.entityCapitalData), { activities: rest === null || rest === void 0 ? void 0 : rest.activities });
661
+ state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { entity: entity, activityList: activityList });
662
+ if (entity === null || entity === void 0 ? void 0 : entity.activities)
663
+ state.data.entityCapitalData = __assign(__assign({}, state.data.entityCapitalData), { activities: entity === null || entity === void 0 ? void 0 : entity.activities });
651
664
  })
652
665
  .addCase(updateEntityName.rejected, function (state, action) {
653
666
  state.loading = false;
package/build/features/app/individual/individualStore.d.ts CHANGED
@@ -211,7 +211,7 @@ export declare const updateIndividualPersonalInfo: import("@reduxjs/toolkit").As
211
211
  export declare const updateIndividualInfo: import("@reduxjs/toolkit").AsyncThunk<{
212
212
  data: any;
213
213
  formData: IndividualExtraFormValues;
214
- individualData: User;
214
+ individualData: any;
215
215
  userList: any;
216
216
  isKWOrSACountry: boolean;
217
217
  }, AsyncThunkParams<IndividualExtraFormValues>, {