@xsolla/payment-client-core 0.1.13 → 0.1.14-test10

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

@@ -5,7 +5,7 @@ import * as i1 from '@angular/common/http';
 import { HttpParams, HttpHeaders, HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
 import JSEncrypt from 'jsencrypt';
 import { UntypedFormGroup, Validators, UntypedFormControl, ReactiveFormsModule } from '@angular/forms';
-import { filter, map as map$1, catchError } from 'rxjs/operators';
+import { filter, map as map$1, tap, catchError } from 'rxjs/operators';
 import * as i1$1 from '@angular/router';
 import { CommonModule } from '@angular/common';
 
@@ -238,18 +238,19 @@ class PaymentMethodsService {
         this.apiRoute = 'remained_payment_methods';
         this.cache = new Map();
     }
-    async getList() {
-        const response = await this.request();
+    async getList(isSaveMethodMode) {
+        const response = await this.request(isSaveMethodMode);
         return response.remained;
     }
     async getQuickMethods() {
         const response = await this.request();
         return response.especial;
     }
-    async request() {
+    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 */
         };
         const cacheKey = JSON.stringify(requestParams);
         if (!this.cache.has(cacheKey)) {
@@ -453,13 +454,19 @@ class PaymentConfigService {
         }
         return {
             ...config,
-            returnUrl: this.enrichReturnUrl(config.returnUrl),
+            returnUrl: this.enrichReturnUrl(config.returnUrl, !!config.savePaymentMethod)
         };
     }
-    enrichReturnUrl(returnUrl) {
-        return this.urlService.addSearchParams(returnUrl, {
-            token: this.settingsService.token,
+    enrichReturnUrl(returnUrl, savePaymentMethod) {
+        let enrichedUrl = this.urlService.addSearchParams(returnUrl, {
+            token: this.settingsService.token
         });
+        if (savePaymentMethod) {
+            enrichedUrl = this.urlService.addSearchParams(returnUrl, {
+                isSavePaymentAccount: "1" /* XpsBoolean.true */
+            });
+        }
+        return enrichedUrl;
     }
 }
 PaymentConfigService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: PaymentConfigService, deps: [{ token: UrlService }, { token: SettingsService }], target: i0.ɵɵFactoryTarget.Injectable });
@@ -467,7 +474,7 @@ PaymentConfigService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0",
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: PaymentConfigService, decorators: [{
             type: Injectable,
             args: [{
-                    providedIn: 'root',
+                    providedIn: 'root'
                 }]
         }], ctorParameters: function () { return [{ type: UrlService }, { type: SettingsService }]; } });
 
@@ -781,15 +788,143 @@ const checkStatusActionFactoryProvider = {
     },
 };
 
+class TerminalError extends AppError {
+    constructor(message, code) {
+        super(message);
+        this.code = code;
+    }
+}
+
+var StatusGroups;
+(function (StatusGroups) {
+    StatusGroups["troubled"] = "troubled";
+    StatusGroups["done"] = "done";
+    StatusGroups["invoice"] = "invoice";
+})(StatusGroups || (StatusGroups = {}));
+
+var StatusEnum;
+(function (StatusEnum) {
+    StatusEnum["created"] = "created";
+    StatusEnum["awaiting"] = "awaiting";
+    StatusEnum["processing"] = "processing";
+    StatusEnum["authorized"] = "authorized";
+    StatusEnum["held"] = "held";
+    StatusEnum["done"] = "done";
+    StatusEnum["error"] = "error";
+    StatusEnum["canceled"] = "canceled";
+})(StatusEnum || (StatusEnum = {}));
+
+class StatusResponse {
+    constructor(parameters) {
+        if (parameters.errors?.[0]) {
+            this.error = {
+                code: parameters.errors[0].code.toString(),
+                message: parameters.errors[0].message,
+            };
+        }
+        if (!parameters.status) {
+            throw new TerminalError(this.error?.message ?? '', this.error?.code.toString() ?? '');
+        }
+        this.status = {
+            statusState: parameters.status.statusData.stateText,
+            email: parameters.status.statusData.email,
+            webSocketUrl: parameters.status.statusData.webSocketChannelUrl,
+            webSocketChannelName: parameters.status.statusData.webSocketChannelName,
+            webSocketClientType: parameters.status.statusData.webSocketClientType,
+            financeInfo: parameters.status.text.info,
+            discount: parameters.status.text.info.discount
+                ? Math.abs(Number.parseFloat(parameters.status.text.info.discount?.value ?? ''))
+                : null,
+            isCancelUser: parameters.status.isCancelUser,
+            postMessageStatus: parameters.status.isCancelUser
+                ? StatusGroups.troubled
+                : parameters.status.group,
+            virtualCurrencyAmount: parameters.status.statusData.out,
+            backUrlSettings: {
+                backUrl: parameters.status.text.backurl,
+                backUrlAction: parameters.status.text.backurl_action,
+                backUrlCaption: parameters.status.text.backurl_caption,
+                returnRegion: parameters.status.return_region,
+            },
+            additionalBackButton: this.getAdditionalBackButton(parameters.status),
+            group: parameters.status.group,
+            needToCheck: parameters.status.needToCheck,
+            autoRedirect: parameters.status.autoredirect,
+            statusMessage: parameters.status.text.state,
+            userId: parameters.status.statusData.v1,
+            invoice: parameters.status.statusData.invoice,
+            pid: parameters.status.statusData.pid,
+            projectAmount: this.getProjectAmount(parameters.status),
+            titleClass: parameters.status.title_class,
+            paymentCountryIso: parameters.status.statusData.payment_country_iso,
+            order: parameters.status.text.order,
+        };
+        if (parameters.form) {
+            this.status.userReturnStatus = this.getUserReturnStatus(parameters.form);
+        }
+        if (this.status.statusState === StatusEnum.done ||
+            this.status.statusState === StatusEnum.authorized) {
+            this.status.isSuccess = true;
+        }
+        if (this.status.statusState === StatusEnum.canceled ||
+            this.status.isCancelUser) {
+            this.status.isCanceled = true;
+        }
+    }
+    getUserReturnStatus(form) {
+        const value = form['fix_userReturnStatus']?.value;
+        if (value === 'undefined')
+            return undefined;
+        return value;
+    }
+    getProjectAmount(status) {
+        if (!status.statusData.projectAmount) {
+            return;
+        }
+        const [amount, currency] = status.statusData.projectAmount.split(' ');
+        return {
+            amount,
+            currency,
+        };
+    }
+    getAdditionalBackButton(status) {
+        if (!status.text.is_additional_back_url_enabled) {
+            return {
+                link: '',
+                action: '',
+                label: '',
+                region: '',
+                isEnabled: false,
+            };
+        }
+        return {
+            link: status.text.additional_back_url_link ?? '',
+            action: status.text.additional_back_url_action ?? '',
+            label: status.text.additional_back_url_label ?? '',
+            region: status.additional_button_return_region ?? '',
+            isEnabled: status.text.is_additional_back_url_enabled,
+        };
+    }
+}
+
 class StatusUpdatedAction {
-    constructor(statusResponse) {
+    constructor(statusResponse, isSavePaymentMethodMode = false, savePaymentMethodStatus) {
         this.type = 'status_updated';
+        let status;
+        if (statusResponse instanceof StatusResponse) {
+            status = statusResponse.status;
+        }
+        else {
+            status = statusResponse;
+        }
         this.data = {
-            statusState: statusResponse.status.statusState,
-            invoice: statusResponse.status.invoice,
-            isSuccess: statusResponse.status.isSuccess,
-            isCanceled: statusResponse.status.isCanceled,
-            group: statusResponse.status.group,
+            statusState: status.statusState,
+            invoice: status.invoice,
+            isSuccess: status.isSuccess,
+            isCanceled: status.isCanceled,
+            group: status.group,
+            isSavePaymentMethodMode,
+            savePaymentMethodStatus
         };
     }
 }
@@ -1431,6 +1566,11 @@ class InitializeService {
             refer: this.ps4ReferId,
             country: this.countryService.getCountry(),
             returnUrl: config.returnUrl,
+            paymentWithSavedMethod: config.paymentWithSavedMethod === true
+                ? "1" /* XpsBoolean.true */
+                : "0" /* XpsBoolean.false */,
+            saved_method_id: config.savedMethodId,
+            save_payment_account_only: !!config.savePaymentMethod ? "1" /* XpsBoolean.true */ : "0" /* XpsBoolean.false */
         };
         return this.xpsApiService
             .directPaymentRequest(requestParams)
@@ -1462,7 +1602,7 @@ InitializeService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", ve
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: InitializeService, decorators: [{
             type: Injectable,
             args: [{
-                    providedIn: 'root',
+                    providedIn: 'root'
                 }]
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
@@ -2820,6 +2960,7 @@ var StatusSearchParam;
     StatusSearchParam["testPs"] = "fix_testPs";
     StatusSearchParam["testXsolla"] = "fix_testXsolla";
     StatusSearchParam["userReturnStatus"] = "fix_userReturnStatus";
+    StatusSearchParam["isSavePaymentAccount"] = "isSavePaymentAccount";
 })(StatusSearchParam || (StatusSearchParam = {}));
 
 const requiredStatusSearchParams = [
@@ -2899,15 +3040,15 @@ const statusSearchParamsMap = new Map([
             converter: numberConverter,
         },
     ],
+    [
+        StatusSearchParam.isSavePaymentAccount,
+        {
+            key: 'isSavePaymentAccount',
+            converter: numberConverter,
+        },
+    ],
 ]);
 
-class TerminalError extends AppError {
-    constructor(message, code) {
-        super(message);
-        this.code = code;
-    }
-}
-
 class XpsApiPart {
     constructor() {
         this.response = new BehaviorSubject(null);
@@ -2951,118 +3092,6 @@ const statusRequestFactoryProvider = {
     useValue: (...args) => new StatusRequest(...args),
 };
 
-var StatusGroups;
-(function (StatusGroups) {
-    StatusGroups["troubled"] = "troubled";
-    StatusGroups["done"] = "done";
-    StatusGroups["invoice"] = "invoice";
-})(StatusGroups || (StatusGroups = {}));
-
-var StatusEnum;
-(function (StatusEnum) {
-    StatusEnum["created"] = "created";
-    StatusEnum["awaiting"] = "awaiting";
-    StatusEnum["processing"] = "processing";
-    StatusEnum["authorized"] = "authorized";
-    StatusEnum["held"] = "held";
-    StatusEnum["done"] = "done";
-    StatusEnum["error"] = "error";
-    StatusEnum["canceled"] = "canceled";
-})(StatusEnum || (StatusEnum = {}));
-
-class StatusResponse {
-    constructor(parameters) {
-        if (parameters.errors?.[0]) {
-            this.error = {
-                code: parameters.errors[0].code.toString(),
-                message: parameters.errors[0].message,
-            };
-        }
-        if (!parameters.status) {
-            throw new TerminalError(this.error?.message ?? '', this.error?.code.toString() ?? '');
-        }
-        this.status = {
-            statusState: parameters.status.statusData.stateText,
-            email: parameters.status.statusData.email,
-            webSocketUrl: parameters.status.statusData.webSocketChannelUrl,
-            webSocketChannelName: parameters.status.statusData.webSocketChannelName,
-            webSocketClientType: parameters.status.statusData.webSocketClientType,
-            financeInfo: parameters.status.text.info,
-            discount: parameters.status.text.info.discount
-                ? Math.abs(Number.parseFloat(parameters.status.text.info.discount?.value ?? ''))
-                : null,
-            isCancelUser: parameters.status.isCancelUser,
-            postMessageStatus: parameters.status.isCancelUser
-                ? StatusGroups.troubled
-                : parameters.status.group,
-            virtualCurrencyAmount: parameters.status.statusData.out,
-            backUrlSettings: {
-                backUrl: parameters.status.text.backurl,
-                backUrlAction: parameters.status.text.backurl_action,
-                backUrlCaption: parameters.status.text.backurl_caption,
-                returnRegion: parameters.status.return_region,
-            },
-            additionalBackButton: this.getAdditionalBackButton(parameters.status),
-            group: parameters.status.group,
-            needToCheck: parameters.status.needToCheck,
-            autoRedirect: parameters.status.autoredirect,
-            statusMessage: parameters.status.text.state,
-            userId: parameters.status.statusData.v1,
-            invoice: parameters.status.statusData.invoice,
-            pid: parameters.status.statusData.pid,
-            projectAmount: this.getProjectAmount(parameters.status),
-            titleClass: parameters.status.title_class,
-            paymentCountryIso: parameters.status.statusData.payment_country_iso,
-            order: parameters.status.text.order,
-        };
-        if (parameters.form) {
-            this.status.userReturnStatus = this.getUserReturnStatus(parameters.form);
-        }
-        if (this.status.statusState === StatusEnum.done ||
-            this.status.statusState === StatusEnum.authorized) {
-            this.status.isSuccess = true;
-        }
-        if (this.status.statusState === StatusEnum.canceled ||
-            this.status.isCancelUser) {
-            this.status.isCanceled = true;
-        }
-    }
-    getUserReturnStatus(form) {
-        const value = form['fix_userReturnStatus']?.value;
-        if (value === 'undefined')
-            return undefined;
-        return value;
-    }
-    getProjectAmount(status) {
-        if (!status.statusData.projectAmount) {
-            return;
-        }
-        const [amount, currency] = status.statusData.projectAmount.split(' ');
-        return {
-            amount,
-            currency,
-        };
-    }
-    getAdditionalBackButton(status) {
-        if (!status.text.is_additional_back_url_enabled) {
-            return {
-                link: '',
-                action: '',
-                label: '',
-                region: '',
-                isEnabled: false,
-            };
-        }
-        return {
-            link: status.text.additional_back_url_link ?? '',
-            action: status.text.additional_back_url_action ?? '',
-            label: status.text.additional_back_url_label ?? '',
-            region: status.additional_button_return_region ?? '',
-            isEnabled: status.text.is_additional_back_url_enabled,
-        };
-    }
-}
-
 const statusResponseFactoryToken = new InjectionToken('StatusResponse');
 const statusResponseFactoryProvider = {
     provide: statusResponseFactoryToken,
@@ -4539,15 +4568,137 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImpor
                 }]
         }], ctorParameters: function () { return [{ type: StatusRequestService }, { type: CheckStatusService }, { type: WebsocketStatusService }]; } });
 
+var TitleClass;
+(function (TitleClass) {
+    TitleClass["done"] = "done";
+    TitleClass["cancel"] = "cancel";
+    TitleClass["cancelUser"] = "canceluser";
+})(TitleClass || (TitleClass = {}));
+
+var SavePaymentMethodStatus;
+(function (SavePaymentMethodStatus) {
+    SavePaymentMethodStatus["success"] = "success";
+    SavePaymentMethodStatus["failed"] = "failed";
+})(SavePaymentMethodStatus || (SavePaymentMethodStatus = {}));
+
+class XpsResponseError extends AppError {
+    constructor(message) {
+        super('XPS response failed' + (message ? `: "${message}".` : '.'));
+    }
+}
+
+class SavedPaymentAccountChangesService {
+    constructor(settingsService, secureApi) {
+        this.settingsService = settingsService;
+        this.secureApi = secureApi;
+        this.apiRoute = 'savedmethods/newaccountinfo';
+        this.response = new Subject();
+    }
+    get response$() {
+        return this.response.asObservable();
+    }
+    async request(invoice) {
+        const requestParameters = {
+            access_token: this.settingsService.token,
+            invoice_id: invoice,
+        };
+        return lastValueFrom(this.secureApi
+            .post(this.apiRoute, new URLSearchParams(requestParameters), {
+            headers: new HttpHeaders().set('Content-Type', 'application/x-www-form-urlencoded; charset=utf-8'),
+            responseType: 'json',
+        })
+            .pipe(tap((value) => {
+            this.response.next(value);
+        }))).catch((error) => {
+            throw new XpsResponseError(error.message);
+        });
+    }
+}
+SavedPaymentAccountChangesService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: SavedPaymentAccountChangesService, deps: [{ token: SettingsService }, { token: SecureApiClient }], target: i0.ɵɵFactoryTarget.Injectable });
+SavedPaymentAccountChangesService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: SavedPaymentAccountChangesService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: SavedPaymentAccountChangesService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: SettingsService }, { type: SecureApiClient }]; } });
+
+class SavePaymentMethodStatusService {
+    constructor(statusRequestService, listenStatusService, savedPaymentAccountChangesService, nextActionService) {
+        this.statusRequestService = statusRequestService;
+        this.listenStatusService = listenStatusService;
+        this.savedPaymentAccountChangesService = savedPaymentAccountChangesService;
+        this.nextActionService = nextActionService;
+    }
+    async getStatus(params) {
+        this.statusRequestService.setRequestParams(params);
+        this.startWaitingStatusUpdates(params.invoice);
+        this.statusRequestService.request();
+        const statusResponse = await firstValueFrom(this.statusRequestService.response$);
+        if (!this.savePaymentMethodStatus) {
+            statusResponse.status.statusState = StatusEnum.processing;
+        }
+        return statusResponse.status;
+    }
+    startWaitingStatusUpdates(invoice) {
+        this.listenStatusService.listen(invoice);
+        this.listenStatusSubscription = this.listenStatusService.statusUpdated$
+            .subscribe(({ statusResponse }) => {
+            if (statusResponse.status) {
+                this.loadNewPaymentAccountData(statusResponse.status);
+            }
+        });
+    }
+    loadNewPaymentAccountData(status) {
+        if (!status.invoice) {
+            return;
+        }
+        void this.savedPaymentAccountChangesService
+            .request(status.invoice)
+            .then((accountChanges) => {
+            if (accountChanges) {
+                this.handleSavingStatus(status, accountChanges.new_account);
+            }
+        });
+    }
+    handleSavingStatus(status, account) {
+        this.listenStatusService.stopListening();
+        this.listenStatusSubscription.unsubscribe();
+        const updatingIsProcessing = status?.titleClass !== TitleClass.cancel && status?.titleClass !== TitleClass.cancelUser && !account;
+        if (updatingIsProcessing) {
+            return;
+        }
+        const paymentAccountWasSaved = status?.titleClass === TitleClass.done && account !== null;
+        const isSavePaymentMethod = true;
+        this.savePaymentMethodStatus = paymentAccountWasSaved ? SavePaymentMethodStatus.success : SavePaymentMethodStatus.failed;
+        this.nextActionService.emitFlowUpdates(new StatusUpdatedAction(status, isSavePaymentMethod, this.savePaymentMethodStatus));
+    }
+}
+SavePaymentMethodStatusService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: SavePaymentMethodStatusService, deps: [{ token: StatusRequestService }, { token: ListenStatusService }, { token: SavedPaymentAccountChangesService }, { token: NextActionService }], target: i0.ɵɵFactoryTarget.Injectable });
+SavePaymentMethodStatusService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: SavePaymentMethodStatusService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: SavePaymentMethodStatusService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: StatusRequestService }, { type: ListenStatusService }, { type: SavedPaymentAccountChangesService }, { type: NextActionService }]; } });
+
 class StatusService {
-    constructor(urlService, statusRequestService, financeDetailsService, listenStatusService, nextActionService) {
+    constructor(urlService, statusRequestService, financeDetailsService, listenStatusService, nextActionService, savePaymentMethodStatusService) {
         this.urlService = urlService;
         this.statusRequestService = statusRequestService;
         this.financeDetailsService = financeDetailsService;
         this.listenStatusService = listenStatusService;
         this.nextActionService = nextActionService;
+        this.savePaymentMethodStatusService = savePaymentMethodStatusService;
     }
     async getStatus(params) {
+        // todo: если params.savePaymentMethod, то надо выполнить логику для
+        // account status
+        const isSavePaymentMethodMode = !!params?.isSavePaymentAccount;
+        if (isSavePaymentMethodMode) {
+            return this.savePaymentMethodStatusService.getStatus(params); // todo: saveMethodStatus.getStatus();
+        }
         this.statusRequestService.setRequestParams(params);
         this.startWaitingStatusUpdates(params.invoice);
         this.statusRequestService.request();
@@ -4557,6 +4708,7 @@ class StatusService {
     }
     async getStatusWithUrlSearchParams(url) {
         const searchParams = this.getRequestParamsFromUrl(url);
+        console.log('searchParams', searchParams);
         if (!searchParams) {
             throw new Error('No required search params to get status');
         }
@@ -4584,14 +4736,14 @@ class StatusService {
         });
     }
 }
-StatusService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: StatusService, deps: [{ token: UrlService }, { token: StatusRequestService }, { token: FinanceDetailsService }, { token: ListenStatusService }, { token: NextActionService }], target: i0.ɵɵFactoryTarget.Injectable });
+StatusService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: StatusService, deps: [{ token: UrlService }, { token: StatusRequestService }, { token: FinanceDetailsService }, { token: ListenStatusService }, { token: NextActionService }, { token: SavePaymentMethodStatusService }], target: i0.ɵɵFactoryTarget.Injectable });
 StatusService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: StatusService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: StatusService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: function () { return [{ type: UrlService }, { type: StatusRequestService }, { type: FinanceDetailsService }, { type: ListenStatusService }, { type: NextActionService }]; } });
+        }], ctorParameters: function () { return [{ type: UrlService }, { type: StatusRequestService }, { type: FinanceDetailsService }, { type: ListenStatusService }, { type: NextActionService }, { type: SavePaymentMethodStatusService }]; } });
 
 class CreditCardStateService extends EmitDataService {
 }
@@ -4616,12 +4768,6 @@ var ThreeDsStatusTypes;
     ThreeDsStatusTypes["collectDfp"] = "collect_dfp";
 })(ThreeDsStatusTypes || (ThreeDsStatusTypes = {}));
 
-class XpsResponseError extends AppError {
-    constructor(message) {
-        super('XPS response failed' + (message ? `: "${message}".` : '.'));
-    }
-}
-
 class StatusThreeDsRequest {
     constructor(token, threeDsId) {
         this.access_token = token;
@@ -5023,11 +5169,33 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImpor
                 }]
         }], ctorParameters: function () { return [{ type: ThreeDs20Service }, { type: NextActionService }]; } });
 
+class FormMessagesService extends EmitDataService {
+    constructor(unescapeHtmlPipe) {
+        super();
+        this.unescapeHtmlPipe = unescapeHtmlPipe;
+    }
+    emitOnResponse(messages) {
+        if (!messages) {
+            return;
+        }
+        const mapInfoMessages = (infoMessage) => this.unescapeHtmlPipe.transform(infoMessage.message);
+        super.emit(messages.map(mapInfoMessages));
+    }
+}
+FormMessagesService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: FormMessagesService, deps: [{ token: UnescapeHtmlPipe }], target: i0.ɵɵFactoryTarget.Injectable });
+FormMessagesService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: FormMessagesService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: FormMessagesService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }], ctorParameters: function () { return [{ type: UnescapeHtmlPipe }]; } });
+
 class PaymentService {
     get formFieldsStatus$() {
         return this.formFieldsStatusSubject.asObservable().pipe(filter$1(Boolean));
     }
-    constructor(initializeService, submitService, syncService, formService, statusService, financeDetailsService, creditCardStateService, nextActionService, controlConfigService, threeDsService) {
+    constructor(initializeService, submitService, syncService, formService, statusService, financeDetailsService, creditCardStateService, nextActionService, controlConfigService, threeDsService, formMessagesService) {
         this.initializeService = initializeService;
         this.submitService = submitService;
         this.syncService = syncService;
@@ -5038,6 +5206,7 @@ class PaymentService {
         this.nextActionService = nextActionService;
         this.controlConfigService = controlConfigService;
         this.threeDsService = threeDsService;
+        this.formMessagesService = formMessagesService;
         this.form = null;
         this.data = null;
         this.financeDetails = null;
@@ -5046,6 +5215,7 @@ class PaymentService {
         this.destroy$ = new Subject();
         this.formDestroy$ = new Subject();
         this.formFieldsStatusSubject = new BehaviorSubject(null);
+        this.isSavingMethodMode = false;
     }
     async initialize(config) {
         this.destroy$ = new Subject();
@@ -5059,6 +5229,7 @@ class PaymentService {
         this.listenFormStatusChanges(this.form);
         this.emitFinanceDetails(this.data.paymentForm?.summary);
         this.emitFormFieldsStatus(this.form);
+        this.emitFormMessages(this.data.paymentForm?.messages);
         return this.fields.filter((field) => field?.isVisible === "1" /* XpsBoolean.true */);
     }
     async submit() {
@@ -5070,9 +5241,15 @@ class PaymentService {
             this.emitFormFieldsStatus(this.form);
             return;
         }
+        console.log('this.fields', this.fields);
+        console.log('this.form', this.form);
+        this.isSavingMethodMode = this.fields.some(({ name, value }) => name === 'savePsAccountOnly' && value === "1" /* XpsBoolean.true */);
         const submitResponse = await this.submitService.request(this.fields, this.form);
         this.data = submitResponse;
-        this.emitFinanceDetails(submitResponse.summary);
+        if (!this.isSavingMethodMode) {
+            this.emitFinanceDetails(submitResponse.summary);
+        }
+        this.emitFormMessages(submitResponse.messages);
         // Handle 3ds flow
         if (submitResponse.currentCommand === XpsCommand.create) {
             this.runThreeDs();
@@ -5120,7 +5297,10 @@ class PaymentService {
             signature: this.data.signature ?? '',
             locale: this.data.fields.find((field) => field.name === 'locale')?.value ??
                 'en',
+            isSavePaymentAccount: this.isSavingMethodMode ? 1 : 0,
         };
+        console.log('this.data', this.data);
+        console.log('getStatus', params);
         return this.statusService.getStatus(params);
     }
     getFieldConfig(field) {
@@ -5178,12 +5358,16 @@ class PaymentService {
         });
         this.formFieldsStatusSubject.next(formFieldsStatus);
     }
+    emitFormMessages(messages) {
+        this.formMessagesService.emitOnResponse(messages);
+    }
     setupSyncService(form, fields) {
         this.syncService.setup(form, fields);
         this.syncService.data$
             .pipe(takeUntil(this.destroy$))
             .subscribe((response) => {
             this.emitFinanceDetails(response.summary);
+            this.emitFormMessages(response.messages);
         });
         this.syncService.fieldAsyncValidation$
             .pipe(takeUntil(this.destroy$))
@@ -5205,14 +5389,14 @@ class PaymentService {
             .subscribe(() => this.emitFormFieldsStatus(form));
     }
 }
-PaymentService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: PaymentService, deps: [{ token: InitializeService }, { token: SubmitService }, { token: SyncService }, { token: FormService }, { token: StatusService }, { token: FinanceDetailsService }, { token: CreditCardStateService }, { token: NextActionService }, { token: ControlConfigService }, { token: ThreeDsService }], target: i0.ɵɵFactoryTarget.Injectable });
+PaymentService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: PaymentService, deps: [{ token: InitializeService }, { token: SubmitService }, { token: SyncService }, { token: FormService }, { token: StatusService }, { token: FinanceDetailsService }, { token: CreditCardStateService }, { token: NextActionService }, { token: ControlConfigService }, { token: ThreeDsService }, { token: FormMessagesService }], target: i0.ɵɵFactoryTarget.Injectable });
 PaymentService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: PaymentService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: PaymentService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: function () { return [{ type: InitializeService }, { type: SubmitService }, { type: SyncService }, { type: FormService }, { type: StatusService }, { type: FinanceDetailsService }, { type: CreditCardStateService }, { type: NextActionService }, { type: ControlConfigService }, { type: ThreeDsService }]; } });
+        }], ctorParameters: function () { return [{ type: InitializeService }, { type: SubmitService }, { type: SyncService }, { type: FormService }, { type: StatusService }, { type: FinanceDetailsService }, { type: CreditCardStateService }, { type: NextActionService }, { type: ControlConfigService }, { type: ThreeDsService }, { type: FormMessagesService }]; } });
 
 class RefundPolicyService {
     constructor(settingsService) {
@@ -5317,7 +5501,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImpor
         }], ctorParameters: function () { return [{ type: SettingsService }, { type: RefundPolicyService }, { type: SecureConnectionService }, { type: DisclaimerService }]; } });
 
 class CoreLibraryService {
-    constructor(settingsService, countryService, paymentMethodsService, savedMethodsService, userBalanceService, paymentConfigService, paymentService, deviceFingerPrintService, financeDetailsService, legalService, statusService, nextActionService, creditCardService, creditCardStateService) {
+    constructor(settingsService, countryService, paymentMethodsService, savedMethodsService, userBalanceService, paymentConfigService, paymentService, deviceFingerPrintService, financeDetailsService, legalService, statusService, nextActionService, creditCardService, creditCardStateService, formMessagesService) {
         this.settingsService = settingsService;
         this.countryService = countryService;
         this.paymentMethodsService = paymentMethodsService;
@@ -5332,8 +5516,9 @@ class CoreLibraryService {
         this.nextActionService = nextActionService;
         this.creditCardService = creditCardService;
         this.creditCardStateService = creditCardStateService;
+        this.formMessagesService = formMessagesService;
         this.paymentMethods = {
-            getList: async () => this.paymentMethodsService.getList(),
+            getList: async (isSaveMethodMode) => this.paymentMethodsService.getList(isSaveMethodMode),
             getQuickMethods: async () => this.paymentMethodsService.getQuickMethods(),
             getSavedMethods: async () => this.savedMethodsService.getList(),
             getUserBalance: async () => this.userBalanceService.getUserBalance(),
@@ -5369,6 +5554,7 @@ class CoreLibraryService {
                 changeFieldValue: (name, value) => this.paymentService.changeFieldValue(name, value),
                 changeFieldState: (name, state) => this.paymentService.changeFieldState(name, state),
                 updateFieldFormState: (fieldName, formState) => this.paymentService.updateFieldFormState(fieldName, formState),
+                formMessages$: this.formMessagesService.data$,
             },
         };
     }
@@ -5399,14 +5585,14 @@ class CoreLibraryService {
         return this.userBalanceService.getUserBalanceValue();
     }
 }
-CoreLibraryService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: CoreLibraryService, deps: [{ token: SettingsService }, { token: CountryService }, { token: PaymentMethodsService }, { token: SavedMethodsService }, { token: UserBalanceService }, { token: PaymentConfigService }, { token: PaymentService }, { token: DeviceFingerPrintService }, { token: FinanceDetailsService }, { token: LegalService }, { token: StatusService }, { token: NextActionService }, { token: CreditCardService }, { token: CreditCardStateService }], target: i0.ɵɵFactoryTarget.Injectable });
+CoreLibraryService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: CoreLibraryService, deps: [{ token: SettingsService }, { token: CountryService }, { token: PaymentMethodsService }, { token: SavedMethodsService }, { token: UserBalanceService }, { token: PaymentConfigService }, { token: PaymentService }, { token: DeviceFingerPrintService }, { token: FinanceDetailsService }, { token: LegalService }, { token: StatusService }, { token: NextActionService }, { token: CreditCardService }, { token: CreditCardStateService }, { token: FormMessagesService }], target: i0.ɵɵFactoryTarget.Injectable });
 CoreLibraryService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: CoreLibraryService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: CoreLibraryService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: function () { return [{ 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 }]; } });
+        }], ctorParameters: function () { return [{ 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 }]; } });
 
 class HttpError extends AppError {
     constructor(error, req) {