@tap-payments/auth-jsconnect 2.4.0-test → 2.4.3-test

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

@@ -135,10 +135,10 @@ export var verifyLeadToken = createAsyncThunk('businessVerifyLeadToken', functio
                 return [4, thunkApi.dispatch(retrieveDataList())];
             case 11:
                 _b.sent();
-                thunkApi.dispatch(handleNextScreenStep('BUSINESS_CUSTOMERS_STEP'));
                 return [4, API.brandService.retrieveBrand(brandID)];
             case 12:
                 brandData = _b.sent();
+                thunkApi.dispatch(handleNextScreenStep('BUSINESS_CUSTOMERS_STEP'));
                 return [3, 19];
             case 13:
                 if (!hasBusinessCRInfoCompleted) return [3, 15];
@@ -162,7 +162,7 @@ export var verifyLeadToken = createAsyncThunk('businessVerifyLeadToken', functio
                     data: data,
                     leadData: __assign(__assign({}, leadData), { flows: (boardData === null || boardData === void 0 ? void 0 : boardData.info) || [] }),
                     token: token,
-                    brandData: (brandData === null || brandData === void 0 ? void 0 : brandData.brand) || {},
+                    brandData: brandData === null || brandData === void 0 ? void 0 : brandData.brand,
                     boardId: leadData === null || leadData === void 0 ? void 0 : leadData.board_id
                 }];
             case 20: return [2, { data: data, isRequireOTP: true, token: token }];
@@ -278,10 +278,10 @@ export var verifyLeadOTP = createAsyncThunk('verifyLeadOTP', function (params, t
                 return [4, thunkApi.dispatch(retrieveDataList())];
             case 17:
                 _j.sent();
-                thunkApi.dispatch(handleNextScreenStep('BUSINESS_CUSTOMERS_STEP'));
                 return [4, API.brandService.retrieveBrand(brandID)];
             case 18:
                 brandData = _j.sent();
+                thunkApi.dispatch(handleNextScreenStep('BUSINESS_CUSTOMERS_STEP'));
                 return [3, 22];
             case 19:
                 if (!hasBusinessCRInfoCompleted) return [3, 21];
@@ -1093,6 +1093,14 @@ export var businessSlice = createSlice({
             state.error = null;
             var _a = action.payload, data = _a.data, formData = _a.formData;
             state.data.activitiesData = formData;
+            var terms = (data || {}).terms;
+            terms === null || terms === void 0 ? void 0 : terms.forEach(function (element) {
+                if ((element === null || element === void 0 ? void 0 : element.term) === 'general') {
+                    state.data.customersData.transactionPolicy = element.agree;
+                    state.data.customersData.refundPolicy = element.agree;
+                }
+            });
+            state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { brand: data });
             state.data.activitiesData.responseBody = __assign(__assign({}, data), state.data.activitiesData.responseBody);
         })
             .addCase(updateActivitiesInfo.rejected, function (state, action) {

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

@@ -456,6 +456,7 @@ export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (param
                 brandReqBody_1 = {
                     id: (selectedBrandItem === null || selectedBrandItem === void 0 ? void 0 : selectedBrandItem.id) || '',
                     channel_services: channel_services,
+                    term: ['general'],
                     segment: { type: { id: ((_b = params.segment) === null || _b === void 0 ? void 0 : _b.id) || '' }, team: { id: ((_c = params.teamSize) === null || _c === void 0 ? void 0 : _c.id) || '' } },
                     step_name: CONNECT_STEP_NAMES.UPDATE_BRAND_INFO
                 };

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

@@ -63,7 +63,7 @@ import { BusinessType, DocumentPurpose, FlowsTypes, LicenseType } from '../../..
 import { handleNextScreenStep, handlePrevScreenStep, handleSetCountryByIso2 } from '../../../app/settings';
 import { ENTITY_STEP_NAMES } from '../../../constants';
 import moment from 'moment';
-import { convertNumbers2English, getRecentDocumentBasedOnPurpose, hasVerifiedValue, hasNoneEditableValue, sleep, formatNumberAsCurrency } from '../../../utils';
+import { convertNumbers2English, getRecentDocumentBasedOnPurpose, hasVerifiedValue, hasNoneEditableValue, sleep, formatNumberAsCurrency, removeAllCharsFromNumber } from '../../../utils';
 export var verifyLeadToken = createAsyncThunk('entityVerifyLeadToken', function (_a, thunkApi) {
     var token = _a.token, isInternally = _a.isInternally;
     return __awaiter(void 0, void 0, void 0, function () {
@@ -366,10 +366,10 @@ 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 : capitalPaid }, (!((isCapitalShareCountNonEditable && isCapitalShareValueNonEditable) || !hasCapitalShares) && {
+                        capital: __assign({ paid: isCapitalPaidNonEditable ? undefined : removeAllCharsFromNumber(capitalPaid) }, (!((isCapitalShareCountNonEditable && isCapitalShareValueNonEditable) || !hasCapitalShares) && {
                             shares: {
                                 count: isCapitalShareCountNonEditable ? undefined : capitalShareCount,
-                                value: isCapitalShareValueNonEditable ? undefined : capitalShareValue
+                                value: isCapitalShareValueNonEditable ? undefined : removeAllCharsFromNumber(capitalShareValue)
                             }
                         }))
                     }));

package/build/features/app/individual/individualStore.js

@@ -71,7 +71,7 @@ import API from '../../../api';
 import { FlowsTypes, IndividualGender, IndividualType, DocumentPurpose } from '../../../@types';
 import { handleNextScreenStep, handlePrevScreenStep, handleSetCountryByIso2 } from '../../../app/settings';
 import { defaultCountry, IDENTIFICATION_TYPE, INDIVIDUAl_STEP_NAMES } from '../../../constants';
-import { convertNumbers2English, dateFormat, findCountryByIddPrefix, findCountryByIso2, hasNoneEditableValue, getUserNameObject, getUserName, sleep, isValidEmail, getRecentDocumentBasedOnPurpose, formatNumberAsCurrency } from '../../../utils';
+import { convertNumbers2English, dateFormat, findCountryByIddPrefix, findCountryByIso2, hasNoneEditableValue, getUserNameObject, getUserName, sleep, isValidEmail, getRecentDocumentBasedOnPurpose, formatNumberAsCurrency, removeAllCharsFromNumber } from '../../../utils';
 export var verifyToken = createAsyncThunk('individual/verifyToken', function (_a, thunkApi) {
     var token = _a.token, isInternally = _a.isInternally, isUpdatePhoneInfo = _a.isUpdatePhoneInfo;
     return __awaiter(void 0, void 0, void 0, function () {
@@ -666,7 +666,7 @@ export var updateIndividualInfo = createAsyncThunk('updateIndividualInfo', funct
                         shares: isSharesAvailable
                             ? {
                                 count: shareCount && Number(shareCount),
-                                value: shareValue && Number(shareValue)
+                                value: shareValue && Number(removeAllCharsFromNumber(shareValue))
                             }
                             : undefined
                     };

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

@@ -9,17 +9,6 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import Box from '@mui/material/Box/Box';
 import { styled } from '@mui/material/styles';
@@ -52,16 +41,38 @@ var ListType;
     ListType["ExpectedSalesList"] = "ExpectedSalesList";
 })(ListType || (ListType = {}));
 var Customers = function (_a) {
-    var _b = React.useState(), listActive = _b[0], setListActive = _b[1];
+    var _b, _c;
+    var _d = React.useState(), listActive = _d[0], setListActive = _d[1];
     var dispatch = useAppDispatch();
-    var _c = useAppSelector(businessSelector), data = _c.data, loading = _c.loading, error = _c.error;
-    var _d = data.customersData, responseBody = _d.responseBody, defaultValues = __rest(_d, ["responseBody"]);
+    var _e = useAppSelector(businessSelector), data = _e.data, loading = _e.loading, error = _e.error;
+    var _f = data.customersData, customerLocations = _f.customerLocations, expectedCustomer = _f.expectedCustomer, expectedSale = _f.expectedSale, refundPolicy = _f.refundPolicy, transactionPolicy = _f.transactionPolicy;
+    var terms = (_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.brand) === null || _c === void 0 ? void 0 : _c.terms;
     var methods = useForm({
         resolver: yupResolver(CustomerInfoValidation),
-        defaultValues: defaultValues,
+        defaultValues: {
+            customerLocations: customerLocations,
+            expectedCustomer: expectedCustomer,
+            expectedSale: expectedSale,
+            refundPolicy: refundPolicy,
+            transactionPolicy: transactionPolicy
+        },
         mode: 'onChange'
     });
-    useSetFromDefaultValues(methods, defaultValues);
+    useSetFromDefaultValues(methods, data.customersData);
+    React.useEffect(function () {
+        var _a, _b;
+        var isTermsAgreed = !!((_b = (_a = terms === null || terms === void 0 ? void 0 : terms.find) === null || _a === void 0 ? void 0 : _a.call(terms, function (_a) {
+            var term = _a.term;
+            return term === 'general';
+        })) === null || _b === void 0 ? void 0 : _b.agree);
+        if (isTermsAgreed) {
+            var getValues = methods.getValues, setValue = methods.setValue;
+            if (!getValues('refundPolicy'))
+                setValue('refundPolicy', true, { shouldValidate: true });
+            if (!getValues('transactionPolicy'))
+                setValue('transactionPolicy', true, { shouldValidate: true });
+        }
+    }, [terms]);
     var onSubmit = function (data) {
         dispatch(updateCustomersInfo(data));
     };

package/package.json

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