@tap-payments/auth-jsconnect 2.3.37-test → 2.3.40-test

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

@@ -134,6 +134,9 @@ export declare type EntityCapitalFormValues = {
     capitalShareCount: string;
     capitalShareValue: string;
 };
+export declare type EntityAddressFormValues = {
+    billingAddress: Record<string, string>;
+};
 export declare type BusinessDataFormValues = {
     brandName: string;
     licenseNumber: string;

package/build/api/address.d.ts

@@ -0,0 +1,4 @@
+declare const addressService: {
+    retrieveAddressFormat: (countryCode: string) => Promise<any>;
+};
+export { addressService };

package/build/api/address.js

@@ -0,0 +1,12 @@
+import { httpClient } from './axios';
+import { ENDPOINT_PATHS } from '../constants';
+var retrieveAddressFormat = function (countryCode) {
+    return httpClient({
+        method: 'get',
+        url: "".concat(ENDPOINT_PATHS.ADDRESS_PATH, "/").concat(countryCode)
+    });
+};
+var addressService = {
+    retrieveAddressFormat: retrieveAddressFormat
+};
+export { addressService };

package/build/api/entity.d.ts

@@ -71,6 +71,7 @@ export declare type UpdateEntityBody = {
         id: string;
         action: string;
     }>;
+    billing_address?: Record<string, string>;
     legal_name?: {
         ar?: string;
         en?: string;

package/build/api/index.d.ts

@@ -141,6 +141,9 @@ declare const API: {
         addFilesToExistingDocument: ({ id, ...data }: DocumentBody) => Promise<any>;
         removeFilesFromDocument: ({ id, ...data }: DocumentBody) => Promise<import("axios").AxiosResponse<any, any>>;
     };
+    addressService: {
+        retrieveAddressFormat: (countryCode: string) => Promise<any>;
+    };
 };
 export type { ValidateOperatorBody, CreateAuthBody, ExpressCreateAccountBody, VerifyAuthBody, CreateLeadBody, UpdateLeadBody, LeadVerifyBody, LeadOTPVerifyBody, CheckEmailBody, CheckBrandBody, LeadIdentityUpdateBody, EntityInfoBody, CreateAccountBody, EntityBankUpdateBody, CreatePasswordBody, BrandListBody, VerifyOperationAuthBody, ResetPasswordVerifyAuthBody, UpdateBoardBody, UpdateBrandBody, DataElementBody, UploadFileBody, UpdateEntityBody, DocumentUpdateBody, DocumentInfo, VerifyAuthExpressOTPBody, UpdateIndividualBody, UpdateEntityActivityBody, UpdateEntityCapitalBody, BankDocumentInfo, GetUserListBody, GetIndividualListBody, RequestEmailBody, DocumentBody, UpdateEntityAOAFileBody };
 export { setAxiosGlobalHeaders, removeAxiosGlobalHeaders, axiosInstance, getAxiosHeaders };

package/build/api/index.js

@@ -15,6 +15,7 @@ import { userService } from './user';
 import { brandService } from './brand';
 import { fileService } from './file';
 import { documentService } from './document';
+import { addressService } from './address';
 var API = {
     locationService: locationService,
     operatorService: operatorService,
@@ -31,7 +32,8 @@ var API = {
     userService: userService,
     brandService: brandService,
     fileService: fileService,
-    documentService: documentService
+    documentService: documentService,
+    addressService: addressService
 };
 export { setAxiosGlobalHeaders, removeAxiosGlobalHeaders, axiosInstance, getAxiosHeaders };
 export default API;

package/build/app/settings.js

@@ -47,13 +47,13 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 var _a;
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
-import { getStoredData, storeData, isArray, findItem, getBrowserInfo, getFingerPrint, sortCountries, findCountryByIso2, getRequestHeaders, encryptString, dangerousMessage } from '../utils';
+import { getStoredData, storeData, isArray, findItem, getBrowserInfo, getFingerPrint, sortCountries, findCountryByIso2, getRequestHeaders, encryptString, dangerousMessage, isKW, isSA } from '../utils';
 import { DefaultDeviceInfo, LOCAL_STORAGE_KEYS } from '../constants';
 import i18n from '../i18n';
 import { updateLocale } from '../utils/locale';
 import API, { setAxiosGlobalHeaders } from '../api';
 export var fetchAppSettingsSync = createAsyncThunk('fetchAppSettingsSync', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var settings, _a, appConfig, language, _b, client, device, os, disableCountries, disableLocale, maturity, _c, visitorId, _d, ip, latitude, longitude, locale, list, operatorData, deviceInfo, operatorStatus, isValidOperator, countries, businessCountry;
+    var settings, _a, appConfig, language, _b, client, device, os, disableCountries, disableLocale, maturity, _c, visitorId, _d, ip, latitude, longitude, locale, list, operatorData, deviceInfo, operatorStatus, isValidOperator, countries, countryCode, isKWOrSA, businessCountry;
     return __generator(this, function (_e) {
         switch (_e.label) {
             case 0:
@@ -113,7 +113,11 @@ export var fetchAppSettingsSync = createAsyncThunk('fetchAppSettingsSync', funct
                 operatorStatus = _e.sent();
                 isValidOperator = operatorStatus === 'valid';
                 countries = sortCountries(list);
-                businessCountry = findCountryByIso2(countries, appConfig.businessCountryCode);
+                countryCode = appConfig.businessCountryCode;
+                isKWOrSA = isKW(countryCode) || isSA(countryCode);
+                if (!isKWOrSA)
+                    countryCode = 'SA';
+                businessCountry = findCountryByIso2(countries, countryCode);
                 if (!businessCountry)
                     throw new Error('Business country not found, you have to pass a valid business country code in the lib config');
                 return [2, { countries: countries, businessCountry: businessCountry, locale: locale, deviceInfo: deviceInfo, isValidOperator: isValidOperator }];

package/build/assets/locales/ar.json

@@ -391,6 +391,7 @@
     "try_again": "حاول مرة أخرى",
     "file_delete_error": "حدث خطأ ما في حذف الملف. حاول مرة اخرى",
     "file_download_error": "حدث خطأ ما في تحميل الملف. حاول مرة اخرى",
+    "is_required": " مطلوب",
     "title_brand_logo": "لوجو العلامة التجارية",
     "description_brand_logo": "JPG or PNG files up to 4mb."
 }

package/build/assets/locales/en.json

@@ -421,6 +421,7 @@
     "try_again": "Try again",
     "file_delete_error": "Something went wrong with deleting file. Please try again",
     "file_download_error": "Something went wrong with downloading file. Please try again",
+    "is_required": " is required",
     "title_brand_logo": "Brand Logo",
     "description_brand_logo": "JPG or PNG files up to 4mb."
 }

package/build/constants/app.js

@@ -465,27 +465,33 @@ export var ENTITY_SCREENS_NAVIGATION = [
     },
     {
         name: 'ENTITY_CAPITAL_STEP',
-        next: 'ENTITY_DETAILS_SUCCESS_STEP',
+        next: 'ENTITY_ADDRESS_STEP',
         prev: 'ENTITY_NAME_STEP',
         order: 3
     },
+    {
+        name: 'ENTITY_ADDRESS_STEP',
+        next: 'ENTITY_DETAILS_SUCCESS_STEP',
+        prev: 'ENTITY_CAPITAL_STEP',
+        order: 4
+    },
     {
         name: 'ENTITY_DETAILS_SUCCESS_STEP',
         next: 'ENTITY_SUCCESS_FOUR_FLOWS_BUTTONS_STEP',
         prev: 'ENTITY_CAPITAL_STEP',
-        order: 4
+        order: 5
     },
     {
         name: 'ENTITY_SUCCESS_FOUR_FLOWS_BUTTONS_STEP',
         next: 'ENTITY_RESET_PASSWORD_SUCCESS',
         prev: '',
-        order: 5
+        order: 6
     },
     {
         name: 'ENTITY_RESET_PASSWORD_SUCCESS',
         next: '',
         prev: '',
-        order: 5
+        order: 7
     }
 ];
 export var BRAND_SCREENS_NAVIGATION = [

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

@@ -156,19 +156,20 @@ export var resendOTPMobile = createAsyncThunk('resendOTPMobile', function (param
     });
 }); });
 export var resendOTPNID = createAsyncThunk('resendOTPNID', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connect, _b, nid, dob, type, requestBody, data;
+    var _a, settings, connect, _b, nid, dob, identification_id_type, requestBody, data;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, connect = _a.connect;
-                _b = connect.data.nidData, nid = _b.nid, dob = _b.dob, type = _b.type;
+                _b = connect.data.nidData, nid = _b.nid, dob = _b.dob;
+                identification_id_type = nid.startsWith('1') ? IDENTIFICATION_TYPE.NID : IDENTIFICATION_TYPE.IQAMA;
                 requestBody = {
                     country: settings.data.businessCountry.iso2,
                     scope: settings.data.appConfig.scope,
                     lang: settings.data.language,
                     user_credentail: {
                         identification_id: nid,
-                        identification_id_type: type,
+                        identification_id_type: identification_id_type,
                         date_of_birth: dob,
                         country_code: settings.data.businessCountry.iso2
                     },

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

@@ -1,5 +1,5 @@
 import { RootState } from '../../../app/store';
-import { ActionState, EntityCapitalFormValues, EntityNameFormValues, FlowsTypes, OTPFormValues, ResponseData, SharedState } from '../../../@types';
+import { ActionState, EntityAddressFormValues, EntityCapitalFormValues, EntityNameFormValues, FlowsTypes, OTPFormValues, ResponseData, SharedState } from '../../../@types';
 interface VerifyLeadTokenProps {
     token: string;
     isInternally?: boolean;
@@ -51,7 +51,12 @@ export declare const updateEntityName: import("@reduxjs/toolkit").AsyncThunk<{
 export declare const updateEntityCapital: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
     formData: EntityCapitalFormValues;
+    addressFormat: any;
 }, EntityCapitalFormValues, {}>;
+export declare const updateEntityAddress: import("@reduxjs/toolkit").AsyncThunk<{
+    data: any;
+    formData: EntityAddressFormValues;
+}, EntityAddressFormValues, {}>;
 export declare const updateBoardSuccess: import("@reduxjs/toolkit").AsyncThunk<{
     response: any;
     formData: void;
@@ -64,6 +69,7 @@ export interface EntityData {
     otpData: OTPFormValues & ResponseData;
     entityNameData: EntityNameFormValues & ResponseData;
     entityCapitalData: EntityCapitalFormValues & ResponseData;
+    entityAddressData: EntityAddressFormValues & ResponseData;
     flowName: FlowsTypes;
 }
 export interface EntityState extends SharedState<EntityData> {

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

@@ -330,7 +330,7 @@ export var updateEntityName = createAsyncThunk('entityUpdateEntityName', functio
     });
 }); });
 export var updateEntityCapital = createAsyncThunk('entityUpdateEntityCapital', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, entity, _b, id, data_status, isCapitalPaidNonEditable, isCapitalShareCountNonEditable, isCapitalShareValueNonEditable, isActivitiesNonEditable, hasCapitalShares, isCapitalNonEditable, activities, payload, data;
+    var _a, settings, entity, _b, id, data_status, isCapitalPaidNonEditable, isCapitalShareCountNonEditable, isCapitalShareValueNonEditable, isActivitiesNonEditable, hasCapitalShares, isCapitalNonEditable, activities, payload, data, list, workAddressFormat;
     var _c, _d, _e, _f;
     return __generator(this, function (_g) {
         switch (_g.label) {
@@ -358,8 +358,34 @@ export var updateEntityCapital = createAsyncThunk('entityUpdateEntityCapital', f
                 return [4, API.entityService.updateEntity(payload)];
             case 1:
                 data = _g.sent();
+                return [4, API.addressService.retrieveAddressFormat(settings.data.businessCountry.iso2)];
+            case 2:
+                list = (_g.sent()).list;
+                workAddressFormat = (list || []).find(function (address) { return address.type.code === 'work'; }).format;
                 thunkApi.dispatch(handleNextScreenStep());
                 (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, id);
+                return [2, { data: data, formData: params, addressFormat: workAddressFormat }];
+        }
+    });
+}); });
+export var updateEntityAddress = createAsyncThunk('entityUpdateEntityAddress', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, settings, entity, _b, id, data_status, isAddressEditable, payload, data;
+    var _c, _d, _e;
+    return __generator(this, function (_f) {
+        switch (_f.label) {
+            case 0:
+                _a = thunkApi.getState(), settings = _a.settings, entity = _a.entity;
+                _b = ((_c = entity.data.verify.responseBody) === null || _c === void 0 ? void 0 : _c.entity) || {}, id = _b.id, data_status = _b.data_status;
+                isAddressEditable = true;
+                payload = {
+                    id: id,
+                    billing_address: isAddressEditable ? params.billingAddress : undefined
+                };
+                return [4, API.entityService.updateEntity(payload)];
+            case 1:
+                data = _f.sent();
+                thunkApi.dispatch(handleNextScreenStep());
+                (_e = (_d = settings.data.appConfig).onStepCompleted) === null || _e === void 0 ? void 0 : _e.call(_d, settings.data.activeScreen.name, id);
                 return [2, { data: data, formData: params }];
         }
     });
@@ -423,6 +449,9 @@ var initialState = {
             capitalPaid: '',
             capitalShareCount: '',
             capitalShareValue: ''
+        },
+        entityAddressData: {
+            billingAddress: {}
         }
     }
 };
@@ -470,7 +499,7 @@ export var entitySlice = createSlice({
             state.data.verify.token = token;
             var _f = boardResponse || {}, entity = _f.entity, entityTypes = _f.entityTypes;
             if (entity) {
-                var _g = entity || {}, license = _g.license, type = _g.type, capital = _g.capital, activities = _g.activities, legal_name = _g.legal_name;
+                var _g = entity || {}, license = _g.license, type = _g.type, capital = _g.capital, activities = _g.activities, legal_name = _g.legal_name, billing_address = _g.billing_address, country = _g.country;
                 var legalName = legal_name;
                 var licenseNumber = license === null || license === void 0 ? void 0 : license.number;
                 var unifiedNumber = (_b = license === null || license === void 0 ? void 0 : license.additional_info) === null || _b === void 0 ? void 0 : _b.unified_number;
@@ -509,6 +538,10 @@ export var entitySlice = createSlice({
                     state.data.entityCapitalData.capitalShareCount = shares === null || shares === void 0 ? void 0 : shares.count;
                 if (shares === null || shares === void 0 ? void 0 : shares.value)
                     state.data.entityCapitalData.capitalShareValue = shares === null || shares === void 0 ? void 0 : shares.value;
+                var billingAddress = { country: country };
+                if (billing_address)
+                    billingAddress = __assign(__assign({}, billing_address), { country: (billing_address === null || billing_address === void 0 ? void 0 : billing_address.country) || country });
+                state.data.entityAddressData.billingAddress = billingAddress;
                 state.data.entityNameData.responseBody = __assign(__assign({}, state.data.entityNameData.responseBody), { entity_id: entity === null || entity === void 0 ? void 0 : entity.id });
             }
         })
@@ -551,7 +584,7 @@ export var entitySlice = createSlice({
             state.data.otpData.responseBody = data;
             state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), boardResponse);
             var _f = boardResponse || {}, entity = _f.entity, entityTypes = _f.entityTypes;
-            var _g = entity || {}, license = _g.license, type = _g.type, capital = _g.capital, activities = _g.activities, legal_name = _g.legal_name;
+            var _g = entity || {}, license = _g.license, type = _g.type, capital = _g.capital, activities = _g.activities, legal_name = _g.legal_name, billing_address = _g.billing_address, country = _g.country;
             var legalName = legal_name;
             var licenseNumber = license === null || license === void 0 ? void 0 : license.number;
             var unifiedNumber = (_b = license === null || license === void 0 ? void 0 : license.additional_info) === null || _b === void 0 ? void 0 : _b.unified_number;
@@ -590,6 +623,10 @@ export var entitySlice = createSlice({
                 state.data.entityCapitalData.capitalShareCount = shares === null || shares === void 0 ? void 0 : shares.count;
             if (shares === null || shares === void 0 ? void 0 : shares.value)
                 state.data.entityCapitalData.capitalShareValue = shares === null || shares === void 0 ? void 0 : shares.value;
+            var billingAddress = { country: country };
+            if (billing_address)
+                billingAddress = __assign(__assign({}, billing_address), { country: (billing_address === null || billing_address === void 0 ? void 0 : billing_address.country) || country });
+            state.data.entityAddressData.billingAddress = billingAddress;
             state.data.entityNameData = __assign(__assign({}, state.data.entityNameData), { responseBody: __assign(__assign({}, state.data.entityNameData.responseBody), { entity_id: entity === null || entity === void 0 ? void 0 : entity.id }) });
         })
             .addCase(verifyEntityLeadOTP.rejected, function (state, action) {
@@ -622,13 +659,29 @@ export var entitySlice = createSlice({
             .addCase(updateEntityCapital.fulfilled, function (state, action) {
             state.loading = false;
             state.error = null;
-            var _a = action.payload, data = _a.data, formData = _a.formData;
+            var _a = action.payload, data = _a.data, formData = _a.formData, addressFormat = _a.addressFormat;
             state.data.entityCapitalData = formData;
             state.data.entityCapitalData.responseBody = __assign(__assign({}, state.data.entityCapitalData.responseBody), { data: data });
+            state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { addressFormat: addressFormat });
         })
             .addCase(updateEntityCapital.rejected, function (state, action) {
             state.loading = false;
             state.error = action.error.message;
+        })
+            .addCase(updateEntityAddress.pending, function (state) {
+            state.loading = true;
+            state.error = null;
+        })
+            .addCase(updateEntityAddress.fulfilled, function (state, action) {
+            state.loading = false;
+            state.error = null;
+            var _a = action.payload, data = _a.data, formData = _a.formData;
+            state.data.entityAddressData = __assign(__assign({}, state.data.entityAddressData), formData);
+            state.data.entityAddressData.responseBody = __assign(__assign({}, state.data.entityAddressData.responseBody), { data: data });
+        })
+            .addCase(updateEntityAddress.rejected, function (state, action) {
+            state.loading = false;
+            state.error = action.error.message;
         })
             .addCase(retrieveBoardDetails.pending, function (state) {
             state.error = null;

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

@@ -7,7 +7,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
-import { REGEX_WEBSITE, LINKEDIN_URL, SOCIAL_USERNAME, DIGITS_ONLY, REGEX_ALPHANUMERIC } from '../../../../constants';
+import { REGEX_WEBSITE, DIGITS_ONLY, REGEX_ALPHANUMERIC } from '../../../../constants';
 import * as yup from 'yup';
 var validationSalesChannels = function (channels) {
     if (channels === void 0) { channels = []; }
@@ -42,16 +42,16 @@ var validationSalesChannels = function (channels) {
         if (key === 'website' && value && !value.match(REGEX_WEBSITE)) {
             return 'invalid_url';
         }
-        if (key === 'linkedin' && value && !value.match(LINKEDIN_URL)) {
+        if (key === 'linkedin' && value && !value.trim()) {
             return 'invalid_linkedin_profile_url';
         }
-        if (key === 'facebook' && value && !value.match(SOCIAL_USERNAME)) {
+        if (key === 'facebook' && value && !value.trim()) {
             return 'invalid_facebook_username';
         }
-        if (key === 'instagram' && value && !value.match(SOCIAL_USERNAME)) {
+        if (key === 'instagram' && value && !value.trim()) {
             return 'invalid_instagram_username';
         }
-        if (key === 'twitter' && value && !value.match(SOCIAL_USERNAME)) {
+        if (key === 'twitter' && value && !value.trim()) {
             return 'invalid_twitter_username';
         }
         if (key === 'physical_store' && value && value.length < 3) {

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

@@ -7,7 +7,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
-import { REGEX_WEBSITE, LINKEDIN_URL, SOCIAL_USERNAME, DIGITS_ONLY, REGEX_ALPHANUMERIC } from '../../../../constants';
+import { REGEX_WEBSITE, DIGITS_ONLY, REGEX_ALPHANUMERIC } from '../../../../constants';
 import * as yup from 'yup';
 var validationSalesChannels = function (channels) {
     if (channels === void 0) { channels = []; }
@@ -42,16 +42,16 @@ var validationSalesChannels = function (channels) {
         if (key === 'website' && value && !value.match(REGEX_WEBSITE)) {
             return 'invalid_url';
         }
-        if (key === 'linkedin' && value && !value.match(LINKEDIN_URL)) {
+        if (key === 'linkedin' && value && !value.trim()) {
             return 'invalid_linkedin_profile_url';
         }
-        if (key === 'facebook' && value && !value.match(SOCIAL_USERNAME)) {
+        if (key === 'facebook' && value && !value.trim()) {
             return 'invalid_facebook_username';
         }
-        if (key === 'instagram' && value && !value.match(SOCIAL_USERNAME)) {
+        if (key === 'instagram' && value && !value.trim()) {
             return 'invalid_instagram_username';
         }
-        if (key === 'twitter' && value && !value.match(SOCIAL_USERNAME)) {
+        if (key === 'twitter' && value && !value.trim()) {
             return 'invalid_twitter_username';
         }
         if (key === 'physical_store' && value && value.length < 3) {

package/build/features/entity/screens/EntityAddress/EntityAddress.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="react" />
+export interface EntityAddressProps {
+}
+declare const EntityAddress: ({}: EntityAddressProps) => JSX.Element;
+export default EntityAddress;

package/build/features/entity/screens/EntityAddress/EntityAddress.js

@@ -0,0 +1,42 @@
+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 } from "react/jsx-runtime";
+import { useTranslation } from 'react-i18next';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
+import { entitySelector, updateEntityAddress } from '../../../app/entity/entityStore';
+import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
+import { ScreenContainer } from '../../../shared/Containers';
+import Address from '../../../shared/Address';
+var EntityAddress = function (_a) {
+    var settings = useAppSelector(settingsSelector).data;
+    var _b = useAppSelector(entitySelector), data = _b.data, loading = _b.loading, error = _b.error;
+    var t = useTranslation().t;
+    var dispatch = useAppDispatch();
+    var _c = data.verify.responseBody || {}, addressFormat = _c.addressFormat, entity = _c.entity;
+    var billingAddress = data.entityAddressData.billingAddress;
+    var isNonEditable = false;
+    var countries = settings.countries;
+    var onAddressChange = function (_a, isValid) {
+        var country = _a.country, address = __rest(_a, ["country"]);
+        if (isValid) {
+            var data_1 = {
+                billingAddress: address
+            };
+            dispatch(updateEntityAddress(data_1));
+        }
+    };
+    var onBack = function () {
+        dispatch(handlePrevScreenStep());
+    };
+    return (_jsx(ScreenContainer, { children: _jsx(Address, { defaultValues: billingAddress, countryList: countries, format: addressFormat || [], disableCountry: true, onAddressChange: onAddressChange, isEditable: !isNonEditable, showSubmitButton: true, loading: loading, error: t(error || ''), onBack: function () { return onBack(); } }) }));
+};
+export default EntityAddress;

package/build/features/entity/screens/EntityAddress/index.d.ts

@@ -0,0 +1,2 @@
+import EntityAddress from './EntityAddress';
+export default EntityAddress;

package/build/features/entity/screens/EntityAddress/index.js

@@ -0,0 +1,2 @@
+import EntityAddress from './EntityAddress';
+export default EntityAddress;

package/build/features/entity/screens/EntityCapital/EntityCapital.js

@@ -33,7 +33,7 @@ var FormStyled = styled(Form)(function () { return ({
 }); });
 var EntityCapital = function (_a) {
     var _b = React.useState(false), anchorEl = _b[0], setAnchorEl = _b[1];
-    var _c = useAppSelector(entitySelector), data = _c.data, loading = _c.loading, error = _c.error, uploading = _c.uploading;
+    var _c = useAppSelector(entitySelector), data = _c.data, loading = _c.loading, error = _c.error;
     var isAr = useLanguage().isAr;
     var t = useTranslation().t;
     var dispatch = useAppDispatch();
@@ -71,7 +71,7 @@ var EntityCapital = function (_a) {
     var handleActivitiesOpenClose = function (flag) {
         setAnchorEl(flag);
     };
-    var disabled = !methods.formState.isValid || !!error || uploading;
+    var disabled = !methods.formState.isValid || !!error;
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(ActivityList, { readOnly: readOnly['activities'] || noneEditable['activities'], onListOpen: function () { return handleActivitiesOpenClose(true); }, onListClose: function () { return handleActivitiesOpenClose(false); } }), _jsxs(Collapse, __assign({ in: !anchorEl }, { children: [_jsx(CapitalPaid, { readOnly: readOnly['capitalPaid'] || noneEditable['capital.paid'] }), _jsx(CapitalShareCount, { readOnly: readOnly['capitalShareCount'] || noneEditable['capital.shares.count'] }), _jsx(CapitalShareValue, { readOnly: readOnly['capitalShareValue'] || noneEditable['capital.shares.value'] }), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] }))] })) })) }));
 };
 export default EntityCapital;

package/build/features/featuresScreens.js

@@ -65,6 +65,7 @@ import SignInPasswordPage from './signIn/screens/Password';
 import EntityVerifyPage from './entity/screens/Verify';
 import EntityNamePage from './entity/screens/EntityName';
 import EntityCapitalPage from './entity/screens/EntityCapital';
+import EntityAddressPage from './entity/screens/EntityAddress';
 import EntitySuccessPage from './entity/screens/Success';
 import EntitySuccessWithFlowPage from './entity/screens/SuccessWithFlowButtons';
 import EntityResetPasswordSuccessPage from './entity/screens/ResetPasswordSuccess';
@@ -344,6 +345,10 @@ export var entityFeatureScreens = [
         name: 'ENTITY_CAPITAL_STEP',
         element: EntityCapitalPage
     },
+    {
+        name: 'ENTITY_ADDRESS_STEP',
+        element: EntityAddressPage
+    },
     {
         name: 'ENTITY_DETAILS_SUCCESS_STEP',
         element: EntitySuccessPage

package/build/features/shared/Address/Address.js

@@ -22,7 +22,7 @@ import InputText from './InputText';
 import { Button } from '../Button';
 export default function Address(_a) {
     var format = _a.format, countryList = _a.countryList, onAddressChange = _a.onAddressChange, defaultValues = _a.defaultValues, disableCountry = _a.disableCountry, loading = _a.loading, error = _a.error, onBack = _a.onBack, showSubmitButton = _a.showSubmitButton, isEditable = _a.isEditable;
-    var _b = useForm({ defaultValues: defaultValues, mode: 'onChange' }), watch = _b.watch, control = _b.control, formState = _b.formState, getValues = _b.getValues;
+    var _b = useForm({ defaultValues: defaultValues, mode: 'onChange' }), watch = _b.watch, control = _b.control, formState = _b.formState, getValues = _b.getValues, handleSubmit = _b.handleSubmit;
     var values = getValues();
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
@@ -32,42 +32,49 @@ export default function Address(_a) {
     }, [values, formState.isValid]);
     var countryIso2 = useMemo(function () {
         var _a;
-        var index = countryList.findIndex(function (item) { return item.countryId === watch('country'); });
+        var index = countryList.findIndex(function (item) { return item.iso2 === watch('country'); });
         return (_a = countryList[index]) === null || _a === void 0 ? void 0 : _a.iso2;
     }, [watch('country')]);
-    return (_jsxs(Box, __assign({ component: 'form' }, { children: [format.map(function (item) {
+    var getName = function (item) {
+        return (isAr ? item.name.ar : item.name.en) || '';
+    };
+    var getRequiredValue = function (item) {
+        return "".concat(getName(item), " ").concat(t('is_required'));
+    };
+    var onSubmit = function (values) {
+        console.log(values);
+        onAddressChange(values, formState.isValid);
+    };
+    return (_jsxs(Box, __assign({ component: 'form', onSubmit: handleSubmit(onSubmit) }, { children: [format.map(function (item) {
                 var isCountry = item.code === 'country';
                 var isSelect = item.type === 'select';
                 if (isCountry) {
                     return (_jsx(Controller, { render: function (_a) {
                             var _b;
                             var field = _a.field, fieldState = _a.fieldState;
-                            return (_jsx(CountryListComponent, { label: "address_".concat(item.code, "_label"), placeholder: "address_".concat(item.code, "_placeholder"), list: countryList, onSelect: function (value) {
+                            return (_jsx(CountryListComponent, { label: getName(item), placeholder: getName(item), list: countryList, onSelect: function (value) {
                                     console.log('value', value);
                                     field.onChange(value);
                                 }, value: field.value, error: (_b = fieldState.error) === null || _b === void 0 ? void 0 : _b.message, disabled: isEditable ? !!disableCountry : false, isRequired: item.required }));
                         }, rules: {
-                            required: item.required && "address_".concat(item.code, "_required")
+                            required: item.required && getRequiredValue(item)
                         }, control: control, name: item.code }, item.code));
                 }
                 if (isSelect) {
                     return (_jsx(Controller, { render: function (_a) {
                             var _b;
                             var field = _a.field, fieldState = _a.fieldState;
-                            return (_jsx(InputSelect, { label: "address_".concat(item.code, "_label"), placeholder: "address_".concat(item.code, "_placeholder"), countryIso2: countryIso2, fetchURL: item.retrieve_uri, onSelect: function (value) { return field.onChange(value); }, error: (_b = fieldState.error) === null || _b === void 0 ? void 0 : _b.message, isRequired: item.required, value: field.value || '', disabled: isEditable ? !countryIso2 : false }));
+                            return (_jsx(InputSelect, { label: getName(item), placeholder: getName(item), countryIso2: countryIso2, fetchURL: item.retrieve_uri, onSelect: function (value) { return field.onChange(value); }, error: (_b = fieldState.error) === null || _b === void 0 ? void 0 : _b.message, isRequired: item.required, value: field.value || '', disabled: isEditable ? !countryIso2 : false }));
                         }, rules: {
-                            required: item.required && "address_".concat(item.code, "_required")
+                            required: item.required && getRequiredValue(item)
                         }, control: control, name: item.code }, item.code));
                 }
                 return (_jsx(Controller, { render: function (_a) {
                         var _b;
                         var field = _a.field, fieldState = _a.fieldState;
-                        return (_jsx(InputText, { label: "address_".concat(item.code, "_label"), placeholder: "address_".concat(item.code, "_placeholder"), onChange: function (value) { return field.onChange(value); }, error: (_b = fieldState.error) === null || _b === void 0 ? void 0 : _b.message, isRequired: item.required, disabled: !isEditable, value: field.value || '' }));
+                        return (_jsx(InputText, { label: getName(item), placeholder: getName(item), onChange: function (value) { return field.onChange(value); }, error: (_b = fieldState.error) === null || _b === void 0 ? void 0 : _b.message, isRequired: item.required, disabled: !isEditable, value: field.value || '' }));
                     }, rules: {
-                        required: item.required && "address_".concat(item.code, "_required")
+                        required: item.required && getRequiredValue(item)
                     }, control: control, name: item.code }, item.code));
-            }), _jsx(Collapse, __assign({ in: showSubmitButton }, { children: _jsx(Button, __assign({ onClick: function (e) {
-                        e.preventDefault();
-                        onAddressChange(values, formState.isValid);
-                    }, onBackClicked: function () { return onBack === null || onBack === void 0 ? void 0 : onBack(); }, isAr: isAr, disabled: !formState.isValid, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })));
+            }), _jsx(Collapse, __assign({ in: showSubmitButton }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack === null || onBack === void 0 ? void 0 : onBack(); }, isAr: isAr, disabled: !formState.isValid, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })));
 }

package/build/features/shared/Address/CountryList.js

@@ -72,17 +72,17 @@ function CountryList(_a) {
     };
     var handleValueChange = function (value) {
         setAnchorEl(null);
-        onSelect(value.countryId);
+        onSelect(value.iso2);
     };
     var nameValue = React.useMemo(function () {
-        var item = list.find(function (item) { return item.countryId === value; });
+        var item = list.find(function (item) { return item.iso2 === value; });
         if (!item)
             return '';
         return isAr ? item.name.arabic : item.name.english;
     }, [isAr, list, value]);
     return (_jsxs(Box, { children: [_jsx(LabelContainerStyled, { children: _jsxs(InputLabelStyled, { children: [t(label), " ", isRequired && _jsx(MandatoryStyled, { children: "*" })] }) }), _jsxs(Box, { children: [_jsx(InputStyled, { readOnly: true, value: nameValue, placeholder: placeholder, onClick: handleListOpenClose, endAdornment: !disabled && _jsx(ExpandIcon, { anchorEl: !!anchorEl }) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleListStyled, { searchValuePath: ['name.english', 'name.arabic'], searchKeyPath: 'name.english', list: list, onSelectItem: handleValueChange, renderItem: function (item) {
                                 var _a, _b;
-                                var isChecked = item.countryId === value;
+                                var isChecked = item.iso2 === value;
                                 return (_jsxs(_Fragment, { children: [_jsx(Box, __assign({ display: 'flex' }, { children: _jsx(NameContainer, __assign({ isSelected: isChecked }, { children: isAr ? (_a = item.name) === null || _a === void 0 ? void 0 : _a.arabic : (_b = item.name) === null || _b === void 0 ? void 0 : _b.english })) })), isChecked && _jsx(CheckIconStyled, {})] }));
                             } }) })), _jsx(Collapse, __assign({ in: !!error && !anchorEl, timeout: 400 }, { children: _jsx(Warning, __assign({ warningType: 'hint' }, { children: t(error || '') })) }))] })] }));
 }

package/package.json

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