@xsolla/payment-client-core 0.2.74 → 0.2.75

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

@@ -6,7 +6,7 @@ import { HttpParams, HttpHeaders, HttpClientModule, HTTP_INTERCEPTORS, provideHt
 import { UntypedFormGroup, Validators, UntypedFormControl, FormGroup, ReactiveFormsModule } from '@angular/forms';
 import JSEncrypt from 'jsencrypt';
 import { filter, map as map$1, tap, debounce, debounceTime, catchError } from 'rxjs/operators';
-import * as i23 from '@ngx-translate/core';
+import * as i24 from '@ngx-translate/core';
 import { provideTranslateService, MissingTranslationHandler } from '@ngx-translate/core';
 import * as i1$1 from '@angular/router';
 import { CommonModule } from '@angular/common';
@@ -141,6 +141,15 @@ class SettingsService {
     get unsafeUtilsResponse() {
         return this.response ?? null;
     }
+    get unsafeUser() {
+        return this.response?.user ?? null;
+    }
+    get unsafeProject() {
+        return this.response?.project ?? null;
+    }
+    get unsafeSettings() {
+        return this.response?.settings ?? null;
+    }
     get isEmpty() {
         return !this.response;
     }
@@ -197,782 +206,84 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImpor
                 }]
         }], ctorParameters: () => [{ type: SecureApiClient }] });
 
-class CountryService {
-    get userIpCountry() {
-        const user = this.settingsService.user;
-        return user?.ip_country ?? user?.country.value ?? '';
-    }
-    constructor(settingsService) {
-        this.settingsService = settingsService;
-        this.userDefinedCountry = null;
-    }
-    setCountry(country) {
-        this.userDefinedCountry = country;
-    }
-    getCountry() {
-        return this.userDefinedCountry ?? this.getTokenCountry();
-    }
-    getTokenCountry() {
-        return this.settingsService.user.country.value;
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: CountryService, deps: [{ token: SettingsService }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: CountryService, providedIn: 'root' }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: CountryService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root',
-                }]
-        }], ctorParameters: () => [{ type: SettingsService }] });
-
-class ResponseError extends AppError {
-    constructor(message) {
-        super('Response failed' + (message ? `: "${message}".` : '.'));
-    }
-}
-
-var BooleanNumber;
-(function (BooleanNumber) {
-    BooleanNumber[BooleanNumber["false"] = 0] = "false";
-    BooleanNumber[BooleanNumber["true"] = 1] = "true";
-})(BooleanNumber || (BooleanNumber = {}));
-
-class PaymentMethodsResponse {
-    constructor(paymentMethods) {
-        this.especial = paymentMethods.especial.map((method) => this.mapPaymentMethod(method));
-        this.top = paymentMethods.top.map((method) => this.mapPaymentMethod(method));
-        this.remained = paymentMethods.remained.map((method) => this.mapPaymentMethod(method));
-        this.remainedCount = {
-            total: paymentMethods.remained_count.total,
-            visible: paymentMethods.remained_count.visible,
-        };
-    }
-    mapPaymentMethod(method) {
-        return {
-            id: method.id,
-            rank: method.rank,
-            name: method.name,
-            aliases: method.aliases,
-            categories: method.cat,
-            recommended: method.recommended === BooleanNumber.true,
-            enabledSaveAccount: method.enabled_save_account,
-            iconName: method.switch_icon_name,
-        };
-    }
-}
-
-const paymentMethodsResponseFactoryToken = new InjectionToken('PaymentMethodsResponse');
-const paymentMethodsResponseFactoryProvider = {
-    provide: paymentMethodsResponseFactoryToken,
-    useValue: (...args) => new PaymentMethodsResponse(...args),
-};
+var ErrorTags;
+(function (ErrorTags) {
+    ErrorTags["APP"] = "appError";
+    ErrorTags["HTTP"] = "httpError";
+    ErrorTags["JS"] = "jsError";
+    ErrorTags["WS"] = "webSocket";
+    ErrorTags["ENCRYPT"] = "encrypt";
+    ErrorTags["APPLEPAY"] = "applepay";
+    ErrorTags["HEADLESS_UI"] = "headlessUi";
+    ErrorTags["GOOGLEPAY"] = "googlepay";
+    ErrorTags["PAYTM"] = "paytm";
+})(ErrorTags || (ErrorTags = {}));
 
-class PaymentMethodsService {
-    constructor(responseFactory, settingsService, countryService, secureApi) {
-        this.responseFactory = responseFactory;
-        this.settingsService = settingsService;
-        this.countryService = countryService;
-        this.secureApi = secureApi;
-        this.apiRoute = 'remained_payment_methods';
-        this.cache = new Map();
-    }
-    async getAllMethods() {
-        return this.request();
-    }
-    async getList(isSaveMethodMode) {
-        const response = await this.request(isSaveMethodMode);
-        if (this.isFixedPaymentMethod) {
-            return this.filterMethodsByFixedPaymentMethod(response.remained);
-        }
-        return response.remained;
-    }
-    async getQuickMethods() {
-        const response = await this.request();
-        return response.especial;
-    }
-    async request(isSaveMethodMode) {
-        const requestParams = {
-            access_token: this.settingsService.token,
-            country: this.countryService.getCountry(),
-            save_payment_account_only: isSaveMethodMode
-                ? "1" /* XpsBoolean.true */
-                : "0" /* XpsBoolean.false */,
-            refer: this.settingsService.refer,
-        };
-        const cacheKey = JSON.stringify(requestParams);
-        if (!this.cache.has(cacheKey)) {
-            this.cache.set(cacheKey, lastValueFrom(this.secureApi
-                .post(this.apiRoute, new URLSearchParams({
-                ...requestParams,
-                refer: String(requestParams.refer),
-            }), {
-                headers: new HttpHeaders().set('Content-Type', 'application/x-www-form-urlencoded; charset=utf-8'),
-                responseType: 'json',
-            })
-                .pipe(map((response) => this.responseFactory(response.payment_methods)))).catch((error) => {
-                throw new ResponseError(error.message);
-            }));
+class TaggedError extends Error {
+    constructor(message, tags, extra) {
+        super(message);
+        this.tags = [];
+        this.parentTag = ErrorTags.HEADLESS_UI;
+        this.tags = this.childTag
+            ? [this.parentTag, this.childTag]
+            : [this.parentTag];
+        if (tags) {
+            const newTags = tags.filter((t, i, arr) => !this.tags.includes(t) && arr.indexOf(t) == i);
+            this.tags = [...this.tags, ...newTags];
         }
-        // @ts-expect-error the map already has the cache with key
-        return this.cache.get(cacheKey);
-    }
-    filterMethodsByFixedPaymentMethod(methods) {
-        const fixedPid = this.settingsService.purchase?.payment_system?.id;
-        const paymentMethod = methods.find((method) => method.id === fixedPid);
-        return paymentMethod ? [paymentMethod] : [];
-    }
-    get isFixedPaymentMethod() {
-        return !!this.settingsService.purchase?.payment_system?.id;
+        this.extra = extra || {};
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: PaymentMethodsService, deps: [{ token: paymentMethodsResponseFactoryToken }, { token: SettingsService }, { token: CountryService }, { token: SecureApiClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: PaymentMethodsService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: PaymentMethodsService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root',
-                }]
-        }], ctorParameters: () => [{ type: undefined, decorators: [{
-                    type: Inject,
-                    args: [paymentMethodsResponseFactoryToken]
-                }] }, { type: SettingsService }, { type: CountryService }, { type: SecureApiClient }] });
 
-class SavedMethodsResponse {
-    constructor(savedMethods) {
-        this.list = savedMethods.list.map((method) => this.mapSavedMethod(method));
-    }
-    mapSavedMethod(method) {
-        return {
-            currency: method.currency,
-            form: method.form,
-            id: method.id,
-            isSelected: method.isSelected,
-            isBabkaPay: method.is_babka_pay,
-            name: method.name,
-            pid: method.pid,
-            psName: method.psName,
-            recurrentType: method.recurrent_type,
-            replaced: method.replaced,
-            type: method.type,
-            cardExpiryDate: method.card_expiry_date,
-            dateCreate: method.date_create,
-            dateLastCharge: method.date_last_charge,
-            iconName: method.switch_icon_name,
-            userEmail: method.user_email,
-            partner: method.partner,
-        };
-    }
-}
+const unknownValue = 'unknown';
+const browsers = [
+    {
+        sentName: 'Mozilla Firefox',
+        shortName: 'Firefox',
+        regexpBrowserNameWithVersion: '(Firefox)\\/(.+)',
+    },
+    {
+        sentName: 'Samsung Internet',
+        shortName: 'SamsungBrowser',
+        regexpBrowserNameWithVersion: '(SamsungBrowser)\\/(.+)\\s',
+    },
+    {
+        sentName: 'Opera',
+        shortName: 'Opera',
+        regexpBrowserNameWithVersion: '(Opera)\\/(.+)',
+    },
+    {
+        sentName: 'Opera',
+        shortName: 'Opera',
+        regexpBrowserNameWithVersion: '(OPR)\\/(.+)',
+    },
+    {
+        sentName: 'Microsoft Edge (Legacy)',
+        shortName: 'MSEdge-legacy',
+        regexpBrowserNameWithVersion: '(Edge)\\/(.+)',
+    },
+    {
+        sentName: 'Microsoft Edge (Chromium)',
+        shortName: 'MSEdge',
+        regexpBrowserNameWithVersion: '(Edg)\\/(.+)',
+    },
+    {
+        sentName: 'Google Chrome or Chromium',
+        shortName: 'Chrome',
+        regexpBrowserNameWithVersion: '(Chrome)\\/(.+)\\s',
+    },
+    {
+        sentName: 'Apple Safari',
+        shortName: 'Safari',
+        regexpBrowserNameWithVersion: '(Safari)\\/(.+)',
+    },
+];
 
-const savedMethodsResponseFactoryToken = new InjectionToken('SavedMethodsResponse');
-const savedMethodsResponseFactoryProvider = {
-    provide: savedMethodsResponseFactoryToken,
-    useValue: (...args) => new SavedMethodsResponse(...args),
-};
-
-class SavedMethodsService {
-    constructor(responseFactory, settingsService, secureApi) {
-        this.responseFactory = responseFactory;
-        this.settingsService = settingsService;
-        this.secureApi = secureApi;
-        this.apiRoute = 'savedmethods';
-        this.cache = new Map();
-    }
-    async getList(needResetCache = false) {
-        if (needResetCache) {
-            this.cache.clear();
-        }
-        const response = await this.request();
-        return response.list;
-    }
-    async request() {
-        const requestParams = {
-            access_token: this.settingsService.token,
-        };
-        const cacheKey = JSON.stringify(requestParams);
-        if (!this.cache.has(cacheKey)) {
-            this.cache.set(cacheKey, lastValueFrom(this.secureApi
-                .post(this.apiRoute, new URLSearchParams({ ...requestParams }), {
-                headers: new HttpHeaders().set('Content-Type', 'application/x-www-form-urlencoded; charset=utf-8'),
-                responseType: 'json',
-            })
-                .pipe(map((response) => this.responseFactory(response)))).catch((error) => {
-                throw new ResponseError(error.message);
-            }));
-        }
-        // @ts-expect-error the map already has the cache with key
-        return this.cache.get(cacheKey);
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: SavedMethodsService, deps: [{ token: savedMethodsResponseFactoryToken }, { token: SettingsService }, { token: SecureApiClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: SavedMethodsService, providedIn: 'root' }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: SavedMethodsService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root',
-                }]
-        }], ctorParameters: () => [{ type: undefined, decorators: [{
-                    type: Inject,
-                    args: [savedMethodsResponseFactoryToken]
-                }] }, { type: SettingsService }, { type: SecureApiClient }] });
-
-class UserBalanceResponse {
-    constructor(userBalance) {
-        this.isEnoughUserBalance = userBalance.is_enough_user_balance ?? false;
-        this.isEnoughUserRecurrentBalance =
-            userBalance.is_enough_user_recurrent_balance ?? false;
-    }
-}
-
-const userBalanceResponseFactoryToken = new InjectionToken('UserBalanceResponse');
-const userBalanceResponseFactoryProvider = {
-    provide: userBalanceResponseFactoryToken,
-    useValue: (...args) => new UserBalanceResponse(...args),
-};
-
-class UserBalanceService {
-    constructor(responseFactory, settingsService, secureApi) {
-        this.responseFactory = responseFactory;
-        this.settingsService = settingsService;
-        this.secureApi = secureApi;
-        this.apiRoute = 'balance/sufficiency';
-        this.cache = new Map();
-    }
-    async getUserBalance() {
-        return this.request();
-    }
-    getUserBalanceValue() {
-        return this.settingsService.user.user_balance;
-    }
-    async request() {
-        const requestParams = {
-            access_token: this.settingsService.token,
-        };
-        const cacheKey = JSON.stringify(requestParams);
-        if (!this.cache.has(cacheKey)) {
-            this.cache.set(cacheKey, lastValueFrom(this.secureApi
-                .post(this.apiRoute, new URLSearchParams({ ...requestParams }), {
-                headers: new HttpHeaders().set('Content-Type', 'application/x-www-form-urlencoded; charset=utf-8'),
-                responseType: 'json',
-            })
-                .pipe(map((response) => this.responseFactory(response)))).catch((error) => {
-                throw new ResponseError(error.message);
-            }));
-        }
-        // @ts-expect-error the map already has the cache with key
-        return this.cache.get(cacheKey);
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: UserBalanceService, deps: [{ token: userBalanceResponseFactoryToken }, { token: SettingsService }, { token: SecureApiClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: UserBalanceService, providedIn: 'root' }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: UserBalanceService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root',
-                }]
-        }], ctorParameters: () => [{ type: undefined, decorators: [{
-                    type: Inject,
-                    args: [userBalanceResponseFactoryToken]
-                }] }, { type: SettingsService }, { type: SecureApiClient }] });
-
-class UrlService {
-    addSearchParams(url, params = {}) {
-        if (!url) {
-            return '';
-        }
-        const urlObject = new URL(url);
-        for (const [key, value] of Object.entries(params)) {
-            urlObject.searchParams.set(key, value);
-        }
-        return urlObject.toString();
-    }
-    getSearchParams(url) {
-        if (!url) {
-            return {};
-        }
-        const urlObject = new URL(url);
-        const searchParams = {};
-        for (const [key, value] of urlObject.searchParams) {
-            searchParams[key] = value;
-        }
-        return searchParams;
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: UrlService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: UrlService, providedIn: 'root' }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: UrlService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root',
-                }]
-        }] });
-
-class PaymentConfigService {
-    constructor(urlService, settingsService) {
-        this.urlService = urlService;
-        this.settingsService = settingsService;
-    }
-    enrich(config) {
-        if (!config.returnUrl) {
-            throw new Error('URL is not provided in payment config');
-        }
-        return {
-            ...config,
-            returnUrl: this.enrichReturnUrl(config.returnUrl, !!config.savePaymentMethod),
-        };
-    }
-    enrichReturnUrl(returnUrl, savePaymentMethod) {
-        const enrichedUrl = this.urlService.addSearchParams(returnUrl, {
-            token: this.settingsService.token,
-            isSavePaymentAccount: savePaymentMethod
-                ? "1" /* XpsBoolean.true */
-                : "0" /* XpsBoolean.false */,
-        });
-        return enrichedUrl;
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: PaymentConfigService, deps: [{ token: UrlService }, { token: SettingsService }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: PaymentConfigService, providedIn: 'root' }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: PaymentConfigService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root',
-                }]
-        }], ctorParameters: () => [{ type: UrlService }, { type: SettingsService }] });
-
-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["cardExpire"] = "card_expire";
-    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["psAccountCountry"] = "psAccountCountry";
-    FieldNames["bazitemail"] = "bazitemail";
-    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["licenseDisclaimer"] = "licenseDisclaimer";
-    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["ppEmail"] = "pp_email";
-    FieldNames["redeemPoints"] = "redeemPoints";
-    FieldNames["omnibusDirective"] = "omnibus_directive";
-    FieldNames["labelApplePay"] = "label_applePay";
-    FieldNames["countryCode"] = "countryCode";
-    FieldNames["merchantCapabilities"] = "merchantCapabilities";
-    FieldNames["requiredBillingContactFields"] = "requiredBillingContactFields";
-    FieldNames["requiredShippingContactFields"] = "requiredShippingContactFields";
-    FieldNames["supportedNetworks"] = "supportedNetworks";
-    FieldNames["acquirer"] = "acquirer";
-    FieldNames["isSandbox"] = "isSandbox";
-    FieldNames["payInstanceAccountId"] = "payInstanceAccountId";
-    FieldNames["getApplePaySessionUrl"] = "getApplePaySessionUrl";
-    FieldNames["payViaCheckoutUrl"] = "payViaCheckoutUrl";
-    FieldNames["googlePayInitData"] = "googlePayInitData";
-    FieldNames["googlePayPaymentData"] = "googlePayPaymentData";
-})(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;
-        this.xsollaNumber = {
-            accountXsolla: parameters.accountXsolla,
-            isMap: parameters.isMap,
-        };
-    }
-}
-
-class InitializeResponse {
-    constructor(response) {
-        this.paymentForm = null;
-        this.paymentForm = this.extractPaymentForm(response);
-    }
-    extractPaymentForm(response) {
-        if (!response) {
-            return null;
-        }
-        return {
-            totalAmount: response.buyData.sum,
-            currency: response.buyData.currency,
-            fields: Object.keys(response.form).map((key) => response.form[key]),
-            taxDisclaimer: response.taxDisclaimer,
-            number: response.number,
-            barcode: response.barcode,
-            instruction: response.instruction,
-            offers: response.offers,
-            error: response.error,
-            errors: response.errors,
-            restrictions: response.restrictions,
-            info: response.info,
-            buyData: response.buyData,
-            pid: response.pid,
-            messages: response.messages ?? [],
-            title: response.title,
-            summary: response.summary,
-            skipForm: response.skipForm,
-            isSavedMethodPayment: !!response.form?.saved_method_id,
-            couponCode: response.form?.couponCode?.value || '',
-            publicId: response.public_id,
-            skipCheckout: response.skipCheckout,
-            koreaNotification: response.form.korea_limits_instruction,
-            isCheckout: response.isCheckout,
-            categories: response.categories,
-            hasFatalErrors: response.textAll?.fatal,
-            userSession: response.userSession,
-            statusText: response.status?.statusData?.stateText ?? null,
-            country: response.country ? response.country.iso : null,
-        };
-    }
-}
-
-const isSubmitResponse = (value) => {
-    return value instanceof SubmitResponse;
-};
-
-var InputEventName;
-(function (InputEventName) {
-    InputEventName["blur"] = "blur";
-    InputEventName["focus"] = "focus";
-})(InputEventName || (InputEventName = {}));
-
-const googlePayPid = 3431;
-
-var ErrorTags;
-(function (ErrorTags) {
-    ErrorTags["APP"] = "appError";
-    ErrorTags["HTTP"] = "httpError";
-    ErrorTags["JS"] = "jsError";
-    ErrorTags["WS"] = "webSocket";
-    ErrorTags["ENCRYPT"] = "encrypt";
-    ErrorTags["APPLEPAY"] = "applepay";
-    ErrorTags["HEADLESS_UI"] = "headlessUi";
-    ErrorTags["GOOGLEPAY"] = "googlepay";
-    ErrorTags["PAYTM"] = "paytm";
-})(ErrorTags || (ErrorTags = {}));
-
-const fieldsAllowedToOverride = new Set([
-    FieldNames.allowSubscription,
-    FieldNames.allowSave,
-]);
-
-function isXpsBoolean(value) {
-    return value === "1" /* XpsBoolean.true */ || value === "0" /* XpsBoolean.false */;
-}
-
-/**
- * Configuration for fields that can be overridden by partner.
- * We can extend this configuration with additional fields in the future.
- */
-const overrideFieldConfigs = {
-    [FieldNames.allowSubscription]: {
-        validator: isXpsBoolean,
-        defaultValue: "0" /* XpsBoolean.false */,
-    },
-    [FieldNames.allowSave]: {
-        validator: isXpsBoolean,
-        defaultValue: "0" /* XpsBoolean.false */,
-    },
-};
-
-class TaggedError extends Error {
-    constructor(message, tags) {
-        super(message);
-        this.tags = [];
-        this.parentTag = ErrorTags.HEADLESS_UI;
-        this.tags = this.childTag
-            ? [this.parentTag, this.childTag]
-            : [this.parentTag];
-        if (tags) {
-            const newTags = tags.filter((t, i, arr) => !this.tags.includes(t) && arr.indexOf(t) == i);
-            this.tags = [...this.tags, ...newTags];
-        }
-    }
-}
-
-class ElkLoggerService {
-    constructor(window, settingsService, http, ngZone) {
-        this.window = window;
-        this.settingsService = settingsService;
-        this.http = http;
-        this.ngZone = ngZone;
-        this.vendors = new RegExp('node_modules\\/(@angular|zone).*.js$');
-        this.stackTrace = this.loadStackTrace();
-    }
-    handleError(error) {
-        this.ngZone.runOutsideAngular(() => {
-            if (isDevMode()) {
-                console.error(error);
-                return;
-            }
-            this.parseError(error).catch(console.log);
-        });
-    }
-    log(message, tags, extra) {
-        const logTags = [ErrorTags.HEADLESS_UI, ...tags];
-        if (isDevMode()) {
-            console.log(message, tags);
-            return;
-        }
-        const logMessage = {
-            additionalInfo: this.getAdditionalInfo(),
-            extra,
-            message,
-        };
-        this.sendLog(logMessage, logTags);
-    }
-    async parseError(error) {
-        const errorObj = error instanceof TaggedError
-            ? error
-            : new TaggedError(error.message || error.toString());
-        errorObj.trace = await this.getErrorTrace(errorObj);
-        errorObj.additionalInfo = this.getAdditionalInfo();
-        const { tags } = errorObj;
-        const cleanError = this.removeErrorMetaFields(errorObj);
-        this.sendLog(cleanError, tags);
-        return errorObj;
-    }
-    async loadStackTrace() {
-        const library = await import('stacktrace-js');
-        return library.default;
-    }
-    async getErrorTrace(error) {
-        const stackTrace = await this.stackTrace;
-        const stackFramesArr = await stackTrace.fromError(error);
-        const filteredFramesArr = stackFramesArr.filter(({ fileName }) => fileName && !this.vendors.test(fileName));
-        return filteredFramesArr
-            .map((stackFrame) => stackFrame.toString())
-            .join('\n');
-    }
-    getAdditionalInfo() {
-        const extractUrlHost = (url) => url.replace(/^https?:\/\/([^/?#]+).*$/i, '$1');
-        return {
-            location: {
-                url: this.window.location.href,
-            },
-            project: {
-                id: this.settingsService.project.id,
-            },
-            referrer: {
-                url: this.window.document.referrer,
-            },
-            viewport: {
-                width: this.window.document.documentElement.clientWidth,
-                height: this.window.document.documentElement.clientHeight,
-            },
-            cdn_address: this.settingsService.settings.cdnUrl
-                ? extractUrlHost(this.settingsService.settings.cdnUrl)
-                : 'none',
-            country: this.settingsService.user.country.value,
-            local: this.settingsService.user.country.localized_name,
-        };
-    }
-    removeErrorMetaFields(error) {
-        const metaPropList = [
-            'parentTag',
-            'childTag',
-            'RESTRICTED_KEYS_REGEXP',
-            'tags',
-        ];
-        Object.keys(error).forEach((key) => {
-            if (metaPropList.includes(key))
-                delete error[key];
-        });
-        // implementing own 'message' property from prototype
-        return { ...error, message: error.message };
-    }
-    sendLog(message, tags) {
-        const url = `https://logs-01.xsolla.com/tag/${tags.join(',')}`;
-        firstValueFrom(this.http.post(url, message, {
-            headers: new HttpHeaders().set('Content-Type', 'text/plain'),
-            responseType: 'text',
-        })).catch((err) => console.error('Elk Logger: request error', err));
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: ElkLoggerService, deps: [{ token: windowToken }, { token: SettingsService }, { token: i1.HttpClient }, { token: i0.NgZone }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: ElkLoggerService, providedIn: 'root' }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: ElkLoggerService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root',
-                }]
-        }], ctorParameters: () => [{ type: undefined, decorators: [{
-                    type: Inject,
-                    args: [windowToken]
-                }] }, { type: SettingsService }, { type: i1.HttpClient }, { type: i0.NgZone }] });
-
-const initializeResponseFactoryToken = new InjectionToken('InitializeResponse');
-const initializeResponseFactoryProvider = {
-    provide: initializeResponseFactoryToken,
-    useValue: (...args) => new InitializeResponse(...args),
-};
-
-var UserBehaviourEventName;
-(function (UserBehaviourEventName) {
-    UserBehaviourEventName["openPaystation"] = "open-paystation";
-    UserBehaviourEventName["showMethodHeader"] = "show-method-header";
-    UserBehaviourEventName["showErrorMessage"] = "show-error-message";
-    UserBehaviourEventName["openStatusError"] = "open-status-error";
-    UserBehaviourEventName["sysTrackedScripts"] = "sys-tracked_scripts";
-})(UserBehaviourEventName || (UserBehaviourEventName = {}));
-
-const userBehaviourEventTypes = {
-    open: 'open',
-    show: 'show',
-    click: 'click',
-    manual: 'manual',
-    store: 'store',
-};
-
-const masterCardAndVisaPaymentMethodId = 26;
-const maestroPaymentMethodId = 490;
-// eslint-disable-next-line @typescript-eslint/no-magic-numbers
-const creditCardPaymentMethodId = 1380;
-const americanExpressMethodId = 714;
-const specialCards = [
-    maestroPaymentMethodId,
-    masterCardAndVisaPaymentMethodId,
-    americanExpressMethodId,
-];
-const cardsWith3ds = [
-    masterCardAndVisaPaymentMethodId,
-    maestroPaymentMethodId,
-    creditCardPaymentMethodId,
-];
-
-const unknownValue = 'unknown';
-const browsers = [
-    {
-        sentName: 'Mozilla Firefox',
-        shortName: 'Firefox',
-        regexpBrowserNameWithVersion: '(Firefox)\\/(.+)',
-    },
-    {
-        sentName: 'Samsung Internet',
-        shortName: 'SamsungBrowser',
-        regexpBrowserNameWithVersion: '(SamsungBrowser)\\/(.+)\\s',
-    },
-    {
-        sentName: 'Opera',
-        shortName: 'Opera',
-        regexpBrowserNameWithVersion: '(Opera)\\/(.+)',
-    },
-    {
-        sentName: 'Opera',
-        shortName: 'Opera',
-        regexpBrowserNameWithVersion: '(OPR)\\/(.+)',
-    },
-    {
-        sentName: 'Microsoft Edge (Legacy)',
-        shortName: 'MSEdge-legacy',
-        regexpBrowserNameWithVersion: '(Edge)\\/(.+)',
-    },
-    {
-        sentName: 'Microsoft Edge (Chromium)',
-        shortName: 'MSEdge',
-        regexpBrowserNameWithVersion: '(Edg)\\/(.+)',
-    },
-    {
-        sentName: 'Google Chrome or Chromium',
-        shortName: 'Chrome',
-        regexpBrowserNameWithVersion: '(Chrome)\\/(.+)\\s',
-    },
-    {
-        sentName: 'Apple Safari',
-        shortName: 'Safari',
-        regexpBrowserNameWithVersion: '(Safari)\\/(.+)',
-    },
-];
-
-var Device;
-(function (Device) {
-    Device["mobile"] = "mobile";
-    Device["desktop"] = "desktop";
-})(Device || (Device = {}));
+var Device;
+(function (Device) {
+    Device["mobile"] = "mobile";
+    Device["desktop"] = "desktop";
+})(Device || (Device = {}));
 
 const osList = [
     {
@@ -1229,210 +540,969 @@ const osList = [
     },
 ];
 
-class UserAgentService {
-    constructor(window) {
+class UserAgentService {
+    constructor(window) {
+        this.window = window;
+        this._browserName = null;
+        this._browserVersion = null;
+        this._browserApp = null;
+        this._platform = null;
+        this._os = null;
+        this.getUserPlatform();
+        this.getBrowserInformation();
+        this.getOsInformation();
+    }
+    get browserVersion() {
+        return this._browserVersion;
+    }
+    get browserApp() {
+        return this._browserApp;
+    }
+    get platform() {
+        if (this._platform === unknownValue) {
+            return this.osType;
+        }
+        return this._platform;
+    }
+    get userAgent() {
+        return this.window.navigator.userAgent;
+    }
+    get browserDescription() {
+        if (this.browserName === unknownValue || this.browserName === null) {
+            return this.userAgent;
+        }
+        return this.browserName;
+    }
+    get isSafari() {
+        return this._browserName === 'Apple Safari';
+    }
+    get safariVersion() {
+        if (!this.isSafari) {
+            return null;
+        }
+        const versionRegExp = new RegExp('(Version)\\/(.+)\\s');
+        const version = versionRegExp.exec(this.userAgent);
+        if (!version) {
+            return null;
+        }
+        return Number(version[2].split('.')[0]);
+    }
+    get iOsVersion() {
+        if (this.osType !== 'ios') {
+            return null;
+        }
+        const version = /OS (\d+)_(\d+)_?(\d+)?/.exec(this.window.navigator.appVersion);
+        return version ? `${version[1]}.${version[2]}.${version[3] ?? 0}` : null;
+    }
+    get browserInfo() {
+        const browserInfo = {
+            name: this.browserDescription,
+            [this.browserApp?.toLowerCase() ?? unknownValue]: true,
+            version: this.browserVersion,
+            [this.browserEngine.toLowerCase()]: true,
+            ui_version: this.isMobileDevice ? Device.mobile : Device.desktop,
+            os: this.os,
+        };
+        if (this.isMobileDevice) {
+            browserInfo.mobile = true;
+        }
+        if (this.osType) {
+            // @ts-expect-error index is string
+            browserInfo[this.osType.toLowerCase()] = true;
+        }
+        if (this.window.navigator.platform?.includes('iPhone')) {
+            browserInfo.iphone = true;
+        }
+        if (this.window.navigator.platform?.includes('iPod')) {
+            browserInfo.ipod = true;
+        }
+        if (this.window.navigator.platform?.includes('iPad')) {
+            browserInfo.ipad = true;
+            browserInfo.tablet = true;
+        }
+        if (this.isAndroid) {
+            browserInfo.android = true;
+        }
+        return browserInfo;
+    }
+    get isMobileDevice() {
+        const deviceAgents = [
+            'Android',
+            'webOS',
+            'iPhone',
+            'iPad',
+            'iPod',
+            'BlackBerry',
+            'IEMobile',
+            'Opera Mini',
+            'Mobile',
+            'Tablet',
+            'Kindle',
+            'Playbook',
+            'Silk',
+            'Puffin',
+            'CriOS',
+        ];
+        return new RegExp(deviceAgents.join('|'), 'i').test(this.userAgent);
+    }
+    get isIosAndNotIpad() {
+        return ['iPhone', 'iPod'].includes(this.window.navigator.platform);
+    }
+    getUserPlatform() {
+        const experimentalPlatformApi = this.window.navigator?.userAgentData;
+        const platform = experimentalPlatformApi?.platform ??
+            this.window?.navigator?.platform ??
+            unknownValue;
+        this._platform = platform.toLowerCase();
+    }
+    getBrowserInformation() {
+        for (const browser of browsers) {
+            const browserRegExp = new RegExp(browser.regexpBrowserNameWithVersion);
+            const browserNameWithVersion = browserRegExp.exec(this.userAgent);
+            if (browserNameWithVersion !== null) {
+                this._browserName = browser.sentName;
+                this._browserApp = browser.shortName;
+                this._browserVersion = browserNameWithVersion[2];
+                break;
+            }
+            this._browserName = unknownValue;
+            this._browserApp = unknownValue;
+            this._browserVersion = unknownValue;
+        }
+    }
+    getOsInformation() {
+        for (const os of osList) {
+            const osRegExp = new RegExp(os.regExp);
+            const osName = osRegExp.exec(this.userAgent);
+            if (osName !== null) {
+                this._os = os.name;
+                break;
+            }
+            this._os = unknownValue;
+        }
+    }
+    get browserName() {
+        return this._browserName;
+    }
+    get isAndroid() {
+        return /Android\s+([\d.]+)/.test(this.userAgent);
+    }
+    get isXbox() {
+        return /xbox/i.test(this.userAgent);
+    }
+    get isLinux() {
+        return /linux/i.test(this.userAgent);
+    }
+    get isWindows() {
+        return /windows/i.test(this.userAgent);
+    }
+    get browserEngine() {
+        const engines = new Map([
+            ['Firefox', 'Gecko'],
+            ['Safari', 'Webkit'],
+            ['MSEdge-legacy', 'EdgeHTML'],
+            ['Chrome', 'Blink'],
+            ['Opera', 'Blink'],
+            ['MSEdge', 'Blink'],
+            ['SamsungBrowser', 'Blink'],
+        ]);
+        return engines.get(this.browserApp) ?? unknownValue;
+    }
+    get os() {
+        return this._os;
+    }
+    get osType() {
+        if (['iPhone', 'iPod', 'iPad'].includes(this.window.navigator.platform)) {
+            return 'ios';
+        }
+        if (this.window.navigator.platform?.includes('MacIntel')) {
+            return 'mac';
+        }
+        if (this.isXbox) {
+            return 'xbox';
+        }
+        if (this.isWindows) {
+            return 'windows';
+        }
+        if (this.isAndroid) {
+            return 'android';
+        }
+        if (this.isLinux) {
+            return 'linux';
+        }
+        return null;
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: UserAgentService, deps: [{ token: windowToken }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: UserAgentService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: UserAgentService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }], ctorParameters: () => [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: [windowToken]
+                }] }] });
+
+class CommonLogAttributesService {
+    constructor(window, settingsService, userAgentService) {
         this.window = window;
-        this._browserName = null;
-        this._browserVersion = null;
-        this._browserApp = null;
-        this._platform = null;
-        this._os = null;
-        this.getUserPlatform();
-        this.getBrowserInformation();
-        this.getOsInformation();
+        this.settingsService = settingsService;
+        this.userAgentService = userAgentService;
+    }
+    getAttributes() {
+        const user = this.settingsService.unsafeUser;
+        const project = this.settingsService.unsafeProject;
+        const settings = this.settingsService.unsafeSettings;
+        return {
+            token: this.settingsService.token,
+            userId: user?.uuid,
+            userEmail: user?.email?.value,
+            projectId: project?.id,
+            merchantId: project?.merchantId,
+            locationUrl: this.window.location.href,
+            userAgent: this.userAgentService.userAgent,
+            referrerUrl: this.window.document.referrer,
+            viewportWidth: this.window.document.documentElement.clientWidth,
+            viewportHeight: this.window.document.documentElement.clientHeight,
+            cdnAddress: settings?.cdnUrl
+                ? this.extractUrlHost(settings.cdnUrl)
+                : 'none',
+            country: user?.country?.value,
+            local: user?.country?.localized_name,
+            browserInfo: JSON.stringify(this.userAgentService.browserInfo),
+        };
+    }
+    extractUrlHost(url) {
+        return url.replace(/^https?:\/\/([^/?#]+).*$/i, '$1');
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: CommonLogAttributesService, deps: [{ token: windowToken }, { token: SettingsService }, { token: UserAgentService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: CommonLogAttributesService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: CommonLogAttributesService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }], ctorParameters: () => [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: [windowToken]
+                }] }, { type: SettingsService }, { type: UserAgentService }] });
+
+class ElkLoggerService {
+    constructor(commonLogAttributesService, http, ngZone) {
+        this.commonLogAttributesService = commonLogAttributesService;
+        this.http = http;
+        this.ngZone = ngZone;
+        this.vendors = new RegExp('node_modules\\/(@angular|zone).*.js$');
+        this.stackTrace = this.loadStackTrace();
+    }
+    handleError(error) {
+        this.ngZone.runOutsideAngular(() => {
+            if (isDevMode()) {
+                console.error(error);
+                return;
+            }
+            this.parseError(error).catch(console.log);
+        });
+    }
+    log(message, tags, extra) {
+        const logTags = [ErrorTags.HEADLESS_UI, ...tags];
+        if (isDevMode()) {
+            console.log(message, tags);
+            return;
+        }
+        const logMessage = {
+            additionalInfo: this.getAdditionalInfo(),
+            extra,
+            message,
+        };
+        this.sendLog(logMessage, logTags);
+    }
+    async parseError(error) {
+        const errorObj = error instanceof TaggedError
+            ? error
+            : new TaggedError(error.message || error.toString());
+        errorObj.trace = await this.getErrorTrace(errorObj);
+        errorObj.additionalInfo = this.getAdditionalInfo();
+        const { tags } = errorObj;
+        const cleanError = this.removeErrorMetaFields(errorObj);
+        this.sendLog(cleanError, tags);
+        return errorObj;
+    }
+    async loadStackTrace() {
+        const library = await import('stacktrace-js');
+        return library.default;
+    }
+    async getErrorTrace(error) {
+        const stackTrace = await this.stackTrace;
+        const stackFramesArr = await stackTrace.fromError(error);
+        const filteredFramesArr = stackFramesArr.filter(({ fileName }) => fileName && !this.vendors.test(fileName));
+        return filteredFramesArr
+            .map((stackFrame) => stackFrame.toString())
+            .join('\n');
+    }
+    getAdditionalInfo() {
+        const commonLogAttributes = this.commonLogAttributesService.getAttributes();
+        return {
+            token: commonLogAttributes.token,
+            location: {
+                url: commonLogAttributes.locationUrl ?? '',
+            },
+            project: {
+                id: commonLogAttributes.projectId ?? null,
+            },
+            referrer: {
+                url: commonLogAttributes.referrerUrl ?? '',
+            },
+            viewport: {
+                width: commonLogAttributes.viewportWidth,
+                height: commonLogAttributes.viewportHeight,
+            },
+            cdn_address: commonLogAttributes.cdnAddress,
+            country: commonLogAttributes.country ?? '',
+            local: commonLogAttributes.local ?? '',
+        };
+    }
+    removeErrorMetaFields(error) {
+        const metaPropList = [
+            'parentTag',
+            'childTag',
+            'RESTRICTED_KEYS_REGEXP',
+            'tags',
+        ];
+        Object.keys(error).forEach((key) => {
+            if (metaPropList.includes(key))
+                delete error[key];
+        });
+        // implementing own 'message' property from prototype
+        return { ...error, message: error.message };
+    }
+    sendLog(message, tags) {
+        const url = `https://logs-01.xsolla.com/tag/${tags.join(',')}`;
+        firstValueFrom(this.http.post(url, message, {
+            headers: new HttpHeaders().set('Content-Type', 'text/plain'),
+            responseType: 'text',
+        })).catch((err) => console.error('Elk Logger: request error', err));
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: ElkLoggerService, deps: [{ token: CommonLogAttributesService }, { token: i1.HttpClient }, { token: i0.NgZone }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: ElkLoggerService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: ElkLoggerService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }], ctorParameters: () => [{ type: CommonLogAttributesService }, { type: i1.HttpClient }, { type: i0.NgZone }] });
+
+class LoggerService {
+    constructor(elkLoggerService) {
+        this.elkLoggerService = elkLoggerService;
+        this.handlers = [];
+    }
+    register(handler) {
+        this.handlers.push(handler);
+    }
+    error(error) {
+        this.elkLoggerService.handleError(error);
+        this.handlers.forEach((handler) => handler.handleError(error));
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: LoggerService, deps: [{ token: ElkLoggerService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: LoggerService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: LoggerService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }], ctorParameters: () => [{ type: ElkLoggerService }] });
+
+class CountryService {
+    get userIpCountry() {
+        const user = this.settingsService.user;
+        return user?.ip_country ?? user?.country.value ?? '';
+    }
+    constructor(settingsService) {
+        this.settingsService = settingsService;
+        this.userDefinedCountry = null;
+    }
+    setCountry(country) {
+        this.userDefinedCountry = country;
+    }
+    getCountry() {
+        return this.userDefinedCountry ?? this.getTokenCountry();
+    }
+    getTokenCountry() {
+        return this.settingsService.user.country.value;
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: CountryService, deps: [{ token: SettingsService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: CountryService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: CountryService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }], ctorParameters: () => [{ type: SettingsService }] });
+
+class ResponseError extends AppError {
+    constructor(message) {
+        super('Response failed' + (message ? `: "${message}".` : '.'));
+    }
+}
+
+var BooleanNumber;
+(function (BooleanNumber) {
+    BooleanNumber[BooleanNumber["false"] = 0] = "false";
+    BooleanNumber[BooleanNumber["true"] = 1] = "true";
+})(BooleanNumber || (BooleanNumber = {}));
+
+class PaymentMethodsResponse {
+    constructor(paymentMethods) {
+        this.especial = paymentMethods.especial.map((method) => this.mapPaymentMethod(method));
+        this.top = paymentMethods.top.map((method) => this.mapPaymentMethod(method));
+        this.remained = paymentMethods.remained.map((method) => this.mapPaymentMethod(method));
+        this.remainedCount = {
+            total: paymentMethods.remained_count.total,
+            visible: paymentMethods.remained_count.visible,
+        };
     }
-    get browserVersion() {
-        return this._browserVersion;
+    mapPaymentMethod(method) {
+        return {
+            id: method.id,
+            rank: method.rank,
+            name: method.name,
+            aliases: method.aliases,
+            categories: method.cat,
+            recommended: method.recommended === BooleanNumber.true,
+            enabledSaveAccount: method.enabled_save_account,
+            iconName: method.switch_icon_name,
+        };
     }
-    get browserApp() {
-        return this._browserApp;
+}
+
+const paymentMethodsResponseFactoryToken = new InjectionToken('PaymentMethodsResponse');
+const paymentMethodsResponseFactoryProvider = {
+    provide: paymentMethodsResponseFactoryToken,
+    useValue: (...args) => new PaymentMethodsResponse(...args),
+};
+
+class PaymentMethodsService {
+    constructor(responseFactory, settingsService, countryService, secureApi) {
+        this.responseFactory = responseFactory;
+        this.settingsService = settingsService;
+        this.countryService = countryService;
+        this.secureApi = secureApi;
+        this.apiRoute = 'remained_payment_methods';
+        this.cache = new Map();
     }
-    get platform() {
-        if (this._platform === unknownValue) {
-            return this.osType;
+    async getAllMethods() {
+        return this.request();
+    }
+    async getList(isSaveMethodMode) {
+        const response = await this.request(isSaveMethodMode);
+        if (this.isFixedPaymentMethod) {
+            return this.filterMethodsByFixedPaymentMethod(response.remained);
         }
-        return this._platform;
+        return response.remained;
     }
-    get userAgent() {
-        return this.window.navigator.userAgent;
+    async getQuickMethods() {
+        const response = await this.request();
+        return response.especial;
     }
-    get browserDescription() {
-        if (this.browserName === unknownValue || this.browserName === null) {
-            return this.userAgent;
+    async request(isSaveMethodMode) {
+        const requestParams = {
+            access_token: this.settingsService.token,
+            country: this.countryService.getCountry(),
+            save_payment_account_only: isSaveMethodMode
+                ? "1" /* XpsBoolean.true */
+                : "0" /* XpsBoolean.false */,
+            refer: this.settingsService.refer,
+        };
+        const cacheKey = JSON.stringify(requestParams);
+        if (!this.cache.has(cacheKey)) {
+            this.cache.set(cacheKey, lastValueFrom(this.secureApi
+                .post(this.apiRoute, new URLSearchParams({
+                ...requestParams,
+                refer: String(requestParams.refer),
+            }), {
+                headers: new HttpHeaders().set('Content-Type', 'application/x-www-form-urlencoded; charset=utf-8'),
+                responseType: 'json',
+            })
+                .pipe(map((response) => this.responseFactory(response.payment_methods)))).catch((error) => {
+                throw new ResponseError(error.message);
+            }));
         }
-        return this.browserName;
+        // @ts-expect-error the map already has the cache with key
+        return this.cache.get(cacheKey);
     }
-    get isSafari() {
-        return this._browserName === 'Apple Safari';
+    filterMethodsByFixedPaymentMethod(methods) {
+        const fixedPid = this.settingsService.purchase?.payment_system?.id;
+        const paymentMethod = methods.find((method) => method.id === fixedPid);
+        return paymentMethod ? [paymentMethod] : [];
     }
-    get safariVersion() {
-        if (!this.isSafari) {
-            return null;
-        }
-        const versionRegExp = new RegExp('(Version)\\/(.+)\\s');
-        const version = versionRegExp.exec(this.userAgent);
-        if (!version) {
-            return null;
-        }
-        return Number(version[2].split('.')[0]);
+    get isFixedPaymentMethod() {
+        return !!this.settingsService.purchase?.payment_system?.id;
     }
-    get iOsVersion() {
-        if (this.osType !== 'ios') {
-            return null;
-        }
-        const version = /OS (\d+)_(\d+)_?(\d+)?/.exec(this.window.navigator.appVersion);
-        return version ? `${version[1]}.${version[2]}.${version[3] ?? 0}` : null;
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: PaymentMethodsService, deps: [{ token: paymentMethodsResponseFactoryToken }, { token: SettingsService }, { token: CountryService }, { token: SecureApiClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: PaymentMethodsService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: PaymentMethodsService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }], ctorParameters: () => [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: [paymentMethodsResponseFactoryToken]
+                }] }, { type: SettingsService }, { type: CountryService }, { type: SecureApiClient }] });
+
+class SavedMethodsResponse {
+    constructor(savedMethods) {
+        this.list = savedMethods.list.map((method) => this.mapSavedMethod(method));
     }
-    get browserInfo() {
-        const browserInfo = {
-            name: this.browserDescription,
-            [this.browserApp?.toLowerCase() ?? unknownValue]: true,
-            version: this.browserVersion,
-            [this.browserEngine.toLowerCase()]: true,
-            ui_version: this.isMobileDevice ? Device.mobile : Device.desktop,
-            os: this.os,
+    mapSavedMethod(method) {
+        return {
+            currency: method.currency,
+            form: method.form,
+            id: method.id,
+            isSelected: method.isSelected,
+            isBabkaPay: method.is_babka_pay,
+            name: method.name,
+            pid: method.pid,
+            psName: method.psName,
+            recurrentType: method.recurrent_type,
+            replaced: method.replaced,
+            type: method.type,
+            cardExpiryDate: method.card_expiry_date,
+            dateCreate: method.date_create,
+            dateLastCharge: method.date_last_charge,
+            iconName: method.switch_icon_name,
+            userEmail: method.user_email,
+            partner: method.partner,
         };
-        if (this.isMobileDevice) {
-            browserInfo.mobile = true;
-        }
-        if (this.osType) {
-            // @ts-expect-error index is string
-            browserInfo[this.osType.toLowerCase()] = true;
-        }
-        if (this.window.navigator.platform?.includes('iPhone')) {
-            browserInfo.iphone = true;
-        }
-        if (this.window.navigator.platform?.includes('iPod')) {
-            browserInfo.ipod = true;
-        }
-        if (this.window.navigator.platform?.includes('iPad')) {
-            browserInfo.ipad = true;
-            browserInfo.tablet = true;
+    }
+}
+
+const savedMethodsResponseFactoryToken = new InjectionToken('SavedMethodsResponse');
+const savedMethodsResponseFactoryProvider = {
+    provide: savedMethodsResponseFactoryToken,
+    useValue: (...args) => new SavedMethodsResponse(...args),
+};
+
+class SavedMethodsService {
+    constructor(responseFactory, settingsService, secureApi) {
+        this.responseFactory = responseFactory;
+        this.settingsService = settingsService;
+        this.secureApi = secureApi;
+        this.apiRoute = 'savedmethods';
+        this.cache = new Map();
+    }
+    async getList(needResetCache = false) {
+        if (needResetCache) {
+            this.cache.clear();
         }
-        if (this.isAndroid) {
-            browserInfo.android = true;
+        const response = await this.request();
+        return response.list;
+    }
+    async request() {
+        const requestParams = {
+            access_token: this.settingsService.token,
+        };
+        const cacheKey = JSON.stringify(requestParams);
+        if (!this.cache.has(cacheKey)) {
+            this.cache.set(cacheKey, lastValueFrom(this.secureApi
+                .post(this.apiRoute, new URLSearchParams({ ...requestParams }), {
+                headers: new HttpHeaders().set('Content-Type', 'application/x-www-form-urlencoded; charset=utf-8'),
+                responseType: 'json',
+            })
+                .pipe(map((response) => this.responseFactory(response)))).catch((error) => {
+                throw new ResponseError(error.message);
+            }));
         }
-        return browserInfo;
+        // @ts-expect-error the map already has the cache with key
+        return this.cache.get(cacheKey);
     }
-    get isMobileDevice() {
-        const deviceAgents = [
-            'Android',
-            'webOS',
-            'iPhone',
-            'iPad',
-            'iPod',
-            'BlackBerry',
-            'IEMobile',
-            'Opera Mini',
-            'Mobile',
-            'Tablet',
-            'Kindle',
-            'Playbook',
-            'Silk',
-            'Puffin',
-            'CriOS',
-        ];
-        return new RegExp(deviceAgents.join('|'), 'i').test(this.userAgent);
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: SavedMethodsService, deps: [{ token: savedMethodsResponseFactoryToken }, { token: SettingsService }, { token: SecureApiClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: SavedMethodsService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: SavedMethodsService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }], ctorParameters: () => [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: [savedMethodsResponseFactoryToken]
+                }] }, { type: SettingsService }, { type: SecureApiClient }] });
+
+class UserBalanceResponse {
+    constructor(userBalance) {
+        this.isEnoughUserBalance = userBalance.is_enough_user_balance ?? false;
+        this.isEnoughUserRecurrentBalance =
+            userBalance.is_enough_user_recurrent_balance ?? false;
+    }
+}
+
+const userBalanceResponseFactoryToken = new InjectionToken('UserBalanceResponse');
+const userBalanceResponseFactoryProvider = {
+    provide: userBalanceResponseFactoryToken,
+    useValue: (...args) => new UserBalanceResponse(...args),
+};
+
+class UserBalanceService {
+    constructor(responseFactory, settingsService, secureApi) {
+        this.responseFactory = responseFactory;
+        this.settingsService = settingsService;
+        this.secureApi = secureApi;
+        this.apiRoute = 'balance/sufficiency';
+        this.cache = new Map();
     }
-    get isIosAndNotIpad() {
-        return ['iPhone', 'iPod'].includes(this.window.navigator.platform);
+    async getUserBalance() {
+        return this.request();
     }
-    getUserPlatform() {
-        const experimentalPlatformApi = this.window.navigator?.userAgentData;
-        const platform = experimentalPlatformApi?.platform ??
-            this.window?.navigator?.platform ??
-            unknownValue;
-        this._platform = platform.toLowerCase();
+    getUserBalanceValue() {
+        return this.settingsService.user.user_balance;
     }
-    getBrowserInformation() {
-        for (const browser of browsers) {
-            const browserRegExp = new RegExp(browser.regexpBrowserNameWithVersion);
-            const browserNameWithVersion = browserRegExp.exec(this.userAgent);
-            if (browserNameWithVersion !== null) {
-                this._browserName = browser.sentName;
-                this._browserApp = browser.shortName;
-                this._browserVersion = browserNameWithVersion[2];
-                break;
-            }
-            this._browserName = unknownValue;
-            this._browserApp = unknownValue;
-            this._browserVersion = unknownValue;
+    async request() {
+        const requestParams = {
+            access_token: this.settingsService.token,
+        };
+        const cacheKey = JSON.stringify(requestParams);
+        if (!this.cache.has(cacheKey)) {
+            this.cache.set(cacheKey, lastValueFrom(this.secureApi
+                .post(this.apiRoute, new URLSearchParams({ ...requestParams }), {
+                headers: new HttpHeaders().set('Content-Type', 'application/x-www-form-urlencoded; charset=utf-8'),
+                responseType: 'json',
+            })
+                .pipe(map((response) => this.responseFactory(response)))).catch((error) => {
+                throw new ResponseError(error.message);
+            }));
         }
+        // @ts-expect-error the map already has the cache with key
+        return this.cache.get(cacheKey);
     }
-    getOsInformation() {
-        for (const os of osList) {
-            const osRegExp = new RegExp(os.regExp);
-            const osName = osRegExp.exec(this.userAgent);
-            if (osName !== null) {
-                this._os = os.name;
-                break;
-            }
-            this._os = unknownValue;
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: UserBalanceService, deps: [{ token: userBalanceResponseFactoryToken }, { token: SettingsService }, { token: SecureApiClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: UserBalanceService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: UserBalanceService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }], ctorParameters: () => [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: [userBalanceResponseFactoryToken]
+                }] }, { type: SettingsService }, { type: SecureApiClient }] });
+
+class UrlService {
+    addSearchParams(url, params = {}) {
+        if (!url) {
+            return '';
         }
+        const urlObject = new URL(url);
+        for (const [key, value] of Object.entries(params)) {
+            urlObject.searchParams.set(key, value);
+        }
+        return urlObject.toString();
     }
-    get browserName() {
-        return this._browserName;
-    }
-    get isAndroid() {
-        return /Android\s+([\d.]+)/.test(this.userAgent);
+    getSearchParams(url) {
+        if (!url) {
+            return {};
+        }
+        const urlObject = new URL(url);
+        const searchParams = {};
+        for (const [key, value] of urlObject.searchParams) {
+            searchParams[key] = value;
+        }
+        return searchParams;
     }
-    get isXbox() {
-        return /xbox/i.test(this.userAgent);
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: UrlService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: UrlService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: UrlService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }] });
+
+class PaymentConfigService {
+    constructor(urlService, settingsService) {
+        this.urlService = urlService;
+        this.settingsService = settingsService;
     }
-    get isLinux() {
-        return /linux/i.test(this.userAgent);
+    enrich(config) {
+        if (!config.returnUrl) {
+            throw new Error('URL is not provided in payment config');
+        }
+        return {
+            ...config,
+            returnUrl: this.enrichReturnUrl(config.returnUrl, !!config.savePaymentMethod),
+        };
     }
-    get isWindows() {
-        return /windows/i.test(this.userAgent);
+    enrichReturnUrl(returnUrl, savePaymentMethod) {
+        const enrichedUrl = this.urlService.addSearchParams(returnUrl, {
+            token: this.settingsService.token,
+            isSavePaymentAccount: savePaymentMethod
+                ? "1" /* XpsBoolean.true */
+                : "0" /* XpsBoolean.false */,
+        });
+        return enrichedUrl;
     }
-    get browserEngine() {
-        const engines = new Map([
-            ['Firefox', 'Gecko'],
-            ['Safari', 'Webkit'],
-            ['MSEdge-legacy', 'EdgeHTML'],
-            ['Chrome', 'Blink'],
-            ['Opera', 'Blink'],
-            ['MSEdge', 'Blink'],
-            ['SamsungBrowser', 'Blink'],
-        ]);
-        return engines.get(this.browserApp) ?? unknownValue;
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: PaymentConfigService, deps: [{ token: UrlService }, { token: SettingsService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: PaymentConfigService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: PaymentConfigService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }], ctorParameters: () => [{ type: UrlService }, { type: SettingsService }] });
+
+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["cardExpire"] = "card_expire";
+    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["psAccountCountry"] = "psAccountCountry";
+    FieldNames["bazitemail"] = "bazitemail";
+    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["licenseDisclaimer"] = "licenseDisclaimer";
+    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["ppEmail"] = "pp_email";
+    FieldNames["redeemPoints"] = "redeemPoints";
+    FieldNames["omnibusDirective"] = "omnibus_directive";
+    FieldNames["labelApplePay"] = "label_applePay";
+    FieldNames["countryCode"] = "countryCode";
+    FieldNames["merchantCapabilities"] = "merchantCapabilities";
+    FieldNames["requiredBillingContactFields"] = "requiredBillingContactFields";
+    FieldNames["requiredShippingContactFields"] = "requiredShippingContactFields";
+    FieldNames["supportedNetworks"] = "supportedNetworks";
+    FieldNames["acquirer"] = "acquirer";
+    FieldNames["isSandbox"] = "isSandbox";
+    FieldNames["payInstanceAccountId"] = "payInstanceAccountId";
+    FieldNames["getApplePaySessionUrl"] = "getApplePaySessionUrl";
+    FieldNames["payViaCheckoutUrl"] = "payViaCheckoutUrl";
+    FieldNames["googlePayInitData"] = "googlePayInitData";
+    FieldNames["googlePayPaymentData"] = "googlePayPaymentData";
+})(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;
+        this.xsollaNumber = {
+            accountXsolla: parameters.accountXsolla,
+            isMap: parameters.isMap,
+        };
     }
-    get os() {
-        return this._os;
+}
+
+class InitializeResponse {
+    constructor(response) {
+        this.paymentForm = null;
+        this.paymentForm = this.extractPaymentForm(response);
     }
-    get osType() {
-        if (['iPhone', 'iPod', 'iPad'].includes(this.window.navigator.platform)) {
-            return 'ios';
-        }
-        if (this.window.navigator.platform?.includes('MacIntel')) {
-            return 'mac';
-        }
-        if (this.isXbox) {
-            return 'xbox';
-        }
-        if (this.isWindows) {
-            return 'windows';
-        }
-        if (this.isAndroid) {
-            return 'android';
-        }
-        if (this.isLinux) {
-            return 'linux';
+    extractPaymentForm(response) {
+        if (!response) {
+            return null;
         }
-        return null;
+        return {
+            totalAmount: response.buyData.sum,
+            currency: response.buyData.currency,
+            fields: Object.keys(response.form).map((key) => response.form[key]),
+            taxDisclaimer: response.taxDisclaimer,
+            number: response.number,
+            barcode: response.barcode,
+            instruction: response.instruction,
+            offers: response.offers,
+            error: response.error,
+            errors: response.errors,
+            restrictions: response.restrictions,
+            info: response.info,
+            buyData: response.buyData,
+            pid: response.pid,
+            messages: response.messages ?? [],
+            title: response.title,
+            summary: response.summary,
+            skipForm: response.skipForm,
+            isSavedMethodPayment: !!response.form?.saved_method_id,
+            couponCode: response.form?.couponCode?.value || '',
+            publicId: response.public_id,
+            skipCheckout: response.skipCheckout,
+            koreaNotification: response.form.korea_limits_instruction,
+            isCheckout: response.isCheckout,
+            categories: response.categories,
+            hasFatalErrors: response.textAll?.fatal,
+            userSession: response.userSession,
+            statusText: response.status?.statusData?.stateText ?? null,
+            country: response.country ? response.country.iso : null,
+        };
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: UserAgentService, deps: [{ token: windowToken }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: UserAgentService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: UserAgentService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root',
-                }]
-        }], ctorParameters: () => [{ type: undefined, decorators: [{
-                    type: Inject,
-                    args: [windowToken]
-                }] }] });
+
+const isSubmitResponse = (value) => {
+    return value instanceof SubmitResponse;
+};
+
+var InputEventName;
+(function (InputEventName) {
+    InputEventName["blur"] = "blur";
+    InputEventName["focus"] = "focus";
+})(InputEventName || (InputEventName = {}));
+
+const fieldsAllowedToOverride = new Set([
+    FieldNames.allowSubscription,
+    FieldNames.allowSave,
+]);
+
+function isXpsBoolean(value) {
+    return value === "1" /* XpsBoolean.true */ || value === "0" /* XpsBoolean.false */;
+}
+
+/**
+ * Configuration for fields that can be overridden by partner.
+ * We can extend this configuration with additional fields in the future.
+ */
+const overrideFieldConfigs = {
+    [FieldNames.allowSubscription]: {
+        validator: isXpsBoolean,
+        defaultValue: "0" /* XpsBoolean.false */,
+    },
+    [FieldNames.allowSave]: {
+        validator: isXpsBoolean,
+        defaultValue: "0" /* XpsBoolean.false */,
+    },
+};
+
+const initializeResponseFactoryToken = new InjectionToken('InitializeResponse');
+const initializeResponseFactoryProvider = {
+    provide: initializeResponseFactoryToken,
+    useValue: (...args) => new InitializeResponse(...args),
+};
+
+var UserBehaviourEventName;
+(function (UserBehaviourEventName) {
+    UserBehaviourEventName["openPaystation"] = "open-paystation";
+    UserBehaviourEventName["showMethodHeader"] = "show-method-header";
+    UserBehaviourEventName["showErrorMessage"] = "show-error-message";
+    UserBehaviourEventName["openStatusError"] = "open-status-error";
+    UserBehaviourEventName["sysTrackedScripts"] = "sys-tracked_scripts";
+})(UserBehaviourEventName || (UserBehaviourEventName = {}));
+
+const userBehaviourEventTypes = {
+    open: 'open',
+    show: 'show',
+    click: 'click',
+    manual: 'manual',
+    store: 'store',
+};
+
+const masterCardAndVisaPaymentMethodId = 26;
+const maestroPaymentMethodId = 490;
+// eslint-disable-next-line @typescript-eslint/no-magic-numbers
+const creditCardPaymentMethodId = 1380;
+const americanExpressMethodId = 714;
+const specialCards = [
+    maestroPaymentMethodId,
+    masterCardAndVisaPaymentMethodId,
+    americanExpressMethodId,
+];
+const cardsWith3ds = [
+    masterCardAndVisaPaymentMethodId,
+    maestroPaymentMethodId,
+    creditCardPaymentMethodId,
+];
 
 class XpsApiService {
     constructor(window, secureApiClient, settingsService, countryService, userAgentService) {
@@ -1830,6 +1900,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImpor
             type: Injectable
         }] });
 
+const googlePayPid = 3431;
+
 class SpecialButtonActionCreator {
     constructor() {
         this.type = 'special_button';
@@ -5669,8 +5741,8 @@ class CentrifugoWebSocketService {
         reconnection: 1000,
         reconnectionMaxDeviation: 1000,
     }; }
-    constructor(elkLoggerService) {
-        this.elkLoggerService = elkLoggerService;
+    constructor(loggerService) {
+        this.loggerService = loggerService;
         this.type = WebSocketClientType.centrifugo;
         this.reconnectionTimerId = null;
         this.isConnectionOpen = false;
@@ -5690,8 +5762,8 @@ class CentrifugoWebSocketService {
         catch (error) {
             // @ts-expect-error error is unknown
             const message = (error?.message || error);
-            const unknownError = new WsError(`unknown websocket error: ${message}`, channel);
-            this.elkLoggerService.handleError(unknownError);
+            const wsError = new WsError(`unknown websocket error: ${message}`, channel);
+            this.loggerService.error(wsError);
         }
     }
     close() {
@@ -5770,9 +5842,9 @@ class CentrifugoWebSocketService {
             })
                 .on('error', (ctx) => {
                 const message = `code ${ctx.error.code} - ${ctx.error.message}`;
-                this.elkLoggerService.log(`connection error: ${message}`, [ErrorTags.WS], {
+                this.loggerService.error(new TaggedError(`connection error: ${message}`, [ErrorTags.WS], {
                     channel: websocketChannel,
-                });
+                }));
             })
                 .connect();
             this.subscription = this.connection.newSubscription(websocketChannel, this.getSubscriptionOptions(websocketChannel));
@@ -5783,16 +5855,16 @@ class CentrifugoWebSocketService {
             })
                 .on('publication', (ctx) => {
                 const message = ctx.data;
-                this.elkLoggerService.log(`websocket message received: ${message}`, [ErrorTags.WS], {
+                this.loggerService.error(new TaggedError(`websocket message received: ${message}`, [ErrorTags.WS], {
                     channel: websocketChannel,
-                });
+                }));
                 this.incomingMessages$.next(ctx);
             })
                 .on('error', (ctx) => {
                 const message = `code ${ctx.error.code} - ${ctx.error.message}`;
-                this.elkLoggerService.log(`subscription error: ${message}`, [ErrorTags.WS], {
+                this.loggerService.error(new TaggedError(`subscription error: ${message}`, [ErrorTags.WS], {
                     channel: websocketChannel,
-                });
+                }));
             })
                 .subscribe();
         });
@@ -5808,9 +5880,9 @@ class CentrifugoWebSocketService {
         /* If connection error, cause any connection error isn't 0 */
         if (ctx.code !== 0) {
             const message = `code ${ctx.code} - ${ctx.reason}`;
-            this.elkLoggerService.log(`disconnected error: ${message}`, [ErrorTags.WS], {
+            this.loggerService.error(new TaggedError(`disconnected error: ${message}`, [ErrorTags.WS], {
                 channel: websocketChannel,
-            });
+            }));
             (async () => {
                 await this.waitWhileNotReconnect();
             })();
@@ -5837,9 +5909,9 @@ class CentrifugoWebSocketService {
         }
         const afterTimer = performance.now();
         const timerDuration = afterTimer - beforeTimer;
-        this.elkLoggerService.log(`fallback to reconnection timer: duration ${timerDuration}ms`, [ErrorTags.WS], {
+        this.loggerService.error(new TaggedError(`fallback to reconnection timer: duration ${timerDuration}ms`, [ErrorTags.WS], {
             channel: this.channel,
-        });
+        }));
         this.successfulReconnectionEventsProxy$.next();
     }
     getSubscriptionOptions(websocketChannel) {
@@ -5852,7 +5924,7 @@ class CentrifugoWebSocketService {
         }
         return options;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: CentrifugoWebSocketService, deps: [{ token: ElkLoggerService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: CentrifugoWebSocketService, deps: [{ token: LoggerService }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: CentrifugoWebSocketService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: CentrifugoWebSocketService, decorators: [{
@@ -5860,7 +5932,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImpor
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: () => [{ type: ElkLoggerService }] });
+        }], ctorParameters: () => [{ type: LoggerService }] });
 
 // @todo: remove this factory and switch to centrifugo client after centrifugo issues resolved
 class WebSocketFactory {
@@ -6308,8 +6380,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImpor
         }] });
 
 class InitializeSpecialButtonActionCreator {
-    constructor(elkLoggerService) {
-        this.elkLoggerService = elkLoggerService;
+    constructor(loggerService) {
+        this.loggerService = loggerService;
         this.type = 'special_button';
         this.pids = [googlePayPid];
         this.sdkPaymentMethodsName = new Map([
@@ -6333,19 +6405,19 @@ class InitializeSpecialButtonActionCreator {
     getPaymentMethodName(pid = 0) {
         const buttonName = this.sdkPaymentMethodsName.get(pid);
         if (!buttonName) {
-            this.elkLoggerService.log('No special button for provided pid', [ErrorTags.GOOGLEPAY], {
+            this.loggerService.error(new TaggedError('No special button for provided pid', [ErrorTags.GOOGLEPAY], {
                 pid,
-            });
+            }));
             throw new Error('Special button not found');
         }
         return buttonName;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: InitializeSpecialButtonActionCreator, deps: [{ token: ElkLoggerService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: InitializeSpecialButtonActionCreator, deps: [{ token: LoggerService }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: InitializeSpecialButtonActionCreator }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: InitializeSpecialButtonActionCreator, decorators: [{
             type: Injectable
-        }], ctorParameters: () => [{ type: ElkLoggerService }] });
+        }], ctorParameters: () => [{ type: LoggerService }] });
 
 const initializeNextActionsToken = new InjectionToken('InitializeNextActions');
 const initializeNextActions = [
@@ -6871,7 +6943,11 @@ class BehaviourStrategy {
     isSuitable() {
         return false;
     }
+    onInit() { }
     onDestroy() { }
+    canAutoSubmit() {
+        return false;
+    }
     setPaymentData(paymentData) {
         this.paymentData = paymentData;
     }
@@ -6921,9 +6997,76 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImpor
             type: Injectable
         }], ctorParameters: () => [] });
 
+class GooglePayInstantFlowStrategy extends BehaviourStrategy {
+    constructor() {
+        super();
+    }
+    isSuitable() {
+        if (!isInitializeResponse(this.paymentData)) {
+            return false;
+        }
+        const isInstantPayFlow = this.paymentData.paymentForm?.fields.some((field) => {
+            return field.name === FieldNames.googlePayInitData;
+        });
+        return (this.paymentData.paymentForm?.pid === googlePay && !!isInstantPayFlow);
+    }
+    onInit() {
+        this.hideField(FieldNames.zip);
+        this.hideField(FieldNames.email);
+    }
+    hideField(fieldName) {
+        if (!isInitializeResponse(this.paymentData)) {
+            return;
+        }
+        const fieldForHide = this.paymentData.paymentForm?.fields.find((field) => {
+            return field.name === fieldName;
+        });
+        if (fieldForHide) {
+            fieldForHide.isVisible = "0" /* XpsBoolean.false */;
+        }
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: GooglePayInstantFlowStrategy, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: GooglePayInstantFlowStrategy }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: GooglePayInstantFlowStrategy, decorators: [{
+            type: Injectable
+        }], ctorParameters: () => [] });
+
+class GooglePayRegularFlowStrategy extends BehaviourStrategy {
+    constructor() {
+        super();
+    }
+    isSuitable() {
+        if (!isInitializeResponse(this.paymentData)) {
+            return false;
+        }
+        const isInstantPayFlow = this.paymentData.paymentForm?.fields.some((field) => {
+            return field.name === FieldNames.googlePayInitData;
+        });
+        return this.paymentData.paymentForm?.pid === googlePay && !isInstantPayFlow;
+    }
+    canAutoSubmit() {
+        const visibleFields = this.getVisibleFields();
+        return visibleFields.length === 0;
+    }
+    getVisibleFields() {
+        if (!isInitializeResponse(this.paymentData)) {
+            return [];
+        }
+        return (this.paymentData.paymentForm?.fields.filter((field) => field.isVisible === "1" /* XpsBoolean.true */ && field.isMandatory) ?? []);
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: GooglePayRegularFlowStrategy, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: GooglePayRegularFlowStrategy }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: GooglePayRegularFlowStrategy, decorators: [{
+            type: Injectable
+        }], ctorParameters: () => [] });
+
 const behaviourStrategiesToken = new InjectionToken('BehaviourStrategies');
 const behaviourStrategies = [
     ApplePayWithShippingAddressStrategy,
+    GooglePayInstantFlowStrategy,
+    GooglePayRegularFlowStrategy,
 ];
 
 class PaymentBehaviourService {
@@ -6965,8 +7108,8 @@ class PaymentService {
     get formResponseValue() {
         return this._formResponse$.getValue();
     }
-    constructor(elkLoggerService, initializeService, submitService, syncService, formService, statusService, financeDetailsService, creditCardStateService, nextActionService, initializeNextActionService, controlConfigService, threeDsService, formMessagesService, settingsService, countryService, checkStatusActionCreator, printInstructionService, paymentBehaviourService) {
-        this.elkLoggerService = elkLoggerService;
+    constructor(loggerService, initializeService, submitService, syncService, formService, statusService, financeDetailsService, creditCardStateService, nextActionService, initializeNextActionService, controlConfigService, threeDsService, formMessagesService, settingsService, countryService, checkStatusActionCreator, printInstructionService, paymentBehaviourService) {
+        this.loggerService = loggerService;
         this.initializeService = initializeService;
         this.submitService = submitService;
         this.syncService = syncService;
@@ -7057,9 +7200,9 @@ class PaymentService {
     }
     async submitWithFields(fields) {
         if (!this.form) {
-            this.elkLoggerService.log('submit error: trying to submit with no form', [
+            this.loggerService.error(new TaggedError('submit error: trying to submit with no form', [
                 ErrorTags.GOOGLEPAY,
-            ]);
+            ]));
             throw new Error('form is empty!');
         }
         this.isSavingMethodMode = this.fields.some(({ name, value }) => name === 'savePsAccountOnly' && value === "1" /* XpsBoolean.true */);
@@ -7381,16 +7524,13 @@ class PaymentService {
         }
         const isRedirectMethod = response.paymentForm.isCheckout;
         const canSkipForm = response.paymentForm.skipForm;
-        const visibleFields = response.paymentForm.fields.filter((field) => field.isVisible === "1" /* XpsBoolean.true */ && field.isMandatory);
-        const suitablePids = [googlePayPid];
-        return ((!isRedirectMethod && canSkipForm) ||
-            (visibleFields.length === 0 &&
-                suitablePids.includes(response.paymentForm.pid)));
+        const isSuitableByStrategy = this.autoSubmitBehaviourStrategies(this.config);
+        return (!isRedirectMethod && canSkipForm) || isSuitableByStrategy;
     }
     getSdkPaymentDataFromResponse(data) {
         if (isSubmitResponse(data)) {
             return {
-                checkoutData: data.parameters.checkout.data.data,
+                checkoutData: data.parameters?.checkout.data.data,
                 fields: data.fields,
                 summary: data.summary,
             };
@@ -7413,7 +7553,13 @@ class PaymentService {
             strategy.onDestroy();
         });
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: PaymentService, deps: [{ token: ElkLoggerService }, { token: InitializeService }, { token: SubmitService }, { token: SyncService }, { token: FormService }, { token: StatusService }, { token: FinanceDetailsService }, { token: CreditCardStateService }, { token: NextActionService }, { token: InitializeNextActionService }, { token: ControlConfigService }, { token: ThreeDsService }, { token: FormMessagesService }, { token: SettingsService }, { token: CountryService }, { token: CheckStatusActionCreator }, { token: PrintInstructionService }, { token: PaymentBehaviourService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    autoSubmitBehaviourStrategies(config) {
+        const behaviourStrategies = this.paymentBehaviourService.getApplicableBehaviourStrategies(this.data, config);
+        return behaviourStrategies.some((strategy) => {
+            return strategy.canAutoSubmit();
+        });
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: PaymentService, deps: [{ token: LoggerService }, { token: InitializeService }, { token: SubmitService }, { token: SyncService }, { token: FormService }, { token: StatusService }, { token: FinanceDetailsService }, { token: CreditCardStateService }, { token: NextActionService }, { token: InitializeNextActionService }, { token: ControlConfigService }, { token: ThreeDsService }, { token: FormMessagesService }, { token: SettingsService }, { token: CountryService }, { token: CheckStatusActionCreator }, { token: PrintInstructionService }, { token: PaymentBehaviourService }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: PaymentService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: PaymentService, decorators: [{
@@ -7421,7 +7567,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImpor
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: () => [{ type: ElkLoggerService }, { type: InitializeService }, { type: SubmitService }, { type: SyncService }, { type: FormService }, { type: StatusService }, { type: FinanceDetailsService }, { type: CreditCardStateService }, { type: NextActionService }, { type: InitializeNextActionService }, { type: ControlConfigService }, { type: ThreeDsService }, { type: FormMessagesService }, { type: SettingsService }, { type: CountryService }, { type: CheckStatusActionCreator }, { type: PrintInstructionService }, { type: PaymentBehaviourService }] });
+        }], ctorParameters: () => [{ type: LoggerService }, { type: InitializeService }, { type: SubmitService }, { type: SyncService }, { type: FormService }, { type: StatusService }, { type: FinanceDetailsService }, { type: CreditCardStateService }, { type: NextActionService }, { type: InitializeNextActionService }, { type: ControlConfigService }, { type: ThreeDsService }, { type: FormMessagesService }, { type: SettingsService }, { type: CountryService }, { type: CheckStatusActionCreator }, { type: PrintInstructionService }, { type: PaymentBehaviourService }] });
 
 const euCountries = new Set([
     'AT',
@@ -8074,8 +8220,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImpor
                 }] }] });
 
 class CoreLibraryService {
-    constructor(settingsService, countryService, paymentMethodsService, savedMethodsService, userBalanceService, paymentConfigService, paymentService, deviceFingerPrintService, financeDetailsService, legalService, statusService, nextActionService, creditCardService, creditCardStateService, formMessagesService, editSavedMethodsService, userBehaviourAnalyticsService, performanceService, combinedPaymentMethodsService, countriesApiService, sendInstructionService, scriptTrackerService, translateService) {
+    constructor(settingsService, loggerService, countryService, paymentMethodsService, savedMethodsService, userBalanceService, paymentConfigService, paymentService, deviceFingerPrintService, financeDetailsService, legalService, statusService, nextActionService, creditCardService, creditCardStateService, formMessagesService, editSavedMethodsService, userBehaviourAnalyticsService, performanceService, combinedPaymentMethodsService, countriesApiService, sendInstructionService, scriptTrackerService, translateService, commonLogAttributesService) {
         this.settingsService = settingsService;
+        this.loggerService = loggerService;
         this.countryService = countryService;
         this.paymentMethodsService = paymentMethodsService;
         this.savedMethodsService = savedMethodsService;
@@ -8098,6 +8245,7 @@ class CoreLibraryService {
         this.sendInstructionService = sendInstructionService;
         this.scriptTrackerService = scriptTrackerService;
         this.translateService = translateService;
+        this.commonLogAttributesService = commonLogAttributesService;
         this.paymentMethods = {
             getList: async (isSaveMethodMode) => this.paymentMethodsService.getList(isSaveMethodMode),
             getQuickMethods: async () => this.paymentMethodsService.getQuickMethods(),
@@ -8211,6 +8359,9 @@ class CoreLibraryService {
     getUserBalanceValue() {
         return this.userBalanceService.getUserBalanceValue();
     }
+    registerLogHandler(handler) {
+        this.loggerService.register(handler);
+    }
     get paymentForm$() {
         return this.paymentService.paymentForm$;
     }
@@ -8226,7 +8377,10 @@ class CoreLibraryService {
     get isApplePayInstantFlowEnabled() {
         return this.settingsService.isApplePayInstantFlowEnabled;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: CoreLibraryService, deps: [{ token: SettingsService }, { token: CountryService }, { token: PaymentMethodsService }, { token: SavedMethodsService }, { token: UserBalanceService }, { token: PaymentConfigService }, { token: PaymentService }, { token: DeviceFingerPrintService }, { token: FinanceDetailsService }, { token: LegalService }, { token: StatusService }, { token: NextActionService }, { token: CreditCardService }, { token: CreditCardStateService }, { token: FormMessagesService }, { token: EditSavedMethodsService }, { token: UserBehaviourAnalyticsService }, { token: PerformanceService }, { token: CombinedPaymentMethodsService }, { token: CountriesApiService }, { token: SendInstructionService }, { token: ScriptTrackerService }, { token: i23.TranslateService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    get commonLogAttributes() {
+        return this.commonLogAttributesService.getAttributes();
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: CoreLibraryService, deps: [{ token: SettingsService }, { token: LoggerService }, { token: CountryService }, { token: PaymentMethodsService }, { token: SavedMethodsService }, { token: UserBalanceService }, { token: PaymentConfigService }, { token: PaymentService }, { token: DeviceFingerPrintService }, { token: FinanceDetailsService }, { token: LegalService }, { token: StatusService }, { token: NextActionService }, { token: CreditCardService }, { token: CreditCardStateService }, { token: FormMessagesService }, { token: EditSavedMethodsService }, { token: UserBehaviourAnalyticsService }, { token: PerformanceService }, { token: CombinedPaymentMethodsService }, { token: CountriesApiService }, { token: SendInstructionService }, { token: ScriptTrackerService }, { token: i24.TranslateService }, { token: CommonLogAttributesService }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: CoreLibraryService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: CoreLibraryService, decorators: [{
@@ -8234,7 +8388,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImpor
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: () => [{ type: SettingsService }, { type: CountryService }, { type: PaymentMethodsService }, { type: SavedMethodsService }, { type: UserBalanceService }, { type: PaymentConfigService }, { type: PaymentService }, { type: DeviceFingerPrintService }, { type: FinanceDetailsService }, { type: LegalService }, { type: StatusService }, { type: NextActionService }, { type: CreditCardService }, { type: CreditCardStateService }, { type: FormMessagesService }, { type: EditSavedMethodsService }, { type: UserBehaviourAnalyticsService }, { type: PerformanceService }, { type: CombinedPaymentMethodsService }, { type: CountriesApiService }, { type: SendInstructionService }, { type: ScriptTrackerService }, { type: i23.TranslateService }] });
+        }], ctorParameters: () => [{ type: SettingsService }, { type: LoggerService }, { type: CountryService }, { type: PaymentMethodsService }, { type: SavedMethodsService }, { type: UserBalanceService }, { type: PaymentConfigService }, { type: PaymentService }, { type: DeviceFingerPrintService }, { type: FinanceDetailsService }, { type: LegalService }, { type: StatusService }, { type: NextActionService }, { type: CreditCardService }, { type: CreditCardStateService }, { type: FormMessagesService }, { type: EditSavedMethodsService }, { type: UserBehaviourAnalyticsService }, { type: PerformanceService }, { type: CombinedPaymentMethodsService }, { type: CountriesApiService }, { type: SendInstructionService }, { type: ScriptTrackerService }, { type: i24.TranslateService }, { type: CommonLogAttributesService }] });
 
 class HttpError extends AppError {
     constructor(error, req) {
@@ -8527,10 +8681,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImpor
         }], ctorParameters: () => [{ type: SummaryFinanceDetailsAdapterService }] });
 
 class BraintreeHandler extends ApplePaySessionHandlerAbstract {
-    constructor(window, elkLoggerService, applePayCartService) {
+    constructor(window, loggerService, applePayCartService) {
         super();
         this.window = window;
-        this.elkLoggerService = elkLoggerService;
+        this.loggerService = loggerService;
         this.applePayCartService = applePayCartService;
         this.paymentClient = null;
     }
@@ -8540,9 +8694,9 @@ class BraintreeHandler extends ApplePaySessionHandlerAbstract {
     startSession(params, additionalParams, applePayFinallyCallback) {
         if (!this.paymentClient) {
             console.error(ApplePayErrors.braintreeInitializeError);
-            this.elkLoggerService.log(ApplePayErrors.braintreeInitializeError, [
+            this.loggerService.error(new TaggedError(ApplePayErrors.braintreeInitializeError, [
                 ErrorTags.APPLEPAY,
-            ]);
+            ]));
             return;
         }
         const request = this.buildPaymentRequest(params);
@@ -8613,7 +8767,7 @@ class BraintreeHandler extends ApplePaySessionHandlerAbstract {
         };
         session.begin();
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: BraintreeHandler, deps: [{ token: windowToken }, { token: ElkLoggerService }, { token: ApplePayCartService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: BraintreeHandler, deps: [{ token: windowToken }, { token: LoggerService }, { token: ApplePayCartService }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: BraintreeHandler }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: BraintreeHandler, decorators: [{
@@ -8621,7 +8775,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImpor
         }], ctorParameters: () => [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [windowToken]
-                }] }, { type: ElkLoggerService }, { type: ApplePayCartService }] });
+                }] }, { type: LoggerService }, { type: ApplePayCartService }] });
 
 class CheckoutHandler extends ApplePaySessionHandlerAbstract {
     constructor(window, http, applePayCartService) {
@@ -9123,9 +9277,9 @@ class GooglePayService {
     get googlePaymentClientWasInitialized() {
         return !!this.googlePaymentClient;
     }
-    constructor(window, elkLoggerService, paymentSystemProcessingService, googlePayCheckoutPaymentService, googlePayInstantPaymentService, injector) {
+    constructor(window, loggerService, paymentSystemProcessingService, googlePayCheckoutPaymentService, googlePayInstantPaymentService, injector) {
         this.window = window;
-        this.elkLoggerService = elkLoggerService;
+        this.loggerService = loggerService;
         this.paymentSystemProcessingService = paymentSystemProcessingService;
         this.googlePayCheckoutPaymentService = googlePayCheckoutPaymentService;
         this.googlePayInstantPaymentService = googlePayInstantPaymentService;
@@ -9159,7 +9313,9 @@ class GooglePayService {
             .pipe(filter$1(Boolean), take(1))
             .subscribe(() => {
             if (!this.googlePaymentClient) {
-                this.elkLoggerService.log('Google payment client is not initialized', [ErrorTags.GOOGLEPAY]);
+                this.loggerService.error(new TaggedError('Google payment client is not initialized', [
+                    ErrorTags.GOOGLEPAY,
+                ]));
                 throw new AppError(`Google Pay: Google payment client is not initialized`);
             }
             this.paymentService = this.getPaymentService();
@@ -9168,9 +9324,7 @@ class GooglePayService {
                 checkDeviceData: data,
             });
             if (!initData) {
-                this.elkLoggerService.log('No initialization data', [
-                    ErrorTags.GOOGLEPAY,
-                ]);
+                this.loggerService.error(new TaggedError('No initialization data', [ErrorTags.GOOGLEPAY]));
                 throw new AppError('Google Pay: no initialization data');
             }
             this.googlePaymentClient
@@ -9197,18 +9351,18 @@ class GooglePayService {
     }
     async proceedCheckout() {
         if (!this.googlePaymentClient) {
-            this.elkLoggerService.log('Google payment client is not initialized to proceed checkout', [ErrorTags.GOOGLEPAY]);
+            this.loggerService.error(new TaggedError('Google payment client is not initialized to proceed checkout', [ErrorTags.GOOGLEPAY]));
             throw new AppError(`Google Pay. proceedCheckout: no google payment client`);
         }
         if (!this.paymentService) {
-            this.elkLoggerService.log('Google payment service is not initialized to proceed checkout', [ErrorTags.GOOGLEPAY]);
+            this.loggerService.error(new TaggedError('Google payment service is not initialized to proceed checkout', [ErrorTags.GOOGLEPAY]));
             throw new AppError(`Google Pay. proceedCheckout: no google payment service`);
         }
         const paymentDataRequest = this.paymentService.getPaymentRequest();
         if (!paymentDataRequest) {
-            this.elkLoggerService.log('No data for payment data request', [
+            this.loggerService.error(new TaggedError('No data for payment data request', [
                 ErrorTags.GOOGLEPAY,
-            ]);
+            ]));
             throw new AppError(`Google Pay: No data for payment data request`);
         }
         const checkStatusAction = this.injector
@@ -9217,7 +9371,7 @@ class GooglePayService {
         try {
             const paymentData = await this.googlePaymentClient.loadPaymentData(paymentDataRequest);
             if (!paymentData?.paymentMethodData?.tokenizationData?.token) {
-                this.elkLoggerService.log('Token is missing', [ErrorTags.GOOGLEPAY]);
+                this.loggerService.error(new TaggedError('Token is missing', [ErrorTags.GOOGLEPAY]));
                 throw new AppError('Google Pay: token is missing');
             }
             this.paymentService.handleSuccessfulPayment?.(paymentData);
@@ -9290,7 +9444,7 @@ class GooglePayService {
     isCanceledStatus(statusCode) {
         return statusCode.toLowerCase() === 'canceled';
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: GooglePayService, deps: [{ token: windowToken }, { token: ElkLoggerService }, { token: PaymentSystemProcessingService }, { token: GooglePayCheckoutPaymentService }, { token: GooglePayInstantPaymentService }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: GooglePayService, deps: [{ token: windowToken }, { token: LoggerService }, { token: PaymentSystemProcessingService }, { token: GooglePayCheckoutPaymentService }, { token: GooglePayInstantPaymentService }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: GooglePayService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: GooglePayService, decorators: [{
@@ -9301,7 +9455,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImpor
         }], ctorParameters: () => [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [windowToken]
-                }] }, { type: ElkLoggerService }, { type: PaymentSystemProcessingService }, { type: GooglePayCheckoutPaymentService }, { type: GooglePayInstantPaymentService }, { type: i0.Injector }] });
+                }] }, { type: LoggerService }, { type: PaymentSystemProcessingService }, { type: GooglePayCheckoutPaymentService }, { type: GooglePayInstantPaymentService }, { type: i0.Injector }] });
 
 var ApplePayIntegrationType;
 (function (ApplePayIntegrationType) {
@@ -9481,9 +9635,9 @@ class ApplePaySdkService {
             listenApplePayPostMessages();
         };
         script.onerror = (error) => {
-            this.loggerService.log('Apple pay: script sdk loading error', [ErrorTags.APPLEPAY], 
+            this.loggerService.error(new TaggedError('Apple pay: script sdk loading error', [ErrorTags.APPLEPAY], 
             // @ts-expect-error error type
-            { error: error?.message ? error.toString() : JSON.stringify(error) });
+            { error: error?.message ? error.toString() : JSON.stringify(error) }));
             console.error('Apple pay: script sdk loading error', error);
         };
     }
@@ -9498,7 +9652,7 @@ class ApplePaySdkService {
         const scriptsElements = this.window.document.querySelectorAll('script');
         return Array.from(scriptsElements).some((element) => element.src === this.jsSdk);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: ApplePaySdkService, deps: [{ token: windowToken }, { token: ElkLoggerService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: ApplePaySdkService, deps: [{ token: windowToken }, { token: LoggerService }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: ApplePaySdkService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: ApplePaySdkService, decorators: [{
@@ -9509,7 +9663,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImpor
         }], ctorParameters: () => [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [windowToken]
-                }] }, { type: ElkLoggerService }] });
+                }] }, { type: LoggerService }] });
 
 class SocketBridgeService {
     constructor(secureApiClient) {
@@ -9645,13 +9799,13 @@ class ApplePayService {
             .getWindowReturnMessage$()
             .pipe(takeUntil(this.destroy$));
     }
-    constructor(window, summaryFinanceDetailsAdapterService, braintreeHandler, checkoutHandler, appleParamsBuilder, elkLoggerService, applePaySdkService, externalWindowCommunicationService, settingsService) {
+    constructor(window, summaryFinanceDetailsAdapterService, braintreeHandler, checkoutHandler, appleParamsBuilder, loggerService, applePaySdkService, externalWindowCommunicationService, settingsService) {
         this.window = window;
         this.summaryFinanceDetailsAdapterService = summaryFinanceDetailsAdapterService;
         this.braintreeHandler = braintreeHandler;
         this.checkoutHandler = checkoutHandler;
         this.appleParamsBuilder = appleParamsBuilder;
-        this.elkLoggerService = elkLoggerService;
+        this.loggerService = loggerService;
         this.applePaySdkService = applePaySdkService;
         this.externalWindowCommunicationService = externalWindowCommunicationService;
         this.settingsService = settingsService;
@@ -9698,9 +9852,9 @@ class ApplePayService {
         }
         catch (error) {
             console.error(ApplePayErrors.braintreeInitializeError, error);
-            this.elkLoggerService.log(ApplePayErrors.braintreeInitializeError, [
+            this.loggerService.error(new TaggedError(ApplePayErrors.braintreeInitializeError, [
                 ErrorTags.APPLEPAY,
-            ]);
+            ]));
         }
         if (!this.paymentClient || !this.isDeviceCapable) {
             this.emitError(ApplePayErrors.deviceIsNotCapableError);
@@ -9838,7 +9992,7 @@ class ApplePayService {
             this.applePayQrOpened.next();
         }
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: ApplePayService, deps: [{ token: windowToken }, { token: SummaryFinanceDetailsAdapterService }, { token: BraintreeHandler }, { token: CheckoutHandler }, { token: ApplePayParamsBuilderService }, { token: ElkLoggerService }, { token: ApplePaySdkService }, { token: ApplePayExternalWindowCommunicationService }, { token: SettingsService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: ApplePayService, deps: [{ token: windowToken }, { token: SummaryFinanceDetailsAdapterService }, { token: BraintreeHandler }, { token: CheckoutHandler }, { token: ApplePayParamsBuilderService }, { token: LoggerService }, { token: ApplePaySdkService }, { token: ApplePayExternalWindowCommunicationService }, { token: SettingsService }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: ApplePayService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: ApplePayService, decorators: [{
@@ -9849,7 +10003,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImpor
         }], ctorParameters: () => [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [windowToken]
-                }] }, { type: SummaryFinanceDetailsAdapterService }, { type: BraintreeHandler }, { type: CheckoutHandler }, { type: ApplePayParamsBuilderService }, { type: ElkLoggerService }, { type: ApplePaySdkService }, { type: ApplePayExternalWindowCommunicationService }, { type: SettingsService }] });
+                }] }, { type: SummaryFinanceDetailsAdapterService }, { type: BraintreeHandler }, { type: CheckoutHandler }, { type: ApplePayParamsBuilderService }, { type: LoggerService }, { type: ApplePaySdkService }, { type: ApplePayExternalWindowCommunicationService }, { type: SettingsService }] });
 
 /*
  * Public API Surface of core-library
@@ -9859,5 +10013,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { ApplePayCartService, ApplePayService, CoreLibraryModule, CoreLibraryService, CreditCardTypes, FieldNames, GooglePayService, PaymentSystemProcessingService, userBehaviourEventTypes };
+export { ApplePayCartService, ApplePayService, CoreLibraryModule, CoreLibraryService, CreditCardTypes, ErrorTags, FieldNames, GooglePayService, PaymentSystemProcessingService, TaggedError, userBehaviourEventTypes };
 //# sourceMappingURL=xsolla-payment-client-core.mjs.map