@tap-payments/auth-jsconnect 2.8.44-test → 2.8.45-test

package/build/constants/app.js

@@ -202,21 +202,27 @@ export var CONNECT_EXPRESS_SCREENS_NAVIGATION = [
     },
     {
         name: 'CONNECT_EXPRESS_WAITING_FOR_CREATING_ACCOUNT_STEP',
-        next: 'CONNECT_EXPRESS_SUCCESS_WITH_FLOW_BUTTONS_STEP',
+        next: 'CONNECT_EXPRESS_PREPARING_DATA_STEP',
         prev: '',
         order: 7
     },
+    {
+        name: 'CONNECT_EXPRESS_PREPARING_DATA_STEP',
+        next: 'CONNECT_EXPRESS_SUCCESS_WITH_FLOW_BUTTONS_STEP',
+        prev: '',
+        order: 8
+    },
     {
         name: 'CONNECT_EXPRESS_ACCOUNT_ALREADY_CREATED_STEP',
         next: '',
         prev: '',
-        order: 8
+        order: 9
     },
     {
         name: 'CONNECT_EXPRESS_SUCCESS_WITH_FLOW_BUTTONS_STEP',
         next: '',
         prev: '',
-        order: 8
+        order: 9
     }
 ];
 export var AUTH_SCREENS_NAVIGATION = [

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

@@ -278,14 +278,23 @@ export declare const checkBrandNameAvailabilityAsync: import("@reduxjs/toolkit")
     rejectedMeta?: unknown;
 }>;
 export declare const createAccountAsync: import("@reduxjs/toolkit").AsyncThunk<{
+    accountData: any;
+} | undefined, {
+    isRetry: boolean;
+}, {
+    state?: unknown;
+    dispatch?: import("redux").Dispatch<import("redux").AnyAction> | undefined;
+    extra?: unknown;
+    rejectValue?: unknown;
+    serializedErrorType?: unknown;
+    pendingMeta?: unknown;
+    fulfilledMeta?: unknown;
+    rejectedMeta?: unknown;
+}>;
+export declare const retrieveDetailsAfterCreateAccountAsync: import("@reduxjs/toolkit").AsyncThunk<{
     boardInfo: any;
     boardData: any;
-    account: any;
-} | {
-    account: any;
-    boardInfo?: undefined;
-    boardData?: undefined;
-} | undefined, void, {
+}, void, {
     state?: unknown;
     dispatch?: import("redux").Dispatch<import("redux").AnyAction> | undefined;
     extra?: unknown;

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

@@ -870,62 +870,100 @@ export var checkBrandNameAvailabilityAsync = createAsyncThunk('connectExpress/ch
         });
     });
 });
-export var createAccountAsync = createAsyncThunk('connectExpress/createAccountAsync', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, connectExpress, settings, responseData, _b, postURL, scope, redirectUrl, mode, showBoard, platforms, payment_provider, authId, bi, body, data, leadData, board_id, board_info_id, _c, boardInfo, boardData, leadData, urlQueryStart;
-    var _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
-    return __generator(this, function (_w) {
-        switch (_w.label) {
+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, platforms, payment_provider, leadId, authId, bi, leadData, accountData, data, body, 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) {
+                case 0:
+                    _b = thunkApi.getState(), connectExpress = _b.connectExpress, settings = _b.settings;
+                    responseData = connectExpress.data.responseData;
+                    _c = settings.data.appConfig, postURL = _c.postURL, scope = _c.scope, redirectUrl = _c.redirectUrl, mode = _c.mode, showBoard = _c.showBoard;
+                    platforms = (_e = (_d = responseData === null || responseData === void 0 ? void 0 : responseData.leadData) === null || _d === void 0 ? void 0 : _d.platforms) !== null && _e !== void 0 ? _e : settings.data.appConfig.platforms;
+                    payment_provider = (_g = (_f = responseData === null || responseData === void 0 ? void 0 : responseData.leadData) === null || _f === void 0 ? void 0 : _f.payment_provider) !== null && _g !== void 0 ? _g : settings.data.appConfig.paymentProvider;
+                    leadId = (_h = responseData === null || responseData === void 0 ? void 0 : responseData.leadData) === null || _h === void 0 ? void 0 : _h.id;
+                    authId = (_k = (_j = responseData === null || responseData === void 0 ? void 0 : responseData.authData) === null || _j === void 0 ? void 0 : _j.auth) === null || _k === void 0 ? void 0 : _k.id;
+                    bi = settings.data.deviceInfo.browser.browser_id;
+                    accountData = undefined;
+                    if (!isRetry) return [3, 2];
+                    return [4, thunkApi.dispatch(getLeadByIdAsync(leadId)).unwrap()];
+                case 1:
+                    data = (_v.sent()).data;
+                    if (data === null || data === void 0 ? void 0 : data.board_id) {
+                        leadData = data;
+                        accountData = data;
+                    }
+                    _v.label = 2;
+                case 2:
+                    body = {
+                        lead_id: leadId,
+                        post_url: scope === SCOPE_AUTH ? '' : postURL || '',
+                        platforms: platforms,
+                        payment_provider: payment_provider
+                    };
+                    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;
+                case 4:
+                    (_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 (!!(leadData === null || leadData === void 0 ? void 0 : leadData.board_id)) return [3, 6];
+                    return [4, thunkApi.dispatch(getLeadByIdAsync(leadId)).unwrap()];
+                case 5:
+                    leadData = _v.sent();
+                    _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 }))];
+                case 7:
+                    _v.sent();
+                    return [2, { accountData: accountData }];
+                case 8:
+                    if (redirectUrl && mode === 'page') {
+                        urlQueryStart = redirectUrl.includes('?') ? '&' : '?';
+                        window.open("".concat(redirectUrl).concat(urlQueryStart, "authentication_id=").concat(authId, "&bi=").concat(bi), '_self');
+                        return [2, { accountData: accountData }];
+                    }
+                    thunkApi.dispatch(handleOpen(false));
+                    return [2];
+            }
+        });
+    });
+});
+export var retrieveDetailsAfterCreateAccountAsync = createAsyncThunk('connectExpress/retrieveDetailsAfterCreateAccountAsync', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var connectExpress, _a, accountData, leadData, leadResData, data, board_id, board_info_id, _b, boardInfo, boardData;
+    var _c, _d;
+    return __generator(this, function (_e) {
+        switch (_e.label) {
             case 0:
-                _a = thunkApi.getState(), connectExpress = _a.connectExpress, settings = _a.settings;
-                responseData = connectExpress.data.responseData;
-                _b = settings.data.appConfig, postURL = _b.postURL, scope = _b.scope, redirectUrl = _b.redirectUrl, mode = _b.mode, showBoard = _b.showBoard;
-                platforms = (_e = (_d = responseData === null || responseData === void 0 ? void 0 : responseData.leadData) === null || _d === void 0 ? void 0 : _d.platforms) !== null && _e !== void 0 ? _e : settings.data.appConfig.platforms;
-                payment_provider = (_g = (_f = responseData === null || responseData === void 0 ? void 0 : responseData.leadData) === null || _f === void 0 ? void 0 : _f.payment_provider) !== null && _g !== void 0 ? _g : settings.data.appConfig.paymentProvider;
-                authId = (_j = (_h = responseData === null || responseData === void 0 ? void 0 : responseData.authData) === null || _h === void 0 ? void 0 : _h.auth) === null || _j === void 0 ? void 0 : _j.id;
-                bi = settings.data.deviceInfo.browser.browser_id;
-                body = {
-                    lead_id: responseData === null || responseData === void 0 ? void 0 : responseData.leadData.id,
-                    post_url: scope === SCOPE_AUTH ? '' : postURL || '',
-                    platforms: platforms,
-                    payment_provider: payment_provider
-                };
-                return [4, API.accountService.expressCreateAccount(body)];
+                connectExpress = thunkApi.getState().connectExpress;
+                _a = connectExpress.data.responseData || {}, accountData = _a.accountData, leadData = _a.leadData;
+                leadResData = undefined;
+                if (!!(leadData === null || leadData === void 0 ? void 0 : leadData.board_id)) return [3, 2];
+                return [4, thunkApi.dispatch(getLeadByIdAsync(leadData === null || leadData === void 0 ? void 0 : leadData.id)).unwrap()];
             case 1:
-                data = _w.sent();
-                (_l = (_k = settings.data.appConfig).onCreated) === null || _l === void 0 ? void 0 : _l.call(_k, data);
-                (_o = (_m = settings.data.appConfig).onFlowCompleted) === null || _o === void 0 ? void 0 : _o.call(_m, data);
-                (_q = (_p = settings.data.appConfig).onStepCompleted) === null || _q === void 0 ? void 0 : _q.call(_p, settings.data.activeScreen.name, data);
-                if (!showBoard) return [3, 4];
-                return [4, thunkApi.dispatch(getLeadByIdAsync(data.lead.id)).unwrap()];
+                data = (_e.sent()).data;
+                leadResData = data;
+                _e.label = 2;
             case 2:
-                leadData = (_w.sent()).data;
-                board_id = (_r = data.board_id) !== null && _r !== void 0 ? _r : leadData.board_id;
-                board_info_id = (_s = data.board_info_id) !== null && _s !== void 0 ? _s : leadData.board_info_id;
+                board_id = (_c = accountData === null || accountData === void 0 ? void 0 : accountData.board_id) !== null && _c !== void 0 ? _c : leadResData === null || leadResData === void 0 ? void 0 : leadResData.board_id;
+                board_info_id = (_d = accountData === null || accountData === void 0 ? void 0 : accountData.board_info_id) !== null && _d !== void 0 ? _d : leadResData === null || leadResData === void 0 ? void 0 : leadResData.board_info_id;
                 return [4, Promise.all([
                         API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id }),
                         API.boardService.retrieveBoardDetails(board_id)
                     ])];
             case 3:
-                _c = _w.sent(), boardInfo = _c[0], boardData = _c[1];
+                _b = _e.sent(), boardInfo = _b[0], boardData = _b[1];
                 sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep()); });
-                return [2, { boardInfo: boardInfo, boardData: boardData, account: data }];
-            case 4:
-                if (!(scope === SCOPE_AUTH)) return [3, 7];
-                return [4, thunkApi.dispatch(getLeadByIdAsync(data.lead.id)).unwrap()];
-            case 5:
-                leadData = (_w.sent()).data;
-                return [4, thunkApi.dispatch(onCloseComplete({ merchantId: (_t = data === null || data === void 0 ? void 0 : data.merchant) === null || _t === void 0 ? void 0 : _t.id, brandId: (_u = leadData === null || leadData === void 0 ? void 0 : leadData.brand) === null || _u === void 0 ? void 0 : _u.id, entityId: (_v = leadData === null || leadData === void 0 ? void 0 : leadData.entity) === null || _v === void 0 ? void 0 : _v.id }))];
-            case 6:
-                _w.sent();
-                return [2, { account: data }];
-            case 7:
-                if (redirectUrl && mode === 'page') {
-                    urlQueryStart = redirectUrl.includes('?') ? '&' : '?';
-                    window.open("".concat(redirectUrl).concat(urlQueryStart, "authentication_id=").concat(authId, "&bi=").concat(bi), '_self');
-                    return [2, { account: data }];
-                }
-                thunkApi.dispatch(handleOpen(false));
-                return [2];
+                return [2, { boardInfo: boardInfo, boardData: boardData }];
         }
     });
 }); });
@@ -1567,6 +1605,19 @@ export var connectSlice = createSlice({
             .addCase(createAccountAsync.rejected, function (state, action) {
             state.loading = false;
             state.error = action.error.message;
+        })
+            .addCase(retrieveDetailsAfterCreateAccountAsync.pending, function (state) {
+            state.loading = true;
+            state.error = null;
+        })
+            .addCase(retrieveDetailsAfterCreateAccountAsync.fulfilled, function (state, action) {
+            state.loading = false;
+            state.error = null;
+            state.data.responseData = __assign(__assign({}, state.data.responseData), action.payload);
+        })
+            .addCase(retrieveDetailsAfterCreateAccountAsync.rejected, function (state, action) {
+            state.loading = false;
+            state.error = action.error.message;
         })
             .addCase(getMerchantListAsync.pending, function (state) {
             state.loading = true;

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

@@ -1,34 +1,24 @@
-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);
-};
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
-import { useTranslation } from 'react-i18next';
-import { isNetworkError } from '../../../../utils';
-import { useAppDispatch, useAppSelector, useLanguage } from '../../../../hooks';
+import { isNetworkError, sleep } from '../../../../utils';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { connectExpressSelector, createAccountAsync } from '../../../app/connectExpress/connectExpressStore';
 import CreateAccountLoading from '../../../shared/CreateAccountLoading';
-import Button from '../../../shared/Button';
 var CreateAccountLoader = function (_a) {
     var dispatch = useAppDispatch();
-    var isAr = useLanguage().isAr;
-    var t = useTranslation().t;
-    var _b = useAppSelector(connectExpressSelector), error = _b.error, loading = _b.loading;
+    var error = useAppSelector(connectExpressSelector).error;
+    var _b = React.useState(0), isRetryCount = _b[0], setIsRetryCount = _b[1];
+    var isNE = React.useMemo(function () { return isNetworkError(error); }, [error]);
     React.useEffect(function () {
-        dispatch(createAccountAsync());
+        dispatch(createAccountAsync({ isRetry: false }));
     }, []);
-    var onReTry = function () {
-        dispatch(createAccountAsync());
-    };
-    var isNE = React.useMemo(function () { return isNetworkError(error); }, [error]);
-    return (_jsx(CreateAccountLoading, __assign({ error: error }, { children: isNE && (_jsx(Button, __assign({ onClick: onReTry, disableBack: true, isAr: isAr, loading: loading }, { children: t('try_again') }))) })));
+    React.useEffect(function () {
+        if (isNE && isRetryCount <= 3) {
+            sleep(2000);
+            setIsRetryCount(isRetryCount + 1);
+            dispatch(createAccountAsync({ isRetry: true }));
+        }
+    }, [isNE]);
+    return _jsx(CreateAccountLoading, { error: isNE && isRetryCount <= 3 ? '' : error });
 };
 export default React.memo(CreateAccountLoader);

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

@@ -0,0 +1,5 @@
+import * as React from 'react';
+export interface PrepareDataLoadingProps {
+}
+declare const _default: React.MemoExoticComponent<({}: PrepareDataLoadingProps) => import("react/jsx-runtime").JSX.Element>;
+export default _default;

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

@@ -0,0 +1,34 @@
+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);
+};
+import { jsx as _jsx } from "react/jsx-runtime";
+import * as React from 'react';
+import { useTranslation } from 'react-i18next';
+import { isNetworkError } from '../../../../utils';
+import { useAppDispatch, useAppSelector, useLanguage } from '../../../../hooks';
+import DataLoading from '../../../shared/DataLoading';
+import Button from '../../../shared/Button';
+import { connectExpressSelector, retrieveDetailsAfterCreateAccountAsync } from '../../../app/connectExpress/connectExpressStore';
+var PrepareDataLoading = function (_a) {
+    var dispatch = useAppDispatch();
+    var isAr = useLanguage().isAr;
+    var t = useTranslation().t;
+    var _b = useAppSelector(connectExpressSelector), error = _b.error, loading = _b.loading;
+    React.useEffect(function () {
+        dispatch(retrieveDetailsAfterCreateAccountAsync());
+    }, []);
+    var onReTry = function () {
+        dispatch(retrieveDetailsAfterCreateAccountAsync());
+    };
+    var isNE = React.useMemo(function () { return isNetworkError(error); }, [error]);
+    return (_jsx(DataLoading, __assign({ error: error }, { children: isNE && (_jsx(Button, __assign({ onClick: onReTry, disableBack: true, isAr: isAr, loading: loading }, { children: t('try_again') }))) })));
+};
+export default React.memo(PrepareDataLoading);

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

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

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

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

package/build/features/featuresScreens.js

@@ -22,6 +22,7 @@ import ConnectExpressIdentityVerifyOTPScreen from './connectExpress/screens/Iden
 import ConnectExpressCollectIndividualScreen from './connectExpress/screens/CollectIndividualInfo';
 import ConnectExpressCollectBusinessScreen from './connectExpress/screens/CollectBusinessInfo';
 import ConnectExpressCreateAccountLoaderScreen from './connectExpress/screens/CreateAccountLoader';
+import ConnectExpressPreparingDataLoaderScreen from './connectExpress/screens/PrepareDataLoading';
 import ConnectExpressSuccessFlowButtonsScreen from './connectExpress/screens/SuccessWithFlowButtons';
 import ConnectExpressAccountAlreadyCreatedScreen from './connectExpress/screens/AccountAlreadyCreated';
 import ConnectExpressAuthenticationListScreen from './connectExpress/screens/AuthenticationList';
@@ -208,6 +209,10 @@ export var connectExpressFeatureScreens = [
         name: 'CONNECT_EXPRESS_WAITING_FOR_CREATING_ACCOUNT_STEP',
         element: ConnectExpressCreateAccountLoaderScreen
     },
+    {
+        name: 'CONNECT_EXPRESS_PREPARING_DATA_STEP',
+        element: ConnectExpressPreparingDataLoaderScreen
+    },
     {
         name: 'CONNECT_EXPRESS_COLLECT_INDIVIDUAL_INFO_STEP',
         element: ConnectExpressCollectIndividualScreen

package/package.json

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