@tap-payments/auth-jsconnect 2.1.5-test → 2.1.7-test

package/build/api/entity.d.ts

@@ -56,7 +56,7 @@ export declare type UploadFileBody = {
 };
 export declare type UpdateEntityBody = {
     id: string;
-    license: {
+    license?: {
         type?: string;
         number?: string;
         additional_info?: {

package/build/app/settings.d.ts

@@ -9,6 +9,7 @@ export declare const fetchAppSettingsSync: import("@reduxjs/toolkit").AsyncThunk
 }, {
     disableCountries?: boolean | undefined;
     disableLocale?: boolean | undefined;
+    mdn: string;
 }, {}>;
 export interface SettingsData {
     skin: ThemeMode;

package/build/app/settings.js

@@ -107,7 +107,7 @@ export var fetchAppSettingsSync = createAsyncThunk('fetchAppSettingsSync', funct
                     },
                     source: 'browser'
                 };
-                setAxiosGlobalHeaders(__assign(__assign({}, getRequestHeaders(deviceInfo)), { authorization: encryptString(appConfig.publicKey), mdn: encryptString(window.location.origin) }));
+                setAxiosGlobalHeaders(__assign(__assign({}, getRequestHeaders(deviceInfo)), { authorization: encryptString(appConfig.publicKey), mdn: encryptString(params.mdn || window.location.origin) }));
                 return [4, API.operatorService.validateOperator(operatorData)];
             case 2:
                 operatorStatus = _e.sent();

package/build/constants/app.d.ts

@@ -132,6 +132,7 @@ export declare const PASSWORD_STEP_NAMES: {
 export declare const ENTITY_STEP_NAMES: {
     PHONE_AUTH: string;
     ENTITY_INFO: string;
+    ENTITY_CUSTOMER: string;
     ENTITY_SUCCESS: string;
 };
 export declare const RSA_FRONTEND_MW_PUBLIC_KEY = "-----BEGIN PUBLIC KEY-----\nMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCgC9kH1SQvjbXAUXd0PbrDUG8P\nLhRig9pJNBmdQBZjihuaxfkzYu6ToMbIMAfmYgVgQw338/y7aQ8X3m03CXNIlkxo\nOwxKCA8ymKsZQptXJn9IxlPO7yjoFgTFBrpmTgvcC4XO1uoUYTAPq3szK8kj4zgT\nucWG1hSKsOdRU7sl/wIDAQAB\n-----END PUBLIC KEY-----";

package/build/constants/app.js

@@ -316,21 +316,27 @@ export var ENTITY_SCREENS_NAVIGATION = [
     },
     {
         name: 'ENTITY_INFO_STEP',
-        next: 'ENTITY_DETAILS_SUCCESS_STEP',
+        next: 'ENTITY_CUSTOMERS_STEP',
         prev: 'ENTITY_SUCCESS_FOUR_FLOWS_BUTTONS_STEP',
         order: 2
     },
     {
-        name: 'ENTITY_DETAILS_SUCCESS_STEP',
-        next: 'ENTITY_SUCCESS_FOUR_FLOWS_BUTTONS_STEP',
+        name: 'ENTITY_CUSTOMERS_STEP',
+        next: 'ENTITY_DETAILS_SUCCESS_STEP',
         prev: 'ENTITY_INFO_STEP',
         order: 3
     },
+    {
+        name: 'ENTITY_DETAILS_SUCCESS_STEP',
+        next: 'ENTITY_SUCCESS_FOUR_FLOWS_BUTTONS_STEP',
+        prev: 'ENTITY_CUSTOMERS_STEP',
+        order: 4
+    },
     {
         name: 'ENTITY_SUCCESS_FOUR_FLOWS_BUTTONS_STEP',
         next: 'ENTITY_RESET_PASSWORD_SUCCESS',
         prev: '',
-        order: 4
+        order: 5
     },
     {
         name: 'ENTITY_RESET_PASSWORD_SUCCESS',
@@ -461,6 +467,7 @@ export var PASSWORD_STEP_NAMES = {
 export var ENTITY_STEP_NAMES = {
     PHONE_AUTH: 'entity_phone_auth',
     ENTITY_INFO: 'entity_info',
+    ENTITY_CUSTOMER: 'entity_customer',
     ENTITY_SUCCESS: 'entity_completed'
 };
 export var RSA_FRONTEND_MW_PUBLIC_KEY = "-----BEGIN PUBLIC KEY-----\nMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCgC9kH1SQvjbXAUXd0PbrDUG8P\nLhRig9pJNBmdQBZjihuaxfkzYu6ToMbIMAfmYgVgQw338/y7aQ8X3m03CXNIlkxo\nOwxKCA8ymKsZQptXJn9IxlPO7yjoFgTFBrpmTgvcC4XO1uoUYTAPq3szK8kj4zgT\nucWG1hSKsOdRU7sl/wIDAQAB\n-----END PUBLIC KEY-----";

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

@@ -723,7 +723,7 @@ var initialState = {
         },
         activitiesData: {
             activities: [],
-            operationStartDate: new Date().toString()
+            operationStartDate: moment(new Date()).format('YYYY-MM-DD')
         },
         customersData: {
             customerLocations: [],

package/build/features/app/entity/entityStore.d.ts

@@ -1,5 +1,5 @@
 import { RootState } from '../../../app/store';
-import { EntityFormValues, FlowsTypes, OTPFormValues, ResponseData, SharedState } from '../../../@types';
+import { CustomersFormValues, EntityFormValues, FlowsTypes, OTPFormValues, ResponseData, SharedState } from '../../../@types';
 export declare const verifyLeadToken: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
     boardResponse: {
@@ -47,6 +47,15 @@ interface UploadArticleParams {
 export declare const uploadArticle: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
 }, UploadArticleParams, {}>;
+export declare const updateCustomersInfo: import("@reduxjs/toolkit").AsyncThunk<{
+    data: any;
+    formData: CustomersFormValues;
+}, CustomersFormValues, {}>;
+export declare const retrieveDataList: import("@reduxjs/toolkit").AsyncThunk<{
+    customerBases: any;
+    expectedSales: any;
+    expectedCustomerSales: any;
+}, void, {}>;
 export declare const updateBoardSuccess: import("@reduxjs/toolkit").AsyncThunk<{
     response: any;
     formData: void;
@@ -58,6 +67,7 @@ export interface EntityData {
     verify: ResponseData & VerifyData;
     otpData: OTPFormValues & ResponseData;
     entityData: EntityFormValues & ResponseData;
+    customersData: CustomersFormValues & ResponseData;
     flowName: FlowsTypes;
 }
 export interface EntityState extends SharedState<EntityData> {

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

@@ -266,18 +266,20 @@ export var updateEntity = createAsyncThunk('entityUpdateEntity', function (param
                 payload = {
                     id: id,
                     license: {
-                        number: params.licenseNumber
+                        number: params.licenseNumber && params.licenseNumber,
+                        type: params.licenseType
                     },
                     legal_name: {
                         ar: params.licenseName,
                         en: params.licenseName
                     },
                     AOA_file_id: articleId,
-                    encryption_contract: ['license.number', 'legal_name.ar', 'legal_name.en']
+                    encryption_contract: ['license.number', 'legal_name.ar', 'legal_name.en', 'license.type']
                 };
                 return [4, API.entityService.updateEntity(payload)];
             case 2:
                 data = _j.sent();
+                thunkApi.dispatch(retrieveDataList());
                 thunkApi.dispatch(handleNextScreenStep());
                 (_h = (_g = settings.data.appConfig).onStepCompleted) === null || _h === void 0 ? void 0 : _h.call(_g, settings.data.activeScreen.name, id);
                 return [2, { data: __assign(__assign({}, data), brandData), formData: params }];
@@ -313,6 +315,66 @@ export var uploadArticle = createAsyncThunk('entityUploadArticle', function (_a)
         });
     });
 });
+export var updateCustomersInfo = createAsyncThunk('entityUpdateCustomersInfo', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, settings, entity, id, customerLocation, customerBase, sales, requestBody, data;
+    var _b, _c, _d, _e, _f, _g;
+    return __generator(this, function (_h) {
+        switch (_h.label) {
+            case 0:
+                _a = thunkApi.getState(), settings = _a.settings, entity = _a.entity;
+                id = (_c = (_b = entity.data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.brand) === null || _c === void 0 ? void 0 : _c.id;
+                customerLocation = params.customerLocations.map(function (location) { return ({
+                    id: location === null || location === void 0 ? void 0 : location.id
+                }); });
+                customerBase = { id: ((_d = params.expectedCustomer) === null || _d === void 0 ? void 0 : _d.id) || '', period: 'monthly', locations: customerLocation };
+                sales = { id: ((_e = params.expectedSale) === null || _e === void 0 ? void 0 : _e.id) || '', period: 'monthly' };
+                requestBody = {
+                    operations: {
+                        customer_base: customerBase,
+                        sales: sales,
+                        start_date: entity.data.entityData.operationStartDate
+                    },
+                    term: ['refund', 'chargeback'],
+                    id: id,
+                    encryption_contract: []
+                };
+                return [4, API.brandService.updateBrandInfo(requestBody)];
+            case 1:
+                data = _h.sent();
+                thunkApi.dispatch(handleNextScreenStep());
+                (_g = (_f = settings.data.appConfig).onStepCompleted) === null || _g === void 0 ? void 0 : _g.call(_f, settings.data.activeScreen.name, requestBody);
+                return [2, { data: data === null || data === void 0 ? void 0 : data.brand, formData: params }];
+        }
+    });
+}); });
+export var retrieveDataList = createAsyncThunk('entityRetrieveDataList', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var settings, dataBody, salesDataBody, _a, customerBases, expectedSales, expectedCustomerSales;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
+            case 0:
+                settings = thunkApi.getState().settings;
+                dataBody = {
+                    page: 0
+                };
+                salesDataBody = {
+                    page: 0,
+                    country_code: [settings.data.businessCountry.iso2]
+                };
+                return [4, Promise.all([
+                        API.dataService.getCustomerBases(dataBody),
+                        API.dataService.getExpectedSales(salesDataBody),
+                        API.dataService.getExpectedCustomerSales(dataBody)
+                    ])];
+            case 1:
+                _a = _b.sent(), customerBases = _a[0], expectedSales = _a[1], expectedCustomerSales = _a[2];
+                return [2, {
+                        customerBases: customerBases,
+                        expectedSales: expectedSales,
+                        expectedCustomerSales: expectedCustomerSales
+                    }];
+        }
+    });
+}); });
 export var updateBoardSuccess = createAsyncThunk('updateBoardEntitySuccess', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, settings, entity, _b, id, infoId, payload, data;
     var _c, _d, _e, _f;
@@ -359,8 +421,15 @@ var initialState = {
             licenseNumber: '',
             licenseType: BusinessType.CR,
             activities: [],
-            operationStartDate: '',
+            operationStartDate: moment(new Date()).format('YYYY-MM-DD'),
             uploading: false
+        },
+        customersData: {
+            customerLocations: [],
+            expectedCustomer: undefined,
+            expectedSale: undefined,
+            refundPolicy: false,
+            transactionPolicy: false
         }
     }
 };
@@ -500,7 +569,7 @@ export var entitySlice = createSlice({
                 return;
             }
             state.data.entityData = formData;
-            state.data.entityData.responseBody = data;
+            state.data.entityData.responseBody = __assign(__assign({}, state.data.entityData.responseBody), { data: data });
         })
             .addCase(updateEntity.rejected, function (state, action) {
             state.loading = false;
@@ -519,6 +588,72 @@ export var entitySlice = createSlice({
             .addCase(retrieveBoardDetails.rejected, function (state, action) {
             state.error = action.error.message;
             state.loading = false;
+        })
+            .addCase(retrieveDataList.pending, function (state) {
+            state.loading = true;
+            state.error = null;
+        })
+            .addCase(retrieveDataList.fulfilled, function (state, action) {
+            var _a, _b, _c, _d, _e, _f;
+            state.loading = false;
+            state.error = null;
+            var payload = action.payload;
+            state.data.customersData.responseBody = payload;
+            var brand = (state.data.verify.responseBody || {}).brand;
+            var _g = (brand === null || brand === void 0 ? void 0 : brand.operations) || {}, customer_base = _g.customer_base, sales = _g.sales;
+            var customerBases = ((_a = payload.customerBases) === null || _a === void 0 ? void 0 : _a.list) || [];
+            var customerBase = undefined;
+            if ((customerBases === null || customerBases === void 0 ? void 0 : customerBases.length) > 1)
+                customerBase = [customerBases === null || customerBases === void 0 ? void 0 : customerBases[1], customerBases[0]];
+            else if ((customerBases === null || customerBases === void 0 ? void 0 : customerBases.length) === 1)
+                customerBase = [customerBases[0]];
+            if (((_b = customer_base === null || customer_base === void 0 ? void 0 : customer_base.locations) === null || _b === void 0 ? void 0 : _b.length) > 0) {
+                customerBase = customerBases === null || customerBases === void 0 ? void 0 : customerBases.filter(function (base) {
+                    var _a;
+                    return (_a = customer_base === null || customer_base === void 0 ? void 0 : customer_base.locations) === null || _a === void 0 ? void 0 : _a.find(function (value) { return value.id === base.id; });
+                });
+            }
+            var expectedSales = ((_c = payload.expectedSales) === null || _c === void 0 ? void 0 : _c.list) || [];
+            var expectedSale = (_e = (_d = expectedSales === null || expectedSales === void 0 ? void 0 : expectedSales[0]) === null || _d === void 0 ? void 0 : _d.sub) === null || _e === void 0 ? void 0 : _e[4];
+            if ((sales === null || sales === void 0 ? void 0 : sales.length) > 0) {
+                expectedSale = expectedSales === null || expectedSales === void 0 ? void 0 : expectedSales.find(function (sale) {
+                    var _a;
+                    return (_a = sales === null || sales === void 0 ? void 0 : sales.sub) === null || _a === void 0 ? void 0 : _a.find(function (s) { return s.id === sale.id; });
+                });
+            }
+            var expectedCustomerSales = ((_f = payload.expectedCustomerSales) === null || _f === void 0 ? void 0 : _f.list) || [];
+            var expectedCustomerSale = expectedCustomerSales === null || expectedCustomerSales === void 0 ? void 0 : expectedCustomerSales[3];
+            if ((customer_base === null || customer_base === void 0 ? void 0 : customer_base.length) > 0) {
+                expectedCustomerSale = expectedCustomerSales === null || expectedCustomerSales === void 0 ? void 0 : expectedCustomerSales.find(function (base) {
+                    return customer_base.id === base.id;
+                });
+            }
+            state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { customerBases: customerBases, expectedSales: expectedSales, expectedCustomerSales: expectedCustomerSales });
+            if (!!customerBase)
+                state.data.customersData.customerLocations = customerBase;
+            if (!!expectedSale)
+                state.data.customersData.expectedSale = expectedSale;
+            if (!!expectedCustomerSale)
+                state.data.customersData.expectedCustomer = expectedCustomerSale;
+        })
+            .addCase(retrieveDataList.rejected, function (state, action) {
+            state.loading = false;
+            state.error = action.error.message;
+        })
+            .addCase(updateCustomersInfo.pending, function (state) {
+            state.loading = true;
+            state.error = null;
+        })
+            .addCase(updateCustomersInfo.fulfilled, function (state, action) {
+            state.loading = false;
+            state.error = null;
+            var _a = action.payload, data = _a.data, formData = _a.formData;
+            state.data.customersData = formData;
+            state.data.customersData.responseBody = data;
+        })
+            .addCase(updateCustomersInfo.rejected, function (state, action) {
+            state.loading = false;
+            state.error = action.error.message;
         })
             .addCase(updateBoardSuccess.fulfilled, function (state, action) {
             var _a;

package/build/features/app/password/passwordStore.d.ts

@@ -2,13 +2,7 @@ import { RootState } from '../../../app/store';
 import { FlowsTypes, OTPFormValues, PasswordCreateFormValues, ResponseData, SharedState } from '../../../@types';
 export declare const verifyLeadToken: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
-    boardResponse: {
-        flows: {
-            name: string;
-            status: string;
-            url: string;
-        }[];
-    };
+    boardResponse: any;
     token: string;
 }, string, {}>;
 export declare const resendOTP: import("@reduxjs/toolkit").AsyncThunk<{

package/build/features/app/password/passwordStore.js

@@ -49,13 +49,13 @@ var _a;
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import API from '../../../api';
 import { FlowsTypes } from '../../../@types';
-import { handleCurrentActiveScreen, handleNextScreenStep } from '../../../app/settings';
+import { handleCurrentActiveScreen, handleNextScreenStep, handleSetCountryByIso2 } from '../../../app/settings';
 import { BUSINESS_FLOW_SUCCESS, PASSWORD_OPERATION_TYPE, PASSWORD_STEP_NAMES } from '../../../constants';
 export var verifyLeadToken = createAsyncThunk('passwordVerifyLeadToken', function (token, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var payload, data, boardInfoData, board_id, board_info_id, info, hasPasswordCompleted;
-    var _a;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
+    var payload, data, boardInfoData, boardData, board_id, board_info_id, countryIso2, info, hasPasswordCompleted;
+    var _a, _b, _c, _d;
+    return __generator(this, function (_e) {
+        switch (_e.label) {
             case 0:
                 payload = {
                     service_name: 'tap_email',
@@ -63,21 +63,28 @@ export var verifyLeadToken = createAsyncThunk('passwordVerifyLeadToken', functio
                 };
                 return [4, API.leadService.verifyLeadToken(payload)];
             case 1:
-                data = (_b.sent()).data;
-                boardInfoData = undefined;
-                if (!(!(data === null || data === void 0 ? void 0 : data.errors) && !(data === null || data === void 0 ? void 0 : data.mw_error))) return [3, 5];
+                data = (_e.sent()).data;
+                boardData = undefined;
+                if (!(!(data === null || data === void 0 ? void 0 : data.errors) && !(data === null || data === void 0 ? void 0 : data.mw_error))) return [3, 6];
                 board_id = data === null || data === void 0 ? void 0 : data.id;
                 board_info_id = data === null || data === void 0 ? void 0 : data.board_info_id;
-                if (!(!!board_id && !!board_info_id)) return [3, 3];
+                if (!(board_id && board_info_id)) return [3, 3];
                 return [4, API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id })];
             case 2:
-                boardInfoData = _b.sent();
-                _b.label = 3;
-            case 3: return [4, thunkApi.dispatch(retrieveBoardDetails(board_id))];
+                boardInfoData = _e.sent();
+                _e.label = 3;
+            case 3:
+                if (!board_id) return [3, 5];
+                return [4, API.boardService.retrieveBoardDetails(board_id)];
             case 4:
-                _b.sent();
+                boardData = _e.sent();
+                _e.label = 5;
+            case 5:
+                countryIso2 = (_a = boardData === null || boardData === void 0 ? void 0 : boardData.entity) === null || _a === void 0 ? void 0 : _a.country;
+                if (countryIso2)
+                    thunkApi.dispatch(handleSetCountryByIso2(countryIso2));
                 info = (boardInfoData || {}).info;
-                hasPasswordCompleted = ((_a = info === null || info === void 0 ? void 0 : info.find(function (flow) { return flow.name === 'password'; })) === null || _a === void 0 ? void 0 : _a.status) === 'completed';
+                hasPasswordCompleted = ((_b = info === null || info === void 0 ? void 0 : info.find(function (flow) { return flow.name === 'password'; })) === null || _b === void 0 ? void 0 : _b.status) === 'completed';
                 if (data.step_name === PASSWORD_STEP_NAMES.PHONE_AUTH) {
                     thunkApi.dispatch(handleCurrentActiveScreen('PASSWORD_VERIFY_STEP'));
                 }
@@ -87,8 +94,12 @@ export var verifyLeadToken = createAsyncThunk('passwordVerifyLeadToken', functio
                 else if (data.step_name === PASSWORD_STEP_NAMES.PASSWORD_INFO) {
                     thunkApi.dispatch(handleNextScreenStep('PASSWORD_CREATE_PASSWORD_STEP'));
                 }
-                _b.label = 5;
-            case 5: return [2, { data: data, boardResponse: { flows: BUSINESS_FLOW_SUCCESS.concat((boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.info) || []) }, token: token }];
+                _e.label = 6;
+            case 6: return [2, {
+                    data: data,
+                    boardResponse: __assign(__assign({}, boardData === null || boardData === void 0 ? void 0 : boardData.business), { flows: BUSINESS_FLOW_SUCCESS.concat((boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.info) || []), user: boardData === null || boardData === void 0 ? void 0 : boardData.user, brand: boardData === null || boardData === void 0 ? void 0 : boardData.brand, bank_account: boardData === null || boardData === void 0 ? void 0 : boardData.bank_account, entity: boardData === null || boardData === void 0 ? void 0 : boardData.entity, merchant: boardData === null || boardData === void 0 ? void 0 : boardData.merchant, name: (_c = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _c === void 0 ? void 0 : _c.names, contact: (_d = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _d === void 0 ? void 0 : _d.contact }),
+                    token: token
+                }];
         }
     });
 }); });

package/build/features/bank/screens/BankDetails/IBAN.js

@@ -50,6 +50,8 @@ import axios from 'axios';
 import ClearIcon from '../../../shared/ClearIcon';
 import CheckIcon from '../../../shared/CheckIcon';
 import CircularProgress from '@mui/material/CircularProgress';
+import { settingsSelector } from '../../../../app/settings';
+import { useAppSelector } from '../../../../hooks';
 var InputStyled = styled(Input)(function () { return ({
     input: {
         textTransform: 'uppercase'
@@ -60,6 +62,7 @@ var IBAN = function (_a) {
     var _b;
     var fetchingIban = _a.fetchingIban, ibanChecking = _a.ibanChecking;
     var dispatch = useAppDispatch();
+    var settingsData = useAppSelector(settingsSelector).data;
     var t = useTranslation().t;
     var control = useFormContext().control;
     var ibanControl = useController({ name: 'iban', control: control });
@@ -92,6 +95,6 @@ var IBAN = function (_a) {
     var clearValue = function () {
         ibanControl.field.onChange('');
     };
-    return (_jsx(ScreenContainer, { children: _jsx(InputStyled, { label: t('enter_iban'), inputProps: { maxLength: MAX_IBAN_VALUE }, onChange: handleIbanChange, value: ibanValue, placeholder: t('enter_iban_placeholder'), warningType: 'alert', warningMessage: error && t(error), required: true, endAdornment: ibanChecking ? (_jsx(CircularProgress, { size: 25, thickness: 5, sx: { height: 'auto !important' } })) : !error && ibanValue ? (_jsx(CheckIcon, {})) : (ibanValue && _jsx(ClearIcon, { onClick: clearValue })) }) }));
+    return (_jsx(ScreenContainer, { children: _jsx(InputStyled, { label: t('enter_iban'), inputProps: { maxLength: MAX_IBAN_VALUE }, onChange: handleIbanChange, value: ibanValue, placeholder: t('iban_input_placeholder', { countrycode: settingsData.businessCountry.iso2.toUpperCase() }), warningType: 'alert', warningMessage: error && t(error), required: true, endAdornment: ibanChecking ? (_jsx(CircularProgress, { size: 25, thickness: 5, sx: { height: 'auto !important' } })) : !error && ibanValue ? (_jsx(CheckIcon, {})) : (ibanValue && _jsx(ClearIcon, { onClick: clearValue })) }) }));
 };
 export default IBAN;

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

@@ -23,7 +23,7 @@ import Button from '../../../shared/Button';
 import { clearError, connectSelector, updateLeadBrand } from '../../../app/connect/connectStore';
 import { useLanguage } from '../../../../hooks';
 import { AuthForType } from '../../../../@types';
-import { isKW, mapSalesChannel } from '../../../../utils';
+import { findFirstId, isKW, mapSalesChannel } from '../../../../utils';
 import { MerchantValidationSchema } from './validation';
 import BrandName from './BrandName';
 import SocialMedia from './SocialMedia';
@@ -35,11 +35,12 @@ var Merchant = function (_a) {
     var _d = React.useState(false), brandNameChecking = _d[0], setBrandNameChecking = _d[1];
     var _e = React.useState(false), isBrandListOpen = _e[0], setIsBrandListOpen = _e[1];
     var _f = React.useState(false), isRequiredNewBrand = _f[0], setIsRequiredNewBrand = _f[1];
-    var _g = useAppSelector(connectSelector), data = _g.data, loading = _g.loading, error = _g.error;
+    var _g = React.useState(''), activeIconId = _g[0], setActiveIconId = _g[1];
+    var _h = useAppSelector(connectSelector), data = _h.data, loading = _h.loading, error = _h.error;
     var settingsData = useAppSelector(settingsSelector).data;
     var isNewIndividual = (_b = data.otpData.responseBody) === null || _b === void 0 ? void 0 : _b.is_new_individual;
     var startWithNID = data.otpData.authFor === AuthForType.NATIONAL_ID;
-    var _h = data.brandData, brandName = _h.brandName, selectedBrandItem = _h.selectedBrandItem, termAndConditionChecked = _h.termAndConditionChecked, responseBody = _h.responseBody, salesChannels = _h.salesChannels;
+    var _j = data.brandData, brandName = _j.brandName, selectedBrandItem = _j.selectedBrandItem, termAndConditionChecked = _j.termAndConditionChecked, responseBody = _j.responseBody, salesChannels = _j.salesChannels;
     var brandList = (responseBody || {}).brand_list;
     var methods = useForm({
         resolver: yupResolver(MerchantValidationSchema(isRequiredNewBrand)),
@@ -76,16 +77,21 @@ var Merchant = function (_a) {
         if ((responseBody === null || responseBody === void 0 ? void 0 : responseBody.response_code) === '5')
             methods.setError('brandName', { message: 'brand_name_already_exist' });
     }, [responseBody]);
+    var onSaleIconChange = function (id) {
+        setActiveIconId(id);
+    };
     React.useEffect(function () {
         if (selectedBrandItem.id) {
             methods.setValue('selectedBrandItem', selectedBrandItem);
             var sales = mapSalesChannel(selectedBrandItem.channel_services || []);
+            setActiveIconId(findFirstId(sales));
             methods.setValue('salesChannels', sales, { shouldValidate: true });
         }
     }, [selectedBrandItem]);
     React.useEffect(function () {
         if (salesChannels.length > 0) {
             var sales = mapSalesChannel(salesChannels);
+            setActiveIconId(findFirstId(sales));
             methods.setValue('salesChannels', sales, { shouldValidate: true });
         }
     }, [salesChannels]);
@@ -101,6 +107,6 @@ var Merchant = function (_a) {
     React.useEffect(function () {
         setIsRequiredNewBrand(isOtherBrand || isNewBrand);
     }, [isOtherBrand, isNewBrand]);
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandList, { show: !(isOtherBrand || isNewBrand), list: brandList, onListOpen: function () { return setIsBrandListOpen(true); }, onListClose: function () { return setIsBrandListOpen(false); } }), _jsx(BrandName, { show: (isNewBrand || isOtherBrand) && !isBrandListOpen, brandNameChecking: brandNameChecking, fetchingBrandName: setBrandNameChecking }), _jsx(Collapse, __assign({ in: !isBrandListOpen }, { children: _jsx(SalesChannels, {}) })), _jsx(SocialMedia, { show: !isBrandListOpen }), _jsx(TAC, { show: (isNewBrand || isOtherBrand) && !isBrandListOpen }), _jsx(Collapse, __assign({ in: !isBrandListOpen, 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: !(isOtherBrand || isNewBrand), list: brandList, onListOpen: function () { return setIsBrandListOpen(true); }, onListClose: function () { return setIsBrandListOpen(false); } }), _jsx(BrandName, { show: (isNewBrand || isOtherBrand) && !isBrandListOpen, brandNameChecking: brandNameChecking, fetchingBrandName: setBrandNameChecking }), _jsx(Collapse, __assign({ in: !isBrandListOpen }, { children: _jsx(SalesChannels, { onSaleIconChange: onSaleIconChange }) })), _jsx(SocialMedia, { show: !isBrandListOpen, activeIconId: activeIconId, onSaleIconChange: onSaleIconChange }), _jsx(TAC, { show: (isNewBrand || isOtherBrand) && !isBrandListOpen }), _jsx(Collapse, __assign({ in: !isBrandListOpen, 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/SalesChannels.d.ts

@@ -2,6 +2,7 @@ import * as React from 'react';
 export declare const MandatoryStyled: import("@emotion/styled").StyledComponent<import("@mui/system").MUIStyledCommonProps<import("@mui/material/styles").Theme>, React.DetailedHTMLProps<React.HTMLAttributes<HTMLSpanElement>, HTMLSpanElement>, {}>;
 export declare const CollapseStyled: import("@emotion/styled").StyledComponent<import("../../../../components/Collapse").CollapseProps & import("@mui/system").MUIStyledCommonProps<import("@mui/material/styles").Theme>, {}, {}>;
 interface SalesChannelsProps {
+    onSaleIconChange: (id: string) => void;
 }
-declare const SalesChannels: ({}: SalesChannelsProps) => JSX.Element;
+declare const SalesChannels: ({ onSaleIconChange }: SalesChannelsProps) => JSX.Element;
 export default SalesChannels;

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

@@ -29,6 +29,7 @@ import { connectSelector, clearError } from '../../../app/connect/connectStore';
 import CheckBox from '../../../../components/CheckBox';
 import Warning from '../../../../components/Warning';
 import Collapse from '../../../../components/Collapse';
+import { findFirstId } from '../../../../utils';
 var InputLabelStyled = styled(Text)(function (_a) {
     var theme = _a.theme;
     return (__assign({ margin: theme.spacing(2.5, 2.5, 0.5, 2.5), color: alpha(theme.palette.text.primary, 0.4) }, theme.typography.caption));
@@ -74,6 +75,7 @@ export var CollapseStyled = styled(Collapse)(function (_a) {
 });
 var SalesChannels = function (_a) {
     var _b;
+    var onSaleIconChange = _a.onSaleIconChange;
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var _c = useFormContext(), control = _c.control, getValues = _c.getValues;
@@ -90,16 +92,12 @@ var SalesChannels = function (_a) {
             dispatch(clearError());
         if (isChecked(channel.id)) {
             var filterChannels = channelsControl.field.value.filter(function (item) { return item.id !== channel.id; });
+            onSaleIconChange(findFirstId([filterChannels.at(-1)]));
             channelsControl.field.onChange(filterChannels);
         }
         else {
-            var brandName = getValues('brandName');
+            onSaleIconChange(findFirstId([channel]));
             var newChannel = __assign({}, channel);
-            if (newChannel.code === 'website' && brandName) {
-                var brandValue = brandName.replaceAll(' ', '-').toLowerCase();
-                var address = (brandValue[brandValue.length - 1] === '-' ? brandValue.slice(0, -1) : brandValue) + '.com';
-                newChannel.address = 'www.' + address;
-            }
             channelsControl.field.onChange(__spreadArray(__spreadArray([], channelsControl.field.value, true), [newChannel], false));
         }
     };

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

@@ -1,6 +1,8 @@
 import * as React from 'react';
 interface SocialMediaProps {
     show: boolean;
+    activeIconId: string;
+    onSaleIconChange: (id: string) => void;
 }
-declare const _default: React.MemoExoticComponent<({ show }: SocialMediaProps) => JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ show, activeIconId, onSaleIconChange }: SocialMediaProps) => JSX.Element>;
 export default _default;

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

@@ -79,16 +79,12 @@ var SocialMediaButtonStyled = styled(ToggleButton, {
 });
 var SocialMedia = function (_a) {
     var _b;
-    var show = _a.show;
-    var _c = React.useState(''), activeSocialId = _c[0], setActiveSocialId = _c[1];
+    var show = _a.show, activeIconId = _a.activeIconId, onSaleIconChange = _a.onSaleIconChange;
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
-    var _d = useFormContext(), setValue = _d.setValue, watch = _d.watch, getFieldState = _d.getFieldState;
+    var _c = useFormContext(), setValue = _c.setValue, watch = _c.watch, getFieldState = _c.getFieldState;
     var selectedChannels = watch('salesChannels');
     var salesChannelsState = getFieldState('salesChannels');
-    var onChangeIcons = function (id) {
-        setActiveSocialId(id);
-    };
     var onChangeInput = function (value, id) {
         if (selectedChannels.length <= 0)
             return;
@@ -123,28 +119,6 @@ var SocialMedia = function (_a) {
         });
         setValue('salesChannels', __spreadArray([], updatedChannels, true), { shouldValidate: true });
     };
-    var setDefaultActiveSocialId = React.useCallback(function () {
-        var _a;
-        var idExist = selectedChannels.find(function (channel) {
-            var _a;
-            if ((_a = channel.sub) === null || _a === void 0 ? void 0 : _a.length) {
-                return channel.sub.find(function (subChannel) { return subChannel.id === activeSocialId; });
-            }
-            return channel.id === activeSocialId;
-        });
-        if (selectedChannels.length >= 1 && !idExist) {
-            var firstChannel = selectedChannels[0];
-            if ((_a = firstChannel.sub) === null || _a === void 0 ? void 0 : _a.length) {
-                setActiveSocialId(firstChannel.sub[0].id);
-            }
-            else {
-                setActiveSocialId(firstChannel.id);
-            }
-        }
-    }, [selectedChannels]);
-    React.useEffect(function () {
-        setDefaultActiveSocialId();
-    }, [setDefaultActiveSocialId]);
     var getPlaceHolder = function (item) {
         var _a, _b;
         if (isAr)
@@ -158,19 +132,19 @@ var SocialMedia = function (_a) {
     }, [salesChannelsState]);
     var linksErrorMsg = (_b = salesChannelsState.error) === null || _b === void 0 ? void 0 : _b.message;
     return (_jsx(Box, { children: _jsx(Collapse, __assign({ in: show && selectedChannels.length > 0 }, { children: _jsxs(Box, __assign({ sx: { mb: 3, direction: 'ltr' } }, { children: [_jsx(SocialMediaGroupStyled, __assign({ exclusive: true, onChange: function (e, value) {
-                            onChangeIcons(value);
+                            onSaleIconChange(value);
                         } }, { children: selectedChannels.map(function (channel, index) {
                             var _a;
-                            var isActive = activeSocialId === channel.id;
+                            var isActive = activeIconId === channel.id;
                             return ((_a = channel.sub) === null || _a === void 0 ? void 0 : _a.length) ? (channel.sub.map(function (sub, subIndex) {
-                                var isSubActive = activeSocialId === sub.id;
+                                var isSubActive = activeIconId === sub.id;
                                 return (_jsx(SocialMediaButtonStyled, __assign({ isShow: true, isActive: isSubActive, value: sub.id }, { children: _jsx(ToggleIconStyled, { isActive: isSubActive, src: (sub === null || sub === void 0 ? void 0 : sub.logo) || '' }) }), "sub_".concat(subIndex)));
                             })) : (_jsx(SocialMediaButtonStyled, __assign({ isShow: true, isActive: isActive, value: channel.id || '' }, { children: _jsx(ToggleIconStyled, { isActive: isActive, src: (channel === null || channel === void 0 ? void 0 : channel.logo) || '' }) }), index));
                         }) })), selectedChannels.map(function (channel, index) {
                         var _a;
-                        var isActive = activeSocialId === channel.id;
+                        var isActive = activeIconId === channel.id;
                         return ((_a = channel.sub) === null || _a === void 0 ? void 0 : _a.length) ? (channel.sub.map(function (sub, subIndex) {
-                            var isSubActive = activeSocialId === sub.id;
+                            var isSubActive = activeIconId === sub.id;
                             return (_jsx(Collapse, __assign({ in: isSubActive, timeout: 300 }, { children: _jsx(InputStyled, { onChange: function (e) {
                                         onChangeInput(e.target.value, sub.id);
                                     }, value: sub.address || '', startAdornment: _jsx(TextStyled, __assign({ sx: __assign({}, (isTwitter(sub.code) && { fontSize: '20px' })) }, { children: isWebsite(sub.code) ? "https://" : isTwitter(sub.code) ? "@" : '' })), placeholder: t(getPlaceHolder(sub)) }) }), "sub_".concat(subIndex)));