@tap-payments/auth-jsconnect 2.11.14-development → 2.11.14-sandbox

package/build/features/connectExpress/screens/AuthenticationList/AuthenticationList.js

@@ -17,7 +17,7 @@ import Collapse from '@mui/material/Collapse';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
-import { deepCopy, isKW, sendCustomEventToGTM } from '../../../../utils';
+import { deepCopy, isKW, isSA, sendCustomEventToGTM } from '../../../../utils';
 import { AuthForType } from '../../../../@types';
 import Form from '../../../../components/Form';
 import { ScreenContainer } from '../../../shared/Containers';
@@ -29,20 +29,20 @@ import BrandList from './BrandList';
 import EntityList from './EntityList';
 import LicenseNumber from './LicenseNumber';
 import EntityLegalName from './EntityLegalName';
-import LicenseType from './EntityLicenseType';
+import EntityLicenseType from './EntityLicenseType';
 var ListType;
 (function (ListType) {
     ListType["BrandList"] = "BrandList";
     ListType["EntityList"] = "EntityList";
 })(ListType || (ListType = {}));
 var AuthenticationList = function (_a) {
-    var _b;
+    var _b, _c;
     var settingsData = useAppSelector(settingsSelector).data;
-    var _c = useAppSelector(connectExpressSelector), data = _c.data, loading = _c.loading, error = _c.error;
-    var _d = data.authenticationData, brandInfo = _d.brandInfo, entityInfo = _d.entityInfo;
-    var _e = React.useState(), listActive = _e[0], setListActive = _e[1];
+    var _d = useAppSelector(connectExpressSelector), data = _d.data, loading = _d.loading, error = _d.error;
+    var _e = data.authenticationData, brandInfo = _e.brandInfo, entityInfo = _e.entityInfo;
+    var _f = React.useState(), listActive = _f[0], setListActive = _f[1];
     var brandList = (((_b = data.responseData) === null || _b === void 0 ? void 0 : _b.authenticationData) || {}).brandList;
-    var _f = React.useState(false), isAddEntity = _f[0], setIsAddEntity = _f[1];
+    var _g = React.useState(false), isAddEntity = _g[0], setIsAddEntity = _g[1];
     var otpData = data.otpData;
     var startWithNID = otpData.authFor === AuthForType.NATIONAL_ID;
     React.useEffect(function () {
@@ -63,6 +63,8 @@ var AuthenticationList = function (_a) {
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
+    var code = (_c = settingsData.businessCountry) === null || _c === void 0 ? void 0 : _c.iso2;
+    var isSACountry = React.useMemo(function () { return isSA(code); }, [code]);
     var onSubmit = function (formData) {
         if (isAddEntity) {
             var licenseNumber = formData.licenseNumber, legalName = formData.legalName, brandInfo_1 = formData.brandInfo, licenseType = formData.licenseType;
@@ -73,7 +75,6 @@ var AuthenticationList = function (_a) {
         dispatch(getMerchantListAsync(deepCopy(formData)));
     };
     var onBack = function () {
-        var _a;
         if (isAddEntity) {
             setIsAddEntity(false);
             methods.setValue('licenseNumber', '');
@@ -82,7 +83,6 @@ var AuthenticationList = function (_a) {
             methods.setValue('entityInfo', undefined, { shouldValidate: true });
             return;
         }
-        var code = (_a = settingsData.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2;
         var screen = startWithNID ? (isKW(code) ? 'CONNECT_EXPRESS_CIVIL_ID_STEP' : 'CONNECT_EXPRESS_NID_STEP') : 'CONNECT_EXPRESS_MOBILE_STEP';
         dispatch(resetAuthenticationScreen());
         dispatch(handlePrevScreenStep(screen));
@@ -99,6 +99,6 @@ var AuthenticationList = function (_a) {
     };
     var isBrandList = listActive === ListType.BrandList;
     var isEntityList = listActive === ListType.EntityList;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandList, { list: brandList || [], show: !isAddEntity && !isEntityList, onListOpen: function () { return handleMenuClick(ListType.BrandList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(EntityList, { countryList: settingsData.countries || [], show: !isBrandList, handleAddEntity: function (flag) { return setIsAddEntity(flag); }, onListOpen: function () { return handleMenuClick(ListType.EntityList); }, onListClose: function () { return handleMenuClick(); } }), _jsxs(Collapse, __assign({ in: isAddEntity && !isBrandList && !isEntityList }, { children: [_jsx(EntityLegalName, {}), _jsx(LicenseType, {}), _jsx(LicenseNumber, {})] })), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, error: t(error || ''), loading: loading }, { children: isAddEntity ? t('create_new_entity') : t('next') })) }))] })) })) }));
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandList, { list: brandList || [], show: !isAddEntity && !isEntityList, onListOpen: function () { return handleMenuClick(ListType.BrandList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(EntityList, { countryList: settingsData.countries || [], show: !isBrandList, handleAddEntity: function (flag) { return setIsAddEntity(flag); }, onListOpen: function () { return handleMenuClick(ListType.EntityList); }, onListClose: function () { return handleMenuClick(); } }), _jsxs(Collapse, __assign({ in: isAddEntity && !isBrandList && !isEntityList }, { children: [_jsx(EntityLegalName, {}), _jsx(EntityLicenseType, { show: isSACountry }), _jsx(LicenseNumber, {})] })), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, error: t(error || ''), loading: loading }, { children: isAddEntity ? t('create_new_entity') : t('next') })) }))] })) })) }));
 };
 export default React.memo(AuthenticationList);

package/build/features/connectExpress/screens/AuthenticationList/EntityLicenseType.d.ts

@@ -27,5 +27,8 @@ export declare const InfoOutlinedIconStyled: import("@emotion/styled").StyledCom
 } & import("@mui/material/OverridableComponent").CommonProps & Omit<Pick<React.SVGProps<SVGSVGElement>, "string" | "name" | "type" | "version" | "fr" | "in" | "className" | "style" | "display" | "overflow" | "visibility" | "order" | "color" | "width" | "height" | "fontFamily" | "fontSize" | "fontStyle" | "fontWeight" | "letterSpacing" | "clipPath" | "cursor" | "direction" | "filter" | "fontSizeAdjust" | "fontStretch" | "fontVariant" | "imageRendering" | "opacity" | "paintOrder" | "pointerEvents" | "rotate" | "scale" | "textRendering" | "transform" | "unicodeBidi" | "wordSpacing" | "writingMode" | "mask" | "offset" | "textDecoration" | "azimuth" | "clip" | "alignmentBaseline" | "baselineShift" | "clipRule" | "colorInterpolation" | "colorRendering" | "dominantBaseline" | "fill" | "fillOpacity" | "fillRule" | "floodColor" | "floodOpacity" | "glyphOrientationVertical" | "lightingColor" | "markerEnd" | "markerMid" | "markerStart" | "shapeRendering" | "stopColor" | "stopOpacity" | "stroke" | "strokeDasharray" | "strokeDashoffset" | "strokeLinecap" | "strokeLinejoin" | "strokeMiterlimit" | "strokeOpacity" | "strokeWidth" | "textAnchor" | "vectorEffect" | "path" | "children" | "key" | "id" | "lang" | "tabIndex" | "role" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "mode" | "end" | "values" | "local" | "x" | "y" | "alphabetic" | "hanging" | "ideographic" | "mathematical" | "origin" | "method" | "operator" | "spacing" | "elevation" | "max" | "href" | "orientation" | "media" | "target" | "min" | "viewBox" | "crossOrigin" | "accentHeight" | "accumulate" | "additive" | "allowReorder" | "amplitude" | "arabicForm" | "ascent" | "attributeName" | "attributeType" | "autoReverse" | "baseFrequency" | "baseProfile" | "bbox" | "begin" | "bias" | "by" | "calcMode" | "capHeight" | "clipPathUnits" | "colorInterpolationFilters" | "colorProfile" | "contentScriptType" | "contentStyleType" | "cx" | "cy" | "d" | "decelerate" | "descent" | "diffuseConstant" | "divisor" | "dur" | "dx" | "dy" | "edgeMode" | "enableBackground" | "exponent" | "externalResourcesRequired" | "filterRes" | "filterUnits" | "focusable" | "format" | "from" | "fx" | "fy" | "g1" | "g2" | "glyphName" | "glyphOrientationHorizontal" | "glyphRef" | "gradientTransform" | "gradientUnits" | "horizAdvX" | "horizOriginX" | "in2" | "intercept" | "k1" | "k2" | "k3" | "k4" | "k" | "kernelMatrix" | "kernelUnitLength" | "kerning" | "keyPoints" | "keySplines" | "keyTimes" | "lengthAdjust" | "limitingConeAngle" | "markerHeight" | "markerUnits" | "markerWidth" | "maskContentUnits" | "maskUnits" | "numOctaves" | "orient" | "overlinePosition" | "overlineThickness" | "panose1" | "pathLength" | "patternContentUnits" | "patternTransform" | "patternUnits" | "points" | "pointsAtX" | "pointsAtY" | "pointsAtZ" | "preserveAlpha" | "preserveAspectRatio" | "primitiveUnits" | "r" | "radius" | "refX" | "refY" | "renderingIntent" | "repeatCount" | "repeatDur" | "requiredExtensions" | "requiredFeatures" | "restart" | "result" | "rx" | "ry" | "seed" | "slope" | "specularConstant" | "specularExponent" | "speed" | "spreadMethod" | "startOffset" | "stdDeviation" | "stemh" | "stemv" | "stitchTiles" | "strikethroughPosition" | "strikethroughThickness" | "surfaceScale" | "systemLanguage" | "tableValues" | "targetX" | "targetY" | "textLength" | "to" | "u1" | "u2" | "underlinePosition" | "underlineThickness" | "unicode" | "unicodeRange" | "unitsPerEm" | "vAlphabetic" | "vertAdvY" | "vertOriginX" | "vertOriginY" | "vHanging" | "vIdeographic" | "viewTarget" | "vMathematical" | "widths" | "x1" | "x2" | "xChannelSelector" | "xHeight" | "xlinkActuate" | "xlinkArcrole" | "xlinkHref" | "xlinkRole" | "xlinkShow" | "xlinkTitle" | "xlinkType" | "xmlBase" | "xmlLang" | "xmlns" | "xmlnsXlink" | "xmlSpace" | "y1" | "y2" | "yChannelSelector" | "z" | "zoomAndPan"> & {
     ref?: ((instance: SVGSVGElement | null) => void) | React.RefObject<SVGSVGElement> | null | undefined;
 }, keyof import("@mui/material/OverridableComponent").CommonProps | "color" | "fontSize" | "shapeRendering" | "children" | "sx" | "htmlColor" | "inheritViewBox" | "titleAccess" | "viewBox"> & import("@mui/system").MUIStyledCommonProps<import("@mui/material/styles").Theme>, {}, {}>;
-declare const Type: () => JSX.Element;
+declare type TypeProps = {
+    show: boolean;
+};
+declare const Type: ({ show }: TypeProps) => JSX.Element;
 export default Type;

package/build/features/connectExpress/screens/AuthenticationList/EntityLicenseType.js

@@ -26,6 +26,7 @@ import Tooltip from '../../../../components/Tooltip';
 import Radio from '../../../../components/Radio';
 import { clearError, connectExpressSelector } from '../../../app/connectExpress/connectExpressStore';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
+import Collapse from '../../../../components/Collapse';
 var LabelTextStyled = styled(Text)(function (_a) {
     var theme = _a.theme;
     return (__assign(__assign({}, theme.typography.caption), { color: alpha(theme.palette.text.primary, 0.6), marginBlockEnd: theme.spacing(0.625) }));
@@ -70,12 +71,13 @@ export var InfoOutlinedIconStyled = styled(InfoOutlinedIcon)(function (_a) {
         display: 'inline-flex'
     });
 });
-var Type = function () {
+var Type = function (_a) {
+    var show = _a.show;
     var t = useTranslation().t;
     var control = useFormContext().control;
     var error = useAppSelector(connectExpressSelector).error;
-    var _a = React.useState(false), isCRHovered = _a[0], setIsCRHovered = _a[1];
-    var _b = React.useState(false), isFLHovered = _b[0], setIsFLHovered = _b[1];
+    var _b = React.useState(false), isCRHovered = _b[0], setIsCRHovered = _b[1];
+    var _c = React.useState(false), isFLHovered = _c[0], setIsFLHovered = _c[1];
     var typeControl = useController({ control: control, name: 'licenseType' });
     var dispatch = useAppDispatch();
     var handleOnChange = function (_a) {
@@ -85,6 +87,6 @@ var Type = function () {
         typeControl.field.onChange(target.value);
     };
     var typeValue = typeControl.field.value;
-    return (_jsxs(ScreenContainer, __assign({ sx: { pb: 1.5, pl: 2.5, pr: 2.5 } }, { children: [_jsxs(LabelTextStyled, { children: [t('signup_business_type_label'), _jsx(Mandatory, {})] }), _jsxs(RadioGroupStyled, __assign({ value: typeValue ? (typeValue === LicenseType.FL ? LicenseType.FL : LicenseType.CR) : false, onChange: handleOnChange }, { children: [_jsx(RadioLabel, { value: LicenseType.FL, label: _jsxs(LabelStyled, { children: [t('homemaker_reg'), _jsx(Tooltip, __assign({ title: t('homemaker_reg_hint'), onMouseOver: function () { return setIsFLHovered(true); }, onMouseLeave: function () { return setIsFLHovered(false); }, onTouchStartCapture: function () { return setIsFLHovered(true); } }, { children: isFLHovered ? _jsx(InfoIconStyled, {}) : _jsx(InfoOutlinedIconStyled, {}) }))] }), control: _jsx(RadioStyled, { color: 'primary', disableFocusRipple: true, disableRipple: true, disableTouchRipple: true, focusRipple: false }) }), _jsx(RadioLabel, { value: LicenseType.CR, sx: { marginInlineEnd: '0px' }, label: _jsxs(LabelStyled, { children: [t('commercial_reg'), _jsx(Tooltip, __assign({ title: t('commercial_reg_hint'), onMouseOver: function () { return setIsCRHovered(true); }, onMouseLeave: function () { return setIsCRHovered(false); }, onTouchStartCapture: function () { return setIsCRHovered(true); } }, { children: isCRHovered ? _jsx(InfoIconStyled, {}) : _jsx(InfoOutlinedIconStyled, {}) }))] }), control: _jsx(RadioStyled, { color: 'primary', disableFocusRipple: true, disableRipple: true, disableTouchRipple: true, focusRipple: false }) })] }))] })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { pb: 1.5, pl: 2.5, pr: 2.5 } }, { children: [_jsxs(LabelTextStyled, { children: [t('signup_business_type_label'), _jsx(Mandatory, {})] }), _jsxs(RadioGroupStyled, __assign({ value: typeValue ? (typeValue === LicenseType.FL ? LicenseType.FL : LicenseType.CR) : false, onChange: handleOnChange }, { children: [_jsx(RadioLabel, { value: LicenseType.FL, label: _jsxs(LabelStyled, { children: [t('homemaker_reg'), _jsx(Tooltip, __assign({ title: t('homemaker_reg_hint'), onMouseOver: function () { return setIsFLHovered(true); }, onMouseLeave: function () { return setIsFLHovered(false); }, onTouchStartCapture: function () { return setIsFLHovered(true); } }, { children: isFLHovered ? _jsx(InfoIconStyled, {}) : _jsx(InfoOutlinedIconStyled, {}) }))] }), control: _jsx(RadioStyled, { color: 'primary', disableFocusRipple: true, disableRipple: true, disableTouchRipple: true, focusRipple: false }) }), _jsx(RadioLabel, { value: LicenseType.CR, sx: { marginInlineEnd: '0px' }, label: _jsxs(LabelStyled, { children: [t('commercial_reg'), _jsx(Tooltip, __assign({ title: t('commercial_reg_hint'), onMouseOver: function () { return setIsCRHovered(true); }, onMouseLeave: function () { return setIsCRHovered(false); }, onTouchStartCapture: function () { return setIsCRHovered(true); } }, { children: isCRHovered ? _jsx(InfoIconStyled, {}) : _jsx(InfoOutlinedIconStyled, {}) }))] }), control: _jsx(RadioStyled, { color: 'primary', disableFocusRipple: true, disableRipple: true, disableTouchRipple: true, focusRipple: false }) })] }))] })) })));
 };
 export default Type;

package/build/features/connectExpress/screens/AuthenticationList/EntityList.js

@@ -43,9 +43,12 @@ import SimpleList from '../../../../components/SimpleList';
 import Text from '../../../../components/Text';
 import ExpandIcon from '../../../../components/ExpandIcon';
 import Collapse from '../../../../components/Collapse';
+import { LicenseType } from '../../../../@types';
 import Icon from '../../../../components/Icon';
 import { connectExpressSelector } from '../../../../features/app/connectExpress/connectExpressStore';
 import { ADD_ENTITY } from '../../../../constants';
+import { isSA } from '../../../../utils';
+import { settingsSelector } from '../../../../app/settings';
 var EntityContainer = styled(Box)(function () { return ({
     display: 'flex',
     alignItems: 'center'
@@ -70,9 +73,11 @@ var EntityList = function (_a) {
     var isAr = useLanguage().isAr;
     var _f = useFormContext(), control = _f.control, watch = _f.watch, setValue = _f.setValue, getValues = _f.getValues;
     var data = useAppSelector(connectExpressSelector).data;
+    var businessCountry = useAppSelector(settingsSelector).data.businessCountry;
     var brandInfo = watch('brandInfo');
     var entityList = ((_c = (_b = data.responseData) === null || _b === void 0 ? void 0 : _b.authenticationData) === null || _c === void 0 ? void 0 : _c.entityList) || [];
     var selectedEntityControl = useController({ control: control, name: 'entityInfo' });
+    var isSACountry = React.useMemo(function () { return isSA(businessCountry === null || businessCountry === void 0 ? void 0 : businessCountry.iso2); }, [businessCountry === null || businessCountry === void 0 ? void 0 : businessCountry.iso2]);
     React.useEffect(function () {
         if (entityList.length > 0) {
             var filteredEntityList = entityList.filter(function (entity) { return (brandInfo === null || brandInfo === void 0 ? void 0 : brandInfo.business_id) && entity.business_id === brandInfo.business_id; }) || [];
@@ -120,8 +125,11 @@ var EntityList = function (_a) {
     };
     var onSelectItem = function (entity) {
         selectedEntityControl.field.onChange(entity);
-        if (entity.id === ADD_ENTITY)
+        if (entity.id === ADD_ENTITY) {
+            if (!isSACountry)
+                setValue('licenseType', LicenseType.CR);
             handleAddEntity === null || handleAddEntity === void 0 ? void 0 : handleAddEntity(true);
+        }
         else {
             setValue('licenseNumber', '');
             setValue('legalName', '');

package/build/features/connectExpress/screens/CollectBusinessInfo/LicenseList.js

@@ -28,9 +28,9 @@ import Box from '@mui/material/Box';
 import { styled } from '@mui/material/styles';
 import { useAppDispatch, useLanguage, useAppSelector } from '../../../../hooks';
 import { BusinessType } from '../../../../@types';
-import { isKW, isOtherLicense, isOtherThanKWOrSA, isSA } from '../../../../utils';
+import { isKW, isOtherLicense, isSA } from '../../../../utils';
 import { settingsSelector } from '../../../../app/settings';
-import { OTHER_CR_LICENSE, OTHER_FL_LICENSE } from '../../../../constants';
+import { OTHER_CR_LICENSE } from '../../../../constants';
 import SimpleList from '../../../../components/SimpleList';
 import Text from '../../../../components/Text';
 import ExpandIcon from '../../../../components/ExpandIcon';
@@ -40,7 +40,6 @@ import InputSelect from '../../../shared/InputSelect';
 import CheckIcon from '../../../shared/CheckIcon';
 import { connectExpressSelector, clearError } from '../../../app/connectExpress/connectExpressStore';
 import LicenseNumber from './LicenseNumber';
-import LicenseType from './LicenseType';
 import UnifiedNumber from './UnifiedNumber';
 var InputStyled = styled(InputSelect)(function (_a) {
     var theme = _a.theme;
@@ -81,7 +80,6 @@ var LicenseList = function (_a) {
         setAnchorEl(null);
         (_a = rest.onListClose) === null || _a === void 0 ? void 0 : _a.call(rest);
     };
-    var isOtherThanKWOrSACountry = React.useMemo(function () { return isOtherThanKWOrSA(country_code); }, [country_code]);
     var isKWCountry = React.useMemo(function () { return isKW(country_code); }, [country_code]);
     var isSACountry = React.useMemo(function () { return isSA(country_code); }, [country_code]);
     React.useEffect(function () {
@@ -97,11 +95,8 @@ var LicenseList = function (_a) {
         }
     }, [licenseList, selectedLicense]);
     React.useEffect(function () {
-        if (!!country_code) {
-            if (isKWCountry) {
-                var license = (selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) === BusinessType.CR ? OTHER_CR_LICENSE : OTHER_FL_LICENSE;
-                setValue('selectedLicense', license, { shouldValidate: true });
-            }
+        if (!!country_code && !isSACountry) {
+            setValue('selectedLicense', OTHER_CR_LICENSE, { shouldValidate: true });
         }
     }, [country_code]);
     var getLicenseNumber = function (item) {
@@ -149,8 +144,8 @@ var LicenseList = function (_a) {
     var isCR = (selected === null || selected === void 0 ? void 0 : selected.type) === BusinessType.CR;
     var isFL = (selected === null || selected === void 0 ? void 0 : selected.type) === BusinessType.FL;
     var flValue = isOtherLicense(selected) ? t(getLicenseName(selected)) : getLicenseNumber(selected);
-    return (_jsxs(ScreenContainer, { children: [_jsxs(Collapse, __assign({ in: isSACountry || isOtherThanKWOrSACountry }, { children: [_jsx(InputStyled, { label: t('choose_any_license'), readOnly: readOnly, onClick: !!anchorEl ? function () { return onCloseLicenseList(); } : onOpenLicenseList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_license_cr'), value: (isCR ? t(getLicenseName(selected)) : flValue) || '' }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'legal_name?.en', list: licenseList || [], onSelectItem: onSelectItem, renderItem: function (item) {
+    return (_jsxs(ScreenContainer, { children: [_jsxs(Collapse, __assign({ in: isSACountry }, { children: [_jsx(InputStyled, { label: t('choose_any_license'), readOnly: readOnly, onClick: !!anchorEl ? function () { return onCloseLicenseList(); } : onOpenLicenseList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_license_cr'), value: (isCR ? t(getLicenseName(selected)) : flValue) || '' }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'legal_name?.en', list: licenseList || [], onSelectItem: onSelectItem, renderItem: function (item) {
                                 return (_jsxs(_Fragment, { children: [_jsx(LicenseContainer, { children: _jsx(LicenseNameText, __assign({ isSelected: getLicenseNumber(item) === getLicenseNumber(selected) }, { children: isOtherLicense(item) ? t(getLicenseName(item)) : getLicenseFullName(item) })) }), getLicenseNumber(item) === getLicenseNumber(selected) && _jsx(CheckIcon, {})] }));
-                            } }) }))] })), _jsx(LicenseType, { show: show && isKWCountry, readOnly: readOnly }), _jsx(LicenseNumber, { show: showLicenseNumber(), readOnly: licenseReadonly }), _jsx(UnifiedNumber, { show: isSACountry && isCR && show, readOnly: licenseReadonly })] }));
+                            } }) }))] })), _jsx(LicenseNumber, { show: showLicenseNumber(), readOnly: licenseReadonly }), _jsx(UnifiedNumber, { show: isSACountry && isCR && show, readOnly: licenseReadonly })] }));
 };
 export default React.memo(LicenseList);

package/build/features/connectExpress/screens/Mobile/Mobile.js

@@ -69,16 +69,16 @@ var OrBoxStyled = styled(Box)(function (_a) {
     });
 });
 var Mobile = function (_a) {
-    var _b, _c;
+    var _b, _c, _d;
     var settingData = useAppSelector(settingsSelector).data;
-    var _d = useAppSelector(connectExpressSelector), data = _d.data, loading = _d.loading, error = _d.error;
-    var _e = React.useState(false), anchor = _e[0], setAnchor = _e[1];
+    var _e = useAppSelector(connectExpressSelector), data = _e.data, loading = _e.loading, error = _e.error;
+    var _f = React.useState(false), anchor = _f[0], setAnchor = _f[1];
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
-    var _f = useCountry(settingData.businessCountry.iso2), isKuwait = _f.isKuwait, isOther = _f.isOther;
+    var _g = useCountry((_b = settingData.businessCountry) === null || _b === void 0 ? void 0 : _b.iso2), isKuwait = _g.isKuwait, isOther = _g.isOther;
     var responseData = data.responseData, isLeadIdPassed = data.isLeadIdPassed;
-    var isLeadIdentityIdAvailable = (_c = (_b = responseData === null || responseData === void 0 ? void 0 : responseData.leadData) === null || _b === void 0 ? void 0 : _b.identification) === null || _c === void 0 ? void 0 : _c.id;
+    var isLeadIdentityIdAvailable = (_d = (_c = responseData === null || responseData === void 0 ? void 0 : responseData.leadData) === null || _c === void 0 ? void 0 : _c.identification) === null || _d === void 0 ? void 0 : _d.id;
     var methods = useForm({
         resolver: yupResolver(PhoneValidationSchema(isLeadIdPassed)),
         defaultValues: data.mobileData,
@@ -95,13 +95,14 @@ var Mobile = function (_a) {
         dispatch(createMobileAuthAsync(deepCopy(formData)));
     };
     var onBack = function () {
+        var _a;
         var screen = isKuwait ? 'CONNECT_EXPRESS_CIVIL_ID_STEP' : 'CONNECT_EXPRESS_NID_STEP';
         var eventAction = isKuwait ? 'PACI Click' : 'Abser Click';
         sendCustomEventToGTM({
             event: 'Send Event',
             event_category: 'User Registration Flow',
             event_action: eventAction,
-            event_label: settingData.businessCountry.iso2
+            event_label: (_a = settingData.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2
         });
         dispatch(handlePrevScreenStep(screen));
     };

package/build/features/featuresScreens.js

@@ -13,6 +13,7 @@ import ConnectOTPScreen from './connect/screens/OTP';
 import ThankYouScreen from './connect/screens/ThankYou';
 import OperatorError from './connect/screens/OperatorError';
 import CollectMobileOwnership from './connect/screens/MobileOwnership';
+import OTPVerifySecurityError from './shared/OTPVerifySecurityError';
 import ConnectExpressBusinessCountry from './connectExpress/screens/BusinessCountry/BusinessCountry';
 import ConnectExpressMobileScreen from './connectExpress/screens/Mobile';
 import ConnectExpressNIDScreen from './connectExpress/screens/NID';
@@ -37,6 +38,7 @@ import ConnectExpressAuthMerchantScreen from './connectExpress/screens/AuthMerch
 import ConnectExpressAuthAccountCreatedLoaderScreen from './connectExpress/screens/AccountCreatedLoader';
 import ConnectExpressOperatorError from './connectExpress/screens/OperatorError';
 import ConnectExpressCollectMobileOwnership from './connectExpress/screens/MobileOwnership';
+import ConnectExpressOTPVerifySecurityError from './shared/OTPVerifySecurityError';
 import AuthBusinessCountry from './auth/screens/BusinessCountry/BusinessCountry';
 import AuthSwitchScreen from './auth/screens/AuthSwitch';
 import AuthMobileScreen from './auth/screens/Mobile';
@@ -58,6 +60,7 @@ import AuthEmailSentScreen from './auth/screens/EmailSent';
 import AuthMigratingDataScreen from './auth/screens/MigratingData';
 import AuthOperatorError from './auth/screens/OperatorError';
 import AuthPasscodeScreen from './auth/screens/Passcode';
+import AuthOTPVerifySecurityError from './shared/OTPVerifySecurityError';
 import CustomersPage from './business/screens/Customers';
 import IDBODPage from './business/screens/IDBOD';
 import BusinessVerifyPage from './business/screens/Verify';
@@ -73,6 +76,7 @@ import BusVerifyPACIScreen from './business/screens/VerifyPACI';
 import BrandVerifyScreen from './business/screens/BrandDetails';
 import BusinessOperatorError from './business/screens/OperatorError';
 import BusinessCollectMobileOwnership from './business/screens/MobileOwnership';
+import BusinessOTPVerifySecurityError from './shared/OTPVerifySecurityError';
 import PasswordVerifyPage from './password/screens/Verify';
 import CreatePasswordPage from './password/screens/CreatePassword';
 import PasswordDataLoadingPage from './password/screens/PrepareDataLoading';
@@ -81,6 +85,7 @@ import SuccessPasswordPage from './password/screens/Success';
 import PasswordSuccessWithFlowPage from './password/screens/SuccessWithFlowButtons';
 import PasswordResetPasswordSuccessPage from './password/screens/ResetPasswordSuccess';
 import PasswordOperatorError from './password/screens/OperatorError';
+import PasswordOTPVerifySecurityError from './shared/OTPVerifySecurityError';
 import IndividualVerifyPage from './individual/screens/Verify';
 import IndividualPhoneInfoPage from './individual/screens/IndividualPhoneInfo';
 import IndividualListPage from './individual/screens/IndividualList';
@@ -91,6 +96,7 @@ import IndividualSuccessWithFlowPage from './individual/screens/SuccessWithFlowB
 import IndividualResetPasswordSuccessPage from './individual/screens/ResetPasswordSuccess';
 import IndividualDataLoadingPage from './individual/screens/PrepareDataLoading';
 import IndividualOperatorError from './individual/screens/OperatorError';
+import IndividualOTPVerifySecurityError from './shared/OTPVerifySecurityError';
 import BankVerifyPage from './bank/screens/Verify';
 import BankDetailsPage from './bank/screens/BankDetails';
 import BankSuccessPage from './bank/screens/Success';
@@ -98,6 +104,7 @@ import BankSuccessWithFlowPage from './bank/screens/SuccessWithFlowButtons';
 import BankResetPasswordSuccessPage from './bank/screens/ResetPasswordSuccess';
 import BankDataLoadingPage from './bank/screens/PrepareDataLoading';
 import BankOperatorError from './bank/screens/OperatorError';
+import BankOTPVerifySecurityError from './shared/OTPVerifySecurityError';
 import TaxVerifyPage from './tax/screens/Verify';
 import TaxDetailsPage from './tax/screens/TaxDetails';
 import TaxSuccessPage from './tax/screens/Success';
@@ -105,6 +112,7 @@ import TaxSuccessWithFlowPage from './tax/screens/SuccessWithFlowButtons';
 import TaxResetPasswordSuccessPage from './tax/screens/ResetPasswordSuccess';
 import TaxDataLoadingPage from './tax/screens/PrepareDataLoading';
 import TaxOperatorError from './tax/screens/OperatorError';
+import TaxOTPVerifySecurityError from './shared/OTPVerifySecurityError';
 import SignInMobilePage from './signIn/screens/Mobile';
 import SignInEmailPage from './signIn/screens/Email';
 import SignInOTPPage from './signIn/screens/OTP';
@@ -118,6 +126,7 @@ import EntitySuccessWithFlowPage from './entity/screens/SuccessWithFlowButtons';
 import EntityResetPasswordSuccessPage from './entity/screens/ResetPasswordSuccess';
 import EntityDataLoadingPage from './entity/screens/PrepareDataLoading';
 import EntityOperatorError from './entity/screens/OperatorError';
+import EntityOTPVerifySecurityError from './shared/OTPVerifySecurityError';
 import BrandVerifyPage from './brand/screens/Verify';
 import BrandInfoPage from './brand/screens/BrandInfo';
 import BrandSegmentPage from './brand/screens/BrandSegmentInfo';
@@ -127,11 +136,13 @@ import BrandSuccessWithFlowPage from './brand/screens/SuccessWithFlowButtons';
 import BrandResetPasswordSuccessPage from './brand/screens/ResetPasswordSuccess';
 import BrandDataLoadingPage from './brand/screens/PrepareDataLoading';
 import BrandOperatorError from './brand/screens/OperatorError';
+import BrandOTPVerifySecurityError from './shared/OTPVerifySecurityError';
 import BoardVerifyPage from './board/screens/Verify';
 import BoardSuccessWithFlowPage from './board/screens/SuccessWithFlowButtons';
 import BoardResetPasswordSuccessPage from './board/screens/ResetPasswordSuccess';
 import BoardDataLoadingPage from './board/screens/PrepareDataLoading';
 import BoardOperatorError from './board/screens/OperatorError';
+import BoardOTPVerifySecurityError from './shared/OTPVerifySecurityError';
 import KycLoadingPage from './kyc/screens/Loading';
 import KycTokenErrorPage from './kyc/screens/TokenError';
 import KycAlreadySubmittedPage from './kyc/screens/AlreadySubmitted';
@@ -154,6 +165,7 @@ import LinkedSuccessPage from './terminal/screens/LinkedSuccess';
 import UnlinkedSuccessPage from './terminal/screens/UnlinkedSuccess';
 import TerminalBoardPage from './terminal/screens/SuccessWithFlowButtons';
 import TerminalResetPasswordSuccessPage from './terminal/screens/ResetPasswordSuccess';
+import TerminalOTPVerifySecurityError from './shared/OTPVerifySecurityError';
 export var connectFeatureScreens = [
     {
         name: 'CONNECT_BUSINESS_COUNTRY_STEP',
@@ -210,6 +222,10 @@ export var connectFeatureScreens = [
     {
         name: 'CONNECT_MOBILE_OWNERSHIP',
         element: CollectMobileOwnership
+    },
+    {
+        name: 'CONNECT_OTP_VERIFY_SECURITY_ERROR_STEP',
+        element: OTPVerifySecurityError
     }
 ];
 export var connectExpressFeatureScreens = [
@@ -308,6 +324,10 @@ export var connectExpressFeatureScreens = [
     {
         name: 'COLLECT_MOBILE_OWNERSHIP',
         element: ConnectExpressCollectMobileOwnership
+    },
+    {
+        name: 'CONNECT_EXPRESS_OTP_VERIFY_SECURITY_ERROR_STEP',
+        element: ConnectExpressOTPVerifySecurityError
     }
 ];
 export var authFeatureScreens = [
@@ -394,6 +414,10 @@ export var authFeatureScreens = [
     {
         name: 'AUTH_OPERATOR_ERROR_STEP',
         element: AuthOperatorError
+    },
+    {
+        name: 'AUTH_OTP_VERIFY_SECURITY_ERROR_STEP',
+        element: AuthOTPVerifySecurityError
     }
 ];
 export var businessFeatureScreens = [
@@ -444,6 +468,10 @@ export var businessFeatureScreens = [
     {
         name: 'BUSINESS_MOBILE_OWNERSHIP',
         element: BusinessCollectMobileOwnership
+    },
+    {
+        name: 'BUSINESS_OTP_VERIFY_SECURITY_ERROR_STEP',
+        element: BusinessOTPVerifySecurityError
     }
 ];
 export var passwordFeatureScreens = [
@@ -475,6 +503,10 @@ export var passwordFeatureScreens = [
     {
         name: 'PASSWORD_OPERATOR_ERROR_STEP',
         element: PasswordOperatorError
+    },
+    {
+        name: 'PASSWORD_OTP_VERIFY_SECURITY_ERROR_STEP',
+        element: PasswordOTPVerifySecurityError
     }
 ];
 export var individualFeatureScreens = [
@@ -514,6 +546,10 @@ export var individualFeatureScreens = [
     {
         name: 'INDIVIDUAL_OPERATOR_ERROR_STEP',
         element: IndividualOperatorError
+    },
+    {
+        name: 'INDIVIDUAL_OTP_VERIFY_SECURITY_ERROR_STEP',
+        element: IndividualOTPVerifySecurityError
     }
 ];
 export var bankFeatureScreens = [
@@ -541,6 +577,10 @@ export var bankFeatureScreens = [
     {
         name: 'BANK_OPERATOR_ERROR_STEP',
         element: BankOperatorError
+    },
+    {
+        name: 'BANK_OTP_VERIFY_SECURITY_ERROR_STEP',
+        element: BankOTPVerifySecurityError
     }
 ];
 export var taxFeatureScreens = [
@@ -568,6 +608,10 @@ export var taxFeatureScreens = [
     {
         name: 'TAX_OPERATOR_ERROR_STEP',
         element: TaxOperatorError
+    },
+    {
+        name: 'TAX_OTP_VERIFY_SECURITY_ERROR_STEP',
+        element: TaxOTPVerifySecurityError
     }
 ];
 export var signInFeatureScreens = [
@@ -621,6 +665,10 @@ export var entityFeatureScreens = [
     {
         name: 'ENTITY_OPERATOR_ERROR_STEP',
         element: EntityOperatorError
+    },
+    {
+        name: 'ENTITY_OTP_VERIFY_SECURITY_ERROR_STEP',
+        element: EntityOTPVerifySecurityError
     }
 ];
 export var brandFeatureScreens = [
@@ -656,6 +704,10 @@ export var brandFeatureScreens = [
     {
         name: 'BRAND_OPERATOR_ERROR_STEP',
         element: BrandOperatorError
+    },
+    {
+        name: 'BRAND_OTP_VERIFY_SECURITY_ERROR_STEP',
+        element: BrandOTPVerifySecurityError
     }
 ];
 export var boardFeatureScreens = [
@@ -678,6 +730,10 @@ export var boardFeatureScreens = [
     {
         name: 'BOARD_OPERATOR_ERROR_STEP',
         element: BoardOperatorError
+    },
+    {
+        name: 'BOARD_OTP_VERIFY_SECURITY_ERROR_STEP',
+        element: BoardOTPVerifySecurityError
     }
 ];
 export var kycFeatureScreens = [
@@ -770,5 +826,9 @@ export var terminalFeatureScreens = [
     {
         name: CONNECT_FLOWS.terminal.resetPassword,
         element: TerminalResetPasswordSuccessPage
+    },
+    {
+        name: CONNECT_FLOWS.terminal.otpVerifySecurityError,
+        element: TerminalOTPVerifySecurityError
     }
 ];

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

@@ -0,0 +1,3 @@
+import * as React from 'react';
+declare const _default: React.MemoExoticComponent<() => JSX.Element>;
+export default _default;

package/build/features/shared/OTPVerifySecurityError/OTPVerifySecurityError.js

@@ -0,0 +1,9 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import * as React from 'react';
+import { useTranslation } from 'react-i18next';
+import GenericError from '../../shared/GenericError';
+var OTPVerifySecurityError = function () {
+    var t = useTranslation().t;
+    return _jsx(GenericError, { error: t('something_went_wrong'), errorTitle: t('oops') });
+};
+export default React.memo(OTPVerifySecurityError);

package/build/features/shared/OTPVerifySecurityError/index.d.ts

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

package/build/features/shared/OTPVerifySecurityError/index.js

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

package/build/features/terminal/screens/NoTerminalDeviceLinked/NoTerminalDeviceLinked.js

@@ -9,32 +9,77 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useAppDispatch, useAppSelector, useLanguage } from '../../../../hooks';
 import { handleNextScreenStep, handlePrevScreenStep } from '../../../../app/settings';
-import Button from '../../../../components/Button';
-import Loader from '../../../../components/Loader';
 import { ICONS_NAMES } from '../../../../constants';
 import { ScreenContainer } from '../../../shared/Containers';
-import { linkNewTerminal, retrieveBoardDetails, retrieveBoardStatus, terminalSelector } from '../../../app/terminal/terminalStore';
+import { retrieveBoardDetails, retrieveBoardStatus, retrievePOSDevices, terminalSelector } from '../../../app/terminal/terminalStore';
 import { DescriptionTypography, DeviceImage, NoTerminalDeviceLinkedContainer, TitleTypography } from './styles';
+import Button from '../../../../features/shared/Button';
 var NoTerminalDeviceLinked = function () {
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
-    var _a = useAppSelector(terminalSelector), loading = _a.loading, data = _a.data;
+    var _a = useAppSelector(terminalSelector), posDevicesLoading = _a.posDevicesLoading, data = _a.data;
     var _b = data.responseData || {}, boardFlows = _b.boardFlows, authData = _b.authData, boardData = _b.boardData;
-    var handleOnClickNewTerminalLink = function () {
-        dispatch(linkNewTerminal())
-            .unwrap()
-            .then(function (_a) {
-            var nextScreen = _a.nextScreen;
-            dispatch(handleNextScreenStep(nextScreen));
-        })
-            .catch(function () { });
-    };
+    var handleOnClickNewTerminalLink = function () { return __awaiter(void 0, void 0, void 0, function () {
+        var err_1;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    _a.trys.push([0, 2, , 3]);
+                    return [4, dispatch(retrievePOSDevices()).unwrap()];
+                case 1:
+                    _a.sent();
+                    dispatch(handleNextScreenStep());
+                    return [3, 3];
+                case 2:
+                    err_1 = _a.sent();
+                    console.log('Error while retrieving pos devices list error', err_1);
+                    return [3, 3];
+                case 3: return [2];
+            }
+        });
+    }); };
     var handleOnBack = function () {
         if ((boardFlows === null || boardFlows === void 0 ? void 0 : boardFlows.length) > 0) {
             dispatch(handlePrevScreenStep());
@@ -53,6 +98,6 @@ var NoTerminalDeviceLinked = function () {
         })
             .catch(function () { });
     };
-    return (_jsxs(ScreenContainer, __assign({ sx: { ml: 2.5, mr: 2.5 }, minHeight: 280, justifyContent: 'space-between' }, { children: [_jsxs(NoTerminalDeviceLinkedContainer, { children: [_jsx(DeviceImage, { src: ICONS_NAMES.terminal_device }), _jsx(TitleTypography, { children: t('terminal_no_terminal_linked') }), _jsx(DescriptionTypography, { children: t('terminal_no_terminal_linked_description') })] }), _jsx(Button, __assign({ sx: { mb: 1.5, mt: 1.5 }, onClick: function () { return handleOnBack(); }, variant: 'text' }, { children: loading ? _jsx(Loader, { innerColor: 'black', outerColor: 'black', size: 15, toggleAnimation: !!loading }) : t('back') }))] })));
+    return (_jsxs(ScreenContainer, __assign({ sx: { ml: 2.5, mr: 2.5 }, minHeight: 280, justifyContent: 'space-between' }, { children: [_jsxs(NoTerminalDeviceLinkedContainer, { children: [_jsx(DeviceImage, { src: ICONS_NAMES.terminal_device }), _jsx(TitleTypography, { children: t('terminal_no_terminal_linked') }), _jsx(DescriptionTypography, { children: t('terminal_no_terminal_linked_description') })] }), _jsx(Button, __assign({ sx: { mt: 0, ml: 0, mr: 0 }, loading: posDevicesLoading, onBackClicked: handleOnBack, onClick: handleOnClickNewTerminalLink, isAr: isAr }, { children: t('terminal_link_terminal') }))] })));
 };
 export default React.memo(NoTerminalDeviceLinked);