@tap-payments/auth-jsconnect 1.0.68 → 1.0.71

package/build/@types/app.d.ts

@@ -80,9 +80,9 @@ export interface SalesChannel {
     title: string;
 }
 export interface SourceOfIncome {
-    id: number;
-    titleAr: string;
-    title: string;
+    id: string;
+    name_ar: string;
+    name_en: string;
 }
 export interface AppInfo {
     name: string;

package/build/api/data.d.ts

@@ -3,5 +3,6 @@ declare const dataService: {
     getCustomerBases: () => Promise<import("axios").AxiosResponse<any, any>>;
     getExpectedSales: () => Promise<import("axios").AxiosResponse<any, any>>;
     getExpectedCustomerSales: () => Promise<import("axios").AxiosResponse<any, any>>;
+    getSourceOfIncome: () => Promise<import("axios").AxiosResponse<any, any>>;
 };
 export { dataService };

package/build/api/data.js

@@ -12,10 +12,14 @@ var getExpectedSales = function () {
 var getExpectedCustomerSales = function () {
     return instance.get("".concat(ENDPOINT_PATHS.EXPECTED_CUSTOMERS));
 };
+var getSourceOfIncome = function () {
+    return instance.get("".concat(ENDPOINT_PATHS.SOURCE_INCOME));
+};
 var dataService = {
     getChannelsOfServices: getChannelsOfServices,
     getCustomerBases: getCustomerBases,
     getExpectedSales: getExpectedSales,
-    getExpectedCustomerSales: getExpectedCustomerSales
+    getExpectedCustomerSales: getExpectedCustomerSales,
+    getSourceOfIncome: getSourceOfIncome
 };
 export { dataService };

package/build/api/index.d.ts

@@ -50,6 +50,7 @@ declare const API: {
         getCustomerBases: () => Promise<import("axios").AxiosResponse<any, any>>;
         getExpectedSales: () => Promise<import("axios").AxiosResponse<any, any>>;
         getExpectedCustomerSales: () => Promise<import("axios").AxiosResponse<any, any>>;
+        getSourceOfIncome: () => Promise<import("axios").AxiosResponse<any, any>>;
     };
 };
 export type { ValidateOperatorBody, CreateAuthBody, VerifyAuthBody, CreateLeadBody, UpdateLeadBody, LeadVerifyBody, LeadOTPVerifyBody, CheckEmailBody, CheckBrandBody, LeadIdentityUpdateBody, EntityInfoBody, CreateAccountBody, EntityBankUpdateBody };

package/build/assets/locales/ar.json

@@ -234,5 +234,6 @@
     "password_flow_pending": "Password",
     "business_flow_pending": "Business",
     "business_flow_completed": "Business",
-    "continue": "Continue"
+    "continue": "Continue",
+    "search_placeholder": "البحث..."
 }

package/build/assets/locales/en.json

@@ -248,5 +248,6 @@
     "password_flow_pending": "Password",
     "business_flow_pending": "Business",
     "business_flow_completed": "Business",
-    "continue": "Continue"
+    "continue": "Continue",
+    "search_placeholder": "search.."
 }

package/build/components/SimpleList/SimpleList.js

@@ -69,6 +69,9 @@ var ListItemStyled = styled(ListItem)(function (_a) {
 function SimpleList(_a) {
     var list = _a.list, listItemProps = _a.listItemProps, onSelectItem = _a.onSelectItem, renderItem = _a.renderItem, children = _a.children, searchKeyPath = _a.searchKeyPath, rest = __rest(_a, ["list", "listItemProps", "onSelectItem", "renderItem", "children", "searchKeyPath"]);
     var _b = React.useState(list), items = _b[0], setItems = _b[1];
+    React.useEffect(function () {
+        setItems(list);
+    }, [list]);
     var filterItems = function (arr, searchKey) {
         return arr.filter(function (item) {
             var searchValue = get(item, searchKeyPath || '') || '';

package/build/constants/api.d.ts

@@ -18,6 +18,7 @@ export declare const ENDPOINT_PATHS: {
     CUSTOMER_BASES: string;
     SALES: string;
     EXPECTED_CUSTOMERS: string;
+    SOURCE_INCOME: string;
     BANK: string;
     IBAN_BANK: string;
 };

package/build/constants/api.js

@@ -18,6 +18,7 @@ var CHANNEL_PATH = '/channel';
 var CUSTOMER_BASES_PATH = '/customerBases';
 var SALES_PATH = '/sales';
 var EXPECTED_CUSTOMERS_PATH = '/expectedCustomers';
+var SOURCE_INCOME_PATH = '/v2/sourceOfIncome';
 var FIREBASE_URL = 'https://goconnect-195cd-default-rtdb.asia-southeast1.firebasedatabase.app/sandbox/local.json';
 export var ENDPOINT_PATHS = {
     BASE_URL: API_BASE_URL,
@@ -39,6 +40,7 @@ export var ENDPOINT_PATHS = {
     CUSTOMER_BASES: CUSTOMER_BASES_PATH,
     SALES: SALES_PATH,
     EXPECTED_CUSTOMERS: EXPECTED_CUSTOMERS_PATH,
+    SOURCE_INCOME: SOURCE_INCOME_PATH,
     BANK: BANK_PATH,
     IBAN_BANK: IBAN_PATH
 };

package/build/constants/assets.d.ts

@@ -35,6 +35,7 @@ export declare const ICONS_NAMES: {
     ABSHER_LOGO: string;
     EMAIL_ICON: string;
     MOBILE_ICON: string;
+    SEARCH_ICON: string;
     GMAIL_Filled_ICON: string;
     GMAIL_White_ICON: string;
     outlook_Filled_ICON: string;
@@ -42,15 +43,21 @@ export declare const ICONS_NAMES: {
     Apple_Filled_ICON: string;
     apple_white_icon: string;
     tax_filled_icon: string;
+    tax_green_icon: string;
     tax_white_icon: string;
     bank_filled_icon: string;
+    bank_green_icon: string;
     bank_white_icon: string;
     individual_filled_icon: string;
+    individual_green_icon: string;
     individual_white_icon: string;
     password_filled_icon: string;
+    password_green_icon: string;
     password_white_icon: string;
     business_filled_icon: string;
+    business_green_icon: string;
     business_white_icon: string;
     Arrow_filled_right_icon: string;
+    Arrow_green_right_icon: string;
     Arrow_white_right_icon: string;
 };

package/build/constants/assets.js

@@ -35,22 +35,29 @@ export var ICONS_NAMES = {
     ABSHER_LOGO: 'https://dash.b-cdn.net/icons/menu/Absher.svg',
     EMAIL_ICON: 'https://dash.b-cdn.net/icons/menu/email.png',
     MOBILE_ICON: 'https://dash.b-cdn.net/icons/menu/mobile.svg',
+    SEARCH_ICON: 'https://dash.b-cdn.net/icons/menu/search-icon.svg',
     GMAIL_Filled_ICON: 'https://dash.b-cdn.net/icons/menu/Gmail-filled.svg',
     GMAIL_White_ICON: 'https://dash.b-cdn.net/icons/menu/Gmail-white.svg',
     outlook_Filled_ICON: 'https://dash.b-cdn.net/icons/menu/Outlook-filled.svg',
     outlook_White_ICON: 'https://dash.b-cdn.net/icons/menu/Outlook-white.svg',
     Apple_Filled_ICON: 'https://dash.b-cdn.net/icons/menu/Apple-filled.svg',
     apple_white_icon: 'https://dash.b-cdn.net/icons/menu/Apple-white.svg',
-    tax_filled_icon: 'https://dash.b-cdn.net/icons/menu/tax-filled.svg',
+    tax_filled_icon: 'https://dash.b-cdn.net/icons/menu/tax-filled-blue.svg',
+    tax_green_icon: 'https://dash.b-cdn.net/icons/menu/tax-filled-green.svg',
     tax_white_icon: 'https://dash.b-cdn.net/icons/menu/tax-white.svg',
-    bank_filled_icon: 'https://dash.b-cdn.net/icons/menu/bank-filled.svg',
+    bank_filled_icon: 'https://dash.b-cdn.net/icons/menu/bank-filled-blue.svg',
+    bank_green_icon: 'https://dash.b-cdn.net/icons/menu/bank-filled-green.svg',
     bank_white_icon: 'https://dash.b-cdn.net/icons/menu/bank-white.svg',
-    individual_filled_icon: 'https://dash.b-cdn.net/icons/menu/user-filled.svg',
+    individual_filled_icon: 'https://dash.b-cdn.net/icons/menu/user-filled-blue.svg',
+    individual_green_icon: 'https://dash.b-cdn.net/icons/menu/user-filled-green.svg',
     individual_white_icon: 'https://dash.b-cdn.net/icons/menu/user-white.svg',
-    password_filled_icon: 'https://dash.b-cdn.net/icons/menu/password-filled.svg',
+    password_filled_icon: 'https://dash.b-cdn.net/icons/menu/password-filled-blue.svg',
+    password_green_icon: 'https://dash.b-cdn.net/icons/menu/password-filled-green.svg',
     password_white_icon: 'https://dash.b-cdn.net/icons/menu/password-white.svg',
-    business_filled_icon: 'https://dash.b-cdn.net/icons/menu/business-filled.svg',
+    business_filled_icon: 'https://dash.b-cdn.net/icons/menu/business-filled-blue.svg',
+    business_green_icon: 'https://dash.b-cdn.net/icons/menu/business-filled-green.svg',
     business_white_icon: 'https://dash.b-cdn.net/icons/menu/business-white.svg',
-    Arrow_filled_right_icon: 'https://dash.b-cdn.net/icons/menu/right-arrow-filled.svg',
+    Arrow_filled_right_icon: 'https://dash.b-cdn.net/icons/menu/right-arrow-filled-blue.svg',
+    Arrow_green_right_icon: 'https://dash.b-cdn.net/icons/menu/right-arrow-filled-green.svg',
     Arrow_white_right_icon: 'https://dash.b-cdn.net/icons/menu/right-arrow-white.svg'
 };

package/build/constants/dummy.d.ts

@@ -314,7 +314,7 @@ export declare const SALES_CHANNELS: {
     titleAr: string;
 }[];
 export declare const SOURCE_OF_INCOME: {
-    id: number;
+    id: string;
     titleAr: string;
     title: string;
 }[];

package/build/constants/dummy.js

@@ -6400,12 +6400,12 @@ export var SALES_CHANNELS = [
     { id: 5, title: 'Call Center', titleAr: 'مركز اتصال' }
 ];
 export var SOURCE_OF_INCOME = [
-    { id: 1, titleAr: 'راتب', title: 'Salary' },
-    { id: 2, titleAr: 'تمويل', title: 'Investment' },
-    { id: 3, titleAr: 'ورث', title: 'Inheritance / inherit' },
-    { id: 4, titleAr: 'اسهم', title: 'Stocks' },
-    { id: 5, titleAr: 'تجارة', title: 'Trading' },
-    { id: 6, titleAr: 'غير ذلك', title: 'Other' }
+    { id: '1', titleAr: 'راتب', title: 'Salary' },
+    { id: '2', titleAr: 'تمويل', title: 'Investment' },
+    { id: '3', titleAr: 'ورث', title: 'Inheritance / inherit' },
+    { id: '4', titleAr: 'اسهم', title: 'Stocks' },
+    { id: '5', titleAr: 'تجارة', title: 'Trading' },
+    { id: '6', titleAr: 'غير ذلك', title: 'Other' }
 ];
 export var BRAND_LIST = [
     {

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

@@ -469,7 +469,9 @@ export var businessSlice = createSlice({
             state.error = null;
             state.customLoading = false;
             var _a = action.payload, businessCountry = _a.businessCountry, countries = _a.countries;
-            state.data.countries = 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) {
@@ -527,7 +529,7 @@ export var businessSlice = createSlice({
             var _a, _b;
             if ((_a = action.meta.arg) === null || _a === void 0 ? void 0 : _a.isResend)
                 state.customLoading = true;
-            if ((_b = action.meta.arg) === null || _b === void 0 ? void 0 : _b.isResend)
+            if (!((_b = action.meta.arg) === null || _b === void 0 ? void 0 : _b.isResend))
                 state.loading = true;
             state.error = null;
         })

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

@@ -265,7 +265,7 @@ export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (param
         switch (_m.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, connect = _a.connect;
-                instagram = !!((_c = params.links) === null || _c === void 0 ? void 0 : _c.instagram) ? "".concat(INSTAGRAM_URL, "/").concat((_d = params.links) === null || _d === void 0 ? void 0 : _d.twitter) : '';
+                instagram = !!((_c = params.links) === null || _c === void 0 ? void 0 : _c.instagram) ? "".concat(INSTAGRAM_URL, "/").concat((_d = params.links) === null || _d === void 0 ? void 0 : _d.instagram) : '';
                 twitter = !!((_e = params.links) === null || _e === void 0 ? void 0 : _e.twitter) ? "".concat(TWITTER_URL, "/").concat((_f = params.links) === null || _f === void 0 ? void 0 : _f.twitter) : '';
                 _b = connect.data, mobileData = _b.mobileData, nidData = _b.nidData, otpData = _b.otpData, brandData = _b.brandData;
                 isAbsher = otpData.isAbsher;
@@ -440,7 +440,9 @@ export var connectSlice = createSlice({
             state.error = null;
             state.customLoading = false;
             var _a = action.payload, countries = _a.countries, businessCountry = _a.businessCountry;
-            state.data.countries = countries;
+            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;
         })

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

@@ -1,10 +1,15 @@
 import { RootState } from '../../../app/store';
-import { IndividualExtraFormValues, OTPFormValues, ResponseData, SharedState } from '../../../@types';
+import { CountryCode, 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;
     token: string;
 }, string, {}>;
+export declare const retrieveDataList: import("@reduxjs/toolkit").AsyncThunk<any, void, {}>;
 export declare const verifyLeadOTP: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
     formData: {
@@ -23,6 +28,8 @@ 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

@@ -50,7 +50,23 @@ import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import API from '../../../api';
 import { removeRequestHeaders } from '../../../utils';
 import { handleNextScreenStep } from '../../../app/settings';
-import { INDIVIDUAl_STEP_NAMES } from '../../../constants';
+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 }];
+        }
+    });
+}); });
 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) {
@@ -76,6 +92,17 @@ export var verifyLeadToken = createAsyncThunk('verifyLeadToken', function (token
         }
     });
 }); });
+export var retrieveDataList = createAsyncThunk('retrieveDataList', function () { return __awaiter(void 0, void 0, void 0, function () {
+    var sourceIncome;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0: return [4, API.dataService.getSourceOfIncome()];
+            case 1:
+                sourceIncome = (_a.sent()).data;
+                return [2, sourceIncome];
+        }
+    });
+}); });
 export var verifyLeadOTP = createAsyncThunk('verifyIndividualLeadOTP', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, individual, settings, responseBody, payload, data, steps, hasIndividualCompleted;
     var _b, _c, _d, _e;
@@ -94,18 +121,19 @@ export var verifyLeadOTP = createAsyncThunk('verifyIndividualLeadOTP', function
                 return [4, API.leadService.verifyLeadOTP(payload)];
             case 1:
                 data = (_f.sent()).data;
-                if (!data.errors) {
-                    (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, { otp: params.otp });
-                    steps = (_e = individual.data.verify.responseBody) === null || _e === void 0 ? void 0 : _e.steps;
-                    hasIndividualCompleted = Object.keys(steps).find(function (key) { return key === INDIVIDUAl_STEP_NAMES.INDIVIDUAl_SUCCESS; });
-                    if (hasIndividualCompleted) {
-                        thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_SUCCESS_STEP'));
-                    }
-                    else {
-                        thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_ADDITIONAL_INDIVIDUAL_INFO_STEP'));
-                    }
-                }
-                return [2, { data: data, formData: __assign({}, params) }];
+                if (!!data.errors) return [3, 4];
+                (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, { otp: params.otp });
+                steps = (_e = individual.data.verify.responseBody) === null || _e === void 0 ? void 0 : _e.steps;
+                hasIndividualCompleted = Object.keys(steps).find(function (key) { return key === INDIVIDUAl_STEP_NAMES.INDIVIDUAl_SUCCESS; });
+                if (!hasIndividualCompleted) return [3, 2];
+                thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_SUCCESS_STEP'));
+                return [3, 4];
+            case 2: return [4, thunkApi.dispatch(retrieveDataList())];
+            case 3:
+                _f.sent();
+                thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_ADDITIONAL_INDIVIDUAL_INFO_STEP'));
+                _f.label = 4;
+            case 4: return [2, { data: data, formData: __assign({}, params) }];
         }
     });
 }); });
@@ -120,10 +148,11 @@ export var updateIndividualInfo = createAsyncThunk('updateIndividualInfo', funct
                     id: (_c = (_b = individual.data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.entity) === null || _c === void 0 ? void 0 : _c.id,
                     employer_name: params.employerName,
                     employer_city: (_d = params.employerLocation) === null || _d === void 0 ? void 0 : _d.iso2,
-                    source_income: [(_e = params.sourceIncome) === null || _e === void 0 ? void 0 : _e.title],
+                    source_income: [(_e = params.sourceIncome) === null || _e === void 0 ? void 0 : _e.id],
                     actual_income: params.monthlyIncome,
                     is_relative_PEP: params.isPEP,
                     is_influencer: params.isInfluencer,
+                    encryption_contract: ['employer_name', 'employer_city', 'actual_income', 'is_relative_PEP', 'is_influencer'],
                     step_name: INDIVIDUAl_STEP_NAMES.INDIVIDUAl_INFO
                 };
                 return [4, API.entityService.updateEntityInfo(requestBody)];
@@ -164,8 +193,9 @@ export var updateLeadSuccess = createAsyncThunk('updateLeadSuccess', function (p
 var initialState = {
     error: null,
     loading: false,
-    customLoading: false,
     data: {
+        countries: [],
+        businessCountry: defaultCountry,
         verify: {
             token: ''
         },
@@ -198,6 +228,23 @@ 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;
@@ -239,6 +286,29 @@ export var individualSlice = createSlice({
             .addCase(verifyLeadOTP.rejected, function (state, action) {
             state.loading = false;
             state.error = action.error.message;
+        })
+            .addCase(retrieveDataList.pending, function (state) {
+            state.loading = true;
+            state.error = null;
+        })
+            .addCase(retrieveDataList.fulfilled, function (state, action) {
+            var _a, _b;
+            state.loading = false;
+            state.error = null;
+            var sourceIncome = action.payload;
+            var data = state.data.individualData.responseBody;
+            state.data.individualData.responseBody = __assign(__assign({}, data), { sourceIncomeList: sourceIncome || [] });
+            var selectedSourceIncome = sourceIncome === null || sourceIncome === void 0 ? void 0 : sourceIncome[0];
+            if (!!selectedSourceIncome)
+                state.data.individualData.sourceIncome = selectedSourceIncome;
+            var location = (_b = (_a = state.data.verify.responseBody) === null || _a === void 0 ? void 0 : _a.entity) === null || _b === void 0 ? void 0 : _b.country;
+            if (!!location) {
+                state.data.individualData.employerLocation = state.data.countries.find(function (country) { return country.iso2 === location; });
+            }
+        })
+            .addCase(retrieveDataList.rejected, function (state, action) {
+            state.loading = false;
+            state.error = action.error.message;
         })
             .addCase(updateIndividualInfo.pending, function (state) {
             state.loading = true;

package/build/features/bank/screens/BankDetails/BankName.js

@@ -1,3 +1,14 @@
+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 { ScreenContainer } from '../../../shared/Containers';
@@ -10,10 +21,11 @@ import CheckIcon from '../../../shared/CheckIcon';
 import { bankSelector } from '../../../app/bank/bankStore';
 import { useAppSelector } from '../../../../hooks';
 import { removeAllOtherThanAlphabetAndSpace } from '../../../../utils';
+import Collapse from '../../../../components/Collapse';
 var FeatureStyled = styled(ScreenContainer)(function (_a) {
     var theme = _a.theme;
     return ({
-        marginBlockEnd: theme.spacing(3)
+        marginBlockStart: theme.spacing(3)
     });
 });
 var InputStyled = styled(Input)(function () { return ({
@@ -25,22 +37,23 @@ var BankName = function () {
     var _a, _b;
     var t = useTranslation().t;
     var _c = useFormContext(), setValue = _c.setValue, control = _c.control;
-    var _d = useAppSelector(bankSelector), data = _d.data, loading = _d.loading;
+    var data = useAppSelector(bankSelector).data;
     var bankNameControl = useController({ name: 'bankName', control: control });
     var bankNameValue = bankNameControl.field.value;
     var hasError = !!((_a = bankNameControl.fieldState.error) === null || _a === void 0 ? void 0 : _a.message);
-    var bankName = (_b = data.bankData.responseBody) === null || _b === void 0 ? void 0 : _b.bank_name;
     var clearValue = function () {
         bankNameControl.field.onChange('');
     };
     React.useEffect(function () {
+        var _a;
+        var bankName = (_a = data.bankData.responseBody) === null || _a === void 0 ? void 0 : _a.bank_name;
         setValue('bankName', bankName);
-    }, []);
+    }, [(_b = data.bankData.responseBody) === null || _b === void 0 ? void 0 : _b.bank_name]);
     var handleBankChange = function (_a) {
         var target = _a.target;
         var value = removeAllOtherThanAlphabetAndSpace(target.value);
         bankNameControl.field.onChange(value);
     };
-    return (_jsx(FeatureStyled, { children: _jsx(InputStyled, { label: t('enter_bank_name'), placeholder: t('enter_bank_name_placeholder'), onChange: handleBankChange, value: bankNameValue, required: true, disabled: !!bankName, endAdornment: !hasError && bankNameValue ? _jsx(CheckIcon, {}) : bankNameValue && _jsx(ClearIcon, { onClick: clearValue }) }) }));
+    return (_jsx(Collapse, __assign({ in: !!bankNameValue }, { children: _jsx(FeatureStyled, { children: _jsx(InputStyled, { label: t('enter_bank_name'), placeholder: t('enter_bank_name_placeholder'), onChange: handleBankChange, value: bankNameValue, required: true, readOnly: true, endAdornment: !hasError && bankNameValue ? _jsx(CheckIcon, {}) : bankNameValue && _jsx(ClearIcon, { onClick: clearValue }) }) }) })));
 };
 export default BankName;

package/build/features/bank/screens/BankDetails/IBAN.js

@@ -40,7 +40,6 @@ import Input from '../../../shared/Input';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import { removeAllOtherThanCharsAndNumber } from '../../../../utils';
-import { styled } from '@mui/material';
 import { MAX_IBAN_VALUE } from '../../../../constants';
 import { ScreenContainer } from '../../../shared/Containers';
 import { debounce } from 'lodash-es';
@@ -50,12 +49,6 @@ import axios from 'axios';
 import ClearIcon from '../../../shared/ClearIcon';
 import CheckIcon from '../../../shared/CheckIcon';
 import CircularProgress from '@mui/material/CircularProgress';
-var FeatureStyled = styled(ScreenContainer)(function (_a) {
-    var theme = _a.theme;
-    return ({
-        marginBlockEnd: theme.spacing(3)
-    });
-});
 var cancelToken = null;
 var IBAN = function (_a) {
     var _b;
@@ -93,6 +86,6 @@ var IBAN = function (_a) {
     var clearValue = function () {
         ibanControl.field.onChange('');
     };
-    return (_jsx(FeatureStyled, { children: _jsx(Input, { label: t('enter_iban'), inputProps: { maxLength: MAX_IBAN_VALUE }, onChange: handleIbanChange, value: ibanValue, placeholder: t('enter_iban_placeholder'), warningType: 'alert', warningMessage: error && t(error), required: true, endAdornment: ibanChecking ? (_jsx(CircularProgress, { size: 25, thickness: 5, sx: { height: 'auto !important' } })) : !error && ibanValue ? (_jsx(CheckIcon, {})) : (ibanValue && _jsx(ClearIcon, { onClick: clearValue })) }) }));
+    return (_jsx(ScreenContainer, { children: _jsx(Input, { label: t('enter_iban'), inputProps: { maxLength: MAX_IBAN_VALUE }, onChange: handleIbanChange, value: ibanValue, placeholder: t('enter_iban_placeholder'), warningType: 'alert', warningMessage: error && t(error), required: true, endAdornment: ibanChecking ? (_jsx(CircularProgress, { size: 25, thickness: 5, sx: { height: 'auto !important' } })) : !error && ibanValue ? (_jsx(CheckIcon, {})) : (ibanValue && _jsx(ClearIcon, { onClick: clearValue })) }) }));
 };
 export default IBAN;

package/build/features/bank/screens/BankDetails/validation.d.ts

@@ -1,14 +1,14 @@
 import * as yup from 'yup';
 export declare const BankValidation: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     iban: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
-    bankName: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+    bankName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     beneficiaryName: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
 }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     iban: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
-    bankName: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+    bankName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     beneficiaryName: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
 }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     iban: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
-    bankName: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+    bankName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     beneficiaryName: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
 }>>>;

package/build/features/bank/screens/BankDetails/validation.js

@@ -7,7 +7,7 @@ export var BankValidation = yup.object().shape({
         .min(16, 'invalid_iban_format')
         .max(34, 'invalid_iban_format')
         .required('alert_iban'),
-    bankName: yup.string().required('bank_name_required'),
+    bankName: yup.string().optional(),
     beneficiaryName: yup
         .string()
         .matches(REGEX_BENEFICIARY_NAME, 'beneficiary_name_invalid')

package/build/features/bank/screens/Verify/Verify.js

@@ -13,13 +13,12 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { useAppDispatch } from '../../../../hooks';
 import { useTranslation } from 'react-i18next';
-import { useSelector } from 'react-redux';
 import { useForm, FormProvider } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import Box from '@mui/material/Box/Box';
 import { styled } from '@mui/material/styles';
 import { handlePrevScreenStep } from '../../../../app/settings';
-import { useLanguage } from '../../../../hooks';
+import { useLanguage, useAppSelector } from '../../../../hooks';
 import { maskPhone } from '../../../../utils';
 import Form from '../../../../components/Form';
 import Text from '../../../../components/Text';
@@ -50,7 +49,7 @@ var FormStyled = styled(Form)(function () { return ({
 var VerifyNumber = function (_a) {
     var _b, _c, _d;
     var dispatch = useAppDispatch();
-    var _e = useSelector(bankSelector), data = _e.data, loading = _e.loading, error = _e.error;
+    var _e = useAppSelector(bankSelector), data = _e.data, loading = _e.loading, error = _e.error;
     var methods = useForm({
         resolver: yupResolver(OTPValidation),
         defaultValues: data.otpData,
@@ -73,6 +72,6 @@ var VerifyNumber = function (_a) {
     };
     var phone = (_d = (_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.contact) === null || _c === void 0 ? void 0 : _c.phone) === null || _d === void 0 ? void 0 : _d.number;
     var disabled = !methods.formState.isValid || !!error || !phone;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [loading ? t('ide_otp_waiting_title') : t('ide_opt_sent_title'), !loading && phone && _jsx("span", __assign({ dir: 'ltr' }, { children: "".concat(maskPhone(phone || '')) }))] }) }), _jsx(OTPInput, {}), _jsx(Button, __assign({ disableBack: true, onBackClicked: function () { return onBack(); }, disabled: disabled, type: 'submit', isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [loading ? t('ide_otp_waiting_title') : t('ide_opt_sent_title'), !loading && phone && _jsx("span", __assign({ dir: 'ltr' }, { children: "".concat(maskPhone(phone || '')) }))] }) }), _jsx(OTPInput, {}), _jsx(Button, __assign({ disableBack: true, onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
 };
 export default React.memo(VerifyNumber);

package/build/features/business/screens/Activities/Activities.js

@@ -11,11 +11,10 @@ var __assign = (this && this.__assign) || function () {
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
-import { useSelector } from 'react-redux';
 import { styled } from '@mui/material/styles';
 import ActivitiesList from './ActivitiesList';
 import { useForm, FormProvider } from 'react-hook-form';
-import { useAppDispatch, useLanguage } from '../../../../hooks';
+import { useAppDispatch, useLanguage, useAppSelector } from '../../../../hooks';
 import Form from '../../../../components/Form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { useTranslation } from 'react-i18next';
@@ -37,7 +36,7 @@ var Activities = function () {
     var dispatch = useAppDispatch();
     var isAr = useLanguage().isAr;
     var t = useTranslation().t;
-    var _c = useSelector(businessSelector), data = _c.data, loading = _c.loading, error = _c.error;
+    var _c = useAppSelector(businessSelector), data = _c.data, loading = _c.loading, error = _c.error;
     var activitiesData = data.activitiesData;
     var methods = useForm({
         resolver: yupResolver(ActivitiesValidationSchema),

package/build/features/business/screens/Activities/ActivitiesList.js

@@ -31,14 +31,13 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import * as React from 'react';
-import { useSelector } from 'react-redux';
 import Box from '@mui/material/Box';
 import { alpha, styled } from '@mui/material/styles';
 import Text from '../../../../components/Text';
 import Input from '../../../../components/Input';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
-import { useLanguage } from '../../../../hooks';
+import { useLanguage, useAppSelector } from '../../../../hooks';
 import { BusinessType } from '../../../../@types';
 import Collapse from '../../../../components/Collapse';
 import SimpleList from '../../../../components/SimpleList';
@@ -83,7 +82,7 @@ var ActivitiesList = function (_a) {
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var control = useFormContext().control;
-    var data = useSelector(businessSelector).data;
+    var data = useAppSelector(businessSelector).data;
     var activitiesControl = useController({ name: 'activities', control: control });
     var controlValue = activitiesControl.field.value;
     var businessTypeData = data.businessTypeData;