@tap-payments/auth-jsconnect 2.3.85-test → 2.3.86-test

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

@@ -271,14 +271,6 @@ export declare type BrandInfo = {
     };
     channel_services: SaleChannel[];
 };
-export declare type BusinessInfo = {
-    id: string;
-    segment: string;
-    name: {
-        ar: string;
-        en: string;
-    };
-};
 export declare enum FlowsTypes {
     CONNECT_EXPRESS = "connect_express",
     CONNECT = "connect",

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

@@ -1,4 +1,4 @@
-import { Activity, BrandInfo, CountryCode, CustomerLocation, ExpectedCustomer, ExpectedSaleRange, License, MonthlyIncome, Occupation, SaleChannel, Segment, SourceOfIncome, TeamSize, City, EntityLicense, BusinessInfo } from './app';
+import { Activity, BrandInfo, CountryCode, CustomerLocation, ExpectedCustomer, ExpectedSaleRange, License, MonthlyIncome, Occupation, SaleChannel, Segment, SourceOfIncome, TeamSize, City, EntityLicense } from './app';
 export declare type MobileFormValues = {
     mobile: string;
     countryCode: CountryCode;
@@ -36,7 +36,6 @@ export declare type BrandFormValues = {
     salesChannels: Array<SaleChannel>;
     termAndConditionChecked?: boolean;
     selectedBrandItem: BrandInfo;
-    business?: BusinessInfo | undefined;
 };
 export declare type BrandActivitiesFormValues = {
     activities: Array<Activity>;

package/build/api/index.d.ts

@@ -113,7 +113,6 @@ declare const API: {
         retrieveIndividual: (id: string, type: string) => Promise<any>;
         updateIndividual: ({ id, type, ...data }: UpdateIndividualBody) => Promise<any>;
         getIndividualList: (data: GetIndividualListBody) => Promise<any>;
-        getBusinessList: (id: string) => Promise<any>;
     };
     boardService: {
         retrieveBoard: (id: string) => Promise<any>;

package/build/api/individual.d.ts

@@ -141,6 +141,5 @@ declare const individualService: {
     retrieveIndividual: (id: string, type: string) => Promise<any>;
     updateIndividual: ({ id, type, ...data }: UpdateIndividualBody) => Promise<any>;
     getIndividualList: (data: GetIndividualListBody) => Promise<any>;
-    getBusinessList: (id: string) => Promise<any>;
 };
 export { individualService };

package/build/api/individual.js

@@ -38,24 +38,10 @@ var getIndividualList = function (data) {
         data: data
     });
 };
-var getBusinessList = function (id) {
-    return httpClient({
-        method: 'post',
-        url: "".concat(ENDPOINT_PATHS.BUSINESS, "/list"),
-        data: {
-            individual_id: id,
-            list: {
-                limit: 10,
-                page: 1
-            }
-        }
-    });
-};
 var individualService = {
     retrieveIndividualInfo: retrieveIndividualInfo,
     retrieveIndividual: retrieveIndividual,
     updateIndividual: updateIndividual,
-    getIndividualList: getIndividualList,
-    getBusinessList: getBusinessList
+    getIndividualList: getIndividualList
 };
 export { individualService };

package/build/api/lead.d.ts

@@ -38,7 +38,6 @@ declare type BrandInfo = {
 export declare type UpdateLeadBody = {
     step_name?: string;
     id: string;
-    business_id?: string;
     encryption_contract?: Array<string>;
     entity?: {
         id: string;

package/build/assets/locales/ar.json

@@ -396,9 +396,5 @@
     "powered_by": "بواسطة",
     "add_other": "أخرى",
     "choose_entity_license": "اختر ترخيص المنشأة",
-    "choose_license_entity": "- الرجاء الاختيار  -",
-    "select_business_label": "اختر الشركة",
-    "Choose_business": "الرجاء تحديد شركة",
-    "alert_choose_business": "يُرجى اختيار الشركة",
-    "other": "اخرى"
+    "choose_license_entity": "- الرجاء الاختيار  -"
 }

package/build/assets/locales/en.json

@@ -426,9 +426,5 @@
     "powered_by": "Powered by",
     "add_other": "Other",
     "choose_entity_license": "Choose Entity License",
-    "choose_license_entity": "- Please select -",
-    "select_business_label": "Business",
-    "choose_business": "Please select a business",
-    "alert_choose_business": "Please select business",
-    "other": "other"
+    "choose_license_entity": "- Please select -"
 }

package/build/constants/dummy.d.ts

@@ -6,14 +6,6 @@ export declare const OTHER_BRAND: {
         en: string;
     };
 };
-export declare const OTHER_BUSINESS: {
-    id: string;
-    segment: string;
-    name: {
-        ar: string;
-        en: string;
-    };
-};
 export declare const defaultCountry: {
     created: number;
     updated: number;

package/build/constants/dummy.js

@@ -6,14 +6,6 @@ export var OTHER_BRAND = {
         en: 'other'
     }
 };
-export var OTHER_BUSINESS = {
-    id: 'other',
-    segment: 'other',
-    name: {
-        ar: 'other',
-        en: 'other'
-    }
-};
 export var defaultCountry = {
     created: 1577690965000,
     updated: 1577691209000,

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

@@ -68,7 +68,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 var _a;
 import API from '../../../api';
 import { handleNextScreenStep } from '../../../app/settings';
-import { CONNECT_STEP_NAMES, defaultCountry, IDENTIFICATION_TYPE, OTHER_BRAND, OTHER_BUSINESS } from '../../../constants';
+import { CONNECT_STEP_NAMES, defaultCountry, IDENTIFICATION_TYPE, OTHER_BRAND } from '../../../constants';
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import { AuthForType, FlowsTypes } from '../../../@types';
 import { capitalizeTheFirstLetterOfEachWord, concatenateObjectValues, findCountryByIddPrefix, fixBrandList, isTwitter, getIndividualName, isWebsite, sleep } from '../../../utils';
@@ -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, businessList, err_1, brands, err_2, countryCode, phone;
+    var _a, connect, settings, startWithNID, _b, mobileData, nidData, responseBody, stepName, payload, data, lead_id, leadResponse, channels, brands, err_1, countryCode, phone;
     var _c, _d, _e, _f;
     return __generator(this, function (_g) {
         switch (_g.label) {
@@ -269,25 +269,15 @@ export var verifyAuth = createAsyncThunk('connect/verifyAuth', function (params,
                 _g.label = 4;
             case 4:
                 _g.trys.push([4, 6, , 7]);
-                return [4, API.individualService.getBusinessList(leadResponse.individual_id)];
+                return [4, API.brandService.getBrandList({ individual_id: leadResponse.individual_id })];
             case 5:
-                businessList = (_g.sent()).list;
-                leadResponse.business_list = businessList;
+                brands = (_g.sent()).brands;
+                leadResponse.brand_list = fixBrandList(brands, channels);
                 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)
@@ -299,7 +289,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, businessList, err_3, brands, err_4, phone;
+    var _a, settings, connect, responseBody, expiry, interval, maxCalls, count, authResponse, isSuccess, lead_id, leadResponse, countryCode, channels, brands, err_2, phone;
     var _b, _c, _d, _e, _f;
     return __generator(this, function (_g) {
         switch (_g.label) {
@@ -312,15 +302,15 @@ export var verifyPACI = createAsyncThunk('connect/verifyPACI', function (params,
                 count = 1;
                 _g.label = 1;
             case 1:
-                if (!(count <= maxCalls)) return [3, 16];
+                if (!(count <= maxCalls)) return [3, 13];
                 if (thunkApi.signal.aborted) {
-                    return [3, 16];
+                    return [3, 13];
                 }
                 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, 13];
+                if (!isSuccess) return [3, 10];
                 lead_id = authResponse.lead_id;
                 if (!lead_id)
                     throw new Error('Lead id is missing');
@@ -337,28 +327,18 @@ export var verifyPACI = createAsyncThunk('connect/verifyPACI', function (params,
                 _g.label = 5;
             case 5:
                 _g.trys.push([5, 7, , 8]);
-                return [4, API.individualService.getBusinessList(leadResponse.individual_id)];
+                return [4, API.brandService.getBrandList({ individual_id: leadResponse.individual_id })];
             case 6:
-                businessList = (_g.sent()).list;
-                leadResponse.business_list = businessList;
+                brands = (_g.sent()).brands;
+                leadResponse.brand_list = fixBrandList(brands, channels);
                 return [3, 8];
             case 7:
-                err_3 = _g.sent();
+                err_2 = _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 12:
+            case 9:
                 _g.sent();
                 phone = (leadResponse.contact || {}).phone;
                 if (phone === null || phone === void 0 ? void 0 : phone.country_code)
@@ -366,19 +346,19 @@ 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 13: return [4, sleep(interval * 1000)];
-            case 14:
+            case 10: return [4, sleep(interval * 1000)];
+            case 11:
                 _g.sent();
-                _g.label = 15;
-            case 15:
+                _g.label = 12;
+            case 12:
                 count++;
                 return [3, 1];
-            case 16: throw new Error('paci_verification_failed');
+            case 13: 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, segments, err_5, teamSize, err_6, brand;
+    var _a, settings, connect, lead_id, phoneCountry, payload, leadResponse, segments, err_3, teamSize, err_4, brand;
     var _b, _c, _d, _e, _f;
     return __generator(this, function (_g) {
         switch (_g.label) {
@@ -406,7 +386,7 @@ export var updateLeadIndividual = createAsyncThunk('updateLeadIndividual', funct
                 leadResponse.segments_list = segments.list;
                 return [3, 5];
             case 4:
-                err_5 = _g.sent();
+                err_3 = _g.sent();
                 return [3, 5];
             case 5:
                 _g.trys.push([5, 7, , 8]);
@@ -416,7 +396,7 @@ export var updateLeadIndividual = createAsyncThunk('updateLeadIndividual', funct
                 leadResponse.team_size_list = teamSize.list;
                 return [3, 8];
             case 7:
-                err_6 = _g.sent();
+                err_4 = _g.sent();
                 return [3, 8];
             case 8:
                 if (!leadResponse.brand) return [3, 10];
@@ -433,7 +413,7 @@ export var updateLeadIndividual = createAsyncThunk('updateLeadIndividual', funct
     });
 }); });
 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, termAndConditionChecked, business, getAddress, channel_services, payload_1, brandReqBody_1, brand_1, brandNameBody, payload, lead, brandReqBody, brand;
+    var _a, settings, connect, responseBody, leadBrandId, isNewBrand, brandName, salesChannels, selectedBrandItem, getAddress, channel_services, payload_1, brandReqBody_1, brand_1, brandNameBody, payload, lead, brandReqBody, brand;
     var _b, _c, _d, _e, _f, _g, _h, _j, _k;
     return __generator(this, function (_l) {
         switch (_l.label) {
@@ -441,7 +421,7 @@ export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (param
                 _a = thunkApi.getState(), settings = _a.settings, connect = _a.connect;
                 responseBody = connect.data.otpData.responseBody;
                 leadBrandId = responseBody === null || responseBody === void 0 ? void 0 : responseBody.brand_id;
-                isNewBrand = params.isNewBrand, brandName = params.brandName, salesChannels = params.salesChannels, selectedBrandItem = params.selectedBrandItem, termAndConditionChecked = params.termAndConditionChecked, business = params.business;
+                isNewBrand = params.isNewBrand, brandName = params.brandName, salesChannels = params.salesChannels, selectedBrandItem = params.selectedBrandItem;
                 getAddress = function (value, isTwitter, isWeb) {
                     if (isTwitter)
                         return '@' + value;
@@ -495,10 +475,12 @@ export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (param
                         zh: brandName
                     }
                 };
-                payload = __assign(__assign({ brand: brandNameBody }, ((business === null || business === void 0 ? void 0 : business.id) &&
-                    (business === null || business === void 0 ? void 0 : business.id) !== OTHER_BUSINESS.id && {
-                    business_id: business.id
-                })), { 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'] });
+                payload = {
+                    brand: brandNameBody,
+                    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']
+                };
                 return [4, API.leadService.updateLead(payload)];
             case 5:
                 lead = _l.sent();
@@ -633,8 +615,7 @@ var initialState = {
             termAndConditionChecked: false,
             selectedBrandItem: {},
             responseBody: {
-                brand_list: [],
-                business_list: []
+                brand_list: []
             }
         }
     }
@@ -729,7 +710,7 @@ export var connectSlice = createSlice({
             state.loading = false;
             state.error = null;
             var _b = action.payload, authResponse = _b.authResponse, leadResponse = _b.leadResponse, countryCode = _b.countryCode;
-            var name = leadResponse.name, contact = leadResponse.contact, brand = leadResponse.brand, brand_list = leadResponse.brand_list, channel_list = leadResponse.channel_list, is_new_individual = leadResponse.is_new_individual, id = leadResponse.id, business_list = leadResponse.business_list, business_id = leadResponse.business_id;
+            var name = leadResponse.name, contact = leadResponse.contact, brand = leadResponse.brand, brand_list = leadResponse.brand_list, channel_list = leadResponse.channel_list, is_new_individual = leadResponse.is_new_individual, id = leadResponse.id;
             var _c = contact || {}, email = _c.email, phone = _c.phone;
             var fullName = concatenateObjectValues(name, ['first', 'middle', 'last']);
             if (!!fullName) {
@@ -744,11 +725,6 @@ export var connectSlice = createSlice({
                 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;
-            var businessList = [];
-            if ((business_list === null || business_list === void 0 ? void 0 : business_list.length) > 0) {
-                businessList = __spreadArray(__spreadArray([], business_list, true), [OTHER_BUSINESS], false);
-                state.data.brandData.business = business_list.find(function (b) { return b.id === business_id; }) || business_list[0];
-            }
             var brandList = [];
             if ((brand_list === null || brand_list === void 0 ? void 0 : brand_list.length) > 0) {
                 var isBrandExist = brand_list.find(function (item) { return item.id === (brand === null || brand === void 0 ? void 0 : brand.id); });
@@ -760,8 +736,7 @@ export var connectSlice = createSlice({
             }
             state.data.brandData.responseBody = {
                 brand_list: brandList,
-                channel_list: channel_list,
-                business_list: businessList
+                channel_list: channel_list
             };
             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 });
         })
@@ -777,7 +752,7 @@ export var connectSlice = createSlice({
             state.loading = false;
             state.error = null;
             var _b = action.payload, authResponse = _b.authResponse, leadResponse = _b.leadResponse, countryCode = _b.countryCode;
-            var name = leadResponse.name, contact = leadResponse.contact, brand = leadResponse.brand, brand_list = leadResponse.brand_list, channel_list = leadResponse.channel_list, is_new_individual = leadResponse.is_new_individual, id = leadResponse.id, business_list = leadResponse.business_list, business_id = leadResponse.business_id;
+            var name = leadResponse.name, contact = leadResponse.contact, brand = leadResponse.brand, brand_list = leadResponse.brand_list, channel_list = leadResponse.channel_list, is_new_individual = leadResponse.is_new_individual, id = leadResponse.id;
             var _c = contact || {}, email = _c.email, phone = _c.phone;
             var fullName = concatenateObjectValues(name, ['first', 'middle', 'last']);
             if (!!fullName) {
@@ -792,11 +767,6 @@ export var connectSlice = createSlice({
                 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;
-            var businessList = [];
-            if ((business_list === null || business_list === void 0 ? void 0 : business_list.length) > 0) {
-                businessList = __spreadArray(__spreadArray([], business_list, true), [OTHER_BUSINESS], false);
-                state.data.brandData.business = business_list.find(function (b) { return b.id === business_id; }) || business_list[0];
-            }
             var brandList = [];
             if ((brand_list === null || brand_list === void 0 ? void 0 : brand_list.length) > 0) {
                 var isBrandExist = brand_list.find(function (item) { return item.id === (brand === null || brand === void 0 ? void 0 : brand.id); });
@@ -808,8 +778,7 @@ export var connectSlice = createSlice({
             }
             state.data.brandData.responseBody = {
                 brand_list: brandList,
-                channel_list: channel_list,
-                business_list: businessList
+                channel_list: channel_list
             };
             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 });
         })

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

@@ -29,7 +29,6 @@ import TAC from './TAC';
 import BrandList from './BrandList';
 import SalesChannels from './SalesChannels';
 import Segments from './Segments';
-import BusinessList from './BusinessList';
 var ListType;
 (function (ListType) {
     ListType["SegmentsList"] = "SegmentsList";
@@ -42,20 +41,18 @@ var Merchant = function (_a) {
     var _d = React.useState(false), brandNameChecking = _d[0], setBrandNameChecking = _d[1];
     var _e = React.useState(false), isRequiredNewBrand = _e[0], setIsRequiredNewBrand = _e[1];
     var _f = useAppSelector(connectSelector), data = _f.data, loading = _f.loading, error = _f.error;
-    var _g = data.brandData, brandName = _g.brandName, selectedBrandItem = _g.selectedBrandItem, termAndConditionChecked = _g.termAndConditionChecked, responseBody = _g.responseBody, salesChannels = _g.salesChannels, segment = _g.segment, teamSize = _g.teamSize, business = _g.business;
-    var _h = responseBody || {}, brandList = _h.brand_list, businessList = _h.business_list;
-    var _j = React.useState(), listActive = _j[0], setListActive = _j[1];
-    var hasBusinessList = (businessList === null || businessList === void 0 ? void 0 : businessList.length) > 0;
+    var _g = data.brandData, brandName = _g.brandName, selectedBrandItem = _g.selectedBrandItem, termAndConditionChecked = _g.termAndConditionChecked, responseBody = _g.responseBody, salesChannels = _g.salesChannels, segment = _g.segment, teamSize = _g.teamSize;
+    var brandList = (responseBody || {}).brand_list;
+    var _h = React.useState(), listActive = _h[0], setListActive = _h[1];
     var methods = useForm({
-        resolver: yupResolver(MerchantValidationSchema(isRequiredNewBrand, hasBusinessList)),
+        resolver: yupResolver(MerchantValidationSchema(isRequiredNewBrand)),
         defaultValues: {
             brandName: brandName || ((_b = selectedBrandItem === null || selectedBrandItem === void 0 ? void 0 : selectedBrandItem.name) === null || _b === void 0 ? void 0 : _b.en),
             selectedBrandItem: selectedBrandItem,
             termAndConditionChecked: termAndConditionChecked,
             salesChannels: salesChannels,
             segment: segment,
-            teamSize: teamSize,
-            business: business
+            teamSize: teamSize
         },
         mode: 'onChange'
     });
@@ -101,7 +98,6 @@ var Merchant = function (_a) {
     var isSegmentsListActive = listActive === ListType.SegmentsList;
     var isTeamSizeListActive = listActive === ListType.TeamSizeList;
     var isBrandListActive = listActive === ListType.BrandList;
-    var isBusinessListActive = listActive === ListType.BusinessList;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandList, { show: hasBrandList && !isTeamSizeListActive && !isSegmentsListActive && !isBusinessListActive, list: brandList, onListOpen: function () { return handleMenuClick(ListType.BrandList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(BusinessList, { show: hasBusinessList && (isOtherBrand || isNewBrand) && !isTeamSizeListActive && !isSegmentsListActive && !isBrandListActive, list: businessList, onListOpen: function () { return handleMenuClick(ListType.BusinessList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(BrandName, { show: (isNewBrand || isOtherBrand) && !listActive, brandNameChecking: brandNameChecking, fetchingBrandName: setBrandNameChecking }), _jsx(Segments, { show: !isTeamSizeListActive && !isBrandListActive && !isBusinessListActive, onListOpen: function () { return handleMenuClick(ListType.SegmentsList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(TeamSize, { show: !isSegmentsListActive && !isBrandListActive && !isBusinessListActive, onListOpen: function () { return handleMenuClick(ListType.TeamSizeList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(Collapse, __assign({ in: !listActive }, { children: _jsx(SalesChannels, {}) })), _jsx(TAC, { show: (isNewBrand || isOtherBrand) && !listActive }), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, error: t(error || ''), loading: loading }, { children: t('next') })) }))] })) })) }));
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandList, { show: hasBrandList && !isTeamSizeListActive && !isSegmentsListActive, list: brandList, onListOpen: function () { return handleMenuClick(ListType.BrandList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(BrandName, { show: (isNewBrand || isOtherBrand) && !listActive, brandNameChecking: brandNameChecking, fetchingBrandName: setBrandNameChecking }), _jsx(Segments, { show: !isTeamSizeListActive && !isBrandListActive, onListOpen: function () { return handleMenuClick(ListType.SegmentsList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(TeamSize, { show: !isSegmentsListActive && !isBrandListActive, onListOpen: function () { return handleMenuClick(ListType.TeamSizeList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(Collapse, __assign({ in: !listActive }, { children: _jsx(SalesChannels, {}) })), _jsx(TAC, { show: (isNewBrand || isOtherBrand) && !listActive }), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, error: t(error || ''), loading: loading }, { children: t('next') })) }))] })) })) }));
 };
 export default React.memo(Merchant);

package/build/features/connect/screens/Merchant/validation.d.ts

@@ -1,5 +1,5 @@
 import * as yup from 'yup';
-export declare const MerchantValidationSchema: (isNewBrand?: boolean, hasBusinessList?: boolean) => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+export declare const MerchantValidationSchema: (isNewBrand?: boolean) => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     salesChannels: import("yup/lib/array").RequiredArraySchema<yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
         id: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
@@ -9,7 +9,6 @@ export declare const MerchantValidationSchema: (isNewBrand?: boolean, hasBusines
     }>>>, import("yup/lib/types").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
         id: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     }>>[] | undefined>;
-    business: import("yup/lib/object").OptionalObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
     segment: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
     teamSize: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
     brandName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
@@ -23,7 +22,6 @@ export declare const MerchantValidationSchema: (isNewBrand?: boolean, hasBusines
     }>>>, import("yup/lib/types").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
         id: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     }>>[] | undefined>;
-    business: import("yup/lib/object").OptionalObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
     segment: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
     teamSize: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
     brandName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
@@ -37,7 +35,6 @@ export declare const MerchantValidationSchema: (isNewBrand?: boolean, hasBusines
     }>>>, import("yup/lib/types").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
         id: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     }>>[] | undefined>;
-    business: import("yup/lib/object").OptionalObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
     segment: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
     teamSize: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
     brandName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;

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

@@ -69,9 +69,8 @@ var validationSalesChannels = function (channels) {
     }
     return true;
 };
-export var MerchantValidationSchema = function (isNewBrand, hasBusinessList) {
+export var MerchantValidationSchema = function (isNewBrand) {
     if (isNewBrand === void 0) { isNewBrand = true; }
-    if (hasBusinessList === void 0) { hasBusinessList = false; }
     if (isNewBrand)
         return yup.object().shape({
             brandName: yup
@@ -89,7 +88,6 @@ export var MerchantValidationSchema = function (isNewBrand, hasBusinessList) {
             termAndConditionChecked: yup.boolean().isTrue('check_terms_cond').required('check_terms_cond'),
             segment: yup.object().required('alert_choose_segment'),
             teamSize: yup.object().required('alert_choose_teamSize'),
-            business: hasBusinessList ? yup.object().required('alert_choose_business') : yup.object().optional(),
             salesChannels: yup
                 .array()
                 .min(1, 'choose_atleast_one_channel')
@@ -130,7 +128,6 @@ export var MerchantValidationSchema = function (isNewBrand, hasBusinessList) {
             }
         })
             .required('choose_atleast_one_channel'),
-        business: yup.object().optional(),
         segment: yup.object().required('alert_choose_segment'),
         teamSize: yup.object().required('alert_choose_teamSize'),
         brandName: yup.string().optional()

package/package.json

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

package/build/features/connect/screens/Merchant/BusinessList.d.ts

@@ -1,10 +0,0 @@
-import * as React from 'react';
-import { BusinessInfo } from '../../../../@types';
-interface BusinessListProps {
-    show: boolean;
-    list: Array<BusinessInfo>;
-    onListOpen?: () => void;
-    onListClose?: () => void;
-}
-declare const _default: React.MemoExoticComponent<({ show, list, ...rest }: BusinessListProps) => JSX.Element>;
-export default _default;

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

@@ -1,82 +0,0 @@
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    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, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-import * as React from 'react';
-import { useTranslation } from 'react-i18next';
-import { useFormContext, useController } from 'react-hook-form';
-import Box from '@mui/material/Box';
-import { styled } from '@mui/material/styles';
-import { useLanguage } from '../../../../hooks';
-import SimpleList from '../../../../components/SimpleList';
-import Text from '../../../../components/Text';
-import ExpandIcon from '../../../../components/ExpandIcon';
-import Collapse from '../../../../components/Collapse';
-import ScreenContainer from '../../../shared/Containers/ScreenContainer';
-import Input from '../../../shared/Input';
-import CheckIcon from '../../../shared/CheckIcon';
-var InputStyled = styled(Input)(function () { return ({
-    '& .MuiInputBase-input': {
-        cursor: 'pointer'
-    }
-}); });
-var BusinessContainer = styled(Box)(function () { return ({
-    display: 'flex'
-}); });
-var BusinessNameText = styled(Text, { shouldForwardProp: function (prop) { return prop !== 'isSelected'; } })(function (_a) {
-    var theme = _a.theme, isSelected = _a.isSelected;
-    return (__assign(__assign({ color: theme.palette.text.primary }, theme.typography.body2), { fontWeight: isSelected ? theme.typography.fontWeightMedium : theme.typography.fontWeightLight }));
-});
-var BusinessList = function (_a) {
-    var show = _a.show, list = _a.list, rest = __rest(_a, ["show", "list"]);
-    var _b = React.useState(null), anchorEl = _b[0], setAnchorEl = _b[1];
-    var t = useTranslation().t;
-    var isAr = useLanguage().isAr;
-    var control = useFormContext().control;
-    var businessControl = useController({ control: control, name: 'business' });
-    var business = businessControl.field.value;
-    var onOpenBusinessList = function (event) {
-        var _a;
-        setAnchorEl(event.currentTarget);
-        (_a = rest.onListOpen) === null || _a === void 0 ? void 0 : _a.call(rest);
-    };
-    var onCloseBusinessList = function () {
-        var _a;
-        setAnchorEl(null);
-        (_a = rest.onListClose) === null || _a === void 0 ? void 0 : _a.call(rest);
-    };
-    var getBusinessName = function (business) {
-        var _a, _b;
-        return (isAr ? (_a = business === null || business === void 0 ? void 0 : business.name) === null || _a === void 0 ? void 0 : _a.ar : (_b = business === null || business === void 0 ? void 0 : business.name) === null || _b === void 0 ? void 0 : _b.en) || '';
-    };
-    var getBusinessId = function (item) {
-        return (item === null || item === void 0 ? void 0 : item.id) || '';
-    };
-    var onSelectItem = function (business) {
-        businessControl.field.onChange(business);
-        onCloseBusinessList();
-    };
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { mt: 2.5, mb: 0 } }, { children: [_jsx(InputStyled, { label: t('select_business_label'), onClick: !!anchorEl ? onCloseBusinessList : onOpenBusinessList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_business'), value: t(getBusinessName(business)) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'id', searchValuePath: ['id', 'name.ar', 'name.en'], list: list, onSelectItem: onSelectItem, renderItem: function (item) {
-                            return (_jsxs(_Fragment, { children: [_jsx(BusinessContainer, { children: _jsx(BusinessNameText, __assign({ isSelected: getBusinessId(item) === getBusinessId(business) }, { children: t(getBusinessName(item)) })) }), getBusinessId(item) === getBusinessId(business) && _jsx(CheckIcon, {})] }));
-                        } }) }))] })) })));
-};
-export default React.memo(BusinessList);