@tap-payments/auth-jsconnect 1.0.93-test → 1.0.94-test

package/build/api/axios.d.ts

@@ -1,4 +1,6 @@
+import { CancelTokenSource } from 'axios';
 declare const instance: import("axios").AxiosInstance;
 export declare const setAxiosGlobalHeaders: (headers: Record<string, string>) => void;
 export declare const removeAxiosGlobalHeaders: (arr: Array<string>) => void;
+export type { CancelTokenSource };
 export default instance;

package/build/api/axios.js

@@ -33,11 +33,13 @@ var encryptionContractTransformer = function (config) {
 export var setAxiosGlobalHeaders = function (headers) {
     Object.keys(headers).forEach(function (key) {
         instance.defaults.headers.common[key] = headers[key];
+        axios.defaults.headers.common[key] = headers[key];
     });
 };
 export var removeAxiosGlobalHeaders = function (arr) {
     arr.forEach(function (key) {
         delete instance.defaults.headers.common[key];
+        delete axios.defaults.headers.common[key];
     });
 };
 export default instance;

package/build/app/settings.d.ts

@@ -1,6 +1,10 @@
 import { RootState } from './store';
-import { ActionState, LanguageMode, SharedState, ThemeMode, ScreenStepNavigation, DeviceInfo, AppInfo, LibConfig } from '../@types';
+import { ActionState, LanguageMode, SharedState, ThemeMode, ScreenStepNavigation, DeviceInfo, AppInfo, LibConfig, CountryCode } from '../@types';
 import { ValidateOperatorBody } from '../api';
+export declare const getCountries: import("@reduxjs/toolkit").AsyncThunk<{
+    businessCountry: any;
+    countries: any;
+}, void, {}>;
 export declare const getClientIp: import("@reduxjs/toolkit").AsyncThunk<any, void, {}>;
 export declare const getBrowserFingerPrint: import("@reduxjs/toolkit").AsyncThunk<{
     fingerPrint: import("@fingerprintjs/fingerprintjs").GetResult;
@@ -20,6 +24,8 @@ export interface SettingsData {
     appConfig: LibConfig;
     open: boolean;
     isTapOrigin: boolean;
+    businessCountry: CountryCode;
+    countries: Array<CountryCode>;
 }
 export interface SettingsState extends SharedState<SettingsData> {
 }

package/build/app/settings.js

@@ -37,10 +37,29 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var _a;
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import { getStoredData, storeData, isArray, findItem, getBrowserInfo, getFingerPrint } from '../utils';
-import { DefaultDeviceInfo, LOCAL_STORAGE_KEYS } from '../constants';
+import { defaultCountry, DefaultDeviceInfo, LOCAL_STORAGE_KEYS } from '../constants';
 import i18n from '../i18n';
 import { updateLocale } from '../utils/locale';
 import API from '../api';
+export var getCountries = createAsyncThunk('getCountries', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var settings, countriesBody, countries, businessCountry;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                settings = thunkApi.getState().settings;
+                return [4, API.countryService.getAllCountries()];
+            case 1:
+                countriesBody = (_a.sent()).data;
+                countries = ((countriesBody === null || countriesBody === void 0 ? void 0 : countriesBody.list) || [])
+                    .slice()
+                    .sort(function (cOne, cTwo) { return cOne.name.english.localeCompare(cTwo.name.english); });
+                businessCountry = countries.find(function (country) {
+                    return [country.iso2, country.iso3].includes(settings.data.appConfig.businessCountryCode.toUpperCase());
+                });
+                return [2, { businessCountry: businessCountry, countries: countries }];
+        }
+    });
+}); });
 export var getClientIp = createAsyncThunk('getClientIp', function () { return __awaiter(void 0, void 0, void 0, function () {
     var data;
     return __generator(this, function (_a) {
@@ -98,7 +117,9 @@ var initialState = {
         featureScreensNavigation: [],
         activeScreen: {},
         deviceInfo: DefaultDeviceInfo,
-        appConfig: {}
+        appConfig: {},
+        businessCountry: defaultCountry,
+        countries: []
     }
 };
 export var settingsSlice = createSlice({
@@ -187,6 +208,21 @@ export var settingsSlice = createSlice({
     },
     extraReducers: function (builder) {
         builder
+            .addCase(getCountries.fulfilled, function (state, action) {
+            state.error = null;
+            state.loading = false;
+            var _a = action.payload, countries = _a.countries, businessCountry = _a.businessCountry;
+            state.data.countries = countries;
+            state.data.businessCountry = businessCountry || defaultCountry;
+        })
+            .addCase(getCountries.pending, function (state) {
+            state.error = null;
+            state.loading = true;
+        })
+            .addCase(getCountries.rejected, function (state, action) {
+            state.error = action.error.message;
+            state.loading = false;
+        })
             .addCase(getClientIp.pending, function (state) {
             state.error = null;
             state.loading = true;

package/build/components/AnimationFlow/Loader.js

@@ -12,5 +12,5 @@ var BoxStyled = styled(Box)(function () { return ({
     zIndex: 2
 }); });
 export default function FlowLoading() {
-    return (_jsx(BoxStyled, { children: _jsx(Loader, { svgStyle: { width: 60, height: 60 }, innerColor: 'white', outerColor: 'white', toggleAnimation: true }) }));
+    return (_jsx(BoxStyled, { children: _jsx(Loader, { style: { width: 60, height: 60 }, svgStyle: { width: 60, height: 60 }, innerColor: 'white', outerColor: 'white', toggleAnimation: true }) }));
 }

package/build/features/app/business/businessStore.d.ts

@@ -1,9 +1,5 @@
 import { RootState } from '../../../app/store';
-import { ActivitiesFormValues, CustomersFormValues, BusinessTypeFormValues, CountryCode, NIDFormValues, OTPFormValues, ResponseData, SharedState, FlowsTypes } from '../../../@types';
-export declare const getCountries: import("@reduxjs/toolkit").AsyncThunk<{
-    businessCountry: any;
-    countries: any;
-}, void, {}>;
+import { ActivitiesFormValues, CustomersFormValues, BusinessTypeFormValues, NIDFormValues, OTPFormValues, ResponseData, SharedState, FlowsTypes } from '../../../@types';
 export declare const verifyLeadToken: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
     leadData: any;
@@ -73,8 +69,6 @@ declare type VerifyData = {
 };
 export interface BusinessData {
     verify: ResponseData & VerifyData;
-    businessCountry: CountryCode;
-    countries: CountryCode[];
     otpData: OTPFormValues & ResponseData & {
         isNID: boolean;
     };

package/build/features/app/business/businessStore.js

@@ -59,25 +59,9 @@ import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import moment from 'moment';
 import API from '../../../api';
 import { BusinessType, FlowsTypes } from '../../../@types';
-import { BUSINESS_STEP_NAMES, defaultCountry, IDENTIFICATION_TYPE, OTHER_CR_LICENSE, OTHER_FL_LICENSE } from '../../../constants';
+import { BUSINESS_STEP_NAMES, IDENTIFICATION_TYPE, OTHER_CR_LICENSE, OTHER_FL_LICENSE } from '../../../constants';
 import { convertNumbers2English, getFlowUrl, hasKey, removeRequestHeaders } from '../../../utils';
 import { handleNextScreenStep } from '../../../app/settings';
-export var getCountries = createAsyncThunk('getCountries', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var settings, countriesBody, businessCountry;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                settings = thunkApi.getState().settings;
-                return [4, API.countryService.getAllCountries()];
-            case 1:
-                countriesBody = (_a.sent()).data;
-                businessCountry = (countriesBody.list || []).find(function (country) {
-                    return [country.iso2, country.iso3].includes(settings.data.appConfig.businessCountryCode.toUpperCase());
-                });
-                return [2, { businessCountry: businessCountry, countries: (countriesBody === null || countriesBody === void 0 ? void 0 : countriesBody.list) || [] }];
-        }
-    });
-}); });
 export var verifyLeadToken = createAsyncThunk('verifyLeadToken', function (token, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var payload, data, leadResponse;
     return __generator(this, function (_a) {
@@ -191,7 +175,7 @@ export var updateLeadIdentity = createAsyncThunk('updateLeadIdentity', function
                     identification_id: params.nid,
                     identification_id_type: identification_id_type,
                     date_of_birth: params.dob,
-                    country_code: business.data.businessCountry.iso2,
+                    country_code: settings.data.businessCountry.iso2,
                     step_name: stepName,
                     encryption_contract: ['country_code', 'identification_id', 'identification_id_type', 'date_of_birth']
                 };
@@ -367,7 +351,7 @@ export var updateCustomersInfo = createAsyncThunk('updateCustomersInfo', functio
                     agree_refund: params.refundPolicy,
                     agree_chargeback: params.transactionPolicy,
                     step_name: stepName,
-                    encryption_contract: ['customers_base[0]', 'customers_served_monthly', 'yearly_sales_range']
+                    encryption_contract: ['customers_served_monthly', 'yearly_sales_range']
                 };
                 return [4, API.entityService.updateEntityInfo(requestBody)];
             case 1:
@@ -453,8 +437,6 @@ var initialState = {
     customLoading: false,
     data: {
         flowName: FlowsTypes.BUSINESS,
-        businessCountry: defaultCountry,
-        countries: [],
         verify: {
             token: ''
         },
@@ -500,23 +482,6 @@ export var businessSlice = createSlice({
     },
     extraReducers: function (builder) {
         builder
-            .addCase(getCountries.fulfilled, function (state, action) {
-            state.error = null;
-            state.customLoading = false;
-            var _a = action.payload, businessCountry = _a.businessCountry, countries = _a.countries;
-            state.data.countries = countries
-                .slice()
-                .sort(function (cOne, cTwo) { return cOne.name.english.localeCompare(cTwo.name.english); });
-            state.data.businessCountry = businessCountry || defaultCountry;
-        })
-            .addCase(getCountries.pending, function (state) {
-            state.error = null;
-            state.customLoading = true;
-        })
-            .addCase(getCountries.rejected, function (state, action) {
-            state.error = action.error.message;
-            state.customLoading = false;
-        })
             .addCase(verifyLeadToken.pending, function (state) {
             state.error = null;
             state.customLoading = true;
@@ -586,7 +551,6 @@ export var businessSlice = createSlice({
             .addCase(updateLeadIdentity.fulfilled, function (state, action) {
             var _a;
             state.loading = false;
-            state.customLoading = false;
             state.error = null;
             var _b = action.payload, data = _b.data, formData = _b.formData;
             var description = (((_a = data === null || data === void 0 ? void 0 : data.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
@@ -601,7 +565,6 @@ export var businessSlice = createSlice({
         })
             .addCase(updateLeadIdentity.rejected, function (state, action) {
             state.loading = false;
-            state.customLoading = false;
             state.error = action.error.message;
         })
             .addCase(retrieveEntityList.pending, function (state) {

package/build/features/app/connect/connectStore.d.ts

@@ -1,10 +1,6 @@
 import { RootState } from '../../../app/store';
-import { ResponseData, CountryCode, MobileFormValues, NIDFormValues, OTPFormValues, IndividualFormValues, SharedState, BrandFormValues, FlowsTypes } from '../../../@types';
+import { ResponseData, MobileFormValues, NIDFormValues, OTPFormValues, IndividualFormValues, SharedState, BrandFormValues, FlowsTypes } from '../../../@types';
 import { CancelToken } from 'axios';
-export declare const getCountries: import("@reduxjs/toolkit").AsyncThunk<{
-    businessCountry: any;
-    countries: any;
-}, void, {}>;
 export declare const createMobileAuth: import("@reduxjs/toolkit").AsyncThunk<{
     response: any;
     formData: MobileFormValues & {
@@ -80,8 +76,6 @@ export declare const updateLeadSuccess: import("@reduxjs/toolkit").AsyncThunk<{
     formData: void;
 }, void, {}>;
 export interface ConnectData {
-    countries: Array<CountryCode>;
-    businessCountry: CountryCode;
     mobileData: (MobileFormValues | undefined) & ResponseData;
     nidData: NIDFormValues & ResponseData & {
         type: string;

package/build/features/app/connect/connectStore.js

@@ -62,22 +62,6 @@ import API from '../../../api';
 import { CONNECT_STEP_NAMES, IDENTIFICATION_TYPE, INSTAGRAM_URL, OTHER_BRAND, TWITTER_URL } from '../../../constants';
 import { defaultCountry } from '../../../constants';
 import { getIndividualName, getFlowUrl, capitalizeTheFirstLetterOfEachWord, removeRequestHeaders } from '../../../utils';
-export var getCountries = createAsyncThunk('getCountries', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var settings, countriesBody, businessCountry;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                settings = thunkApi.getState().settings;
-                return [4, API.countryService.getAllCountries()];
-            case 1:
-                countriesBody = (_a.sent()).data;
-                businessCountry = (countriesBody.list || []).find(function (country) {
-                    return [country.iso2, country.iso3].includes(settings.data.appConfig.businessCountryCode.toUpperCase());
-                });
-                return [2, { businessCountry: businessCountry, countries: countriesBody.list }];
-        }
-    });
-}); });
 export var createMobileAuth = createAsyncThunk('createMobileAuth', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var settings, requestBody, data;
     var _a, _b;
@@ -118,7 +102,7 @@ export var createNIDAuth = createAsyncThunk('createNIDAuth', function (params, t
                         identification_id: params.nid,
                         identification_id_type: identification_id_type,
                         date_of_birth: params.dob,
-                        country_code: connect.data.businessCountry.iso2
+                        country_code: settings.data.businessCountry.iso2
                     },
                     sign_in: false,
                     step_name: CONNECT_STEP_NAMES.CREATE_AUTH_NID,
@@ -200,12 +184,12 @@ export var retrieveLead = createAsyncThunk('retrieveLead', function (params, thu
     });
 }); });
 export var createLead = createAsyncThunk('createLead', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var connect, businessCountry, payload, brandPayload, _a, brandResponse, data;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
+    var _a, connect, settings, businessCountry, payload, brandPayload, _b, brandResponse, data;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
-                connect = thunkApi.getState().connect;
-                businessCountry = connect.data.businessCountry;
+                _a = thunkApi.getState(), connect = _a.connect, settings = _a.settings;
+                businessCountry = settings.data.businessCountry;
                 payload = {
                     individual_id: params.individualId,
                     country_code: businessCountry.iso2
@@ -218,7 +202,7 @@ export var createLead = createAsyncThunk('createLead', function (params, thunkAp
                         API.leadService.createLead(payload)
                     ])];
             case 1:
-                _a = _b.sent(), brandResponse = _a[0].data, data = _a[1].data;
+                _b = _c.sent(), brandResponse = _b[0].data, data = _b[1].data;
                 if (!data.errors) {
                     thunkApi.dispatch(handleNextScreenStep(params.stepName));
                 }
@@ -293,14 +277,7 @@ export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (param
                     id: (isExistingUser ? (_h = brandData.responseBody) === null || _h === void 0 ? void 0 : _h.lead_id : (_j = otpData.responseBody) === null || _j === void 0 ? void 0 : _j.lead_id) || '',
                     terms_conditions_accepted: params.termAndConditionChecked,
                     step_name: CONNECT_STEP_NAMES.UPDATE_LEAD_MERCHANT,
-                    encryption_contract: [
-                        'brand.name.en',
-                        'brand.name.ar',
-                        'brand.name.zh',
-                        'brand.website',
-                        'brand.social[0]',
-                        'brand.social[1]'
-                    ]
+                    encryption_contract: ['brand.name.en', 'brand.name.ar', 'brand.name.zh', 'brand.website']
                 };
                 return [4, API.leadService.updateLead(payload)];
             case 1:
@@ -395,8 +372,6 @@ var initialState = {
     customLoading: false,
     data: {
         flowName: FlowsTypes.CONNECT,
-        businessCountry: defaultCountry,
-        countries: [],
         mobileData: {
             countryCode: defaultCountry,
             mobile: null
@@ -456,24 +431,6 @@ export var connectSlice = createSlice({
     },
     extraReducers: function (builder) {
         builder
-            .addCase(getCountries.fulfilled, function (state, action) {
-            state.error = null;
-            state.customLoading = false;
-            var _a = action.payload, countries = _a.countries, businessCountry = _a.businessCountry;
-            state.data.countries = countries
-                .slice()
-                .sort(function (cOne, cTwo) { return cOne.name.english.localeCompare(cTwo.name.english); });
-            state.data.businessCountry = businessCountry || defaultCountry;
-            state.data.mobileData.countryCode = businessCountry || defaultCountry;
-        })
-            .addCase(getCountries.pending, function (state) {
-            state.error = null;
-            state.customLoading = true;
-        })
-            .addCase(getCountries.rejected, function (state, action) {
-            state.error = action.error.message;
-            state.customLoading = false;
-        })
             .addCase(createMobileAuth.fulfilled, function (state, action) {
             var _a;
             state.loading = false;

package/build/features/app/individual/individualStore.d.ts

@@ -1,9 +1,5 @@
 import { RootState } from '../../../app/store';
 import { CountryCode, FlowsTypes, IndividualExtraFormValues, OTPFormValues, ResponseData, SharedState } from '../../../@types';
-export declare const getCountries: import("@reduxjs/toolkit").AsyncThunk<{
-    businessCountry: any;
-    countries: any;
-}, void, {}>;
 export declare const verifyLeadToken: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
     leadData: any;
@@ -16,6 +12,7 @@ export declare const retrieveDataList: import("@reduxjs/toolkit").AsyncThunk<{
     sourceIncome: any;
     monthlyIncome: any;
     countryCode: string;
+    countries: CountryCode[];
 }, string, {}>;
 export declare const retrieveEntityInfo: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
@@ -38,8 +35,6 @@ declare type VerifyData = {
     token: string;
 };
 export interface IndividualData {
-    businessCountry: CountryCode;
-    countries: Array<CountryCode>;
     verify: ResponseData & VerifyData;
     otpData: OTPFormValues & ResponseData;
     individualData: IndividualExtraFormValues & ResponseData;

package/build/features/app/individual/individualStore.js

@@ -51,23 +51,7 @@ import API from '../../../api';
 import { FlowsTypes } from '../../../@types';
 import { hasKey, removeRequestHeaders } from '../../../utils';
 import { handleNextScreenStep } from '../../../app/settings';
-import { defaultCountry, INDIVIDUAl_STEP_NAMES } from '../../../constants';
-export var getCountries = createAsyncThunk('getCountries', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var settings, countriesBody, businessCountry;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                settings = thunkApi.getState().settings;
-                return [4, API.countryService.getAllCountries()];
-            case 1:
-                countriesBody = (_a.sent()).data;
-                businessCountry = (countriesBody.list || []).find(function (country) {
-                    return [country.iso2, country.iso3].includes(settings.data.appConfig.businessCountryCode.toUpperCase());
-                });
-                return [2, { businessCountry: businessCountry, countries: countriesBody.list }];
-        }
-    });
-}); });
+import { INDIVIDUAl_STEP_NAMES } from '../../../constants';
 export var verifyLeadToken = createAsyncThunk('verifyLeadToken', function (token, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var payload, data, leadResponse, _a, steps, entity, hasTaxCompleted;
     var _b, _c;
@@ -123,19 +107,23 @@ export var resendOTP = createAsyncThunk('resendOTPIndividual', function (params,
     });
 }); });
 export var retrieveDataList = createAsyncThunk('retrieveDataList', function (countryCode, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, sourceIncome, monthlyIncome;
+    var settings, _a, sourceIncome, monthlyIncome, countries;
     return __generator(this, function (_b) {
         switch (_b.label) {
-            case 0: return [4, Promise.all([
-                    API.dataService.getSourceOfIncome(),
-                    API.dataService.getMonthlyIncome(countryCode)
-                ])];
+            case 0:
+                settings = thunkApi.getState().settings;
+                return [4, Promise.all([
+                        API.dataService.getSourceOfIncome(),
+                        API.dataService.getMonthlyIncome(countryCode)
+                    ])];
             case 1:
                 _a = _b.sent(), sourceIncome = _a[0].data, monthlyIncome = _a[1].data;
+                countries = settings.data.countries;
                 return [2, {
                         sourceIncome: sourceIncome,
                         monthlyIncome: monthlyIncome,
-                        countryCode: countryCode
+                        countryCode: countryCode,
+                        countries: countries
                     }];
         }
     });
@@ -203,7 +191,7 @@ export var updateIndividualInfo = createAsyncThunk('updateIndividualInfo', funct
                     actual_income: (_f = params.monthlyIncome) === null || _f === void 0 ? void 0 : _f.id,
                     is_relative_PEP: params.isPEP,
                     is_influencer: params.isInfluencer,
-                    encryption_contract: ['employer_name', 'employer_city', 'actual_income', 'source_income[0]'],
+                    encryption_contract: ['employer_name', 'employer_city', 'actual_income'],
                     step_name: INDIVIDUAl_STEP_NAMES.INDIVIDUAl_INFO
                 };
                 return [4, API.entityService.updateEntityInfo(requestBody)];
@@ -250,8 +238,6 @@ var initialState = {
     loading: false,
     data: {
         flowName: FlowsTypes.INDIVIDUAL,
-        countries: [],
-        businessCountry: defaultCountry,
         verify: {
             token: ''
         },
@@ -284,23 +270,6 @@ export var individualSlice = createSlice({
     },
     extraReducers: function (builder) {
         builder
-            .addCase(getCountries.fulfilled, function (state, action) {
-            state.error = null;
-            state.customLoading = false;
-            var _a = action.payload, countries = _a.countries, businessCountry = _a.businessCountry;
-            state.data.countries = countries
-                .slice()
-                .sort(function (cOne, cTwo) { return cOne.name.english.localeCompare(cTwo.name.english); });
-            state.data.businessCountry = businessCountry || defaultCountry;
-        })
-            .addCase(getCountries.pending, function (state) {
-            state.error = null;
-            state.customLoading = true;
-        })
-            .addCase(getCountries.rejected, function (state, action) {
-            state.error = action.error.message;
-            state.customLoading = false;
-        })
             .addCase(verifyLeadToken.pending, function (state) {
             state.error = null;
             state.customLoading = true;
@@ -367,7 +336,7 @@ export var individualSlice = createSlice({
             .addCase(retrieveDataList.fulfilled, function (state, action) {
             state.loading = false;
             state.error = null;
-            var _a = action.payload, sourceIncome = _a.sourceIncome, monthlyIncome = _a.monthlyIncome, countryCode = _a.countryCode;
+            var _a = action.payload, sourceIncome = _a.sourceIncome, monthlyIncome = _a.monthlyIncome, countryCode = _a.countryCode, countries = _a.countries;
             var data = state.data.individualData.responseBody;
             state.data.individualData.responseBody = __assign(__assign({}, data), { sourceIncomeList: sourceIncome || [], monthlyIncomeList: monthlyIncome || [] });
             var selectedSourceIncome = sourceIncome === null || sourceIncome === void 0 ? void 0 : sourceIncome[0];
@@ -377,7 +346,7 @@ export var individualSlice = createSlice({
             if (!!selectedMonthlyIncome)
                 state.data.individualData.monthlyIncome = selectedMonthlyIncome;
             if (!!countryCode) {
-                var employerLocation = state.data.countries.find(function (country) { return country.iso2 === countryCode; });
+                var employerLocation = countries.find(function (country) { return country.iso2 === countryCode; });
                 state.data.individualData.employerLocation = employerLocation;
             }
         })

package/build/features/business/Business.js

@@ -14,7 +14,7 @@ import { memo, useEffect } from 'react';
 import { useAppTheme, useAppDispatch, useAppSelector, useAppConfig, useErrorListener, useStepStartedListener } from '../../hooks';
 import { handleLanguage, settingsSelector } from '../../app/settings';
 import { FeatureContainer } from '../shared/Containers';
-import { businessSelector, getCountries, verifyLeadToken } from '../app/business/businessStore';
+import { businessSelector, verifyLeadToken } from '../app/business/businessStore';
 import AnimationFlow from '../../components/AnimationFlow';
 import { store } from '../../app/store';
 import { ReduxProvider, ThemeProvider } from '../../components/Providers';
@@ -47,9 +47,6 @@ var Business = memo(function (props) {
         if (!loading)
             verifyToken();
     }, [loading]);
-    useEffect(function () {
-        dispatch(getCountries());
-    }, []);
     return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ isTapOrigin: isTapOrigin, loading: settingLoading || customLoading }, { children: _jsx(AnimationFlow, __assign({ isTapOrigin: isTapOrigin, loading: settingLoading || customLoading, error: error, open: open, breakpoint: 'sm', footer: _jsx(CustomFooter, {}) }, { children: _jsx(FeatureContainer, { children: businessFeatureScreens.map(function (_a, index) {
                         var Element = _a.element, name = _a.name;
                         var isActive = activeScreen.name === name;

package/build/features/connect/Connect.js

@@ -10,13 +10,13 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import { jsx as _jsx } from "react/jsx-runtime";
-import { memo, useEffect } from 'react';
+import { memo } from 'react';
 import { FeatureContainer } from '../shared/Containers';
-import { useAppTheme, useAppDispatch, useAppSelector, useAppConfig, useErrorListener, useStepStartedListener } from '../../hooks';
+import { useAppTheme, useAppSelector, useAppConfig, useErrorListener, useStepStartedListener } from '../../hooks';
 import { settingsSelector } from '../../app/settings';
 import AnimationFlow from '../../components/AnimationFlow';
 import { store } from '../../app/store';
-import { connectSelector, getCountries } from '../app/connect/connectStore';
+import { connectSelector } from '../app/connect/connectStore';
 import { ReduxProvider, ThemeProvider } from '../../components/Providers';
 import Collapse from '../../components/Collapse';
 import { reactElement } from '../../utils';
@@ -26,16 +26,12 @@ import CustomFooter from '../shared/Footer';
 import Background from '../shared/Background';
 var Connect = memo(function (props) {
     var theme = useAppTheme().theme;
-    var dispatch = useAppDispatch();
     var _a = useAppSelector(settingsSelector), data = _a.data, error = _a.error, settingLoading = _a.loading;
     var connectError = useAppSelector(connectSelector).error;
     useAppConfig(__assign({ navigation: CONNECT_SCREENS_NAVIGATION }, props));
     useErrorListener(connectError || error);
     useStepStartedListener();
     var activeScreen = data.activeScreen, isTapOrigin = data.isTapOrigin, open = data.open;
-    useEffect(function () {
-        dispatch(getCountries());
-    }, []);
     return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ isTapOrigin: isTapOrigin, loading: settingLoading }, { children: _jsx(AnimationFlow, __assign({ isTapOrigin: isTapOrigin, loading: settingLoading, error: error, open: open, footer: _jsx(CustomFooter, {}) }, { children: _jsx(FeatureContainer, { children: connectFeatureScreens.map(function (_a, index) {
                         var Element = _a.element, name = _a.name;
                         var isActive = activeScreen.name === name;

package/build/features/connect/screens/Merchant/BrandName.js

@@ -63,9 +63,10 @@ import Tooltip from '../../../../components/Tooltip';
 import Collapse from '../../../../components/Collapse';
 import { removeAllOtherThanCharsNumbersAndSpace } from '../../../../utils';
 import CheckIcon from '../../../shared/CheckIcon';
-import { checkBrandNameAvailability, connectSelector } from '../../../app/connect/connectStore';
+import { checkBrandNameAvailability } from '../../../app/connect/connectStore';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { debounce } from 'lodash-es';
+import { settingsSelector } from '../../../../app/settings';
 var LabelContainerStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -107,7 +108,7 @@ var BrandName = function (_a) {
     var brandControl = useController({ control: control, name: 'brandName' });
     var brandNameValue = brandControl.field.value;
     var error = (_b = brandControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
-    var data = useAppSelector(connectSelector).data;
+    var data = useAppSelector(settingsSelector).data;
     var checkBrand = debounce(function (value) { return __awaiter(void 0, void 0, void 0, function () {
         var onSuccess;
         return __generator(this, function (_a) {

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

@@ -107,6 +107,6 @@ var Mobile = function (_a) {
     var disabled = !methods.formState.isValid || !!error;
     var title = t('join_our_community');
     var subTitle = t('ide_terms_and_conditions_description');
-    return (_jsxs(ScreenContainer, { children: [(title || subTitle) && _jsx(MIDTitle, { show: !listActive, title: title, description: subTitle }), _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(InputsContainerStyled, { children: _jsx(MobileNumber, { show: !isBusinessListActive, countries: data.countries, onListOpen: function () { return handleMenuListClick(ListType.CountryCodeList); }, onListClose: function () { return handleMenuListClick(); } }) }), _jsxs(Collapse, __assign({ in: !listActive }, { children: [_jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disableBack: true, disabled: disabled || settingsStore.loading, loading: loading, error: t(error || '') }, { children: t('next') })), _jsxs(OrBoxStyled, { children: [_jsx(DividerStyled, {}), _jsx(TextStyled, { children: t('or') }), _jsx(DividerStyled, {})] }), _jsx(AbsherButton, __assign({ disabled: settingsStore.loading || loading, onClick: function () { return onBack(); } }, { children: t('absher_button_label') }))] }))] })) }))] }));
+    return (_jsxs(ScreenContainer, { children: [(title || subTitle) && _jsx(MIDTitle, { show: !listActive, title: title, description: subTitle }), _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(InputsContainerStyled, { children: _jsx(MobileNumber, { show: !isBusinessListActive, countries: settingsStore.data.countries, onListOpen: function () { return handleMenuListClick(ListType.CountryCodeList); }, onListClose: function () { return handleMenuListClick(); } }) }), _jsxs(Collapse, __assign({ in: !listActive }, { children: [_jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disableBack: true, disabled: disabled || settingsStore.loading, loading: loading, error: t(error || '') }, { children: t('next') })), _jsxs(OrBoxStyled, { children: [_jsx(DividerStyled, {}), _jsx(TextStyled, { children: t('or') }), _jsx(DividerStyled, {})] }), _jsx(AbsherButton, __assign({ disabled: settingsStore.loading || loading, onClick: function () { return onBack(); } }, { children: t('absher_button_label') }))] }))] })) }))] }));
 };
 export default React.memo(Mobile);

package/build/features/individual/Individual.js

@@ -21,7 +21,7 @@ import { getParameterByName, reactElement } from '../../utils';
 import { FeatureContainer } from '../shared/Containers';
 import { INDIVIDUAL_SCREENS_NAVIGATION } from '../../constants';
 import { individualFeatureScreens } from '../featuresScreens';
-import { getCountries, individualSelector, verifyLeadToken } from '../app/individual/individualStore';
+import { individualSelector, verifyLeadToken } from '../app/individual/individualStore';
 import CustomFooter from '../shared/Footer';
 import Background from '../shared/Background';
 var Individual = memo(function (props) {
@@ -47,9 +47,6 @@ var Individual = memo(function (props) {
         if (!loading)
             verifyToken();
     }, [loading]);
-    useEffect(function () {
-        dispatch(getCountries());
-    }, []);
     return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ isTapOrigin: isTapOrigin, loading: settingLoading || customLoading }, { children: _jsx(AnimationFlow, __assign({ isTapOrigin: isTapOrigin, loading: settingLoading || customLoading, error: error, open: open, breakpoint: 'sm', footer: _jsx(CustomFooter, {}) }, { children: _jsx(FeatureContainer, { children: individualFeatureScreens.map(function (_a, index) {
                         var Element = _a.element, name = _a.name;
                         var isActive = activeScreen.name === name;

package/build/features/individual/screens/AdditionalIndividualInfo/AdditionalIndividualInfo.js

@@ -16,7 +16,7 @@ import { useForm, FormProvider } from 'react-hook-form';
 import Box from '@mui/material/Box';
 import { useTranslation } from 'react-i18next';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
-import { handleCurrentActiveScreen } from '../../../../app/settings';
+import { handleCurrentActiveScreen, settingsSelector } from '../../../../app/settings';
 import Form from '../../../../components/Form';
 import Collapse from '../../../../components/Collapse';
 import Button from '../../../shared/Button';
@@ -41,6 +41,8 @@ var AdditionalIndividualInfo = function (_a) {
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
     var _b = useAppSelector(individualSelector), data = _b.data, loading = _b.loading, error = _b.error;
+    var settingsData = useAppSelector(settingsSelector).data;
+    var countries = settingsData.countries;
     var methods = useForm({
         resolver: yupResolver(IndividualInfoValidationSchema),
         defaultValues: data.individualData,
@@ -73,7 +75,7 @@ var AdditionalIndividualInfo = function (_a) {
     var isSourceOfIncomeListActive = listActive === ListType.SourceOfIncomeList;
     var isEmployerLocationListActive = listActive === ListType.EmployerLocationList;
     var isMonthlyIncomeListActive = listActive === ListType.MonthlyIncomeList;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsxs(Box, { children: [_jsx(SourceOfIncome, { onListOpen: function () { return handleMenuClick(ListType.SourceOfIncomeList); }, onListClose: function () { return handleMenuClick(); }, show: !isEmployerLocationListActive && !isMonthlyIncomeListActive }), _jsx(MonthlyIncome, { show: !isEmployerLocationListActive && !isSourceOfIncomeListActive, onListOpen: function () { return handleMenuClick(ListType.MonthlyIncomeList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(EmployerName, { show: false }), _jsx(EmployerLocation, { show: !isSourceOfIncomeListActive && employerFieldsActive && !isMonthlyIncomeListActive, countries: data.countries, onListOpen: function () { return handleMenuClick(ListType.EmployerLocationList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(PEPSwitch, { show: !listActive }), _jsx(InfluencerSwitch, { show: !listActive })] }), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disabled: !methods.formState.isValid, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsxs(Box, { children: [_jsx(SourceOfIncome, { onListOpen: function () { return handleMenuClick(ListType.SourceOfIncomeList); }, onListClose: function () { return handleMenuClick(); }, show: !isEmployerLocationListActive && !isMonthlyIncomeListActive }), _jsx(MonthlyIncome, { show: !isEmployerLocationListActive && !isSourceOfIncomeListActive, onListOpen: function () { return handleMenuClick(ListType.MonthlyIncomeList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(EmployerName, { show: false }), _jsx(EmployerLocation, { show: !isSourceOfIncomeListActive && employerFieldsActive && !isMonthlyIncomeListActive, countries: countries, onListOpen: function () { return handleMenuClick(ListType.EmployerLocationList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(PEPSwitch, { show: !listActive }), _jsx(InfluencerSwitch, { show: !listActive })] }), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disabled: !methods.formState.isValid, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
 };
 export default React.memo(AdditionalIndividualInfo);
 AdditionalIndividualInfo.defaultProps = {};

package/build/features/shared/Background/Background.js

@@ -15,7 +15,7 @@ import { styled } from '@mui/material/styles';
 import Box from '@mui/material/Box';
 import LogoBackground from './LogoBackground';
 var BackgroundStyled = styled(Box, { shouldForwardProp: function (prop) { return prop !== 'isTapOrigin'; } })(function (_a) {
-    var isTapOrigin = _a.isTapOrigin;
+    var isTapOrigin = _a.isTapOrigin, theme = _a.theme;
     return ({
         width: '100vw',
         height: '100vh',
@@ -24,6 +24,7 @@ var BackgroundStyled = styled(Box, { shouldForwardProp: function (prop) { return
 });
 var Background = function (_a) {
     var children = _a.children, isTapOrigin = _a.isTapOrigin, loading = _a.loading;
-    return (_jsxs(BackgroundStyled, __assign({ id: 'background', isTapOrigin: isTapOrigin }, { children: [_jsx(LogoBackground, { hide: loading || !isTapOrigin }), children] })));
+    var showLogo = !loading && isTapOrigin;
+    return (_jsxs(BackgroundStyled, __assign({ id: 'background', isTapOrigin: isTapOrigin }, { children: [showLogo && _jsx(LogoBackground, {}), children] })));
 };
 export default memo(Background);

package/build/features/shared/Background/LogoBackground.d.ts

@@ -1,6 +1,3 @@
 import React from 'react';
-declare type LogoBackgroundProps = {
-    hide?: boolean;
-};
-declare const _default: React.MemoExoticComponent<({ hide }: LogoBackgroundProps) => JSX.Element>;
+declare const _default: React.MemoExoticComponent<() => JSX.Element>;
 export default _default;

package/build/features/shared/Background/LogoBackground.js

@@ -1,18 +1,6 @@
-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, jsxs as _jsxs } from "react/jsx-runtime";
 import { memo } from 'react';
 import { styled } from '@mui/material/styles';
-import Collapse from '@mui/material/Collapse';
 import Box from '@mui/material/Box';
 import Icon from '../../../components/Icon';
 import { ICONS_NAMES } from '../../../constants';
@@ -25,8 +13,7 @@ var BoxStyled = styled(Box)(function (_a) {
             flexDirection: 'column',
             justifyContent: 'center',
             alignItems: 'center',
-            paddingTop: theme.spacing(5),
-            paddingBottom: theme.spacing(2)
+            paddingTop: theme.spacing(5)
         },
         _b[theme.breakpoints.down('sm')] = {
             paddingTop: theme.spacing(11)
@@ -40,31 +27,16 @@ var LogoBadgeStyled = styled(Icon)(function (_a) {
         width: theme.spacing(8.875)
     });
 });
-var LogoIconBoxStyled = styled(Box)(function (_a) {
-    var _b;
-    var theme = _a.theme;
-    return (_b = {
-            paddingTop: theme.spacing(2.5),
-            width: '100%',
-            display: 'flex',
-            justifyContent: 'center'
-        },
-        _b[theme.transitions.create(['top'])] = {
-            duration: theme.transitions.duration.standard
-        },
-        _b);
-});
 var LogoIconStyled = styled(Icon)(function (_a) {
     var theme = _a.theme;
     return ({
         width: theme.spacing(5.875),
         height: theme.spacing(3.625),
-        padding: theme.spacing(0)
+        marginTop: theme.spacing(2.5)
     });
 });
-var LogoBackground = function (_a) {
-    var hide = _a.hide;
+var LogoBackground = function () {
     var isAr = useLanguage().isAr;
-    return (_jsx(Collapse, __assign({ in: !hide }, { children: _jsxs(BoxStyled, { children: [_jsx(LogoBadgeStyled, { src: ICONS_NAMES.TAP_LOGO_EN_ICON }), _jsx(LogoIconBoxStyled, { children: _jsx(LogoIconStyled, { src: isAr ? ICONS_NAMES.TAP_LOGO_TEXT_AR : ICONS_NAMES.TAP_LOGO_TEXT_EN, alt: 'tap logo' }) })] }) })));
+    return (_jsxs(BoxStyled, { children: [_jsx(LogoBadgeStyled, { src: ICONS_NAMES.TAP_LOGO_EN_ICON }), _jsx(LogoIconStyled, { src: isAr ? ICONS_NAMES.TAP_LOGO_TEXT_AR : ICONS_NAMES.TAP_LOGO_TEXT_EN, alt: 'tap logo' })] }));
 };
 export default memo(LogoBackground);

package/build/features/shared/Footer/Footer.js

@@ -1,15 +1,14 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { LanguageMode } from '../../../@types';
 import { useAppDispatch, useLanguage, useAppSelector } from '../../../hooks';
-import { handleLanguage } from '../../../app/settings';
+import { handleLanguage, settingsSelector } from '../../../app/settings';
 import Footer from '../../../components/Footer';
 import { useTranslation } from 'react-i18next';
-import { connectSelector } from '../../app/connect/connectStore';
 export default function CustomFooter() {
     var isEn = useLanguage().isEn;
     var t = useTranslation().t;
     var dispatch = useAppDispatch();
-    var data = useAppSelector(connectSelector).data;
+    var data = useAppSelector(settingsSelector).data;
     var handleChangeLanguage = function () {
         var language = isEn ? LanguageMode.AR : LanguageMode.EN;
         dispatch(handleLanguage(language));

package/build/hooks/useAppConfig.js

@@ -57,7 +57,7 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 import { useEffect, useState } from 'react';
-import { handleActiveFlowScreens, settingsSelector, getClientIp, getLocale, getBrowserFingerPrint, getOperator, handleSetAppConfig, handleLanguage, handleOpen, handleIsTapOrigin } from '../app/settings';
+import { handleActiveFlowScreens, settingsSelector, getClientIp, getLocale, getBrowserFingerPrint, getOperator, handleSetAppConfig, handleLanguage, handleOpen, handleIsTapOrigin, getCountries } from '../app/settings';
 import { useAppDispatch } from './useAppDispatch';
 import { useAppSelector } from './useAppSelector';
 import { setAxiosGlobalHeaders, axiosInstance } from '../api';
@@ -126,6 +126,9 @@ export var useAppConfig = function (_a) {
                     };
                     return [4, dispatch(getOperator(payload))];
                 case 1:
+                    _c.sent();
+                    return [4, dispatch(getCountries())];
+                case 2:
                     _c.sent();
                     setLoading(false);
                     return [2];

package/package.json

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