@tap-payments/auth-jsconnect 2.4.72-test → 2.4.74-test

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

@@ -633,4 +633,8 @@ export type VerifyExpressTokenParams = {
     };
     lead_id: string;
 };
+export declare enum MerchantStatus {
+    DISABLED = "disabled",
+    ENABLED = "enabled"
+}
 export {};

package/build/@types/app.js

@@ -80,3 +80,8 @@ export var VerificationStatus;
     VerificationStatus["ENTERED"] = "entered";
     VerificationStatus["NOT_ENTERED"] = "not_entered";
 })(VerificationStatus || (VerificationStatus = {}));
+export var MerchantStatus;
+(function (MerchantStatus) {
+    MerchantStatus["DISABLED"] = "disabled";
+    MerchantStatus["ENABLED"] = "enabled";
+})(MerchantStatus || (MerchantStatus = {}));

package/build/features/app/brand/brandStore.js

@@ -704,9 +704,9 @@ export var brandSlice = createSlice({
                 var _a;
                 return team.id === ((_a = segment === null || segment === void 0 ? void 0 : segment.team) === null || _a === void 0 ? void 0 : _a.id);
             });
-            state.data.brandSegmentData.segmentLocation = selectedSegmentLocation;
-            state.data.brandSegmentData.segmentProfit = selectedSegmentProfit;
-            state.data.brandSegmentData.segmentTech = selectedSegmentTech;
+            state.data.brandSegmentData.segmentLocation = selectedSegmentLocation || (segmentLocationList === null || segmentLocationList === void 0 ? void 0 : segmentLocationList[0]);
+            state.data.brandSegmentData.segmentProfit = selectedSegmentProfit || (segmentProfitList === null || segmentProfitList === void 0 ? void 0 : segmentProfitList[0]);
+            state.data.brandSegmentData.segmentTech = selectedSegmentTech || (segmentTechList === null || segmentTechList === void 0 ? void 0 : segmentTechList[1]);
             state.data.brandSegmentData.teamSize = selectedTeamSize;
             state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { teamSizeList: teamSizeList, segmentLocationList: segmentLocationList, segmentProfitList: segmentProfitList, segmentTechList: segmentTechList });
         })

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

@@ -944,23 +944,27 @@ export var connectSlice = createSlice({
             state.error = null;
             var _a = action.payload, formData = _a.formData, response = _a.response;
             var _b = response || {}, segment_location_list = _b.segment_location_list, segment_profit_list = _b.segment_profit_list, segment_tech_list = _b.segment_tech_list, team_size_list = _b.team_size_list, brand = _b.brand;
-            state.data.brandSegmentData.segmentLocation = segment_location_list === null || segment_location_list === void 0 ? void 0 : segment_location_list.find(function (location) {
+            var selectedSegmentLocation = segment_location_list === null || segment_location_list === void 0 ? void 0 : segment_location_list.find(function (location) {
                 var _a, _b;
                 return location.id === ((_b = (_a = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _a === void 0 ? void 0 : _a.location_type) === null || _b === void 0 ? void 0 : _b.id);
             });
-            state.data.brandSegmentData.segmentProfit = segment_profit_list === null || segment_profit_list === void 0 ? void 0 : segment_profit_list.find(function (profit) {
+            var selectedSegmentProfit = segment_profit_list === null || segment_profit_list === void 0 ? void 0 : segment_profit_list.find(function (profit) {
                 var _a, _b;
                 return profit.id === ((_b = (_a = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _a === void 0 ? void 0 : _a.profit_type) === null || _b === void 0 ? void 0 : _b.id);
             });
-            state.data.brandSegmentData.segmentTech = segment_tech_list === null || segment_tech_list === void 0 ? void 0 : segment_tech_list.find(function (tech) {
+            var selectedSegmentTech = segment_tech_list === null || segment_tech_list === void 0 ? void 0 : segment_tech_list.find(function (tech) {
                 var _a, _b;
                 return tech.id === ((_b = (_a = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _a === void 0 ? void 0 : _a.tech_type) === null || _b === void 0 ? void 0 : _b.id);
             });
-            state.data.brandSegmentData.teamSize = team_size_list === null || team_size_list === void 0 ? void 0 : team_size_list.find(function (_a) {
+            var selectedTeamSize = team_size_list === null || team_size_list === void 0 ? void 0 : team_size_list.find(function (_a) {
                 var _b, _c;
                 var id = _a.id;
                 return ((_c = (_b = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _b === void 0 ? void 0 : _b.team) === null || _c === void 0 ? void 0 : _c.id) === id;
             });
+            state.data.brandSegmentData.segmentLocation = selectedSegmentLocation || (segment_location_list === null || segment_location_list === void 0 ? void 0 : segment_location_list[0]);
+            state.data.brandSegmentData.segmentProfit = selectedSegmentProfit || (segment_profit_list === null || segment_profit_list === void 0 ? void 0 : segment_profit_list[0]);
+            state.data.brandSegmentData.segmentTech = selectedSegmentTech || (segment_tech_list === null || segment_tech_list === void 0 ? void 0 : segment_tech_list[1]);
+            state.data.brandSegmentData.teamSize = selectedTeamSize;
             state.data.brandData = __assign(__assign({}, formData), { responseBody: __assign(__assign({}, state.data.brandData.responseBody), { brand: brand }) });
             state.data.brandSegmentData.responseBody = { segment_location_list: segment_location_list, segment_profit_list: segment_profit_list, segment_tech_list: segment_tech_list, team_size_list: team_size_list };
         })

package/build/features/brand/screens/BrandInfo/SalesChannels.js

@@ -6,12 +6,12 @@ import { hasVerifiedValue, isTwitter, isWebsite, mapSalesChannel } from '../../.
 import { brandSelector, clearError } from '../../../app/brand/brandStore';
 import SalesChannel from '../../../shared/SalesChannels';
 var SalesChannels = function (_a) {
-    var _b;
+    var _b, _c;
     var readOnly = _a.readOnly;
     var control = useFormContext().control;
     var dispatch = useAppDispatch();
-    var _c = useController({ control: control, name: 'salesChannels' }), fieldState = _c.fieldState, field = _c.field;
-    var _d = useAppSelector(brandSelector), data = _d.data, error = _d.error;
+    var _d = useController({ control: control, name: 'salesChannels' }), fieldState = _d.fieldState, field = _d.field;
+    var _e = useAppSelector(brandSelector), data = _e.data, error = _e.error;
     var brand = (data.verify.responseBody || {}).brand;
     var channelList = (data.verify.responseBody || {}).channel_list;
     var isChannelVerified = function (id, selected) {
@@ -31,6 +31,6 @@ var SalesChannels = function (_a) {
             dispatch(clearError());
         field.onChange(channels);
     };
-    return (_jsx(SalesChannel, { readOnly: readOnly, isChannelVerified: function (id, selected) { return isChannelVerified(id, selected); }, error: (_b = fieldState.error) === null || _b === void 0 ? void 0 : _b.message, list: channelList, onChange: onChange, defaultValue: selectedSalesChannels }));
+    return (_jsx(SalesChannel, { readOnly: readOnly, isChannelVerified: function (id, selected) { return isChannelVerified(id, selected); }, error: (_c = (_b = fieldState.error) === null || _b === void 0 ? void 0 : _b.message) === null || _c === void 0 ? void 0 : _c.trim(), list: channelList, onChange: onChange, defaultValue: selectedSalesChannels }));
 };
 export default SalesChannels;

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

@@ -31,12 +31,6 @@ var validationSalesChannels = function (channels) {
             typeDic[key] = channel.address || '';
         }
     });
-    for (var key in dic) {
-        var values = dic[key];
-        var atLestOne = values.every(function (item) { return item === ''; });
-        if (atLestOne)
-            return "enter_at_least_one_".concat(key);
-    }
     for (var key in typeDic) {
         var value = typeDic[key];
         if (key === 'website' && value && !value.match(REGEX_WEBSITE)) {
@@ -67,6 +61,12 @@ var validationSalesChannels = function (channels) {
             return 'invalid_call_center_number';
         }
     }
+    for (var key in dic) {
+        var values = dic[key];
+        var atLestOne = values.every(function (item) { return item === ''; });
+        if (atLestOne)
+            return ' ';
+    }
     return true;
 };
 export var BrandValidationSchema = function () {

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

@@ -6,12 +6,12 @@ import { connectSelector, clearError } from '../../../app/connect/connectStore';
 import { mapSalesChannel } from '../../../../utils';
 import SalesChannel from '../../../shared/SalesChannels';
 var SalesChannels = function (_a) {
-    var _b;
-    var _c = useFormContext(), control = _c.control, setValue = _c.setValue, getValues = _c.getValues;
+    var _b, _c;
+    var _d = useFormContext(), control = _d.control, setValue = _d.setValue, getValues = _d.getValues;
     var dispatch = useAppDispatch();
-    var _d = useController({ control: control, name: 'salesChannels' }), fieldState = _d.fieldState, field = _d.field;
-    var _e = useAppSelector(connectSelector), data = _e.data, error = _e.error;
-    var _f = data.brandData, selectedBrandItem = _f.selectedBrandItem, responseBody = _f.responseBody, defaultSalesChannels = _f.salesChannels;
+    var _e = useController({ control: control, name: 'salesChannels' }), fieldState = _e.fieldState, field = _e.field;
+    var _f = useAppSelector(connectSelector), data = _f.data, error = _f.error;
+    var _g = data.brandData, selectedBrandItem = _g.selectedBrandItem, responseBody = _g.responseBody, defaultSalesChannels = _g.salesChannels;
     var channelList = (responseBody || {}).channel_list;
     var selectedBrandControl = getValues('selectedBrandItem');
     React.useEffect(function () {
@@ -33,6 +33,6 @@ var SalesChannels = function (_a) {
             dispatch(clearError());
         field.onChange(channels);
     };
-    return (_jsx(SalesChannel, { error: (_b = fieldState.error) === null || _b === void 0 ? void 0 : _b.message, list: channelList, selectFirstIconListener: selectedBrandControl === null || selectedBrandControl === void 0 ? void 0 : selectedBrandControl.id, onChange: onChange, defaultValue: selectedSalesChannels }));
+    return (_jsx(SalesChannel, { error: (_c = (_b = fieldState.error) === null || _b === void 0 ? void 0 : _b.message) === null || _c === void 0 ? void 0 : _c.trim(), list: channelList, selectFirstIconListener: selectedBrandControl === null || selectedBrandControl === void 0 ? void 0 : selectedBrandControl.id, onChange: onChange, defaultValue: selectedSalesChannels }));
 };
 export default SalesChannels;

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

@@ -31,12 +31,6 @@ var validationSalesChannels = function (channels) {
             typeDic[key] = channel.address || '';
         }
     });
-    for (var key in dic) {
-        var values = dic[key];
-        var atLestOne = values.every(function (item) { return item === ''; });
-        if (atLestOne)
-            return "enter_at_least_one_".concat(key);
-    }
     for (var key in typeDic) {
         var value = typeDic[key];
         if (key === 'website' && value && !value.match(REGEX_WEBSITE)) {
@@ -67,6 +61,12 @@ var validationSalesChannels = function (channels) {
             return 'invalid_call_center_number';
         }
     }
+    for (var key in dic) {
+        var values = dic[key];
+        var atLestOne = values.every(function (item) { return item === ''; });
+        if (atLestOne)
+            return ' ';
+    }
     return true;
 };
 export var MerchantValidationSchema = function (isNewBrand) {

package/build/features/shared/SuccessFlowButtons/SuccessFlowButtons.js

@@ -13,6 +13,7 @@ import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
 import { memo, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { styled } from '@mui/material/styles';
+import { MerchantStatus } from '../../../@types';
 import { FlowsButtons } from '../../shared/Button';
 import { ICONS_NAMES, PASSWORD_OPERATION_TYPE } from '../../../constants';
 import { useAppSelector, useLanguage } from '../../../hooks';
@@ -53,6 +54,7 @@ var SuccessFlowButtons = function (_a) {
     var primary_contact = (business || {}).primary_contact;
     var _g = entity || {}, license = _g.license, vat_id = _g.vat_id, legal_name = _g.legal_name;
     var count = (individuals || {}).count;
+    var _h = merchant || {}, acceptance_status = _h.acceptance_status, payout_status = _h.payout_status;
     var username = isAr ? concatenateObjectValues((names === null || names === void 0 ? void 0 : names.ar) || (names === null || names === void 0 ? void 0 : names.en), ['first', 'last']) : concatenateObjectValues(names === null || names === void 0 ? void 0 : names.en, ['first', 'last']);
     var licenseNumber = (license === null || license === void 0 ? void 0 : license.number) || '';
     var bankName = shortenString(bank === null || bank === void 0 ? void 0 : bank.name, 20) || t('bank');
@@ -60,8 +62,8 @@ var SuccessFlowButtons = function (_a) {
     var taxID = vat_id || '';
     var brandName = (isAr ? (_b = brand === null || brand === void 0 ? void 0 : brand.name) === null || _b === void 0 ? void 0 : _b.ar : (_c = brand === null || brand === void 0 ? void 0 : brand.name) === null || _c === void 0 ? void 0 : _c.en) || t('brand');
     var entityLegalName = shortenString(isAr ? legal_name === null || legal_name === void 0 ? void 0 : legal_name.ar : legal_name === null || legal_name === void 0 ? void 0 : legal_name.en, 20) || t('entity');
-    var isAcceptance = merchant === null || merchant === void 0 ? void 0 : merchant.is_acceptance_allowed;
-    var isPayout = merchant === null || merchant === void 0 ? void 0 : merchant.is_payout_allowed;
+    var isAcceptance = acceptance_status === MerchantStatus.ENABLED;
+    var isPayout = payout_status === MerchantStatus.ENABLED;
     var maskedId = (identification === null || identification === void 0 ? void 0 : identification.id) ? " ".concat(t('masking_symbols')).concat((_d = identification === null || identification === void 0 ? void 0 : identification.id) === null || _d === void 0 ? void 0 : _d.slice(-2)) : '';
     var email = (primary_contact || {}).email;
     var url = getResetFlowUrl('/password', settings.data.language, PASSWORD_OPERATION_TYPE.RESET_PASSWORD, boardId, boardInfoId);

package/package.json

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