@tap-payments/auth-jsconnect 2.10.12-beta → 2.10.14-beta

package/build/app/settings.d.ts

@@ -14,6 +14,7 @@ export declare const onCloseComplete: import("@reduxjs/toolkit").AsyncThunk<void
     merchantId: string;
     brandId: string;
     entityId: string;
+    nextScreen?: string | undefined;
 }, {}>;
 export interface SettingsData {
     skin: ThemeMode;

package/build/app/settings.js

@@ -56,7 +56,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 var _a;
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
-import { getStoredData, storeData, isArray, findItem, getBrowserInfo, getFingerPrint, sortCountries, findCountryByIso2, getRequestHeaders, encryptString, dangerousMessage, getParameterByName, setBaseUrl, getUserLanguage } from '../utils';
+import { getStoredData, storeData, isArray, findItem, getBrowserInfo, getFingerPrint, sortCountries, findCountryByIso2, getRequestHeaders, encryptString, dangerousMessage, getParameterByName, setBaseUrl, getUserLanguage, sleep } from '../utils';
 import { BUSINESS_COUNTRIES, DEFAULT_COUNTRY_ISO2, DefaultDeviceInfo, LOCAL_STORAGE_KEYS } from '../constants';
 import i18n from '../i18n';
 import { updateLocale } from '../utils/locale';
@@ -179,7 +179,7 @@ export var fetchAppSettingsSync = createAsyncThunk('fetchAppSettingsSync', funct
     });
 }); });
 export var onCloseComplete = createAsyncThunk('settings/onCloseComplete', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var settings, _a, appConfig, authId, postURL, redirectUrl, bi, merchantId, brandId, entityId, body, data, urlQueryStart, newUrl;
+    var settings, _a, appConfig, authId, postURL, redirectUrl, bi, merchantId, brandId, entityId, nextScreen, body, data, urlQueryStart, newUrl;
     var _b, _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -188,7 +188,7 @@ export var onCloseComplete = createAsyncThunk('settings/onCloseComplete', functi
                 _a = settings.data, appConfig = _a.appConfig, authId = _a.authId;
                 postURL = appConfig.postURL, redirectUrl = appConfig.redirectUrl;
                 bi = settings.data.deviceInfo.browser.browser_id;
-                merchantId = params.merchantId, brandId = params.brandId, entityId = params.entityId;
+                merchantId = params.merchantId, brandId = params.brandId, entityId = params.entityId, nextScreen = params.nextScreen;
                 if (!authId) return [3, 2];
                 body = {
                     post_url: postURL || '',
@@ -203,6 +203,10 @@ export var onCloseComplete = createAsyncThunk('settings/onCloseComplete', functi
             case 1:
                 data = _d.sent();
                 (_c = (_b = settings.data.appConfig).onStepCompleted) === null || _c === void 0 ? void 0 : _c.call(_b, settings.data.activeScreen.name, data);
+                if (nextScreen) {
+                    sleep(100).then(function () { return thunkApi.dispatch(handleCurrentActiveScreen(nextScreen)); });
+                    return [2];
+                }
                 if (settings.data.appConfig.mode === 'popup') {
                     settings.data.appConfig.onFlowCompleted({ auth_id: authId, bi: bi });
                     thunkApi.dispatch(handleOpen(false));

package/build/assets/currencies/SARSymbol.d.ts

@@ -0,0 +1,7 @@
+import * as React from 'react';
+declare type SARSymbolProps = React.SVGProps<SVGSVGElement> & {
+    width?: number;
+    height?: number;
+};
+declare const SARSymbol: ({ height, ...svgProps }: SARSymbolProps) => JSX.Element;
+export default SARSymbol;

package/build/assets/currencies/SARSymbol.js

@@ -0,0 +1,28 @@
+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 } from "react/jsx-runtime";
+var SARSymbol = function (_a) {
+    var _b = _a.height, height = _b === void 0 ? 10 : _b, svgProps = __rest(_a, ["height"]);
+    return (_jsx("span", __assign({ style: { padding: '0 2px' } }, { children: _jsx("svg", __assign({ xmlns: 'http://www.w3.org/2000/svg', height: height, fill: 'currentColor', viewBox: '0 0 1124.14 1256.39' }, svgProps, { children: _jsx("path", { d: 'M699.62 1113.02a460.24 460.24 0 0 0-38.4 143.37l424.51-90.24a460.44 460.44 0 0 0 38.4-143.37l-424.51 90.24zM1085.73 895.8a460.16 460.16 0 0 0 38.4-143.37l-330.68 70.33v-135.2l292.27-62.11a460.16 460.16 0 0 0 38.4-143.37l-330.68 70.27V66.13a466.56 466.56 0 0 0-132.25 110.99v403.35l-132.25 28.11V0A466.4 466.4 0 0 0 396.7 110.99v525.69l-295.92 62.88a460.46 460.46 0 0 0-38.42 143.37l334.33-71.05v170.26l-358.3 76.14a460.16 460.16 0 0 0-38.4 143.37l375.03-79.7a119.13 119.13 0 0 0 73.83-49.24l68.78-101.97v-.02a65.72 65.72 0 0 0 11.3-36.97V743.77l132.25-28.11v270.4l424.53-90.28z' }) })) })));
+};
+export default SARSymbol;

package/build/assets/currencies/index.d.ts

@@ -0,0 +1,2 @@
+import SARSymbol from './SARSymbol';
+export { SARSymbol };

package/build/assets/currencies/index.js

@@ -0,0 +1,2 @@
+import SARSymbol from './SARSymbol';
+export { SARSymbol };

package/build/assets/currencies/utils.d.ts

@@ -0,0 +1,4 @@
+import * as React from 'react';
+declare type CurrencyIconMap = Record<string, React.FC>;
+export declare const CURRENCY_ICON: CurrencyIconMap;
+export {};

package/build/assets/currencies/utils.js

@@ -0,0 +1,4 @@
+import SARSymbol from './SARSymbol';
+export var CURRENCY_ICON = {
+    SA: SARSymbol
+};

package/build/assets/locales/ar.json

@@ -136,12 +136,14 @@
     "cancel": "إلغاء",
     "capital_paid_hint": "00000",
     "capital_paid_label": "رأس المال المدفوع ({{currency}})",
+    "capital_paid_input_label": "رأس المال المدفوع",
     "capital_paid_required": "Please Enter paid amount",
     "capital_share_count_hint": "00000",
     "capital_share_count_label": "عدد اسهم رأس المال",
     "capital_share_count_required": "Please Enter share count",
     "capital_share_value_hint": "00000",
     "capital_share_value_label": "قيمة السهم ({{currency}})",
+    "capital_share_value_input_label": "قيمة السهم",
     "capital_share_value_required": "Please Enter share value",
     "category": "الفئة",
     "category_name": "اسم الفئة",
@@ -280,6 +282,7 @@
     "entity_type_required": "Please select at least one entity type",
     "expected_customers_to_serve": "عدد العملاء شهريا",
     "expected_sales_monthly": "البيع المتوقع في الشهر؟ ({{currency}})",
+    "expected_sale_per_month": "البيع المتوقع في الشهر؟",
     "expected_sales_yearly": "ما هي المبيعات المتوقعة لعملك شهريًا؟",
     "expected_served_monthly": "عدد العملاء شهريا",
     "expiry_date": "تاريخ الإنتهاء",
@@ -483,6 +486,7 @@
     "please_choose_is_authorized": "الرجاء التأكيد إذا كنت أنت المستخدم المصرح له",
     "please_choose_relative_pep": "هل أنت أو أحد أقاربك شخص مكشوف علنًا (PEP)",
     "please_enter_actual_income": "ما هو دخلك الشهري ({{currency}}) ؟ ",
+    "monthly_income": "ما هو دخلك الشهري؟ ",
     "please_enter_employer_name": "يرجى إدخال اسم منشأه العمل الخاص بك",
     "please_try_again_after_few_minutes": "يمكنك محاولة تسجيل الدخول مرة أخرى بعد {{minutes}} دقيقة",
     "powered_by": "بواسطة",
@@ -523,6 +527,7 @@
     "share_count_label": "عدد الأسهم",
     "share_value_hint": "0000",
     "share_value_label": "قيمة السهم ({{currency}})",
+    "share_value_input_label": "قيمة السهم",
     "sign_up": "Sign up",
     "signed_up": "تسجيل الدخول",
     "signin_email_label": "البريد الألكتروني",

package/build/assets/locales/en.json

@@ -135,12 +135,14 @@
     "cancel": "Cancel",
     "capital_paid_hint": "00000",
     "capital_paid_label": "Capital Paid ({{currency}})",
+    "capital_paid_input_label": "Capital Paid",
     "capital_paid_required": "Please Enter paid amount",
     "capital_share_count_hint": "00000",
     "capital_share_count_label": "Capital Share Count",
     "capital_share_count_required": "Please Enter share count",
     "capital_share_value_hint": "00000",
     "capital_share_value_label": "Capital Share Value ({{currency}})",
+    "capital_share_value_input_label": "Capital Share Value",
     "capital_share_value_required": "Please Enter share value",
     "category": "Category",
     "category_name": "Category name",
@@ -288,6 +290,7 @@
     "entity_type_required": "Please select at least one entity type",
     "expected_customers_to_serve": "Customers server per month",
     "expected_sales_monthly": "Expected sale per month? ({{currency}})",
+    "expected_sale_per_month": "Expected sale per month?",
     "expected_sales_yearly": "What is the expected sales for your business per month?",
     "expected_served_monthly": "Customers server per month",
     "expiry_date": "Date of expiry",
@@ -499,6 +502,7 @@
     "please_choose_is_authorized": "Please tell us if you are the authorized user",
     "please_choose_relative_pep": "Are you or one of your relatives a Publicly Exposed Person (PEP)",
     "please_enter_actual_income": "Monthly income ({{currency}})",
+    "monthly_income": "Monthly income",
     "please_enter_employer_name": "Please enter the name of your employer",
     "please_try_again_after_few_minutes": "You can try to login again after {{minutes}} mins",
     "powered_by": "Powered by",
@@ -545,6 +549,7 @@
     "share_count_label": "Share Count",
     "share_value_hint": "0000",
     "share_value_label": "Share Value ({{currency}})",
+    "share_value_input_label": "Share Value",
     "sign_up": "Sign up",
     "signed_up": "Signed up",
     "signin_email_label": "Email address",

package/build/components/TextWithCurrency/TextWithCurrency.d.ts

@@ -0,0 +1,7 @@
+/// <reference types="react" />
+declare type TextWithCurrencyProps = {
+    text: string;
+    countryCode?: string;
+};
+declare const TextWithCurrency: ({ text, countryCode }: TextWithCurrencyProps) => JSX.Element;
+export default TextWithCurrency;

package/build/components/TextWithCurrency/TextWithCurrency.js

@@ -0,0 +1,14 @@
+import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { getCurrencyByCountryIso2 } from '../../utils';
+import { CURRENCY_ICON } from '../../assets/currencies/utils';
+var TextWithCurrency = function (_a) {
+    var text = _a.text, countryCode = _a.countryCode;
+    if (!countryCode)
+        return _jsx(_Fragment, { children: text });
+    var currencyCode = getCurrencyByCountryIso2(countryCode);
+    var CurrencyIcon = CURRENCY_ICON[countryCode];
+    if (CurrencyIcon)
+        return (_jsxs("span", { children: [text, " (", _jsx(CurrencyIcon, {}), ")"] }));
+    return (_jsxs("span", { children: [text, currencyCode ? " (".concat(currencyCode, ")") : ''] }));
+};
+export default TextWithCurrency;

package/build/components/TextWithCurrency/index.d.ts

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

package/build/components/TextWithCurrency/index.js

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

package/build/constants/app.d.ts

@@ -11,6 +11,7 @@ export declare const LOCAL_STORAGE_KEYS: {
     languageMode: string;
 };
 export declare const SCOPE_AUTH = "auth";
+export declare const SCOPE_MERCHANT = "merchant";
 export declare const DEFAULT_COUNTRY_ISO2 = "KW";
 export declare const NAFATH_VERIFICATION_FAILED = "nafath_verification_failed";
 export declare const COLLECT_DOB_INFO_NAFATH = "collect_date_of_birth";

package/build/constants/app.js

@@ -12,6 +12,7 @@ export var LOCAL_STORAGE_KEYS = {
     languageMode: 'languageMode'
 };
 export var SCOPE_AUTH = 'auth';
+export var SCOPE_MERCHANT = 'merchant';
 export var DEFAULT_COUNTRY_ISO2 = 'KW';
 export var NAFATH_VERIFICATION_FAILED = 'nafath_verification_failed';
 export var COLLECT_DOB_INFO_NAFATH = 'collect_date_of_birth';

package/build/features/app/connectExpress/connectExpressStore.js

@@ -59,7 +59,7 @@ import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import { handleNextScreenStep, handleCurrentActiveScreen, handleOpen, handleSetCountryByIso2, onCloseComplete, storeAuthId } from '../../../app/settings';
 import { FlowsTypes, AuthForType, BusinessType, LicenseType, AuthForScreen } from '../../../@types';
 import API from '../../../api';
-import { ADD_NEW_ENTITY, COLLECT_DOB_INFO_NAFATH, CONNECT_EXPRESS_STEP_NAMES, IDENTIFICATION_TYPE, NAFATH_PACI_TIMEOUT_DURATION, NAFATH_VERIFICATION_FAILED, OTHER_CR_LICENSE, OTHER_FL_LICENSE, SCOPE_AUTH } from '../../../constants';
+import { ADD_NEW_ENTITY, COLLECT_DOB_INFO_NAFATH, CONNECT_EXPRESS_STEP_NAMES, IDENTIFICATION_TYPE, NAFATH_PACI_TIMEOUT_DURATION, NAFATH_VERIFICATION_FAILED, OTHER_CR_LICENSE, OTHER_FL_LICENSE, SCOPE_AUTH, SCOPE_MERCHANT } from '../../../constants';
 import { defaultCountry } from '../../../constants';
 import { getIndividualName, capitalizeTheFirstLetterOfEachWord, sleep, findCountryByIddPrefix, concatenateObjectValues, isSA, isKW, isOtherThanKWOrSA, sendCustomEventToGTM, sendCustomDimension, getMetaData, isNetworkError, isTimeoutError } from '../../../utils';
 export var updateBusinessCountryAsync = createAsyncThunk('connectExpress/updateBusinessCountryAsync', function (countryCode, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
@@ -888,10 +888,10 @@ export var checkBrandNameAvailabilityAsync = createAsyncThunk('connectExpress/ch
 export var createAccountAsync = createAsyncThunk('connectExpress/createAccountAsync', function (_a, thunkApi) {
     var isRetry = _a.isRetry;
     return __awaiter(void 0, void 0, void 0, function () {
-        var _b, connectExpress, settings, responseData, _c, postURL, scope, redirectUrl, mode, showBoard, notification, platforms, payment_provider, leadId, authId, bi, leadData, accountData, data, body, data, urlQueryStart;
-        var _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
-        return __generator(this, function (_v) {
-            switch (_v.label) {
+        var _b, connectExpress, settings, responseData, _c, postURL, scope, redirectUrl, mode, showBoard, notification, platforms, payment_provider, leadId, authId, bi, leadData, accountData, data, body, data, data, urlQueryStart;
+        var _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
+        return __generator(this, function (_y) {
+            switch (_y.label) {
                 case 0:
                     _b = thunkApi.getState(), connectExpress = _b.connectExpress, settings = _b.settings;
                     responseData = connectExpress.data.responseData;
@@ -905,12 +905,12 @@ export var createAccountAsync = createAsyncThunk('connectExpress/createAccountAs
                     if (!isRetry) return [3, 2];
                     return [4, thunkApi.dispatch(getLeadByIdAsync(leadId)).unwrap()];
                 case 1:
-                    data = (_v.sent()).data;
+                    data = (_y.sent()).data;
                     if (data === null || data === void 0 ? void 0 : data.board_id) {
                         leadData = data;
                         accountData = data;
                     }
-                    _v.label = 2;
+                    _y.label = 2;
                 case 2:
                     body = {
                         lead_id: leadId,
@@ -922,8 +922,8 @@ export var createAccountAsync = createAsyncThunk('connectExpress/createAccountAs
                     if (!!(leadData === null || leadData === void 0 ? void 0 : leadData.board_id)) return [3, 4];
                     return [4, API.accountService.expressCreateAccount(body)];
                 case 3:
-                    accountData = _v.sent();
-                    _v.label = 4;
+                    accountData = _y.sent();
+                    _y.label = 4;
                 case 4:
                     sendCustomEventToGTM({
                         event: 'Send Event',
@@ -939,22 +939,41 @@ export var createAccountAsync = createAsyncThunk('connectExpress/createAccountAs
                     (_m = (_l = settings.data.appConfig).onCreated) === null || _m === void 0 ? void 0 : _m.call(_l, accountData);
                     (_p = (_o = settings.data.appConfig).onFlowCompleted) === null || _p === void 0 ? void 0 : _p.call(_o, accountData);
                     (_r = (_q = settings.data.appConfig).onStepCompleted) === null || _r === void 0 ? void 0 : _r.call(_q, settings.data.activeScreen.name, accountData);
-                    if (showBoard) {
-                        sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep()); });
-                        return [2, { accountData: accountData }];
-                    }
-                    if (!(scope === SCOPE_AUTH)) return [3, 8];
+                    if (!(scope === SCOPE_MERCHANT)) return [3, 8];
                     if (!!(leadData === null || leadData === void 0 ? void 0 : leadData.board_id)) return [3, 6];
                     return [4, thunkApi.dispatch(getLeadByIdAsync(leadId)).unwrap()];
                 case 5:
-                    data = (_v.sent()).data;
+                    data = (_y.sent()).data;
                     leadData = data;
-                    _v.label = 6;
-                case 6: return [4, thunkApi.dispatch(onCloseComplete({ merchantId: (_s = leadData === null || leadData === void 0 ? void 0 : leadData.merchant) === null || _s === void 0 ? void 0 : _s.id, brandId: (_t = leadData === null || leadData === void 0 ? void 0 : leadData.brand) === null || _t === void 0 ? void 0 : _t.id, entityId: (_u = leadData === null || leadData === void 0 ? void 0 : leadData.entity) === null || _u === void 0 ? void 0 : _u.id }))];
+                    _y.label = 6;
+                case 6:
+                    if (!postURL) return [3, 8];
+                    return [4, thunkApi.dispatch(onCloseComplete({
+                            merchantId: (_s = leadData === null || leadData === void 0 ? void 0 : leadData.merchant) === null || _s === void 0 ? void 0 : _s.id,
+                            brandId: (_t = leadData === null || leadData === void 0 ? void 0 : leadData.brand) === null || _t === void 0 ? void 0 : _t.id,
+                            entityId: (_u = leadData === null || leadData === void 0 ? void 0 : leadData.entity) === null || _u === void 0 ? void 0 : _u.id,
+                            nextScreen: showBoard ? 'CONNECT_EXPRESS_PREPARING_DATA_STEP' : ''
+                        }))];
                 case 7:
-                    _v.sent();
+                    _y.sent();
                     return [2, { accountData: accountData }];
                 case 8:
+                    if (showBoard) {
+                        sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep()); });
+                        return [2, { accountData: accountData }];
+                    }
+                    if (!(scope === SCOPE_AUTH)) return [3, 12];
+                    if (!!(leadData === null || leadData === void 0 ? void 0 : leadData.board_id)) return [3, 10];
+                    return [4, thunkApi.dispatch(getLeadByIdAsync(leadId)).unwrap()];
+                case 9:
+                    data = (_y.sent()).data;
+                    leadData = data;
+                    _y.label = 10;
+                case 10: return [4, thunkApi.dispatch(onCloseComplete({ merchantId: (_v = leadData === null || leadData === void 0 ? void 0 : leadData.merchant) === null || _v === void 0 ? void 0 : _v.id, brandId: (_w = leadData === null || leadData === void 0 ? void 0 : leadData.brand) === null || _w === void 0 ? void 0 : _w.id, entityId: (_x = leadData === null || leadData === void 0 ? void 0 : leadData.entity) === null || _x === void 0 ? void 0 : _x.id }))];
+                case 11:
+                    _y.sent();
+                    return [2, { accountData: accountData }];
+                case 12:
                     if (redirectUrl && mode === 'page') {
                         urlQueryStart = redirectUrl.includes('?') ? '&' : '?';
                         window.open("".concat(redirectUrl).concat(urlQueryStart, "authentication_id=").concat(authId, "&bi=").concat(bi), '_self');

package/build/features/brand/screens/BrandActivities/ExpectedSalesRange.js

@@ -15,7 +15,7 @@ import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import Box from '@mui/material/Box';
 import { styled } from '@mui/material/styles';
-import { getCurrencyByCountryIso2, isExist } from '../../../../utils';
+import { isExist } from '../../../../utils';
 import { useLanguage, useAppSelector, useAppDispatch } from '../../../../hooks';
 import { settingsSelector } from '../../../../app/settings';
 import SimpleList from '../../../../components/SimpleList';
@@ -29,6 +29,7 @@ import { EndAdornmentExpanded } from '../../../shared/EndAdornment';
 import CheckIcon from '../../../shared/CheckIcon';
 import { InputLabelStyled, NameContainer } from './CustomerBase';
 import { MandatoryStyled } from './ActivitiesList';
+import TextWithCurrency from '../../../../components/TextWithCurrency';
 var InputStyled = styled(InputSelect)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -71,7 +72,6 @@ var ExpectedSalesRange = function (_a) {
     var brandActivities = data.brandActivities;
     var expectedSales = (brandActivities.responseBody || {}).expectedSales;
     var expectedSalesRangeValue = expectedSaleControl.field.value;
-    var countryCode = settingsData.businessCountry;
     var handleOpenMainMenu = function (event) {
         if (readOnly)
             return;
@@ -95,9 +95,6 @@ var ExpectedSalesRange = function (_a) {
     var handleCloseSubMenu = function () {
         setSubIndex('');
     };
-    var getCurrency = React.useMemo(function () {
-        return t(getCurrencyByCountryIso2(countryCode.iso2));
-    }, [countryCode.iso2]);
     React.useEffect(function () {
         if ((expectedSales === null || expectedSales === void 0 ? void 0 : expectedSales.length) > 0) {
             setExpectedSalesRangeList(expectedSales);
@@ -126,9 +123,7 @@ var ExpectedSalesRange = function (_a) {
         if (item)
             setSubIndex(item.id);
     }, [anchorEl, expectedSalesRangeValue]);
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, { children: [_jsxs(InputLabelStyled, { children: [t('expected_sales_monthly', {
-                            currency: getCurrency
-                        }), _jsx(MandatoryStyled, { children: "*" })] }), _jsx(InputStyled, { readOnly: readOnly, value: isAr ? (_b = expectedSalesRangeValue === null || expectedSalesRangeValue === void 0 ? void 0 : expectedSalesRangeValue.name.ar) !== null && _b !== void 0 ? _b : '' : (_c = expectedSalesRangeValue === null || expectedSalesRangeValue === void 0 ? void 0 : expectedSalesRangeValue.name.en) !== null && _c !== void 0 ? _c : '', onClick: !!anchorEl ? handleCloseMainMenu : handleOpenMainMenu, placeholder: t('choose_expected_sales'), endAdornment: _jsx(EndAdornmentExpanded, { anchorEl: anchorEl, isVerified: isVerified }) }), _jsxs(Collapse, __assign({ in: !!anchorEl }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _jsx(SimpleListStyled, { sx: { maxHeight: '350px', paddingTop: 0 }, list: expectedSalesRangeList, listItemProps: { sx: { padding: 0 } }, onSelectItem: function (item) {
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, { children: [_jsxs(InputLabelStyled, { children: [_jsx(TextWithCurrency, { text: t('expected_sale_per_month'), countryCode: settingsData.businessCountry.iso2 }), _jsx(MandatoryStyled, { children: "*" })] }), _jsx(InputStyled, { readOnly: readOnly, value: isAr ? (_b = expectedSalesRangeValue === null || expectedSalesRangeValue === void 0 ? void 0 : expectedSalesRangeValue.name.ar) !== null && _b !== void 0 ? _b : '' : (_c = expectedSalesRangeValue === null || expectedSalesRangeValue === void 0 ? void 0 : expectedSalesRangeValue.name.en) !== null && _c !== void 0 ? _c : '', onClick: !!anchorEl ? handleCloseMainMenu : handleOpenMainMenu, placeholder: t('choose_expected_sales'), endAdornment: _jsx(EndAdornmentExpanded, { anchorEl: anchorEl, isVerified: isVerified }) }), _jsxs(Collapse, __assign({ in: !!anchorEl }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _jsx(SimpleListStyled, { sx: { maxHeight: '350px', paddingTop: 0 }, list: expectedSalesRangeList, listItemProps: { sx: { padding: 0 } }, onSelectItem: function (item) {
                                 var isOnlyOneItem = !item.sub || item.sub.length === 1;
                                 if (isOnlyOneItem)
                                     onSelectItem(item);

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

@@ -22,12 +22,13 @@ import Collapse from '../../../../components/Collapse';
 import ExpandIcon from '../../../../components/ExpandIcon';
 import { EndAdornmentExpanded } from '../../../shared/EndAdornment';
 import { businessSelector, clearError } from '../../../app/business/businessStore';
-import { getCurrencyByCountryIso2, isExist } from '../../../../utils';
+import { isExist } from '../../../../utils';
 import { ScreenContainer } from '../../../shared/Containers';
 import Search from '../../../shared/Search';
 import InputSelect from '../../../shared/InputSelect';
 import CheckIcon from '../../../shared/CheckIcon';
 import { InputLabelStyled, NameContainer } from './CustomerLocations';
+import TextWithCurrency from '../../../../components/TextWithCurrency';
 var InputStyled = styled(InputSelect)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -69,7 +70,6 @@ var ExpectedSalesRange = function (_a) {
     var activitiesData = data.activitiesData;
     var expectedSales = (activitiesData.responseBody || {}).expectedSales;
     var expectedSalesRangeValue = expectedSaleControl.field.value;
-    var countryCode = settingsData.businessCountry;
     var handleOpenMainMenu = function (event) {
         if (readOnly)
             return;
@@ -121,12 +121,7 @@ var ExpectedSalesRange = function (_a) {
         if (item)
             setSubIndex(item.id);
     }, [anchorEl, expectedSalesRangeValue]);
-    var getCurrency = React.useMemo(function () {
-        return t(getCurrencyByCountryIso2(countryCode.iso2));
-    }, [countryCode.iso2]);
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, { children: [_jsx(InputLabelStyled, { children: t('expected_sales_monthly', {
-                        currency: getCurrency
-                    }) }), _jsx(InputStyled, { readOnly: readOnly, value: (isAr ? expectedSalesRangeValue === null || expectedSalesRangeValue === void 0 ? void 0 : expectedSalesRangeValue.name.ar : expectedSalesRangeValue === null || expectedSalesRangeValue === void 0 ? void 0 : expectedSalesRangeValue.name.en) || '', onClick: !!anchorEl ? handleCloseMainMenu : handleOpenMainMenu, placeholder: t('choose_expected_sales'), endAdornment: _jsx(EndAdornmentExpanded, { anchorEl: anchorEl, isVerified: isVerified }) }), _jsxs(Collapse, __assign({ in: !!anchorEl }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _jsx(SimpleListStyled, { sx: { maxHeight: '350px', paddingTop: 0 }, list: expectedSalesRangeList, listItemProps: { sx: { padding: 0 } }, onSelectItem: function (item) {
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, { children: [_jsx(InputLabelStyled, { children: _jsx(TextWithCurrency, { text: t('expected_sale_per_month'), countryCode: settingsData.businessCountry.iso2 }) }), _jsx(InputStyled, { readOnly: readOnly, value: (isAr ? expectedSalesRangeValue === null || expectedSalesRangeValue === void 0 ? void 0 : expectedSalesRangeValue.name.ar : expectedSalesRangeValue === null || expectedSalesRangeValue === void 0 ? void 0 : expectedSalesRangeValue.name.en) || '', onClick: !!anchorEl ? handleCloseMainMenu : handleOpenMainMenu, placeholder: t('choose_expected_sales'), endAdornment: _jsx(EndAdornmentExpanded, { anchorEl: anchorEl, isVerified: isVerified }) }), _jsxs(Collapse, __assign({ in: !!anchorEl }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _jsx(SimpleListStyled, { sx: { maxHeight: '350px', paddingTop: 0 }, list: expectedSalesRangeList, listItemProps: { sx: { padding: 0 } }, onSelectItem: function (item) {
                                 var isOnlyOneItem = !item.sub || item.sub.length === 1;
                                 if (isOnlyOneItem)
                                     onSelectItem(item);

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

@@ -15,11 +15,12 @@ import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { settingsSelector } from '../../../../app/settings';
-import { formatNumberAsCurrency, getCurrencyByCountryIso2, removeAllCharsFromNumber } from '../../../../utils';
+import { formatNumberAsCurrency, removeAllCharsFromNumber } from '../../../../utils';
 import { ScreenContainer } from '../../../shared/Containers';
 import Input from '../../../shared/Input';
 import { clearError } from '../../../app/entity/entityStore';
 import { EndAdornment } from '../../../shared/EndAdornment';
+import TextWithCurrency from '../../../../components/TextWithCurrency';
 var CapitalPaid = function (_a) {
     var _b;
     var readOnly = _a.readOnly, isVerified = _a.isVerified;
@@ -34,14 +35,9 @@ var CapitalPaid = function (_a) {
         var value = formatNumberAsCurrency(removeAllCharsFromNumber(target.value));
         capitalPaidControl.field.onChange(value);
     };
-    var getCurrency = React.useMemo(function () {
-        return t(getCurrencyByCountryIso2(settingsData.businessCountry.iso2));
-    }, [settingsData.businessCountry.iso2]);
     var capitalPaidControl = useController({ control: control, name: 'capitalPaid' });
     var capitalPaidValue = capitalPaidControl.field.value;
     var error = (_b = capitalPaidControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
-    return (_jsx(ScreenContainer, __assign({ sx: { mt: 2.5 } }, { children: _jsx(Input, { readOnly: readOnly, label: t('capital_paid_label', {
-                currency: getCurrency
-            }), required: true, onChange: handleChange, value: capitalPaidValue, sx: { '& .MuiInputBase-input': { cursor: 'auto' } }, placeholder: t('capital_paid_hint'), warningType: 'alert', warningMessage: error && t(error), endAdornment: _jsx(EndAdornment, { value: capitalPaidValue, isVerified: isVerified }) }) })));
+    return (_jsx(ScreenContainer, __assign({ sx: { mt: 2.5 } }, { children: _jsx(Input, { readOnly: readOnly, label: _jsx(TextWithCurrency, { text: t('capital_paid_input_label'), countryCode: settingsData.businessCountry.iso2 }), required: true, onChange: handleChange, value: capitalPaidValue, sx: { '& .MuiInputBase-input': { cursor: 'auto' } }, placeholder: t('capital_paid_hint'), warningType: 'alert', warningMessage: error && t(error), endAdornment: _jsx(EndAdornment, { value: capitalPaidValue, isVerified: isVerified }) }) })));
 };
 export default React.memo(CapitalPaid);

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

@@ -13,13 +13,14 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
-import { formatNumberAsCurrency, getCurrencyByCountryIso2, removeAllCharsFromNumber } from '../../../../utils';
+import { formatNumberAsCurrency, removeAllCharsFromNumber } from '../../../../utils';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { settingsSelector } from '../../../../app/settings';
 import { ScreenContainer } from '../../../shared/Containers';
 import Input from '../../../shared/Input';
 import { clearError } from '../../../app/entity/entityStore';
 import { EndAdornment } from '../../../shared/EndAdornment';
+import TextWithCurrency from '../../../../components/TextWithCurrency';
 var CapitalShareValue = function (_a) {
     var _b;
     var readOnly = _a.readOnly, isVerified = _a.isVerified;
@@ -34,14 +35,9 @@ var CapitalShareValue = function (_a) {
         var value = formatNumberAsCurrency(removeAllCharsFromNumber(target.value));
         capitalShareValueControl.field.onChange(value);
     };
-    var getCurrency = React.useMemo(function () {
-        return t(getCurrencyByCountryIso2(settingsData.businessCountry.iso2));
-    }, [settingsData.businessCountry.iso2]);
     var capitalShareValueControl = useController({ control: control, name: 'capitalShareValue' });
     var capitalShareValueValue = capitalShareValueControl.field.value;
     var error = (_b = capitalShareValueControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
-    return (_jsx(ScreenContainer, __assign({ sx: { mt: 2.5 } }, { children: _jsx(Input, { readOnly: readOnly, label: t('capital_share_value_label', {
-                currency: getCurrency
-            }), required: true, onChange: handleChange, value: capitalShareValueValue, sx: { '& .MuiInputBase-input': { cursor: 'auto' } }, placeholder: t('capital_share_value_hint'), warningType: 'alert', warningMessage: error && t(error), endAdornment: _jsx(EndAdornment, { value: capitalShareValueValue, isVerified: isVerified }) }) })));
+    return (_jsx(ScreenContainer, __assign({ sx: { mt: 2.5 } }, { children: _jsx(Input, { readOnly: readOnly, label: _jsx(TextWithCurrency, { text: t('capital_share_value_input_label'), countryCode: settingsData.businessCountry.iso2 }), required: true, onChange: handleChange, value: capitalShareValueValue, sx: { '& .MuiInputBase-input': { cursor: 'auto' } }, placeholder: t('capital_share_value_hint'), warningType: 'alert', warningMessage: error && t(error), endAdornment: _jsx(EndAdornment, { value: capitalShareValueValue, isVerified: isVerified }) }) })));
 };
 export default React.memo(CapitalShareValue);

package/build/features/individual/screens/AdditionalIndividualInfo/MonthlyIncome.js

@@ -16,7 +16,7 @@ import { useController, useFormContext } from 'react-hook-form';
 import Box from '@mui/material/Box';
 import { styled } from '@mui/material/styles';
 import { settingsSelector } from '../../../../app/settings';
-import { getCurrencyByCountryIso2, hasVerifiedValue } from '../../../../utils';
+import { hasVerifiedValue } from '../../../../utils';
 import { useAppDispatch, useAppSelector, useLanguage } from '../../../../hooks';
 import Collapse from '../../../../components/Collapse';
 import Text from '../../../../components/Text';
@@ -26,6 +26,7 @@ import InputSelect from '../../../shared/InputSelect';
 import CheckIcon from '../../../shared/CheckIcon';
 import { ScreenContainer } from '../../../shared/Containers';
 import { EndAdornmentExpanded } from '../../../shared/EndAdornment';
+import TextWithCurrency from '../../../../components/TextWithCurrency';
 var Container = styled(Box)(function () { return ({
     display: 'flex'
 }); });
@@ -45,16 +46,12 @@ var MonthlyIncome = function (props) {
     var settingsData = useAppSelector(settingsSelector).data;
     var monthlyIncomeList = (data.individualData.responseBody || {}).monthlyIncomeList;
     var monthlyIncomeControl = useController({ control: control, name: 'monthlyIncome' });
-    var countryCode = settingsData.businessCountry;
     var user = (data.verify.responseBody || {}).user;
     var isMonthlyIncomeVerified = function (item) {
         if (!(item === null || item === void 0 ? void 0 : item.id))
             return false;
         return hasVerifiedValue(user === null || user === void 0 ? void 0 : user.data_verification, "monthly_income.".concat(item.id));
     };
-    var getCurrency = React.useMemo(function () {
-        return t(getCurrencyByCountryIso2(countryCode.iso2));
-    }, [countryCode.iso2]);
     React.useEffect(function () {
         if ((monthlyIncomeList === null || monthlyIncomeList === void 0 ? void 0 : monthlyIncomeList.length) > 0) {
             setIncomeList(monthlyIncomeList);
@@ -83,9 +80,7 @@ var MonthlyIncome = function (props) {
     };
     var income = monthlyIncomeControl.field.value;
     var error = (_a = monthlyIncomeControl.fieldState.error) === null || _a === void 0 ? void 0 : _a.message;
-    return (_jsx(Collapse, __assign({ in: props.show }, { children: _jsxs(ScreenContainer, __assign({ sx: { pb: 0 } }, { children: [_jsx(InputSelect, { label: t('please_enter_actual_income', {
-                        currency: getCurrency
-                    }), required: true, readOnly: props.readOnly, onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, placeholder: t('choose_any_source_of_income'), value: (isAr ? income === null || income === void 0 ? void 0 : income.range.ar : income === null || income === void 0 ? void 0 : income.range.en) || '', warningMessage: error && t(error), endAdornment: _jsx(EndAdornmentExpanded, { isVerified: isMonthlyIncomeVerified(income), anchorEl: anchorEl }) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'range.en', searchValuePath: ['range.en', 'range.ar'], list: incomeList, onSelectItem: onSelectItem, renderItem: function (item) {
+    return (_jsx(Collapse, __assign({ in: props.show }, { children: _jsxs(ScreenContainer, __assign({ sx: { pb: 0 } }, { children: [_jsx(InputSelect, { label: _jsx(TextWithCurrency, { text: t('monthly_income'), countryCode: settingsData.businessCountry.iso2 }), required: true, readOnly: props.readOnly, onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, placeholder: t('choose_any_source_of_income'), value: (isAr ? income === null || income === void 0 ? void 0 : income.range.ar : income === null || income === void 0 ? void 0 : income.range.en) || '', warningMessage: error && t(error), endAdornment: _jsx(EndAdornmentExpanded, { isVerified: isMonthlyIncomeVerified(income), anchorEl: anchorEl }) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'range.en', searchValuePath: ['range.en', 'range.ar'], list: incomeList, onSelectItem: onSelectItem, renderItem: function (item) {
                             return (_jsxs(_Fragment, { children: [_jsx(Container, { children: _jsx(IncomeText, __assign({ isSelected: item.id === (income === null || income === void 0 ? void 0 : income.id) }, { children: isAr ? item.range.ar : item === null || item === void 0 ? void 0 : item.range.en })) }), item.id === (income === null || income === void 0 ? void 0 : income.id) && _jsx(CheckIcon, { isVerified: isMonthlyIncomeVerified(item) })] }));
                         } }) }))] })) })));
 };

package/build/features/individual/screens/AdditionalIndividualInfo/ShareValue.js

@@ -14,13 +14,14 @@ import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import Collapse from '@mui/material/Collapse';
-import { formatNumberAsCurrency, getCurrencyByCountryIso2, removeAllCharsFromNumber } from '../../../../utils';
+import { formatNumberAsCurrency, removeAllCharsFromNumber } from '../../../../utils';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { settingsSelector } from '../../../../app/settings';
 import { ScreenContainer } from '../../../shared/Containers';
 import Input from '../../../shared/Input';
 import { individualSelector, clearError } from '../../../app/individual/individualStore';
 import { EndAdornment } from '../../../shared/EndAdornment';
+import TextWithCurrency from '../../../../components/TextWithCurrency';
 var ShareValue = function (_a) {
     var _b;
     var show = _a.show, readOnly = _a.readOnly;
@@ -29,7 +30,6 @@ var ShareValue = function (_a) {
     var control = useFormContext().control;
     var bckError = useAppSelector(individualSelector).error;
     var dispatch = useAppDispatch();
-    var countryCode = settingsData.businessCountry;
     var handleChange = function (_a) {
         var target = _a.target;
         if (bckError)
@@ -37,14 +37,9 @@ var ShareValue = function (_a) {
         var value = formatNumberAsCurrency(removeAllCharsFromNumber(target.value));
         shareValueControl.field.onChange(value);
     };
-    var getCurrency = React.useMemo(function () {
-        return t(getCurrencyByCountryIso2(countryCode.iso2));
-    }, [countryCode.iso2]);
     var shareValueControl = useController({ control: control, name: 'shareValue' });
     var shareValue = shareValueControl.field.value;
     var error = (_b = shareValueControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, __assign({ sx: { mt: 2.5 } }, { children: _jsx(Input, { readOnly: readOnly, label: t('share_value_label', {
-                    currency: getCurrency
-                }), onChange: handleChange, value: shareValue, sx: { '& .MuiInputBase-input': { cursor: 'auto' } }, placeholder: t('share_value_hint'), warningType: 'alert', warningMessage: error && t(error), endAdornment: _jsx(EndAdornment, { value: shareValue, error: error }) }) })) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, __assign({ sx: { mt: 2.5 } }, { children: _jsx(Input, { readOnly: readOnly, label: _jsx(TextWithCurrency, { text: t('share_value_input_label'), countryCode: settingsData.businessCountry.iso2 }), onChange: handleChange, value: shareValue, sx: { '& .MuiInputBase-input': { cursor: 'auto' } }, placeholder: t('share_value_hint'), warningType: 'alert', warningMessage: error && t(error), endAdornment: _jsx(EndAdornment, { value: shareValue, error: error }) }) })) })));
 };
 export default React.memo(ShareValue);

package/build/features/shared/Background/LogoBackground.js

@@ -10,7 +10,7 @@ var BoxStyled = styled(Box)(function (_a) {
     return (_b = {
             display: 'flex',
             justifyContent: 'center',
-            paddingTop: theme.spacing(15.75)
+            paddingTop: theme.spacing(10)
         },
         _b[theme.breakpoints.down('sm')] = {
             paddingTop: theme.spacing(11)

package/build/features/shared/Input/Input.d.ts

@@ -20,7 +20,7 @@ export declare const InputStyled: import("@emotion/styled").StyledComponent<Pick
     warningType?: "alert" | "error" | "hint" | undefined;
 } & {} & import("@mui/system").MUIStyledCommonProps<Theme>, {}, {}>;
 export interface CustomInputProps extends InputProps {
-    label?: string;
+    label?: string | JSX.Element;
     required?: boolean;
     labelSx?: SxProps<Theme>;
 }

package/build/utils/string.d.ts

@@ -75,6 +75,6 @@ export declare const getFileType: (type: string) => "" | "image/jpeg" | "image/p
 export declare const isStringHasOneAsterisk: (value: string) => boolean;
 export declare const isOtherLicense: (item?: License) => boolean;
 export declare const formatNumberAsCurrency: (number: string) => string;
-export declare const getCurrencyByCountryIso2: (countryCode: string) => string;
+export declare const getCurrencyByCountryIso2: (countryCode?: string) => string;
 export declare const getMobileNumberLen: (initialLen: number, number: string) => number;
 export declare const getWebsiteLink: (isAr: boolean, countryCode: string, path: string) => string;

package/package.json

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