@tap-payments/auth-jsconnect 2.8.37-test → 2.8.39-test

package/build/api/entity.d.ts

@@ -140,7 +140,7 @@ export declare type CreateEntityBody = {
 declare const entityService: {
     createEntityInfo: ({ id, ...data }: EntityInfoBody, config?: AxiosRequestConfig) => Promise<import("axios").AxiosResponse<any, any>>;
     updateEntityInfo: ({ id, ...data }: EntityInfoBody) => Promise<any>;
-    createBankAccount: (data: EntityBankUpdateBody, config?: AxiosRequestConfig) => Promise<import("axios").AxiosResponse<any, any>>;
+    createBankAccount: (data: EntityBankUpdateBody) => Promise<any>;
     retrieveBankAccount: (id: string) => Promise<any>;
     retrieveEntityInfo: (entity_id: string, config?: AxiosRequestConfig) => Promise<import("axios").AxiosResponse<any, any>>;
     updateIndividualInfo: ({ id, ...data }: EntityInfoBody) => Promise<any>;

package/build/api/entity.js

@@ -56,8 +56,12 @@ var updateEntityCapital = function (_a) {
         data: data
     });
 };
-var createBankAccount = function (data, config) {
-    return instance.put("".concat(ENDPOINT_PATHS.BANK), data, config);
+var createBankAccount = function (data) {
+    return httpClient({
+        method: 'put',
+        url: "".concat(ENDPOINT_PATHS.BANK),
+        data: data
+    });
 };
 var retrieveBankAccount = function (id) {
     return httpClient({

package/build/api/index.d.ts

@@ -60,7 +60,7 @@ declare const API: {
     entityService: {
         createEntityInfo: ({ id, ...data }: EntityInfoBody, config?: import("axios").AxiosRequestConfig<any> | undefined) => Promise<import("axios").AxiosResponse<any, any>>;
         updateEntityInfo: ({ id, ...data }: EntityInfoBody) => Promise<any>;
-        createBankAccount: (data: EntityBankUpdateBody, config?: import("axios").AxiosRequestConfig<any> | undefined) => Promise<import("axios").AxiosResponse<any, any>>;
+        createBankAccount: (data: EntityBankUpdateBody) => Promise<any>;
         retrieveBankAccount: (id: string) => Promise<any>;
         retrieveEntityInfo: (entity_id: string, config?: import("axios").AxiosRequestConfig<any> | undefined) => Promise<import("axios").AxiosResponse<any, any>>;
         updateIndividualInfo: ({ id, ...data }: EntityInfoBody) => Promise<any>;

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

@@ -236,12 +236,12 @@ export var retrieveBoardDetails = createAsyncThunk('bank/retrieveBoardDetails',
     });
 });
 export var createBankAccount = createAsyncThunk('createBankAccount', function (_a, thunkApi) {
-    var formData = _a.formData, originalFormData = _a.originalFormData;
+    var formData = _a.formData, originalFormData = _a.originalFormData, isDirty = _a.isDirty;
     return __awaiter(void 0, void 0, void 0, function () {
-        var _b, settings, bank, iban, beneficiaryName, bankName, bankStatementId, confirmPolicy, _c, bank_account, wallet_id, recipient, _d, data_status, document, isIBANMasked, isIBANNonEditable, isBeneficiaryNameNonEditable, isBankNameNonEditable, isBankStatementIdNonEditable, isConfirmPolicyNonEditable, documentResponse, hasDocument, documentId, requestBody, data, documentBody;
-        var _e, _f, _g;
-        return __generator(this, function (_h) {
-            switch (_h.label) {
+        var _b, settings, bank, iban, beneficiaryName, bankName, bankStatementId, confirmPolicy, _c, bank_account, wallet_id, recipient, _d, data_status, document, isIBANMasked, isIBANNonEditable, isBeneficiaryNameNonEditable, isBankNameNonEditable, isBankStatementIdNonEditable, isConfirmPolicyNonEditable, documentResponse, data, hasDocument, documentId, requestBody, documentBody;
+        var _e, _f;
+        return __generator(this, function (_g) {
+            switch (_g.label) {
                 case 0:
                     _b = thunkApi.getState(), settings = _b.settings, bank = _b.bank;
                     iban = formData.iban, beneficiaryName = formData.beneficiaryName, bankName = formData.bankName, bankStatementId = formData.bankStatementId, confirmPolicy = formData.confirmPolicy;
@@ -254,6 +254,7 @@ export var createBankAccount = createAsyncThunk('createBankAccount', function (_
                     isBankStatementIdNonEditable = hasNoneEditableValue(data_status, 'bank_statement_file_id');
                     isConfirmPolicyNonEditable = hasNoneEditableValue(data_status, 'is_acknowledged');
                     documentResponse = undefined;
+                    data = bank_account || {};
                     hasDocument = (bankStatementId || []).length > 0;
                     documentId = document === null || document === void 0 ? void 0 : document.id;
                     requestBody = {
@@ -270,24 +271,25 @@ export var createBankAccount = createAsyncThunk('createBankAccount', function (_
                         step_name: BANK_STEP_NAMES.BANK_INFO,
                         encryption_contract: ['bank_account.iban', 'bank_account.beneficiary_name', 'bank_account.bank_name']
                     };
+                    if (!isDirty) return [3, 2];
                     return [4, API.entityService.createBankAccount(requestBody)];
                 case 1:
-                    data = (_h.sent()).data;
-                    if ((_e = data.errors) === null || _e === void 0 ? void 0 : _e.length)
-                        throw new Error(data.errors[0].description);
-                    if (!(!isBankStatementIdNonEditable && documentId && hasDocument)) return [3, 3];
+                    data = _g.sent();
+                    _g.label = 2;
+                case 2:
+                    if (!(!isBankStatementIdNonEditable && documentId && hasDocument)) return [3, 4];
                     documentBody = {
                         id: documentId,
                         files: bankStatementId || []
                     };
                     return [4, API.documentService.addFilesToExistingDocument(documentBody)];
-                case 2:
-                    documentResponse = _h.sent();
-                    _h.label = 3;
                 case 3:
-                    data.documentData = documentResponse;
+                    documentResponse = _g.sent();
+                    _g.label = 4;
+                case 4:
+                    data = __assign(__assign({}, data), { documentResponse: documentResponse });
                     thunkApi.dispatch(handleNextScreenStep());
-                    (_g = (_f = settings.data.appConfig).onStepCompleted) === null || _g === void 0 ? void 0 : _g.call(_f, settings.data.activeScreen.name, requestBody);
+                    (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, requestBody);
                     return [2, { data: data, formData: originalFormData }];
             }
         });

package/build/features/app/tax/taxStore.js

@@ -228,10 +228,10 @@ export var verifyTaxLeadOTP = createAsyncThunk('verifyTaxLeadOTP', function (par
 export var updateTaxInfo = createAsyncThunk('updateTaxInfo', function (_a, thunkApi) {
     var formData = _a.formData, originalFormData = _a.originalFormData, isDirty = _a.isDirty;
     return __awaiter(void 0, void 0, void 0, function () {
-        var _b, settings, tax, _c, entity, recipient, _d, id, data_status, documents, isTaxNumberNonEditable, isConfirmPolicyNonEditable, isDocumentsNonEditable, document, vatId, confirmPolicy, documentId, data, requestBody, documentBody, _e, documentBody, _f;
-        var _g, _h;
-        return __generator(this, function (_j) {
-            switch (_j.label) {
+        var _b, settings, tax, _c, entity, recipient, _d, id, data_status, documents, isTaxNumberNonEditable, isConfirmPolicyNonEditable, isDocumentsNonEditable, document, vatId, confirmPolicy, documentId, data, requestBody, documentBody, documentData, documentBody, documentData;
+        var _e, _f;
+        return __generator(this, function (_g) {
+            switch (_g.label) {
                 case 0:
                     _b = thunkApi.getState(), settings = _b.settings, tax = _b.tax;
                     _c = tax.data.verify.responseBody || {}, entity = _c.entity, recipient = _c.recipient;
@@ -249,8 +249,8 @@ export var updateTaxInfo = createAsyncThunk('updateTaxInfo', function (_a, thunk
                     if (!isDirty) return [3, 2];
                     return [4, API.entityService.updateEntityInfo(requestBody)];
                 case 1:
-                    data = _j.sent();
-                    _j.label = 2;
+                    data = _g.sent();
+                    _g.label = 2;
                 case 2:
                     if (!(!isDocumentsNonEditable && (documentId || []).length > 0)) return [3, 6];
                     if (!(document === null || document === void 0 ? void 0 : document.id)) return [3, 4];
@@ -258,10 +258,10 @@ export var updateTaxInfo = createAsyncThunk('updateTaxInfo', function (_a, thunk
                         id: document === null || document === void 0 ? void 0 : document.id,
                         images: documentId
                     };
-                    _e = data;
                     return [4, API.documentService.addFilesToExistingDocument(documentBody)];
                 case 3:
-                    _e.documentData = _j.sent();
+                    documentData = _g.sent();
+                    data = __assign(__assign({}, data), { documentData: documentData });
                     return [3, 6];
                 case 4:
                     documentBody = {
@@ -273,14 +273,14 @@ export var updateTaxInfo = createAsyncThunk('updateTaxInfo', function (_a, thunk
                             }
                         ]
                     };
-                    _f = data;
                     return [4, API.documentService.updateDocumentInfo(documentBody)];
                 case 5:
-                    _f.documentData = _j.sent();
-                    _j.label = 6;
+                    documentData = _g.sent();
+                    data = __assign(__assign({}, data), { documentData: documentData });
+                    _g.label = 6;
                 case 6:
                     thunkApi.dispatch(handleNextScreenStep());
-                    (_h = (_g = settings.data.appConfig).onStepCompleted) === null || _h === void 0 ? void 0 : _h.call(_g, settings.data.activeScreen.name, requestBody);
+                    (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, requestBody);
                     return [2, { data: data, formData: originalFormData }];
             }
         });

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

@@ -16,7 +16,7 @@ import Beneficiary from './Beneficiary';
 import IBAN from './IBAN';
 import BankName from './BankName';
 import Button from '../../../shared/Button';
-import { useAppDispatch, useAppSelector, useFormReadOnly, useSetFromDefaultValues, useDataNoneEditable, useFormErrorAndUpdateReadOnly, useExcludeReadOnlyFelids, useDataVerified } from '../../../../hooks';
+import { useAppDispatch, useAppSelector, useFormReadOnly, useSetFromDefaultValues, useDataNoneEditable, useFormErrorAndUpdateReadOnly, useExcludeReadOnlyFelids, useDataVerified, useFormDirtyCheck } from '../../../../hooks';
 import { BankKWFLValidation, BankValidation } from './validation';
 import { useTranslation } from 'react-i18next';
 import { useForm, FormProvider } from 'react-hook-form';
@@ -50,7 +50,7 @@ var BankDetails = function () {
     var _e = data.bankData, iban = _e.iban, beneficiaryName = _e.beneficiaryName, bankName = _e.bankName, bankStatementId = _e.bankStatementId, bankStatementUploading = _e.uploading, confirmPolicy = _e.confirmPolicy;
     var verify = data.verify;
     var _f = verify.responseBody || {}, bank_account = _f.bank_account, entity = _f.entity, flows = _f.flows;
-    var _g = bank_account || {}, document = _g.document, data_status = _g.data_status, data_verification = _g.data_verification, beneficiary_name = _g.beneficiary_name, resIban = _g.iban, bank_name = _g.bank_name;
+    var _g = bank_account || {}, document = _g.document, data_status = _g.data_status, data_verification = _g.data_verification, beneficiary_name = _g.beneficiary_name, resIban = _g.iban, bank_name = _g.bank_name, is_acknowledged = _g.is_acknowledged;
     var isKWCountry = React.useMemo(function () { return isKW(settingsData.businessCountry.iso2); }, [settingsData.businessCountry.iso2]);
     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 = ((_b = document === null || document === void 0 ? void 0 : document.file_details) === null || _b === void 0 ? void 0 : _b.length) > 0;
@@ -101,9 +101,17 @@ var BankDetails = function () {
     var isBeneficiaryNameVerified = dataVerified['beneficiary_name'] && beneficiary_name === methods.watch('beneficiaryName');
     var isIBANVerified = dataVerified['iban'] && resIban === methods.watch('iban');
     var isBankNameVerified = dataVerified['bank_name'] && bank_name === methods.watch('bankName');
+    var isDirty = useFormDirtyCheck(methods, {
+        iban: resIban,
+        beneficiaryName: beneficiary_name,
+        bankName: bank_name,
+        confirmPolicy: is_acknowledged
+    }).isDirty;
+    console.log('isDirty', isDirty);
     var getFelids = useExcludeReadOnlyFelids(methods, readOnly).getFelids;
     var onSubmit = function (data) {
-        dispatch(createBankAccount(deepCopy(getFelids(data))));
+        var formData = __assign(__assign({}, deepCopy(getFelids(data))), { isDirty: isDirty });
+        dispatch(createBankAccount(formData));
     };
     var disableBack = settingsData.appConfig.mode === 'content';
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Beneficiary, { readOnly: readOnly['beneficiaryName'] || noneEditable['beneficiary_name'], isVerified: isBeneficiaryNameVerified }), _jsx(IBAN, { fetchingIban: function (value) { return setIbanChecking(value); }, ibanChecking: ibanChecking, readOnly: readOnly['iban'] || noneEditable['iban'], isVerified: isIBANVerified }), _jsx(BankName, { readOnly: readOnly['bankName'] || noneEditable['bank_name'], isVerified: isBankNameVerified }), _jsx(BankStatement, { isVerified: dataVerified['document'], required: isKWCountry && isFL && !bankHasDocument, defaultFiles: defaultBankFiles, readOnly: readOnly['bankStatementId'] || noneEditable['bank_statement_file_id'] }), _jsx(ConfirmPolicy, { readOnly: readOnly['confirmPolicy'] || noneEditable['is_acknowledged'] }), _jsx(ButtonStyled, __assign({ disableBack: disableBack, onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('confirm') }))] })) })) }));

package/build/features/tax/screens/TaxDetails/TaxDetails.js

@@ -59,7 +59,6 @@ var TaxDetails = function () {
         vatId: entity === null || entity === void 0 ? void 0 : entity.vat_id,
         confirmPolicy: entity === null || entity === void 0 ? void 0 : entity.is_vat_acknowledged
     }).isDirty;
-    console.log('isDirty', isDirty);
     var getFelids = useExcludeReadOnlyFelids(methods, readOnly).getFelids;
     var isVatIdVerified = dataVerified['tax_number'] && vat_id === methods.watch('vatId');
     var t = useTranslation().t;

package/build/hooks/useFormDirtyCheck.js

@@ -3,18 +3,20 @@ import _ from 'lodash';
 export var useFormDirtyCheck = function (method, backendData) {
     var _a = React.useState(false), isDirty = _a[0], setIsDirty = _a[1];
     var data = method.watch();
-    var isValidData = function (data) {
+    var isValidData = function (data, backendData) {
         if (data === undefined)
             return false;
         if (Array.isArray(data) && !data.length)
             return false;
+        if (data === '' && !backendData)
+            return false;
         return true;
     };
     var deepComparison = function (data, backendData) {
         for (var key in backendData) {
             var formValue = data === null || data === void 0 ? void 0 : data[key];
             var backEndValue = backendData === null || backendData === void 0 ? void 0 : backendData[key];
-            if (isValidData(formValue) && !_.isEqual(formValue, backEndValue))
+            if (isValidData(formValue, backEndValue) && !_.isEqual(formValue, backEndValue))
                 return true;
         }
         return false;

package/package.json

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