@tap-payments/auth-jsconnect 2.10.7-beta → 2.10.9-beta

package/build/constants/app.js

@@ -270,6 +270,17 @@ export var CONNECT_EXPRESS_SCREENS_NAVIGATION = [
         prev: '',
         order: 7
     },
+    {
+        name: 'CONNECT_EXPRESS_GENERIC_PREPARING_DATA_STEP',
+        next: [
+            'CONNECT_EXPRESS_COLLECT_INDIVIDUAL_INFO_STEP',
+            'CONNECT_EXPRESS_COLLECT_DOB_INFO_STEP',
+            'CONNECT_EXPRESS_WAITING_FOR_CREATING_ACCOUNT_STEP',
+            'CONNECT_EXPRESS_AUTHENTICATION_LIST_STEP'
+        ],
+        prev: '',
+        order: 9
+    },
     {
         name: 'CONNECT_EXPRESS_PREPARING_DATA_STEP',
         next: 'CONNECT_EXPRESS_SUCCESS_WITH_FLOW_BUTTONS_STEP',

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

@@ -186,34 +186,29 @@ export var retrieveEntityListAsync = createAsyncThunk('connectExpress/retrieveEn
 export var retrieveAuthenticationListAsync = createAsyncThunk('connectExpress/retrieveAuthenticationListAsync', function (_a) {
     var individualId = _a.individualId;
     return __awaiter(void 0, void 0, void 0, function () {
-        var brandList, entityList, brands, err_1, list, err_2;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var brandList, entityList, _b, brandResponse, entityResponse, err_1;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0:
                     brandList = undefined;
                     entityList = undefined;
-                    _b.label = 1;
+                    _c.label = 1;
                 case 1:
-                    _b.trys.push([1, 3, , 4]);
-                    return [4, API.brandService.getBrandList({ individual_id: individualId })];
+                    _c.trys.push([1, 3, , 4]);
+                    return [4, Promise.all([
+                            API.brandService.getBrandList({ individual_id: individualId }),
+                            API.entityService.getEntityListUsingIndividualId(individualId)
+                        ])];
                 case 2:
-                    brands = (_b.sent()).brands;
-                    brandList = brands;
+                    _b = _c.sent(), brandResponse = _b[0], entityResponse = _b[1];
+                    brandList = brandResponse.brands;
+                    entityList = entityResponse.list;
                     return [3, 4];
                 case 3:
-                    err_1 = _b.sent();
+                    err_1 = _c.sent();
+                    console.error('Error fetching data:', err_1);
                     return [3, 4];
-                case 4:
-                    _b.trys.push([4, 6, , 7]);
-                    return [4, API.entityService.getEntityListUsingIndividualId(individualId)];
-                case 5:
-                    list = (_b.sent()).list;
-                    entityList = list;
-                    return [3, 7];
-                case 6:
-                    err_2 = _b.sent();
-                    return [3, 7];
-                case 7: return [2, { brandList: brandList || [], entityList: entityList || [] }];
+                case 4: return [2, { brandList: brandList || [], entityList: entityList || [] }];
             }
         });
     });
@@ -390,6 +385,7 @@ export var verifyNafathAsync = createAsyncThunk('connectExpress/verifyNafathAsyn
                     return [2, { data: data }];
                 }
                 if (!isSuccess) return [3, 9];
+                thunkApi.dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_GENERIC_PREPARING_DATA_STEP'));
                 authId = (_j = data.auth) === null || _j === void 0 ? void 0 : _j.id;
                 leadId = (_k = data.auth) === null || _k === void 0 ? void 0 : _k.lead_id;
                 thunkApi.dispatch(storeAuthId(authId));

package/build/features/connectExpress/screens/GenericPrepareDataLoading/GenericPrepareDataLoading.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+declare const GenericPrepareDataLoading: () => JSX.Element;
+export default GenericPrepareDataLoading;

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

@@ -0,0 +1,9 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useAppSelector } from '../../../../hooks';
+import DataLoading from '../../../shared/DataLoading';
+import { connectExpressSelector } from '../../../app/connectExpress/connectExpressStore';
+var GenericPrepareDataLoading = function () {
+    var error = useAppSelector(connectExpressSelector).error;
+    return _jsx(DataLoading, { error: error });
+};
+export default GenericPrepareDataLoading;

package/build/features/connectExpress/screens/GenericPrepareDataLoading/index.d.ts

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

package/build/features/connectExpress/screens/GenericPrepareDataLoading/index.js

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

package/build/features/featuresScreens.js

@@ -29,6 +29,7 @@ import ConnectExpressCollectDobScreen from './connectExpress/screens/DOB';
 import ConnectExpressCollectBusinessScreen from './connectExpress/screens/CollectBusinessInfo';
 import ConnectExpressCreateAccountLoaderScreen from './connectExpress/screens/CreateAccountLoader';
 import ConnectExpressPreparingDataLoaderScreen from './connectExpress/screens/PrepareDataLoading';
+import ConnectExpressGenericPreparingDataLoaderScreen from './connectExpress/screens/GenericPrepareDataLoading';
 import ConnectExpressSuccessFlowButtonsScreen from './connectExpress/screens/SuccessWithFlowButtons';
 import ConnectExpressAccountAlreadyCreatedScreen from './connectExpress/screens/AccountAlreadyCreated';
 import ConnectExpressAuthenticationListScreen from './connectExpress/screens/AuthenticationList';
@@ -289,6 +290,10 @@ export var connectExpressFeatureScreens = [
     {
         name: 'COLLECT_MOBILE_OWNERSHIP',
         element: ConnectExpressCollectMobileOwnership
+    },
+    {
+        name: 'CONNECT_EXPRESS_GENERIC_PREPARING_DATA_STEP',
+        element: ConnectExpressGenericPreparingDataLoaderScreen
     }
 ];
 export var authFeatureScreens = [

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

@@ -163,6 +163,7 @@ export default function FlowsButtons(_a) {
     var isAr = useLanguage().isAr;
     var t = useTranslation().t;
     var onRedirect = function (item) {
+        var _a;
         if (!item.href)
             return;
         var name = item.name === FlowsTypes.BANK ? 'Wallet' : capitalize(item.name);
@@ -180,7 +181,7 @@ export default function FlowsButtons(_a) {
             return;
         }
         if (typeof settingsData.appConfig.onBoardButtonClick === 'function') {
-            settingsData.appConfig.onBoardButtonClick({ name: item.name, token: item.token });
+            settingsData.appConfig.onBoardButtonClick({ name: item.name, token: item.token, countryCode: (_a = settingsData.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2 });
             return;
         }
         dispatch(handleOpen(false));

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tap-payments/auth-jsconnect",
-	"version": "2.10.7-beta",
+	"version": "2.10.9-beta",
 	"description": "connect library, auth",
 	"private": false,
 	"main": "build/index.js",
@@ -112,8 +112,7 @@
 	"lint-staged": {
 		"src/**/*.{ts,tsx,json,js,jsx}": [
 			"yarn run prettier:fix",
-			"yarn run lint",
-			"git add ."
+			"yarn run lint"
 		]
 	},
 	"browserslist": {