@tap-payments/auth-jsconnect 2.1.78-test → 2.1.80-test

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

@@ -241,8 +241,12 @@ export interface LocalProps {
 }
 export declare type BrandInfo = {
     segment?: {
-        type: string;
-        team: string;
+        type: {
+            id: string;
+        };
+        team: {
+            id: string;
+        };
     };
     id: string;
     name: {

package/build/api/entity.d.ts

@@ -44,10 +44,10 @@ export declare type BankDocumentInfo = {
 export declare type EntityBankUpdateBody = {
     wallet_id: string;
     bank_account: {
-        bank_name: string;
-        beneficiary_name: string;
+        bank_name?: string;
+        beneficiary_name?: string;
         bank_statement_file_id?: string;
-        iban: string;
+        iban?: string;
         swift_code?: string;
         account_number?: string;
         is_acknowledged: boolean;

package/build/assets/locales/ar.json

@@ -386,5 +386,6 @@
     "share_count_label": "عدد الأسهم",
     "share_count_hint": "0",
     "share_value_label": "قيمة السهم",
-    "share_value_hint": "0000"
+    "share_value_hint": "0000",
+    "brand": "الاسم التجاري"
 }

package/build/assets/locales/en.json

@@ -416,5 +416,6 @@
     "share_count_label": "Share Count",
     "share_count_hint": "0",
     "share_value_label": "Share Value",
-    "share_value_hint": "0000"
+    "share_value_hint": "0000",
+    "brand": "Brand"
 }

package/build/features/app/bank/bankStore.js

@@ -48,7 +48,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var _a;
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import API from '../../../api';
-import { FlowsTypes } from '../../../@types';
+import { FieldType, FlowsTypes } from '../../../@types';
 import { handleCurrentActiveScreen, handleNextScreenStep, handleSetCountryByIso2 } from '../../../app/settings';
 import { BANK_STEP_NAMES } from '../../../constants';
 export var verifyLeadToken = createAsyncThunk('bankVerifyLeadToken', function (_a, thunkApi) {
@@ -180,21 +180,26 @@ export var retrieveBoardDetails = createAsyncThunk('retrieveBankEntityInfo', fun
     });
 }); });
 export var createBankAccount = createAsyncThunk('createBankAccount', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, bank, iban, beneficiaryName, bankName, bankStatementId, confirmPolicy, requestBody, data;
-    var _b, _c, _d, _e, _f, _g, _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var _a, settings, bank, iban, beneficiaryName, bankName, bankStatementId, confirmPolicy, bank_account, isIBANEditable, isBeneficiaryNameEditable, isBankNameEditable, isBankStatementIdEditable, requestBody, data;
+    var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+    return __generator(this, function (_o) {
+        switch (_o.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, bank = _a.bank;
                 iban = params.iban, beneficiaryName = params.beneficiaryName, bankName = params.bankName, bankStatementId = params.bankStatementId, confirmPolicy = params.confirmPolicy;
+                bank_account = (bank.data.verify.responseBody || {}).bank_account;
+                isIBANEditable = ((_b = bank_account === null || bank_account === void 0 ? void 0 : bank_account.data_status) === null || _b === void 0 ? void 0 : _b.iban) === FieldType.EDITABLE;
+                isBeneficiaryNameEditable = ((_c = bank_account === null || bank_account === void 0 ? void 0 : bank_account.data_status) === null || _c === void 0 ? void 0 : _c.beneficiary_name) === FieldType.EDITABLE;
+                isBankNameEditable = ((_d = bank_account === null || bank_account === void 0 ? void 0 : bank_account.data_status) === null || _d === void 0 ? void 0 : _d.bank_name) === FieldType.EDITABLE;
+                isBankStatementIdEditable = ((_e = bank_account === null || bank_account === void 0 ? void 0 : bank_account.data_status) === null || _e === void 0 ? void 0 : _e.bank_statement_file_id) === FieldType.EDITABLE;
                 requestBody = {
-                    wallet_id: (_f = (_e = (_d = (_c = (_b = bank.data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.business) === null || _c === void 0 ? void 0 : _c.entity) === null || _d === void 0 ? void 0 : _d.merchant) === null || _e === void 0 ? void 0 : _e.wallet) === null || _f === void 0 ? void 0 : _f.id,
+                    wallet_id: (_k = (_j = (_h = (_g = (_f = bank.data.verify.responseBody) === null || _f === void 0 ? void 0 : _f.business) === null || _g === void 0 ? void 0 : _g.entity) === null || _h === void 0 ? void 0 : _h.merchant) === null || _j === void 0 ? void 0 : _j.wallet) === null || _k === void 0 ? void 0 : _k.id,
                     bank_account: {
-                        iban: iban,
-                        beneficiary_name: beneficiaryName,
-                        bank_name: bankName,
+                        iban: isIBANEditable ? iban : undefined,
+                        beneficiary_name: isBeneficiaryNameEditable ? beneficiaryName : undefined,
+                        bank_name: isBankNameEditable ? bankName : undefined,
                         is_acknowledged: confirmPolicy,
-                        document: (bankStatementId || []).length > 0
+                        document: isBankStatementIdEditable && (bankStatementId || []).length > 0
                             ? {
                                 type: 'bank_statement',
                                 files: bankStatementId || []
@@ -206,10 +211,10 @@ export var createBankAccount = createAsyncThunk('createBankAccount', function (p
                 };
                 return [4, API.entityService.createBankAccount(requestBody)];
             case 1:
-                data = (_j.sent()).data;
+                data = (_o.sent()).data;
                 if (!data.errors) {
                     thunkApi.dispatch(handleNextScreenStep());
-                    (_h = (_g = settings.data.appConfig).onStepCompleted) === null || _h === void 0 ? void 0 : _h.call(_g, settings.data.activeScreen.name, requestBody);
+                    (_m = (_l = settings.data.appConfig).onStepCompleted) === null || _m === void 0 ? void 0 : _m.call(_l, settings.data.activeScreen.name, requestBody);
                 }
                 return [2, { data: data, formData: params }];
         }

package/build/features/app/brand/brandStore.js

@@ -463,12 +463,12 @@ export var brandSlice = createSlice({
             var brand = boardResponse.brand, entity = boardResponse.entity;
             state.data.brandData.brandName = (_a = brand === null || brand === void 0 ? void 0 : brand.name) === null || _a === void 0 ? void 0 : _a.en;
             var selectedSegment = (_b = segmentsList === null || segmentsList === void 0 ? void 0 : segmentsList.filter(function (segment) {
-                var _a;
-                return segment.id === ((_a = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _a === void 0 ? void 0 : _a.type);
+                var _a, _b;
+                return segment.id === ((_b = (_a = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _a === void 0 ? void 0 : _a.type) === null || _b === void 0 ? void 0 : _b.id);
             })) === null || _b === void 0 ? void 0 : _b[0];
             var selectedTeamSize = (_c = teamSizeList === null || teamSizeList === void 0 ? void 0 : teamSizeList.filter(function (team) {
-                var _a;
-                return team.id === ((_a = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _a === void 0 ? void 0 : _a.team);
+                var _a, _b;
+                return team.id === ((_b = (_a = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _a === void 0 ? void 0 : _a.team) === null || _b === void 0 ? void 0 : _b.id);
             })) === null || _c === void 0 ? void 0 : _c[0];
             (_d = brand === null || brand === void 0 ? void 0 : brand.terms) === null || _d === void 0 ? void 0 : _d.forEach(function (element) {
                 if ((element === null || element === void 0 ? void 0 : element.term) === 'general') {
@@ -515,12 +515,12 @@ export var brandSlice = createSlice({
             state.data.otpData.responseBody = data;
             state.data.brandData.brandName = (_a = brand === null || brand === void 0 ? void 0 : brand.name) === null || _a === void 0 ? void 0 : _a.en;
             var selectedSegment = (_b = segmentsList === null || segmentsList === void 0 ? void 0 : segmentsList.filter(function (segment) {
-                var _a;
-                return segment.id === ((_a = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _a === void 0 ? void 0 : _a.type);
+                var _a, _b;
+                return segment.id === ((_b = (_a = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _a === void 0 ? void 0 : _a.type) === null || _b === void 0 ? void 0 : _b.id);
             })) === null || _b === void 0 ? void 0 : _b[0];
             var selectedTeamSize = (_c = teamSizeList === null || teamSizeList === void 0 ? void 0 : teamSizeList.filter(function (team) {
-                var _a;
-                return team.id === ((_a = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _a === void 0 ? void 0 : _a.team);
+                var _a, _b;
+                return team.id === ((_b = (_a = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _a === void 0 ? void 0 : _a.team) === null || _b === void 0 ? void 0 : _b.id);
             })) === null || _c === void 0 ? void 0 : _c[0];
             state.data.brandData.segment = selectedSegment;
             state.data.brandData.teamSize = selectedTeamSize;

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

@@ -834,14 +834,14 @@ export var connectSlice = createSlice({
             var selectedBrand = ((_b = (_a = state.data.brandData) === null || _a === void 0 ? void 0 : _a.responseBody) === null || _b === void 0 ? void 0 : _b.brand_list[0]) || leadResponse.brand;
             state.data.brandData.brandName = (_c = selectedBrand === null || selectedBrand === void 0 ? void 0 : selectedBrand.name) === null || _c === void 0 ? void 0 : _c.en;
             state.data.brandData.segment = rest.segments_list.find(function (_a) {
-                var _b;
+                var _b, _c;
                 var id = _a.id;
-                return ((_b = selectedBrand === null || selectedBrand === void 0 ? void 0 : selectedBrand.segment) === null || _b === void 0 ? void 0 : _b.type) === id;
+                return ((_c = (_b = selectedBrand === null || selectedBrand === void 0 ? void 0 : selectedBrand.segment) === null || _b === void 0 ? void 0 : _b.type) === null || _c === void 0 ? void 0 : _c.id) === id;
             });
             state.data.brandData.teamSize = rest.team_size_list.find(function (_a) {
-                var _b;
+                var _b, _c;
                 var id = _a.id;
-                return ((_b = selectedBrand === null || selectedBrand === void 0 ? void 0 : selectedBrand.segment) === null || _b === void 0 ? void 0 : _b.team) === id;
+                return ((_c = (_b = selectedBrand === null || selectedBrand === void 0 ? void 0 : selectedBrand.segment) === null || _b === void 0 ? void 0 : _b.team) === null || _c === void 0 ? void 0 : _c.id) === id;
             });
             state.data.individualData = formData;
             state.data.individualData.responseBody = rest;

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

@@ -858,10 +858,20 @@ export var individualSlice = createSlice({
             state.error = null;
         })
             .addCase(getCityList.fulfilled, function (state, action) {
+            var _a;
             state.cityLoading = false;
             state.error = null;
             var data = state.data.verify.responseBody;
-            state.data.verify.responseBody = __assign(__assign({}, data), { cityList: action.payload });
+            var cityList = action.payload;
+            state.data.verify.responseBody = __assign(__assign({}, data), { cityList: cityList });
+            var birth = (((_a = state.data.verify.responseBody) === null || _a === void 0 ? void 0 : _a.user) || {}).birth;
+            var city = (birth || {}).city;
+            if (city) {
+                var selectedCity = cityList === null || cityList === void 0 ? void 0 : cityList.find(function (c) {
+                    return c.name.en === city;
+                });
+                state.data.individualPersonalData.placeOfBirthCity = selectedCity;
+            }
         })
             .addCase(getCityList.rejected, function (state, action) {
             state.cityLoading = false;

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

@@ -42,18 +42,19 @@ var ButtonStyled = styled(Button)(function (_a) {
     });
 });
 var BankDetails = function () {
-    var _a, _b, _c, _d, _e, _f, _g;
-    var _h = React.useState(false), ibanChecking = _h[0], setIbanChecking = _h[1];
+    var _a, _b, _c;
+    var _d = React.useState(false), ibanChecking = _d[0], setIbanChecking = _d[1];
     var dispatch = useAppDispatch();
-    var _j = useAppSelector(bankSelector), data = _j.data, loading = _j.loading, error = _j.error;
+    var _e = useAppSelector(bankSelector), data = _e.data, loading = _e.loading, error = _e.error;
     var settingsData = useAppSelector(settingsSelector).data;
-    var _k = data.bankData, iban = _k.iban, beneficiaryName = _k.beneficiaryName, bankName = _k.bankName, bankStatementId = _k.bankStatementId, bankStatementUploading = _k.uploading, confirmPolicy = _k.confirmPolicy;
+    var _f = data.bankData, iban = _f.iban, beneficiaryName = _f.beneficiaryName, bankName = _f.bankName, bankStatementId = _f.bankStatementId, bankStatementUploading = _f.uploading, confirmPolicy = _f.confirmPolicy;
     var verify = data.verify;
+    var _g = verify.responseBody || {}, bank_account = _g.bank_account, entity = _g.entity;
     var isKWCountry = React.useMemo(function () { return isKW(settingsData.businessCountry.iso2); }, [settingsData.businessCountry.iso2]);
-    var isFL = ((_c = (_b = (_a = verify.responseBody) === null || _a === void 0 ? void 0 : _a.entity) === null || _b === void 0 ? void 0 : _b.type) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === BusinessType.FL ? true : false;
-    var bankHasDocument = ((_g = (_f = (_e = (_d = verify.responseBody) === null || _d === void 0 ? void 0 : _d.bank_account) === null || _e === void 0 ? void 0 : _e.document) === null || _f === void 0 ? void 0 : _f.file_details) === null || _g === void 0 ? void 0 : _g.length) > 0;
+    var isFL = ((_a = entity === null || entity === void 0 ? void 0 : entity.type) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === BusinessType.FL ? true : false;
+    var bankHasDocument = ((_c = (_b = bank_account === null || bank_account === void 0 ? void 0 : bank_account.document) === null || _b === void 0 ? void 0 : _b.file_details) === null || _c === void 0 ? void 0 : _c.length) > 0;
     var methods = useForm({
-        resolver: yupResolver(isKWCountry && isFL && !bankHasDocument ? BankKWFLValidation : BankValidation),
+        resolver: yupResolver(isKWCountry && isFL && !bankHasDocument ? BankKWFLValidation(bank_account) : BankValidation(bank_account)),
         defaultValues: {
             iban: iban,
             beneficiaryName: beneficiaryName,

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

@@ -11,17 +11,18 @@ var __assign = (this && this.__assign) || function () {
 };
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
-import { ScreenContainer } from '../../../shared/Containers';
-import Input from '../../../shared/Input';
-import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 import { styled } from '@mui/material/styles';
-import ClearIcon from '../../../shared/ClearIcon';
-import CheckIcon from '../../../shared/CheckIcon';
-import { bankSelector } from '../../../app/bank/bankStore';
 import { useAppSelector } from '../../../../hooks';
 import { removeAllOtherThanAlphabetAndSpace } from '../../../../utils';
+import { FieldType } from '../../../../@types';
 import Collapse from '../../../../components/Collapse';
+import { ScreenContainer } from '../../../shared/Containers';
+import Input from '../../../shared/Input';
+import ClearIcon from '../../../shared/ClearIcon';
+import CheckIcon from '../../../shared/CheckIcon';
+import { bankSelector } from '../../../app/bank/bankStore';
 var FeatureStyled = styled(ScreenContainer)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -34,13 +35,15 @@ var InputStyled = styled(Input)(function () { return ({
     }
 }); });
 var BankName = function () {
-    var _a, _b;
+    var _a, _b, _c;
     var t = useTranslation().t;
-    var _c = useFormContext(), setValue = _c.setValue, control = _c.control;
+    var _d = useFormContext(), setValue = _d.setValue, control = _d.control;
     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 bank_account = (data.verify.responseBody || {}).bank_account;
+    var isNonEditable = ((_b = bank_account === null || bank_account === void 0 ? void 0 : bank_account.data_status) === null || _b === void 0 ? void 0 : _b.bank_name) === FieldType.NON_EDITABLE;
     var clearValue = function () {
         bankNameControl.field.onChange('');
     };
@@ -49,12 +52,12 @@ var BankName = function () {
         var bankName = (_a = data.bankData.responseBody) === null || _a === void 0 ? void 0 : _a.bank_name;
         if (bankName && !bankNameValue)
             setValue('bankName', bankName);
-    }, [(_b = data.bankData.responseBody) === null || _b === void 0 ? void 0 : _b.bank_name]);
+    }, [(_c = data.bankData.responseBody) === null || _c === void 0 ? void 0 : _c.bank_name]);
     var handleBankChange = function (_a) {
         var target = _a.target;
         var value = removeAllOtherThanAlphabetAndSpace(target.value);
         bankNameControl.field.onChange(value);
     };
-    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 }) }) }) })));
+    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, disabled: isNonEditable, endAdornment: !hasError && bankNameValue ? _jsx(CheckIcon, {}) : bankNameValue && _jsx(ClearIcon, { onClick: clearValue }) }) }) })));
 };
 export default BankName;

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

@@ -4,35 +4,34 @@ import Input from '../../../shared/Input';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import { styled } from '@mui/material/styles';
-import { ScreenContainer } from '../../../shared/Containers';
-import { bankSelector } from '../../../app/bank/bankStore';
 import { useAppSelector } from '../../../../hooks';
+import { FieldType } from '../../../../@types';
 import ClearIcon from '../../../shared/ClearIcon';
 import CheckIcon from '../../../shared/CheckIcon';
+import { ScreenContainer } from '../../../shared/Containers';
+import { bankSelector } from '../../../app/bank/bankStore';
 var FeatureStyled = styled(ScreenContainer)(function (_a) {
     var theme = _a.theme;
     return ({
         marginBlockEnd: theme.spacing(3)
     });
 });
-var InputStyled = styled(Input)(function (_a) {
-    var theme = _a.theme;
-    return ({
-        input: {
-            textTransform: 'capitalize'
-        }
-    });
-});
+var InputStyled = styled(Input)(function () { return ({
+    input: {
+        textTransform: 'capitalize'
+    }
+}); });
 var Beneficiary = function () {
-    var _a, _b;
+    var _a, _b, _c;
     var t = useTranslation().t;
-    var _c = useFormContext(), setValue = _c.setValue, control = _c.control;
+    var _d = useFormContext(), setValue = _d.setValue, control = _d.control;
     var data = useAppSelector(bankSelector).data;
     var beneficiaryControl = useController({ name: 'beneficiaryName', control: control });
     var beneficiaryValue = beneficiaryControl.field.value;
     var hasError = (_a = beneficiaryControl.fieldState.error) === null || _a === void 0 ? void 0 : _a.message;
     var error = (_b = beneficiaryControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
     var bank_account = (data.verify.responseBody || {}).bank_account;
+    var isNonEditable = ((_c = bank_account === null || bank_account === void 0 ? void 0 : bank_account.data_status) === null || _c === void 0 ? void 0 : _c.beneficiary_name) === FieldType.NON_EDITABLE;
     React.useEffect(function () {
         var beneficiary_name = (bank_account || {}).beneficiary_name;
         if (beneficiary_name)
@@ -45,6 +44,6 @@ var Beneficiary = function () {
     var clearValue = function () {
         beneficiaryControl.field.onChange('');
     };
-    return (_jsx(FeatureStyled, { children: _jsx(InputStyled, { label: t('beneficiary_name'), onChange: handleBeneficiaryChange, value: beneficiaryValue, placeholder: t('beneficiary_name'), warningType: 'alert', warningMessage: error && t(error), required: true, endAdornment: !hasError && beneficiaryValue ? _jsx(CheckIcon, {}) : beneficiaryValue && _jsx(ClearIcon, { onClick: clearValue }) }) }));
+    return (_jsx(FeatureStyled, { children: _jsx(InputStyled, { label: t('beneficiary_name'), onChange: handleBeneficiaryChange, disabled: isNonEditable, value: beneficiaryValue, placeholder: t('beneficiary_name'), warningType: 'alert', warningMessage: error && t(error), required: true, endAdornment: !hasError && beneficiaryValue ? _jsx(CheckIcon, {}) : beneficiaryValue && _jsx(ClearIcon, { onClick: clearValue }) }) }));
 };
 export default Beneficiary;

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

@@ -36,22 +36,23 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
-import Input from '../../../shared/Input';
+import { debounce } from 'lodash-es';
 import { useTranslation } from 'react-i18next';
+import axios from 'axios';
 import { useController, useFormContext } from 'react-hook-form';
-import { removeAllOtherThanCharsAndNumber } from '../../../../utils';
 import { styled } from '@mui/material';
+import CircularProgress from '@mui/material/CircularProgress';
+import { removeAllOtherThanCharsAndNumber } from '../../../../utils';
+import { settingsSelector } from '../../../../app/settings';
+import { useAppSelector, useAppDispatch } from '../../../../hooks';
+import { FieldType } from '../../../../@types';
 import { MAX_IBAN_VALUE } from '../../../../constants';
 import { ScreenContainer } from '../../../shared/Containers';
-import { debounce } from 'lodash-es';
 import { checkIbanBank } from '../../../app/bank/bankStore';
-import { useAppDispatch } from '../../../../hooks';
-import axios from 'axios';
 import ClearIcon from '../../../shared/ClearIcon';
 import CheckIcon from '../../../shared/CheckIcon';
-import CircularProgress from '@mui/material/CircularProgress';
-import { settingsSelector } from '../../../../app/settings';
-import { useAppSelector } from '../../../../hooks';
+import Input from '../../../shared/Input';
+import { bankSelector } from '../../../app/bank/bankStore';
 var InputStyled = styled(Input)(function () { return ({
     input: {
         textTransform: 'uppercase'
@@ -59,15 +60,18 @@ var InputStyled = styled(Input)(function () { return ({
 }); });
 var cancelToken = null;
 var IBAN = function (_a) {
-    var _b;
+    var _b, _c;
     var fetchingIban = _a.fetchingIban, ibanChecking = _a.ibanChecking;
     var dispatch = useAppDispatch();
     var settingsData = useAppSelector(settingsSelector).data;
+    var data = useAppSelector(bankSelector).data;
     var t = useTranslation().t;
     var control = useFormContext().control;
     var ibanControl = useController({ name: 'iban', control: control });
     var ibanValue = ibanControl.field.value;
     var error = (_b = ibanControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
+    var bank_account = (data.verify.responseBody || {}).bank_account;
+    var isNonEditable = ((_c = bank_account === null || bank_account === void 0 ? void 0 : bank_account.data_status) === null || _c === void 0 ? void 0 : _c.iban) === FieldType.NON_EDITABLE;
     var checkBank = debounce(function (value) { return __awaiter(void 0, void 0, void 0, function () {
         var onSuccess;
         return __generator(this, function (_a) {
@@ -95,6 +99,6 @@ var IBAN = function (_a) {
     var clearValue = function () {
         ibanControl.field.onChange('');
     };
-    return (_jsx(ScreenContainer, { children: _jsx(InputStyled, { label: t('enter_iban'), inputProps: { maxLength: MAX_IBAN_VALUE }, onChange: handleIbanChange, value: ibanValue, placeholder: t('iban_input_placeholder', { countrycode: settingsData.businessCountry.iso2.toUpperCase() }), 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(InputStyled, { label: t('enter_iban'), inputProps: { maxLength: MAX_IBAN_VALUE }, onChange: handleIbanChange, value: ibanValue, placeholder: t('iban_input_placeholder', { countrycode: settingsData.businessCountry.iso2.toUpperCase() }), warningType: 'alert', warningMessage: error && t(error), required: true, disabled: isNonEditable, 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,39 +1,39 @@
 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>;
+export declare const BankValidation: (bankAccount: any) => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    iban: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     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>;
+    beneficiaryName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     bankStatementId: yup.ArraySchema<yup.AnySchema<any, any, any>, import("yup/lib/types").AnyObject, any[] | undefined, any[] | undefined>;
     confirmPolicy: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, true>;
 }>, 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>;
+    iban: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     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>;
+    beneficiaryName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     bankStatementId: yup.ArraySchema<yup.AnySchema<any, any, any>, import("yup/lib/types").AnyObject, any[] | undefined, any[] | undefined>;
     confirmPolicy: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, true>;
 }>>, 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>;
+    iban: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     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>;
+    beneficiaryName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     bankStatementId: yup.ArraySchema<yup.AnySchema<any, any, any>, import("yup/lib/types").AnyObject, any[] | undefined, any[] | undefined>;
     confirmPolicy: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, true>;
 }>>>;
-export declare const BankKWFLValidation: 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>;
+export declare const BankKWFLValidation: (bankAccount: any) => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    iban: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     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>;
+    beneficiaryName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     bankStatementId: import("yup/lib/array").RequiredArraySchema<yup.AnySchema<any, any, any>, import("yup/lib/types").AnyObject, any[] | undefined>;
     confirmPolicy: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, true>;
 }>, 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>;
+    iban: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     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>;
+    beneficiaryName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     bankStatementId: import("yup/lib/array").RequiredArraySchema<yup.AnySchema<any, any, any>, import("yup/lib/types").AnyObject, any[] | undefined>;
     confirmPolicy: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, true>;
 }>>, 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>;
+    iban: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     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>;
+    beneficiaryName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     bankStatementId: import("yup/lib/array").RequiredArraySchema<yup.AnySchema<any, any, any>, import("yup/lib/types").AnyObject, any[] | undefined>;
     confirmPolicy: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, true>;
 }>>>;

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

@@ -1,16 +1,35 @@
-import { REGEX_ALPHANUMERIC, REGEX_IBAN } from '../../../../constants';
 import * as yup from 'yup';
-export var BankValidation = yup.object().shape({
-    iban: yup.string().matches(REGEX_IBAN, 'invalid_iban_format').min(15, 'invalid_iban_format').max(34, 'invalid_iban_format').required('alert_iban'),
-    bankName: yup.string().optional(),
-    beneficiaryName: yup.string().matches(REGEX_ALPHANUMERIC, 'beneficiary_name_invalid').required('beneficiary_name_required'),
-    bankStatementId: yup.array().optional(),
-    confirmPolicy: yup.boolean().required('alert_bank_confirm').isTrue('alert_bank_confirm')
-});
-export var BankKWFLValidation = yup.object().shape({
-    iban: yup.string().matches(REGEX_IBAN, 'invalid_iban_format').min(15, 'invalid_iban_format').max(34, 'invalid_iban_format').required('alert_iban'),
-    bankName: yup.string().optional(),
-    beneficiaryName: yup.string().matches(REGEX_ALPHANUMERIC, 'beneficiary_name_invalid').required('beneficiary_name_required'),
-    bankStatementId: yup.array().min(1, 'bank_statement_required').required('bank_statement_required'),
-    confirmPolicy: yup.boolean().required('alert_bank_confirm').isTrue('alert_bank_confirm')
-});
+import { FieldType } from '../../../../@types';
+import { REGEX_ALPHANUMERIC, REGEX_IBAN } from '../../../../constants';
+export var BankValidation = function (bankAccount) {
+    var _a = bankAccount || {}, iban = _a.iban, beneficiary_name = _a.beneficiary_name, data_status = _a.data_status;
+    var isIBANOptional = !iban && (data_status === null || data_status === void 0 ? void 0 : data_status.iban) === FieldType.NON_EDITABLE;
+    var isBeneficiaryNameOptional = !beneficiary_name && (data_status === null || data_status === void 0 ? void 0 : data_status.beneficiary_name) === FieldType.NON_EDITABLE;
+    return yup.object().shape({
+        iban: isIBANOptional
+            ? yup.string().optional()
+            : yup.string().matches(REGEX_IBAN, 'invalid_iban_format').min(15, 'invalid_iban_format').max(34, 'invalid_iban_format').required('alert_iban'),
+        bankName: yup.string().optional(),
+        beneficiaryName: isBeneficiaryNameOptional
+            ? yup.string().optional()
+            : yup.string().matches(REGEX_ALPHANUMERIC, 'beneficiary_name_invalid').required('beneficiary_name_required'),
+        bankStatementId: yup.array().optional(),
+        confirmPolicy: yup.boolean().required('alert_bank_confirm').isTrue('alert_bank_confirm')
+    });
+};
+export var BankKWFLValidation = function (bankAccount) {
+    var _a = bankAccount || {}, iban = _a.iban, beneficiary_name = _a.beneficiary_name, data_status = _a.data_status;
+    var isIBANOptional = !iban && (data_status === null || data_status === void 0 ? void 0 : data_status.iban) === FieldType.NON_EDITABLE;
+    var isBeneficiaryNameOptional = !beneficiary_name && (data_status === null || data_status === void 0 ? void 0 : data_status.beneficiary_name) === FieldType.NON_EDITABLE;
+    return yup.object().shape({
+        iban: isIBANOptional
+            ? yup.string().optional()
+            : yup.string().matches(REGEX_IBAN, 'invalid_iban_format').min(15, 'invalid_iban_format').max(34, 'invalid_iban_format').required('alert_iban'),
+        bankName: yup.string().optional(),
+        beneficiaryName: isBeneficiaryNameOptional
+            ? yup.string().optional()
+            : yup.string().matches(REGEX_ALPHANUMERIC, 'beneficiary_name_invalid').required('beneficiary_name_required'),
+        bankStatementId: yup.array().min(1, 'bank_statement_required').required('bank_statement_required'),
+        confirmPolicy: yup.boolean().required('alert_bank_confirm').isTrue('alert_bank_confirm')
+    });
+};

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

@@ -88,14 +88,14 @@ var BrandList = function (_a) {
             setValue('brandName', '');
         }
         setValue('segment', segments_list.find(function (_a) {
-            var _b;
+            var _b, _c;
             var id = _a.id;
-            return ((_b = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _b === void 0 ? void 0 : _b.type) === id;
+            return ((_c = (_b = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _b === void 0 ? void 0 : _b.type) === null || _c === void 0 ? void 0 : _c.id) === id;
         }), { shouldValidate: true });
         setValue('teamSize', team_size_list.find(function (_a) {
-            var _b;
+            var _b, _c;
             var id = _a.id;
-            return ((_b = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _b === void 0 ? void 0 : _b.team) === id;
+            return ((_c = (_b = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _b === void 0 ? void 0 : _b.team) === null || _c === void 0 ? void 0 : _c.id) === id;
         }), { shouldValidate: true });
         onCloseBrandList();
     };

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

@@ -13,18 +13,17 @@ var FeatureStyled = styled(ScreenContainer)(function (_a) {
     });
 });
 var CivilIDFile = function () {
-    var _a;
     var t = useTranslation().t;
     var dispatch = useAppDispatch();
     var control = useFormContext().control;
     var civilIDFileIdControl = useController({ name: 'civilID', control: control });
-    var _b = useAppSelector(individualSelector), loading = _b.loading, data = _b.data;
+    var loading = useAppSelector(individualSelector).loading;
     var handleCivilIDChange = function (ids) {
         civilIDFileIdControl.field.onChange(ids);
     };
     var handleReset = function (ids) {
         civilIDFileIdControl.field.onChange(ids);
     };
-    return (_jsx(FeatureStyled, { children: _jsx(UploadMultipleFile, { label: t('title_civil_id'), title: t('drag_and_drop'), subTitle: t('subtitle_drop'), dragDescription: t('desc_drag_and_drop_civilID'), uploadingTitle: t('file_uploading_title'), successTitle: t('success_upload_civil_id'), onFileUploaded: handleCivilIDChange, isSubmitting: loading, onDeleteFile: handleReset, maxLimit: 4, fileTitle: (_a = data.verify.responseBody) === null || _a === void 0 ? void 0 : _a.merchant_id, purpose: 'identity_document', fileUploadingStatus: function (uploading) { return dispatch(civilIDUploadingStatus(uploading)); } }) }));
+    return (_jsx(FeatureStyled, { children: _jsx(UploadMultipleFile, { label: t('title_civil_id'), title: t('drag_and_drop'), subTitle: t('subtitle_drop'), dragDescription: t('desc_drag_and_drop_civilID'), uploadingTitle: t('file_uploading_title'), successTitle: t('success_upload_civil_id'), onFileUploaded: handleCivilIDChange, isSubmitting: loading, onDeleteFile: handleReset, maxLimit: 4, purpose: 'identity_document', fileUploadingStatus: function (uploading) { return dispatch(civilIDUploadingStatus(uploading)); } }) }));
 };
 export default CivilIDFile;

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

@@ -37,6 +37,6 @@ var SignatureFile = function (_a) {
     var handleReset = function (ids) {
         signatureFileIdControl.field.onChange(ids);
     };
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(FeatureStyled, { children: _jsx(UploadMultipleFile, { label: t('title_signature_file'), title: t('drag_and_drop'), subTitle: t('subtitle_drop'), dragDescription: t('desc_drag_and_drop_signature'), uploadingTitle: t('file_uploading_title'), successTitle: t('success_upload_signature_file'), onFileUploaded: handleSignatureChange, isSubmitting: loading, onDeleteFile: handleReset, maxLimit: 4, purpose: 'customer_signature', fileTitle: 'Merchant Signature', fileUploadingStatus: function (uploading) { return dispatch(signatureFileUploadingStatus(uploading)); } }) }) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(FeatureStyled, { children: _jsx(UploadMultipleFile, { label: t('title_signature_file'), title: t('drag_and_drop'), subTitle: t('subtitle_drop'), dragDescription: t('desc_drag_and_drop_signature'), uploadingTitle: t('file_uploading_title'), successTitle: t('success_upload_signature_file'), onFileUploaded: handleSignatureChange, isSubmitting: loading, onDeleteFile: handleReset, maxLimit: 4, purpose: 'customer_signature', fileUploadingStatus: function (uploading) { return dispatch(signatureFileUploadingStatus(uploading)); } }) }) })));
 };
 export default SignatureFile;

package/build/features/individual/screens/IndividualPersonalInfo/BirthCity.js

@@ -58,27 +58,30 @@ var BirthCity = React.forwardRef(function (_a, ref) {
     var dispatch = useAppDispatch();
     var _e = useFormContext(), control = _e.control, getValues = _e.getValues, setValue = _e.setValue;
     var _f = useAppSelector(individualSelector), data = _f.data, cityLoading = _f.cityLoading;
-    var cityList = (data.verify.responseBody || {}).cityList;
+    var _g = data.verify.responseBody || {}, cityList = _g.cityList, user = _g.user;
     var placeOfBirthCityControl = useController({ control: control, name: 'placeOfBirthCity' });
     var birthCountry = getValues('placeOfBirthCountry');
+    var cityValue = placeOfBirthCityControl.field.value;
+    var error = (_b = placeOfBirthCityControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
     React.useEffect(function () {
         var _a;
         if ((cityList === null || cityList === void 0 ? void 0 : cityList.length) > 0) {
-            var listCountry = (_a = cityList[0]) === null || _a === void 0 ? void 0 : _a.country;
-            if (cityValue && listCountry !== cityValue.country)
-                setValue('placeOfBirthCity', undefined);
+            var city_1 = (_a = cityValue === null || cityValue === void 0 ? void 0 : cityValue.name) === null || _a === void 0 ? void 0 : _a.en;
+            var selectedCity = cityList.find(function (c) {
+                return c.name.en.toLowerCase() === (city_1 === null || city_1 === void 0 ? void 0 : city_1.toLowerCase());
+            }) || {};
+            setValue('placeOfBirthCity', selectedCity, { shouldValidate: true });
             var list = __spreadArray([], cityList, true);
             setCities(list);
         }
     }, [cityList]);
     React.useEffect(function () {
         var _a, _b;
-        var user = (data.verify.responseBody || {}).user;
         var listCountry = (cityList === null || cityList === void 0 ? void 0 : cityList.length) > 0 ? (_a = cityList[0]) === null || _a === void 0 ? void 0 : _a.country : (_b = user === null || user === void 0 ? void 0 : user.birth) === null || _b === void 0 ? void 0 : _b.country;
         var iso2 = (birthCountry || {}).iso2;
         if (!listCountry || !iso2)
             return;
-        if (listCountry !== iso2) {
+        if ((listCountry === null || listCountry === void 0 ? void 0 : listCountry.toLowerCase()) !== (iso2 === null || iso2 === void 0 ? void 0 : iso2.toLowerCase())) {
             dispatch(getCityList(iso2));
         }
     }, [birthCountry]);
@@ -99,8 +102,6 @@ var BirthCity = React.forwardRef(function (_a, ref) {
         var _a;
         return (_a = city === null || city === void 0 ? void 0 : city.name) === null || _a === void 0 ? void 0 : _a.en;
     };
-    var cityValue = placeOfBirthCityControl.field.value;
-    var error = (_b = placeOfBirthCityControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
     return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { pt: 2.5 } }, { children: [_jsx(Input, { label: t('place_birth_city_label'), readOnly: true, placeholder: t('choose_place_birth_city'), value: getName(cityValue) || '', warningMessage: error && t(error), onClick: cityLoading ? undefined : !!anchorEl ? function () { return onCloseCitySelect(); } : onOpenCitySelect, endAdornment: cityLoading ? _jsx(CircularProgress, { size: 25, thickness: 5, sx: { height: 'auto !important' } }) : _jsx(ExpandIcon, { anchorEl: !!anchorEl }) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.en', searchValuePath: ['name.en'], list: locationCities, onSelectItem: onSelectItem, renderItem: function (item) {
                             return (_jsxs(_Fragment, { children: [_jsx(CountryItemContainer, { children: _jsx(CountryNameText, __assign({ isSelected: item.id === (cityValue === null || cityValue === void 0 ? void 0 : cityValue.id) }, { children: getName(item) })) }), item.id === (cityValue === null || cityValue === void 0 ? void 0 : cityValue.id) && _jsx(CheckIconStyled, {})] }));
                         } }) }))] })) })));

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

@@ -80,7 +80,7 @@ var IndividualPersonalInfo = function (_a) {
         },
         mode: 'onChange'
     });
-    useSetFromDefaultValues(methods, data.individualPersonalData, true);
+    useSetFromDefaultValues(methods, data.individualPersonalData);
     var _c = React.useState(), listActive = _c[0], setListActive = _c[1];
     var _d = React.useState(false), dobActive = _d[0], setDobActive = _d[1];
     var _e = React.useState(false), expiryDateActive = _e[0], setExpiryDateActive = _e[1];
@@ -126,7 +126,7 @@ var IndividualPersonalInfo = function (_a) {
     var isBirthCountryListActive = listActive === ListType.BirthCountryList;
     var isBirthCityListActive = listActive === ListType.BirthCityList;
     var isNationalityListActive = listActive === ListType.NationalityList;
-    return (_jsxs(ScreenContainer, { children: [_jsx(Collapse, __assign({ in: showField && !!(user === null || user === void 0 ? void 0 : user.is_authorized), timeout: 500 }, { children: _jsxs(TextBoxStyled, { children: [getUserName() || '', _jsx(RoleTextStyled, { children: getUserOccupation() || '' })] }) })), _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsxs(Box, { children: [_jsx(Name, { show: showField }), _jsx(MobileNumber, { show: showField, countries: countries }), _jsx(Email, { show: showField }), _jsx(Gender, { show: showField }), _jsx(ID, { show: showField }), _jsx(IssuedCountry, { show: !dobActive && !expiryDateActive && !isBirthCountryListActive && !isBirthCityListActive && !isNationalityListActive, countries: countries, onListOpen: function () { return handleMenuClick(ListType.IssuedCountryList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(ExpiryDate, { show: !listActive && !dobActive, onDateClicked: handleExpiryDateActive }), _jsx(DOB, { show: !listActive && !expiryDateActive, onDateClicked: handleDobActive }), _jsx(BirthCountry, { show: !dobActive && !expiryDateActive && !isIssuedCountryListActive && !isBirthCityListActive && !isNationalityListActive, countries: countries, onListOpen: function () { return handleMenuClick(ListType.BirthCountryList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(BirthCity, { show: !dobActive && !expiryDateActive && !isIssuedCountryListActive && !isNationalityListActive, onListOpen: function () { return handleMenuClick(ListType.BirthCityList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(Nationality, { show: !dobActive && !expiryDateActive && !isIssuedCountryListActive && !isBirthCityListActive, countries: countries, onListOpen: function () { return handleMenuClick(ListType.NationalityList); }, onListClose: function () { return handleMenuClick(); } })] }), _jsx(Collapse, __assign({ in: showField, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disableBack: !(user === null || user === void 0 ? void 0 : user.is_authorized), disabled: disabled, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) }))] }));
+    return (_jsxs(ScreenContainer, { children: [_jsx(Collapse, __assign({ in: showField && !!(user === null || user === void 0 ? void 0 : user.is_authorized), timeout: 500 }, { children: _jsxs(TextBoxStyled, { children: [getUserName() || '', _jsx(RoleTextStyled, { children: getUserOccupation() || '' })] }) })), _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsxs(Box, { children: [_jsx(Name, { show: showField }), _jsx(MobileNumber, { show: showField, countries: countries }), _jsx(Email, { show: showField }), _jsx(Gender, { show: showField }), _jsx(ID, { show: showField }), _jsx(IssuedCountry, { show: !dobActive && !expiryDateActive && !isBirthCountryListActive && !isBirthCityListActive && !isNationalityListActive, countries: countries, onListOpen: function () { return handleMenuClick(ListType.IssuedCountryList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(ExpiryDate, { show: !listActive && !dobActive, onDateClicked: handleExpiryDateActive }), _jsx(DOB, { show: !listActive && !expiryDateActive, onDateClicked: handleDobActive }), _jsx(BirthCountry, { show: !dobActive && !expiryDateActive && !isIssuedCountryListActive && !isBirthCityListActive && !isNationalityListActive, countries: countries, onListOpen: function () { return handleMenuClick(ListType.BirthCountryList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(BirthCity, { show: !dobActive && !expiryDateActive && !isIssuedCountryListActive && !isBirthCountryListActive && !isNationalityListActive, onListOpen: function () { return handleMenuClick(ListType.BirthCityList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(Nationality, { show: !dobActive && !expiryDateActive && !isIssuedCountryListActive && !isBirthCityListActive && !isBirthCountryListActive, countries: countries, onListOpen: function () { return handleMenuClick(ListType.NationalityList); }, onListClose: function () { return handleMenuClick(); } })] }), _jsx(Collapse, __assign({ in: showField, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disableBack: !(user === null || user === void 0 ? void 0 : user.is_authorized), disabled: disabled, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) }))] }));
 };
 export default React.memo(IndividualPersonalInfo);
 IndividualPersonalInfo.defaultProps = {};

package/build/features/shared/SuccessFlowButtons/SuccessFlowButtons.js

@@ -58,7 +58,7 @@ var SuccessFlowButtons = function (_a) {
     var bankName = shortenString(bank === null || bank === void 0 ? void 0 : bank.name, 20) || t('bank');
     var iban = showLastFour((bank === null || bank === void 0 ? void 0 : bank.iban) || '');
     var taxID = vat_id || '';
-    var brandName = (isAr ? (_b = brand === null || brand === void 0 ? void 0 : brand.name) === null || _b === void 0 ? void 0 : _b.ar : (_c = brand === null || brand === void 0 ? void 0 : brand.name) === null || _c === void 0 ? void 0 : _c.en) || '';
+    var brandName = (isAr ? (_b = brand === null || brand === void 0 ? void 0 : brand.name) === null || _b === void 0 ? void 0 : _b.ar : (_c = brand === null || brand === void 0 ? void 0 : brand.name) === null || _c === void 0 ? void 0 : _c.en) || t('brand');
     var entityLegalName = shortenString(isAr ? legal_name === null || legal_name === void 0 ? void 0 : legal_name.ar : legal_name === null || legal_name === void 0 ? void 0 : legal_name.en, 20) || '';
     var isAcceptance = merchant === null || merchant === void 0 ? void 0 : merchant.is_acceptance_allowed;
     var isPayout = merchant === null || merchant === void 0 ? void 0 : merchant.is_payout_allowed;

package/package.json

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