@tap-payments/auth-jsconnect 2.10.8-beta → 2.10.10-beta

package/build/features/app/connectExpress/connectExpressStore.d.ts

@@ -46,13 +46,16 @@ export declare const createNafathAuth: import("@reduxjs/toolkit").AsyncThunk<{
         termAndConditionChecked?: boolean | undefined;
     };
 }, NIDFormValues, {}>;
+declare type VerifyNafathAsyncParams = verifyPACIAsyncParams & {
+    showLoadingScreenAfterNafathSuccess: () => void;
+};
 export declare const verifyNafathAsync: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
     isNextScreenIsDob?: undefined;
 } | {
     data: any;
     isNextScreenIsDob: boolean;
-}, verifyPACIAsyncParams, {}>;
+}, VerifyNafathAsyncParams, {}>;
 export declare const createCivilIdAuthAsync: import("@reduxjs/toolkit").AsyncThunk<{
     response: any;
     formData: CivilFormValues;

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 || [] }];
             }
         });
     });
@@ -405,6 +400,7 @@ export var verifyNafathAsync = createAsyncThunk('connectExpress/verifyNafathAsyn
                         return [2, { data: data }];
                     }
                 }
+                params.showLoadingScreenAfterNafathSuccess();
                 if (!(isScopeAuthentication && !data.new_user && authDataHasValue)) return [3, 7];
                 return [4, thunkApi.dispatch(retrieveAuthenticationListAsync({ individualId: data.individual_id })).unwrap()];
             case 6:

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/connectExpress/screens/VerifyNafath/VerifyNafath.js

@@ -4,14 +4,16 @@ import { connectExpressSelector, verifyNafathAsync } from '../../../app/connectE
 import NafathVerification from '../../../shared/NafathVerification';
 import { handlePrevScreenStep } from '../../../../app/settings';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
+import GenericPrepareDataLoading from '../GenericPrepareDataLoading';
 var VerifyNafath = function () {
     var _a = React.useState(false), success = _a[0], setSuccess = _a[1];
     var _b = React.useState(false), failed = _b[0], setFailed = _b[1];
     var _c = React.useState(false), isReady = _c[0], setIsReady = _c[1];
+    var _d = React.useState(false), showLoadingScreen = _d[0], setShowLoadingScreen = _d[1];
     var dispatch = useAppDispatch();
     var data = useAppSelector(connectExpressSelector).data;
     var authData = (data.responseData || {}).authData;
-    var _d = authData || {}, expiry = _d.expiry, app_url_android = _d.app_url_android, app_url_ios = _d.app_url_ios, random = _d.random;
+    var _e = authData || {}, expiry = _e.expiry, app_url_android = _e.app_url_android, app_url_ios = _e.app_url_ios, random = _e.random;
     React.useEffect(function () {
         if (authData && !isReady) {
             setIsReady(true);
@@ -20,7 +22,11 @@ var VerifyNafath = function () {
     React.useEffect(function () {
         if (!isReady)
             return;
-        var promise = dispatch(verifyNafathAsync({ onSuccess: function () { return setSuccess(true); }, onFailure: function () { return setFailed(true); } }));
+        var promise = dispatch(verifyNafathAsync({
+            onSuccess: function () { return setSuccess(true); },
+            onFailure: function () { return setFailed(true); },
+            showLoadingScreenAfterNafathSuccess: function () { return setShowLoadingScreen(true); }
+        }));
         return function () {
             promise === null || promise === void 0 ? void 0 : promise.abort();
         };
@@ -30,6 +36,6 @@ var VerifyNafath = function () {
     }, []);
     if (!isReady)
         return null;
-    return (_jsx(NafathVerification, { randomNumber: random, expiryInSeconds: expiry, success: success, failed: failed, urls: { android: app_url_android, ios: app_url_ios }, onFinish: function () { return onBack(); } }));
+    return showLoadingScreen ? (_jsx(GenericPrepareDataLoading, {})) : (_jsx(NafathVerification, { randomNumber: random, expiryInSeconds: expiry, success: success, failed: failed, urls: { android: app_url_android, ios: app_url_ios }, onFinish: function () { return onBack(); } }));
 };
 export default React.memo(VerifyNafath);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tap-payments/auth-jsconnect",
-	"version": "2.10.8-beta",
+	"version": "2.10.10-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": {