@xsolla/payment-client-core 0.0.10 → 0.0.12

package/fesm2020/xsolla-payment-client-core.mjs

@@ -7,6 +7,13 @@ import { UntypedFormGroup, Validators, UntypedFormControl, ReactiveFormsModule }
 import { filter, map as map$1, catchError } from 'rxjs/operators';
 import * as i1$1 from '@angular/router';
 
+const masksFunctionsMap = {
+    zip: () => {
+        const zipLength = 5;
+        return new Array(zipLength).fill('9').join('');
+    },
+};
+
 class AppError extends Error {
     constructor(message) {
         super(message);
@@ -398,6 +405,113 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImpor
                     args: [userBalanceResponseFactoryToken]
                 }] }, { type: SettingsService }, { type: SecureApiClient }]; } });
 
+var XpsCommand;
+(function (XpsCommand) {
+    XpsCommand["form"] = "form";
+    XpsCommand["check"] = "check";
+    XpsCommand["status"] = "status";
+    XpsCommand["checkout"] = "checkout";
+    XpsCommand["account"] = "account";
+    XpsCommand["create"] = "create";
+})(XpsCommand || (XpsCommand = {}));
+
+var FieldNames;
+(function (FieldNames) {
+    FieldNames["address1"] = "address1";
+    FieldNames["address2"] = "address2";
+    FieldNames["address"] = "address";
+    FieldNames["allowRecurrentSubscription"] = "allowRecurrentSubscription";
+    FieldNames["allowSubscription"] = "allowSubscription";
+    FieldNames["apt"] = "apt";
+    FieldNames["availableCardTypes"] = "available_card_types";
+    FieldNames["bank"] = "bank";
+    FieldNames["birthDate"] = "birth_date";
+    FieldNames["cardMonth"] = "card_month";
+    FieldNames["cardYear"] = "card_year";
+    FieldNames["cardNumber"] = "card_number";
+    FieldNames["cardholdername"] = "cardholdername";
+    FieldNames["city"] = "city";
+    FieldNames["couponCode"] = "couponCode";
+    FieldNames["cpfName"] = "cpf_name";
+    FieldNames["cpfNumber"] = "cpf_number";
+    FieldNames["cvv"] = "cvv";
+    FieldNames["description"] = "description";
+    FieldNames["email"] = "email";
+    FieldNames["psEmail"] = "psEmail";
+    FieldNames["euCheck"] = "eu_check";
+    FieldNames["extraCvv"] = "extra_cvv";
+    FieldNames["extraCardNumber"] = "extra_card_number";
+    FieldNames["extraCardType"] = "extra_card_type";
+    FieldNames["fName"] = "f_name";
+    FieldNames["installments"] = "installments";
+    FieldNames["lName"] = "l_name";
+    FieldNames["needInstallments"] = "needInstallments";
+    FieldNames["personId"] = "person_id";
+    FieldNames["personIdAr"] = "person_id_ar";
+    FieldNames["personIdCo"] = "person_id_co";
+    FieldNames["phone"] = "phone";
+    FieldNames["purchaseDescription"] = "purchaseDescription";
+    FieldNames["recurrentType"] = "recurrent_type";
+    FieldNames["rockstarTaxes"] = "rockstar_taxes";
+    FieldNames["state"] = "state";
+    FieldNames["street"] = "street";
+    FieldNames["streetNumber"] = "street_number";
+    FieldNames["take2Taxes"] = "take2_taxes";
+    FieldNames["termsAndConditions"] = "termsAndConditions";
+    FieldNames["termsAndConditionsAtariPp"] = "termsAndConditionsAtariPP";
+    FieldNames["termsAndConditionsAtariTc"] = "termsAndConditionsAtariTC";
+    FieldNames["termsAndConditionsHtcEula"] = "termsAndConditionsHtcEula";
+    FieldNames["termsAndConditionsRobloxEula"] = "termsAndConditionsRobloxEula";
+    FieldNames["termsAndConditionsRolandEula"] = "termsAndConditionsRolandEula";
+    FieldNames["termsAndConditionsDeusLoVultEula"] = "termsAndConditionsDeusLoVultEula";
+    FieldNames["termsAndConditionsOnzenga"] = "termsAndConditionsOnzenga";
+    FieldNames["xsollaTipsAmount"] = "xsollaTipsAmount";
+    FieldNames["zip"] = "zip";
+    FieldNames["allowSave"] = "allowSave";
+    FieldNames["koreaLimitsInstruction"] = "korea_limits_instruction";
+    FieldNames["tokenApplePay"] = "token_applepay";
+    FieldNames["fixInvoice"] = "fix_invoice";
+    FieldNames["fixPid"] = "fix_pid";
+    FieldNames["signature"] = "signature";
+    FieldNames["qr"] = "qr";
+    FieldNames["sum"] = "sum";
+    FieldNames["out"] = "out";
+    FieldNames["tinkoffDisclaimer"] = "ps.tinkoff.disclaimer";
+})(FieldNames || (FieldNames = {}));
+
+class SubmitResponse {
+    constructor(parameters, responseNumber = 0) {
+        this.responseNumber = responseNumber;
+        /* Todo split into properties */
+        this.parameters = parameters;
+        this.fields = Object.keys(parameters.form).map((key) => parameters.form[key]);
+        if (parameters.onlineBanking) {
+            this.onlineBanking = {
+                url: parameters.onlineBanking.value,
+            };
+        }
+        this.isNeedRedirect =
+            parameters.currentCommand === XpsCommand.account ||
+                (parameters.currentCommand === XpsCommand.checkout &&
+                    Boolean(parameters.checkout));
+        this.buyData = parameters.buyData;
+        this.fixInvoice = this.fields.find((field) => field.name === FieldNames.fixInvoice)?.value;
+        this.signature = this.fields.find((field) => field.name === FieldNames.signature)?.value;
+        this.hasFatalErrors = parameters.textAll?.fatal;
+        this.userSession = parameters.userSession;
+        this.pid = parameters.pid;
+        this.errors = parameters.errors;
+        this.summary = parameters.summary;
+        this.title = parameters.title;
+        this.currentCommand = parameters.currentCommand;
+        this.messages = parameters.messages;
+    }
+}
+
+const isSubmitResponse = (value) => {
+    return value instanceof SubmitResponse;
+};
+
 class InitializeResponse {
     constructor(response) {
         this.paymentForm = null;
@@ -529,109 +643,6 @@ const submitRequestFactoryProvider = {
     useValue: (...args) => new SubmitRequest(...args),
 };
 
-var XpsCommand;
-(function (XpsCommand) {
-    XpsCommand["form"] = "form";
-    XpsCommand["check"] = "check";
-    XpsCommand["status"] = "status";
-    XpsCommand["checkout"] = "checkout";
-    XpsCommand["account"] = "account";
-    XpsCommand["create"] = "create";
-})(XpsCommand || (XpsCommand = {}));
-
-var FieldNames;
-(function (FieldNames) {
-    FieldNames["address1"] = "address1";
-    FieldNames["address2"] = "address2";
-    FieldNames["address"] = "address";
-    FieldNames["allowRecurrentSubscription"] = "allowRecurrentSubscription";
-    FieldNames["allowSubscription"] = "allowSubscription";
-    FieldNames["apt"] = "apt";
-    FieldNames["availableCardTypes"] = "available_card_types";
-    FieldNames["bank"] = "bank";
-    FieldNames["birthDate"] = "birth_date";
-    FieldNames["cardMonth"] = "card_month";
-    FieldNames["cardYear"] = "card_year";
-    FieldNames["cardNumber"] = "card_number";
-    FieldNames["cardholdername"] = "cardholdername";
-    FieldNames["city"] = "city";
-    FieldNames["couponCode"] = "couponCode";
-    FieldNames["cpfName"] = "cpf_name";
-    FieldNames["cpfNumber"] = "cpf_number";
-    FieldNames["cvv"] = "cvv";
-    FieldNames["description"] = "description";
-    FieldNames["email"] = "email";
-    FieldNames["psEmail"] = "psEmail";
-    FieldNames["euCheck"] = "eu_check";
-    FieldNames["extraCvv"] = "extra_cvv";
-    FieldNames["extraCardNumber"] = "extra_card_number";
-    FieldNames["extraCardType"] = "extra_card_type";
-    FieldNames["fName"] = "f_name";
-    FieldNames["installments"] = "installments";
-    FieldNames["lName"] = "l_name";
-    FieldNames["needInstallments"] = "needInstallments";
-    FieldNames["personId"] = "person_id";
-    FieldNames["personIdAr"] = "person_id_ar";
-    FieldNames["personIdCo"] = "person_id_co";
-    FieldNames["phone"] = "phone";
-    FieldNames["purchaseDescription"] = "purchaseDescription";
-    FieldNames["recurrentType"] = "recurrent_type";
-    FieldNames["rockstarTaxes"] = "rockstar_taxes";
-    FieldNames["state"] = "state";
-    FieldNames["street"] = "street";
-    FieldNames["streetNumber"] = "street_number";
-    FieldNames["take2Taxes"] = "take2_taxes";
-    FieldNames["termsAndConditions"] = "termsAndConditions";
-    FieldNames["termsAndConditionsAtariPp"] = "termsAndConditionsAtariPP";
-    FieldNames["termsAndConditionsAtariTc"] = "termsAndConditionsAtariTC";
-    FieldNames["termsAndConditionsHtcEula"] = "termsAndConditionsHtcEula";
-    FieldNames["termsAndConditionsRobloxEula"] = "termsAndConditionsRobloxEula";
-    FieldNames["termsAndConditionsRolandEula"] = "termsAndConditionsRolandEula";
-    FieldNames["termsAndConditionsDeusLoVultEula"] = "termsAndConditionsDeusLoVultEula";
-    FieldNames["termsAndConditionsOnzenga"] = "termsAndConditionsOnzenga";
-    FieldNames["xsollaTipsAmount"] = "xsollaTipsAmount";
-    FieldNames["zip"] = "zip";
-    FieldNames["allowSave"] = "allowSave";
-    FieldNames["koreaLimitsInstruction"] = "korea_limits_instruction";
-    FieldNames["tokenApplePay"] = "token_applepay";
-    FieldNames["fixInvoice"] = "fix_invoice";
-    FieldNames["fixPid"] = "fix_pid";
-    FieldNames["signature"] = "signature";
-    FieldNames["qr"] = "qr";
-    FieldNames["sum"] = "sum";
-    FieldNames["out"] = "out";
-    FieldNames["tinkoffDisclaimer"] = "ps.tinkoff.disclaimer";
-})(FieldNames || (FieldNames = {}));
-
-class SubmitResponse {
-    constructor(parameters, responseNumber = 0) {
-        this.responseNumber = responseNumber;
-        /* Todo split into properties */
-        this.parameters = parameters;
-        this.fields = Object.keys(parameters.form).map((key) => parameters.form[key]);
-        if (parameters.onlineBanking) {
-            this.onlineBanking = {
-                url: parameters.onlineBanking.value,
-            };
-        }
-        this.isNeedRedirect =
-            parameters.currentCommand === XpsCommand.account ||
-                (parameters.currentCommand === XpsCommand.checkout &&
-                    Boolean(parameters.checkout));
-        this.buyData = parameters.buyData;
-        this.fixInvoice = this.fields.find((field) => field.name === FieldNames.fixInvoice)?.value;
-        this.signature = this.fields.find((field) => field.name === FieldNames.signature)?.value;
-        this.hasFatalErrors = parameters.textAll?.fatal;
-        this.userSession = parameters.userSession;
-        this.pid = parameters.pid;
-        this.errors = parameters.errors;
-        this.summary = parameters.summary;
-        this.title = parameters.title;
-        this.currentCommand = parameters.currentCommand;
-        this.messages = parameters.messages;
-    }
-}
-
 const submitResponseFactoryToken = new InjectionToken('SubmitResponse');
 const submitResponseFactoryProvider = {
     provide: submitResponseFactoryToken,
@@ -967,7 +978,9 @@ class SyncService extends EmitDataService {
             return Promise.resolve(null);
         }
         if (prevFieldState && value === prevFieldState.value) {
-            return Promise.resolve(prevFieldState.result);
+            return Promise.resolve(prevFieldState.result).then((response) => {
+                return response?.rewritableError ?? null;
+            });
         }
         const requestPromise = this.request(field);
         this.setPrevFieldSyncState(field, value, requestPromise);
@@ -975,6 +988,16 @@ class SyncService extends EmitDataService {
             return response.rewritableError ?? null;
         });
     }
+    getSyncValidationErrors(field) {
+        const control = this.form.get(field.name);
+        if (!control) {
+            return null;
+        }
+        const rewritableError = control.errors?.rewritableError;
+        return rewritableError
+            ? { message: rewritableError.message, code: rewritableError.code }
+            : null;
+    }
     async request(field) {
         const requestParams = this.requestFactory({
             token: this.settingsService.token,
@@ -1030,7 +1053,7 @@ class TextControlConfig extends ControlConfig {
     }
 }
 
-function convert(validator, message) {
+function convert(validator, message, errorCode) {
     return (control) => {
         const errors = validator(control);
         if (!errors) {
@@ -1041,6 +1064,7 @@ function convert(validator, message) {
         error = typeof error === 'object' && error !== null ? error : {};
         const rewritableError = { ...error };
         rewritableError.message = message;
+        rewritableError.code = errorCode;
         if (error[firstErrorKey] != null) {
             rewritableError.value = error[firstErrorKey];
         }
@@ -1052,13 +1076,21 @@ function convert(validator, message) {
     };
 }
 
+var ErrorsCodes;
+(function (ErrorsCodes) {
+    ErrorsCodes["minLength"] = "min-length";
+    ErrorsCodes["maxLength"] = "max-length";
+    ErrorsCodes["invalidValue"] = "invalid-value";
+    ErrorsCodes["required"] = "required";
+})(ErrorsCodes || (ErrorsCodes = {}));
+
 const emailRegexp = /^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))$/i; // eslint-disable-line
 function emailValidator() {
-    return convert(Validators.pattern(emailRegexp), 'Enter a valid email');
+    return convert(Validators.pattern(emailRegexp), 'Enter a valid email', ErrorsCodes.invalidValue);
 }
 
 function requiredValidator() {
-    return convert(Validators.required, 'Required');
+    return convert(Validators.required, 'Required', ErrorsCodes.required);
 }
 
 class Converter {
@@ -1073,7 +1105,7 @@ class Converter {
         return config;
     }
     convertToFormControl(field) {
-        return new UntypedFormControl(this.getValue(field), this.getValidators(field), this.getAsyncValidators(field));
+        return new UntypedFormControl(this.getValue(field), this.getValidators(field));
     }
     getValidators(field) {
         const validators = [];
@@ -1087,14 +1119,11 @@ class Converter {
                 const errorMessage = field.validation_error_msg
                     ? field.validation_error_msg
                     : 'Enter valid data';
-                validators.push(convert(Validators.pattern(pattern), errorMessage));
+                validators.push(convert(Validators.pattern(pattern), errorMessage, ErrorsCodes.invalidValue));
             }
         }
         return validators;
     }
-    getAsyncValidators(field) {
-        return async () => this.syncService.validate(field);
-    }
     createDefaultControlConfig(controlConfigClass, field) {
         const config = new controlConfigClass();
         this.copyCommonOptions(config, field);
@@ -1179,11 +1208,11 @@ class ZipConverter extends Converter {
         const validators = super
             .getValidators(field)
             .concat([
-            convert(Validators.minLength(minLength), 'Enter at least ${minLength} characters'),
-            convert(Validators.maxLength(maxLength), 'Enter no more than ${maxLength} characters'),
+            convert(Validators.minLength(minLength), `Enter at least ${minLength} characters`, ErrorsCodes.minLength),
+            convert(Validators.maxLength(maxLength), `Enter no more than ${maxLength} characters`, ErrorsCodes.maxLength),
         ]);
         if (this.isUsCountry) {
-            validators.push(convert(restrictedValueValidator('00000'), 'Enter a valid ZIP code'));
+            validators.push(convert(restrictedValueValidator('00000'), 'Enter a valid ZIP code', ErrorsCodes.invalidValue));
         }
         return validators;
     }
@@ -1192,12 +1221,14 @@ class ZipConverter extends Converter {
         config.icon = 'location';
         if (this.isUsCountry) {
             config.maskConfig = {
-                mask: () => new Array(this.usCountryLength).fill('9').join(''),
                 guide: false,
                 unmaskModelValue: true,
                 showMask: true,
             };
             config.inputMode = 'numeric';
+            if (masksFunctionsMap['zip']) {
+                config.maskConfig.mask = masksFunctionsMap['zip'];
+            }
         }
         else {
             config.maxLength = this.maxLength;
@@ -2273,7 +2304,7 @@ class ShowFieldsAction {
             messages: [],
             order: {},
         };
-        this.data.fields = submitResponse.fields;
+        this.data.fields = submitResponse.fields.filter((field) => field?.isVisible === "1" /* XpsBoolean.true */);
         this.data.errors = submitResponse.errors;
         this.data.messages = submitResponse.messages;
         this.data.order = submitResponse.summary;
@@ -2285,7 +2316,9 @@ const showFieldsActionFactoryProvider = {
     provide: showFieldsActionFactoryToken,
     useValue: {
         factory: (...args) => new ShowFieldsAction(...args),
-        type: 'show_fields',
+        isSuitable: (response) => {
+            return response.currentCommand === XpsCommand.check;
+        },
     },
 };
 
@@ -2310,7 +2343,9 @@ const checkStatusActionFactoryProvider = {
     provide: checkStatusActionFactoryToken,
     useValue: {
         factory: (...args) => new CheckStatusAction(...args),
-        type: 'check_status',
+        isSuitable: (response) => {
+            return response.currentCommand === XpsCommand.status;
+        },
     },
 };
 
@@ -2319,7 +2354,40 @@ const statusUpdatedActionFactoryProvider = {
     provide: statusUpdatedActionFactoryToken,
     useValue: {
         factory: (...args) => new StatusUpdatedAction(...args),
-        type: 'status_updated',
+        isSuitable: () => false,
+    },
+};
+
+class RedirectAction {
+    constructor(submitResponse) {
+        this.type = 'redirect';
+        this.data = {
+            fields: submitResponse.fields,
+            errors: submitResponse.errors,
+            messages: submitResponse.messages,
+            order: submitResponse.summary,
+            invoiceId: submitResponse.fixInvoice,
+            redirect: this.getRedirect(submitResponse),
+        };
+    }
+    getRedirect(submitResponse) {
+        return {
+            redirectUrl: submitResponse.parameters.checkout.action,
+            data: submitResponse.parameters.checkout.data,
+        };
+    }
+}
+
+const redirectActionFactoryToken = new InjectionToken('RedirectAction');
+const redirectActionFactoryProvider = {
+    provide: redirectActionFactoryToken,
+    useValue: {
+        factory: (...args) => new RedirectAction(...args),
+        isSuitable: (response) => {
+            return (response.currentCommand === XpsCommand.account ||
+                (response.currentCommand === XpsCommand.checkout &&
+                    Boolean(response.parameters.checkout)));
+        },
     },
 };
 
@@ -2328,13 +2396,9 @@ const nextActions = [
     showFieldsActionFactoryProvider,
     checkStatusActionFactoryProvider,
     statusUpdatedActionFactoryProvider,
+    redirectActionFactoryProvider,
 ];
 
-const actionTypeCommandMap = {
-    [XpsCommand.check]: 'show_fields',
-    [XpsCommand.status]: 'check_status',
-};
-
 class NextActionService {
     get flowUpdates$() {
         return this.flowUpdatesSubject.asObservable();
@@ -2343,14 +2407,14 @@ class NextActionService {
         this.nextActionTokens = nextActionTokens;
         this.injector = injector;
         this.flowUpdatesSubject = new Subject();
-        this.nextActionsMap = new Map();
-        this.fillNextActionsMap();
+        this.nextActionsList = [];
+        this.fillNextActionsList();
     }
     getNextAction(submitResponse) {
         if (!submitResponse.currentCommand) {
             return null;
         }
-        const nextActionFactory = this.findNextAction(submitResponse.currentCommand);
+        const nextActionFactory = this.findNextAction(submitResponse);
         if (nextActionFactory) {
             return nextActionFactory(submitResponse);
         }
@@ -2359,18 +2423,20 @@ class NextActionService {
     emitFlowUpdates(action) {
         this.flowUpdatesSubject.next(action);
     }
-    fillNextActionsMap() {
+    fillNextActionsList() {
         this.nextActionTokens.forEach((nextAction) => {
             const item = this.injector.get(nextAction.provide);
-            this.nextActionsMap.set(item.type, item.factory);
+            this.nextActionsList.push(item);
         });
     }
-    findNextAction(command) {
-        const actionType = actionTypeCommandMap[command];
+    findNextAction(submitResponse) {
+        const actionType = this.nextActionsList.find((nextAction) => {
+            return nextAction.isSuitable(submitResponse);
+        });
         if (!actionType) {
             return;
         }
-        return this.nextActionsMap.get(actionType);
+        return actionType.factory;
     }
 }
 NextActionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: NextActionService, deps: [{ token: nextActionsToken }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.Injectable });
@@ -2451,6 +2517,9 @@ class FinanceDetails {
     constructor(parameters) {
         this.purchase = parameters.purchase;
         this.finance = parameters.finance;
+        this.cartItems = this.getFormattedPurchaseForCart();
+        this.cartSummary = this.getFormattedPricingForCart();
+        this.paymentCountry = this.getPaymentCountry();
     }
     getFormattedPurchaseForCart() {
         const checkouts = this.purchase.checkout_items?.map((item) => {
@@ -2491,9 +2560,8 @@ class FinanceDetails {
         if (this.purchase.checkout) {
             checkoutArray = [
                 {
-                    title: this.purchase.checkout.description
-                        ? this.purchase.checkout.description
-                        : 'In-game purchase',
+                    key: 'checkout',
+                    title: this.purchase.checkout.description,
                     price: extractMoneyCurrency(this.purchase.checkout),
                     isBonus: this.purchase.checkout.is_bonus ?? false,
                 },
@@ -2511,14 +2579,17 @@ class FinanceDetails {
         const subtotalDetailsSorting = [
             {
                 key: 'discount',
+                responseKey: 'discount',
                 title: 'Discount',
             },
             {
                 key: 'fee',
+                responseKey: 'fee',
                 title: 'Payment system fee',
             },
             {
-                key: 'user_balance',
+                key: 'user-balance',
+                responseKey: 'user_balance',
                 title: 'Balance',
             },
         ];
@@ -2538,10 +2609,11 @@ class FinanceDetails {
             totalDetails: this.getTaxesForTotalDetails(),
             subtotalDetails: [
                 ...subtotalDetailsSorting.map((sorting) => {
-                    const field = this.finance[sorting.key];
+                    const field = this.finance[sorting.responseKey];
                     if (field) {
                         return {
-                            ...sorting,
+                            key: sorting.key,
+                            title: sorting.title,
                             money: {
                                 amount: sorting.key === 'discount' && field.amount
                                     ? -field.amount
@@ -2557,28 +2629,36 @@ class FinanceDetails {
         };
     }
     getPaymentCountry() {
-        return this.finance?.payment_country.iso;
+        return this.finance.payment_country.iso;
     }
     getTaxForItem(indirectTaxRate) {
         if (indirectTaxRate ||
             (this.shouldShowZeroIndirectTaxRate && indirectTaxRate === 0)) {
             if (this.isSalesTaxes) {
                 return {
+                    key: 'sales-tax',
                     content: `Sales tax ${indirectTaxRate}%`,
+                    rate: indirectTaxRate,
                 };
             }
             if (this.isIndia()) {
                 return {
+                    key: 'vat-india',
                     content: `GST ${indirectTaxRate}%`,
+                    rate: indirectTaxRate,
                 };
             }
             if (this.isGhana()) {
                 return {
+                    key: 'vat-ghana',
                     content: 'VAT, NHIL, GETFund Levy, and Covid-19 Levy',
+                    rate: indirectTaxRate,
                 };
             }
             return {
+                key: 'vat',
                 content: `VAT ${indirectTaxRate}%`,
+                rate: indirectTaxRate,
             };
         }
         return null;
@@ -2589,14 +2669,14 @@ class FinanceDetails {
         if (this.finance.vat_user &&
             (this.finance?.vat_user?.amount ?? this.finance?.vat_user?.visible)) {
             ret.push({
-                key: 'vat_user',
+                key: this.getVatKeyForDetails(),
                 title: this.getVatLabelForSubtotalDetails(),
                 money: extractMoneyCurrency(this.finance.vat_user),
             });
         }
         if (this.finance.sales_tax_user?.amount) {
             ret.push({
-                key: 'sales_tax_user',
+                key: 'sales-tax',
                 title: 'Sales tax',
                 money: extractMoneyCurrency(this.finance.sales_tax_user),
             });
@@ -2618,7 +2698,7 @@ class FinanceDetails {
         if ((this.finance?.vat?.amount || this.finance?.vat?.visible) &&
             !this.finance?.vat_user?.amount) {
             ret.push({
-                key: 'vat',
+                key: this.getVatKeyForDetails(),
                 title: this.getVatLabelForTotalDetails(),
                 money: extractMoneyCurrency(this.finance.vat),
             });
@@ -2626,13 +2706,22 @@ class FinanceDetails {
         if (this.finance?.sales_tax?.amount &&
             !this.finance?.sales_tax_user?.amount) {
             ret.push({
-                key: 'sales_tax',
+                key: 'sales-tax',
                 title: 'Sales tax included',
                 money: extractMoneyCurrency(this.finance.sales_tax),
             });
         }
         return ret;
     }
+    getVatKeyForDetails() {
+        if (this.isIndia()) {
+            return 'vat-india';
+        }
+        if (this.isGhana()) {
+            return 'vat-ghana';
+        }
+        return 'vat';
+    }
     getVatLabelForTotalDetails() {
         if (this.isIndia()) {
             return `Including ${this.finance.vat.percent}% GST`;
@@ -2705,20 +2794,28 @@ class PaymentService {
         this.form = this.formService.createForm(this.fields);
         this.emitFinanceDetails(this.data.paymentForm?.summary);
         this.setupSyncService(this.form, this.fields);
-        return this.fields;
+        return this.fields.filter((field) => field?.isVisible === "1" /* XpsBoolean.true */);
     }
     async submit() {
         if (!this.form) {
             throw new Error('form is empty!');
         }
         const submitResponse = await this.submitService.request(this.fields, this.form);
+        this.data = submitResponse;
         this.emitFinanceDetails(submitResponse.summary);
         return this.nextActionService.getNextAction(submitResponse);
     }
     getFields() {
+        if (this.data instanceof SubmitResponse) {
+            return this.data.fields ?? [];
+        }
         return this.data?.paymentForm?.fields ?? [];
     }
     async validate(field) {
+        const syncErrors = this.syncService.getSyncValidationErrors(field);
+        if (syncErrors) {
+            return Promise.resolve(syncErrors);
+        }
         return this.syncService.validate(field);
     }
     runThreeDs() {
@@ -2727,7 +2824,16 @@ class PaymentService {
     getFinanceDetails() {
         return this.financeDetails;
     }
-    async getStatus(params) {
+    async getStatus() {
+        if (!isSubmitResponse(this.data)) {
+            throw new Error('Should submit form first');
+        }
+        const params = {
+            invoice: parseInt(this.data.fixInvoice ?? ''),
+            signature: this.data.signature ?? '',
+            locale: this.data.fields.find((field) => field.name === 'locale')?.value ??
+                'en',
+        };
         return this.statusService.getStatus({
             ...params,
             pid: this.config.paymentMethodId,
@@ -2907,7 +3013,7 @@ class CoreLibraryService {
             validate: async (field) => this.paymentService.validate(field),
             getFinanceDetails: () => this.paymentService.getFinanceDetails(),
             runThreeDs: () => this.paymentService.runThreeDs(),
-            getStatus: async (params) => this.paymentService.getStatus(params),
+            getStatus: async () => this.paymentService.getStatus(),
             flowUpdates$: this.nextActionService.flowUpdates$,
             financeDetailsUpdates$: this.financeDetailsService.data$,
             form: {
@@ -2919,6 +3025,10 @@ class CoreLibraryService {
     getLegalComponentConfig() {
         return this.legalService.getLegalComponentConfig();
     }
+    getFieldMask(field) {
+        const sanitizedName = field.name.replace(/^fix_/i, '');
+        return masksFunctionsMap[sanitizedName];
+    }
 }
 CoreLibraryService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: CoreLibraryService, deps: [{ token: SettingsService }, { token: CountryService }, { token: PaymentMethodsService }, { token: SavedMethodsService }, { token: UserBalanceService }, { token: PaymentService }, { token: DeviceFingerPrintService }, { token: FinanceDetailsService }, { token: LegalService }, { token: NextActionService }], target: i0.ɵɵFactoryTarget.Injectable });
 CoreLibraryService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: CoreLibraryService, providedIn: 'root' });