@tap-payments/auth-jsconnect 2.10.15-development → 2.10.17-development

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

@@ -76,12 +76,13 @@ var EntityList = function (_a) {
     var selectedEntity = selectedEntityControl.field.value;
     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; });
-            var list_1 = __spreadArray(__spreadArray([], filteredEntityList, true), [entityList[entityList.length - 1]], false) || [];
+            var filteredEntityList = entityList.filter(function (entity) { return (brandInfo === null || brandInfo === void 0 ? void 0 : brandInfo.business_id) && entity.business_id === brandInfo.business_id; }) || [];
+            var list_1 = __spreadArray(__spreadArray([], filteredEntityList, true), [entityList[entityList.length - 1]], false);
             setList(list_1);
             if (filteredEntityList.length) {
                 setValue('entityInfo', filteredEntityList[0], { shouldValidate: true });
                 setValue('licenseNumber', '');
+                setValue('unifiedNumber', '');
                 setValue('licenseType', '');
                 setValue('legalName', '');
                 handleAddEntity === null || handleAddEntity === void 0 ? void 0 : handleAddEntity(false);
@@ -125,6 +126,7 @@ var EntityList = function (_a) {
             handleAddEntity === null || handleAddEntity === void 0 ? void 0 : handleAddEntity(true);
         else {
             setValue('licenseNumber', '');
+            setValue('unifiedNumber', '');
             setValue('legalName', '');
             setValue('licenseType', '');
             handleAddEntity === null || handleAddEntity === void 0 ? void 0 : handleAddEntity(false);

package/build/features/business/screens/BusinessType/LicenseList.js

@@ -36,7 +36,7 @@ import { businessSelector, clearError } from '../../../app/business/businessStor
 import Text from '../../../../components/Text';
 import ExpandIcon from '../../../../components/ExpandIcon';
 import Collapse from '../../../../components/Collapse';
-import { isKW, isOtherLicense, isSA } from '../../../../utils';
+import { isKW, isOtherLicense } from '../../../../utils';
 import { OTHER_CR_LICENSE, OTHER_FL_LICENSE } from '../../../../constants';
 import { settingsSelector } from '../../../../app/settings';
 var InputStyled = styled(InputSelect)(function (_a) {
@@ -104,8 +104,6 @@ var LicenseList = function (_a) {
     };
     var getLicenseName = function (item) {
         var _a, _b;
-        if ((item === null || item === void 0 ? void 0 : item.type) === BusinessType.CR && isOtherLicense(item) && isSA(country_code))
-            return t('v1_add_unified_number');
         if ((item === null || item === void 0 ? void 0 : item.type) === BusinessType.FL && !isOtherLicense(item))
             return t('future_work');
         return t((isAr ? (_a = item === null || item === void 0 ? void 0 : item.legal_name) === null || _a === void 0 ? void 0 : _a.ar : (_b = item === null || item === void 0 ? void 0 : item.legal_name) === null || _b === void 0 ? void 0 : _b.en) || '');

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

@@ -75,12 +75,13 @@ var EntityList = function (_a) {
     var selectedEntityControl = useController({ control: control, name: 'entityInfo' });
     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; });
-            var list_1 = __spreadArray(__spreadArray([], filteredEntityList, true), [entityList[entityList.length - 1]], false) || [];
+            var filteredEntityList = entityList.filter(function (entity) { return (brandInfo === null || brandInfo === void 0 ? void 0 : brandInfo.business_id) && entity.business_id === brandInfo.business_id; }) || [];
+            var list_1 = __spreadArray(__spreadArray([], filteredEntityList, true), [entityList[entityList.length - 1]], false);
             setList(list_1);
             if (filteredEntityList.length) {
                 setValue('entityInfo', filteredEntityList[0], { shouldValidate: true });
                 setValue('licenseNumber', '');
+                setValue('unifiedNumber', '');
                 setValue('licenseType', '');
                 setValue('legalName', '');
                 handleAddEntity === null || handleAddEntity === void 0 ? void 0 : handleAddEntity(false);
@@ -124,6 +125,7 @@ var EntityList = function (_a) {
             handleAddEntity === null || handleAddEntity === void 0 ? void 0 : handleAddEntity(true);
         else {
             setValue('licenseNumber', '');
+            setValue('unifiedNumber', '');
             setValue('legalName', '');
             setValue('licenseType', '');
             handleAddEntity === null || handleAddEntity === void 0 ? void 0 : handleAddEntity(false);

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

@@ -110,8 +110,6 @@ var LicenseList = function (_a) {
     };
     var getLicenseName = function (item) {
         var _a, _b;
-        if ((item === null || item === void 0 ? void 0 : item.type) === BusinessType.CR && isOtherLicense(item) && isSACountry)
-            return t('v1_add_unified_number');
         if ((item === null || item === void 0 ? void 0 : item.type) === BusinessType.FL && !isOtherLicense(item))
             return t('future_work');
         return t((isAr ? (_a = item === null || item === void 0 ? void 0 : item.legal_name) === null || _a === void 0 ? void 0 : _a.ar : (_b = item === null || item === void 0 ? void 0 : item.legal_name) === null || _b === void 0 ? void 0 : _b.en) || '');

package/build/features/shared/Button/FlowsButtons.d.ts

@@ -19,6 +19,7 @@ export interface DataProps {
     emailUrl: string;
     brandName?: string;
     isAuthorizedUser?: boolean;
+    terminalStepName?: string;
 }
 export interface EmailProvidersButtonsProps extends ButtonProps {
     buttons: ButtonItemProps[];

package/build/features/shared/Button/FlowsButtons.js

@@ -177,7 +177,7 @@ export default function FlowsButtons(_a) {
         });
         if (flowName === item.name && !isResetPassword(item.name, item.status)) {
             var isOtherThanSAOrKWCountry = !isKWOrSA(settingsData.businessCountry.iso2);
-            dispatch(handleCurrentActiveScreen(getScreenNameBasedOnFlow(item.name, isAuthorizedUser, isOtherThanSAOrKWCountry)));
+            dispatch(handleCurrentActiveScreen(getScreenNameBasedOnFlow(item.name, isAuthorizedUser, isOtherThanSAOrKWCountry, data.terminalStepName)));
             return;
         }
         if (typeof settingsData.appConfig.onBoardButtonClick === 'function') {

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

@@ -19,6 +19,7 @@ interface SuccessFlowButtonsProps {
     onClose?: () => void;
     loading?: boolean;
     status: 'complete' | 'incomplete';
+    terminalStepName?: string;
 }
-declare const _default: React.MemoExoticComponent<({ brand, entity, business, merchant, bank, user, flows, boardInfoId, boardId, flowName, individuals, recipient, onClose, loading, status }: SuccessFlowButtonsProps) => JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ brand, entity, business, merchant, bank, user, flows, boardInfoId, boardId, flowName, individuals, recipient, onClose, loading, status, terminalStepName }: SuccessFlowButtonsProps) => JSX.Element>;
 export default _default;

package/build/features/shared/SuccessFlowButtons/SuccessFlowButtons.js

@@ -45,7 +45,7 @@ var ButtonGroupStyled = styled(Box)(function (_a) {
 });
 var SuccessFlowButtons = function (_a) {
     var _b, _c, _d;
-    var brand = _a.brand, entity = _a.entity, business = _a.business, merchant = _a.merchant, bank = _a.bank, user = _a.user, flows = _a.flows, boardInfoId = _a.boardInfoId, boardId = _a.boardId, flowName = _a.flowName, individuals = _a.individuals, recipient = _a.recipient, onClose = _a.onClose, loading = _a.loading, status = _a.status;
+    var brand = _a.brand, entity = _a.entity, business = _a.business, merchant = _a.merchant, bank = _a.bank, user = _a.user, flows = _a.flows, boardInfoId = _a.boardInfoId, boardId = _a.boardId, flowName = _a.flowName, individuals = _a.individuals, recipient = _a.recipient, onClose = _a.onClose, loading = _a.loading, status = _a.status, terminalStepName = _a.terminalStepName;
     var _e = useState([]), buttons = _e[0], setButtons = _e[1];
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
@@ -127,7 +127,8 @@ var SuccessFlowButtons = function (_a) {
                         email: email || '',
                         emailUrl: url,
                         brandName: shortenBrand(brandName),
-                        isAuthorizedUser: is_authorized
+                        isAuthorizedUser: is_authorized,
+                        terminalStepName: terminalStepName
                     } }) })] }));
 };
 export default memo(SuccessFlowButtons);

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

@@ -14,6 +14,8 @@ 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';
@@ -51,6 +53,6 @@ var NoTerminalDeviceLinked = function () {
         })
             .catch(function () { });
     };
-    return (_jsx(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') })] }) })));
+    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') }))] })));
 };
 export default React.memo(NoTerminalDeviceLinked);

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

@@ -13,19 +13,20 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { memo } from 'react';
 import { settingsSelector } from '../../../../app/settings';
 import { useAppSelector, useAppDispatch } from '../../../../hooks';
-import { SCOPE_AUTH } from '../../../../constants';
+import { CONNECT_FLOWS, SCOPE_AUTH } from '../../../../constants';
 import SuccessFlowButtons from '../../../shared/SuccessFlowButtons';
 import { onCloseCompleteTerminal, terminalSelector } from '../../../app/terminal/terminalStore';
 var SuccessWithFlowButtons = function () {
+    var _a;
     var dispatch = useAppDispatch();
-    var _a = useAppSelector(terminalSelector), data = _a.data, loading = _a.loading;
+    var _b = useAppSelector(terminalSelector), data = _b.data, loading = _b.loading;
     var settingsData = useAppSelector(settingsSelector).data;
     var isScopeAuthentication = settingsData.appConfig.scope === SCOPE_AUTH;
-    var _b = data.responseData || {}, boardFlows = _b.boardFlows, boardData = _b.boardData;
-    var _c = boardData || {}, entity = _c.entity, brand = _c.brand, bank = _c.bank_account, merchant = _c.merchant, user = _c.user, business = _c.business, board_id = _c.board_id, board_info_id = _c.board_info_id, name = _c.name, individuals = _c.individuals, recipient = _c.recipient, board_status = _c.board_status;
+    var _c = data.responseData || {}, boardFlows = _c.boardFlows, boardData = _c.boardData, terminalData = _c.terminalData;
+    var _d = boardData || {}, entity = _d.entity, brand = _d.brand, bank = _d.bank_account, merchant = _d.merchant, user = _d.user, business = _d.business, board_id = _d.board_id, board_info_id = _d.board_info_id, name = _d.name, individuals = _d.individuals, recipient = _d.recipient, board_status = _d.board_status;
     var onClose = function () {
         dispatch(onCloseCompleteTerminal());
     };
-    return (_jsx(SuccessFlowButtons, { flowName: data.flowName, loading: loading, bank: bank, brand: brand, entity: entity, merchant: merchant, user: __assign({ names: { en: name } }, user), business: business, boardId: board_id, boardInfoId: board_info_id, individuals: individuals, flows: boardFlows || [], onClose: isScopeAuthentication ? onClose : undefined, recipient: recipient, status: board_status }));
+    return (_jsx(SuccessFlowButtons, { flowName: data.flowName, loading: loading, bank: bank, brand: brand, entity: entity, merchant: merchant, user: __assign({ names: { en: name } }, user), business: business, boardId: board_id, boardInfoId: board_info_id, individuals: individuals, flows: boardFlows || [], onClose: isScopeAuthentication ? onClose : undefined, recipient: recipient, status: board_status, terminalStepName: ((_a = terminalData === null || terminalData === void 0 ? void 0 : terminalData.terminal_devices) === null || _a === void 0 ? void 0 : _a.length) ? CONNECT_FLOWS.terminal.terminalDeviceList : CONNECT_FLOWS.terminal.noTerminalLinked }));
 };
 export default memo(SuccessWithFlowButtons);

package/build/utils/string.d.ts

@@ -43,7 +43,7 @@ export declare const getRequestHeaders: (deviceInfo: DeviceInfo) => {
 };
 export declare const removeRequestHeaders: () => void;
 export declare const getBaseUrl: () => string;
-export declare const getScreenNameBasedOnFlow: (flow: string, isAuthorizedUser?: boolean, isOtherThanSAOrKWCountry?: boolean) => string;
+export declare const getScreenNameBasedOnFlow: (flow: string, isAuthorizedUser?: boolean, isOtherThanSAOrKWCountry?: boolean, terminalStepName?: string) => string;
 export declare const getEighteenYearsAgo: () => string;
 export declare const isKW: (flag: string) => boolean;
 export declare const isSA: (flag: string) => boolean;

package/build/utils/string.js

@@ -179,7 +179,7 @@ export var getBaseUrl = function () {
     }
     return ENDPOINT_PATHS.PRODUCTION_BASE_URL;
 };
-export var getScreenNameBasedOnFlow = function (flow, isAuthorizedUser, isOtherThanSAOrKWCountry) {
+export var getScreenNameBasedOnFlow = function (flow, isAuthorizedUser, isOtherThanSAOrKWCountry, terminalStepName) {
     if (flow === FlowsTypes.BANK) {
         return 'BANK_BANK_DETAILS_STEP';
     }
@@ -205,7 +205,7 @@ export var getScreenNameBasedOnFlow = function (flow, isAuthorizedUser, isOtherT
         return 'PASSWORD_CREATE_PASSWORD_STEP';
     }
     if (flow === FlowsTypes.TERMINAL) {
-        return CONNECT_FLOWS.terminal.terminalDeviceList;
+        return terminalStepName !== null && terminalStepName !== void 0 ? terminalStepName : CONNECT_FLOWS.terminal.terminalDeviceList;
     }
     return '';
 };

package/package.json

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