{
field: string;
diff --git a/src/utils/decorators/ignore-before-completion.ts b/src/utils/decorators/ignore-before-completion.ts
index 0d0e97eb6..f056536ed 100644
--- a/src/utils/decorators/ignore-before-completion.ts
+++ b/src/utils/decorators/ignore-before-completion.ts
@@ -2,7 +2,7 @@ import { Subscription } from 'rxjs';
export function ignoreBeforeCompletion<
P extends PropertyKey,
- C extends { [N in P]: (...args: unknown[]) => Subscription },
+ C extends Record Subscription>,
>(target: C, propertyKey: P, descriptor: PropertyDescriptor) {
let lastSubscription: Subscription;
const original = descriptor.value;
diff --git a/src/utils/decorators/in-progress-to.ts b/src/utils/decorators/in-progress-to.ts
index 7b803d236..b31691ab0 100644
--- a/src/utils/decorators/in-progress-to.ts
+++ b/src/utils/decorators/in-progress-to.ts
@@ -6,9 +6,7 @@ import { Subject, Subscription } from 'rxjs';
export function inProgressTo(observableKey: T) {
return function <
P extends PropertyKey,
- C extends { [N in P]: (...args: unknown[]) => Subscription } & {
- [N in T]: Subject;
- },
+ C extends Record Subscription> & Record>,
>(target: C, propertyKey: P, descriptor: PropertyDescriptor) {
const original = descriptor.value;
let count = 0;
From 50a23439161b3abc11af71879117f0246575405f Mon Sep 17 00:00:00 2001
From: Ray <11846445+A77AY@users.noreply.github.com>
Date: Mon, 22 Jun 2026 20:52:13 +0400
Subject: [PATCH 11/14] refactor: reorganize imports and remove duplicates
across multiple components and modules
- Cleaned up import statements in various components and modules by removing duplicates and reordering for consistency.
- Added missing imports where necessary, particularly for FlexLayoutModule and other Angular modules.
- Improved code readability and maintainability by ensuring consistent import styles.
---
eslint.config.js | 74 +-
package-lock.json | 824 +++++++++++++-----
package.json | 2 +-
.../organizations-dictionary.service.ts | 1 +
.../api/organizations/organizations.module.ts | 1 +
src/app/api/organizations/orgs.service.ts | 1 +
src/app/api/payments/categories.service.ts | 6 +-
src/app/api/payments/countries.service.ts | 6 +-
.../api/payments/invoice-templates.service.ts | 3 +-
src/app/api/payments/invoices.service.ts | 3 +-
src/app/api/payments/parties.service.ts | 1 +
.../payments/payment-institutions.service.ts | 6 +-
.../payments/payments-dictionary.service.ts | 1 +
src/app/api/payments/payments.module.ts | 1 +
src/app/api/payments/payments.service.ts | 1 +
src/app/api/payments/shops.service.ts | 1 +
.../payments/utils/operators/filter-shop.ts | 3 +-
.../utils/operators/map-to-shop-id.ts | 3 +-
src/app/api/payments/webhooks.service.ts | 3 +-
src/app/api/utils/create-api/create-api.ts | 5 +-
.../utils/x-request-id-extension.ts | 1 -
src/app/api/utils/dictionary.service.ts | 5 +-
.../utils/extensions/party-id-extension.ts | 2 +-
.../party-id-patch-method.service.ts | 3 +-
src/app/api/wallet/deposits.service.ts | 3 +-
src/app/api/wallet/downloads.service.ts | 1 +
src/app/api/wallet/reports.service.ts | 3 +-
.../api/wallet/wallet-dictionary.service.ts | 1 +
src/app/api/wallet/wallet.module.ts | 1 +
src/app/api/wallet/wallets.service.ts | 5 +-
src/app/api/wallet/webhooks.service.ts | 3 +-
src/app/api/wallet/withdrawals.service.ts | 3 +-
src/app/app.component.ts | 2 +-
src/app/app.module.ts | 9 +-
src/app/auth/app-auth-guard.service.ts | 3 +-
src/app/auth/role-access.service.ts | 2 +-
src/app/auth/utils/create-private-route.ts | 1 -
src/app/bootstrap.service.ts | 4 +-
src/app/config/config.service.ts | 3 +-
src/app/home/actionbar/actionbar.module.ts | 6 +-
.../organizations-list.component.ts | 2 +-
...ct-active-organization-dialog.component.ts | 9 +-
.../user-dropdown/user-dropdown.component.ts | 2 +-
.../components/user/user.component.ts | 9 +-
src/app/home/home.component.ts | 5 +-
src/app/home/home.module.ts | 3 +-
.../home/laptop-grid/laptop-grid.module.ts | 3 +-
.../home/mobile-grid/mobile-grid.module.ts | 4 +-
.../mobile-user-bar.component.ts | 3 +-
.../mobile-menu/mobile-menu.component.ts | 2 +-
.../mobile-menu/mobile-menu.module.ts | 6 +-
src/app/home/toolbar/toolbar.component.ts | 1 -
src/app/home/toolbar/toolbar.module.ts | 4 +-
.../humanize-duration.service.ts | 5 +-
.../humanized-duration.pipe.ts | 3 +-
src/app/language/language.service.ts | 3 +-
.../accept-invitation.component.ts | 6 +-
.../accept-invitation.module.ts | 6 +-
.../change-roles-table.component.ts | 27 +-
.../change-roles-table.module.ts | 6 +-
.../select-role-dialog.component.ts | 9 +-
.../role-accesses-dictionary.service.ts | 5 +-
.../create-invitation-dialog.component.ts | 7 +-
.../invitation/invitation.component.ts | 9 +-
.../invitations-list.component.ts | 1 +
.../invitations/invitations.component.ts | 4 +-
.../invitations/invitations.module.ts | 6 +-
.../fetch-invitations.service.ts | 9 +-
...invitations-expanded-id-manager.service.ts | 6 +-
.../edit-roles-dialog.component.ts | 10 +-
.../components/member/member.component.ts | 9 +-
.../members-list/members-list.component.ts | 1 +
.../members/members.component.ts | 4 +-
.../members/members.module.ts | 6 +-
.../fetch-members/fetch-members.service.ts | 9 +-
.../members-expanded-id-manager.service.ts | 6 +-
.../organization-details.component.ts | 7 +-
.../organization-details.module.ts | 6 +-
.../organization/organization.component.ts | 11 +-
.../organizations-list.component.ts | 1 +
.../rename-organization-dialog.component.ts | 7 +-
.../organizations/organizations.component.ts | 1 -
.../organizations/organizations.module.ts | 6 +-
...ganizations-expanded-id-manager.service.ts | 7 +-
.../page-not-found/page-not-found.module.ts | 3 +-
.../analytics/analytics-routing.module.ts | 1 -
.../analytics-search-filters.component.ts | 12 +-
.../analytics-search-filters.module.ts | 4 +-
.../analytics/analytics.component.ts | 5 +-
.../analytics/analytics.module.ts | 6 +-
.../average-payment.component.ts | 1 -
.../average-payment/average-payment.module.ts | 6 +-
.../average-payment.service.ts | 2 +-
.../bar-chart-item.component.ts | 1 -
.../bar-chart-item/bar-chart-item.module.ts | 6 +-
.../donut-chart-item.component.ts | 1 -
.../donut-chart-item.module.ts | 6 +-
.../payment-split-amount.component.ts | 1 -
.../payment-split-amount.module.ts | 6 +-
.../payment-split-amount.service.ts | 2 +-
.../prepare-split-amount.ts | 3 +-
.../split-amount-to-chart-data.ts | 3 +-
.../payment-split-count.component.ts | 3 +-
.../payment-split-count.module.ts | 6 +-
.../payment-split-count.service.ts | 2 +-
.../prepare-split-count.ts | 3 +-
.../split-count-to-chart-data.ts | 3 +-
.../payments-amount.component.ts | 1 -
.../payments-amount/payments-amount.module.ts | 6 +-
.../payments-amount.service.ts | 2 +-
.../payments-count.component.ts | 1 -
.../payments-count/payments-count.module.ts | 6 +-
.../payments-count/payments-count.service.ts | 2 +-
.../payments-error-distribution.component.ts | 1 -
.../payments-error-distribution.module.ts | 6 +-
.../payments-error-distribution.service.ts | 2 +-
...ayments-tool-distribution-to-chart-data.ts | 3 +-
.../payments-tool-distribution.component.ts | 1 -
.../payments-tool-distribution.module.ts | 6 +-
.../payments-tool-distribution.service.ts | 2 +-
.../percent-difference.module.ts | 4 +-
.../refunds-amount.component.ts | 1 -
.../refunds-amount/refunds-amount.module.ts | 6 +-
.../refunds-amount/refunds-amount.service.ts | 2 +-
.../stat-item/stat-item.component.ts | 1 -
.../analytics/stat-item/stat-item.module.ts | 6 +-
.../utils/filters-to-search-params.ts | 3 +-
.../analytics/utils/get-offsets.ts | 3 +-
...search-params-to-params-with-split-unit.ts | 3 +-
.../search-params-to-stat-search-params.ts | 3 +-
.../balances/balances.module.ts | 5 +-
.../balances/balances.service.ts | 2 +-
.../api-key-details.component.ts | 3 +-
.../api-key-details/api-key-details.module.ts | 8 +-
.../api-key-delete-dialog.component.ts | 12 +-
.../api-keys/api-keys.component.ts | 12 +-
.../integrations/api-keys/api-keys.module.ts | 6 +-
.../api-key-create-dialog.component.ts | 11 +-
.../api-key-revoke.component.ts | 3 +-
.../api-keys/fetch-api-keys.service.ts | 8 +-
.../api-keys/types/api-key-status-color.ts | 3 +-
.../integrations-routing.module.ts | 1 -
.../integrations/integrations.component.ts | 2 +-
.../integrations/integrations.module.ts | 6 +-
.../create-webhook-dialog.component.ts | 4 +-
.../create-webhook-dialog.service.ts | 4 +-
.../create-webhook-form.component.ts | 7 +-
.../create-webhook/create-webhook.module.ts | 5 +-
.../create-webhook/create-webhook.service.ts | 5 +-
.../delete-webhook/delete-webhook.service.ts | 10 +-
.../webhooks/receive-webhooks.service.ts | 9 +-
.../webhook-details.component.ts | 1 +
.../webhook-details/webhook-details.module.ts | 6 +-
.../webhook-events.component.ts | 6 +-
.../webhook-list/webhook-list.component.ts | 1 +
.../webhook-list/webhook-list.module.ts | 6 +-
.../webhooks-expanded-id-manager.service.ts | 6 +-
.../webhooks/webhooks.component.ts | 1 +
.../integrations/webhooks/webhooks.module.ts | 6 +-
.../no-shops-alert/no-shops-alert.module.ts | 2 +-
.../create-invoice-dialog.component.ts | 3 +-
.../create-invoice/create-invoice.module.ts | 6 +-
.../create-invoice/create-invoice.service.ts | 8 +-
.../invoice-row/invoice-row.component.ts | 3 +-
.../cancel-invoice/cancel-invoice.module.ts | 5 +-
.../cancel-invoice/cancel-invoice.service.ts | 8 +-
.../invoice-actions.component.ts | 1 +
.../cart-info/invoice-cart-line.component.ts | 1 +
.../invoice-cart-info.component.ts | 1 +
.../invoice-main-info.component.ts | 1 +
.../invoice-payments.component.ts | 3 +-
.../fulfill-invoice/fulfill-invoice.module.ts | 5 +-
.../fulfill-invoice.service.ts | 8 +-
.../invoice-details.component.ts | 1 +
.../invoice-details/invoice-details.module.ts | 6 +-
.../tax-mode-to-tax-rate.pipe.ts | 1 +
.../receive-invoice.service.ts | 8 +-
.../receive-payments.service.ts | 7 +-
.../invoices-list/invoices-list.component.ts | 1 +
.../invoices-list/invoices-list.module.ts | 6 +-
.../additional-filters.module.ts | 5 +-
.../dialog-filters.component.ts | 1 +
.../invoice-status-filter.component.ts | 3 +-
.../invoice-status-filter.module.ts | 6 +-
.../invoices-filter.component.ts | 1 +
.../invoices-filter/invoices-filter.module.ts | 5 +-
.../shops-filter/shops-filter.component.ts | 3 +-
.../shops-filter/shops-filter.module.ts | 5 +-
.../invoices-search-filters.component.ts | 21 +-
.../invoices-search-filters.module.ts | 6 +-
.../operations/invoices/invoices.component.ts | 8 +-
.../operations/invoices/invoices.module.ts | 6 +-
.../fetch-invoices/fetch-invoices.service.ts | 5 +-
.../invoices-expanded-id-manager.service.ts | 6 +-
.../operations/operations-routing.module.ts | 1 -
.../operations/operations.component.ts | 2 +-
.../operations/operations.module.ts | 6 +-
.../operators/filter-shops-by-realm.ts | 3 +-
.../operations/operators/map-to-shop-info.ts | 3 +-
.../additional-filters.module.ts | 5 +-
.../card-filter/card-filter.component.ts | 3 +-
.../card-filter/card-filter.module.ts | 3 +-
.../dialog-filters.component.ts | 1 +
.../invoices-filter.component.ts | 1 +
.../invoices-filter/invoices-filter.module.ts | 5 +-
.../main-filters/main-filters.component.ts | 1 +
.../main-filters/main-filters.module.ts | 3 +-
.../payment-status-filter.component.ts | 3 +-
.../payment-status-filter.module.ts | 6 +-
.../validators/payment-status-validator.ts | 4 +-
.../payment-sum-filter.component.ts | 1 +
.../payment-sum-filter.module.ts | 3 +-
.../payment-system-filter.component.ts | 5 +-
.../payment-system-filter.module.ts | 5 +-
.../shops-filter/shops-filter.component.ts | 3 +-
.../shops-filter/shops-filter.module.ts | 5 +-
.../token-provider-filter.component.ts | 5 +-
.../token-provider-filter.module.ts | 5 +-
.../card-bin-pan-filter.component.ts | 4 +-
.../card-bin-pan-filter.module.ts | 5 +-
.../pipes/card-bin-pan-label.pipe.ts | 1 -
.../payments-filters.component.ts | 21 +-
.../payments-filters.module.ts | 6 +-
.../components/row/payments-row.component.ts | 1 +
.../payment-detail-header.module.ts | 3 +-
.../cancel-hold/cancel-hold.module.ts | 6 +-
.../cancel-hold/cancel-hold.service.ts | 4 +-
.../cancel-hold-dialog.component.ts | 4 +-
.../create-hold-dialog.component.ts | 9 +-
.../create-hold/create-hold.module.ts | 6 +-
.../create-hold/create-hold.service.ts | 4 +-
.../hold-details/hold-details.component.ts | 6 +-
.../hold-details/hold-details.module.ts | 3 +-
.../pipes/hold-active/hold-active.pipe.ts | 4 +-
.../payment-details.component.ts | 6 +-
.../payment-invoice-info.component.ts | 1 +
.../payment-invoice-info.module.ts | 5 +-
.../charge-amount/charge-amount.component.ts | 4 +-
.../payment-fee/payment-fee.component.ts | 4 +-
.../payment-status-details-item.component.ts | 1 +
.../resource-payer.component.ts | 1 +
.../payment-main-info.component.ts | 4 +-
.../payment-main-info.module.ts | 6 +-
.../bank-card/bank-card.component.ts | 3 +-
.../digital-wallet.component.ts | 1 +
.../mobile-commerce.component.ts | 1 +
.../payment-terminal.component.ts | 1 +
.../payment-tool/payment-tool.component.ts | 3 +-
.../payment-tool/payment-tool.module.ts | 5 +-
.../payment-error-message.pipe.ts | 8 +-
.../payments-details.module.ts | 5 +-
.../create-refund-dialog.component.ts | 12 +-
.../create-refund/create-refund.module.ts | 6 +-
.../create-refund/create-refund.service.ts | 3 +-
.../services/refunds/refunds.service.ts | 5 +-
.../max-available-amount-validator.ts | 3 +-
.../refunds-list/refunds-list.component.ts | 4 +-
.../refunds-list/refunds-list.module.ts | 6 +-
.../refunds/refunds.component.ts | 9 +-
.../refunds/refunds.module.ts | 5 +-
.../fetch-refunds/fetch-refunds.service.ts | 5 +-
.../invoice-details.service.ts | 7 +-
.../payments-panels.component.ts | 4 +-
.../payments-panels/payments-panels.module.ts | 6 +-
.../operations/payments/payments.component.ts | 6 +-
.../operations/payments/payments.module.ts | 4 +-
.../fetch-payments/fetch-payments.service.ts | 9 +-
.../payments-expanded-id-manager.service.ts | 6 +-
.../refunds-expanded-id-manager.service.ts | 6 +-
.../refund-row/refund-row.component.ts | 3 +-
.../refund-main-info.component.ts | 1 +
.../refund-details.component.ts | 1 +
.../refund-details/refund-details.module.ts | 6 +-
.../receive-invoice.service.ts | 5 +-
.../receive-payment.service.ts | 5 +-
.../refunds-list/refunds-list.component.ts | 1 +
.../refunds-list/refunds-list.module.ts | 6 +-
.../additional-filters.module.ts | 5 +-
.../dialog-filters.component.ts | 1 +
.../invoices-filter.component.ts | 1 +
.../invoices-filter/invoices-filter.module.ts | 5 +-
.../refund-status-filter.component.ts | 3 +-
.../refund-status-filter.module.ts | 6 +-
.../shops-filter/shops-filter.component.ts | 3 +-
.../shops-filter/shops-filter.module.ts | 5 +-
.../refunds-search-filters.component.ts | 21 +-
.../refunds-search-filters.module.ts | 6 +-
.../operations/refunds/refunds.component.ts | 1 +
.../operations/refunds/refunds.module.ts | 6 +-
.../fetch-refunds/fetch-refunds.service.ts | 5 +-
.../refunds-expanded-id-manager.service.ts | 6 +-
.../payment-section-routing.module.ts | 1 -
.../payment-section.component.ts | 8 +-
.../payment-section/payment-section.module.ts | 6 +-
.../cancel-report/cancel-report.module.ts | 2 +-
.../cancel-report/cancel-report.service.ts | 10 +-
.../create-report-dialog.component.ts | 9 +-
.../create-report-dialog.service.ts | 2 +-
.../create-report-form.component.ts | 3 +-
.../create-report/create-report.module.ts | 6 +-
.../form-value-to-create-value.ts | 3 +-
.../reports/fetch-reports.service.ts | 5 +-
.../report-details.component.ts | 1 +
.../report-details/report-details.module.ts | 6 +-
.../report-main-info.component.ts | 3 +-
.../report-file/report-file.component.ts | 1 +
.../report-files/report-files.component.ts | 4 +-
.../report-files/report-files.module.ts | 5 +-
.../report-files/report-files.service.ts | 2 +-
.../report-pipes/report-status-color.pipe.ts | 1 +
.../reports-expanded-id-manager.service.ts | 6 +-
.../report-row/report-row.component.ts | 3 +-
.../reports-list/reports-list.component.ts | 6 +-
.../reports-list/reports-list.module.ts | 6 +-
.../report-types-filter.component.ts | 7 +-
.../reports-search-filters.component.ts | 7 +-
.../reports-search-filters.module.ts | 6 +-
.../reports/reports.component.ts | 6 +-
.../payment-section/reports/reports.module.ts | 6 +-
.../payment-institution-realm.service.ts | 6 +-
.../services/realm-mix.service.ts | 6 +-
.../services/realm-shops.service.ts | 5 +-
.../services/fetch-shops/combine-shop-item.ts | 3 +-
.../fetch-shops/fetch-shops.service.ts | 5 +-
.../shops-balance/shops-balance.service.ts | 2 +-
.../shops-filters-store.service.ts | 1 -
.../shops-expanded-id-manager.service.ts | 6 +-
.../shop-balance/shop-balance.module.ts | 1 -
.../shop-contract-details.component.ts | 1 -
.../components/shop-id/shop-id.component.ts | 1 +
.../shop-info/shop-info.component.ts | 6 +-
.../services/category/category.service.ts | 5 +-
.../shop-actions/shop-actions.service.ts | 10 +-
.../shop-details/shop-details.module.ts | 5 +-
.../shops/shops-list/shop-list.module.ts | 6 +-
.../shops/shops-list/shops-list.component.ts | 3 +-
.../payment-section/shops/shops.component.ts | 3 +-
.../payment-section/shops/shops.module.ts | 5 +-
.../payment-section/shops/types/shop-item.ts | 3 +-
src/app/sections/sections.module.ts | 1 -
src/app/sections/sections.service.ts | 6 +-
.../deposit-row/deposit-row.component.ts | 3 +-
.../deposit-details.component.ts | 3 +-
.../deposit-details/deposit-details.module.ts | 6 +-
.../deposit-panels.component.ts | 4 +-
.../deposit-panels/deposit-panels.module.ts | 6 +-
.../additional-filters.module.ts | 5 +-
.../dialog-filters.component.ts | 4 +-
.../deposit-status-filter.component.ts | 3 +-
.../deposit-status-filter.module.ts | 6 +-
.../validators/deposit-status-validator.ts | 3 +-
.../deposit-sum-filter.component.ts | 1 +
.../deposit-sum-filter.module.ts | 3 +-
.../main-info-filters.component.ts | 1 +
.../main-info-filters.module.ts | 5 +-
.../deposits-filters.component.ts | 19 +-
.../deposits-filters.module.ts | 6 +-
.../deposits/deposits.component.ts | 3 +-
.../deposits/deposits.module.ts | 6 +-
.../deposits-expanded-id-manager.service.ts | 6 +-
.../fetch-deposits/fetch-deposits.service.ts | 9 +-
.../integrations/integrations.module.ts | 6 +-
.../create-webhook-dialog.component.ts | 4 +-
.../create-webhook-dialog.service.ts | 4 +-
.../create-webhook-form.component.ts | 9 +-
.../create-webhook/create-webhook.module.ts | 6 +-
.../create-webhook/create-webhook.service.ts | 5 +-
.../delete-webhook/delete-webhook.service.ts | 10 +-
.../webhooks/receive-webhooks.service.ts | 10 +-
.../webhook-details.component.ts | 1 +
.../webhook-details/webhook-details.module.ts | 6 +-
.../webhook-events.component.ts | 5 +-
.../webhook-list/webhook-list.component.ts | 1 +
.../webhook-list/webhook-list.module.ts | 6 +-
.../webhooks-expanded-id-manager.service.ts | 6 +-
.../webhooks/webhooks.component.ts | 1 +
.../integrations/webhooks/webhooks.module.ts | 6 +-
.../create-report-dialog.component.ts | 11 +-
.../components/files/files.component.ts | 10 +-
.../reports/fetch-reports.service.ts | 8 +-
.../reports/reports.component.ts | 15 +-
.../wallet-section/reports/reports.module.ts | 6 +-
.../wallet-section/status-to-color.pipe.ts | 1 +
.../wallet-section.component.ts | 5 +-
.../wallet-section/wallet-section.module.ts | 6 +-
.../fetch-wallets/fetch-wallets.service.ts | 7 +-
.../wallets-expanded-id-manager.service.ts | 6 +-
.../wallet-details.component.ts | 1 +
.../fetch-wallet-account.service.ts | 7 +-
.../wallets-account-info.component.ts | 1 +
.../wallets-account-info.module.ts | 6 +-
.../wallet-deposit-details.component.ts | 3 +-
.../fetch-wallet-deposits.service.ts | 4 +-
.../wallet-deposits.component.ts | 3 +-
.../wallet-deposits/wallet-deposits.module.ts | 6 +-
.../wallets-main-info.component.ts | 1 +
.../wallets-main-info.module.ts | 6 +-
.../wallet-withdrawal-details.component.ts | 3 +-
.../fetch-wallet-withdrawals.service.ts | 5 +-
.../wallet-withdrawals.component.ts | 3 +-
.../wallet-withdrawals.module.ts | 6 +-
.../wallets-list/wallets-list.component.ts | 1 +
.../wallets-list/wallets-list.module.ts | 6 +-
.../wallet-section/wallets/wallets.module.ts | 6 +-
.../fetch-withdrawals.service.ts | 15 +-
...withdrawals-expanded-id-manager.service.ts | 6 +-
.../additional-filters.module.ts | 5 +-
.../dialog-filters.component.ts | 1 +
.../main-info-filters.component.ts | 1 +
.../main-info-filters.module.ts | 5 +-
.../withdrawal-status-filter.component.ts | 8 +-
.../withdrawal-status-filter.module.ts | 6 +-
.../withdrawal-sum-filter.component.ts | 1 +
.../withdrawal-sum-filter.module.ts | 3 +-
.../withdrawals-filters.component.ts | 19 +-
.../withdrawals-filters.module.ts | 6 +-
.../pipes/withdrawal-error-message.pipe.ts | 10 +-
.../withdrawal-details.component.ts | 3 +-
.../withdrawal-row.component.ts | 3 +-
.../withdrawals-list.component.ts | 1 +
.../withdrawals-list.module.ts | 6 +-
.../withdrawals/withdrawals.component.ts | 4 +-
.../withdrawals/withdrawals.module.ts | 6 +-
.../accordion-table.component.ts | 8 +-
.../accordion-table/accordion-table.module.ts | 7 +-
.../accordion-table/expanded-fragment.ts | 6 +-
.../components/actions/actions.module.ts | 3 +-
.../invoice-details.component.ts | 3 +-
.../invoice-details/invoice-details.module.ts | 6 +-
.../invoice-status-color.pipe.ts | 1 +
.../payment-details.component.ts | 1 +
.../payment-details/payment-details.module.ts | 6 +-
.../payment-status-color.pipe.ts | 1 +
.../refund-details.component.ts | 3 +-
.../refund-details/refund-details.module.ts | 6 +-
.../refund-status-color.pipe.ts | 1 +
.../webhook-api-key.component.ts | 1 +
.../webhook-api-key/webhook-api-key.module.ts | 3 +-
.../withdrawal-info/status-to-color.pipe.ts | 1 +
.../withdrawal-info.component.ts | 1 +
.../withdrawal-info/withdrawal-info.module.ts | 6 +-
.../components/balance/balance.component.ts | 3 +-
.../components/balance/balance.module.ts | 1 -
.../components/buttons/buttons.module.ts | 1 -
.../inline-show-all-toggle.module.ts | 4 +-
.../create-invoice-form.component.ts | 8 +-
.../create-invoice-form.module.ts | 6 +-
.../dialog/base-dialog/base-dialog.module.ts | 6 +-
.../currency-filter.component.ts | 8 +-
.../currency-filter/currency-filter.module.ts | 2 +-
.../invoice-status-filter.component.ts | 3 +-
.../invoice-status-filter.module.ts | 3 +-
.../invoices-filter.component.ts | 3 +-
.../invoices-filter/invoices-filter.module.ts | 3 +-
.../refund-status-filter.component.ts | 3 +-
.../refund-status-filter.module.ts | 3 +-
.../shops-filter/shops-filter.component.ts | 7 +-
.../shops-filter/shops-filter.module.ts | 3 +-
.../category-autocomplete-field.component.ts | 8 +-
.../category-autocomplete-field.module.ts | 1 +
.../countries-autocomplete-field.component.ts | 6 +-
.../country-autocomplete-field.module.ts | 1 +
.../currency-autocomplete-field.component.ts | 3 +-
.../currency-autocomplete-field.module.ts | 1 +
.../currency-field.component.ts | 1 +
.../currency-field/currency-field.module.ts | 2 +-
.../invoice-status-field.component.ts | 6 +-
.../invoice-status-field.module.ts | 2 +-
.../pipes/invoice-status-label.pipe.ts | 5 +-
.../invoices-field.component.ts | 1 +
.../invoices-field/invoices-field.module.ts | 2 +-
.../max-length-input.component.ts | 11 +-
.../payment-institution-field.component.ts | 8 +-
.../payment-institution-field.module.ts | 1 +
.../pipes/refund-status-label.pipe.ts | 5 +-
.../refund-status-field.component.ts | 6 +-
.../refund-status-field.module.ts | 2 +-
.../pipes/report-types-label.pipe.ts | 5 +-
.../report-types-field.component.ts | 3 +-
.../report-types-field.module.ts | 2 +-
.../inputs/shop-field/shop-field.component.ts | 11 +-
.../inputs/shop-field/shop-field.module.ts | 1 +
.../inputs/shop-field/shops-token.ts | 4 +-
.../shops-field/shops-field.component.ts | 6 +-
.../inputs/shops-field/shops-field.module.ts | 2 +-
.../wallet-autocomplete-field.component.ts | 6 +-
.../wallet-autocomplete-field.module.ts | 1 +
...invoice-randomize-amount-form.component.ts | 6 +-
.../invoice-randomize-amount-form.module.ts | 6 +-
.../organization-roles.component.ts | 3 +-
.../organization-roles.module.ts | 6 +-
.../organization-roles/types/role-group.ts | 3 +-
.../organization-roles/utils/group-roles.ts | 3 +-
.../payment-status.component.ts | 4 +-
.../expandable-radio-group.component.ts | 3 +-
.../expandable-radio-group.module.ts | 5 +-
.../route-navbar-layout.module.ts | 4 +-
.../amount-currency/amount-currency.pipe.ts | 1 +
.../pipes/api-model-refs/shop-details.pipe.ts | 2 +-
.../api-model-refs/wallet-details.pipe.ts | 2 +-
.../deposit-status-color.pipe.ts | 1 +
.../payout-tool-details-type.pipe.ts | 3 +-
.../withdrawal-status-color.pipe.ts | 1 +
.../pipes/error-message/error-message.pipe.ts | 5 +-
.../context-organization.service.ts | 7 +-
.../daterange-manager.service.ts | 2 +-
.../shared/services/error/error.service.ts | 4 +-
.../error/models/component-input-error.ts | 1 -
.../expanded-id-manager.ts | 7 +-
.../shared/services/fake-paginator.service.ts | 3 +-
.../fetch-organizations.service.ts | 5 +-
.../id-generator/id-generator.service.ts | 3 +-
.../keycloak-token-info.service.ts | 5 +-
.../notification/notification.service.ts | 4 +-
.../organization-management.service.ts | 5 +-
.../partial-fetcher/partial-fetcher.ts | 5 +-
src/app/shared/services/query-params-store.ts | 5 +-
.../sections-links/section-links.service.ts | 4 +-
.../services/shops-data/shops-data.service.ts | 5 +-
src/app/shared/utils/get-controls.ts | 6 +-
src/app/transloco-http-loader.service.ts | 3 +-
.../charts/bar-chart/bar-chart.component.ts | 3 +-
.../charts/bar-chart/bar-chart.module.ts | 3 +-
.../charts/bar-chart/custom-tooltip.ts | 3 +-
.../donut-chart/donut-chart.component.ts | 5 +-
.../charts/donut-chart/donut-chart.module.ts | 3 +-
src/components/charts/format-amount.ts | 3 +-
.../date-range-filter.component.ts | 8 +-
.../date-range-filter.module.ts | 6 +-
.../date-range-localization.service.ts | 7 +-
.../utils/get-date-range-current-type.ts | 3 +-
.../utils/get-date-range-type.ts | 3 +-
.../utils/get-localized-date-range.ts | 3 +-
.../utils/get-localized-date.ts | 3 +-
.../utils/get-localized-day-range.ts | 3 +-
.../utils/get-localized-year-range.ts | 3 +-
...reate-date-range-with-preset-serializer.ts | 3 +-
src/components/empty/empty.directive.ts | 1 +
src/components/filter/filter-superclass.ts | 5 +-
src/components/filter/filter.component.ts | 3 +-
src/components/filter/filter.module.ts | 6 +-
.../filters-group/filters-group.module.ts | 3 +-
.../multi-input-field.component.ts | 6 +-
.../multi-input-field.module.ts | 4 +-
.../multi-select-field.component.ts | 4 +-
.../multi-select-field.module.ts | 3 +-
.../radio-group-field.component.ts | 4 +-
.../radio-group-field.module.ts | 3 +-
.../last-updated/last-updated.module.ts | 3 +-
.../indicators/spinner/spinner.component.ts | 1 -
.../indicators/status/status.component.ts | 1 -
.../text-color/text-color.directive.ts | 1 -
.../accordion-item.component.ts | 1 +
.../layout/accordion/accordion.component.ts | 21 +-
.../layout/accordion/accordion.module.ts | 4 +-
.../layout/collapse/collapse.module.ts | 4 +-
.../layout/dropdown/dropdown.component.ts | 5 +-
.../limited-list/limited-list.module.ts | 3 +-
.../limited-panel/limited-panel.component.ts | 3 +-
.../layout/link-label/link-label.module.ts | 2 +-
src/components/layout/panel/panel.module.ts | 1 -
.../section-header/section-header.module.ts | 4 +-
.../navigation-link/navigation-link.module.ts | 3 +-
.../navbar-item/navbar-item.component.ts | 8 +-
.../navbar-item/navbar-item.module.ts | 3 +-
.../scroll-up/scroll-up.component.ts | 3 +-
.../navigation/scroll-up/scroll-up.module.ts | 1 -
.../state-nav-item.component.ts | 3 +-
.../state-nav/state-nav.component.ts | 3 +-
.../navigation/state-nav/state-nav.module.ts | 4 +-
.../nested-table/nested-table.component.ts | 6 +-
.../nested-table/nested-table.module.ts | 2 +-
.../confirm-action-dialog.component.ts | 1 +
.../confirm-action-dialog.module.ts | 5 +-
src/pipes/daterange/daterange.pipe.ts | 3 +-
src/pipes/daterange/daterange.service.ts | 7 +-
src/utils/form/get-form-value-changes.ts | 6 +-
.../query-list-started-array-changes.ts | 3 +-
src/utils/query-params-to-str.ts | 3 +-
579 files changed, 2147 insertions(+), 1293 deletions(-)
diff --git a/eslint.config.js b/eslint.config.js
index 429cf64eb..5b65e2c7b 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -2,7 +2,7 @@
const eslint = require('@eslint/js');
const tseslint = require('typescript-eslint');
const angular = require('angular-eslint');
-const importPlugin = require('eslint-plugin-import');
+const importPlugin = require('eslint-plugin-import-x');
const unusedImportsPlugin = require('eslint-plugin-unused-imports');
const pathsPlugin = require('eslint-plugin-paths');
@@ -20,43 +20,41 @@ function getImportOrderConfig(internalPatterns = ['~/**']) {
ignoreDeclarationSort: true,
},
],
- // Disabled due to incompatibility with ESLint 10
- // TODO: Update eslint-plugin-import or find alternative
- // 'import/order': [
- // 'error',
- // {
- // groups: [
- // ['builtin', 'external'],
- // 'type',
- // 'internal',
- // 'parent',
- // ['index', 'sibling'],
- // 'object',
- // ],
- // pathGroups: [
- // {
- // pattern: '@vality/**',
- // group: 'type',
- // position: 'before',
- // },
- // {
- // pattern: '@*/**',
- // group: 'external',
- // position: 'after',
- // },
- // ...internalPatterns.map((pattern) => ({
- // pattern,
- // group: 'internal',
- // })),
- // ],
- // pathGroupsExcludedImportTypes: ['builtin'],
- // 'newlines-between': 'always',
- // alphabetize: {
- // order: 'asc',
- // caseInsensitive: true,
- // },
- // },
- // ],
+ 'import/order': [
+ 'error',
+ {
+ groups: [
+ ['builtin', 'external'],
+ 'type',
+ 'internal',
+ 'parent',
+ ['index', 'sibling'],
+ 'object',
+ ],
+ pathGroups: [
+ {
+ pattern: '@vality/**',
+ group: 'type',
+ position: 'before',
+ },
+ {
+ pattern: '@*/**',
+ group: 'external',
+ position: 'after',
+ },
+ ...internalPatterns.map((pattern) => ({
+ pattern,
+ group: 'internal',
+ })),
+ ],
+ pathGroupsExcludedImportTypes: ['builtin'],
+ 'newlines-between': 'always',
+ alphabetize: {
+ order: 'asc',
+ caseInsensitive: true,
+ },
+ },
+ ],
'paths/alias': 'error',
'no-restricted-imports': [
'error',
diff --git a/package-lock.json b/package-lock.json
index aa60e04c2..28a03423c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -66,6 +66,7 @@
"dotenv": "^17.4.2",
"eslint": "^10.5.0",
"eslint-plugin-import": "^2.32.0",
+ "eslint-plugin-import-x": "^4.16.2",
"eslint-plugin-paths": "^1.1.0",
"eslint-plugin-unused-imports": "^4.4.1",
"glob": "^13.0.6",
@@ -1945,6 +1946,40 @@
"node": ">=14"
}
},
+ "node_modules/@emnapi/core": {
+ "version": "1.10.0",
+ "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.10.0.tgz",
+ "integrity": "sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "dependencies": {
+ "@emnapi/wasi-threads": "1.2.1",
+ "tslib": "^2.4.0"
+ }
+ },
+ "node_modules/@emnapi/runtime": {
+ "version": "1.10.0",
+ "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.10.0.tgz",
+ "integrity": "sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "dependencies": {
+ "tslib": "^2.4.0"
+ }
+ },
+ "node_modules/@emnapi/wasi-threads": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.1.tgz",
+ "integrity": "sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "dependencies": {
+ "tslib": "^2.4.0"
+ }
+ },
"node_modules/@epic-web/invariant": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/@epic-web/invariant/-/invariant-1.0.0.tgz",
@@ -3298,24 +3333,6 @@
}
}
},
- "node_modules/@jsverse/transloco-keys-manager/node_modules/debug": {
- "version": "4.4.3",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
- "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "ms": "^2.1.3"
- },
- "engines": {
- "node": ">=6.0"
- },
- "peerDependenciesMeta": {
- "supports-color": {
- "optional": true
- }
- }
- },
"node_modules/@jsverse/transloco-keys-manager/node_modules/env-paths": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
@@ -4142,6 +4159,25 @@
"node": ">= 10"
}
},
+ "node_modules/@napi-rs/wasm-runtime": {
+ "version": "1.1.5",
+ "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.5.tgz",
+ "integrity": "sha512-AWPoBRJ9tsnVhor4sjO7rkni+7p+2IAEFj6cx06UgP10jkQHqay/36uRV/bFkgrh18D9vb4cr8Q0Pthskgzy+Q==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "dependencies": {
+ "@tybys/wasm-util": "^0.10.2"
+ },
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/Brooooooklyn"
+ },
+ "peerDependencies": {
+ "@emnapi/core": "^1.7.1",
+ "@emnapi/runtime": "^1.7.1"
+ }
+ },
"node_modules/@ng-matero/extensions": {
"version": "21.3.1",
"resolved": "https://registry.npmjs.org/@ng-matero/extensions/-/extensions-21.3.1.tgz",
@@ -4406,6 +4442,13 @@
"node": "^20.17.0 || >=22.9.0"
}
},
+ "node_modules/@package-json/types": {
+ "version": "0.0.12",
+ "resolved": "https://registry.npmjs.org/@package-json/types/-/types-0.0.12.tgz",
+ "integrity": "sha512-uu43FGU34B5VM9mCNjXCwLaGHYjXdNincqKLaraaCW+7S2+SmiBg1Nv8bPnmschrIfZmfKNY9f3fC376MRrObw==",
+ "dev": true,
+ "license": "MIT"
+ },
"node_modules/@parcel/watcher": {
"version": "2.5.6",
"resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.6.tgz",
@@ -5351,6 +5394,17 @@
"node": "^20.17.0 || >=22.9.0"
}
},
+ "node_modules/@tybys/wasm-util": {
+ "version": "0.10.2",
+ "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.2.tgz",
+ "integrity": "sha512-RoBvJ2X0wuKlWFIjrwffGw1IqZHKQqzIchKaadZZfnNpsAYp2mM0h36JtPCjNDAHGgYez/15uMBpfGwchhiMgg==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "dependencies": {
+ "tslib": "^2.4.0"
+ }
+ },
"node_modules/@types/chai": {
"version": "5.2.3",
"resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.2.3.tgz",
@@ -5503,24 +5557,6 @@
"typescript": ">=4.8.4 <6.1.0"
}
},
- "node_modules/@typescript-eslint/parser/node_modules/debug": {
- "version": "4.4.3",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
- "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "ms": "^2.1.3"
- },
- "engines": {
- "node": ">=6.0"
- },
- "peerDependenciesMeta": {
- "supports-color": {
- "optional": true
- }
- }
- },
"node_modules/@typescript-eslint/project-service": {
"version": "8.61.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.61.1.tgz",
@@ -5543,24 +5579,6 @@
"typescript": ">=4.8.4 <6.1.0"
}
},
- "node_modules/@typescript-eslint/project-service/node_modules/debug": {
- "version": "4.4.3",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
- "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "ms": "^2.1.3"
- },
- "engines": {
- "node": ">=6.0"
- },
- "peerDependenciesMeta": {
- "supports-color": {
- "optional": true
- }
- }
- },
"node_modules/@typescript-eslint/scope-manager": {
"version": "8.61.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.61.1.tgz",
@@ -5621,24 +5639,6 @@
"typescript": ">=4.8.4 <6.1.0"
}
},
- "node_modules/@typescript-eslint/type-utils/node_modules/debug": {
- "version": "4.4.3",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
- "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "ms": "^2.1.3"
- },
- "engines": {
- "node": ">=6.0"
- },
- "peerDependenciesMeta": {
- "supports-color": {
- "optional": true
- }
- }
- },
"node_modules/@typescript-eslint/types": {
"version": "8.61.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.61.1.tgz",
@@ -5681,78 +5681,403 @@
"typescript": ">=4.8.4 <6.1.0"
}
},
- "node_modules/@typescript-eslint/typescript-estree/node_modules/debug": {
- "version": "4.4.3",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
- "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
+ "node_modules/@typescript-eslint/utils": {
+ "version": "8.61.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.61.1.tgz",
+ "integrity": "sha512-1+P/3Dj6jvtybE1q0HQ6yBt/gq+oKJyLdEv4HdnqasaEXRSYCAsD59mXEVQnM/ULNdQxbX77tdG4jPRjIS6knA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@eslint-community/eslint-utils": "^4.9.1",
+ "@typescript-eslint/scope-manager": "8.61.1",
+ "@typescript-eslint/types": "8.61.1",
+ "@typescript-eslint/typescript-estree": "8.61.1"
+ },
+ "engines": {
+ "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ },
+ "peerDependencies": {
+ "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
+ "typescript": ">=4.8.4 <6.1.0"
+ }
+ },
+ "node_modules/@typescript-eslint/visitor-keys": {
+ "version": "8.61.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.61.1.tgz",
+ "integrity": "sha512-6fJ9MHWtK14C1DSkiMlHUSOmrVebL7150xZJBlJiL62jjhIA4JmOq6flwBgDxIdBKKdoiZRel+dfPD5MLfny3w==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@typescript-eslint/types": "8.61.1",
+ "eslint-visitor-keys": "^5.0.0"
+ },
+ "engines": {
+ "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ }
+ },
+ "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz",
+ "integrity": "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "engines": {
+ "node": "^20.19.0 || ^22.13.0 || >=24"
+ },
+ "funding": {
+ "url": "https://opencollective.com/eslint"
+ }
+ },
+ "node_modules/@unrs/resolver-binding-android-arm-eabi": {
+ "version": "1.12.2",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm-eabi/-/resolver-binding-android-arm-eabi-1.12.2.tgz",
+ "integrity": "sha512-g5T90pqg1bo/7mytQx6F4iBNC0Wsh9cu+z9veDbFjc7HjpesJFWD7QMS0NGStXM075+7dJPPVvBbpZlnrdpi/w==",
+ "cpu": [
+ "arm"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "android"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-android-arm64": {
+ "version": "1.12.2",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm64/-/resolver-binding-android-arm64-1.12.2.tgz",
+ "integrity": "sha512-YGCRZv/9GLhwmz6mYDeTsm/92BAyR28l6c2ReweVW5pWgfsitWLY8upvfRlGdoyD8HjeTHSYJWyZGD4KJA/nFQ==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "android"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-darwin-arm64": {
+ "version": "1.12.2",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-arm64/-/resolver-binding-darwin-arm64-1.12.2.tgz",
+ "integrity": "sha512-u9DiNT1auQMO20A9SyTuG3wUgQWB9Z7KjAg0uFuCDR1FsAY8A0CG2S6JpHS1xwm/w1G08bjXZDcyOCjv1WAm2w==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "darwin"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-darwin-x64": {
+ "version": "1.12.2",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-x64/-/resolver-binding-darwin-x64-1.12.2.tgz",
+ "integrity": "sha512-f7rPLi/T1HVKZu/u6t87lroib16n8vrSzcyxI7lg4BGO9UF26KhQL44sd9eOUgrTYhvRXtWOIZT5PejdPyJfUA==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "darwin"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-freebsd-x64": {
+ "version": "1.12.2",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-freebsd-x64/-/resolver-binding-freebsd-x64-1.12.2.tgz",
+ "integrity": "sha512-BpcOjWCJub6nRZUS2zA20pmLvjtqAtGejETaIyRLiZiQf++cbrjltLA5NN/xaXfqeOBOSlMFbemIl5/S5tljmg==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "freebsd"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-linux-arm-gnueabihf": {
+ "version": "1.12.2",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-gnueabihf/-/resolver-binding-linux-arm-gnueabihf-1.12.2.tgz",
+ "integrity": "sha512-vZTDvdSISZjJx66OzJqtsOhzifbqRjbmI1Mnu49fQDwog5GtDI4QidRiEAYbZCRj9C8YZEW+3ZjqsyS9GR4k2A==",
+ "cpu": [
+ "arm"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-linux-arm-musleabihf": {
+ "version": "1.12.2",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-musleabihf/-/resolver-binding-linux-arm-musleabihf-1.12.2.tgz",
+ "integrity": "sha512-BiPI+IrIlwcW4nLLMM21+B1dFPzd55yAVgVGrdgDjNef+ch03GdxrcyaIz8X9SsQirh/kCQ7mviyWlMxdh2D7g==",
+ "cpu": [
+ "arm"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-linux-arm64-gnu": {
+ "version": "1.12.2",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-gnu/-/resolver-binding-linux-arm64-gnu-1.12.2.tgz",
+ "integrity": "sha512-zJc0H99FEPoFfSrNpa91HYfxzfAJCr502oxNK1cfdC9hlaFI43RT+JFCann9JUgZmLzzntChHyn13Sgn9ljHNg==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "libc": [
+ "glibc"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-linux-arm64-musl": {
+ "version": "1.12.2",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-musl/-/resolver-binding-linux-arm64-musl-1.12.2.tgz",
+ "integrity": "sha512-KQ3Lki6l+Pz1k/eBipN41ES+YUK30beLGb9YqcB1O542cyLCNE6GaxrfcY3T6EezmGGk84wb5XyO9loTM9tkcA==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "libc": [
+ "musl"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-linux-loong64-gnu": {
+ "version": "1.12.2",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-loong64-gnu/-/resolver-binding-linux-loong64-gnu-1.12.2.tgz",
+ "integrity": "sha512-3SJGEh1DborhG6pyxvhPzCT4bbSIVihsvgJc13P1bHG7KLdNDaF9T3gsTwFc7Jw/5Y5/iWOjkEx7Zy0NvCGX3Q==",
+ "cpu": [
+ "loong64"
+ ],
+ "dev": true,
+ "libc": [
+ "glibc"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-linux-loong64-musl": {
+ "version": "1.12.2",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-loong64-musl/-/resolver-binding-linux-loong64-musl-1.12.2.tgz",
+ "integrity": "sha512-jiuG/Obbel7uw1PwHNFfrkiKhLAF6mnyZ6aWlOAVN9WqKm8v0OFGnciJIHu8+CMvXLQ8AD51LPzAoUfT21D5Ew==",
+ "cpu": [
+ "loong64"
+ ],
+ "dev": true,
+ "libc": [
+ "musl"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-linux-ppc64-gnu": {
+ "version": "1.12.2",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-ppc64-gnu/-/resolver-binding-linux-ppc64-gnu-1.12.2.tgz",
+ "integrity": "sha512-q7xRvVpmcfeL+LlZg8Pbbo6QaTZwDU5BaGZbwfhkEsXJn3Was8xYfE0RBH266xZt0rM6B7i8xAYIvjthuUIWHg==",
+ "cpu": [
+ "ppc64"
+ ],
+ "dev": true,
+ "libc": [
+ "glibc"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-linux-riscv64-gnu": {
+ "version": "1.12.2",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-gnu/-/resolver-binding-linux-riscv64-gnu-1.12.2.tgz",
+ "integrity": "sha512-0CVdx6lcnT3Q9inOH8tsMIOJ6ImndllMjqJHg8RLVdB7Vq4SfkEXl9mCSsVNuNA4MCYycRicCUxPCabVHJRr6A==",
+ "cpu": [
+ "riscv64"
+ ],
+ "dev": true,
+ "libc": [
+ "glibc"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-linux-riscv64-musl": {
+ "version": "1.12.2",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-musl/-/resolver-binding-linux-riscv64-musl-1.12.2.tgz",
+ "integrity": "sha512-iOwlRo9vnp6R6ohHQS11n0NnfdXx/omhkocmIfaPRpQhKZ+3BDMkkdRVh53qjkFkpPddf+FETA28NwGN7l5l+w==",
+ "cpu": [
+ "riscv64"
+ ],
+ "dev": true,
+ "libc": [
+ "musl"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-linux-s390x-gnu": {
+ "version": "1.12.2",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-s390x-gnu/-/resolver-binding-linux-s390x-gnu-1.12.2.tgz",
+ "integrity": "sha512-HYJtLfXq94q8iZNFT1lknx258wlkkWhZeUXJRqzKBBUJ00CvZ+N33zgbCqimLjsyw5Va6uUxhVa12mI+kaveEw==",
+ "cpu": [
+ "s390x"
+ ],
+ "dev": true,
+ "libc": [
+ "glibc"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-linux-x64-gnu": {
+ "version": "1.12.2",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-gnu/-/resolver-binding-linux-x64-gnu-1.12.2.tgz",
+ "integrity": "sha512-mPsUhunKKDih5O96Y6enDQyHc1SqBPlY1E/SfMWDM3EdJ95Z9CArPeCVwCCqbP45ljvivdEk8Fxn+SIb1rDAJQ==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "libc": [
+ "glibc"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-linux-x64-musl": {
+ "version": "1.12.2",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-musl/-/resolver-binding-linux-x64-musl-1.12.2.tgz",
+ "integrity": "sha512-azrt6+5ydLd8Vt210AAFis/lZevSfPw93EJRIJG+xPu4WCJ8K0kppCTpMyLPcKT7H15M4Jnt2tMp5bOvCkRC6A==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "libc": [
+ "musl"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-openharmony-arm64": {
+ "version": "1.12.2",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-openharmony-arm64/-/resolver-binding-openharmony-arm64-1.12.2.tgz",
+ "integrity": "sha512-YZ9hP4O0X9PQb8eO980qmLNGH4zT3I9+SZTdt0Pr0YyuGQhYKoOZkV02VzrzyOZJ5xIJ3UFIenKkUkGg8GjgWQ==",
+ "cpu": [
+ "arm64"
+ ],
"dev": true,
"license": "MIT",
- "dependencies": {
- "ms": "^2.1.3"
- },
- "engines": {
- "node": ">=6.0"
- },
- "peerDependenciesMeta": {
- "supports-color": {
- "optional": true
- }
- }
+ "optional": true,
+ "os": [
+ "openharmony"
+ ]
},
- "node_modules/@typescript-eslint/utils": {
- "version": "8.61.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.61.1.tgz",
- "integrity": "sha512-1+P/3Dj6jvtybE1q0HQ6yBt/gq+oKJyLdEv4HdnqasaEXRSYCAsD59mXEVQnM/ULNdQxbX77tdG4jPRjIS6knA==",
+ "node_modules/@unrs/resolver-binding-wasm32-wasi": {
+ "version": "1.12.2",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-wasm32-wasi/-/resolver-binding-wasm32-wasi-1.12.2.tgz",
+ "integrity": "sha512-tYFDIkMxSflfEc/h92ZWNsZlHSwgimbNHSO3PL2JWQHfCuC2q316jMyYU9TIWZsFK2bQwyK5VAdYgn8ygPj69A==",
+ "cpu": [
+ "wasm32"
+ ],
"dev": true,
"license": "MIT",
+ "optional": true,
"dependencies": {
- "@eslint-community/eslint-utils": "^4.9.1",
- "@typescript-eslint/scope-manager": "8.61.1",
- "@typescript-eslint/types": "8.61.1",
- "@typescript-eslint/typescript-estree": "8.61.1"
+ "@emnapi/core": "1.10.0",
+ "@emnapi/runtime": "1.10.0",
+ "@napi-rs/wasm-runtime": "^1.1.4"
},
"engines": {
- "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/typescript-eslint"
- },
- "peerDependencies": {
- "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
- "typescript": ">=4.8.4 <6.1.0"
+ "node": ">=14.0.0"
}
},
- "node_modules/@typescript-eslint/visitor-keys": {
- "version": "8.61.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.61.1.tgz",
- "integrity": "sha512-6fJ9MHWtK14C1DSkiMlHUSOmrVebL7150xZJBlJiL62jjhIA4JmOq6flwBgDxIdBKKdoiZRel+dfPD5MLfny3w==",
+ "node_modules/@unrs/resolver-binding-win32-arm64-msvc": {
+ "version": "1.12.2",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-arm64-msvc/-/resolver-binding-win32-arm64-msvc-1.12.2.tgz",
+ "integrity": "sha512-qzNyg3xL0VPQmCaUh+N5jSitce6k+uCBfMDesWRnlULOZaqUkaJ0ybdT+UqlAWJoQjuqfIU/0Ptx9bteN4D82g==",
+ "cpu": [
+ "arm64"
+ ],
"dev": true,
"license": "MIT",
- "dependencies": {
- "@typescript-eslint/types": "8.61.1",
- "eslint-visitor-keys": "^5.0.0"
- },
- "engines": {
- "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/typescript-eslint"
- }
+ "optional": true,
+ "os": [
+ "win32"
+ ]
},
- "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz",
- "integrity": "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==",
+ "node_modules/@unrs/resolver-binding-win32-ia32-msvc": {
+ "version": "1.12.2",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-ia32-msvc/-/resolver-binding-win32-ia32-msvc-1.12.2.tgz",
+ "integrity": "sha512-WD9sY00OfpHVGfsnHZoA8jVT+esS/Bg8z8jzxp5BnDCjjwsuKsPQrzswwpFy4J1AUJbXPRfkpcX0mXrzeXW79g==",
+ "cpu": [
+ "ia32"
+ ],
"dev": true,
- "license": "Apache-2.0",
- "engines": {
- "node": "^20.19.0 || ^22.13.0 || >=24"
- },
- "funding": {
- "url": "https://opencollective.com/eslint"
- }
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-win32-x64-msvc": {
+ "version": "1.12.2",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-x64-msvc/-/resolver-binding-win32-x64-msvc-1.12.2.tgz",
+ "integrity": "sha512-nAB74NfSNKknqQ1RrYj6uz8FcXEomu/MATJZxh/x+BArzN2U3JbOYC0APYzUIGhVY3m5hRxA8VPNdPBoG8txlA==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ]
},
"node_modules/@vality/matez": {
"version": "22.0.1-e965167.0",
@@ -7105,6 +7430,16 @@
"node": ">= 6"
}
},
+ "node_modules/comment-parser": {
+ "version": "1.4.7",
+ "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.4.7.tgz",
+ "integrity": "sha512-0h+uSNtQGW3D98eQt3jJ8L06Fves8hncB4V/PKdw/Qb8Hnk19VaKuTr55UNRYiSoVa7WwrFls+rh3ux9agmkeQ==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">= 12.0.0"
+ }
+ },
"node_modules/concat-map": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -7581,10 +7916,11 @@
}
},
"node_modules/debug": {
- "version": "4.3.7",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
- "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+ "version": "4.4.3",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+ "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"ms": "^2.1.3"
},
@@ -8178,6 +8514,31 @@
}
}
},
+ "node_modules/eslint-import-context": {
+ "version": "0.1.9",
+ "resolved": "https://registry.npmjs.org/eslint-import-context/-/eslint-import-context-0.1.9.tgz",
+ "integrity": "sha512-K9Hb+yRaGAGUbwjhFNHvSmmkZs9+zbuoe3kFQ4V1wYjrepUFYM2dZAfNtjbbj3qsPfUfsA68Bx/ICWQMi+C8Eg==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "get-tsconfig": "^4.10.1",
+ "stable-hash-x": "^0.2.0"
+ },
+ "engines": {
+ "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/eslint-import-context"
+ },
+ "peerDependencies": {
+ "unrs-resolver": "^1.0.0"
+ },
+ "peerDependenciesMeta": {
+ "unrs-resolver": {
+ "optional": true
+ }
+ }
+ },
"node_modules/eslint-import-resolver-node": {
"version": "0.3.10",
"resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.10.tgz",
@@ -8262,6 +8623,44 @@
"eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9"
}
},
+ "node_modules/eslint-plugin-import-x": {
+ "version": "4.16.2",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-import-x/-/eslint-plugin-import-x-4.16.2.tgz",
+ "integrity": "sha512-rM9K8UBHcWKpzQzStn1YRN2T5NvdeIfSVoKu/lKF41znQXHAUcBbYXe5wd6GNjZjTrP7viQ49n1D83x/2gYgIw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@package-json/types": "^0.0.12",
+ "@typescript-eslint/types": "^8.56.0",
+ "comment-parser": "^1.4.1",
+ "debug": "^4.4.1",
+ "eslint-import-context": "^0.1.9",
+ "is-glob": "^4.0.3",
+ "minimatch": "^9.0.3 || ^10.1.2",
+ "semver": "^7.7.2",
+ "stable-hash-x": "^0.2.0",
+ "unrs-resolver": "^1.9.2"
+ },
+ "engines": {
+ "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/eslint-plugin-import-x"
+ },
+ "peerDependencies": {
+ "@typescript-eslint/utils": "^8.56.0",
+ "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
+ "eslint-import-resolver-node": "*"
+ },
+ "peerDependenciesMeta": {
+ "@typescript-eslint/utils": {
+ "optional": true
+ },
+ "eslint-import-resolver-node": {
+ "optional": true
+ }
+ }
+ },
"node_modules/eslint-plugin-import/node_modules/brace-expansion": {
"version": "1.1.15",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz",
@@ -8721,24 +9120,6 @@
"url": "https://opencollective.com/express"
}
},
- "node_modules/express/node_modules/debug": {
- "version": "4.4.3",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
- "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "ms": "^2.1.3"
- },
- "engines": {
- "node": ">=6.0"
- },
- "peerDependenciesMeta": {
- "supports-color": {
- "optional": true
- }
- }
- },
"node_modules/express/node_modules/encodeurl": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
@@ -9290,6 +9671,19 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/get-tsconfig": {
+ "version": "4.14.0",
+ "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.14.0.tgz",
+ "integrity": "sha512-yTb+8DXzDREzgvYmh6s9vHsSVCHeC0G3PI5bEXNBHtmshPnO+S5O7qgLEOn0I5QvMy6kpZN8K1NKGyilLb93wA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "resolve-pkg-maps": "^1.0.0"
+ },
+ "funding": {
+ "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
+ }
+ },
"node_modules/glob": {
"version": "13.0.6",
"resolved": "https://registry.npmjs.org/glob/-/glob-13.0.6.tgz",
@@ -11051,6 +11445,22 @@
"node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
}
},
+ "node_modules/napi-postinstall": {
+ "version": "0.3.4",
+ "resolved": "https://registry.npmjs.org/napi-postinstall/-/napi-postinstall-0.3.4.tgz",
+ "integrity": "sha512-PHI5f1O0EP5xJ9gQmFGMS6IZcrVvTjpXjz7Na41gTE7eE2hK11lg04CECCYEEjdc17EV4DO+fkGEtt7TpTaTiQ==",
+ "dev": true,
+ "license": "MIT",
+ "bin": {
+ "napi-postinstall": "lib/cli.js"
+ },
+ "engines": {
+ "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/napi-postinstall"
+ }
+ },
"node_modules/natural-compare": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -12255,6 +12665,16 @@
"node": ">=8"
}
},
+ "node_modules/resolve-pkg-maps": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
+ "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==",
+ "dev": true,
+ "license": "MIT",
+ "funding": {
+ "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1"
+ }
+ },
"node_modules/restore-cursor": {
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz",
@@ -12347,24 +12767,6 @@
"node": ">= 18"
}
},
- "node_modules/router/node_modules/debug": {
- "version": "4.4.3",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
- "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "ms": "^2.1.3"
- },
- "engines": {
- "node": ">=6.0"
- },
- "peerDependenciesMeta": {
- "supports-color": {
- "optional": true
- }
- }
- },
"node_modules/rxjs": {
"version": "7.8.2",
"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz",
@@ -12546,24 +12948,6 @@
"url": "https://opencollective.com/express"
}
},
- "node_modules/send/node_modules/debug": {
- "version": "4.4.3",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
- "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "ms": "^2.1.3"
- },
- "engines": {
- "node": ">=6.0"
- },
- "peerDependenciesMeta": {
- "supports-color": {
- "optional": true
- }
- }
- },
"node_modules/send/node_modules/encodeurl": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
@@ -13042,6 +13426,16 @@
"node": "^20.17.0 || >=22.9.0"
}
},
+ "node_modules/stable-hash-x": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/stable-hash-x/-/stable-hash-x-0.2.0.tgz",
+ "integrity": "sha512-o3yWv49B/o4QZk5ZcsALc6t0+eCelPc44zZsLtCQnZPDwFpDYSWcDnrv2TtMmMbQ7uKo3J0HTURCqckw23czNQ==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=12.0.0"
+ }
+ },
"node_modules/stackback": {
"version": "0.0.2",
"resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz",
@@ -13617,24 +14011,6 @@
"node": "^20.17.0 || >=22.9.0"
}
},
- "node_modules/tuf-js/node_modules/debug": {
- "version": "4.4.3",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
- "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "ms": "^2.1.3"
- },
- "engines": {
- "node": ">=6.0"
- },
- "peerDependenciesMeta": {
- "supports-color": {
- "optional": true
- }
- }
- },
"node_modules/type-check": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -13828,6 +14204,44 @@
"node": ">= 0.8"
}
},
+ "node_modules/unrs-resolver": {
+ "version": "1.12.2",
+ "resolved": "https://registry.npmjs.org/unrs-resolver/-/unrs-resolver-1.12.2.tgz",
+ "integrity": "sha512-dmlRxBJJayXjqTwC+JtF1HhJmgf3ftQ3YejFcZrf4+KKtJv0qDsK1pjqaaVjG7wJ5NJ6UVP1OqRMQ71Z4C3rxQ==",
+ "dev": true,
+ "hasInstallScript": true,
+ "license": "MIT",
+ "dependencies": {
+ "napi-postinstall": "^0.3.4"
+ },
+ "funding": {
+ "url": "https://opencollective.com/unrs-resolver"
+ },
+ "optionalDependencies": {
+ "@unrs/resolver-binding-android-arm-eabi": "1.12.2",
+ "@unrs/resolver-binding-android-arm64": "1.12.2",
+ "@unrs/resolver-binding-darwin-arm64": "1.12.2",
+ "@unrs/resolver-binding-darwin-x64": "1.12.2",
+ "@unrs/resolver-binding-freebsd-x64": "1.12.2",
+ "@unrs/resolver-binding-linux-arm-gnueabihf": "1.12.2",
+ "@unrs/resolver-binding-linux-arm-musleabihf": "1.12.2",
+ "@unrs/resolver-binding-linux-arm64-gnu": "1.12.2",
+ "@unrs/resolver-binding-linux-arm64-musl": "1.12.2",
+ "@unrs/resolver-binding-linux-loong64-gnu": "1.12.2",
+ "@unrs/resolver-binding-linux-loong64-musl": "1.12.2",
+ "@unrs/resolver-binding-linux-ppc64-gnu": "1.12.2",
+ "@unrs/resolver-binding-linux-riscv64-gnu": "1.12.2",
+ "@unrs/resolver-binding-linux-riscv64-musl": "1.12.2",
+ "@unrs/resolver-binding-linux-s390x-gnu": "1.12.2",
+ "@unrs/resolver-binding-linux-x64-gnu": "1.12.2",
+ "@unrs/resolver-binding-linux-x64-musl": "1.12.2",
+ "@unrs/resolver-binding-openharmony-arm64": "1.12.2",
+ "@unrs/resolver-binding-wasm32-wasi": "1.12.2",
+ "@unrs/resolver-binding-win32-arm64-msvc": "1.12.2",
+ "@unrs/resolver-binding-win32-ia32-msvc": "1.12.2",
+ "@unrs/resolver-binding-win32-x64-msvc": "1.12.2"
+ }
+ },
"node_modules/update-browserslist-db": {
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz",
diff --git a/package.json b/package.json
index 6cced8239..4dd759a84 100644
--- a/package.json
+++ b/package.json
@@ -82,7 +82,7 @@
"cspell": "^10.0.1",
"dotenv": "^17.4.2",
"eslint": "^10.5.0",
- "eslint-plugin-import": "^2.32.0",
+ "eslint-plugin-import-x": "^4.16.2",
"eslint-plugin-paths": "^1.1.0",
"eslint-plugin-unused-imports": "^4.4.1",
"glob": "^13.0.6",
diff --git a/src/app/api/organizations/organizations-dictionary.service.ts b/src/app/api/organizations/organizations-dictionary.service.ts
index 64dd3876f..25f2a4f90 100644
--- a/src/app/api/organizations/organizations-dictionary.service.ts
+++ b/src/app/api/organizations/organizations-dictionary.service.ts
@@ -1,5 +1,6 @@
import { Injectable } from '@angular/core';
import { TranslocoService } from '@jsverse/transloco';
+
import { ResourceScopeId } from '@vality/swag-organizations';
import { RoleId } from '../../auth/types/role-id';
diff --git a/src/app/api/organizations/organizations.module.ts b/src/app/api/organizations/organizations.module.ts
index 8c3f1d19f..0fad6b1d0 100644
--- a/src/app/api/organizations/organizations.module.ts
+++ b/src/app/api/organizations/organizations.module.ts
@@ -1,4 +1,5 @@
import { NgModule } from '@angular/core';
+
import { Configuration } from '@vality/swag-organizations';
import { ConfigService } from '../../config';
diff --git a/src/app/api/organizations/orgs.service.ts b/src/app/api/organizations/orgs.service.ts
index 5083a3a2b..5afdeb679 100644
--- a/src/app/api/organizations/orgs.service.ts
+++ b/src/app/api/organizations/orgs.service.ts
@@ -1,4 +1,5 @@
import { Injectable } from '@angular/core';
+
import { OrgsService as ApiOrgsService } from '@vality/swag-organizations';
import { createApi } from '../utils';
diff --git a/src/app/api/payments/categories.service.ts b/src/app/api/payments/categories.service.ts
index 71bd75dd3..326f16b1b 100644
--- a/src/app/api/payments/categories.service.ts
+++ b/src/app/api/payments/categories.service.ts
@@ -1,8 +1,10 @@
-import { Injectable } from '@angular/core';
-import { CategoriesService as ApiCategoriesService } from '@vality/swag-payments';
import { BehaviorSubject, defer } from 'rxjs';
import { shareReplay, switchMap } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
+
+import { CategoriesService as ApiCategoriesService } from '@vality/swag-payments';
+
import { createApi } from '../utils';
@Injectable({
diff --git a/src/app/api/payments/countries.service.ts b/src/app/api/payments/countries.service.ts
index 1376bf603..83828b7c5 100644
--- a/src/app/api/payments/countries.service.ts
+++ b/src/app/api/payments/countries.service.ts
@@ -1,9 +1,11 @@
-import { Injectable, Injector } from '@angular/core';
-import { CountriesService as ApiCountriesService, Country } from '@vality/swag-payments';
import sortBy from 'lodash-es/sortBy';
import { Observable, of } from 'rxjs';
import { catchError, map, shareReplay } from 'rxjs/operators';
+import { Injectable, Injector } from '@angular/core';
+
+import { CountriesService as ApiCountriesService, Country } from '@vality/swag-payments';
+
import { createApi } from '../utils';
@Injectable({
diff --git a/src/app/api/payments/invoice-templates.service.ts b/src/app/api/payments/invoice-templates.service.ts
index 47736d8b4..e03b5d410 100644
--- a/src/app/api/payments/invoice-templates.service.ts
+++ b/src/app/api/payments/invoice-templates.service.ts
@@ -1,7 +1,8 @@
import { Injectable, Injector } from '@angular/core';
+import { PartyIdPatchMethodService } from '@dsh/app/api/utils/extensions';
+
import { InvoiceTemplatesService as ApiInvoiceTemplatesService } from '@vality/swag-payments';
-import { PartyIdPatchMethodService } from '@dsh/app/api/utils/extensions';
import { createApi } from '../utils';
diff --git a/src/app/api/payments/invoices.service.ts b/src/app/api/payments/invoices.service.ts
index 88fa661d6..b2932a28d 100644
--- a/src/app/api/payments/invoices.service.ts
+++ b/src/app/api/payments/invoices.service.ts
@@ -1,7 +1,8 @@
import { Injectable, Injector } from '@angular/core';
+import { PartyIdPatchMethodService } from '@dsh/app/api/utils/extensions';
+
import { InvoicesService as ApiInvoicesService } from '@vality/swag-payments';
-import { PartyIdPatchMethodService } from '@dsh/app/api/utils/extensions';
import { createApi } from '../utils';
diff --git a/src/app/api/payments/parties.service.ts b/src/app/api/payments/parties.service.ts
index 3b1e78dad..ade64bcc1 100644
--- a/src/app/api/payments/parties.service.ts
+++ b/src/app/api/payments/parties.service.ts
@@ -1,4 +1,5 @@
import { Injectable } from '@angular/core';
+
import { PartiesService as ApiPartiesService } from '@vality/swag-payments';
import { createApi } from '../utils';
diff --git a/src/app/api/payments/payment-institutions.service.ts b/src/app/api/payments/payment-institutions.service.ts
index 099ceb158..2f04303f1 100644
--- a/src/app/api/payments/payment-institutions.service.ts
+++ b/src/app/api/payments/payment-institutions.service.ts
@@ -1,8 +1,10 @@
-import { Injectable } from '@angular/core';
-import { PaymentInstitutionsService as ApiPaymentInstitutionsService } from '@vality/swag-payments';
import { BehaviorSubject, defer } from 'rxjs';
import { shareReplay, switchMap } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
+
+import { PaymentInstitutionsService as ApiPaymentInstitutionsService } from '@vality/swag-payments';
+
import { createApi } from '../utils';
@Injectable({
diff --git a/src/app/api/payments/payments-dictionary.service.ts b/src/app/api/payments/payments-dictionary.service.ts
index d063a1b07..68cfb713d 100644
--- a/src/app/api/payments/payments-dictionary.service.ts
+++ b/src/app/api/payments/payments-dictionary.service.ts
@@ -1,5 +1,6 @@
import { Injectable } from '@angular/core';
import { TranslocoService } from '@jsverse/transloco';
+
import { InvoicesTopic, PaymentStatus } from '@vality/swag-payments';
import { DictionaryService } from '../utils';
diff --git a/src/app/api/payments/payments.module.ts b/src/app/api/payments/payments.module.ts
index 4f68bfdc5..28412994d 100644
--- a/src/app/api/payments/payments.module.ts
+++ b/src/app/api/payments/payments.module.ts
@@ -1,4 +1,5 @@
import { NgModule } from '@angular/core';
+
import { Configuration } from '@vality/swag-payments';
import { ConfigService } from '../../config';
diff --git a/src/app/api/payments/payments.service.ts b/src/app/api/payments/payments.service.ts
index 837a41a26..142551c09 100644
--- a/src/app/api/payments/payments.service.ts
+++ b/src/app/api/payments/payments.service.ts
@@ -1,4 +1,5 @@
import { Injectable } from '@angular/core';
+
import { PaymentsService as ApiPaymentsService } from '@vality/swag-payments';
import { createApi } from '../utils';
diff --git a/src/app/api/payments/shops.service.ts b/src/app/api/payments/shops.service.ts
index 7ae0402c7..605191f4c 100644
--- a/src/app/api/payments/shops.service.ts
+++ b/src/app/api/payments/shops.service.ts
@@ -1,4 +1,5 @@
import { Injectable } from '@angular/core';
+
import { ShopsService as ApiShopsService } from '@vality/swag-payments';
import { createApi } from '../utils';
diff --git a/src/app/api/payments/utils/operators/filter-shop.ts b/src/app/api/payments/utils/operators/filter-shop.ts
index ab6edb9f6..292e44ecb 100644
--- a/src/app/api/payments/utils/operators/filter-shop.ts
+++ b/src/app/api/payments/utils/operators/filter-shop.ts
@@ -1,6 +1,7 @@
-import { Shop } from '@vality/swag-payments';
import negate from 'lodash-es/negate';
+import { Shop } from '@vality/swag-payments';
+
export const isTestShop = ({ categoryID }: Shop): boolean => categoryID === 1;
export const toTestShops = (s: Shop[]): Shop[] => s.filter(isTestShop);
export const toLiveShops = (s: Shop[]): Shop[] => s.filter(negate(isTestShop));
diff --git a/src/app/api/payments/utils/operators/map-to-shop-id.ts b/src/app/api/payments/utils/operators/map-to-shop-id.ts
index 69cd1266a..7e941d1c9 100644
--- a/src/app/api/payments/utils/operators/map-to-shop-id.ts
+++ b/src/app/api/payments/utils/operators/map-to-shop-id.ts
@@ -1,6 +1,7 @@
-import { Shop } from '@vality/swag-payments';
import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
+import { Shop } from '@vality/swag-payments';
+
export const mapToShopId = (s: Observable): Observable =>
s.pipe(map((shops) => shops.map((shop) => shop.id)));
diff --git a/src/app/api/payments/webhooks.service.ts b/src/app/api/payments/webhooks.service.ts
index ee4845397..07008aa24 100644
--- a/src/app/api/payments/webhooks.service.ts
+++ b/src/app/api/payments/webhooks.service.ts
@@ -1,7 +1,8 @@
import { Injectable, Injector } from '@angular/core';
+import { PartyIdExtension, PartyIdPatchMethodService } from '@dsh/app/api/utils/extensions';
+
import { WebhooksService as ApiWebhooksService } from '@vality/swag-payments';
-import { PartyIdExtension, PartyIdPatchMethodService } from '@dsh/app/api/utils/extensions';
import { createApi } from '../utils';
diff --git a/src/app/api/utils/create-api/create-api.ts b/src/app/api/utils/create-api/create-api.ts
index 3cb58c3a7..f0fc8a50a 100644
--- a/src/app/api/utils/create-api/create-api.ts
+++ b/src/app/api/utils/create-api/create-api.ts
@@ -1,9 +1,10 @@
-import { HttpHeaders, HttpResponse } from '@angular/common/http';
-import { Injectable, Injector } from '@angular/core';
import { Observable, combineLatest, isObservable, of } from 'rxjs';
import { switchMap } from 'rxjs/operators';
import { Overwrite, ReadonlyKeys, RequiredKeys, UnionToIntersection } from 'utility-types';
+import { HttpHeaders, HttpResponse } from '@angular/common/http';
+import { Injectable, Injector } from '@angular/core';
+
import { ApiExtension } from './utils/api-extension';
import { getMethods } from './utils/get-methods';
import { ObservableValue } from './utils/observable-value';
diff --git a/src/app/api/utils/create-api/utils/x-request-id-extension.ts b/src/app/api/utils/create-api/utils/x-request-id-extension.ts
index d449be2c6..b26c667aa 100644
--- a/src/app/api/utils/create-api/utils/x-request-id-extension.ts
+++ b/src/app/api/utils/create-api/utils/x-request-id-extension.ts
@@ -1,5 +1,4 @@
import { Injectable } from '@angular/core';
-
import { IdGeneratorService } from '@dsh/app/shared/services/id-generator';
import { ApiExtension } from './api-extension';
diff --git a/src/app/api/utils/dictionary.service.ts b/src/app/api/utils/dictionary.service.ts
index 4cff107d2..dce22ebad 100644
--- a/src/app/api/utils/dictionary.service.ts
+++ b/src/app/api/utils/dictionary.service.ts
@@ -1,8 +1,9 @@
-import { Injectable } from '@angular/core';
-import { TranslocoService } from '@jsverse/transloco';
import { Observable } from 'rxjs';
import { map, shareReplay } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
+import { TranslocoService } from '@jsverse/transloco';
+
@Injectable({
providedIn: 'root',
})
diff --git a/src/app/api/utils/extensions/party-id-extension.ts b/src/app/api/utils/extensions/party-id-extension.ts
index b75253ca3..4758481ad 100644
--- a/src/app/api/utils/extensions/party-id-extension.ts
+++ b/src/app/api/utils/extensions/party-id-extension.ts
@@ -1,6 +1,6 @@
-import { Injectable } from '@angular/core';
import { first, map } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
import { ContextOrganizationService } from '@dsh/app/shared/services/context-organization';
import { ApiExtension } from '../create-api';
diff --git a/src/app/api/utils/extensions/party-id-patch-method.service.ts b/src/app/api/utils/extensions/party-id-patch-method.service.ts
index 67803d8a5..9d59915fc 100644
--- a/src/app/api/utils/extensions/party-id-patch-method.service.ts
+++ b/src/app/api/utils/extensions/party-id-patch-method.service.ts
@@ -1,8 +1,9 @@
-import { Injectable } from '@angular/core';
import cloneDeep from 'lodash-es/cloneDeep';
import { Observable, switchMap } from 'rxjs';
import { DeepPartial } from 'utility-types';
+import { Injectable } from '@angular/core';
+
import { PartyIdExtension } from './party-id-extension';
@Injectable({
diff --git a/src/app/api/wallet/deposits.service.ts b/src/app/api/wallet/deposits.service.ts
index 9b76bcbe7..e08ce55ca 100644
--- a/src/app/api/wallet/deposits.service.ts
+++ b/src/app/api/wallet/deposits.service.ts
@@ -1,7 +1,8 @@
import { Injectable } from '@angular/core';
+import { PartyIdExtension } from '@dsh/app/api/utils/extensions';
+
import { DepositsService as ApiDepositsService } from '@vality/swag-wallets';
-import { PartyIdExtension } from '@dsh/app/api/utils/extensions';
import { createApi } from '../utils';
diff --git a/src/app/api/wallet/downloads.service.ts b/src/app/api/wallet/downloads.service.ts
index ba0d38bda..e9863b520 100644
--- a/src/app/api/wallet/downloads.service.ts
+++ b/src/app/api/wallet/downloads.service.ts
@@ -1,4 +1,5 @@
import { Injectable } from '@angular/core';
+
import { DownloadsService as ApiService } from '@vality/swag-wallets';
import { createApi } from '../utils';
diff --git a/src/app/api/wallet/reports.service.ts b/src/app/api/wallet/reports.service.ts
index cf05249c6..b4f6ccafd 100644
--- a/src/app/api/wallet/reports.service.ts
+++ b/src/app/api/wallet/reports.service.ts
@@ -1,7 +1,8 @@
import { Injectable } from '@angular/core';
+import { PartyIdExtension } from '@dsh/app/api/utils/extensions';
+
import { ReportsService as ApiService } from '@vality/swag-wallets';
-import { PartyIdExtension } from '@dsh/app/api/utils/extensions';
import { createApi } from '../utils';
diff --git a/src/app/api/wallet/wallet-dictionary.service.ts b/src/app/api/wallet/wallet-dictionary.service.ts
index 82a92839d..c8f2e8597 100644
--- a/src/app/api/wallet/wallet-dictionary.service.ts
+++ b/src/app/api/wallet/wallet-dictionary.service.ts
@@ -1,5 +1,6 @@
import { Injectable } from '@angular/core';
import { TranslocoService } from '@jsverse/transloco';
+
import {
Deposit,
DestinationsTopic,
diff --git a/src/app/api/wallet/wallet.module.ts b/src/app/api/wallet/wallet.module.ts
index 6c7bce018..d8c59f8be 100644
--- a/src/app/api/wallet/wallet.module.ts
+++ b/src/app/api/wallet/wallet.module.ts
@@ -1,4 +1,5 @@
import { NgModule } from '@angular/core';
+
import { Configuration } from '@vality/swag-wallets';
import { ConfigService } from '../../config';
diff --git a/src/app/api/wallet/wallets.service.ts b/src/app/api/wallet/wallets.service.ts
index 96b4e9f22..83840e637 100644
--- a/src/app/api/wallet/wallets.service.ts
+++ b/src/app/api/wallet/wallets.service.ts
@@ -1,10 +1,11 @@
-import { Injectable, Injector } from '@angular/core';
-import { WalletsService as ApiWalletsService, Wallet } from '@vality/swag-wallets';
import { Observable, of, switchMap } from 'rxjs';
import { catchError, map, shareReplay } from 'rxjs/operators';
+import { Injectable, Injector } from '@angular/core';
import { ContextOrganizationService } from '@dsh/app/shared';
+import { WalletsService as ApiWalletsService, Wallet } from '@vality/swag-wallets';
+
import { createApi } from '../utils';
import { PartyIdExtension } from '../utils/extensions';
diff --git a/src/app/api/wallet/webhooks.service.ts b/src/app/api/wallet/webhooks.service.ts
index b67dad771..18b260c9d 100644
--- a/src/app/api/wallet/webhooks.service.ts
+++ b/src/app/api/wallet/webhooks.service.ts
@@ -1,7 +1,8 @@
import { Injectable } from '@angular/core';
+import { PartyIdExtension } from '@dsh/app/api/utils/extensions';
+
import { WebhooksService as ApiWebhooksService } from '@vality/swag-wallets';
-import { PartyIdExtension } from '@dsh/app/api/utils/extensions';
import { createApi } from '../utils';
diff --git a/src/app/api/wallet/withdrawals.service.ts b/src/app/api/wallet/withdrawals.service.ts
index ef32e4eca..09ce540c8 100644
--- a/src/app/api/wallet/withdrawals.service.ts
+++ b/src/app/api/wallet/withdrawals.service.ts
@@ -1,7 +1,8 @@
import { Injectable } from '@angular/core';
+import { PartyIdExtension } from '@dsh/app/api/utils/extensions';
+
import { WithdrawalsService as ApiWithdrawalsService } from '@vality/swag-wallets';
-import { PartyIdExtension } from '@dsh/app/api/utils/extensions';
import { createApi } from '../utils';
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index ba9c67faf..a2e8d8868 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -1,6 +1,6 @@
-import { ChangeDetectionStrategy, Component, inject, isDevMode } from '@angular/core';
import { map } from 'rxjs';
+import { ChangeDetectionStrategy, Component, inject, isDevMode } from '@angular/core';
import { Language, LanguageService } from '@dsh/app/language';
import { BootstrapService } from './bootstrap.service';
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index ed7b5b626..ce251c487 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -1,3 +1,5 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { provideHttpClient, withInterceptorsFromDi, withXhr } from '@angular/common/http';
import { LOCALE_ID, NgModule, inject, isDevMode, provideAppInitializer } from '@angular/core';
@@ -18,16 +20,15 @@ import {
} from '@angular/material-moment-adapter';
import { BrowserModule } from '@angular/platform-browser';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { TRANSLOCO_SCOPE, TranslocoModule, provideTransloco } from '@jsverse/transloco';
-import { QUERY_PARAMS_SERIALIZERS } from '@vality/matez';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { AnapiModule } from '@dsh/app/api/anapi';
import { PaymentsModule } from '@dsh/app/api/payments';
import { WalletModule } from '@dsh/app/api/wallet';
import { ErrorModule } from '@dsh/app/shared/services';
import { createDateRangeWithPresetSerializer } from '@dsh/components/date-range-filter';
import { BootstrapIconModule, SpinnerModule } from '@dsh/components/indicators';
+import { TRANSLOCO_SCOPE, TranslocoModule, provideTransloco } from '@jsverse/transloco';
+
+import { QUERY_PARAMS_SERIALIZERS } from '@vality/matez';
import { ENV, environment } from '../environments';
diff --git a/src/app/auth/app-auth-guard.service.ts b/src/app/auth/app-auth-guard.service.ts
index b6ca757f6..ead9bdca5 100644
--- a/src/app/auth/app-auth-guard.service.ts
+++ b/src/app/auth/app-auth-guard.service.ts
@@ -1,6 +1,7 @@
+import { firstValueFrom } from 'rxjs';
+
import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, Router, UrlTree } from '@angular/router';
-import { firstValueFrom } from 'rxjs';
import { KeycloakAuthGuard, KeycloakService } from './keycloak';
import { RoleAccessService } from './role-access.service';
diff --git a/src/app/auth/role-access.service.ts b/src/app/auth/role-access.service.ts
index c0adf9a53..8403b53ae 100644
--- a/src/app/auth/role-access.service.ts
+++ b/src/app/auth/role-access.service.ts
@@ -1,7 +1,7 @@
-import { Injectable } from '@angular/core';
import { Observable, of } from 'rxjs';
import { map } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
import { ContextOrganizationService } from '@dsh/app/shared';
import { ROLE_ACCESS_GROUPS } from './role-access-groups';
diff --git a/src/app/auth/utils/create-private-route.ts b/src/app/auth/utils/create-private-route.ts
index 4399ff5ed..803928977 100644
--- a/src/app/auth/utils/create-private-route.ts
+++ b/src/app/auth/utils/create-private-route.ts
@@ -1,5 +1,4 @@
import { Route } from '@angular/router';
-
import { AppAuthGuardService, RoleAccessName } from '@dsh/app/auth';
export function createPrivateRoute(route: Route, roles: RoleAccessName[]) {
diff --git a/src/app/bootstrap.service.ts b/src/app/bootstrap.service.ts
index e23953c7e..0430a65a5 100644
--- a/src/app/bootstrap.service.ts
+++ b/src/app/bootstrap.service.ts
@@ -1,9 +1,9 @@
-import { Injectable } from '@angular/core';
-import { TranslocoService } from '@jsverse/transloco';
import { Observable, switchMap, throwError } from 'rxjs';
import { catchError, map, tap } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
import { CommonError, ErrorService, ShopsDataService } from '@dsh/app/shared';
+import { TranslocoService } from '@jsverse/transloco';
@Injectable()
export class BootstrapService {
diff --git a/src/app/config/config.service.ts b/src/app/config/config.service.ts
index 9502b1fce..d75344ae0 100644
--- a/src/app/config/config.service.ts
+++ b/src/app/config/config.service.ts
@@ -1,6 +1,7 @@
+import { BehaviorSubject } from 'rxjs';
+
import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
-import { BehaviorSubject } from 'rxjs';
import { BASE_CONFIG, Config } from './config';
diff --git a/src/app/home/actionbar/actionbar.module.ts b/src/app/home/actionbar/actionbar.module.ts
index e9548139c..acda03cf9 100644
--- a/src/app/home/actionbar/actionbar.module.ts
+++ b/src/app/home/actionbar/actionbar.module.ts
@@ -1,3 +1,5 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { OverlayModule } from '@angular/cdk/overlay';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
@@ -7,14 +9,12 @@ import { MatDividerModule } from '@angular/material/divider';
import { MatMenuModule } from '@angular/material/menu';
import { MatRadioModule } from '@angular/material/radio';
import { RouterModule } from '@angular/router';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { BaseDialogModule } from '@dsh/app/shared/components/dialog/base-dialog';
import { FetchOrganizationsModule } from '@dsh/app/shared/services/fetch-organizations';
import { IndicatorsModule } from '@dsh/components/indicators';
import { DropdownModule } from '@dsh/components/layout';
import { LimitedPanelComponent } from '@dsh/components/layout/limited-panel/limited-panel.component';
+import { TranslocoModule } from '@jsverse/transloco';
import { ActionbarComponent } from './actionbar.component';
import { MenuItemComponent } from './components/menu-item/menu-item.component';
diff --git a/src/app/home/actionbar/components/organizations-list/organizations-list.component.ts b/src/app/home/actionbar/components/organizations-list/organizations-list.component.ts
index fb1c27ee7..9bd9b30d2 100644
--- a/src/app/home/actionbar/components/organizations-list/organizations-list.component.ts
+++ b/src/app/home/actionbar/components/organizations-list/organizations-list.component.ts
@@ -1,6 +1,6 @@
-import { ChangeDetectionStrategy, Component, EventEmitter, OnInit, Output } from '@angular/core';
import { map } from 'rxjs/operators';
+import { ChangeDetectionStrategy, Component, EventEmitter, OnInit, Output } from '@angular/core';
import { FetchOrganizationsService } from '@dsh/app/shared/services/fetch-organizations';
@Component({
diff --git a/src/app/home/actionbar/components/select-active-organization-dialog/select-active-organization-dialog.component.ts b/src/app/home/actionbar/components/select-active-organization-dialog/select-active-organization-dialog.component.ts
index 97c93a2f2..e1f46d834 100644
--- a/src/app/home/actionbar/components/select-active-organization-dialog/select-active-organization-dialog.component.ts
+++ b/src/app/home/actionbar/components/select-active-organization-dialog/select-active-organization-dialog.component.ts
@@ -1,16 +1,17 @@
+import { combineLatest } from 'rxjs';
+import { first, map } from 'rxjs/operators';
+
import { ChangeDetectionStrategy, Component, DestroyRef, OnInit } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { MatDialogRef } from '@angular/material/dialog';
import { Router } from '@angular/router';
-import { Organization } from '@vality/swag-organizations';
-import { combineLatest } from 'rxjs';
-import { first, map } from 'rxjs/operators';
-
import { SEARCH_LIMIT } from '@dsh/app/sections/tokens';
import { BaseDialogResponseStatus } from '@dsh/app/shared/components/dialog/base-dialog';
import { ContextOrganizationService } from '@dsh/app/shared/services';
import { FetchOrganizationsService } from '@dsh/app/shared/services/fetch-organizations';
+import { Organization } from '@vality/swag-organizations';
+
const DISPLAYED_COUNT = 5;
@Component({
diff --git a/src/app/home/actionbar/components/user-dropdown/user-dropdown.component.ts b/src/app/home/actionbar/components/user-dropdown/user-dropdown.component.ts
index 8e1d4a018..b707dc5e7 100644
--- a/src/app/home/actionbar/components/user-dropdown/user-dropdown.component.ts
+++ b/src/app/home/actionbar/components/user-dropdown/user-dropdown.component.ts
@@ -1,6 +1,6 @@
-import { ChangeDetectionStrategy, Component, Input, booleanAttribute } from '@angular/core';
import { map } from 'rxjs/operators';
+import { ChangeDetectionStrategy, Component, Input, booleanAttribute } from '@angular/core';
import { ContextOrganizationService } from '@dsh/app/shared/services';
import { KeycloakService } from '../../../../auth';
diff --git a/src/app/home/actionbar/components/user/user.component.ts b/src/app/home/actionbar/components/user/user.component.ts
index a651eef23..644cae270 100644
--- a/src/app/home/actionbar/components/user/user.component.ts
+++ b/src/app/home/actionbar/components/user/user.component.ts
@@ -1,3 +1,5 @@
+import { filter, map } from 'rxjs/operators';
+
import {
ChangeDetectionStrategy,
Component,
@@ -8,13 +10,12 @@ import {
} from '@angular/core';
import { MatDialog } from '@angular/material/dialog';
import { Router } from '@angular/router';
-import { TranslocoService } from '@jsverse/transloco';
-import { Organization } from '@vality/swag-organizations';
-import { filter, map } from 'rxjs/operators';
-
import { DIALOG_CONFIG, DialogConfig } from '@dsh/app/sections/tokens';
import { ContextOrganizationService } from '@dsh/app/shared';
import { BaseDialogResponseStatus } from '@dsh/app/shared/components/dialog/base-dialog';
+import { TranslocoService } from '@jsverse/transloco';
+
+import { Organization } from '@vality/swag-organizations';
import { KeycloakService } from '../../../../auth';
import { ConfigService } from '../../../../config';
diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts
index 7b20a273f..14406b0fe 100644
--- a/src/app/home/home.component.ts
+++ b/src/app/home/home.component.ts
@@ -1,9 +1,10 @@
+import { Observable } from 'rxjs';
+import { filter, map, pluck, take } from 'rxjs/operators';
+
import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';
import { ChangeDetectionStrategy, Component, DestroyRef, OnInit } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { NavigationEnd, Router } from '@angular/router';
-import { Observable } from 'rxjs';
-import { filter, map, pluck, take } from 'rxjs/operators';
import { ThemeManager } from '../theme-manager';
diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts
index 94e1af93e..1e7a5dedf 100644
--- a/src/app/home/home.module.ts
+++ b/src/app/home/home.module.ts
@@ -1,8 +1,9 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatIconModule } from '@angular/material/icon';
import { RouterModule } from '@angular/router';
-import { FlexLayoutModule } from 'ng-flex-layout';
import { HomeComponent } from './home.component';
import { LaptopGridModule } from './laptop-grid/laptop-grid.module';
diff --git a/src/app/home/laptop-grid/laptop-grid.module.ts b/src/app/home/laptop-grid/laptop-grid.module.ts
index 0b49039c3..da6ba4b1c 100644
--- a/src/app/home/laptop-grid/laptop-grid.module.ts
+++ b/src/app/home/laptop-grid/laptop-grid.module.ts
@@ -1,6 +1,7 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
-import { FlexLayoutModule } from 'ng-flex-layout';
import { ToolbarModule } from '../toolbar';
diff --git a/src/app/home/mobile-grid/mobile-grid.module.ts b/src/app/home/mobile-grid/mobile-grid.module.ts
index 77bc0d522..017f60bf5 100644
--- a/src/app/home/mobile-grid/mobile-grid.module.ts
+++ b/src/app/home/mobile-grid/mobile-grid.module.ts
@@ -1,8 +1,8 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatSidenavModule } from '@angular/material/sidenav';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { BootstrapIconModule } from '@dsh/components/indicators';
import { MobileGridComponent } from './mobile-grid.component';
diff --git a/src/app/home/mobile-grid/mobile-menu/components/mobile-user-bar/mobile-user-bar.component.ts b/src/app/home/mobile-grid/mobile-menu/components/mobile-user-bar/mobile-user-bar.component.ts
index 44ba44ab7..5c7ff6b8c 100644
--- a/src/app/home/mobile-grid/mobile-menu/components/mobile-user-bar/mobile-user-bar.component.ts
+++ b/src/app/home/mobile-grid/mobile-menu/components/mobile-user-bar/mobile-user-bar.component.ts
@@ -1,6 +1,7 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
import { KeycloakService } from 'keycloak-angular';
+import { ChangeDetectionStrategy, Component } from '@angular/core';
+
@Component({
selector: 'dsh-mobile-user-bar',
templateUrl: './mobile-user-bar.component.html',
diff --git a/src/app/home/mobile-grid/mobile-menu/mobile-menu.component.ts b/src/app/home/mobile-grid/mobile-menu/mobile-menu.component.ts
index 50a66d7e4..cddff64d3 100644
--- a/src/app/home/mobile-grid/mobile-menu/mobile-menu.component.ts
+++ b/src/app/home/mobile-grid/mobile-menu/mobile-menu.component.ts
@@ -1,6 +1,6 @@
-import { ChangeDetectionStrategy, Component, EventEmitter, Output } from '@angular/core';
import { Observable } from 'rxjs';
+import { ChangeDetectionStrategy, Component, EventEmitter, Output } from '@angular/core';
import { SectionLink, SectionsLinksService } from '@dsh/app/shared/services/sections-links';
@Component({
diff --git a/src/app/home/mobile-grid/mobile-menu/mobile-menu.module.ts b/src/app/home/mobile-grid/mobile-menu/mobile-menu.module.ts
index c8940ddde..98e991188 100644
--- a/src/app/home/mobile-grid/mobile-menu/mobile-menu.module.ts
+++ b/src/app/home/mobile-grid/mobile-menu/mobile-menu.module.ts
@@ -1,12 +1,12 @@
+import { FlexModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatDividerModule } from '@angular/material/divider';
import { RouterModule } from '@angular/router';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexModule } from 'ng-flex-layout';
-
import { SectionsLinksModule } from '@dsh/app/shared/services/sections-links';
import { BootstrapIconModule } from '@dsh/components/indicators';
+import { TranslocoModule } from '@jsverse/transloco';
import { MobileUserBarComponent, NavItemComponent } from './components';
import { MobileMenuComponent } from './mobile-menu.component';
diff --git a/src/app/home/toolbar/toolbar.component.ts b/src/app/home/toolbar/toolbar.component.ts
index 56206528d..ba522ffad 100644
--- a/src/app/home/toolbar/toolbar.component.ts
+++ b/src/app/home/toolbar/toolbar.component.ts
@@ -1,5 +1,4 @@
import { ChangeDetectionStrategy, Component } from '@angular/core';
-
import { SectionsLinksService } from '@dsh/app/shared/services/sections-links';
@Component({
diff --git a/src/app/home/toolbar/toolbar.module.ts b/src/app/home/toolbar/toolbar.module.ts
index b26752018..42aefc979 100644
--- a/src/app/home/toolbar/toolbar.module.ts
+++ b/src/app/home/toolbar/toolbar.module.ts
@@ -1,9 +1,9 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatTabsModule } from '@angular/material/tabs';
import { RouterModule } from '@angular/router';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { SectionsLinksModule } from '@dsh/app/shared/services/sections-links';
import { ActionbarModule } from '../actionbar';
diff --git a/src/app/humanize-duration/humanize-duration.service.ts b/src/app/humanize-duration/humanize-duration.service.ts
index b4abf07ee..4bb08651f 100644
--- a/src/app/humanize-duration/humanize-duration.service.ts
+++ b/src/app/humanize-duration/humanize-duration.service.ts
@@ -1,11 +1,12 @@
-import { Injectable } from '@angular/core';
-import { TranslocoService } from '@jsverse/transloco';
import * as humanizeDuration from 'humanize-duration';
import { UnitTranslationOptions } from 'humanize-duration';
import moment from 'moment';
import { Observable, of, switchMap } from 'rxjs';
import { first, map, withLatestFrom } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
+import { TranslocoService } from '@jsverse/transloco';
+
import { LanguageService } from '../language';
export type Value = number | string | moment.Moment | Date;
diff --git a/src/app/humanize-duration/humanized-duration.pipe.ts b/src/app/humanize-duration/humanized-duration.pipe.ts
index 75c7a7d82..d45b0e811 100644
--- a/src/app/humanize-duration/humanized-duration.pipe.ts
+++ b/src/app/humanize-duration/humanized-duration.pipe.ts
@@ -1,7 +1,8 @@
-import { ChangeDetectorRef, OnDestroy, Pipe, PipeTransform } from '@angular/core';
import { Subscription, interval, switchMap } from 'rxjs';
import { startWith } from 'rxjs/operators';
+import { ChangeDetectorRef, OnDestroy, Pipe, PipeTransform } from '@angular/core';
+
import { HumanizeConfig, HumanizeDurationService, Value } from './humanize-duration.service';
export interface HumanizeDurationConfig extends HumanizeConfig {
diff --git a/src/app/language/language.service.ts b/src/app/language/language.service.ts
index 1bf4a0143..68ac8eecd 100644
--- a/src/app/language/language.service.ts
+++ b/src/app/language/language.service.ts
@@ -1,7 +1,8 @@
+import * as moment from 'moment';
+
import { registerLocaleData } from '@angular/common';
import { Injectable } from '@angular/core';
import { TranslocoService } from '@jsverse/transloco';
-import * as moment from 'moment';
import { SettingsService } from '../settings';
diff --git a/src/app/sections/organization-section/accept-invitation/accept-invitation.component.ts b/src/app/sections/organization-section/accept-invitation/accept-invitation.component.ts
index 365069e31..032b9b6e4 100644
--- a/src/app/sections/organization-section/accept-invitation/accept-invitation.component.ts
+++ b/src/app/sections/organization-section/accept-invitation/accept-invitation.component.ts
@@ -1,9 +1,9 @@
-import { ChangeDetectionStrategy, Component, DestroyRef } from '@angular/core';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { ActivatedRoute } from '@angular/router';
import { BehaviorSubject, Subscription } from 'rxjs';
import { first, pluck, switchMap } from 'rxjs/operators';
+import { ChangeDetectionStrategy, Component, DestroyRef } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { ActivatedRoute } from '@angular/router';
import { OrgsService } from '@dsh/app/api/organizations';
import { inProgressTo } from '@dsh/utils';
diff --git a/src/app/sections/organization-section/accept-invitation/accept-invitation.module.ts b/src/app/sections/organization-section/accept-invitation/accept-invitation.module.ts
index 2ec1d460b..cb2968734 100644
--- a/src/app/sections/organization-section/accept-invitation/accept-invitation.module.ts
+++ b/src/app/sections/organization-section/accept-invitation/accept-invitation.module.ts
@@ -1,12 +1,12 @@
+import { FlexModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexModule } from 'ng-flex-layout';
-
import { ErrorModule } from '@dsh/app/shared';
import { IndicatorsModule } from '@dsh/components/indicators';
import { LinkModule } from '@dsh/components/link';
+import { TranslocoModule } from '@jsverse/transloco';
import { AcceptInvitationRoutingModule } from './accept-invitation-routing.module';
import { AcceptInvitationComponent } from './accept-invitation.component';
diff --git a/src/app/sections/organization-section/organization-details/change-roles-table/change-roles-table.component.ts b/src/app/sections/organization-section/organization-details/change-roles-table/change-roles-table.component.ts
index b9299035f..455a819e9 100644
--- a/src/app/sections/organization-section/organization-details/change-roles-table/change-roles-table.component.ts
+++ b/src/app/sections/organization-section/organization-details/change-roles-table/change-roles-table.component.ts
@@ -1,3 +1,8 @@
+import { uniqBy } from 'lodash-es';
+import isNil from 'lodash-es/isNil';
+import { BehaviorSubject, Observable, ReplaySubject, combineLatest, defer, filter, of } from 'rxjs';
+import { first, map, shareReplay, switchMap, tap } from 'rxjs/operators';
+
import {
ChangeDetectionStrategy,
Component,
@@ -16,19 +21,6 @@ import {
} from '@angular/core';
import { takeUntilDestroyed, toObservable } from '@angular/core/rxjs-interop';
import { MatDialog } from '@angular/material/dialog';
-import {
- ComponentChanges,
- DialogResponseStatus,
- DialogService,
- getEnumValues,
-} from '@vality/matez';
-import { Organization, ResourceScopeId } from '@vality/swag-organizations';
-import { Shop } from '@vality/swag-payments';
-import { uniqBy } from 'lodash-es';
-import isNil from 'lodash-es/isNil';
-import { BehaviorSubject, Observable, ReplaySubject, combineLatest, defer, filter, of } from 'rxjs';
-import { first, map, shareReplay, switchMap, tap } from 'rxjs/operators';
-
import {
MemberRoleOptionalId,
OrganizationsDictionaryService,
@@ -40,6 +32,15 @@ import { sortRoleIds } from '@dsh/app/shared/components/organization-roles/utils
import { NestedTableColumn, NestedTableNode } from '@dsh/components/nested-table';
import { addDialogsClass } from '@dsh/utils/add-dialogs-class';
+import {
+ ComponentChanges,
+ DialogResponseStatus,
+ DialogService,
+ getEnumValues,
+} from '@vality/matez';
+import { Organization, ResourceScopeId } from '@vality/swag-organizations';
+import { Shop } from '@vality/swag-payments';
+
import { equalRoles } from '../members/components/edit-roles-dialog/utils/equal-roles';
import { SelectRoleDialogComponent } from './components/select-role-dialog/select-role-dialog.component';
diff --git a/src/app/sections/organization-section/organization-details/change-roles-table/change-roles-table.module.ts b/src/app/sections/organization-section/organization-details/change-roles-table/change-roles-table.module.ts
index 418d0e946..5daab17ac 100644
--- a/src/app/sections/organization-section/organization-details/change-roles-table/change-roles-table.module.ts
+++ b/src/app/sections/organization-section/organization-details/change-roles-table/change-roles-table.module.ts
@@ -1,3 +1,5 @@
+import { FlexModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
@@ -6,13 +8,11 @@ import { MatCheckboxModule } from '@angular/material/checkbox';
import { MatRadioModule } from '@angular/material/radio';
import { MatTableModule } from '@angular/material/table';
import { MatTooltip } from '@angular/material/tooltip';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexModule } from 'ng-flex-layout';
-
import { BaseDialogModule } from '@dsh/app/shared/components/dialog/base-dialog';
import { BootstrapIconModule } from '@dsh/components/indicators';
import { SelectionModule } from '@dsh/components/indicators/selection';
import { NestedTableModule } from '@dsh/components/nested-table';
+import { TranslocoModule } from '@jsverse/transloco';
import { ChangeRolesTableComponent } from './change-roles-table.component';
import { SelectRoleDialogComponent } from './components/select-role-dialog/select-role-dialog.component';
diff --git a/src/app/sections/organization-section/organization-details/change-roles-table/components/select-role-dialog/select-role-dialog.component.ts b/src/app/sections/organization-section/organization-details/change-roles-table/components/select-role-dialog/select-role-dialog.component.ts
index 7cf0fc203..fd7e988a5 100644
--- a/src/app/sections/organization-section/organization-details/change-roles-table/components/select-role-dialog/select-role-dialog.component.ts
+++ b/src/app/sections/organization-section/organization-details/change-roles-table/components/select-role-dialog/select-role-dialog.component.ts
@@ -1,3 +1,6 @@
+import { Observable, ReplaySubject, combineLatest } from 'rxjs';
+import { first, map } from 'rxjs/operators';
+
import {
ChangeDetectionStrategy,
Component,
@@ -6,10 +9,6 @@ import {
ViewChild,
} from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { DEFAULT_DIALOG_CONFIG, DialogSuperclass, getEnumValues } from '@vality/matez';
-import { Observable, ReplaySubject, combineLatest } from 'rxjs';
-import { first, map } from 'rxjs/operators';
-
import { OrganizationsDictionaryService } from '@dsh/app/api/organizations';
import { ROLE_ACCESS_GROUPS, RoleAccessGroup } from '@dsh/app/auth';
import { RoleId } from '@dsh/app/auth/types/role-id';
@@ -19,6 +18,8 @@ import {
} from '@dsh/app/shared/components/organization-roles/utils/sort-role-ids';
import { NestedTableColumn, NestedTableNode } from '@dsh/components/nested-table';
+import { DEFAULT_DIALOG_CONFIG, DialogSuperclass, getEnumValues } from '@vality/matez';
+
import { RoleAccessesDictionaryService } from './services/role-accesses-dictionary.service';
@Component({
diff --git a/src/app/sections/organization-section/organization-details/change-roles-table/components/select-role-dialog/services/role-accesses-dictionary.service.ts b/src/app/sections/organization-section/organization-details/change-roles-table/components/select-role-dialog/services/role-accesses-dictionary.service.ts
index 998b16380..c523750cb 100644
--- a/src/app/sections/organization-section/organization-details/change-roles-table/components/select-role-dialog/services/role-accesses-dictionary.service.ts
+++ b/src/app/sections/organization-section/organization-details/change-roles-table/components/select-role-dialog/services/role-accesses-dictionary.service.ts
@@ -1,8 +1,9 @@
-import { Injectable } from '@angular/core';
-import { TranslocoService } from '@jsverse/transloco';
import { map } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
import { RoleAccessName } from '@dsh/app/auth';
+import { TranslocoService } from '@jsverse/transloco';
+
@Injectable({
providedIn: 'root',
diff --git a/src/app/sections/organization-section/organization-details/invitations/components/create-invitation-dialog/create-invitation-dialog.component.ts b/src/app/sections/organization-section/organization-details/invitations/components/create-invitation-dialog/create-invitation-dialog.component.ts
index 3ccbe55ce..d10fb790c 100644
--- a/src/app/sections/organization-section/organization-details/invitations/components/create-invitation-dialog/create-invitation-dialog.component.ts
+++ b/src/app/sections/organization-section/organization-details/invitations/components/create-invitation-dialog/create-invitation-dialog.component.ts
@@ -1,16 +1,17 @@
+import { BehaviorSubject } from 'rxjs';
+
import { ChangeDetectionStrategy, Component, DestroyRef, Inject } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { FormBuilder, Validators } from '@angular/forms';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { InviteeContact, MemberRole } from '@vality/swag-organizations';
-import { BehaviorSubject } from 'rxjs';
-
import { InvitationsService } from '@dsh/app/api/organizations';
import { BaseDialogResponseStatus } from '@dsh/app/shared/components/dialog/base-dialog';
import { ErrorService } from '@dsh/app/shared/services/error';
import { NotificationService } from '@dsh/app/shared/services/notification';
import { inProgressTo } from '@dsh/utils';
+import { InviteeContact, MemberRole } from '@vality/swag-organizations';
+
import { CreateInvitationDialogData } from './types/create-invitation-dialog-data';
@Component({
diff --git a/src/app/sections/organization-section/organization-details/invitations/components/invitation/invitation.component.ts b/src/app/sections/organization-section/organization-details/invitations/components/invitation/invitation.component.ts
index f77df4888..5489ec82f 100644
--- a/src/app/sections/organization-section/organization-details/invitations/components/invitation/invitation.component.ts
+++ b/src/app/sections/organization-section/organization-details/invitations/components/invitation/invitation.component.ts
@@ -1,3 +1,5 @@
+import { filter, switchMap } from 'rxjs/operators';
+
import {
ChangeDetectionStrategy,
Component,
@@ -8,15 +10,14 @@ import {
} from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { MatDialog } from '@angular/material/dialog';
-import { DialogResponse, DialogResponseStatus } from '@vality/matez';
-import { Invitation, Organization, RevokeInvitationRequest } from '@vality/swag-organizations';
-import { filter, switchMap } from 'rxjs/operators';
-
import { InvitationsService } from '@dsh/app/api/organizations';
import { ErrorService, NotificationService } from '@dsh/app/shared';
import { ConfirmActionDialogComponent } from '@dsh/components/popups';
import { ignoreBeforeCompletion } from '@dsh/utils';
+import { DialogResponse, DialogResponseStatus } from '@vality/matez';
+import { Invitation, Organization, RevokeInvitationRequest } from '@vality/swag-organizations';
+
@Component({
selector: 'dsh-invitation',
templateUrl: 'invitation.component.html',
diff --git a/src/app/sections/organization-section/organization-details/invitations/components/invitations-list/invitations-list.component.ts b/src/app/sections/organization-section/organization-details/invitations/components/invitations-list/invitations-list.component.ts
index 0cda29636..61a799952 100644
--- a/src/app/sections/organization-section/organization-details/invitations/components/invitations-list/invitations-list.component.ts
+++ b/src/app/sections/organization-section/organization-details/invitations/components/invitations-list/invitations-list.component.ts
@@ -1,4 +1,5 @@
import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
+
import { Invitation, Organization } from '@vality/swag-organizations';
import { InvitationsExpandedIdManager } from '../../services/invitations-expanded-id-manager/invitations-expanded-id-manager.service';
diff --git a/src/app/sections/organization-section/organization-details/invitations/invitations.component.ts b/src/app/sections/organization-section/organization-details/invitations/invitations.component.ts
index c9cc31418..976deb60d 100644
--- a/src/app/sections/organization-section/organization-details/invitations/invitations.component.ts
+++ b/src/app/sections/organization-section/organization-details/invitations/invitations.component.ts
@@ -1,9 +1,9 @@
+import { filter, first, shareReplay, switchMap } from 'rxjs/operators';
+
import { ChangeDetectionStrategy, Component, DestroyRef, Inject } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { MatDialog } from '@angular/material/dialog';
import { ActivatedRoute } from '@angular/router';
-import { filter, first, shareReplay, switchMap } from 'rxjs/operators';
-
import { OrgsService } from '@dsh/app/api/organizations';
import { DIALOG_CONFIG, DialogConfig } from '@dsh/app/sections/tokens';
import { BaseDialogResponseStatus } from '@dsh/app/shared/components/dialog/base-dialog';
diff --git a/src/app/sections/organization-section/organization-details/invitations/invitations.module.ts b/src/app/sections/organization-section/organization-details/invitations/invitations.module.ts
index 6b9a88f0c..b9a604b83 100644
--- a/src/app/sections/organization-section/organization-details/invitations/invitations.module.ts
+++ b/src/app/sections/organization-section/organization-details/invitations/invitations.module.ts
@@ -1,3 +1,5 @@
+import { FlexModule, GridModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
@@ -8,9 +10,6 @@ import { MatDividerModule } from '@angular/material/divider';
import { MatInputModule } from '@angular/material/input';
import { MatRadioModule } from '@angular/material/radio';
import { MatMomentDateModule } from '@angular/material-moment-adapter';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexModule, GridModule } from 'ng-flex-layout';
-
import { DialogModule } from '@dsh/app/shared/components/dialog';
import { OrganizationRolesModule } from '@dsh/app/shared/components/organization-roles';
import { EmptyModule } from '@dsh/components/empty';
@@ -20,6 +19,7 @@ import { AccordionModule, CardModule, DetailsItemModule, RowModule } from '@dsh/
import { ScrollUpModule } from '@dsh/components/navigation';
import { NestedTableModule } from '@dsh/components/nested-table';
import { ShowMorePanelModule } from '@dsh/components/show-more-panel';
+import { TranslocoModule } from '@jsverse/transloco';
import { ChangeRolesTableModule } from '../change-roles-table';
diff --git a/src/app/sections/organization-section/organization-details/invitations/services/fetch-invitations/fetch-invitations.service.ts b/src/app/sections/organization-section/organization-details/invitations/services/fetch-invitations/fetch-invitations.service.ts
index 7a213a1f2..67eb5799b 100644
--- a/src/app/sections/organization-section/organization-details/invitations/services/fetch-invitations/fetch-invitations.service.ts
+++ b/src/app/sections/organization-section/organization-details/invitations/services/fetch-invitations/fetch-invitations.service.ts
@@ -1,14 +1,15 @@
-import { DestroyRef, Injectable } from '@angular/core';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { ActivatedRoute } from '@angular/router';
-import { Invitation, InvitationStatusName } from '@vality/swag-organizations';
import { BehaviorSubject, defer, of } from 'rxjs';
import { catchError, pluck, shareReplay, switchMap, switchMapTo } from 'rxjs/operators';
+import { DestroyRef, Injectable } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { ActivatedRoute } from '@angular/router';
import { InvitationsService } from '@dsh/app/api/organizations';
import { mapToTimestamp, progress } from '@dsh/app/custom-operators';
import { ErrorService } from '@dsh/app/shared';
+import { Invitation, InvitationStatusName } from '@vality/swag-organizations';
+
@Injectable()
export class FetchInvitationsService {
invitations$ = defer(() => this.loadInvitations$).pipe(
diff --git a/src/app/sections/organization-section/organization-details/invitations/services/invitations-expanded-id-manager/invitations-expanded-id-manager.service.ts b/src/app/sections/organization-section/organization-details/invitations/services/invitations-expanded-id-manager/invitations-expanded-id-manager.service.ts
index cd3b3193a..e8e7c8323 100644
--- a/src/app/sections/organization-section/organization-details/invitations/services/invitations-expanded-id-manager/invitations-expanded-id-manager.service.ts
+++ b/src/app/sections/organization-section/organization-details/invitations/services/invitations-expanded-id-manager/invitations-expanded-id-manager.service.ts
@@ -1,9 +1,11 @@
+import { Observable } from 'rxjs';
+
import { Injectable } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
+import { ExpandedIdManager } from '@dsh/app/shared/services';
+
import { Invitation } from '@vality/swag-organizations';
-import { Observable } from 'rxjs';
-import { ExpandedIdManager } from '@dsh/app/shared/services';
import { FetchInvitationsService } from '../fetch-invitations/fetch-invitations.service';
diff --git a/src/app/sections/organization-section/organization-details/members/components/edit-roles-dialog/edit-roles-dialog.component.ts b/src/app/sections/organization-section/organization-details/members/components/edit-roles-dialog/edit-roles-dialog.component.ts
index 71a124a67..f48ee8362 100644
--- a/src/app/sections/organization-section/organization-details/members/components/edit-roles-dialog/edit-roles-dialog.component.ts
+++ b/src/app/sections/organization-section/organization-details/members/components/edit-roles-dialog/edit-roles-dialog.component.ts
@@ -1,13 +1,15 @@
-import { ChangeDetectionStrategy, Component, DestroyRef } from '@angular/core';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { DEFAULT_DIALOG_CONFIG, DialogSuperclass, progressTo } from '@vality/matez';
-import { MemberRole } from '@vality/swag-organizations';
import { BehaviorSubject, Subscription, defer, forkJoin, of } from 'rxjs';
import { catchError, map, shareReplay, switchMap } from 'rxjs/operators';
+import { ChangeDetectionStrategy, Component, DestroyRef } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { MembersService } from '@dsh/app/api/organizations';
import { ErrorService } from '@dsh/app/shared';
+import { DEFAULT_DIALOG_CONFIG, DialogSuperclass, progressTo } from '@vality/matez';
+import { MemberRole } from '@vality/swag-organizations';
+
+
import { EditRolesDialogData } from './types/edit-roles-dialog-data';
@Component({
diff --git a/src/app/sections/organization-section/organization-details/members/components/member/member.component.ts b/src/app/sections/organization-section/organization-details/members/components/member/member.component.ts
index c792d450f..a9b1ccbee 100644
--- a/src/app/sections/organization-section/organization-details/members/components/member/member.component.ts
+++ b/src/app/sections/organization-section/organization-details/members/components/member/member.component.ts
@@ -1,3 +1,5 @@
+import { filter, switchMap } from 'rxjs/operators';
+
import {
ChangeDetectionStrategy,
Component,
@@ -8,16 +10,15 @@ import {
Output,
} from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { ComponentChanges, DialogResponseStatus, DialogService } from '@vality/matez';
-import { Member, Organization } from '@vality/swag-organizations';
-import { filter, switchMap } from 'rxjs/operators';
-
import { MembersService } from '@dsh/app/api/organizations';
import { ErrorService, NotificationService } from '@dsh/app/shared';
import { OrganizationManagementService } from '@dsh/app/shared/services/organization-management/organization-management.service';
import { ConfirmActionDialogComponent } from '@dsh/components/popups';
import { ignoreBeforeCompletion } from '@dsh/utils';
+import { ComponentChanges, DialogResponseStatus, DialogService } from '@vality/matez';
+import { Member, Organization } from '@vality/swag-organizations';
+
import { EditRolesDialogComponent } from '../edit-roles-dialog/edit-roles-dialog.component';
@Component({
diff --git a/src/app/sections/organization-section/organization-details/members/components/members-list/members-list.component.ts b/src/app/sections/organization-section/organization-details/members/components/members-list/members-list.component.ts
index d553738b0..eb2e059f6 100644
--- a/src/app/sections/organization-section/organization-details/members/components/members-list/members-list.component.ts
+++ b/src/app/sections/organization-section/organization-details/members/components/members-list/members-list.component.ts
@@ -1,4 +1,5 @@
import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
+
import { Member, Organization } from '@vality/swag-organizations';
import { MembersExpandedIdManager } from '../../services/members-expanded-id-manager/members-expanded-id-manager.service';
diff --git a/src/app/sections/organization-section/organization-details/members/members.component.ts b/src/app/sections/organization-section/organization-details/members/members.component.ts
index 000aa6f63..870146de8 100644
--- a/src/app/sections/organization-section/organization-details/members/members.component.ts
+++ b/src/app/sections/organization-section/organization-details/members/members.component.ts
@@ -1,8 +1,8 @@
+import { shareReplay, switchMap } from 'rxjs/operators';
+
import { ChangeDetectionStrategy, Component, DestroyRef } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { ActivatedRoute } from '@angular/router';
-import { shareReplay, switchMap } from 'rxjs/operators';
-
import { OrgsService } from '@dsh/app/api/organizations';
import { FetchMembersService } from './services/fetch-members/fetch-members.service';
diff --git a/src/app/sections/organization-section/organization-details/members/members.module.ts b/src/app/sections/organization-section/organization-details/members/members.module.ts
index 5a696dbb0..ca58dc441 100644
--- a/src/app/sections/organization-section/organization-details/members/members.module.ts
+++ b/src/app/sections/organization-section/organization-details/members/members.module.ts
@@ -1,3 +1,5 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
@@ -7,9 +9,6 @@ import { MatDividerModule } from '@angular/material/divider';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatInputModule } from '@angular/material/input';
import { MatSnackBarModule } from '@angular/material/snack-bar';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { OrganizationsModule as OrganizationsAPIModule } from '@dsh/app/api/organizations';
import { ErrorModule, NotificationModule } from '@dsh/app/shared';
import { BaseDialogModule } from '@dsh/app/shared/components/dialog/base-dialog';
@@ -20,6 +19,7 @@ import { AccordionModule, DetailsItemModule, LayoutModule } from '@dsh/component
import { ScrollUpModule } from '@dsh/components/navigation';
import { NavigationLinkModule } from '@dsh/components/navigation-link';
import { ShowMorePanelModule } from '@dsh/components/show-more-panel';
+import { TranslocoModule } from '@jsverse/transloco';
import { OrganizationRolesModule } from '../../../../shared/components/organization-roles';
import { ChangeRolesTableModule } from '../change-roles-table';
diff --git a/src/app/sections/organization-section/organization-details/members/services/fetch-members/fetch-members.service.ts b/src/app/sections/organization-section/organization-details/members/services/fetch-members/fetch-members.service.ts
index cd8ab73dd..f4a363d3c 100644
--- a/src/app/sections/organization-section/organization-details/members/services/fetch-members/fetch-members.service.ts
+++ b/src/app/sections/organization-section/organization-details/members/services/fetch-members/fetch-members.service.ts
@@ -1,14 +1,15 @@
-import { DestroyRef, Injectable } from '@angular/core';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { ActivatedRoute } from '@angular/router';
-import { Member } from '@vality/swag-organizations';
import { BehaviorSubject, defer, of } from 'rxjs';
import { catchError, pluck, shareReplay, switchMap, switchMapTo } from 'rxjs/operators';
+import { DestroyRef, Injectable } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { ActivatedRoute } from '@angular/router';
import { MembersService } from '@dsh/app/api/organizations';
import { mapToTimestamp, progress } from '@dsh/app/custom-operators';
import { ErrorService } from '@dsh/app/shared';
+import { Member } from '@vality/swag-organizations';
+
@Injectable()
export class FetchMembersService {
members$ = defer(() => this.loadMembers$).pipe(
diff --git a/src/app/sections/organization-section/organization-details/members/services/members-expanded-id-manager/members-expanded-id-manager.service.ts b/src/app/sections/organization-section/organization-details/members/services/members-expanded-id-manager/members-expanded-id-manager.service.ts
index 997627d5c..1a1cb0b06 100644
--- a/src/app/sections/organization-section/organization-details/members/services/members-expanded-id-manager/members-expanded-id-manager.service.ts
+++ b/src/app/sections/organization-section/organization-details/members/services/members-expanded-id-manager/members-expanded-id-manager.service.ts
@@ -1,9 +1,11 @@
+import { Observable } from 'rxjs';
+
import { Injectable } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
+import { ExpandedIdManager } from '@dsh/app/shared/services';
+
import { Member } from '@vality/swag-organizations';
-import { Observable } from 'rxjs';
-import { ExpandedIdManager } from '@dsh/app/shared/services';
import { FetchMembersService } from '../fetch-members/fetch-members.service';
diff --git a/src/app/sections/organization-section/organization-details/organization-details.component.ts b/src/app/sections/organization-section/organization-details/organization-details.component.ts
index 9f3fd34ab..94c56b726 100644
--- a/src/app/sections/organization-section/organization-details/organization-details.component.ts
+++ b/src/app/sections/organization-section/organization-details/organization-details.component.ts
@@ -1,10 +1,11 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { TranslocoService } from '@jsverse/transloco';
import { Observable } from 'rxjs';
import { shareReplay, switchMap } from 'rxjs/operators';
+import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
import { OrgsService } from '@dsh/app/api/organizations';
+import { TranslocoService } from '@jsverse/transloco';
+
@Component({
selector: 'dsh-organization-details',
diff --git a/src/app/sections/organization-section/organization-details/organization-details.module.ts b/src/app/sections/organization-section/organization-details/organization-details.module.ts
index 4240bc16c..2b51aa730 100644
--- a/src/app/sections/organization-section/organization-details/organization-details.module.ts
+++ b/src/app/sections/organization-section/organization-details/organization-details.module.ts
@@ -1,12 +1,12 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatTabsModule } from '@angular/material/tabs';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { OrganizationManagementModule } from '@dsh/app/shared/services/organization-management/organization-management.module';
import { IndicatorsModule } from '@dsh/components/indicators';
import { BreadcrumbModule } from '@dsh/components/navigation';
+import { TranslocoModule } from '@jsverse/transloco';
import { OrganizationDetailsRoutingModule } from './organization-details-routing.module';
import { OrganizationDetailsComponent } from './organization-details.component';
diff --git a/src/app/sections/organization-section/organizations/components/organization/organization.component.ts b/src/app/sections/organization-section/organizations/components/organization/organization.component.ts
index c8acb3a83..ab59d0641 100644
--- a/src/app/sections/organization-section/organizations/components/organization/organization.component.ts
+++ b/src/app/sections/organization-section/organizations/components/organization/organization.component.ts
@@ -1,3 +1,6 @@
+import isNil from 'lodash-es/isNil';
+import { filter, pluck, switchMap } from 'rxjs/operators';
+
import {
ChangeDetectionStrategy,
Component,
@@ -9,11 +12,6 @@ import {
} from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { MatDialog } from '@angular/material/dialog';
-import { ComponentChanges, DialogResponseStatus } from '@vality/matez';
-import { Organization } from '@vality/swag-organizations';
-import isNil from 'lodash-es/isNil';
-import { filter, pluck, switchMap } from 'rxjs/operators';
-
import { OrgsService } from '@dsh/app/api/organizations';
import { BaseDialogResponseStatus } from '@dsh/app/shared/components/dialog/base-dialog';
import {
@@ -26,6 +24,9 @@ import { OrganizationManagementService } from '@dsh/app/shared/services/organiza
import { ConfirmActionDialogComponent } from '@dsh/components/popups';
import { ignoreBeforeCompletion } from '@dsh/utils';
+import { ComponentChanges, DialogResponseStatus } from '@vality/matez';
+import { Organization } from '@vality/swag-organizations';
+
import { RenameOrganizationDialogComponent } from '../rename-organization-dialog/rename-organization-dialog.component';
import { RenameOrganizationDialogData } from '../rename-organization-dialog/types/rename-organization-dialog-data';
diff --git a/src/app/sections/organization-section/organizations/components/organizations-list/organizations-list.component.ts b/src/app/sections/organization-section/organizations/components/organizations-list/organizations-list.component.ts
index e206b7f7d..962a8b80a 100644
--- a/src/app/sections/organization-section/organizations/components/organizations-list/organizations-list.component.ts
+++ b/src/app/sections/organization-section/organizations/components/organizations-list/organizations-list.component.ts
@@ -1,4 +1,5 @@
import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
+
import { Organization } from '@vality/swag-organizations';
import { OrganizationsExpandedIdManager } from '../../services/organizations-expanded-id-manager/organizations-expanded-id-manager.service';
diff --git a/src/app/sections/organization-section/organizations/components/rename-organization-dialog/rename-organization-dialog.component.ts b/src/app/sections/organization-section/organizations/components/rename-organization-dialog/rename-organization-dialog.component.ts
index fb163e610..d251f08c4 100644
--- a/src/app/sections/organization-section/organizations/components/rename-organization-dialog/rename-organization-dialog.component.ts
+++ b/src/app/sections/organization-section/organizations/components/rename-organization-dialog/rename-organization-dialog.component.ts
@@ -1,15 +1,16 @@
+import { BehaviorSubject } from 'rxjs';
+
import { ChangeDetectionStrategy, Component, DestroyRef, Inject } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { FormBuilder } from '@angular/forms';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { FormGroupByValue } from '@vality/matez';
-import { BehaviorSubject } from 'rxjs';
-
import { OrgsService } from '@dsh/app/api/organizations';
import { BaseDialogResponseStatus } from '@dsh/app/shared/components/dialog/base-dialog';
import { ErrorService, NotificationService } from '@dsh/app/shared/services';
import { inProgressTo } from '@dsh/utils';
+import { FormGroupByValue } from '@vality/matez';
+
import { RenameOrganizationDialogData } from './types/rename-organization-dialog-data';
@Component({
diff --git a/src/app/sections/organization-section/organizations/organizations.component.ts b/src/app/sections/organization-section/organizations/organizations.component.ts
index df7cd1421..38d7b123e 100644
--- a/src/app/sections/organization-section/organizations/organizations.component.ts
+++ b/src/app/sections/organization-section/organizations/organizations.component.ts
@@ -1,5 +1,4 @@
import { ChangeDetectionStrategy, Component, OnInit, isDevMode } from '@angular/core';
-
import { FetchOrganizationsService } from '@dsh/app/shared/services/fetch-organizations';
@Component({
diff --git a/src/app/sections/organization-section/organizations/organizations.module.ts b/src/app/sections/organization-section/organizations/organizations.module.ts
index f3783b40d..303716a2f 100644
--- a/src/app/sections/organization-section/organizations/organizations.module.ts
+++ b/src/app/sections/organization-section/organizations/organizations.module.ts
@@ -1,3 +1,5 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
@@ -7,9 +9,6 @@ import { MatDividerModule } from '@angular/material/divider';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatInputModule } from '@angular/material/input';
import { MatSnackBarModule } from '@angular/material/snack-bar';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { OrganizationsModule as OrganizationsAPIModule } from '@dsh/app/api/organizations';
import { ErrorModule, NotificationModule } from '@dsh/app/shared';
import { DialogModule } from '@dsh/app/shared/components/dialog';
@@ -22,6 +21,7 @@ import { AccordionModule, DetailsItemModule, LayoutModule } from '@dsh/component
import { ScrollUpModule } from '@dsh/components/navigation';
import { NavigationLinkModule } from '@dsh/components/navigation-link';
import { ShowMorePanelModule } from '@dsh/components/show-more-panel';
+import { TranslocoModule } from '@jsverse/transloco';
import { OrganizationComponent } from './components/organization/organization.component';
import { OrganizationsListComponent } from './components/organizations-list/organizations-list.component';
diff --git a/src/app/sections/organization-section/organizations/services/organizations-expanded-id-manager/organizations-expanded-id-manager.service.ts b/src/app/sections/organization-section/organizations/services/organizations-expanded-id-manager/organizations-expanded-id-manager.service.ts
index 174482a75..6ce9fd2ad 100644
--- a/src/app/sections/organization-section/organizations/services/organizations-expanded-id-manager/organizations-expanded-id-manager.service.ts
+++ b/src/app/sections/organization-section/organizations/services/organizations-expanded-id-manager/organizations-expanded-id-manager.service.ts
@@ -1,11 +1,12 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { Organization } from '@vality/swag-organizations';
import { Observable } from 'rxjs';
+import { Injectable } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
import { ExpandedIdManager } from '@dsh/app/shared/services';
import { FetchOrganizationsService } from '@dsh/app/shared/services/fetch-organizations';
+import { Organization } from '@vality/swag-organizations';
+
@Injectable()
export class OrganizationsExpandedIdManager extends ExpandedIdManager {
constructor(
diff --git a/src/app/sections/page-not-found/page-not-found.module.ts b/src/app/sections/page-not-found/page-not-found.module.ts
index ec6ef9ad5..385b742d9 100644
--- a/src/app/sections/page-not-found/page-not-found.module.ts
+++ b/src/app/sections/page-not-found/page-not-found.module.ts
@@ -1,8 +1,9 @@
+import { FlexModule } from 'ng-flex-layout';
+
import { NgModule } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
import { RouterModule } from '@angular/router';
import { TranslocoModule } from '@jsverse/transloco';
-import { FlexModule } from 'ng-flex-layout';
import { PageNotFoundRoutingModule } from './page-not-found-routing.module';
import { PageNotFoundComponent } from './page-not-found.component';
diff --git a/src/app/sections/payment-section/analytics/analytics-routing.module.ts b/src/app/sections/payment-section/analytics/analytics-routing.module.ts
index 2cc8f9bb4..be1da4738 100644
--- a/src/app/sections/payment-section/analytics/analytics-routing.module.ts
+++ b/src/app/sections/payment-section/analytics/analytics-routing.module.ts
@@ -1,6 +1,5 @@
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
-
import { RoleAccessName, createPrivateRoute } from '@dsh/app/auth';
import { AnalyticsComponent } from './analytics.component';
diff --git a/src/app/sections/payment-section/analytics/analytics-search-filters/analytics-search-filters.component.ts b/src/app/sections/payment-section/analytics/analytics-search-filters/analytics-search-filters.component.ts
index ec7a5fe9f..de69856e7 100644
--- a/src/app/sections/payment-section/analytics/analytics-search-filters/analytics-search-filters.component.ts
+++ b/src/app/sections/payment-section/analytics/analytics-search-filters/analytics-search-filters.component.ts
@@ -1,3 +1,6 @@
+import { Observable, combineLatest, defer } from 'rxjs';
+import { first, map, pluck, shareReplay } from 'rxjs/operators';
+
import {
ChangeDetectionStrategy,
Component,
@@ -10,11 +13,6 @@ import {
} from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { FormBuilder } from '@angular/forms';
-import { ComponentChanges } from '@vality/matez';
-import { Shop } from '@vality/swag-payments';
-import { Observable, combineLatest, defer } from 'rxjs';
-import { first, map, pluck, shareReplay } from 'rxjs/operators';
-
import {
DateRangeWithPreset,
Preset,
@@ -22,6 +20,10 @@ import {
} from '@dsh/components/date-range-filter';
import { getFormValueChanges } from '@dsh/utils';
+import { ComponentChanges } from '@vality/matez';
+import { Shop } from '@vality/swag-payments';
+
+
import { RealmShopsService } from '../../services';
import { shopsToCurrencies } from './shops-to-currencies';
diff --git a/src/app/sections/payment-section/analytics/analytics-search-filters/analytics-search-filters.module.ts b/src/app/sections/payment-section/analytics/analytics-search-filters/analytics-search-filters.module.ts
index fc17c56a1..13cfa74e6 100644
--- a/src/app/sections/payment-section/analytics/analytics-search-filters/analytics-search-filters.module.ts
+++ b/src/app/sections/payment-section/analytics/analytics-search-filters/analytics-search-filters.module.ts
@@ -1,8 +1,8 @@
+import { FlexLayoutModule, FlexModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
-import { FlexLayoutModule, FlexModule } from 'ng-flex-layout';
-
import { CurrencyFilterModule } from '@dsh/app/shared/components/filters/currency-filter';
import { ShopsFilterModule } from '@dsh/app/shared/components/filters/shops-filter';
import { DateRangeFilterModule } from '@dsh/components/date-range-filter';
diff --git a/src/app/sections/payment-section/analytics/analytics.component.ts b/src/app/sections/payment-section/analytics/analytics.component.ts
index 6c59c396d..6393ecb00 100644
--- a/src/app/sections/payment-section/analytics/analytics.component.ts
+++ b/src/app/sections/payment-section/analytics/analytics.component.ts
@@ -1,10 +1,11 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { QueryParamsService } from '@vality/matez';
import { ReplaySubject, combineLatest } from 'rxjs';
import { map } from 'rxjs/operators';
+import { ChangeDetectionStrategy, Component } from '@angular/core';
import { SpinnerType } from '@dsh/components/indicators';
+import { QueryParamsService } from '@vality/matez';
+
import { PaymentInstitutionRealmService } from '../services';
import { Filters } from './analytics-search-filters/analytics-search-filters.component';
diff --git a/src/app/sections/payment-section/analytics/analytics.module.ts b/src/app/sections/payment-section/analytics/analytics.module.ts
index 0b25a501a..10924de9a 100644
--- a/src/app/sections/payment-section/analytics/analytics.module.ts
+++ b/src/app/sections/payment-section/analytics/analytics.module.ts
@@ -1,14 +1,14 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { MatDialogModule } from '@angular/material/dialog';
import { MatSelectModule } from '@angular/material/select';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { BarChartModule, DonutChartModule } from '@dsh/components/charts';
import { SpinnerModule } from '@dsh/components/indicators';
import { LayoutModule } from '@dsh/components/layout';
+import { TranslocoModule } from '@jsverse/transloco';
import { AnalyticsRoutingModule } from './analytics-routing.module';
import { AnalyticsSearchFiltersModule } from './analytics-search-filters';
diff --git a/src/app/sections/payment-section/analytics/average-payment/average-payment.component.ts b/src/app/sections/payment-section/analytics/average-payment/average-payment.component.ts
index 4ac2fb161..16506a6d9 100644
--- a/src/app/sections/payment-section/analytics/average-payment/average-payment.component.ts
+++ b/src/app/sections/payment-section/analytics/average-payment/average-payment.component.ts
@@ -1,5 +1,4 @@
import { ChangeDetectionStrategy, Component, Input, OnChanges, SimpleChanges } from '@angular/core';
-
import { SpinnerType } from '@dsh/components/indicators';
import { SearchParams } from '../search-params';
diff --git a/src/app/sections/payment-section/analytics/average-payment/average-payment.module.ts b/src/app/sections/payment-section/analytics/average-payment/average-payment.module.ts
index e629b7091..4aae3c26c 100644
--- a/src/app/sections/payment-section/analytics/average-payment/average-payment.module.ts
+++ b/src/app/sections/payment-section/analytics/average-payment/average-payment.module.ts
@@ -1,11 +1,11 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatSelectModule } from '@angular/material/select';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { SpinnerModule } from '@dsh/components/indicators';
import { CardModule } from '@dsh/components/layout';
+import { TranslocoModule } from '@jsverse/transloco';
import { PercentDifferenceModule } from '../percent-difference';
import { StatItemModule } from '../stat-item/stat-item.module';
diff --git a/src/app/sections/payment-section/analytics/average-payment/average-payment.service.ts b/src/app/sections/payment-section/analytics/average-payment/average-payment.service.ts
index e20b899d1..bf24f04c8 100644
--- a/src/app/sections/payment-section/analytics/average-payment/average-payment.service.ts
+++ b/src/app/sections/payment-section/analytics/average-payment/average-payment.service.ts
@@ -1,7 +1,7 @@
-import { Injectable } from '@angular/core';
import { BehaviorSubject, ReplaySubject, combineLatest, defer, forkJoin } from 'rxjs';
import { distinctUntilChanged, map, shareReplay, switchMap } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
import { AnalyticsService } from '@dsh/app/api/anapi';
import { attach, distinctUntilChangedDeep, errorTo, inProgressFrom, progressTo } from '@dsh/utils';
diff --git a/src/app/sections/payment-section/analytics/bar-chart-item/bar-chart-item.component.ts b/src/app/sections/payment-section/analytics/bar-chart-item/bar-chart-item.component.ts
index 7a4436d98..6093190e5 100644
--- a/src/app/sections/payment-section/analytics/bar-chart-item/bar-chart-item.component.ts
+++ b/src/app/sections/payment-section/analytics/bar-chart-item/bar-chart-item.component.ts
@@ -1,5 +1,4 @@
import { ChangeDetectionStrategy, Component, Input, OnChanges, SimpleChanges } from '@angular/core';
-
import { SpinnerType } from '@dsh/components/indicators';
import { ChartData } from '../utils';
diff --git a/src/app/sections/payment-section/analytics/bar-chart-item/bar-chart-item.module.ts b/src/app/sections/payment-section/analytics/bar-chart-item/bar-chart-item.module.ts
index eb7809a32..0e9a53ff8 100644
--- a/src/app/sections/payment-section/analytics/bar-chart-item/bar-chart-item.module.ts
+++ b/src/app/sections/payment-section/analytics/bar-chart-item/bar-chart-item.module.ts
@@ -1,11 +1,11 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { TranslocoModule } from '@jsverse/transloco';
import { FlexLayoutModule } from 'ng-flex-layout';
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
import { BarChartModule } from '@dsh/components/charts';
import { SpinnerModule } from '@dsh/components/indicators';
import { CardModule } from '@dsh/components/layout';
+import { TranslocoModule } from '@jsverse/transloco';
import { BarChartItemComponent } from './bar-chart-item.component';
diff --git a/src/app/sections/payment-section/analytics/donut-chart-item/donut-chart-item.component.ts b/src/app/sections/payment-section/analytics/donut-chart-item/donut-chart-item.component.ts
index 32c09e0cc..667ef4756 100644
--- a/src/app/sections/payment-section/analytics/donut-chart-item/donut-chart-item.component.ts
+++ b/src/app/sections/payment-section/analytics/donut-chart-item/donut-chart-item.component.ts
@@ -7,7 +7,6 @@ import {
Output,
SimpleChanges,
} from '@angular/core';
-
import { SpinnerType } from '@dsh/components/indicators';
import { DistributionChartData } from '../utils';
diff --git a/src/app/sections/payment-section/analytics/donut-chart-item/donut-chart-item.module.ts b/src/app/sections/payment-section/analytics/donut-chart-item/donut-chart-item.module.ts
index d9c370ae7..9114391e6 100644
--- a/src/app/sections/payment-section/analytics/donut-chart-item/donut-chart-item.module.ts
+++ b/src/app/sections/payment-section/analytics/donut-chart-item/donut-chart-item.module.ts
@@ -1,12 +1,12 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { TranslocoModule } from '@jsverse/transloco';
import { FlexModule } from 'ng-flex-layout';
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
import { BarChartModule } from '@dsh/components/charts/bar-chart';
import { DonutChartModule } from '@dsh/components/charts/donut-chart';
import { BootstrapIconModule, SpinnerModule } from '@dsh/components/indicators';
import { CardModule } from '@dsh/components/layout';
+import { TranslocoModule } from '@jsverse/transloco';
import { DonutChartItemComponent } from './donut-chart-item.component';
diff --git a/src/app/sections/payment-section/analytics/payment-split-amount/payment-split-amount.component.ts b/src/app/sections/payment-section/analytics/payment-split-amount/payment-split-amount.component.ts
index f5b60b3a8..e00d668b5 100644
--- a/src/app/sections/payment-section/analytics/payment-split-amount/payment-split-amount.component.ts
+++ b/src/app/sections/payment-section/analytics/payment-split-amount/payment-split-amount.component.ts
@@ -6,7 +6,6 @@ import {
OnChanges,
SimpleChanges,
} from '@angular/core';
-
import { SpinnerType } from '@dsh/components/indicators';
import { CHARTS_THEME, ChartsThemeProvider } from '../charts-theme';
diff --git a/src/app/sections/payment-section/analytics/payment-split-amount/payment-split-amount.module.ts b/src/app/sections/payment-section/analytics/payment-split-amount/payment-split-amount.module.ts
index 78ad8e1be..cff093527 100644
--- a/src/app/sections/payment-section/analytics/payment-split-amount/payment-split-amount.module.ts
+++ b/src/app/sections/payment-section/analytics/payment-split-amount/payment-split-amount.module.ts
@@ -1,11 +1,11 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { TranslocoModule } from '@jsverse/transloco';
import { FlexModule } from 'ng-flex-layout';
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
import { BarChartModule } from '@dsh/components/charts/bar-chart';
import { SpinnerModule } from '@dsh/components/indicators';
import { CardModule } from '@dsh/components/layout';
+import { TranslocoModule } from '@jsverse/transloco';
import { BarChartItemModule } from '../bar-chart-item/bar-chart-item.module';
diff --git a/src/app/sections/payment-section/analytics/payment-split-amount/payment-split-amount.service.ts b/src/app/sections/payment-section/analytics/payment-split-amount/payment-split-amount.service.ts
index 659d25fa4..897f1330b 100644
--- a/src/app/sections/payment-section/analytics/payment-split-amount/payment-split-amount.service.ts
+++ b/src/app/sections/payment-section/analytics/payment-split-amount/payment-split-amount.service.ts
@@ -1,7 +1,7 @@
-import { Injectable } from '@angular/core';
import { BehaviorSubject, ReplaySubject, combineLatest, defer, forkJoin, of } from 'rxjs';
import { distinctUntilChanged, map, shareReplay, switchMap } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
import { AnalyticsService } from '@dsh/app/api/anapi';
import { attach, distinctUntilChangedDeep, errorTo, inProgressFrom, progressTo } from '@dsh/utils';
diff --git a/src/app/sections/payment-section/analytics/payment-split-amount/prepare-split-amount.ts b/src/app/sections/payment-section/analytics/payment-split-amount/prepare-split-amount.ts
index 638928fc6..a793275fb 100644
--- a/src/app/sections/payment-section/analytics/payment-split-amount/prepare-split-amount.ts
+++ b/src/app/sections/payment-section/analytics/payment-split-amount/prepare-split-amount.ts
@@ -1,7 +1,8 @@
-import { OffsetAmount, SplitAmountResult, SplitUnit } from '@vality/swag-anapi-v2';
import sortBy from 'lodash-es/sortBy';
import moment from 'moment';
+import { OffsetAmount, SplitAmountResult, SplitUnit } from '@vality/swag-anapi-v2';
+
import { getOffsets } from '../utils';
const fixExtraInterval = (offsetAmounts: OffsetAmount[]): OffsetAmount[] =>
diff --git a/src/app/sections/payment-section/analytics/payment-split-amount/split-amount-to-chart-data.ts b/src/app/sections/payment-section/analytics/payment-split-amount/split-amount-to-chart-data.ts
index 859ed6db9..45bf6a770 100644
--- a/src/app/sections/payment-section/analytics/payment-split-amount/split-amount-to-chart-data.ts
+++ b/src/app/sections/payment-section/analytics/payment-split-amount/split-amount-to-chart-data.ts
@@ -1,6 +1,7 @@
+import moment from 'moment';
+
import { toMajor } from '@vality/matez';
import { OffsetAmount, SplitAmountResult, SplitUnit } from '@vality/swag-anapi-v2';
-import moment from 'moment';
import { ChartData, Series, splitUnitToTimeFormat } from '../utils';
diff --git a/src/app/sections/payment-section/analytics/payment-split-count/payment-split-count.component.ts b/src/app/sections/payment-section/analytics/payment-split-count/payment-split-count.component.ts
index f04ea1929..5e4472837 100644
--- a/src/app/sections/payment-section/analytics/payment-split-count/payment-split-count.component.ts
+++ b/src/app/sections/payment-section/analytics/payment-split-count/payment-split-count.component.ts
@@ -1,7 +1,8 @@
import { ChangeDetectionStrategy, Component, Inject, Input, OnChanges } from '@angular/core';
+import { SpinnerType } from '@dsh/components/indicators';
+
import { ComponentChanges } from '@vality/matez';
-import { SpinnerType } from '@dsh/components/indicators';
import { CHARTS_THEME, ChartsThemeProvider } from '../charts-theme';
import { SearchParams } from '../search-params';
diff --git a/src/app/sections/payment-section/analytics/payment-split-count/payment-split-count.module.ts b/src/app/sections/payment-section/analytics/payment-split-count/payment-split-count.module.ts
index 82c5b8a87..681fafe34 100644
--- a/src/app/sections/payment-section/analytics/payment-split-count/payment-split-count.module.ts
+++ b/src/app/sections/payment-section/analytics/payment-split-count/payment-split-count.module.ts
@@ -1,11 +1,11 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { TranslocoModule } from '@jsverse/transloco';
import { FlexModule } from 'ng-flex-layout';
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
import { BarChartModule } from '@dsh/components/charts/bar-chart';
import { SpinnerModule } from '@dsh/components/indicators';
import { CardModule } from '@dsh/components/layout';
+import { TranslocoModule } from '@jsverse/transloco';
import { BarChartItemModule } from '../bar-chart-item/bar-chart-item.module';
diff --git a/src/app/sections/payment-section/analytics/payment-split-count/payment-split-count.service.ts b/src/app/sections/payment-section/analytics/payment-split-count/payment-split-count.service.ts
index e32e524a9..1c0a0d015 100644
--- a/src/app/sections/payment-section/analytics/payment-split-count/payment-split-count.service.ts
+++ b/src/app/sections/payment-section/analytics/payment-split-count/payment-split-count.service.ts
@@ -1,7 +1,7 @@
-import { Injectable } from '@angular/core';
import { BehaviorSubject, ReplaySubject, combineLatest, defer, forkJoin, of } from 'rxjs';
import { distinctUntilChanged, map, shareReplay, switchMap, withLatestFrom } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
import { AnalyticsService, AnapiDictionaryService } from '@dsh/app/api/anapi';
import { attach, distinctUntilChangedDeep, errorTo, inProgressFrom, progressTo } from '@dsh/utils';
diff --git a/src/app/sections/payment-section/analytics/payment-split-count/prepare-split-count.ts b/src/app/sections/payment-section/analytics/payment-split-count/prepare-split-count.ts
index 07ae461ab..091d9b9e4 100644
--- a/src/app/sections/payment-section/analytics/payment-split-count/prepare-split-count.ts
+++ b/src/app/sections/payment-section/analytics/payment-split-count/prepare-split-count.ts
@@ -1,7 +1,8 @@
-import { OffsetCount, SplitCountResult, SplitUnit, StatusOffsetCount } from '@vality/swag-anapi-v2';
import sortBy from 'lodash-es/sortBy';
import moment from 'moment';
+import { OffsetCount, SplitCountResult, SplitUnit, StatusOffsetCount } from '@vality/swag-anapi-v2';
+
import { getOffsets } from '../utils';
const STATUSES: StatusOffsetCount.StatusEnum[] = ['captured', 'cancelled', 'failed'];
diff --git a/src/app/sections/payment-section/analytics/payment-split-count/split-count-to-chart-data.ts b/src/app/sections/payment-section/analytics/payment-split-count/split-count-to-chart-data.ts
index a6d1f2da2..18dc5ca5c 100644
--- a/src/app/sections/payment-section/analytics/payment-split-count/split-count-to-chart-data.ts
+++ b/src/app/sections/payment-section/analytics/payment-split-count/split-count-to-chart-data.ts
@@ -1,7 +1,8 @@
-import { SplitCountResult, SplitUnit, StatusOffsetCount } from '@vality/swag-anapi-v2';
import sortBy from 'lodash-es/sortBy';
import moment from 'moment';
+import { SplitCountResult, SplitUnit, StatusOffsetCount } from '@vality/swag-anapi-v2';
+
import { ChartData, Series, splitUnitToTimeFormat } from '../utils';
const prepareOffsetCounts = (statusOffsetCounts: StatusOffsetCount[]): StatusOffsetCount[] =>
diff --git a/src/app/sections/payment-section/analytics/payments-amount/payments-amount.component.ts b/src/app/sections/payment-section/analytics/payments-amount/payments-amount.component.ts
index 51ebda24f..90413cd22 100644
--- a/src/app/sections/payment-section/analytics/payments-amount/payments-amount.component.ts
+++ b/src/app/sections/payment-section/analytics/payments-amount/payments-amount.component.ts
@@ -1,5 +1,4 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
-
import { SpinnerType } from '@dsh/components/indicators';
import { SearchParams } from '../search-params';
diff --git a/src/app/sections/payment-section/analytics/payments-amount/payments-amount.module.ts b/src/app/sections/payment-section/analytics/payments-amount/payments-amount.module.ts
index 9c56dabbd..5b61cd941 100644
--- a/src/app/sections/payment-section/analytics/payments-amount/payments-amount.module.ts
+++ b/src/app/sections/payment-section/analytics/payments-amount/payments-amount.module.ts
@@ -1,11 +1,11 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatSelectModule } from '@angular/material/select';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { SpinnerModule } from '@dsh/components/indicators';
import { CardModule } from '@dsh/components/layout';
+import { TranslocoModule } from '@jsverse/transloco';
import { PercentDifferenceModule } from '../percent-difference';
import { StatItemModule } from '../stat-item/stat-item.module';
diff --git a/src/app/sections/payment-section/analytics/payments-amount/payments-amount.service.ts b/src/app/sections/payment-section/analytics/payments-amount/payments-amount.service.ts
index 1f9b3ec50..177f728bd 100644
--- a/src/app/sections/payment-section/analytics/payments-amount/payments-amount.service.ts
+++ b/src/app/sections/payment-section/analytics/payments-amount/payments-amount.service.ts
@@ -1,7 +1,7 @@
-import { Injectable } from '@angular/core';
import { BehaviorSubject, ReplaySubject, combineLatest, defer, forkJoin } from 'rxjs';
import { distinctUntilChanged, map, shareReplay, switchMap } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
import { AnalyticsService } from '@dsh/app/api/anapi';
import { attach, distinctUntilChangedDeep, errorTo, inProgressFrom, progressTo } from '@dsh/utils';
diff --git a/src/app/sections/payment-section/analytics/payments-count/payments-count.component.ts b/src/app/sections/payment-section/analytics/payments-count/payments-count.component.ts
index e83942877..db7e3687d 100644
--- a/src/app/sections/payment-section/analytics/payments-count/payments-count.component.ts
+++ b/src/app/sections/payment-section/analytics/payments-count/payments-count.component.ts
@@ -1,5 +1,4 @@
import { ChangeDetectionStrategy, Component, Input, OnChanges, SimpleChanges } from '@angular/core';
-
import { SpinnerType } from '@dsh/components/indicators';
import { SearchParams } from '../search-params';
diff --git a/src/app/sections/payment-section/analytics/payments-count/payments-count.module.ts b/src/app/sections/payment-section/analytics/payments-count/payments-count.module.ts
index 4dd6ea2f4..70588c4f1 100644
--- a/src/app/sections/payment-section/analytics/payments-count/payments-count.module.ts
+++ b/src/app/sections/payment-section/analytics/payments-count/payments-count.module.ts
@@ -1,11 +1,11 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatSelectModule } from '@angular/material/select';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { SpinnerModule } from '@dsh/components/indicators';
import { CardModule } from '@dsh/components/layout';
+import { TranslocoModule } from '@jsverse/transloco';
import { PercentDifferenceModule } from '../percent-difference';
import { StatItemModule } from '../stat-item/stat-item.module';
diff --git a/src/app/sections/payment-section/analytics/payments-count/payments-count.service.ts b/src/app/sections/payment-section/analytics/payments-count/payments-count.service.ts
index 2903c9784..65e70beaf 100644
--- a/src/app/sections/payment-section/analytics/payments-count/payments-count.service.ts
+++ b/src/app/sections/payment-section/analytics/payments-count/payments-count.service.ts
@@ -1,7 +1,7 @@
-import { Injectable } from '@angular/core';
import { BehaviorSubject, ReplaySubject, combineLatest, defer, forkJoin } from 'rxjs';
import { distinctUntilChanged, map, shareReplay, switchMap } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
import { AnalyticsService } from '@dsh/app/api/anapi';
import { attach, distinctUntilChangedDeep, errorTo, inProgressFrom, progressTo } from '@dsh/utils';
diff --git a/src/app/sections/payment-section/analytics/payments-error-distribution/payments-error-distribution.component.ts b/src/app/sections/payment-section/analytics/payments-error-distribution/payments-error-distribution.component.ts
index bb77b88f1..0fa49cb68 100644
--- a/src/app/sections/payment-section/analytics/payments-error-distribution/payments-error-distribution.component.ts
+++ b/src/app/sections/payment-section/analytics/payments-error-distribution/payments-error-distribution.component.ts
@@ -7,7 +7,6 @@ import {
SimpleChanges,
ViewEncapsulation,
} from '@angular/core';
-
import { SpinnerType } from '@dsh/components/indicators';
import { CHARTS_THEME, ChartsThemeProvider } from '../charts-theme';
diff --git a/src/app/sections/payment-section/analytics/payments-error-distribution/payments-error-distribution.module.ts b/src/app/sections/payment-section/analytics/payments-error-distribution/payments-error-distribution.module.ts
index 811cad245..b5200447a 100644
--- a/src/app/sections/payment-section/analytics/payments-error-distribution/payments-error-distribution.module.ts
+++ b/src/app/sections/payment-section/analytics/payments-error-distribution/payments-error-distribution.module.ts
@@ -1,12 +1,12 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { TranslocoModule } from '@jsverse/transloco';
import { FlexModule } from 'ng-flex-layout';
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
import { BarChartModule } from '@dsh/components/charts/bar-chart';
import { DonutChartModule } from '@dsh/components/charts/donut-chart';
import { SpinnerModule } from '@dsh/components/indicators';
import { CardModule } from '@dsh/components/layout';
+import { TranslocoModule } from '@jsverse/transloco';
import { DonutChartItemModule } from '../donut-chart-item/donut-chart-item.module';
diff --git a/src/app/sections/payment-section/analytics/payments-error-distribution/payments-error-distribution.service.ts b/src/app/sections/payment-section/analytics/payments-error-distribution/payments-error-distribution.service.ts
index dd427e342..44cb046ce 100644
--- a/src/app/sections/payment-section/analytics/payments-error-distribution/payments-error-distribution.service.ts
+++ b/src/app/sections/payment-section/analytics/payments-error-distribution/payments-error-distribution.service.ts
@@ -1,7 +1,7 @@
-import { Injectable } from '@angular/core';
import { BehaviorSubject, ReplaySubject, combineLatest, defer } from 'rxjs';
import { map, pluck, shareReplay, switchMap } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
import { AnalyticsService, AnapiDictionaryService } from '@dsh/app/api/anapi';
import { attach, distinctUntilChangedDeep, errorTo, inProgressFrom, progressTo } from '@dsh/utils';
diff --git a/src/app/sections/payment-section/analytics/payments-tool-distribution/payments-tool-distribution-to-chart-data.ts b/src/app/sections/payment-section/analytics/payments-tool-distribution/payments-tool-distribution-to-chart-data.ts
index 4ec70bf22..3791ec5d5 100644
--- a/src/app/sections/payment-section/analytics/payments-tool-distribution/payments-tool-distribution-to-chart-data.ts
+++ b/src/app/sections/payment-section/analytics/payments-tool-distribution/payments-tool-distribution-to-chart-data.ts
@@ -1,6 +1,7 @@
-import { PaymentsToolDistributionResult } from '@vality/swag-anapi-v2';
import sortBy from 'lodash-es/sortBy';
+import { PaymentsToolDistributionResult } from '@vality/swag-anapi-v2';
+
import { DistributionChartData } from '../utils';
const sortByPercents = (distribution: PaymentsToolDistributionResult[]) =>
diff --git a/src/app/sections/payment-section/analytics/payments-tool-distribution/payments-tool-distribution.component.ts b/src/app/sections/payment-section/analytics/payments-tool-distribution/payments-tool-distribution.component.ts
index 49f4ba1b2..598442e78 100644
--- a/src/app/sections/payment-section/analytics/payments-tool-distribution/payments-tool-distribution.component.ts
+++ b/src/app/sections/payment-section/analytics/payments-tool-distribution/payments-tool-distribution.component.ts
@@ -6,7 +6,6 @@ import {
OnChanges,
SimpleChanges,
} from '@angular/core';
-
import { SpinnerType } from '@dsh/components/indicators';
import { CHARTS_THEME, ChartsThemeProvider } from '../charts-theme';
diff --git a/src/app/sections/payment-section/analytics/payments-tool-distribution/payments-tool-distribution.module.ts b/src/app/sections/payment-section/analytics/payments-tool-distribution/payments-tool-distribution.module.ts
index a02f991a1..82a069830 100644
--- a/src/app/sections/payment-section/analytics/payments-tool-distribution/payments-tool-distribution.module.ts
+++ b/src/app/sections/payment-section/analytics/payments-tool-distribution/payments-tool-distribution.module.ts
@@ -1,12 +1,12 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { TranslocoModule } from '@jsverse/transloco';
import { FlexModule } from 'ng-flex-layout';
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
import { BarChartModule } from '@dsh/components/charts/bar-chart';
import { DonutChartModule } from '@dsh/components/charts/donut-chart';
import { SpinnerModule } from '@dsh/components/indicators';
import { CardModule } from '@dsh/components/layout';
+import { TranslocoModule } from '@jsverse/transloco';
import { DonutChartItemModule } from '../donut-chart-item/donut-chart-item.module';
diff --git a/src/app/sections/payment-section/analytics/payments-tool-distribution/payments-tool-distribution.service.ts b/src/app/sections/payment-section/analytics/payments-tool-distribution/payments-tool-distribution.service.ts
index a34cf082e..48c5726a5 100644
--- a/src/app/sections/payment-section/analytics/payments-tool-distribution/payments-tool-distribution.service.ts
+++ b/src/app/sections/payment-section/analytics/payments-tool-distribution/payments-tool-distribution.service.ts
@@ -1,7 +1,7 @@
-import { Injectable } from '@angular/core';
import { BehaviorSubject, ReplaySubject, defer } from 'rxjs';
import { map, shareReplay, switchMap, withLatestFrom } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
import { AnalyticsService, AnapiDictionaryService } from '@dsh/app/api/anapi';
import { attach, distinctUntilChangedDeep, errorTo, inProgressFrom, progressTo } from '@dsh/utils';
diff --git a/src/app/sections/payment-section/analytics/percent-difference/percent-difference.module.ts b/src/app/sections/payment-section/analytics/percent-difference/percent-difference.module.ts
index 2bdc40ab8..be88824a1 100644
--- a/src/app/sections/payment-section/analytics/percent-difference/percent-difference.module.ts
+++ b/src/app/sections/payment-section/analytics/percent-difference/percent-difference.module.ts
@@ -1,7 +1,7 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
import { FlexLayoutModule } from 'ng-flex-layout';
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
import { CardModule } from '@dsh/components/layout';
import { PercentDifferenceComponent } from './percent-difference.component';
diff --git a/src/app/sections/payment-section/analytics/refunds-amount/refunds-amount.component.ts b/src/app/sections/payment-section/analytics/refunds-amount/refunds-amount.component.ts
index 19ae5389b..787a21553 100644
--- a/src/app/sections/payment-section/analytics/refunds-amount/refunds-amount.component.ts
+++ b/src/app/sections/payment-section/analytics/refunds-amount/refunds-amount.component.ts
@@ -1,5 +1,4 @@
import { ChangeDetectionStrategy, Component, Input, OnChanges, SimpleChanges } from '@angular/core';
-
import { SpinnerType } from '@dsh/components/indicators';
import { SearchParams } from '../search-params';
diff --git a/src/app/sections/payment-section/analytics/refunds-amount/refunds-amount.module.ts b/src/app/sections/payment-section/analytics/refunds-amount/refunds-amount.module.ts
index 7055c28d2..a83c1733d 100644
--- a/src/app/sections/payment-section/analytics/refunds-amount/refunds-amount.module.ts
+++ b/src/app/sections/payment-section/analytics/refunds-amount/refunds-amount.module.ts
@@ -1,11 +1,11 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatSelectModule } from '@angular/material/select';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { SpinnerModule } from '@dsh/components/indicators';
import { CardModule } from '@dsh/components/layout';
+import { TranslocoModule } from '@jsverse/transloco';
import { PercentDifferenceModule } from '../percent-difference';
import { StatItemModule } from '../stat-item/stat-item.module';
diff --git a/src/app/sections/payment-section/analytics/refunds-amount/refunds-amount.service.ts b/src/app/sections/payment-section/analytics/refunds-amount/refunds-amount.service.ts
index 3a23c94b5..3e0d8800b 100644
--- a/src/app/sections/payment-section/analytics/refunds-amount/refunds-amount.service.ts
+++ b/src/app/sections/payment-section/analytics/refunds-amount/refunds-amount.service.ts
@@ -1,7 +1,7 @@
-import { Injectable } from '@angular/core';
import { BehaviorSubject, ReplaySubject, combineLatest, defer, forkJoin } from 'rxjs';
import { distinctUntilChanged, map, shareReplay, switchMap } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
import { AnalyticsService } from '@dsh/app/api/anapi';
import { attach, distinctUntilChangedDeep, errorTo, inProgressFrom, progressTo } from '@dsh/utils';
diff --git a/src/app/sections/payment-section/analytics/stat-item/stat-item.component.ts b/src/app/sections/payment-section/analytics/stat-item/stat-item.component.ts
index 5b08ddb0f..6850fa8d1 100644
--- a/src/app/sections/payment-section/analytics/stat-item/stat-item.component.ts
+++ b/src/app/sections/payment-section/analytics/stat-item/stat-item.component.ts
@@ -6,7 +6,6 @@ import {
SimpleChanges,
booleanAttribute,
} from '@angular/core';
-
import { SpinnerType } from '@dsh/components/indicators';
import { StatData } from '../utils';
diff --git a/src/app/sections/payment-section/analytics/stat-item/stat-item.module.ts b/src/app/sections/payment-section/analytics/stat-item/stat-item.module.ts
index 69796c7ca..3cfb864c6 100644
--- a/src/app/sections/payment-section/analytics/stat-item/stat-item.module.ts
+++ b/src/app/sections/payment-section/analytics/stat-item/stat-item.module.ts
@@ -1,11 +1,11 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { TranslocoModule } from '@jsverse/transloco';
import { FlexLayoutModule } from 'ng-flex-layout';
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
import { AmountCurrencyModule } from '@dsh/app/shared/pipes';
import { SpinnerModule } from '@dsh/components/indicators';
import { CardModule } from '@dsh/components/layout';
+import { TranslocoModule } from '@jsverse/transloco';
import { PercentDifferenceModule } from '../percent-difference';
diff --git a/src/app/sections/payment-section/analytics/utils/filters-to-search-params.ts b/src/app/sections/payment-section/analytics/utils/filters-to-search-params.ts
index 0055fd3a2..7f37849a0 100644
--- a/src/app/sections/payment-section/analytics/utils/filters-to-search-params.ts
+++ b/src/app/sections/payment-section/analytics/utils/filters-to-search-params.ts
@@ -1,8 +1,9 @@
-import { PaymentInstitution } from '@vality/swag-payments';
import moment from 'moment';
import { Preset } from '@dsh/components/date-range-filter';
+import { PaymentInstitution } from '@vality/swag-payments';
+
import { Filters } from '../analytics-search-filters/analytics-search-filters.component';
import { SearchParams } from '../search-params';
diff --git a/src/app/sections/payment-section/analytics/utils/get-offsets.ts b/src/app/sections/payment-section/analytics/utils/get-offsets.ts
index 19c8f0d10..4603772b5 100644
--- a/src/app/sections/payment-section/analytics/utils/get-offsets.ts
+++ b/src/app/sections/payment-section/analytics/utils/get-offsets.ts
@@ -1,6 +1,7 @@
-import { SplitUnit } from '@vality/swag-anapi-v2';
import moment, { Moment } from 'moment';
+import { SplitUnit } from '@vality/swag-anapi-v2';
+
export const getOffsets = (fromTime: string, toTime: string, splitUnit: SplitUnit): number[] => {
let current: Moment;
switch (splitUnit) {
diff --git a/src/app/sections/payment-section/analytics/utils/search-params-to-params-with-split-unit.ts b/src/app/sections/payment-section/analytics/utils/search-params-to-params-with-split-unit.ts
index c0e058152..9a2d52777 100644
--- a/src/app/sections/payment-section/analytics/utils/search-params-to-params-with-split-unit.ts
+++ b/src/app/sections/payment-section/analytics/utils/search-params-to-params-with-split-unit.ts
@@ -1,6 +1,7 @@
-import { GetPaymentsSplitCountRequestParams } from '@vality/swag-anapi-v2';
import moment from 'moment';
+import { GetPaymentsSplitCountRequestParams } from '@vality/swag-anapi-v2';
+
import { SearchParams } from '../search-params';
import { SearchParamsWithSplitUnit } from '../search-params-with-split-unit';
diff --git a/src/app/sections/payment-section/analytics/utils/search-params-to-stat-search-params.ts b/src/app/sections/payment-section/analytics/utils/search-params-to-stat-search-params.ts
index 321018c2e..dfc7a1e24 100644
--- a/src/app/sections/payment-section/analytics/utils/search-params-to-stat-search-params.ts
+++ b/src/app/sections/payment-section/analytics/utils/search-params-to-stat-search-params.ts
@@ -1,6 +1,7 @@
-import { PaymentInstitution } from '@vality/swag-payments';
import moment from 'moment';
+import { PaymentInstitution } from '@vality/swag-payments';
+
import { SearchParams } from '../search-params';
import { StatSearchParams } from '../stat-search-params';
diff --git a/src/app/sections/payment-section/balances/balances.module.ts b/src/app/sections/payment-section/balances/balances.module.ts
index a75b349be..d62f28caf 100644
--- a/src/app/sections/payment-section/balances/balances.module.ts
+++ b/src/app/sections/payment-section/balances/balances.module.ts
@@ -1,9 +1,10 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
+import { AmountCurrencyModule } from '@dsh/app/shared/pipes';
import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-import { AmountCurrencyModule } from '@dsh/app/shared/pipes';
import { BalancesComponent } from './balances.component';
diff --git a/src/app/sections/payment-section/balances/balances.service.ts b/src/app/sections/payment-section/balances/balances.service.ts
index ca97a6144..168f8cd38 100644
--- a/src/app/sections/payment-section/balances/balances.service.ts
+++ b/src/app/sections/payment-section/balances/balances.service.ts
@@ -1,7 +1,7 @@
-import { Injectable } from '@angular/core';
import { of, timer } from 'rxjs';
import { catchError, pluck, shareReplay, switchMap } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
import { AnalyticsService } from '@dsh/app/api/anapi';
import { PaymentInstitutionRealmService } from '../services';
diff --git a/src/app/sections/payment-section/integrations/api-keys/api-key-details/api-key-details.component.ts b/src/app/sections/payment-section/integrations/api-keys/api-key-details/api-key-details.component.ts
index 90b6b4e95..d5c176edf 100644
--- a/src/app/sections/payment-section/integrations/api-keys/api-key-details/api-key-details.component.ts
+++ b/src/app/sections/payment-section/integrations/api-keys/api-key-details/api-key-details.component.ts
@@ -1,8 +1,9 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { ApiKeysDictionaryService } from '@dsh/app/api/api-keys';
+
import { DialogService } from '@vality/matez';
import { ApiKey } from '@vality/swag-api-keys-v2';
-import { ApiKeysDictionaryService } from '@dsh/app/api/api-keys';
import { API_KEY_STATUS_COLOR } from '../types/api-key-status-color';
diff --git a/src/app/sections/payment-section/integrations/api-keys/api-key-details/api-key-details.module.ts b/src/app/sections/payment-section/integrations/api-keys/api-key-details/api-key-details.module.ts
index 69f430d1e..e932f716d 100644
--- a/src/app/sections/payment-section/integrations/api-keys/api-key-details/api-key-details.module.ts
+++ b/src/app/sections/payment-section/integrations/api-keys/api-key-details/api-key-details.module.ts
@@ -1,14 +1,16 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
import { MatDividerModule } from '@angular/material/divider';
import { MatSnackBarModule } from '@angular/material/snack-bar';
+import { IndicatorsModule } from '@dsh/components/indicators';
+import { LayoutModule } from '@dsh/components/layout';
import { TranslocoModule } from '@jsverse/transloco';
+
import { DialogModule } from '@vality/matez';
-import { FlexLayoutModule } from 'ng-flex-layout';
-import { IndicatorsModule } from '@dsh/components/indicators';
-import { LayoutModule } from '@dsh/components/layout';
import { ApiKeyDetailsComponent } from './api-key-details.component';
import { ApiKeyDeleteDialogComponent } from './components/api-key-delete-dialog/api-key-delete-dialog.component';
diff --git a/src/app/sections/payment-section/integrations/api-keys/api-key-details/components/api-key-delete-dialog/api-key-delete-dialog.component.ts b/src/app/sections/payment-section/integrations/api-keys/api-key-details/components/api-key-delete-dialog/api-key-delete-dialog.component.ts
index 9cc5c9f18..abc7baacd 100644
--- a/src/app/sections/payment-section/integrations/api-keys/api-key-details/components/api-key-delete-dialog/api-key-delete-dialog.component.ts
+++ b/src/app/sections/payment-section/integrations/api-keys/api-key-details/components/api-key-delete-dialog/api-key-delete-dialog.component.ts
@@ -1,16 +1,18 @@
+import { FlexModule } from 'ng-flex-layout';
+import { BehaviorSubject } from 'rxjs';
+
import { CommonModule } from '@angular/common';
import { ChangeDetectionStrategy, Component, DestroyRef } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { MatButtonModule } from '@angular/material/button';
+import { ApiKeysService } from '@dsh/app/api/api-keys';
+import { BaseDialogModule } from '@dsh/app/shared/components/dialog/base-dialog';
+import { SpinnerModule } from '@dsh/components/indicators';
import { TranslocoModule, TranslocoService } from '@jsverse/transloco';
+
import { DialogSuperclass, NotifyLogService, progressTo } from '@vality/matez';
import { RequestRevokeApiKeyRequestParams } from '@vality/swag-api-keys-v2';
-import { FlexModule } from 'ng-flex-layout';
-import { BehaviorSubject } from 'rxjs';
-import { ApiKeysService } from '@dsh/app/api/api-keys';
-import { BaseDialogModule } from '@dsh/app/shared/components/dialog/base-dialog';
-import { SpinnerModule } from '@dsh/components/indicators';
@Component({
selector: 'dsh-api-key-delete-dialog',
diff --git a/src/app/sections/payment-section/integrations/api-keys/api-keys.component.ts b/src/app/sections/payment-section/integrations/api-keys/api-keys.component.ts
index 3e08fe3e8..5d25b0379 100644
--- a/src/app/sections/payment-section/integrations/api-keys/api-keys.component.ts
+++ b/src/app/sections/payment-section/integrations/api-keys/api-keys.component.ts
@@ -1,11 +1,8 @@
+import { map } from 'rxjs/operators';
+
import { Breakpoints } from '@angular/cdk/layout';
import { ChangeDetectionStrategy, Component, DestroyRef } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { TranslocoService } from '@jsverse/transloco';
-import { DialogService, QueryParamsService } from '@vality/matez';
-import { ApiKey, ApiKeyStatus } from '@vality/swag-api-keys-v2';
-import { map } from 'rxjs/operators';
-
import { ApiKeysDictionaryService } from '@dsh/app/api/api-keys';
import { mapToTimestamp } from '@dsh/app/custom-operators';
import {
@@ -13,6 +10,11 @@ import {
ContentHeader,
ExpandedFragment,
} from '@dsh/app/shared/components/accordion-table';
+import { TranslocoService } from '@jsverse/transloco';
+
+import { DialogService, QueryParamsService } from '@vality/matez';
+import { ApiKey, ApiKeyStatus } from '@vality/swag-api-keys-v2';
+
import { ApiKeyCreateDialogComponent } from './components/api-key-create-dialog/api-key-create-dialog.component';
import { FetchApiKeysService } from './fetch-api-keys.service';
diff --git a/src/app/sections/payment-section/integrations/api-keys/api-keys.module.ts b/src/app/sections/payment-section/integrations/api-keys/api-keys.module.ts
index 5a6b99703..3d4cb0fe3 100644
--- a/src/app/sections/payment-section/integrations/api-keys/api-keys.module.ts
+++ b/src/app/sections/payment-section/integrations/api-keys/api-keys.module.ts
@@ -1,17 +1,17 @@
+import { FlexModule } from 'ng-flex-layout';
+
import { ClipboardModule } from '@angular/cdk/clipboard';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
import { MatInputModule } from '@angular/material/input';
import { MatSlideToggleModule } from '@angular/material/slide-toggle';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexModule } from 'ng-flex-layout';
-
import { AccordionTableModule } from '@dsh/app/shared/components/accordion-table';
import { EmptySearchResultModule } from '@dsh/components/empty-search-result';
import { SpinnerModule } from '@dsh/components/indicators';
import { CardModule } from '@dsh/components/layout';
import { ShowMorePanelModule } from '@dsh/components/show-more-panel';
+import { TranslocoModule } from '@jsverse/transloco';
import { ApiKeyDetailsModule } from './api-key-details';
import { ApiKeysRoutingModule } from './api-keys-routing.module';
diff --git a/src/app/sections/payment-section/integrations/api-keys/components/api-key-create-dialog/api-key-create-dialog.component.ts b/src/app/sections/payment-section/integrations/api-keys/components/api-key-create-dialog/api-key-create-dialog.component.ts
index 379c044ee..00f090a76 100644
--- a/src/app/sections/payment-section/integrations/api-keys/components/api-key-create-dialog/api-key-create-dialog.component.ts
+++ b/src/app/sections/payment-section/integrations/api-keys/components/api-key-create-dialog/api-key-create-dialog.component.ts
@@ -1,3 +1,6 @@
+import { FlexModule } from 'ng-flex-layout';
+import { BehaviorSubject } from 'rxjs';
+
import { Clipboard, ClipboardModule } from '@angular/cdk/clipboard';
import { CommonModule } from '@angular/common';
import { ChangeDetectionStrategy, Component, DestroyRef } from '@angular/core';
@@ -5,15 +8,13 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { NonNullableFormBuilder, ReactiveFormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
import { MatInputModule } from '@angular/material/input';
-import { TranslocoModule, TranslocoService } from '@jsverse/transloco';
-import { DialogSuperclass, NotifyLogService, progressTo } from '@vality/matez';
-import { FlexModule } from 'ng-flex-layout';
-import { BehaviorSubject } from 'rxjs';
-
import { ApiKeysService } from '@dsh/app/api/api-keys';
import { BaseDialogModule } from '@dsh/app/shared/components/dialog/base-dialog';
import { ErrorService } from '@dsh/app/shared/services';
import { SpinnerModule } from '@dsh/components/indicators';
+import { TranslocoModule, TranslocoService } from '@jsverse/transloco';
+
+import { DialogSuperclass, NotifyLogService, progressTo } from '@vality/matez';
@Component({
selector: 'dsh-api-key-create-dialog',
diff --git a/src/app/sections/payment-section/integrations/api-keys/components/api-key-revoke/api-key-revoke.component.ts b/src/app/sections/payment-section/integrations/api-keys/components/api-key-revoke/api-key-revoke.component.ts
index c0dc8733e..96daa32ad 100644
--- a/src/app/sections/payment-section/integrations/api-keys/components/api-key-revoke/api-key-revoke.component.ts
+++ b/src/app/sections/payment-section/integrations/api-keys/components/api-key-revoke/api-key-revoke.component.ts
@@ -1,10 +1,9 @@
import { ChangeDetectionStrategy, Component, DestroyRef, OnInit } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { ActivatedRoute, Router } from '@angular/router';
-import { TranslocoService } from '@jsverse/transloco';
-
import { ApiKeysService } from '@dsh/app/api/api-keys';
import { ErrorService, NotificationService } from '@dsh/app/shared/services';
+import { TranslocoService } from '@jsverse/transloco';
@Component({
selector: 'dsh-api-key-revoke',
diff --git a/src/app/sections/payment-section/integrations/api-keys/fetch-api-keys.service.ts b/src/app/sections/payment-section/integrations/api-keys/fetch-api-keys.service.ts
index eb55861c6..cba5c437d 100644
--- a/src/app/sections/payment-section/integrations/api-keys/fetch-api-keys.service.ts
+++ b/src/app/sections/payment-section/integrations/api-keys/fetch-api-keys.service.ts
@@ -1,11 +1,13 @@
+import { Observable, of } from 'rxjs';
+import { catchError, map } from 'rxjs/operators';
+
import { Injectable } from '@angular/core';
+import { ApiKeysService } from '@dsh/app/api/api-keys';
import { TranslocoService } from '@jsverse/transloco';
+
import { FetchOptions, FetchResult, FetchSuperclass, NotifyLogService } from '@vality/matez';
import { ApiKey, ListApiKeysRequestParams } from '@vality/swag-api-keys-v2';
-import { Observable, of } from 'rxjs';
-import { catchError, map } from 'rxjs/operators';
-import { ApiKeysService } from '@dsh/app/api/api-keys';
@Injectable()
export class FetchApiKeysService extends FetchSuperclass<
diff --git a/src/app/sections/payment-section/integrations/api-keys/types/api-key-status-color.ts b/src/app/sections/payment-section/integrations/api-keys/types/api-key-status-color.ts
index 8d6a015c5..5c638d879 100644
--- a/src/app/sections/payment-section/integrations/api-keys/types/api-key-status-color.ts
+++ b/src/app/sections/payment-section/integrations/api-keys/types/api-key-status-color.ts
@@ -1,6 +1,7 @@
+import { StatusColor } from '@dsh/app/theme-manager';
+
import { ApiKeyStatus } from '@vality/swag-api-keys-v2';
-import { StatusColor } from '@dsh/app/theme-manager';
export const API_KEY_STATUS_COLOR = {
[ApiKeyStatus.Active]: StatusColor.Success,
diff --git a/src/app/sections/payment-section/integrations/integrations-routing.module.ts b/src/app/sections/payment-section/integrations/integrations-routing.module.ts
index 43ceeb3e1..e5a6ae8b3 100644
--- a/src/app/sections/payment-section/integrations/integrations-routing.module.ts
+++ b/src/app/sections/payment-section/integrations/integrations-routing.module.ts
@@ -1,6 +1,5 @@
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
-
import { RoleAccessName, createPrivateRoute } from '@dsh/app/auth';
import { IntegrationsComponent } from './integrations.component';
diff --git a/src/app/sections/payment-section/integrations/integrations.component.ts b/src/app/sections/payment-section/integrations/integrations.component.ts
index 485826c8b..48f9ab5dd 100644
--- a/src/app/sections/payment-section/integrations/integrations.component.ts
+++ b/src/app/sections/payment-section/integrations/integrations.component.ts
@@ -1,7 +1,7 @@
import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { RoleAccessName } from '@dsh/app/auth';
import { TranslocoService } from '@jsverse/transloco';
-import { RoleAccessName } from '@dsh/app/auth';
@Component({
templateUrl: 'integrations.component.html',
diff --git a/src/app/sections/payment-section/integrations/integrations.module.ts b/src/app/sections/payment-section/integrations/integrations.module.ts
index 9e6e8ae28..d7caa3b98 100644
--- a/src/app/sections/payment-section/integrations/integrations.module.ts
+++ b/src/app/sections/payment-section/integrations/integrations.module.ts
@@ -1,12 +1,12 @@
+import { FlexModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatTabsModule } from '@angular/material/tabs';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexModule } from 'ng-flex-layout';
-
import { AuthModule } from '@dsh/app/auth';
import { LayoutModule } from '@dsh/components/layout';
import { ScrollUpModule } from '@dsh/components/navigation';
+import { TranslocoModule } from '@jsverse/transloco';
import { IntegrationsRoutingModule } from './integrations-routing.module';
import { IntegrationsComponent } from './integrations.component';
diff --git a/src/app/sections/payment-section/integrations/webhooks/create-webhook/create-webhook-dialog.component.ts b/src/app/sections/payment-section/integrations/webhooks/create-webhook/create-webhook-dialog.component.ts
index 4136d8e01..0c4bea063 100644
--- a/src/app/sections/payment-section/integrations/webhooks/create-webhook/create-webhook-dialog.component.ts
+++ b/src/app/sections/payment-section/integrations/webhooks/create-webhook/create-webhook-dialog.component.ts
@@ -1,8 +1,10 @@
+import { filter } from 'rxjs/operators';
+
import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
import { MatDialogRef } from '@angular/material/dialog';
import { TranslocoService } from '@jsverse/transloco';
+
import { NotifyLogService } from '@vality/matez';
-import { filter } from 'rxjs/operators';
import { CreateWebhookDialogService } from './create-webhook-dialog.service';
diff --git a/src/app/sections/payment-section/integrations/webhooks/create-webhook/create-webhook-dialog.service.ts b/src/app/sections/payment-section/integrations/webhooks/create-webhook/create-webhook-dialog.service.ts
index 0c50ed88b..0dcdc2562 100644
--- a/src/app/sections/payment-section/integrations/webhooks/create-webhook/create-webhook-dialog.service.ts
+++ b/src/app/sections/payment-section/integrations/webhooks/create-webhook/create-webhook-dialog.service.ts
@@ -1,8 +1,8 @@
-import { Injectable } from '@angular/core';
-import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
import { BehaviorSubject, Subject, of } from 'rxjs';
import { catchError, filter, map, switchMap } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
import { WebhooksService } from '@dsh/app/api/payments';
import { oneMustBeSelected } from '@dsh/components/form-controls';
diff --git a/src/app/sections/payment-section/integrations/webhooks/create-webhook/create-webhook-form/create-webhook-form.component.ts b/src/app/sections/payment-section/integrations/webhooks/create-webhook/create-webhook-form/create-webhook-form.component.ts
index 12e6786bd..9efb4c96a 100644
--- a/src/app/sections/payment-section/integrations/webhooks/create-webhook/create-webhook-form/create-webhook-form.component.ts
+++ b/src/app/sections/payment-section/integrations/webhooks/create-webhook/create-webhook-form/create-webhook-form.component.ts
@@ -1,12 +1,13 @@
-import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
-import { UntypedFormArray, UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
-import { WebhookScope } from '@vality/swag-payments';
import { BehaviorSubject } from 'rxjs';
+import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
+import { UntypedFormArray, UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
import { PaymentsDictionaryService } from '@dsh/app/api/payments';
import { ShopsDataService } from '@dsh/app/shared';
import { oneMustBeSelected } from '@dsh/components/form-controls';
+import { WebhookScope } from '@vality/swag-payments';
+
import { getEventsByTopic } from '../get-events-by-topic';
import TopicEnum = WebhookScope.TopicEnum;
diff --git a/src/app/sections/payment-section/integrations/webhooks/create-webhook/create-webhook.module.ts b/src/app/sections/payment-section/integrations/webhooks/create-webhook/create-webhook.module.ts
index ef6a2b86f..3a1b28d56 100644
--- a/src/app/sections/payment-section/integrations/webhooks/create-webhook/create-webhook.module.ts
+++ b/src/app/sections/payment-section/integrations/webhooks/create-webhook/create-webhook.module.ts
@@ -1,3 +1,5 @@
+import { FlexModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
@@ -8,10 +10,9 @@ import { MatFormFieldModule } from '@angular/material/form-field';
import { MatInputModule } from '@angular/material/input';
import { MatRadioModule } from '@angular/material/radio';
import { MatSelectModule } from '@angular/material/select';
+import { BaseDialogModule } from '@dsh/app/shared/components/dialog/base-dialog';
import { TranslocoModule } from '@jsverse/transloco';
-import { FlexModule } from 'ng-flex-layout';
-import { BaseDialogModule } from '@dsh/app/shared/components/dialog/base-dialog';
import { CreateWebhookDialogComponent } from './create-webhook-dialog.component';
import { CreateWebhookFormComponent } from './create-webhook-form';
diff --git a/src/app/sections/payment-section/integrations/webhooks/create-webhook/create-webhook.service.ts b/src/app/sections/payment-section/integrations/webhooks/create-webhook/create-webhook.service.ts
index 587612b1f..f4dddb84f 100644
--- a/src/app/sections/payment-section/integrations/webhooks/create-webhook/create-webhook.service.ts
+++ b/src/app/sections/payment-section/integrations/webhooks/create-webhook/create-webhook.service.ts
@@ -1,8 +1,9 @@
-import { Injectable } from '@angular/core';
-import { MatDialog } from '@angular/material/dialog';
import { Observable, Subject } from 'rxjs';
import { filter, switchMap, takeUntil } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
+import { MatDialog } from '@angular/material/dialog';
+
import { CreateWebhookDialogComponent } from './create-webhook-dialog.component';
@Injectable()
diff --git a/src/app/sections/payment-section/integrations/webhooks/delete-webhook/delete-webhook.service.ts b/src/app/sections/payment-section/integrations/webhooks/delete-webhook/delete-webhook.service.ts
index 45f6107d9..843303e93 100644
--- a/src/app/sections/payment-section/integrations/webhooks/delete-webhook/delete-webhook.service.ts
+++ b/src/app/sections/payment-section/integrations/webhooks/delete-webhook/delete-webhook.service.ts
@@ -1,12 +1,14 @@
-import { Injectable } from '@angular/core';
-import { MatDialog } from '@angular/material/dialog';
-import { TranslocoService } from '@jsverse/transloco';
-import { DialogResponseStatus, NotifyLogService } from '@vality/matez';
import { Observable, Subject, combineLatest, of } from 'rxjs';
import { catchError, filter, switchMap, takeUntil } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
+import { MatDialog } from '@angular/material/dialog';
import { WebhooksService } from '@dsh/app/api/payments';
import { ConfirmActionDialogComponent } from '@dsh/components/popups';
+import { TranslocoService } from '@jsverse/transloco';
+
+import { DialogResponseStatus, NotifyLogService } from '@vality/matez';
+
@Injectable()
export class DeleteWebhookService {
diff --git a/src/app/sections/payment-section/integrations/webhooks/receive-webhooks.service.ts b/src/app/sections/payment-section/integrations/webhooks/receive-webhooks.service.ts
index fe6f82737..0019ed683 100644
--- a/src/app/sections/payment-section/integrations/webhooks/receive-webhooks.service.ts
+++ b/src/app/sections/payment-section/integrations/webhooks/receive-webhooks.service.ts
@@ -1,13 +1,14 @@
-import { Injectable } from '@angular/core';
-import { TranslocoService } from '@jsverse/transloco';
-import { NotifyLogService } from '@vality/matez';
-import { Webhook } from '@vality/swag-payments';
import sortBy from 'lodash-es/sortBy';
import { BehaviorSubject, Observable, Subject, of } from 'rxjs';
import { catchError, filter, map, shareReplay, switchMap } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
import { WebhooksService } from '@dsh/app/api/payments';
import { mapToTimestamp, progress } from '@dsh/app/custom-operators';
+import { TranslocoService } from '@jsverse/transloco';
+
+import { NotifyLogService } from '@vality/matez';
+import { Webhook } from '@vality/swag-payments';
@Injectable()
export class ReceiveWebhooksService {
diff --git a/src/app/sections/payment-section/integrations/webhooks/webhook-details/webhook-details.component.ts b/src/app/sections/payment-section/integrations/webhooks/webhook-details/webhook-details.component.ts
index e2f536871..95dfd0db1 100644
--- a/src/app/sections/payment-section/integrations/webhooks/webhook-details/webhook-details.component.ts
+++ b/src/app/sections/payment-section/integrations/webhooks/webhook-details/webhook-details.component.ts
@@ -1,4 +1,5 @@
import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
+
import { Webhook, WebhookScope } from '@vality/swag-payments';
import { getShopIdFromScope } from '../get-shop-id-from-scope';
diff --git a/src/app/sections/payment-section/integrations/webhooks/webhook-details/webhook-details.module.ts b/src/app/sections/payment-section/integrations/webhooks/webhook-details/webhook-details.module.ts
index 02372993e..aee62dafe 100644
--- a/src/app/sections/payment-section/integrations/webhooks/webhook-details/webhook-details.module.ts
+++ b/src/app/sections/payment-section/integrations/webhooks/webhook-details/webhook-details.module.ts
@@ -1,16 +1,16 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { ClipboardModule } from '@angular/cdk/clipboard';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
import { MatDividerModule } from '@angular/material/divider';
import { MatSnackBarModule } from '@angular/material/snack-bar';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { WebhookApiKeyModule } from '@dsh/app/shared/components';
import { ApiModelRefsModule } from '@dsh/app/shared/pipes';
import { IndicatorsModule } from '@dsh/components/indicators';
import { LayoutModule } from '@dsh/components/layout';
+import { TranslocoModule } from '@jsverse/transloco';
import { WebhookActionsComponent } from './webhook-actions';
import { WebhookDetailsComponent } from './webhook-details.component';
diff --git a/src/app/sections/payment-section/integrations/webhooks/webhook-details/webhook-events/webhook-events.component.ts b/src/app/sections/payment-section/integrations/webhooks/webhook-details/webhook-events/webhook-events.component.ts
index 59851b5a1..c9ca12da2 100644
--- a/src/app/sections/payment-section/integrations/webhooks/webhook-details/webhook-events/webhook-events.component.ts
+++ b/src/app/sections/payment-section/integrations/webhooks/webhook-details/webhook-events/webhook-events.component.ts
@@ -1,9 +1,11 @@
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
-import { InvoicesTopic, WebhookScope } from '@vality/swag-payments';
import { combineLatest } from 'rxjs';
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
import { PaymentsDictionaryService } from '@dsh/app/api/payments';
+import { InvoicesTopic, WebhookScope } from '@vality/swag-payments';
+
+
@Component({
selector: 'dsh-webhook-events',
templateUrl: 'webhook-events.component.html',
diff --git a/src/app/sections/payment-section/integrations/webhooks/webhook-list/webhook-list.component.ts b/src/app/sections/payment-section/integrations/webhooks/webhook-list/webhook-list.component.ts
index ff72ec040..6ff71e09d 100644
--- a/src/app/sections/payment-section/integrations/webhooks/webhook-list/webhook-list.component.ts
+++ b/src/app/sections/payment-section/integrations/webhooks/webhook-list/webhook-list.component.ts
@@ -8,6 +8,7 @@ import {
Output,
} from '@angular/core';
import { TranslocoService } from '@jsverse/transloco';
+
import { NotifyLogService } from '@vality/matez';
import { Webhook, WebhookScope } from '@vality/swag-payments';
diff --git a/src/app/sections/payment-section/integrations/webhooks/webhook-list/webhook-list.module.ts b/src/app/sections/payment-section/integrations/webhooks/webhook-list/webhook-list.module.ts
index 98ff0b90c..b0d51120f 100644
--- a/src/app/sections/payment-section/integrations/webhooks/webhook-list/webhook-list.module.ts
+++ b/src/app/sections/payment-section/integrations/webhooks/webhook-list/webhook-list.module.ts
@@ -1,12 +1,12 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatSnackBarModule } from '@angular/material/snack-bar';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { ApiModelRefsModule } from '@dsh/app/shared/pipes';
import { IndicatorsModule } from '@dsh/components/indicators';
import { LayoutModule } from '@dsh/components/layout';
+import { TranslocoModule } from '@jsverse/transloco';
import { DeleteWebhookModule } from '../delete-webhook';
import { WebhookDetailsModule } from '../webhook-details';
diff --git a/src/app/sections/payment-section/integrations/webhooks/webhooks-expanded-id-manager.service.ts b/src/app/sections/payment-section/integrations/webhooks/webhooks-expanded-id-manager.service.ts
index 99951130c..65863d2e0 100644
--- a/src/app/sections/payment-section/integrations/webhooks/webhooks-expanded-id-manager.service.ts
+++ b/src/app/sections/payment-section/integrations/webhooks/webhooks-expanded-id-manager.service.ts
@@ -1,9 +1,11 @@
+import { Observable } from 'rxjs';
+
import { Injectable } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
+import { ExpandedIdManager } from '@dsh/app/shared/services';
+
import { Webhook } from '@vality/swag-payments';
-import { Observable } from 'rxjs';
-import { ExpandedIdManager } from '@dsh/app/shared/services';
import { ReceiveWebhooksService } from './receive-webhooks.service';
diff --git a/src/app/sections/payment-section/integrations/webhooks/webhooks.component.ts b/src/app/sections/payment-section/integrations/webhooks/webhooks.component.ts
index 439037821..7f03e3808 100644
--- a/src/app/sections/payment-section/integrations/webhooks/webhooks.component.ts
+++ b/src/app/sections/payment-section/integrations/webhooks/webhooks.component.ts
@@ -1,5 +1,6 @@
import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core';
import { TranslocoService } from '@jsverse/transloco';
+
import { NotifyLogService } from '@vality/matez';
import { CreateWebhookService } from './create-webhook';
diff --git a/src/app/sections/payment-section/integrations/webhooks/webhooks.module.ts b/src/app/sections/payment-section/integrations/webhooks/webhooks.module.ts
index 4094a329a..4d26f185c 100644
--- a/src/app/sections/payment-section/integrations/webhooks/webhooks.module.ts
+++ b/src/app/sections/payment-section/integrations/webhooks/webhooks.module.ts
@@ -1,3 +1,5 @@
+import { FlexModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
@@ -8,13 +10,11 @@ import { MatDividerModule } from '@angular/material/divider';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatInputModule } from '@angular/material/input';
import { MatSelectModule } from '@angular/material/select';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexModule } from 'ng-flex-layout';
-
import { EmptySearchResultModule } from '@dsh/components/empty-search-result';
import { SpinnerModule } from '@dsh/components/indicators';
import { ConfirmActionDialogModule } from '@dsh/components/popups';
import { ShowMorePanelModule } from '@dsh/components/show-more-panel';
+import { TranslocoModule } from '@jsverse/transloco';
import { CreateWebhookModule } from './create-webhook/';
import { WebhookListModule } from './webhook-list';
diff --git a/src/app/sections/payment-section/no-shops-alert/no-shops-alert.module.ts b/src/app/sections/payment-section/no-shops-alert/no-shops-alert.module.ts
index 316144c8a..9aaed2fb7 100644
--- a/src/app/sections/payment-section/no-shops-alert/no-shops-alert.module.ts
+++ b/src/app/sections/payment-section/no-shops-alert/no-shops-alert.module.ts
@@ -1,7 +1,7 @@
import { NgModule } from '@angular/core';
+import { AlertModule } from '@dsh/components/layout';
import { TranslocoModule } from '@jsverse/transloco';
-import { AlertModule } from '@dsh/components/layout';
import { NoShopsComponent } from './no-shops-alert.component';
diff --git a/src/app/sections/payment-section/operations/invoices/create-invoice/components/create-invoice-dialog/create-invoice-dialog.component.ts b/src/app/sections/payment-section/operations/invoices/create-invoice/components/create-invoice-dialog/create-invoice-dialog.component.ts
index 79dccb7c8..787444d90 100644
--- a/src/app/sections/payment-section/operations/invoices/create-invoice/components/create-invoice-dialog/create-invoice-dialog.component.ts
+++ b/src/app/sections/payment-section/operations/invoices/create-invoice/components/create-invoice-dialog/create-invoice-dialog.component.ts
@@ -2,9 +2,10 @@ import { ChangeDetectionStrategy, Component, DestroyRef, Inject } from '@angular
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { FormControl } from '@angular/forms';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { InvoicesService } from '@dsh/app/api/payments';
+
import { Shop } from '@vality/swag-payments';
-import { InvoicesService } from '@dsh/app/api/payments';
import { CreateInvoiceDialogResponse } from '../../types/create-invoice-dialog-response';
diff --git a/src/app/sections/payment-section/operations/invoices/create-invoice/create-invoice.module.ts b/src/app/sections/payment-section/operations/invoices/create-invoice/create-invoice.module.ts
index af72acc56..17187c9ad 100644
--- a/src/app/sections/payment-section/operations/invoices/create-invoice/create-invoice.module.ts
+++ b/src/app/sections/payment-section/operations/invoices/create-invoice/create-invoice.module.ts
@@ -1,12 +1,12 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { CreateInvoiceFormModule } from '@dsh/app/shared/components/create-invoice-form';
import { DialogModule } from '@dsh/app/shared/components/dialog';
+import { TranslocoModule } from '@jsverse/transloco';
import { CreateInvoiceDialogComponent } from './components/create-invoice-dialog/create-invoice-dialog.component';
import { CreateInvoiceService } from './create-invoice.service';
diff --git a/src/app/sections/payment-section/operations/invoices/create-invoice/create-invoice.service.ts b/src/app/sections/payment-section/operations/invoices/create-invoice/create-invoice.service.ts
index ec15c6adb..98cffc8df 100644
--- a/src/app/sections/payment-section/operations/invoices/create-invoice/create-invoice.service.ts
+++ b/src/app/sections/payment-section/operations/invoices/create-invoice/create-invoice.service.ts
@@ -1,12 +1,14 @@
+import { Observable, ReplaySubject, of } from 'rxjs';
+import { filter, pluck, switchMap, take } from 'rxjs/operators';
+
import { Injectable } from '@angular/core';
import { MatDialog } from '@angular/material/dialog';
+import { ShopsDataService } from '@dsh/app/shared';
import { TranslocoService } from '@jsverse/transloco';
+
import { NotifyLogService } from '@vality/matez';
import { PaymentInstitution, Shop } from '@vality/swag-payments';
-import { Observable, ReplaySubject, of } from 'rxjs';
-import { filter, pluck, switchMap, take } from 'rxjs/operators';
-import { ShopsDataService } from '@dsh/app/shared';
import { filterShopsByRealm } from '../../operators';
diff --git a/src/app/sections/payment-section/operations/invoices/invoices-list/components/invoice-row/invoice-row.component.ts b/src/app/sections/payment-section/operations/invoices/invoices-list/components/invoice-row/invoice-row.component.ts
index e4aafa4aa..6caf45e0f 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices-list/components/invoice-row/invoice-row.component.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices-list/components/invoice-row/invoice-row.component.ts
@@ -1,7 +1,8 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { AnapiDictionaryService } from '@dsh/app/api/anapi';
+
import { Invoice } from '@vality/swag-anapi-v2';
-import { AnapiDictionaryService } from '@dsh/app/api/anapi';
@Component({
selector: 'dsh-invoice-row',
diff --git a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/cancel-invoice/cancel-invoice.module.ts b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/cancel-invoice/cancel-invoice.module.ts
index e2ff6728e..c6794019e 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/cancel-invoice/cancel-invoice.module.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/cancel-invoice/cancel-invoice.module.ts
@@ -1,13 +1,14 @@
+import { FlexModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatInputModule } from '@angular/material/input';
+import { BaseDialogModule } from '@dsh/app/shared/components/dialog/base-dialog';
import { TranslocoModule } from '@jsverse/transloco';
-import { FlexModule } from 'ng-flex-layout';
-import { BaseDialogModule } from '@dsh/app/shared/components/dialog/base-dialog';
import { CancelInvoiceDialogComponent } from './components/cancel-invoice-dialog/cancel-invoice-dialog.component';
diff --git a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/cancel-invoice/cancel-invoice.service.ts b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/cancel-invoice/cancel-invoice.service.ts
index cd1d3a5de..edbb5facc 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/cancel-invoice/cancel-invoice.service.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/cancel-invoice/cancel-invoice.service.ts
@@ -1,11 +1,13 @@
+import { Observable, ReplaySubject } from 'rxjs';
+import { filter, switchMap, take } from 'rxjs/operators';
+
import { Injectable } from '@angular/core';
import { MatDialog } from '@angular/material/dialog';
+import { InvoicesService } from '@dsh/app/api/payments';
import { TranslocoService } from '@jsverse/transloco';
+
import { NotifyLogService } from '@vality/matez';
-import { Observable, ReplaySubject } from 'rxjs';
-import { filter, switchMap, take } from 'rxjs/operators';
-import { InvoicesService } from '@dsh/app/api/payments';
import { CancelInvoiceDialogComponent } from './components/cancel-invoice-dialog/cancel-invoice-dialog.component';
diff --git a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/components/invoice-actions/invoice-actions.component.ts b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/components/invoice-actions/invoice-actions.component.ts
index fdb35c88c..026578daf 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/components/invoice-actions/invoice-actions.component.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/components/invoice-actions/invoice-actions.component.ts
@@ -7,6 +7,7 @@ import {
Output,
} from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+
import { Invoice } from '@vality/swag-payments';
import { CancelInvoiceService } from '../../cancel-invoice';
diff --git a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/components/invoice-cart-info/cart-info/invoice-cart-line.component.ts b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/components/invoice-cart-info/cart-info/invoice-cart-line.component.ts
index 541b35d59..e9c537644 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/components/invoice-cart-info/cart-info/invoice-cart-line.component.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/components/invoice-cart-info/cart-info/invoice-cart-line.component.ts
@@ -1,4 +1,5 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+
import { InvoiceLine } from '@vality/swag-anapi-v2';
import { ReceiveInvoiceService } from '../../../services/receive-invoice/receive-invoice.service';
diff --git a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/components/invoice-cart-info/invoice-cart-info.component.ts b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/components/invoice-cart-info/invoice-cart-info.component.ts
index 0557b962d..0abcc35a1 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/components/invoice-cart-info/invoice-cart-info.component.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/components/invoice-cart-info/invoice-cart-info.component.ts
@@ -1,4 +1,5 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+
import { InvoiceLine } from '@vality/swag-anapi-v2';
import { ReceiveInvoiceService } from '../../services/receive-invoice/receive-invoice.service';
diff --git a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/components/invoice-main-info/invoice-main-info.component.ts b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/components/invoice-main-info/invoice-main-info.component.ts
index 65cdc1d75..5239e68cf 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/components/invoice-main-info/invoice-main-info.component.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/components/invoice-main-info/invoice-main-info.component.ts
@@ -1,4 +1,5 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+
import { Invoice } from '@vality/swag-anapi-v2';
@Component({
diff --git a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/components/invoice-payments/invoice-payments.component.ts b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/components/invoice-payments/invoice-payments.component.ts
index fe34169dd..cedf0ba5b 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/components/invoice-payments/invoice-payments.component.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/components/invoice-payments/invoice-payments.component.ts
@@ -1,7 +1,8 @@
import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
+import { FakePaginatorService } from '@dsh/app/shared/services';
+
import { Payment } from '@vality/swag-payments';
-import { FakePaginatorService } from '@dsh/app/shared/services';
@Component({
selector: 'dsh-invoice-payments',
diff --git a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/fulfill-invoice/fulfill-invoice.module.ts b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/fulfill-invoice/fulfill-invoice.module.ts
index 53d534fcc..0190f678b 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/fulfill-invoice/fulfill-invoice.module.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/fulfill-invoice/fulfill-invoice.module.ts
@@ -1,13 +1,14 @@
+import { FlexModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatInputModule } from '@angular/material/input';
+import { BaseDialogModule } from '@dsh/app/shared/components/dialog/base-dialog';
import { TranslocoModule } from '@jsverse/transloco';
-import { FlexModule } from 'ng-flex-layout';
-import { BaseDialogModule } from '@dsh/app/shared/components/dialog/base-dialog';
import { FulfillInvoiceDialogComponent } from './components/cancel-invoice-dialog/fulfill-invoice-dialog.component';
diff --git a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/fulfill-invoice/fulfill-invoice.service.ts b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/fulfill-invoice/fulfill-invoice.service.ts
index 303cb3aea..99ad3d0fb 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/fulfill-invoice/fulfill-invoice.service.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/fulfill-invoice/fulfill-invoice.service.ts
@@ -1,11 +1,13 @@
+import { Observable, ReplaySubject } from 'rxjs';
+import { filter, switchMap, take } from 'rxjs/operators';
+
import { Injectable } from '@angular/core';
import { MatDialog } from '@angular/material/dialog';
+import { InvoicesService } from '@dsh/app/api/payments';
import { TranslocoService } from '@jsverse/transloco';
+
import { NotifyLogService } from '@vality/matez';
-import { Observable, ReplaySubject } from 'rxjs';
-import { filter, switchMap, take } from 'rxjs/operators';
-import { InvoicesService } from '@dsh/app/api/payments';
import { FulfillInvoiceDialogComponent } from './components/cancel-invoice-dialog/fulfill-invoice-dialog.component';
diff --git a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/invoice-details.component.ts b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/invoice-details.component.ts
index 4d023c4f1..a0bc2a637 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/invoice-details.component.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/invoice-details.component.ts
@@ -6,6 +6,7 @@ import {
OnInit,
Output,
} from '@angular/core';
+
import { Invoice, InvoiceLine } from '@vality/swag-anapi-v2';
import { ReceivePaymentsService } from './services/receive-payments/receive-payments.service';
diff --git a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/invoice-details.module.ts b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/invoice-details.module.ts
index 63d7d8ef5..3eb6153af 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/invoice-details.module.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/invoice-details.module.ts
@@ -1,3 +1,5 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
@@ -5,9 +7,6 @@ import { MatDividerModule } from '@angular/material/divider';
import { MatIconModule } from '@angular/material/icon';
import { MatSnackBarModule } from '@angular/material/snack-bar';
import { RouterModule } from '@angular/router';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { AuthModule } from '@dsh/app/auth';
import {
RefundDetailsModule as ApiRefundDetailsModule,
@@ -17,6 +16,7 @@ import {
import { AmountCurrencyModule, ApiModelRefsModule } from '@dsh/app/shared/pipes';
import { IndicatorsModule } from '@dsh/components/indicators';
import { LayoutModule } from '@dsh/components/layout';
+import { TranslocoModule } from '@jsverse/transloco';
import { CancelInvoiceModule } from './cancel-invoice';
import { InvoiceActionsComponent } from './components/invoice-actions/invoice-actions.component';
diff --git a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/pipes/tax-mode-to-tax-rate/tax-mode-to-tax-rate.pipe.ts b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/pipes/tax-mode-to-tax-rate/tax-mode-to-tax-rate.pipe.ts
index 0a6830b93..dcfbd6664 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/pipes/tax-mode-to-tax-rate/tax-mode-to-tax-rate.pipe.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/pipes/tax-mode-to-tax-rate/tax-mode-to-tax-rate.pipe.ts
@@ -1,4 +1,5 @@
import { Pipe, PipeTransform } from '@angular/core';
+
import { InvoiceLineTaxMode, InvoiceLineTaxVAT } from '@vality/swag-anapi-v2';
@Pipe({
diff --git a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/services/receive-invoice/receive-invoice.service.ts b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/services/receive-invoice/receive-invoice.service.ts
index be80fd235..fc6bd6f45 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/services/receive-invoice/receive-invoice.service.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/services/receive-invoice/receive-invoice.service.ts
@@ -1,11 +1,13 @@
-import { DestroyRef, Injectable } from '@angular/core';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { Invoice } from '@vality/swag-payments';
import { BehaviorSubject, Observable, ReplaySubject, Subject, of } from 'rxjs';
import { catchError, filter, map, switchMap, tap } from 'rxjs/operators';
+import { DestroyRef, Injectable } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { InvoicesService } from '@dsh/app/api/payments';
+import { Invoice } from '@vality/swag-payments';
+
+
@Injectable()
export class ReceiveInvoiceService {
isLoading$: Observable;
diff --git a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/services/receive-payments/receive-payments.service.ts b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/services/receive-payments/receive-payments.service.ts
index cdecec6d0..8b04c7944 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/services/receive-payments/receive-payments.service.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/services/receive-payments/receive-payments.service.ts
@@ -1,12 +1,13 @@
-import { DestroyRef, Injectable } from '@angular/core';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { Payment } from '@vality/swag-payments';
import moment from 'moment';
import { BehaviorSubject, Observable, ReplaySubject, Subject, of } from 'rxjs';
import { catchError, filter, map, switchMap, tap } from 'rxjs/operators';
+import { DestroyRef, Injectable } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { PaymentsService } from '@dsh/app/api/payments';
+import { Payment } from '@vality/swag-payments';
+
@Injectable()
export class ReceivePaymentsService {
isLoading$: Observable;
diff --git a/src/app/sections/payment-section/operations/invoices/invoices-list/invoices-list.component.ts b/src/app/sections/payment-section/operations/invoices/invoices-list/invoices-list.component.ts
index 4701e9856..e1668f148 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices-list/invoices-list.component.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices-list/invoices-list.component.ts
@@ -1,4 +1,5 @@
import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
+
import { Invoice } from '@vality/swag-anapi-v2';
@Component({
diff --git a/src/app/sections/payment-section/operations/invoices/invoices-list/invoices-list.module.ts b/src/app/sections/payment-section/operations/invoices/invoices-list/invoices-list.module.ts
index 69fe3ab3a..b69324cc2 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices-list/invoices-list.module.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices-list/invoices-list.module.ts
@@ -1,13 +1,13 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatSnackBarModule } from '@angular/material/snack-bar';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { InvoiceDetailsModule as ApiInvoiceDetailsModule } from '@dsh/app/shared/components';
import { AmountCurrencyModule, ApiModelRefsModule } from '@dsh/app/shared/pipes';
import { IndicatorsModule } from '@dsh/components/indicators';
import { LayoutModule } from '@dsh/components/layout';
+import { TranslocoModule } from '@jsverse/transloco';
import { InvoiceRowComponent } from './components/invoice-row/invoice-row.component';
import { InvoiceRowHeaderComponent } from './components/invoice-row-header/invoice-row-header.component';
diff --git a/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/additional-filters.module.ts b/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/additional-filters.module.ts
index 9ce65d148..7c7a18a17 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/additional-filters.module.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/additional-filters.module.ts
@@ -1,13 +1,14 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
import { MatDividerModule } from '@angular/material/divider';
import { MatIconModule } from '@angular/material/icon';
+import { BaseDialogModule } from '@dsh/app/shared/components/dialog/base-dialog';
import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-import { BaseDialogModule } from '@dsh/app/shared/components/dialog/base-dialog';
import { DialogFiltersComponent } from './components';
import { InvoiceStatusFilterModule } from './invoice-status-filter';
diff --git a/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/components/dialog-filters/dialog-filters.component.ts b/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/components/dialog-filters/dialog-filters.component.ts
index 0c4e69c39..01216fe51 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/components/dialog-filters/dialog-filters.component.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/components/dialog-filters/dialog-filters.component.ts
@@ -1,6 +1,7 @@
import { ChangeDetectionStrategy, Component, Inject, OnInit } from '@angular/core';
import { FormBuilder } from '@angular/forms';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+
import { FormGroupByValue, FormGroupSuperclass, createControlProviders } from '@vality/matez';
import { AdditionalFilters } from '../../types';
diff --git a/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/invoice-status-filter/invoice-status-filter.component.ts b/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/invoice-status-filter/invoice-status-filter.component.ts
index 6490069c6..212344b45 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/invoice-status-filter/invoice-status-filter.component.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/invoice-status-filter/invoice-status-filter.component.ts
@@ -1,8 +1,9 @@
import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { AnapiDictionaryService } from '@dsh/app/api/anapi';
+
import { FormControlSuperclass, createControlProviders } from '@vality/matez';
import { InvoiceStatus } from '@vality/swag-anapi-v2';
-import { AnapiDictionaryService } from '@dsh/app/api/anapi';
@Component({
selector: 'dsh-invoice-status-filter',
diff --git a/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/invoice-status-filter/invoice-status-filter.module.ts b/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/invoice-status-filter/invoice-status-filter.module.ts
index da3044289..1221edef9 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/invoice-status-filter/invoice-status-filter.module.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/invoice-status-filter/invoice-status-filter.module.ts
@@ -1,12 +1,12 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { MatRadioModule } from '@angular/material/radio';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { InlineShowAllToggleModule } from '@dsh/app/shared/components/buttons/inline-show-all-toggle';
import { ExpandableRadioGroupModule } from '@dsh/app/shared/components/radio-buttons/expandable-radio-group';
+import { TranslocoModule } from '@jsverse/transloco';
import { InvoiceStatusFilterComponent } from './invoice-status-filter.component';
diff --git a/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/invoices-filter/invoices-filter.component.ts b/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/invoices-filter/invoices-filter.component.ts
index 69cac5173..44db1009f 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/invoices-filter/invoices-filter.component.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/invoices-filter/invoices-filter.component.ts
@@ -1,4 +1,5 @@
import { ChangeDetectionStrategy, Component } from '@angular/core';
+
import { FormControlSuperclass, createControlProviders } from '@vality/matez';
@Component({
diff --git a/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/invoices-filter/invoices-filter.module.ts b/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/invoices-filter/invoices-filter.module.ts
index b90f8a630..3d934a8f3 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/invoices-filter/invoices-filter.module.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/invoices-filter/invoices-filter.module.ts
@@ -1,10 +1,11 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
+import { InvoicesFieldModule } from '@dsh/app/shared/components/inputs/invoices-field';
import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-import { InvoicesFieldModule } from '@dsh/app/shared/components/inputs/invoices-field';
import { InvoicesFilterComponent } from './invoices-filter.component';
diff --git a/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/shops-filter/shops-filter.component.ts b/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/shops-filter/shops-filter.component.ts
index e3fea3931..5b9cae38b 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/shops-filter/shops-filter.component.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/shops-filter/shops-filter.component.ts
@@ -1,8 +1,9 @@
import { ChangeDetectionStrategy, Component } from '@angular/core';
import { FormBuilder } from '@angular/forms';
+import { ShopsDataService } from '@dsh/app/shared';
+
import { FormControlSuperclass, createControlProviders } from '@vality/matez';
-import { ShopsDataService } from '@dsh/app/shared';
@Component({
selector: 'dsh-shops-filter',
diff --git a/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/shops-filter/shops-filter.module.ts b/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/shops-filter/shops-filter.module.ts
index 3c6e726e6..1cf2a4372 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/shops-filter/shops-filter.module.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/shops-filter/shops-filter.module.ts
@@ -1,11 +1,12 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { MatFormFieldModule } from '@angular/material/form-field';
+import { ShopsFieldModule } from '@dsh/app/shared/components/inputs/shops-field';
import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-import { ShopsFieldModule } from '@dsh/app/shared/components/inputs/shops-field';
import { ShopsFilterComponent } from './shops-filter.component';
diff --git a/src/app/sections/payment-section/operations/invoices/invoices-search-filters/invoices-search-filters.component.ts b/src/app/sections/payment-section/operations/invoices/invoices-search-filters/invoices-search-filters.component.ts
index 0c16a0329..d0e1d8e29 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices-search-filters/invoices-search-filters.component.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices-search-filters/invoices-search-filters.component.ts
@@ -1,3 +1,11 @@
+import isEmpty from 'lodash-es/isEmpty';
+import negate from 'lodash-es/negate';
+import omit from 'lodash-es/omit';
+import pick from 'lodash-es/pick';
+import { MediaObserver } from 'ng-flex-layout';
+import { BehaviorSubject, ReplaySubject, combineLatest, defer } from 'rxjs';
+import { map, shareReplay } from 'rxjs/operators';
+
import {
ChangeDetectionStrategy,
Component,
@@ -11,16 +19,6 @@ import {
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { FormBuilder } from '@angular/forms';
import { MatDialog } from '@angular/material/dialog';
-import { ComponentChanges } from '@vality/matez';
-import { PaymentInstitution } from '@vality/swag-payments';
-import isEmpty from 'lodash-es/isEmpty';
-import negate from 'lodash-es/negate';
-import omit from 'lodash-es/omit';
-import pick from 'lodash-es/pick';
-import { MediaObserver } from 'ng-flex-layout';
-import { BehaviorSubject, ReplaySubject, combineLatest, defer } from 'rxjs';
-import { map, shareReplay } from 'rxjs/operators';
-
import { ShopsDataService } from '@dsh/app/shared';
import {
DateRangeWithPreset,
@@ -29,6 +27,9 @@ import {
} from '@dsh/components/date-range-filter';
import { getFormValueChanges } from '@dsh/utils';
+import { ComponentChanges } from '@vality/matez';
+import { PaymentInstitution } from '@vality/swag-payments';
+
import { filterShopsByRealm } from '../../operators';
import { AdditionalFilters, DialogFiltersComponent } from './additional-filters';
diff --git a/src/app/sections/payment-section/operations/invoices/invoices-search-filters/invoices-search-filters.module.ts b/src/app/sections/payment-section/operations/invoices/invoices-search-filters/invoices-search-filters.module.ts
index 4d1c17e1d..549f0695b 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices-search-filters/invoices-search-filters.module.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices-search-filters/invoices-search-filters.module.ts
@@ -1,15 +1,15 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { InvoiceStatusFilterModule, RefundStatusFilterModule } from '@dsh/app/shared/components';
import { InvoicesFilterModule } from '@dsh/app/shared/components/filters/invoices-filter';
import { ShopsFilterModule } from '@dsh/app/shared/components/filters/shops-filter';
import { DateRangeFilterModule } from '@dsh/components/date-range-filter';
import { FilterModule } from '@dsh/components/filter';
import { FiltersGroupModule } from '@dsh/components/filters-group';
+import { TranslocoModule } from '@jsverse/transloco';
import { AdditionalFiltersModule } from './additional-filters';
import { InvoicesSearchFiltersComponent } from './invoices-search-filters.component';
diff --git a/src/app/sections/payment-section/operations/invoices/invoices.component.ts b/src/app/sections/payment-section/operations/invoices/invoices.component.ts
index bbc7ea296..9335f3bcd 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices.component.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices.component.ts
@@ -1,11 +1,13 @@
+import { take } from 'rxjs/operators';
+
import { ChangeDetectionStrategy, Component, DestroyRef, OnInit, isDevMode } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { ShopsDataService } from '@dsh/app/shared';
+import { SpinnerType } from '@dsh/components/indicators';
import { TranslocoService } from '@jsverse/transloco';
+
import { NotifyLogService, QueryParamsService } from '@vality/matez';
-import { take } from 'rxjs/operators';
-import { ShopsDataService } from '@dsh/app/shared';
-import { SpinnerType } from '@dsh/components/indicators';
import { PaymentInstitutionRealmService, RealmMixService } from '../../services';
import { filterShopsByRealm } from '../operators';
diff --git a/src/app/sections/payment-section/operations/invoices/invoices.module.ts b/src/app/sections/payment-section/operations/invoices/invoices.module.ts
index cda3f87e2..7d9cb3ef3 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices.module.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices.module.ts
@@ -1,3 +1,5 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
@@ -12,9 +14,6 @@ import { MatMenuModule } from '@angular/material/menu';
import { MatSelectModule } from '@angular/material/select';
import { MatSnackBarModule } from '@angular/material/snack-bar';
import { MatMomentDateModule } from '@angular/material-moment-adapter';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { AuthModule } from '@dsh/app/auth';
import { InvoiceDetailsModule } from '@dsh/app/shared/components';
import { EmptySearchResultModule } from '@dsh/components/empty-search-result';
@@ -22,6 +21,7 @@ import { IndicatorsModule } from '@dsh/components/indicators';
import { LayoutModule } from '@dsh/components/layout';
import { StateNavModule } from '@dsh/components/navigation';
import { ShowMorePanelModule } from '@dsh/components/show-more-panel';
+import { TranslocoModule } from '@jsverse/transloco';
import { CreateInvoiceModule } from './create-invoice';
import { InvoicesListModule } from './invoices-list';
diff --git a/src/app/sections/payment-section/operations/invoices/services/fetch-invoices/fetch-invoices.service.ts b/src/app/sections/payment-section/operations/invoices/services/fetch-invoices/fetch-invoices.service.ts
index fb6ae79ce..6b4f08834 100644
--- a/src/app/sections/payment-section/operations/invoices/services/fetch-invoices/fetch-invoices.service.ts
+++ b/src/app/sections/payment-section/operations/invoices/services/fetch-invoices/fetch-invoices.service.ts
@@ -1,12 +1,13 @@
-import { Inject, Injectable } from '@angular/core';
-import { Invoice } from '@vality/swag-anapi-v2';
import { Observable } from 'rxjs';
import { shareReplay } from 'rxjs/operators';
+import { Inject, Injectable } from '@angular/core';
import { SearchService } from '@dsh/app/api/anapi';
import { mapToTimestamp } from '@dsh/app/custom-operators';
import { PartialFetcher } from '@dsh/app/shared';
+import { Invoice } from '@vality/swag-anapi-v2';
+
import { SEARCH_LIMIT } from '../../../../../tokens';
import { SearchFiltersParams } from '../../invoices-search-filters';
diff --git a/src/app/sections/payment-section/operations/invoices/services/invoices-expanded-id-manager/invoices-expanded-id-manager.service.ts b/src/app/sections/payment-section/operations/invoices/services/invoices-expanded-id-manager/invoices-expanded-id-manager.service.ts
index caa2a0a51..06960746c 100644
--- a/src/app/sections/payment-section/operations/invoices/services/invoices-expanded-id-manager/invoices-expanded-id-manager.service.ts
+++ b/src/app/sections/payment-section/operations/invoices/services/invoices-expanded-id-manager/invoices-expanded-id-manager.service.ts
@@ -1,9 +1,11 @@
+import { Observable } from 'rxjs';
+
import { Injectable } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
+import { ExpandedIdManager } from '@dsh/app/shared/services';
+
import { Invoice } from '@vality/swag-anapi-v2';
-import { Observable } from 'rxjs';
-import { ExpandedIdManager } from '@dsh/app/shared/services';
import { FetchInvoicesService } from '../fetch-invoices/fetch-invoices.service';
diff --git a/src/app/sections/payment-section/operations/operations-routing.module.ts b/src/app/sections/payment-section/operations/operations-routing.module.ts
index 4a82ffdb5..bc6419e4d 100644
--- a/src/app/sections/payment-section/operations/operations-routing.module.ts
+++ b/src/app/sections/payment-section/operations/operations-routing.module.ts
@@ -1,6 +1,5 @@
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
-
import { RoleAccessName, createPrivateRoute } from '@dsh/app/auth';
import { OperationsComponent } from './operations.component';
diff --git a/src/app/sections/payment-section/operations/operations.component.ts b/src/app/sections/payment-section/operations/operations.component.ts
index a304b4713..aeb52d03e 100644
--- a/src/app/sections/payment-section/operations/operations.component.ts
+++ b/src/app/sections/payment-section/operations/operations.component.ts
@@ -1,7 +1,7 @@
import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { RoleAccessName } from '@dsh/app/auth';
import { TranslocoService } from '@jsverse/transloco';
-import { RoleAccessName } from '@dsh/app/auth';
@Component({
templateUrl: 'operations.component.html',
diff --git a/src/app/sections/payment-section/operations/operations.module.ts b/src/app/sections/payment-section/operations/operations.module.ts
index 3533f2e11..274f2b021 100644
--- a/src/app/sections/payment-section/operations/operations.module.ts
+++ b/src/app/sections/payment-section/operations/operations.module.ts
@@ -1,12 +1,12 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatTabsModule } from '@angular/material/tabs';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { AuthModule } from '@dsh/app/auth';
import { LayoutModule } from '@dsh/components/layout';
import { ScrollUpModule } from '@dsh/components/navigation';
+import { TranslocoModule } from '@jsverse/transloco';
import { OperationsRoutingModule } from './operations-routing.module';
import { OperationsComponent } from './operations.component';
diff --git a/src/app/sections/payment-section/operations/operators/filter-shops-by-realm.ts b/src/app/sections/payment-section/operations/operators/filter-shops-by-realm.ts
index 128bd98d1..a104e914c 100644
--- a/src/app/sections/payment-section/operations/operators/filter-shops-by-realm.ts
+++ b/src/app/sections/payment-section/operations/operators/filter-shops-by-realm.ts
@@ -1,9 +1,10 @@
-import { PaymentInstitution, Shop } from '@vality/swag-payments';
import { Observable } from 'rxjs';
import { map, switchMap } from 'rxjs/operators';
import { toLiveShops, toTestShops } from '@dsh/app/api/payments';
+import { PaymentInstitution, Shop } from '@vality/swag-payments';
+
import RealmEnum = PaymentInstitution.RealmEnum;
export function getShopsByRealm(shops: Shop[], realm: RealmEnum): Shop[] {
diff --git a/src/app/sections/payment-section/operations/operators/map-to-shop-info.ts b/src/app/sections/payment-section/operations/operators/map-to-shop-info.ts
index 9da6351c6..2f37b5cef 100644
--- a/src/app/sections/payment-section/operations/operators/map-to-shop-info.ts
+++ b/src/app/sections/payment-section/operations/operators/map-to-shop-info.ts
@@ -1,7 +1,8 @@
-import { Shop } from '@vality/swag-payments';
import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
+import { Shop } from '@vality/swag-payments';
+
export interface ShopInfo {
shopID: string;
name: string;
diff --git a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/additional-filters.module.ts b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/additional-filters.module.ts
index 69d67b8db..3a0defcd4 100644
--- a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/additional-filters.module.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/additional-filters.module.ts
@@ -1,13 +1,14 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
import { MatDividerModule } from '@angular/material/divider';
import { MatIconModule } from '@angular/material/icon';
+import { BaseDialogModule } from '@dsh/app/shared/components/dialog/base-dialog';
import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-import { BaseDialogModule } from '@dsh/app/shared/components/dialog/base-dialog';
import { CardFilterModule } from './card-filter';
import { DialogFiltersComponent } from './components/dialog-filters/dialog-filters.component';
diff --git a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/card-filter/card-filter.component.ts b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/card-filter/card-filter.component.ts
index 737dd6919..4812fb410 100644
--- a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/card-filter/card-filter.component.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/card-filter/card-filter.component.ts
@@ -1,8 +1,9 @@
import { ChangeDetectionStrategy, Component } from '@angular/core';
import { FormBuilder } from '@angular/forms';
+import { binValidator, panValidator } from '@dsh/components/form-controls';
+
import { FormGroupSuperclass, createControlProviders } from '@vality/matez';
-import { binValidator, panValidator } from '@dsh/components/form-controls';
import { CardFilterForm } from './types';
diff --git a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/card-filter/card-filter.module.ts b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/card-filter/card-filter.module.ts
index 93e2dc8d8..183574191 100644
--- a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/card-filter/card-filter.module.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/card-filter/card-filter.module.ts
@@ -1,10 +1,11 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatInputModule } from '@angular/material/input';
import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
import { CardBinPanFilterModule } from '../../card-bin-pan-filter';
diff --git a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/components/dialog-filters/dialog-filters.component.ts b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/components/dialog-filters/dialog-filters.component.ts
index 9808b502f..d5da4dba2 100644
--- a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/components/dialog-filters/dialog-filters.component.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/components/dialog-filters/dialog-filters.component.ts
@@ -1,6 +1,7 @@
import { ChangeDetectionStrategy, Component, Inject, OnInit } from '@angular/core';
import { FormBuilder, FormGroup } from '@angular/forms';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+
import { FormGroupSuperclass, createControlProviders } from '@vality/matez';
import { paymentStatusValidator } from '../../payment-status-filter';
diff --git a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/invoices-filter/invoices-filter.component.ts b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/invoices-filter/invoices-filter.component.ts
index 4896e0b76..943d593a9 100644
--- a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/invoices-filter/invoices-filter.component.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/invoices-filter/invoices-filter.component.ts
@@ -1,5 +1,6 @@
import { ChangeDetectionStrategy, Component } from '@angular/core';
import { FormBuilder, FormGroup } from '@angular/forms';
+
import { FormGroupSuperclass, createControlProviders } from '@vality/matez';
import { InvoicesFilterForm } from './types';
diff --git a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/invoices-filter/invoices-filter.module.ts b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/invoices-filter/invoices-filter.module.ts
index b90f8a630..3d934a8f3 100644
--- a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/invoices-filter/invoices-filter.module.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/invoices-filter/invoices-filter.module.ts
@@ -1,10 +1,11 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
+import { InvoicesFieldModule } from '@dsh/app/shared/components/inputs/invoices-field';
import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-import { InvoicesFieldModule } from '@dsh/app/shared/components/inputs/invoices-field';
import { InvoicesFilterComponent } from './invoices-filter.component';
diff --git a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/main-filters/main-filters.component.ts b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/main-filters/main-filters.component.ts
index 2f9e58392..ccffa0cd5 100644
--- a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/main-filters/main-filters.component.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/main-filters/main-filters.component.ts
@@ -1,5 +1,6 @@
import { ChangeDetectionStrategy, Component } from '@angular/core';
import { FormBuilder, Validators } from '@angular/forms';
+
import { FormGroupSuperclass, createControlProviders } from '@vality/matez';
import { MainFiltersForm } from './types/main-filters-form';
diff --git a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/main-filters/main-filters.module.ts b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/main-filters/main-filters.module.ts
index 755fbd416..4ec47a270 100644
--- a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/main-filters/main-filters.module.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/main-filters/main-filters.module.ts
@@ -1,10 +1,11 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatInputModule } from '@angular/material/input';
import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
import { MainFiltersComponent } from './main-filters.component';
diff --git a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-status-filter/payment-status-filter.component.ts b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-status-filter/payment-status-filter.component.ts
index ab783de7e..2f5d80aba 100644
--- a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-status-filter/payment-status-filter.component.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-status-filter/payment-status-filter.component.ts
@@ -1,8 +1,9 @@
import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { AnapiDictionaryService } from '@dsh/app/api/anapi';
+
import { FormControlSuperclass, createControlProviders } from '@vality/matez';
import { PaymentStatus } from '@vality/swag-anapi-v2';
-import { AnapiDictionaryService } from '@dsh/app/api/anapi';
@Component({
selector: 'dsh-payment-status-filter',
diff --git a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-status-filter/payment-status-filter.module.ts b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-status-filter/payment-status-filter.module.ts
index fdf332f9a..bf664a051 100644
--- a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-status-filter/payment-status-filter.module.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-status-filter/payment-status-filter.module.ts
@@ -1,12 +1,12 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { MatRadioModule } from '@angular/material/radio';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { InlineShowAllToggleModule } from '@dsh/app/shared/components/buttons/inline-show-all-toggle';
import { ExpandableRadioGroupModule } from '@dsh/app/shared/components/radio-buttons/expandable-radio-group';
+import { TranslocoModule } from '@jsverse/transloco';
import { PaymentStatusFilterComponent } from './payment-status-filter.component';
diff --git a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-status-filter/validators/payment-status-validator.ts b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-status-filter/validators/payment-status-validator.ts
index c598e268e..24e1d96a1 100644
--- a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-status-filter/validators/payment-status-validator.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-status-filter/validators/payment-status-validator.ts
@@ -1,6 +1,8 @@
+import isNil from 'lodash-es/isNil';
+
import { FormControl, ValidatorFn } from '@angular/forms';
+
import { PaymentStatus } from '@vality/swag-anapi-v2';
-import isNil from 'lodash-es/isNil';
export const paymentStatusValidator: ValidatorFn = (
control: FormControl,
diff --git a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-sum-filter/payment-sum-filter.component.ts b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-sum-filter/payment-sum-filter.component.ts
index 98aa01bbd..0e4f7e202 100644
--- a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-sum-filter/payment-sum-filter.component.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-sum-filter/payment-sum-filter.component.ts
@@ -1,5 +1,6 @@
import { ChangeDetectionStrategy, Component } from '@angular/core';
import { FormBuilder } from '@angular/forms';
+
import { FormGroupSuperclass, createControlProviders } from '@vality/matez';
import { PaymentSumFilterForm } from './types/payment-sum-filter-form';
diff --git a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-sum-filter/payment-sum-filter.module.ts b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-sum-filter/payment-sum-filter.module.ts
index 576f9642a..a762bdcbb 100644
--- a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-sum-filter/payment-sum-filter.module.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-sum-filter/payment-sum-filter.module.ts
@@ -1,10 +1,11 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatInputModule } from '@angular/material/input';
import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
import { PaymentSumFilterComponent } from './payment-sum-filter.component';
diff --git a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-system-filter/payment-system-filter.component.ts b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-system-filter/payment-system-filter.component.ts
index eeae959fa..0595b4c43 100644
--- a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-system-filter/payment-system-filter.component.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-system-filter/payment-system-filter.component.ts
@@ -1,9 +1,10 @@
import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { AnapiDictionaryService } from '@dsh/app/api/anapi';
+import { PaymentSystem } from '@dsh/app/api/payments';
+
import { FormControlSuperclass, createControlProviders } from '@vality/matez';
import { SearchPaymentsRequestParams } from '@vality/swag-anapi-v2';
-import { AnapiDictionaryService } from '@dsh/app/api/anapi';
-import { PaymentSystem } from '@dsh/app/api/payments';
@Component({
selector: 'dsh-payment-system-filter',
diff --git a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-system-filter/payment-system-filter.module.ts b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-system-filter/payment-system-filter.module.ts
index 8071e85ad..d85937566 100644
--- a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-system-filter/payment-system-filter.module.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-system-filter/payment-system-filter.module.ts
@@ -1,9 +1,10 @@
+import { FlexModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
+import { ExpandableRadioGroupModule } from '@dsh/app/shared/components/radio-buttons/expandable-radio-group';
import { TranslocoModule } from '@jsverse/transloco';
-import { FlexModule } from 'ng-flex-layout';
-import { ExpandableRadioGroupModule } from '@dsh/app/shared/components/radio-buttons/expandable-radio-group';
import { PaymentSystemFilterComponent } from './payment-system-filter.component';
diff --git a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/shops-filter/shops-filter.component.ts b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/shops-filter/shops-filter.component.ts
index 89c885a37..ff48cfd9b 100644
--- a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/shops-filter/shops-filter.component.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/shops-filter/shops-filter.component.ts
@@ -1,8 +1,9 @@
import { ChangeDetectionStrategy, Component } from '@angular/core';
import { FormBuilder, FormGroup } from '@angular/forms';
+import { ShopsDataService } from '@dsh/app/shared';
+
import { FormGroupSuperclass, createControlProviders } from '@vality/matez';
-import { ShopsDataService } from '@dsh/app/shared';
import { ShopsFilterForm } from './types';
diff --git a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/shops-filter/shops-filter.module.ts b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/shops-filter/shops-filter.module.ts
index 3c6e726e6..1cf2a4372 100644
--- a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/shops-filter/shops-filter.module.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/shops-filter/shops-filter.module.ts
@@ -1,11 +1,12 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { MatFormFieldModule } from '@angular/material/form-field';
+import { ShopsFieldModule } from '@dsh/app/shared/components/inputs/shops-field';
import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-import { ShopsFieldModule } from '@dsh/app/shared/components/inputs/shops-field';
import { ShopsFilterComponent } from './shops-filter.component';
diff --git a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/token-provider-filter/token-provider-filter.component.ts b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/token-provider-filter/token-provider-filter.component.ts
index 3fab75001..0dd839605 100644
--- a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/token-provider-filter/token-provider-filter.component.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/token-provider-filter/token-provider-filter.component.ts
@@ -1,9 +1,10 @@
import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { AnapiDictionaryService } from '@dsh/app/api/anapi';
+import { TokenProvider } from '@dsh/app/api/payments';
+
import { FormControlSuperclass, createControlProviders } from '@vality/matez';
import { SearchPaymentsRequestParams } from '@vality/swag-anapi-v2';
-import { AnapiDictionaryService } from '@dsh/app/api/anapi';
-import { TokenProvider } from '@dsh/app/api/payments';
@Component({
selector: 'dsh-token-provider-filter',
diff --git a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/token-provider-filter/token-provider-filter.module.ts b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/token-provider-filter/token-provider-filter.module.ts
index 9f2c68913..d7edd04b3 100644
--- a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/token-provider-filter/token-provider-filter.module.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/token-provider-filter/token-provider-filter.module.ts
@@ -1,9 +1,10 @@
+import { FlexModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
+import { ExpandableRadioGroupModule } from '@dsh/app/shared/components/radio-buttons/expandable-radio-group';
import { TranslocoModule } from '@jsverse/transloco';
-import { FlexModule } from 'ng-flex-layout';
-import { ExpandableRadioGroupModule } from '@dsh/app/shared/components/radio-buttons/expandable-radio-group';
import { TokenProviderFilterComponent } from './token-provider-filter.component';
diff --git a/src/app/sections/payment-section/operations/payments/payments-filters/card-bin-pan-filter/card-bin-pan-filter.component.ts b/src/app/sections/payment-section/operations/payments/payments-filters/card-bin-pan-filter/card-bin-pan-filter.component.ts
index 3e72ec3e8..75d113a6e 100644
--- a/src/app/sections/payment-section/operations/payments/payments-filters/card-bin-pan-filter/card-bin-pan-filter.component.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-filters/card-bin-pan-filter/card-bin-pan-filter.component.ts
@@ -1,10 +1,10 @@
import { ChangeDetectionStrategy, Component, Injector } from '@angular/core';
import { FormBuilder } from '@angular/forms';
-import { createControlProviders } from '@vality/matez';
-
import { FilterSuperclass } from '@dsh/components/filter';
import { binValidator, panValidator } from '@dsh/components/form-controls';
+import { createControlProviders } from '@vality/matez';
+
import { CardBinPan } from './types/card-bin-pan';
@Component({
diff --git a/src/app/sections/payment-section/operations/payments/payments-filters/card-bin-pan-filter/card-bin-pan-filter.module.ts b/src/app/sections/payment-section/operations/payments/payments-filters/card-bin-pan-filter/card-bin-pan-filter.module.ts
index e28814990..43f33f5b5 100644
--- a/src/app/sections/payment-section/operations/payments/payments-filters/card-bin-pan-filter/card-bin-pan-filter.module.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-filters/card-bin-pan-filter/card-bin-pan-filter.module.ts
@@ -1,12 +1,13 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatInputModule } from '@angular/material/input';
+import { FilterModule } from '@dsh/components/filter';
import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-import { FilterModule } from '@dsh/components/filter';
import { CardBinPanFilterComponent } from './card-bin-pan-filter.component';
import { CardBinPanLabelPipe } from './pipes/card-bin-pan-label.pipe';
diff --git a/src/app/sections/payment-section/operations/payments/payments-filters/card-bin-pan-filter/pipes/card-bin-pan-label.pipe.ts b/src/app/sections/payment-section/operations/payments/payments-filters/card-bin-pan-filter/pipes/card-bin-pan-label.pipe.ts
index 646dbff67..0658f026a 100644
--- a/src/app/sections/payment-section/operations/payments/payments-filters/card-bin-pan-filter/pipes/card-bin-pan-label.pipe.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-filters/card-bin-pan-filter/pipes/card-bin-pan-label.pipe.ts
@@ -1,5 +1,4 @@
import { Pipe, PipeTransform } from '@angular/core';
-
import { splitCardNumber } from '@dsh/app/shared/utils/split-card-number';
import { CardBinPan } from '../types/card-bin-pan';
diff --git a/src/app/sections/payment-section/operations/payments/payments-filters/payments-filters.component.ts b/src/app/sections/payment-section/operations/payments/payments-filters/payments-filters.component.ts
index 42516ac3a..40000b251 100644
--- a/src/app/sections/payment-section/operations/payments/payments-filters/payments-filters.component.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-filters/payments-filters.component.ts
@@ -1,3 +1,11 @@
+import isEmpty from 'lodash-es/isEmpty';
+import negate from 'lodash-es/negate';
+import omit from 'lodash-es/omit';
+import pick from 'lodash-es/pick';
+import { MediaObserver } from 'ng-flex-layout';
+import { BehaviorSubject, ReplaySubject, combineLatest, defer } from 'rxjs';
+import { map, shareReplay } from 'rxjs/operators';
+
import {
ChangeDetectionStrategy,
Component,
@@ -11,20 +19,13 @@ import {
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { AbstractControl, FormBuilder } from '@angular/forms';
import { MatDialog } from '@angular/material/dialog';
-import { ComponentChanges } from '@vality/matez';
-import { PaymentInstitution, Shop } from '@vality/swag-payments';
-import isEmpty from 'lodash-es/isEmpty';
-import negate from 'lodash-es/negate';
-import omit from 'lodash-es/omit';
-import pick from 'lodash-es/pick';
-import { MediaObserver } from 'ng-flex-layout';
-import { BehaviorSubject, ReplaySubject, combineLatest, defer } from 'rxjs';
-import { map, shareReplay } from 'rxjs/operators';
-
import { ShopsDataService } from '@dsh/app/shared';
import { DateRange, Preset, createDateRangeWithPreset } from '@dsh/components/date-range-filter';
import { getFormValueChanges } from '@dsh/utils';
+import { ComponentChanges } from '@vality/matez';
+import { PaymentInstitution, Shop } from '@vality/swag-payments';
+
import { filterShopsByRealm } from '../../operators';
import { AdditionalFilters, FloatingFilters } from './additional-filters';
diff --git a/src/app/sections/payment-section/operations/payments/payments-filters/payments-filters.module.ts b/src/app/sections/payment-section/operations/payments/payments-filters/payments-filters.module.ts
index a5efc89e6..60233ec03 100644
--- a/src/app/sections/payment-section/operations/payments/payments-filters/payments-filters.module.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-filters/payments-filters.module.ts
@@ -1,15 +1,15 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { InvoicesFilterModule } from '@dsh/app/shared/components';
import { ShopsFilterModule } from '@dsh/app/shared/components/filters/shops-filter';
import { DaterangeManagerModule } from '@dsh/app/shared/services/date-range-manager';
import { DateRangeFilterModule } from '@dsh/components/date-range-filter';
import { FilterModule } from '@dsh/components/filter/filter.module';
import { FiltersGroupModule } from '@dsh/components/filters-group';
+import { TranslocoModule } from '@jsverse/transloco';
import { AdditionalFiltersModule } from './additional-filters';
import { CardBinPanFilterModule } from './card-bin-pan-filter';
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/components/row/payments-row.component.ts b/src/app/sections/payment-section/operations/payments/payments-panels/components/row/payments-row.component.ts
index c38a26ee8..8fd6ed31d 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/components/row/payments-row.component.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/components/row/payments-row.component.ts
@@ -1,4 +1,5 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+
import { PaymentSearchResult } from '@vality/swag-anapi-v2';
@Component({
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payment-detail-header/payment-detail-header.module.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payment-detail-header/payment-detail-header.module.ts
index ba9168a84..28e330f68 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payment-detail-header/payment-detail-header.module.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payment-detail-header/payment-detail-header.module.ts
@@ -1,7 +1,8 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
import { PaymentDetailHeaderComponent } from './payment-detail-header.component';
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/cancel-hold/cancel-hold.module.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/cancel-hold/cancel-hold.module.ts
index 08c06697a..996c0de68 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/cancel-hold/cancel-hold.module.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/cancel-hold/cancel-hold.module.ts
@@ -1,12 +1,12 @@
+import { FlexModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexModule } from 'ng-flex-layout';
-
import { BaseDialogModule } from '@dsh/app/shared/components/dialog/base-dialog';
import { MaxLengthInputModule } from '@dsh/app/shared/components/inputs/max-length-input/max-length-input.module';
+import { TranslocoModule } from '@jsverse/transloco';
import { CancelHoldService } from './cancel-hold.service';
import { CancelHoldDialogComponent } from './components/cancel-hold-dialog/cancel-hold-dialog.component';
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/cancel-hold/cancel-hold.service.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/cancel-hold/cancel-hold.service.ts
index 218a14908..2f8310b40 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/cancel-hold/cancel-hold.service.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/cancel-hold/cancel-hold.service.ts
@@ -1,7 +1,7 @@
-import { Injectable } from '@angular/core';
-import { MatDialog } from '@angular/material/dialog';
import { Observable } from 'rxjs';
+import { Injectable } from '@angular/core';
+import { MatDialog } from '@angular/material/dialog';
import { BaseDialogResponseStatus } from '@dsh/app/shared/components/dialog/base-dialog';
import { CancelHoldDialogComponent } from './components/cancel-hold-dialog/cancel-hold-dialog.component';
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/cancel-hold/components/cancel-hold-dialog/cancel-hold-dialog.component.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/cancel-hold/components/cancel-hold-dialog/cancel-hold-dialog.component.ts
index b9dd19eba..891d94dbc 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/cancel-hold/components/cancel-hold-dialog/cancel-hold-dialog.component.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/cancel-hold/components/cancel-hold-dialog/cancel-hold-dialog.component.ts
@@ -1,12 +1,12 @@
import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
import { FormBuilder, Validators } from '@angular/forms';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { FormGroupByValue } from '@vality/matez';
-
import { PaymentsService } from '@dsh/app/api/payments';
import { BaseDialogResponseStatus } from '@dsh/app/shared/components/dialog/base-dialog';
import { ErrorService } from '@dsh/app/shared/services';
+import { FormGroupByValue } from '@vality/matez';
+
import { CreateRefundForm } from '../../../../refunds/create-refund/types/create-refund-form';
import { MAX_REASON_LENGTH } from '../../../consts';
import { CancelHoldDialogData } from '../../types/cancel-hold-dialog-data';
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/create-hold/components/create-hold-dialog/create-hold-dialog.component.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/create-hold/components/create-hold-dialog/create-hold-dialog.component.ts
index cc953d82c..aaed2b730 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/create-hold/components/create-hold-dialog/create-hold-dialog.component.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/create-hold/components/create-hold-dialog/create-hold-dialog.component.ts
@@ -1,16 +1,17 @@
+import isNil from 'lodash-es/isNil';
+
import { ChangeDetectionStrategy, Component, DestroyRef, Inject } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { FormBuilder, Validators } from '@angular/forms';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { FormGroupByValue, toMajor, toMinor } from '@vality/matez';
-import { CaptureParams } from '@vality/swag-payments';
-import isNil from 'lodash-es/isNil';
-
import { PaymentsService } from '@dsh/app/api/payments';
import { BaseDialogResponseStatus } from '@dsh/app/shared/components/dialog/base-dialog';
import { ErrorService } from '@dsh/app/shared/services';
import { amountValidator } from '@dsh/components/form-controls';
+import { FormGroupByValue, toMajor, toMinor } from '@vality/matez';
+import { CaptureParams } from '@vality/swag-payments';
+
import { CreateRefundForm } from '../../../../refunds/create-refund/types/create-refund-form';
import { MAX_REASON_LENGTH } from '../../../consts';
import { CreateHoldDialogData } from '../../types/create-hold-dialog-data';
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/create-hold/create-hold.module.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/create-hold/create-hold.module.ts
index b12fb83f2..cad8b3415 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/create-hold/create-hold.module.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/create-hold/create-hold.module.ts
@@ -1,3 +1,5 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
@@ -5,11 +7,9 @@ import { MatButtonModule } from '@angular/material/button';
import { MatCheckboxModule } from '@angular/material/checkbox';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatInputModule } from '@angular/material/input';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { BaseDialogModule } from '@dsh/app/shared/components/dialog/base-dialog';
import { MaxLengthInputModule } from '@dsh/app/shared/components/inputs/max-length-input/max-length-input.module';
+import { TranslocoModule } from '@jsverse/transloco';
import { CreateHoldDialogComponent } from './components/create-hold-dialog/create-hold-dialog.component';
import { CreateHoldService } from './create-hold.service';
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/create-hold/create-hold.service.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/create-hold/create-hold.service.ts
index 3323d4325..08eca1f4c 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/create-hold/create-hold.service.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/create-hold/create-hold.service.ts
@@ -1,7 +1,7 @@
-import { Injectable } from '@angular/core';
-import { MatDialog } from '@angular/material/dialog';
import { Observable } from 'rxjs';
+import { Injectable } from '@angular/core';
+import { MatDialog } from '@angular/material/dialog';
import { BaseDialogResponseStatus } from '@dsh/app/shared/components/dialog/base-dialog';
import { CreateHoldDialogComponent } from './components/create-hold-dialog/create-hold-dialog.component';
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/hold-details.component.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/hold-details.component.ts
index a5f03c566..428aa1ff1 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/hold-details.component.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/hold-details.component.ts
@@ -1,3 +1,5 @@
+import { filter } from 'rxjs/operators';
+
import {
ChangeDetectionStrategy,
Component,
@@ -7,10 +9,10 @@ import {
Output,
} from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { BaseDialogResponseStatus } from '@dsh/app/shared/components/dialog/base-dialog';
+
import { PaymentFlowHold, PaymentSearchResult } from '@vality/swag-anapi-v2';
-import { filter } from 'rxjs/operators';
-import { BaseDialogResponseStatus } from '@dsh/app/shared/components/dialog/base-dialog';
import { PaymentIds } from '../../../types/payment-ids';
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/hold-details.module.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/hold-details.module.ts
index d6e4b842b..8ae69807e 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/hold-details.module.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/hold-details.module.ts
@@ -1,8 +1,9 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
import { HumanizeDurationModule } from '../../../../../../../humanize-duration';
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/pipes/hold-active/hold-active.pipe.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/pipes/hold-active/hold-active.pipe.ts
index c0fa5e347..33acc11ea 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/pipes/hold-active/hold-active.pipe.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/pipes/hold-active/hold-active.pipe.ts
@@ -1,6 +1,8 @@
+import moment from 'moment';
+
import { Pipe, PipeTransform } from '@angular/core';
+
import { PaymentStatus } from '@vality/swag-payments';
-import moment from 'moment';
@Pipe({
name: 'holdActive',
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-details.component.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-details.component.ts
index a86ffe461..b9669d83d 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-details.component.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-details.component.ts
@@ -1,3 +1,6 @@
+import isEmpty from 'lodash-es/isEmpty';
+import { Observable } from 'rxjs';
+
import {
ChangeDetectionStrategy,
Component,
@@ -6,10 +9,9 @@ import {
OnChanges,
Output,
} from '@angular/core';
+
import { ComponentChanges } from '@vality/matez';
import { Invoice, PaymentSearchResult } from '@vality/swag-anapi-v2';
-import isEmpty from 'lodash-es/isEmpty';
-import { Observable } from 'rxjs';
import { PaymentIds } from '../../types';
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-invoice-info/payment-invoice-info.component.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-invoice-info/payment-invoice-info.component.ts
index 65a754492..b61d457bb 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-invoice-info/payment-invoice-info.component.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-invoice-info/payment-invoice-info.component.ts
@@ -1,4 +1,5 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+
import { Invoice } from '@vality/swag-payments';
@Component({
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-invoice-info/payment-invoice-info.module.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-invoice-info/payment-invoice-info.module.ts
index d5cb39b0b..a404bbe1e 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-invoice-info/payment-invoice-info.module.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-invoice-info/payment-invoice-info.module.ts
@@ -1,11 +1,12 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatIconModule } from '@angular/material/icon';
import { RouterModule } from '@angular/router';
+import { InvoiceDetailsModule } from '@dsh/app/shared/components';
import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-import { InvoiceDetailsModule } from '@dsh/app/shared/components';
import { PaymentInvoiceInfoComponent } from './payment-invoice-info.component';
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/components/charge-amount/charge-amount.component.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/components/charge-amount/charge-amount.component.ts
index 9bbafa491..a1bf8c87a 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/components/charge-amount/charge-amount.component.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/components/charge-amount/charge-amount.component.ts
@@ -1,6 +1,8 @@
+import isNil from 'lodash-es/isNil';
+
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+
import { PaymentSearchResult } from '@vality/swag-anapi-v2';
-import isNil from 'lodash-es/isNil';
@Component({
selector: 'dsh-charge-amount',
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/components/payment-fee/payment-fee.component.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/components/payment-fee/payment-fee.component.ts
index 01ab1d9e2..e8773d127 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/components/payment-fee/payment-fee.component.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/components/payment-fee/payment-fee.component.ts
@@ -1,6 +1,8 @@
+import isNil from 'lodash-es/isNil';
+
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+
import { PaymentSearchResult } from '@vality/swag-anapi-v2';
-import isNil from 'lodash-es/isNil';
@Component({
selector: 'dsh-payment-fee',
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/components/payment-status-details-item/payment-status-details-item.component.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/components/payment-status-details-item/payment-status-details-item.component.ts
index 912310d06..b2602bbcd 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/components/payment-status-details-item/payment-status-details-item.component.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/components/payment-status-details-item/payment-status-details-item.component.ts
@@ -1,4 +1,5 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+
import { PaymentSearchResult } from '@vality/swag-anapi-v2';
@Component({
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/components/resource-payer/resource-payer.component.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/components/resource-payer/resource-payer.component.ts
index 18d0011c3..bdf16c9a8 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/components/resource-payer/resource-payer.component.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/components/resource-payer/resource-payer.component.ts
@@ -1,4 +1,5 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+
import { PaymentResourcePayer } from '@vality/swag-anapi-v2';
@Component({
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-main-info.component.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-main-info.component.ts
index e02b5d483..b5c83b8a9 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-main-info.component.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-main-info.component.ts
@@ -1,6 +1,8 @@
+import isObject from 'lodash-es/isObject';
+
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+
import { PaymentResourcePayer, PaymentSearchResult } from '@vality/swag-anapi-v2';
-import isObject from 'lodash-es/isObject';
import { CommonPayer } from './types/common-payer';
import { PaymentAdditionalInfo } from './types/payment-additional-info';
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-main-info.module.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-main-info.module.ts
index 65c0a0aac..9a7ce46f8 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-main-info.module.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-main-info.module.ts
@@ -1,13 +1,13 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { TranslocoModule } from '@jsverse/transloco';
import { FlexLayoutModule } from 'ng-flex-layout';
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
import { PaymentStatusComponent } from '@dsh/app/shared/components/payment-status';
import { AmountCurrencyModule, ApiModelRefsModule } from '@dsh/app/shared/pipes';
import { StatusModule } from '@dsh/components/indicators';
import { DetailsItemModule } from '@dsh/components/layout';
import { CollapseModule } from '@dsh/components/layout/collapse';
+import { TranslocoModule } from '@jsverse/transloco';
import { AdditionalInfoComponent } from './components/additional-info/additional-info.component';
import { ChargeAmountComponent } from './components/charge-amount/charge-amount.component';
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/components/bank-card/bank-card.component.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/components/bank-card/bank-card.component.ts
index 1f6ba226b..d2638b6e0 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/components/bank-card/bank-card.component.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/components/bank-card/bank-card.component.ts
@@ -1,7 +1,8 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { PaymentSystem, TokenProvider } from '@dsh/app/api/payments';
+
import { BankCardDetails } from '@vality/swag-payments';
-import { PaymentSystem, TokenProvider } from '@dsh/app/api/payments';
interface BankCardIconConfig {
iconName: string;
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/components/digital-wallet/digital-wallet.component.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/components/digital-wallet/digital-wallet.component.ts
index 3595c517a..eb84dd19d 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/components/digital-wallet/digital-wallet.component.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/components/digital-wallet/digital-wallet.component.ts
@@ -1,4 +1,5 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+
import { DigitalWalletDetails } from '@vality/swag-payments';
@Component({
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/components/mobile-commerce/mobile-commerce.component.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/components/mobile-commerce/mobile-commerce.component.ts
index 9e97e9bc9..d749a1ad9 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/components/mobile-commerce/mobile-commerce.component.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/components/mobile-commerce/mobile-commerce.component.ts
@@ -1,4 +1,5 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+
import { MobileCommerceDetails } from '@vality/swag-anapi-v2';
@Component({
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/components/payment-terminal/payment-terminal.component.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/components/payment-terminal/payment-terminal.component.ts
index 55c18c2e3..45b5304cf 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/components/payment-terminal/payment-terminal.component.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/components/payment-terminal/payment-terminal.component.ts
@@ -1,4 +1,5 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+
import { PaymentTerminalDetails } from '@vality/swag-payments';
@Component({
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/payment-tool.component.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/payment-tool.component.ts
index 385054a82..729bca236 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/payment-tool.component.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/payment-tool.component.ts
@@ -1,7 +1,8 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { PaymentToolDetailsType } from '@dsh/app/api/payments';
+
import { PaymentToolDetails } from '@vality/swag-payments';
-import { PaymentToolDetailsType } from '@dsh/app/api/payments';
@Component({
selector: 'dsh-payment-tool',
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/payment-tool.module.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/payment-tool.module.ts
index 23eefe90c..7c78b5c62 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/payment-tool.module.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/payment-tool.module.ts
@@ -1,10 +1,11 @@
+import { FlexModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatIconModule } from '@angular/material/icon';
+import { DetailsItemModule } from '@dsh/components/layout';
import { TranslocoModule } from '@jsverse/transloco';
-import { FlexModule } from 'ng-flex-layout';
-import { DetailsItemModule } from '@dsh/components/layout';
import { BankCardComponent } from './components/bank-card/bank-card.component';
import { DigitalWalletComponent } from './components/digital-wallet/digital-wallet.component';
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/pipes/payment-error-message/payment-error-message.pipe.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/pipes/payment-error-message/payment-error-message.pipe.ts
index 333928e79..93db728f5 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/pipes/payment-error-message/payment-error-message.pipe.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/pipes/payment-error-message/payment-error-message.pipe.ts
@@ -1,12 +1,14 @@
-import { Pipe, PipeTransform } from '@angular/core';
-import { TranslocoService } from '@jsverse/transloco';
-import { PaymentError } from '@vality/swag-payments';
import isObject from 'lodash-es/isObject';
import lowerCase from 'lodash-es/lowerCase';
import upperFirst from 'lodash-es/upperFirst';
import { Observable } from 'rxjs';
import { first, map } from 'rxjs/operators';
+import { Pipe, PipeTransform } from '@angular/core';
+import { TranslocoService } from '@jsverse/transloco';
+
+import { PaymentError } from '@vality/swag-payments';
+
function renderSubErrorMessage(error?: string, sub?: string) {
if (!error) {
return sub;
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payments-details.module.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payments-details.module.ts
index 421c08a48..2fee43e62 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payments-details.module.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payments-details.module.ts
@@ -1,10 +1,11 @@
+import { FlexModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatDividerModule } from '@angular/material/divider';
+import { ErrorModule } from '@dsh/app/shared/services';
import { TranslocoModule } from '@jsverse/transloco';
-import { FlexModule } from 'ng-flex-layout';
-import { ErrorModule } from '@dsh/app/shared/services';
import { HoldDetailsModule } from './hold-details';
import { PaymentDetailsComponent } from './payment-details.component';
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/create-refund/components/create-refund-dialog/create-refund-dialog.component.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/create-refund/components/create-refund-dialog/create-refund-dialog.component.ts
index f62c01298..e93dfd32a 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/create-refund/components/create-refund-dialog/create-refund-dialog.component.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/create-refund/components/create-refund-dialog/create-refund-dialog.component.ts
@@ -1,16 +1,18 @@
+import isEmpty from 'lodash-es/isEmpty';
+import isNil from 'lodash-es/isNil';
+import { Observable } from 'rxjs';
+import { map, shareReplay, take, withLatestFrom } from 'rxjs/operators';
+
import { HttpErrorResponse } from '@angular/common/http';
import { ChangeDetectionStrategy, Component, Inject, OnInit } from '@angular/core';
import { FormBuilder, Validators } from '@angular/forms';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { amountValidator } from '@dsh/components/form-controls';
import { TranslocoService } from '@jsverse/transloco';
+
import { FormGroupByValue, NotifyLogService, toMajor, toMinor } from '@vality/matez';
import { Refund, RefundParams } from '@vality/swag-payments';
-import isEmpty from 'lodash-es/isEmpty';
-import isNil from 'lodash-es/isNil';
-import { Observable } from 'rxjs';
-import { map, shareReplay, take, withLatestFrom } from 'rxjs/operators';
-import { amountValidator } from '@dsh/components/form-controls';
import { RefundsService } from '../../services/refunds/refunds.service';
import { Balance } from '../../types/balance';
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/create-refund/create-refund.module.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/create-refund/create-refund.module.ts
index 78e5dc382..57a0f5040 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/create-refund/create-refund.module.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/create-refund/create-refund.module.ts
@@ -1,3 +1,5 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
@@ -5,12 +7,10 @@ import { MatButtonModule } from '@angular/material/button';
import { MatCheckboxModule } from '@angular/material/checkbox';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatInputModule } from '@angular/material/input';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { BaseDialogModule } from '@dsh/app/shared/components/dialog/base-dialog';
import { MaxLengthInputModule } from '@dsh/app/shared/components/inputs/max-length-input/max-length-input.module';
import { AmountCurrencyModule } from '@dsh/app/shared/pipes';
+import { TranslocoModule } from '@jsverse/transloco';
import { CreateRefundDialogComponent } from './components/create-refund-dialog/create-refund-dialog.component';
import { CreateRefundService } from './create-refund.service';
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/create-refund/create-refund.service.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/create-refund/create-refund.service.ts
index d3eda40a9..5bde9f4ae 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/create-refund/create-refund.service.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/create-refund/create-refund.service.ts
@@ -1,6 +1,7 @@
+import { Observable } from 'rxjs';
+
import { Injectable } from '@angular/core';
import { MatDialog } from '@angular/material/dialog';
-import { Observable } from 'rxjs';
import { CreateRefundDialogComponent } from './components/create-refund-dialog/create-refund-dialog.component';
import { CreateRefundDialogData } from './types/create-refund-dialog-data';
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/create-refund/services/refunds/refunds.service.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/create-refund/services/refunds/refunds.service.ts
index 2b4102f1c..fca8b5350 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/create-refund/services/refunds/refunds.service.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/create-refund/services/refunds/refunds.service.ts
@@ -1,10 +1,11 @@
-import { Injectable } from '@angular/core';
-import { Refund, RefundParams } from '@vality/swag-payments';
import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
import { PaymentsService } from '@dsh/app/api/payments';
+import { Refund, RefundParams } from '@vality/swag-payments';
+
@Injectable()
export class RefundsService {
constructor(private paymentsService: PaymentsService) {}
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/create-refund/validators/max-available-amount-validator.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/create-refund/validators/max-available-amount-validator.ts
index 268c1b05e..9480f1b78 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/create-refund/validators/max-available-amount-validator.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/create-refund/validators/max-available-amount-validator.ts
@@ -1,7 +1,8 @@
-import { AsyncValidatorFn, FormControl } from '@angular/forms';
import { Observable } from 'rxjs';
import { filter, map } from 'rxjs/operators';
+import { AsyncValidatorFn, FormControl } from '@angular/forms';
+
export const maxAvailableAmountValidator = (
availableAmount$: Observable,
): AsyncValidatorFn => {
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/refunds-list/refunds-list.component.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/refunds-list/refunds-list.component.ts
index 162691250..9c3cdd894 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/refunds-list/refunds-list.component.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/refunds-list/refunds-list.component.ts
@@ -1,6 +1,8 @@
+import isEmpty from 'lodash-es/isEmpty';
+
import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
+
import { Refund } from '@vality/swag-payments';
-import isEmpty from 'lodash-es/isEmpty';
@Component({
selector: 'dsh-refunds-list',
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/refunds-list/refunds-list.module.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/refunds-list/refunds-list.module.ts
index d838a8a63..c2a7bc251 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/refunds-list/refunds-list.module.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/refunds-list/refunds-list.module.ts
@@ -1,14 +1,14 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
import { MatDividerModule } from '@angular/material/divider';
import { MatIconModule } from '@angular/material/icon';
import { RouterModule } from '@angular/router';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { RefundDetailsModule } from '@dsh/app/shared/components';
import { SpinnerModule } from '@dsh/components/indicators';
+import { TranslocoModule } from '@jsverse/transloco';
import { RefundsListComponent } from './refunds-list.component';
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/refunds.component.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/refunds.component.ts
index f57824e78..57a5bca1d 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/refunds.component.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/refunds.component.ts
@@ -1,3 +1,6 @@
+import { Observable } from 'rxjs';
+import { filter, take } from 'rxjs/operators';
+
import {
ChangeDetectionStrategy,
Component,
@@ -6,12 +9,10 @@ import {
OnInit,
Output,
} from '@angular/core';
-import { PaymentSearchResult, RefundSearchResult } from '@vality/swag-anapi-v2';
-import { Observable } from 'rxjs';
-import { filter, take } from 'rxjs/operators';
-
import { SEARCH_LIMIT } from '@dsh/app/sections/tokens';
+import { PaymentSearchResult, RefundSearchResult } from '@vality/swag-anapi-v2';
+
import { PaymentIds } from '../../../types';
import {
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/refunds.module.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/refunds.module.ts
index 58f08ab34..c11ef2bfc 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/refunds.module.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/refunds.module.ts
@@ -1,10 +1,11 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
+import { AuthModule } from '@dsh/app/auth';
import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-import { AuthModule } from '@dsh/app/auth';
import { CreateRefundModule } from './create-refund';
import { RefundsListModule } from './refunds-list';
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/services/fetch-refunds/fetch-refunds.service.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/services/fetch-refunds/fetch-refunds.service.ts
index 23d021a9b..7d082432e 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/services/fetch-refunds/fetch-refunds.service.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/services/fetch-refunds/fetch-refunds.service.ts
@@ -1,13 +1,14 @@
-import { Inject, Injectable } from '@angular/core';
-import { RefundSearchResult, SearchRefundsRequestParams } from '@vality/swag-anapi-v2';
import moment from 'moment';
import { Observable, switchMap } from 'rxjs';
import { first, shareReplay } from 'rxjs/operators';
+import { Inject, Injectable } from '@angular/core';
import { SearchService } from '@dsh/app/api/anapi';
import { SEARCH_LIMIT } from '@dsh/app/sections/tokens';
import { DEBOUNCE_FETCHER_ACTION_TIME, PartialFetcher } from '@dsh/app/shared';
+import { RefundSearchResult, SearchRefundsRequestParams } from '@vality/swag-anapi-v2';
+
import { PaymentInstitutionRealmService } from '../../../../../../../services';
@Injectable()
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/services/invoice-details/invoice-details.service.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/services/invoice-details/invoice-details.service.ts
index 198d51a0f..3c65c8c55 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/services/invoice-details/invoice-details.service.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/services/invoice-details/invoice-details.service.ts
@@ -1,13 +1,14 @@
-import { DestroyRef, Injectable } from '@angular/core';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { Invoice } from '@vality/swag-anapi-v2';
import moment from 'moment';
import { Observable, ReplaySubject } from 'rxjs';
import { distinctUntilChanged, map, switchMap, tap, withLatestFrom } from 'rxjs/operators';
+import { DestroyRef, Injectable } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { SearchService } from '@dsh/app/api/anapi';
import { ErrorService } from '@dsh/app/shared/services';
+import { Invoice } from '@vality/swag-anapi-v2';
+
import { PaymentInstitutionRealmService } from '../../../../../../services';
@Injectable()
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-panels.component.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-panels.component.ts
index 8795fa94b..57494912b 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-panels.component.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-panels.component.ts
@@ -1,6 +1,8 @@
+import isEmpty from 'lodash-es/isEmpty';
+
import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
+
import { PaymentSearchResult } from '@vality/swag-anapi-v2';
-import isEmpty from 'lodash-es/isEmpty';
import { getPaymentId } from '../utils/get-payment-id';
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-panels.module.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-panels.module.ts
index ceef714de..2465ffb32 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-panels.module.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-panels.module.ts
@@ -1,9 +1,8 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { BalanceModule } from '@dsh/app/shared/components/balance/balance.module';
import { PaymentStatusComponent } from '@dsh/app/shared/components/payment-status';
import { ApiModelRefsModule } from '@dsh/app/shared/pipes';
@@ -11,6 +10,7 @@ import { EmptySearchResultModule } from '@dsh/components/empty-search-result';
import { SpinnerModule } from '@dsh/components/indicators';
import { AccordionModule, CardModule, RowModule } from '@dsh/components/layout';
import { ShowMorePanelModule } from '@dsh/components/show-more-panel';
+import { TranslocoModule } from '@jsverse/transloco';
import { PaymentsRowComponent } from './components/row/payments-row.component';
import { PaymentsRowHeaderComponent } from './components/row-header/payments-row-header.component';
diff --git a/src/app/sections/payment-section/operations/payments/payments.component.ts b/src/app/sections/payment-section/operations/payments/payments.component.ts
index 4562103ac..2e0891211 100644
--- a/src/app/sections/payment-section/operations/payments/payments.component.ts
+++ b/src/app/sections/payment-section/operations/payments/payments.component.ts
@@ -1,9 +1,11 @@
+import { Observable } from 'rxjs';
+import { skip, take } from 'rxjs/operators';
+
import { ChangeDetectionStrategy, Component, DestroyRef, OnInit, signal } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+
import { QueryParamsService } from '@vality/matez';
import { PaymentSearchResult, SearchPaymentsRequestParams } from '@vality/swag-anapi-v2';
-import { Observable } from 'rxjs';
-import { skip, take } from 'rxjs/operators';
import { PaymentInstitutionRealmService } from '../../services/payment-institution-realm.service';
diff --git a/src/app/sections/payment-section/operations/payments/payments.module.ts b/src/app/sections/payment-section/operations/payments/payments.module.ts
index 2735ae724..82f6298e9 100644
--- a/src/app/sections/payment-section/operations/payments/payments.module.ts
+++ b/src/app/sections/payment-section/operations/payments/payments.module.ts
@@ -1,8 +1,8 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatDialogModule } from '@angular/material/dialog';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { SEARCH_LIMIT } from '@dsh/app/sections/tokens';
import { NotificationModule } from '@dsh/app/shared/services';
import { LastUpdatedModule } from '@dsh/components/indicators/last-updated/last-updated.module';
diff --git a/src/app/sections/payment-section/operations/payments/services/fetch-payments/fetch-payments.service.ts b/src/app/sections/payment-section/operations/payments/services/fetch-payments/fetch-payments.service.ts
index 41b347e36..7654f17fb 100644
--- a/src/app/sections/payment-section/operations/payments/services/fetch-payments/fetch-payments.service.ts
+++ b/src/app/sections/payment-section/operations/payments/services/fetch-payments/fetch-payments.service.ts
@@ -1,15 +1,16 @@
-import { Inject, Injectable } from '@angular/core';
-import { TranslocoService } from '@jsverse/transloco';
-import { NotifyLogService } from '@vality/matez';
-import { PaymentSearchResult, SearchPaymentsRequestParams } from '@vality/swag-anapi-v2';
import { isNumber } from 'lodash-es';
import { Observable, of } from 'rxjs';
import { catchError, shareReplay } from 'rxjs/operators';
+import { Inject, Injectable } from '@angular/core';
import { SearchService } from '@dsh/app/api/anapi';
import { mapToTimestamp } from '@dsh/app/custom-operators';
import { SEARCH_LIMIT } from '@dsh/app/sections/tokens';
import { DEBOUNCE_FETCHER_ACTION_TIME, PartialFetcher } from '@dsh/app/shared';
+import { TranslocoService } from '@jsverse/transloco';
+
+import { NotifyLogService } from '@vality/matez';
+import { PaymentSearchResult, SearchPaymentsRequestParams } from '@vality/swag-anapi-v2';
@Injectable()
export class FetchPaymentsService extends PartialFetcher<
diff --git a/src/app/sections/payment-section/operations/payments/services/payments-expanded-id-manager/payments-expanded-id-manager.service.ts b/src/app/sections/payment-section/operations/payments/services/payments-expanded-id-manager/payments-expanded-id-manager.service.ts
index 5d0800bfd..e014ffca4 100644
--- a/src/app/sections/payment-section/operations/payments/services/payments-expanded-id-manager/payments-expanded-id-manager.service.ts
+++ b/src/app/sections/payment-section/operations/payments/services/payments-expanded-id-manager/payments-expanded-id-manager.service.ts
@@ -1,9 +1,11 @@
+import { Observable } from 'rxjs';
+
import { Injectable } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
+import { ExpandedIdManager, Fragment } from '@dsh/app/shared/services';
+
import { PaymentSearchResult } from '@vality/swag-anapi-v2';
-import { Observable } from 'rxjs';
-import { ExpandedIdManager, Fragment } from '@dsh/app/shared/services';
import { getPaymentId } from '../../utils/get-payment-id';
import { FetchPaymentsService } from '../fetch-payments/fetch-payments.service';
diff --git a/src/app/sections/payment-section/operations/refunds/refunds-expanded-id-manager.service.ts b/src/app/sections/payment-section/operations/refunds/refunds-expanded-id-manager.service.ts
index 8b8b05681..438d5cb29 100644
--- a/src/app/sections/payment-section/operations/refunds/refunds-expanded-id-manager.service.ts
+++ b/src/app/sections/payment-section/operations/refunds/refunds-expanded-id-manager.service.ts
@@ -1,9 +1,11 @@
+import { Observable } from 'rxjs';
+
import { Injectable } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
+import { ExpandedIdManager, Fragment } from '@dsh/app/shared/services';
+
import { Refund } from '@vality/swag-payments';
-import { Observable } from 'rxjs';
-import { ExpandedIdManager, Fragment } from '@dsh/app/shared/services';
import { FetchRefundsService } from './services/fetch-refunds/fetch-refunds.service';
diff --git a/src/app/sections/payment-section/operations/refunds/refunds-list/components/refund-row/refund-row.component.ts b/src/app/sections/payment-section/operations/refunds/refunds-list/components/refund-row/refund-row.component.ts
index fb346ef58..aca5b8982 100644
--- a/src/app/sections/payment-section/operations/refunds/refunds-list/components/refund-row/refund-row.component.ts
+++ b/src/app/sections/payment-section/operations/refunds/refunds-list/components/refund-row/refund-row.component.ts
@@ -1,7 +1,8 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { AnapiDictionaryService } from '@dsh/app/api/anapi';
+
import { RefundSearchResult } from '@vality/swag-anapi-v2';
-import { AnapiDictionaryService } from '@dsh/app/api/anapi';
@Component({
selector: 'dsh-refund-row',
diff --git a/src/app/sections/payment-section/operations/refunds/refunds-list/refund-details/components/refund-main-info/refund-main-info.component.ts b/src/app/sections/payment-section/operations/refunds/refunds-list/refund-details/components/refund-main-info/refund-main-info.component.ts
index 2b7819840..657a1395b 100644
--- a/src/app/sections/payment-section/operations/refunds/refunds-list/refund-details/components/refund-main-info/refund-main-info.component.ts
+++ b/src/app/sections/payment-section/operations/refunds/refunds-list/refund-details/components/refund-main-info/refund-main-info.component.ts
@@ -1,4 +1,5 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+
import { RefundSearchResult } from '@vality/swag-anapi-v2';
@Component({
diff --git a/src/app/sections/payment-section/operations/refunds/refunds-list/refund-details/refund-details.component.ts b/src/app/sections/payment-section/operations/refunds/refunds-list/refund-details/refund-details.component.ts
index e6e265974..e1095645a 100644
--- a/src/app/sections/payment-section/operations/refunds/refunds-list/refund-details/refund-details.component.ts
+++ b/src/app/sections/payment-section/operations/refunds/refunds-list/refund-details/refund-details.component.ts
@@ -1,4 +1,5 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+
import { RefundSearchResult } from '@vality/swag-anapi-v2';
@Component({
diff --git a/src/app/sections/payment-section/operations/refunds/refunds-list/refund-details/refund-details.module.ts b/src/app/sections/payment-section/operations/refunds/refunds-list/refund-details/refund-details.module.ts
index fc5385565..e62794cac 100644
--- a/src/app/sections/payment-section/operations/refunds/refunds-list/refund-details/refund-details.module.ts
+++ b/src/app/sections/payment-section/operations/refunds/refunds-list/refund-details/refund-details.module.ts
@@ -1,3 +1,5 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
@@ -5,9 +7,6 @@ import { MatDividerModule } from '@angular/material/divider';
import { MatIconModule } from '@angular/material/icon';
import { MatSnackBarModule } from '@angular/material/snack-bar';
import { RouterModule } from '@angular/router';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import {
RefundDetailsModule as ApiRefundDetailsModule,
InvoiceDetailsModule,
@@ -16,6 +15,7 @@ import {
import { ApiModelRefsModule } from '@dsh/app/shared/pipes';
import { IndicatorsModule } from '@dsh/components/indicators';
import { LayoutModule } from '@dsh/components/layout';
+import { TranslocoModule } from '@jsverse/transloco';
import { RefundInvoiceInfoComponent } from './components/refund-invoice-info/refund-invoice-info.component';
import { RefundMainInfoComponent } from './components/refund-main-info/refund-main-info.component';
diff --git a/src/app/sections/payment-section/operations/refunds/refunds-list/refund-details/services/receive-invoice/receive-invoice.service.ts b/src/app/sections/payment-section/operations/refunds/refunds-list/refund-details/services/receive-invoice/receive-invoice.service.ts
index abd0395d1..434202357 100644
--- a/src/app/sections/payment-section/operations/refunds/refunds-list/refund-details/services/receive-invoice/receive-invoice.service.ts
+++ b/src/app/sections/payment-section/operations/refunds/refunds-list/refund-details/services/receive-invoice/receive-invoice.service.ts
@@ -1,10 +1,11 @@
-import { Injectable } from '@angular/core';
-import { Invoice } from '@vality/swag-payments';
import { BehaviorSubject, Observable, ReplaySubject, Subject, of } from 'rxjs';
import { catchError, filter, map, switchMap, tap } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
import { InvoicesService } from '@dsh/app/api/payments';
+import { Invoice } from '@vality/swag-payments';
+
@Injectable()
export class ReceiveInvoiceService {
isLoading$: Observable;
diff --git a/src/app/sections/payment-section/operations/refunds/refunds-list/refund-details/services/receive-payment/receive-payment.service.ts b/src/app/sections/payment-section/operations/refunds/refunds-list/refund-details/services/receive-payment/receive-payment.service.ts
index d3e627107..1cf575d09 100644
--- a/src/app/sections/payment-section/operations/refunds/refunds-list/refund-details/services/receive-payment/receive-payment.service.ts
+++ b/src/app/sections/payment-section/operations/refunds/refunds-list/refund-details/services/receive-payment/receive-payment.service.ts
@@ -1,10 +1,11 @@
-import { Injectable } from '@angular/core';
-import { Payment } from '@vality/swag-payments';
import { BehaviorSubject, Observable, ReplaySubject, Subject, of } from 'rxjs';
import { catchError, filter, switchMap, tap } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
import { PaymentsService } from '@dsh/app/api/payments';
+import { Payment } from '@vality/swag-payments';
+
export interface ReceivePaymentParams {
invoiceID: string;
paymentID: string;
diff --git a/src/app/sections/payment-section/operations/refunds/refunds-list/refunds-list.component.ts b/src/app/sections/payment-section/operations/refunds/refunds-list/refunds-list.component.ts
index 6f44ae776..af7da370d 100644
--- a/src/app/sections/payment-section/operations/refunds/refunds-list/refunds-list.component.ts
+++ b/src/app/sections/payment-section/operations/refunds/refunds-list/refunds-list.component.ts
@@ -1,4 +1,5 @@
import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
+
import { Refund } from '@vality/swag-anapi-v2';
@Component({
diff --git a/src/app/sections/payment-section/operations/refunds/refunds-list/refunds-list.module.ts b/src/app/sections/payment-section/operations/refunds/refunds-list/refunds-list.module.ts
index bdf95e027..e2ae1aa42 100644
--- a/src/app/sections/payment-section/operations/refunds/refunds-list/refunds-list.module.ts
+++ b/src/app/sections/payment-section/operations/refunds/refunds-list/refunds-list.module.ts
@@ -1,13 +1,13 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatSnackBarModule } from '@angular/material/snack-bar';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { RefundDetailsModule as ApiRefundDetailsModule } from '@dsh/app/shared/components';
import { AmountCurrencyModule, ApiModelRefsModule } from '@dsh/app/shared/pipes';
import { IndicatorsModule } from '@dsh/components/indicators';
import { LayoutModule } from '@dsh/components/layout';
+import { TranslocoModule } from '@jsverse/transloco';
import { RefundRowComponent } from './components/refund-row/refund-row.component';
import { RefundRowHeaderComponent } from './components/refund-row-header/refund-row-header.component';
diff --git a/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/additional-filters.module.ts b/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/additional-filters.module.ts
index ee723440a..940e3fb8d 100644
--- a/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/additional-filters.module.ts
+++ b/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/additional-filters.module.ts
@@ -1,13 +1,14 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
import { MatDividerModule } from '@angular/material/divider';
import { MatIconModule } from '@angular/material/icon';
+import { BaseDialogModule } from '@dsh/app/shared/components/dialog/base-dialog';
import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-import { BaseDialogModule } from '@dsh/app/shared/components/dialog/base-dialog';
import { DialogFiltersComponent } from './components';
import { InvoicesFilterModule } from './invoices-filter';
diff --git a/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/components/dialog-filters/dialog-filters.component.ts b/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/components/dialog-filters/dialog-filters.component.ts
index 1f944496e..a1ce5a74e 100644
--- a/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/components/dialog-filters/dialog-filters.component.ts
+++ b/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/components/dialog-filters/dialog-filters.component.ts
@@ -1,6 +1,7 @@
import { ChangeDetectionStrategy, Component, Inject, OnInit } from '@angular/core';
import { FormBuilder } from '@angular/forms';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+
import { FormGroupByValue, FormGroupSuperclass, createControlProviders } from '@vality/matez';
import { AdditionalFilters } from '../../types';
diff --git a/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/invoices-filter/invoices-filter.component.ts b/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/invoices-filter/invoices-filter.component.ts
index 69cac5173..44db1009f 100644
--- a/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/invoices-filter/invoices-filter.component.ts
+++ b/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/invoices-filter/invoices-filter.component.ts
@@ -1,4 +1,5 @@
import { ChangeDetectionStrategy, Component } from '@angular/core';
+
import { FormControlSuperclass, createControlProviders } from '@vality/matez';
@Component({
diff --git a/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/invoices-filter/invoices-filter.module.ts b/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/invoices-filter/invoices-filter.module.ts
index b90f8a630..3d934a8f3 100644
--- a/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/invoices-filter/invoices-filter.module.ts
+++ b/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/invoices-filter/invoices-filter.module.ts
@@ -1,10 +1,11 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
+import { InvoicesFieldModule } from '@dsh/app/shared/components/inputs/invoices-field';
import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-import { InvoicesFieldModule } from '@dsh/app/shared/components/inputs/invoices-field';
import { InvoicesFilterComponent } from './invoices-filter.component';
diff --git a/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/refund-status-filter/refund-status-filter.component.ts b/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/refund-status-filter/refund-status-filter.component.ts
index adb243a31..2f904c864 100644
--- a/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/refund-status-filter/refund-status-filter.component.ts
+++ b/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/refund-status-filter/refund-status-filter.component.ts
@@ -1,8 +1,9 @@
import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { AnapiDictionaryService } from '@dsh/app/api/anapi';
+
import { FormControlSuperclass, createControlProviders } from '@vality/matez';
import { RefundStatus } from '@vality/swag-anapi-v2';
-import { AnapiDictionaryService } from '@dsh/app/api/anapi';
@Component({
selector: 'dsh-refund-status-filter',
diff --git a/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/refund-status-filter/refund-status-filter.module.ts b/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/refund-status-filter/refund-status-filter.module.ts
index 99b3f3314..fe74b7d7e 100644
--- a/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/refund-status-filter/refund-status-filter.module.ts
+++ b/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/refund-status-filter/refund-status-filter.module.ts
@@ -1,12 +1,12 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { MatRadioModule } from '@angular/material/radio';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { InlineShowAllToggleModule } from '@dsh/app/shared/components/buttons/inline-show-all-toggle';
import { ExpandableRadioGroupModule } from '@dsh/app/shared/components/radio-buttons/expandable-radio-group';
+import { TranslocoModule } from '@jsverse/transloco';
import { RefundStatusFilterComponent } from './refund-status-filter.component';
diff --git a/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/shops-filter/shops-filter.component.ts b/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/shops-filter/shops-filter.component.ts
index e3fea3931..5b9cae38b 100644
--- a/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/shops-filter/shops-filter.component.ts
+++ b/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/shops-filter/shops-filter.component.ts
@@ -1,8 +1,9 @@
import { ChangeDetectionStrategy, Component } from '@angular/core';
import { FormBuilder } from '@angular/forms';
+import { ShopsDataService } from '@dsh/app/shared';
+
import { FormControlSuperclass, createControlProviders } from '@vality/matez';
-import { ShopsDataService } from '@dsh/app/shared';
@Component({
selector: 'dsh-shops-filter',
diff --git a/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/shops-filter/shops-filter.module.ts b/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/shops-filter/shops-filter.module.ts
index 3c6e726e6..1cf2a4372 100644
--- a/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/shops-filter/shops-filter.module.ts
+++ b/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/shops-filter/shops-filter.module.ts
@@ -1,11 +1,12 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { MatFormFieldModule } from '@angular/material/form-field';
+import { ShopsFieldModule } from '@dsh/app/shared/components/inputs/shops-field';
import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-import { ShopsFieldModule } from '@dsh/app/shared/components/inputs/shops-field';
import { ShopsFilterComponent } from './shops-filter.component';
diff --git a/src/app/sections/payment-section/operations/refunds/refunds-search-filters/refunds-search-filters.component.ts b/src/app/sections/payment-section/operations/refunds/refunds-search-filters/refunds-search-filters.component.ts
index 10fe73119..92d4e9a8b 100644
--- a/src/app/sections/payment-section/operations/refunds/refunds-search-filters/refunds-search-filters.component.ts
+++ b/src/app/sections/payment-section/operations/refunds/refunds-search-filters/refunds-search-filters.component.ts
@@ -1,3 +1,11 @@
+import isEmpty from 'lodash-es/isEmpty';
+import negate from 'lodash-es/negate';
+import omit from 'lodash-es/omit';
+import pick from 'lodash-es/pick';
+import { MediaObserver } from 'ng-flex-layout';
+import { BehaviorSubject, combineLatest, defer } from 'rxjs';
+import { map } from 'rxjs/operators';
+
import {
ChangeDetectionStrategy,
Component,
@@ -11,16 +19,6 @@ import {
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { FormBuilder } from '@angular/forms';
import { MatDialog } from '@angular/material/dialog';
-import { ComponentChanges } from '@vality/matez';
-import { Shop } from '@vality/swag-payments';
-import isEmpty from 'lodash-es/isEmpty';
-import negate from 'lodash-es/negate';
-import omit from 'lodash-es/omit';
-import pick from 'lodash-es/pick';
-import { MediaObserver } from 'ng-flex-layout';
-import { BehaviorSubject, combineLatest, defer } from 'rxjs';
-import { map } from 'rxjs/operators';
-
import {
DateRangeWithPreset,
Preset,
@@ -28,6 +26,9 @@ import {
} from '@dsh/components/date-range-filter';
import { getFormValueChanges } from '@dsh/utils';
+import { ComponentChanges } from '@vality/matez';
+import { Shop } from '@vality/swag-payments';
+
import { AdditionalFilters, DialogFiltersComponent } from './additional-filters';
interface MainFilters {
diff --git a/src/app/sections/payment-section/operations/refunds/refunds-search-filters/refunds-search-filters.module.ts b/src/app/sections/payment-section/operations/refunds/refunds-search-filters/refunds-search-filters.module.ts
index e7529e041..dabe8f5e8 100644
--- a/src/app/sections/payment-section/operations/refunds/refunds-search-filters/refunds-search-filters.module.ts
+++ b/src/app/sections/payment-section/operations/refunds/refunds-search-filters/refunds-search-filters.module.ts
@@ -1,14 +1,14 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { InvoicesFilterModule, RefundStatusFilterModule } from '@dsh/app/shared/components';
import { ShopsFilterModule } from '@dsh/app/shared/components/filters/shops-filter';
import { DateRangeFilterModule } from '@dsh/components/date-range-filter';
import { FilterModule } from '@dsh/components/filter';
import { FiltersGroupModule } from '@dsh/components/filters-group';
+import { TranslocoModule } from '@jsverse/transloco';
import { RefundsSearchFiltersComponent } from './refunds-search-filters.component';
diff --git a/src/app/sections/payment-section/operations/refunds/refunds.component.ts b/src/app/sections/payment-section/operations/refunds/refunds.component.ts
index 1fe97dd4b..7cc42a2f9 100644
--- a/src/app/sections/payment-section/operations/refunds/refunds.component.ts
+++ b/src/app/sections/payment-section/operations/refunds/refunds.component.ts
@@ -1,6 +1,7 @@
import { ChangeDetectionStrategy, Component, DestroyRef, OnInit } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { TranslocoService } from '@jsverse/transloco';
+
import { NotifyLogService, QueryParamsService } from '@vality/matez';
import { RealmMixService, RealmShopsService } from '../../services';
diff --git a/src/app/sections/payment-section/operations/refunds/refunds.module.ts b/src/app/sections/payment-section/operations/refunds/refunds.module.ts
index 8651727bd..09d2871a4 100644
--- a/src/app/sections/payment-section/operations/refunds/refunds.module.ts
+++ b/src/app/sections/payment-section/operations/refunds/refunds.module.ts
@@ -1,3 +1,5 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
@@ -9,14 +11,12 @@ import { MatInputModule } from '@angular/material/input';
import { MatMenuModule } from '@angular/material/menu';
import { MatSelectModule } from '@angular/material/select';
import { MatSnackBarModule } from '@angular/material/snack-bar';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { EmptySearchResultModule } from '@dsh/components/empty-search-result';
import { IndicatorsModule } from '@dsh/components/indicators';
import { LayoutModule } from '@dsh/components/layout';
import { StateNavModule } from '@dsh/components/navigation';
import { ShowMorePanelModule } from '@dsh/components/show-more-panel';
+import { TranslocoModule } from '@jsverse/transloco';
import { RefundsListModule } from './refunds-list';
import { RefundsRoutingModule } from './refunds-routing.module';
diff --git a/src/app/sections/payment-section/operations/refunds/services/fetch-refunds/fetch-refunds.service.ts b/src/app/sections/payment-section/operations/refunds/services/fetch-refunds/fetch-refunds.service.ts
index 666756e4c..c40fd55b6 100644
--- a/src/app/sections/payment-section/operations/refunds/services/fetch-refunds/fetch-refunds.service.ts
+++ b/src/app/sections/payment-section/operations/refunds/services/fetch-refunds/fetch-refunds.service.ts
@@ -1,12 +1,13 @@
-import { Injectable } from '@angular/core';
-import { RefundSearchResult } from '@vality/swag-anapi-v2';
import { Observable } from 'rxjs';
import { shareReplay } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
import { SearchService } from '@dsh/app/api/anapi';
import { mapToTimestamp } from '@dsh/app/custom-operators';
import { PartialFetcher } from '@dsh/app/shared';
+import { RefundSearchResult } from '@vality/swag-anapi-v2';
+
import { SearchFiltersParams } from '../../refunds-search-filters';
const SEARCH_LIMIT = 10;
diff --git a/src/app/sections/payment-section/operations/refunds/services/refunds-expanded-id-manager/refunds-expanded-id-manager.service.ts b/src/app/sections/payment-section/operations/refunds/services/refunds-expanded-id-manager/refunds-expanded-id-manager.service.ts
index f71311812..c8cd89f6c 100644
--- a/src/app/sections/payment-section/operations/refunds/services/refunds-expanded-id-manager/refunds-expanded-id-manager.service.ts
+++ b/src/app/sections/payment-section/operations/refunds/services/refunds-expanded-id-manager/refunds-expanded-id-manager.service.ts
@@ -1,9 +1,11 @@
+import { Observable } from 'rxjs';
+
import { Injectable } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
+import { ExpandedIdManager, Fragment } from '@dsh/app/shared/services';
+
import { RefundSearchResult } from '@vality/swag-anapi-v2';
-import { Observable } from 'rxjs';
-import { ExpandedIdManager, Fragment } from '@dsh/app/shared/services';
import { FetchRefundsService } from '../fetch-refunds/fetch-refunds.service';
diff --git a/src/app/sections/payment-section/payment-section-routing.module.ts b/src/app/sections/payment-section/payment-section-routing.module.ts
index 2439a46c9..890fcd9c2 100644
--- a/src/app/sections/payment-section/payment-section-routing.module.ts
+++ b/src/app/sections/payment-section/payment-section-routing.module.ts
@@ -1,6 +1,5 @@
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
-
import { RoleAccessName, createPrivateRoute } from '@dsh/app/auth';
import { PaymentSectionComponent } from './payment-section.component';
diff --git a/src/app/sections/payment-section/payment-section.component.ts b/src/app/sections/payment-section/payment-section.component.ts
index 581e74e3a..b9c006cd3 100644
--- a/src/app/sections/payment-section/payment-section.component.ts
+++ b/src/app/sections/payment-section/payment-section.component.ts
@@ -1,12 +1,14 @@
+import { Observable, ReplaySubject, Subject, combineLatest, defer } from 'rxjs';
+import { filter, map } from 'rxjs/operators';
+
import { ChangeDetectionStrategy, Component, DestroyRef, OnInit, isDevMode } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { ActivatedRoute, Router } from '@angular/router';
+import { SHOPS } from '@dsh/app/shared/components/inputs/shop-field';
import { TranslocoService } from '@jsverse/transloco';
+
import { PaymentInstitution } from '@vality/swag-payments';
-import { Observable, ReplaySubject, Subject, combineLatest, defer } from 'rxjs';
-import { filter, map } from 'rxjs/operators';
-import { SHOPS } from '@dsh/app/shared/components/inputs/shop-field';
import { PaymentInstitutionRealmService, RealmShopsService } from './services';
import { NavbarItemConfig, toNavbarItemConfig } from './utils';
diff --git a/src/app/sections/payment-section/payment-section.module.ts b/src/app/sections/payment-section/payment-section.module.ts
index c1028a6de..8aa6c6252 100644
--- a/src/app/sections/payment-section/payment-section.module.ts
+++ b/src/app/sections/payment-section/payment-section.module.ts
@@ -1,12 +1,12 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatIconModule } from '@angular/material/icon';
-import { TRANSLOCO_SCOPE, TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { AuthModule } from '@dsh/app/auth';
import { RouteNavbarLayoutModule } from '@dsh/app/shared/components/route-navbar-layout';
import { NavbarItemModule } from '@dsh/components/navigation';
+import { TRANSLOCO_SCOPE, TranslocoModule } from '@jsverse/transloco';
import { BalancesModule } from './balances';
import { NoShopsAlertModule } from './no-shops-alert';
diff --git a/src/app/sections/payment-section/reports/cancel-report/cancel-report.module.ts b/src/app/sections/payment-section/reports/cancel-report/cancel-report.module.ts
index fa8e83c68..d2b3eced2 100644
--- a/src/app/sections/payment-section/reports/cancel-report/cancel-report.module.ts
+++ b/src/app/sections/payment-section/reports/cancel-report/cancel-report.module.ts
@@ -1,9 +1,9 @@
import { NgModule } from '@angular/core';
import { MatDialogModule } from '@angular/material/dialog';
import { MatSnackBarModule } from '@angular/material/snack-bar';
+import { ConfirmActionDialogModule } from '@dsh/components/popups';
import { TranslocoModule } from '@jsverse/transloco';
-import { ConfirmActionDialogModule } from '@dsh/components/popups';
import { CancelReportService } from './cancel-report.service';
diff --git a/src/app/sections/payment-section/reports/cancel-report/cancel-report.service.ts b/src/app/sections/payment-section/reports/cancel-report/cancel-report.service.ts
index 6636e01e5..7759cd1ab 100644
--- a/src/app/sections/payment-section/reports/cancel-report/cancel-report.service.ts
+++ b/src/app/sections/payment-section/reports/cancel-report/cancel-report.service.ts
@@ -1,13 +1,15 @@
+import { Observable, Subject, combineLatest, of } from 'rxjs';
+import { catchError, filter, first, map, switchMap, takeUntil, tap } from 'rxjs/operators';
+
import { Injectable } from '@angular/core';
import { MatDialog } from '@angular/material/dialog';
import { MatSnackBar } from '@angular/material/snack-bar';
+import { ReportsService } from '@dsh/app/api/anapi';
+import { ConfirmActionDialogComponent } from '@dsh/components/popups';
import { TranslocoService } from '@jsverse/transloco';
+
import { DialogResponseStatus } from '@vality/matez';
-import { Observable, Subject, combineLatest, of } from 'rxjs';
-import { catchError, filter, first, map, switchMap, takeUntil, tap } from 'rxjs/operators';
-import { ReportsService } from '@dsh/app/api/anapi';
-import { ConfirmActionDialogComponent } from '@dsh/components/popups';
@Injectable()
export class CancelReportService {
diff --git a/src/app/sections/payment-section/reports/create-report/create-report-dialog.component.ts b/src/app/sections/payment-section/reports/create-report/create-report-dialog.component.ts
index 45e956e40..5143e29bd 100644
--- a/src/app/sections/payment-section/reports/create-report/create-report-dialog.component.ts
+++ b/src/app/sections/payment-section/reports/create-report/create-report-dialog.component.ts
@@ -1,14 +1,15 @@
+import moment from 'moment';
+import { of, switchMap } from 'rxjs';
+import { first } from 'rxjs/operators';
+
import { ChangeDetectionStrategy, Component, DestroyRef, Inject, OnInit } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { UntypedFormBuilder, Validators } from '@angular/forms';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import { MatSnackBar } from '@angular/material/snack-bar';
+import { ShopsDataService } from '@dsh/app/shared';
import { TranslocoService } from '@jsverse/transloco';
-import moment from 'moment';
-import { of, switchMap } from 'rxjs';
-import { first } from 'rxjs/operators';
-import { ShopsDataService } from '@dsh/app/shared';
import { filterShopsByRealm, mapToShopInfo } from '../../operations/operators';
diff --git a/src/app/sections/payment-section/reports/create-report/create-report-dialog.service.ts b/src/app/sections/payment-section/reports/create-report/create-report-dialog.service.ts
index c75831c1f..dfe66129f 100644
--- a/src/app/sections/payment-section/reports/create-report/create-report-dialog.service.ts
+++ b/src/app/sections/payment-section/reports/create-report/create-report-dialog.service.ts
@@ -1,7 +1,7 @@
-import { Injectable } from '@angular/core';
import { BehaviorSubject, Subject, of } from 'rxjs';
import { catchError, filter, map, switchMap, tap } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
import { ReportsService } from '@dsh/app/api/anapi';
import { formValueToCreateValue } from './form-value-to-create-value';
diff --git a/src/app/sections/payment-section/reports/create-report/create-report-form/create-report-form.component.ts b/src/app/sections/payment-section/reports/create-report/create-report-form/create-report-form.component.ts
index 21109d213..3f4f11222 100644
--- a/src/app/sections/payment-section/reports/create-report/create-report-form/create-report-form.component.ts
+++ b/src/app/sections/payment-section/reports/create-report/create-report-form/create-report-form.component.ts
@@ -1,7 +1,8 @@
+import { pluck } from 'rxjs/operators';
+
import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
import { UntypedFormGroup } from '@angular/forms';
-import { pluck } from 'rxjs/operators';
import { ShopInfo } from '../../../operations/operators';
diff --git a/src/app/sections/payment-section/reports/create-report/create-report.module.ts b/src/app/sections/payment-section/reports/create-report/create-report.module.ts
index 78068469c..f1955d9aa 100644
--- a/src/app/sections/payment-section/reports/create-report/create-report.module.ts
+++ b/src/app/sections/payment-section/reports/create-report/create-report.module.ts
@@ -1,3 +1,5 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
@@ -9,11 +11,9 @@ import { MatInputModule } from '@angular/material/input';
import { MatSelectModule } from '@angular/material/select';
import { MatSnackBarModule } from '@angular/material/snack-bar';
import { MatMomentDateModule } from '@angular/material-moment-adapter';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { BaseDialogModule } from '@dsh/app/shared/components/dialog/base-dialog';
import { BootstrapIconModule } from '@dsh/components/indicators';
+import { TranslocoModule } from '@jsverse/transloco';
import { CreateReportDialogComponent } from './create-report-dialog.component';
import { CreateReportFormComponent } from './create-report-form';
diff --git a/src/app/sections/payment-section/reports/create-report/form-value-to-create-value.ts b/src/app/sections/payment-section/reports/create-report/form-value-to-create-value.ts
index 30b65cfc9..db0afff74 100644
--- a/src/app/sections/payment-section/reports/create-report/form-value-to-create-value.ts
+++ b/src/app/sections/payment-section/reports/create-report/form-value-to-create-value.ts
@@ -1,6 +1,7 @@
-import { CreateReportRequestParams } from '@vality/swag-anapi-v2';
import moment from 'moment';
+import { CreateReportRequestParams } from '@vality/swag-anapi-v2';
+
export const formValueToCreateValue = ({
fromDate,
fromTime,
diff --git a/src/app/sections/payment-section/reports/fetch-reports.service.ts b/src/app/sections/payment-section/reports/fetch-reports.service.ts
index 33dd8f669..219303ba1 100644
--- a/src/app/sections/payment-section/reports/fetch-reports.service.ts
+++ b/src/app/sections/payment-section/reports/fetch-reports.service.ts
@@ -1,14 +1,15 @@
-import { Inject, Injectable } from '@angular/core';
-import { Report } from '@vality/swag-anapi-v2';
import isEmpty from 'lodash-es/isEmpty';
import { Observable } from 'rxjs';
import { shareReplay } from 'rxjs/operators';
+import { Inject, Injectable } from '@angular/core';
import { ReportsService as ReportsApiService } from '@dsh/app/api/anapi';
import { mapToTimestamp } from '@dsh/app/custom-operators';
import { SEARCH_LIMIT } from '@dsh/app/sections/tokens';
import { PartialFetcher } from '@dsh/app/shared';
+import { Report } from '@vality/swag-anapi-v2';
+
import { SearchFiltersParams } from './reports-search-filters';
@Injectable()
diff --git a/src/app/sections/payment-section/reports/report-details/report-details.component.ts b/src/app/sections/payment-section/reports/report-details/report-details.component.ts
index 379139e6b..f35825b0e 100644
--- a/src/app/sections/payment-section/reports/report-details/report-details.component.ts
+++ b/src/app/sections/payment-section/reports/report-details/report-details.component.ts
@@ -1,4 +1,5 @@
import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
+
import { Report } from '@vality/swag-anapi-v2';
@Component({
diff --git a/src/app/sections/payment-section/reports/report-details/report-details.module.ts b/src/app/sections/payment-section/reports/report-details/report-details.module.ts
index 007ef265b..9831fcc46 100644
--- a/src/app/sections/payment-section/reports/report-details/report-details.module.ts
+++ b/src/app/sections/payment-section/reports/report-details/report-details.module.ts
@@ -1,14 +1,14 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
import { MatDividerModule } from '@angular/material/divider';
import { MatSnackBarModule } from '@angular/material/snack-bar';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { ApiModelRefsModule } from '@dsh/app/shared/pipes';
import { IndicatorsModule } from '@dsh/components/indicators';
import { LayoutModule } from '@dsh/components/layout';
+import { TranslocoModule } from '@jsverse/transloco';
import { ReportFilesModule } from '../report-files';
import { ReportPipesModule } from '../report-pipes';
diff --git a/src/app/sections/payment-section/reports/report-details/report-main-info/report-main-info.component.ts b/src/app/sections/payment-section/reports/report-details/report-main-info/report-main-info.component.ts
index 43467b82d..8eb5b649b 100644
--- a/src/app/sections/payment-section/reports/report-details/report-main-info/report-main-info.component.ts
+++ b/src/app/sections/payment-section/reports/report-details/report-main-info/report-main-info.component.ts
@@ -1,7 +1,8 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { AnapiDictionaryService } from '@dsh/app/api/anapi';
+
import { Report } from '@vality/swag-anapi-v2';
-import { AnapiDictionaryService } from '@dsh/app/api/anapi';
@Component({
selector: 'dsh-report-main-info',
diff --git a/src/app/sections/payment-section/reports/report-files/report-file/report-file.component.ts b/src/app/sections/payment-section/reports/report-files/report-file/report-file.component.ts
index 8691bce02..c707a3955 100644
--- a/src/app/sections/payment-section/reports/report-files/report-file/report-file.component.ts
+++ b/src/app/sections/payment-section/reports/report-files/report-file/report-file.component.ts
@@ -1,4 +1,5 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+
import { FileMeta } from '@vality/swag-anapi-v2';
import { ReportFilesService } from '../report-files.service';
diff --git a/src/app/sections/payment-section/reports/report-files/report-files.component.ts b/src/app/sections/payment-section/reports/report-files/report-files.component.ts
index 47a5d26b5..89e1bdc36 100644
--- a/src/app/sections/payment-section/reports/report-files/report-files.component.ts
+++ b/src/app/sections/payment-section/reports/report-files/report-files.component.ts
@@ -1,9 +1,11 @@
+import { Observable, combineLatest } from 'rxjs';
+
import { ChangeDetectionStrategy, Component, DestroyRef, Input, OnInit } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { MatSnackBar } from '@angular/material/snack-bar';
import { TranslocoService } from '@jsverse/transloco';
+
import { FileMeta } from '@vality/swag-anapi-v2';
-import { Observable, combineLatest } from 'rxjs';
import { ReportFilesService } from './report-files.service';
diff --git a/src/app/sections/payment-section/reports/report-files/report-files.module.ts b/src/app/sections/payment-section/reports/report-files/report-files.module.ts
index 27d6bbfbc..b8049930c 100644
--- a/src/app/sections/payment-section/reports/report-files/report-files.module.ts
+++ b/src/app/sections/payment-section/reports/report-files/report-files.module.ts
@@ -1,11 +1,12 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
import { MatSnackBarModule } from '@angular/material/snack-bar';
+import { BootstrapIconModule } from '@dsh/components/indicators';
import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-import { BootstrapIconModule } from '@dsh/components/indicators';
import { ReportFileComponent } from './report-file';
import { ReportFilesComponent } from './report-files.component';
diff --git a/src/app/sections/payment-section/reports/report-files/report-files.service.ts b/src/app/sections/payment-section/reports/report-files/report-files.service.ts
index 1b35e328f..b4112b813 100644
--- a/src/app/sections/payment-section/reports/report-files/report-files.service.ts
+++ b/src/app/sections/payment-section/reports/report-files/report-files.service.ts
@@ -1,7 +1,7 @@
-import { Injectable } from '@angular/core';
import { BehaviorSubject, Subject, forkJoin, of } from 'rxjs';
import { catchError, map, switchMap, tap } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
import { ReportsService } from '@dsh/app/api/anapi';
import { multipleDownload } from '@dsh/utils';
diff --git a/src/app/sections/payment-section/reports/report-pipes/report-status-color.pipe.ts b/src/app/sections/payment-section/reports/report-pipes/report-status-color.pipe.ts
index b1fa631cb..4647b16a8 100644
--- a/src/app/sections/payment-section/reports/report-pipes/report-status-color.pipe.ts
+++ b/src/app/sections/payment-section/reports/report-pipes/report-status-color.pipe.ts
@@ -1,4 +1,5 @@
import { Pipe, PipeTransform } from '@angular/core';
+
import { Report } from '@vality/swag-anapi-v2';
import { StatusColor } from '../../../../theme-manager';
diff --git a/src/app/sections/payment-section/reports/reports-expanded-id-manager.service.ts b/src/app/sections/payment-section/reports/reports-expanded-id-manager.service.ts
index 9994c5cc9..58b09c192 100644
--- a/src/app/sections/payment-section/reports/reports-expanded-id-manager.service.ts
+++ b/src/app/sections/payment-section/reports/reports-expanded-id-manager.service.ts
@@ -1,9 +1,11 @@
+import { Observable } from 'rxjs';
+
import { Injectable } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
+import { ExpandedIdManager } from '@dsh/app/shared/services';
+
import { Report } from '@vality/swag-anapi-v2';
-import { Observable } from 'rxjs';
-import { ExpandedIdManager } from '@dsh/app/shared/services';
import { FetchReportsService } from './fetch-reports.service';
diff --git a/src/app/sections/payment-section/reports/reports-list/report-row/report-row.component.ts b/src/app/sections/payment-section/reports/reports-list/report-row/report-row.component.ts
index d6093d6ef..70575849e 100644
--- a/src/app/sections/payment-section/reports/reports-list/report-row/report-row.component.ts
+++ b/src/app/sections/payment-section/reports/reports-list/report-row/report-row.component.ts
@@ -1,7 +1,8 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { AnapiDictionaryService } from '@dsh/app/api/anapi';
+
import { Report } from '@vality/swag-anapi-v2';
-import { AnapiDictionaryService } from '@dsh/app/api/anapi';
@Component({
selector: 'dsh-report-row',
diff --git a/src/app/sections/payment-section/reports/reports-list/reports-list.component.ts b/src/app/sections/payment-section/reports/reports-list/reports-list.component.ts
index bb2d3f4ac..be9e7c78b 100644
--- a/src/app/sections/payment-section/reports/reports-list/reports-list.component.ts
+++ b/src/app/sections/payment-section/reports/reports-list/reports-list.component.ts
@@ -1,3 +1,6 @@
+import { switchMap } from 'rxjs';
+import { first } from 'rxjs/operators';
+
import {
ChangeDetectionStrategy,
Component,
@@ -11,9 +14,8 @@ import {
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { MatSnackBar } from '@angular/material/snack-bar';
import { TranslocoService } from '@jsverse/transloco';
+
import { Report } from '@vality/swag-anapi-v2';
-import { switchMap } from 'rxjs';
-import { first } from 'rxjs/operators';
import { CancelReportService } from '../cancel-report';
diff --git a/src/app/sections/payment-section/reports/reports-list/reports-list.module.ts b/src/app/sections/payment-section/reports/reports-list/reports-list.module.ts
index e07331d50..76e3c99c6 100644
--- a/src/app/sections/payment-section/reports/reports-list/reports-list.module.ts
+++ b/src/app/sections/payment-section/reports/reports-list/reports-list.module.ts
@@ -1,11 +1,11 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatSnackBarModule } from '@angular/material/snack-bar';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { IndicatorsModule } from '@dsh/components/indicators';
import { LayoutModule } from '@dsh/components/layout';
+import { TranslocoModule } from '@jsverse/transloco';
import { CancelReportModule } from '../cancel-report';
import { ReportDetailsModule } from '../report-details';
diff --git a/src/app/sections/payment-section/reports/reports-search-filters/report-types-filter/report-types-filter.component.ts b/src/app/sections/payment-section/reports/reports-search-filters/report-types-filter/report-types-filter.component.ts
index 142069415..7f6b098ef 100644
--- a/src/app/sections/payment-section/reports/reports-search-filters/report-types-filter/report-types-filter.component.ts
+++ b/src/app/sections/payment-section/reports/reports-search-filters/report-types-filter/report-types-filter.component.ts
@@ -1,12 +1,13 @@
-import { ChangeDetectionStrategy, Component, Injector } from '@angular/core';
-import { createControlProviders } from '@vality/matez';
-import { Report } from '@vality/swag-anapi-v2';
import { combineLatest } from 'rxjs';
import { share, switchMap } from 'rxjs/operators';
+import { ChangeDetectionStrategy, Component, Injector } from '@angular/core';
import { ReportTypesLabelPipe } from '@dsh/app/shared/components/inputs/report-types-field';
import { FilterSuperclass } from '@dsh/components/filter';
+import { createControlProviders } from '@vality/matez';
+import { Report } from '@vality/swag-anapi-v2';
+
@Component({
selector: 'dsh-report-types-filter',
templateUrl: 'report-types-filter.component.html',
diff --git a/src/app/sections/payment-section/reports/reports-search-filters/reports-search-filters.component.ts b/src/app/sections/payment-section/reports/reports-search-filters/reports-search-filters.component.ts
index 88ae8df82..67f2db106 100644
--- a/src/app/sections/payment-section/reports/reports-search-filters/reports-search-filters.component.ts
+++ b/src/app/sections/payment-section/reports/reports-search-filters/reports-search-filters.component.ts
@@ -10,9 +10,6 @@ import {
} from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { FormBuilder } from '@angular/forms';
-import { ComponentChanges } from '@vality/matez';
-import { Report } from '@vality/swag-anapi-v2';
-
import {
DateRangeWithPreset,
Preset,
@@ -20,6 +17,10 @@ import {
} from '@dsh/components/date-range-filter';
import { getFormValueChanges } from '@dsh/utils';
+import { ComponentChanges } from '@vality/matez';
+import { Report } from '@vality/swag-anapi-v2';
+
+
export interface Filters {
reportTypes: Report.ReportTypeEnum[];
dateRange: DateRangeWithPreset;
diff --git a/src/app/sections/payment-section/reports/reports-search-filters/reports-search-filters.module.ts b/src/app/sections/payment-section/reports/reports-search-filters/reports-search-filters.module.ts
index 469911b4d..bf08a655c 100644
--- a/src/app/sections/payment-section/reports/reports-search-filters/reports-search-filters.module.ts
+++ b/src/app/sections/payment-section/reports/reports-search-filters/reports-search-filters.module.ts
@@ -1,13 +1,13 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { ReportTypesFieldModule } from '@dsh/app/shared/components/inputs/report-types-field';
import { DateRangeFilterModule } from '@dsh/components/date-range-filter';
import { FilterModule } from '@dsh/components/filter';
import { FiltersGroupModule } from '@dsh/components/filters-group';
+import { TranslocoModule } from '@jsverse/transloco';
import { ReportPipesModule } from '../report-pipes';
diff --git a/src/app/sections/payment-section/reports/reports.component.ts b/src/app/sections/payment-section/reports/reports.component.ts
index e678017d0..c866f0585 100644
--- a/src/app/sections/payment-section/reports/reports.component.ts
+++ b/src/app/sections/payment-section/reports/reports.component.ts
@@ -1,11 +1,13 @@
+import { Subject, combineLatest } from 'rxjs';
+import { filter, first, switchMap } from 'rxjs/operators';
+
import { ChangeDetectionStrategy, Component, DestroyRef, OnInit } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { MatDialog } from '@angular/material/dialog';
import { MatSnackBar } from '@angular/material/snack-bar';
import { TranslocoService } from '@jsverse/transloco';
+
import { QueryParamsService } from '@vality/matez';
-import { Subject, combineLatest } from 'rxjs';
-import { filter, first, switchMap } from 'rxjs/operators';
import { PaymentInstitutionRealmService, RealmMixService } from '../services';
diff --git a/src/app/sections/payment-section/reports/reports.module.ts b/src/app/sections/payment-section/reports/reports.module.ts
index 233341891..1e0d59873 100644
--- a/src/app/sections/payment-section/reports/reports.module.ts
+++ b/src/app/sections/payment-section/reports/reports.module.ts
@@ -1,15 +1,15 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
import { MatSnackBarModule } from '@angular/material/snack-bar';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { EmptySearchResultModule } from '@dsh/components/empty-search-result';
import { IndicatorsModule } from '@dsh/components/indicators';
import { LayoutModule } from '@dsh/components/layout';
import { ScrollUpModule } from '@dsh/components/navigation';
import { ShowMorePanelModule } from '@dsh/components/show-more-panel';
+import { TranslocoModule } from '@jsverse/transloco';
import { CreateReportModule } from './create-report';
import { ReportsListModule } from './reports-list';
diff --git a/src/app/sections/payment-section/services/payment-institution-realm.service.ts b/src/app/sections/payment-section/services/payment-institution-realm.service.ts
index 864371d31..74a891d85 100644
--- a/src/app/sections/payment-section/services/payment-institution-realm.service.ts
+++ b/src/app/sections/payment-section/services/payment-institution-realm.service.ts
@@ -1,8 +1,10 @@
+import { Observable } from 'rxjs';
+import { map, shareReplay } from 'rxjs/operators';
+
import { Injectable } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
+
import { PaymentInstitution } from '@vality/swag-payments';
-import { Observable } from 'rxjs';
-import { map, shareReplay } from 'rxjs/operators';
import RealmEnum = PaymentInstitution.RealmEnum;
diff --git a/src/app/sections/payment-section/services/realm-mix.service.ts b/src/app/sections/payment-section/services/realm-mix.service.ts
index 2a28fb426..35df8bc89 100644
--- a/src/app/sections/payment-section/services/realm-mix.service.ts
+++ b/src/app/sections/payment-section/services/realm-mix.service.ts
@@ -1,8 +1,10 @@
-import { Injectable } from '@angular/core';
-import { PaymentInstitution } from '@vality/swag-payments';
import { Observable, Subject, combineLatest } from 'rxjs';
import { map } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
+
+import { PaymentInstitution } from '@vality/swag-payments';
+
import { PaymentInstitutionRealmService } from './payment-institution-realm.service';
import RealmEnum = PaymentInstitution.RealmEnum;
diff --git a/src/app/sections/payment-section/services/realm-shops.service.ts b/src/app/sections/payment-section/services/realm-shops.service.ts
index 600a76a50..3f5016db3 100644
--- a/src/app/sections/payment-section/services/realm-shops.service.ts
+++ b/src/app/sections/payment-section/services/realm-shops.service.ts
@@ -1,10 +1,11 @@
-import { Injectable } from '@angular/core';
-import { PaymentInstitution, Shop } from '@vality/swag-payments';
import { Observable } from 'rxjs';
import { map, shareReplay, switchMap } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
import { ShopsDataService } from '@dsh/app/shared';
+import { PaymentInstitution, Shop } from '@vality/swag-payments';
+
import { getShopsByRealm } from '../operations/operators';
import { PaymentInstitutionRealmService } from './payment-institution-realm.service';
diff --git a/src/app/sections/payment-section/shops/services/fetch-shops/combine-shop-item.ts b/src/app/sections/payment-section/shops/services/fetch-shops/combine-shop-item.ts
index a616e8f47..c0dd860c3 100644
--- a/src/app/sections/payment-section/shops/services/fetch-shops/combine-shop-item.ts
+++ b/src/app/sections/payment-section/shops/services/fetch-shops/combine-shop-item.ts
@@ -1,6 +1,7 @@
-import { Shop as ApiShop } from '@vality/swag-payments';
import isNil from 'lodash-es/isNil';
+import { Shop as ApiShop } from '@vality/swag-payments';
+
import { ShopBalance } from '../../types/shop-balance';
import { ShopItem } from '../../types/shop-item';
diff --git a/src/app/sections/payment-section/shops/services/fetch-shops/fetch-shops.service.ts b/src/app/sections/payment-section/shops/services/fetch-shops/fetch-shops.service.ts
index 4d1d2ede6..0e7ea007d 100644
--- a/src/app/sections/payment-section/shops/services/fetch-shops/fetch-shops.service.ts
+++ b/src/app/sections/payment-section/shops/services/fetch-shops/fetch-shops.service.ts
@@ -1,5 +1,3 @@
-import { Inject, Injectable, InjectionToken, Optional } from '@angular/core';
-import { Shop as ApiShop, PaymentInstitution } from '@vality/swag-payments';
import isNil from 'lodash-es/isNil';
import { BehaviorSubject, Observable, ReplaySubject, combineLatest, defer } from 'rxjs';
import {
@@ -13,9 +11,12 @@ import {
withLatestFrom,
} from 'rxjs/operators';
+import { Inject, Injectable, InjectionToken, Optional } from '@angular/core';
import { mapToTimestamp } from '@dsh/app/custom-operators';
import { ShopsDataService } from '@dsh/app/shared';
+import { Shop as ApiShop, PaymentInstitution } from '@vality/swag-payments';
+
import { getShopsByRealm } from '../../../operations/operators';
import { ShopBalance } from '../../types/shop-balance';
import { ShopFiltersData } from '../../types/shop-filters-data';
diff --git a/src/app/sections/payment-section/shops/services/shops-balance/shops-balance.service.ts b/src/app/sections/payment-section/shops/services/shops-balance/shops-balance.service.ts
index 93cae0f6d..9e6e53da8 100644
--- a/src/app/sections/payment-section/shops/services/shops-balance/shops-balance.service.ts
+++ b/src/app/sections/payment-section/shops/services/shops-balance/shops-balance.service.ts
@@ -1,7 +1,7 @@
-import { Injectable } from '@angular/core';
import { Observable, of } from 'rxjs';
import { catchError, map } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
import { AnalyticsService } from '@dsh/app/api/anapi';
import { ShopBalance } from '../../types/shop-balance';
diff --git a/src/app/sections/payment-section/shops/services/shops-filters-store/shops-filters-store.service.ts b/src/app/sections/payment-section/shops/services/shops-filters-store/shops-filters-store.service.ts
index 69f2ffe8b..47ad43dfc 100644
--- a/src/app/sections/payment-section/shops/services/shops-filters-store/shops-filters-store.service.ts
+++ b/src/app/sections/payment-section/shops/services/shops-filters-store/shops-filters-store.service.ts
@@ -1,6 +1,5 @@
import { Injectable } from '@angular/core';
import { Params } from '@angular/router';
-
import { QueryParamsStore } from '@dsh/app/shared/services';
import { ShopFiltersData } from '../../types/shop-filters-data';
diff --git a/src/app/sections/payment-section/shops/shops-list/services/shops-expanded-id-manager/shops-expanded-id-manager.service.ts b/src/app/sections/payment-section/shops/shops-list/services/shops-expanded-id-manager/shops-expanded-id-manager.service.ts
index ada57c6c6..af8cbf4a5 100644
--- a/src/app/sections/payment-section/shops/shops-list/services/shops-expanded-id-manager/shops-expanded-id-manager.service.ts
+++ b/src/app/sections/payment-section/shops/shops-list/services/shops-expanded-id-manager/shops-expanded-id-manager.service.ts
@@ -1,9 +1,11 @@
+import { Observable } from 'rxjs';
+
import { Injectable } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
+import { ExpandedIdManager } from '@dsh/app/shared/services';
+
import { Shop } from '@vality/swag-payments';
-import { Observable } from 'rxjs';
-import { ExpandedIdManager } from '@dsh/app/shared/services';
import { FetchShopsService } from '../../../services/fetch-shops/fetch-shops.service';
diff --git a/src/app/sections/payment-section/shops/shops-list/shop-balance/shop-balance.module.ts b/src/app/sections/payment-section/shops/shops-list/shop-balance/shop-balance.module.ts
index fffe3f08a..4e2ba7b30 100644
--- a/src/app/sections/payment-section/shops/shops-list/shop-balance/shop-balance.module.ts
+++ b/src/app/sections/payment-section/shops/shops-list/shop-balance/shop-balance.module.ts
@@ -1,6 +1,5 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
-
import { AmountCurrencyModule } from '@dsh/app/shared/pipes';
import { ShopBalanceComponent } from './shop-balance.component';
diff --git a/src/app/sections/payment-section/shops/shops-list/shop-details/components/shop-contract-details/shop-contract-details.component.ts b/src/app/sections/payment-section/shops/shops-list/shop-details/components/shop-contract-details/shop-contract-details.component.ts
index 673bd848a..b1dd141f0 100644
--- a/src/app/sections/payment-section/shops/shops-list/shop-details/components/shop-contract-details/shop-contract-details.component.ts
+++ b/src/app/sections/payment-section/shops/shops-list/shop-details/components/shop-contract-details/shop-contract-details.component.ts
@@ -1,5 +1,4 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
-
import { ShopContractDetailsService } from '@dsh/app/shared/services/shop-contract-details';
@Component({
diff --git a/src/app/sections/payment-section/shops/shops-list/shop-details/components/shop-id/shop-id.component.ts b/src/app/sections/payment-section/shops/shops-list/shop-details/components/shop-id/shop-id.component.ts
index a4b8fea8e..fbd0229d5 100644
--- a/src/app/sections/payment-section/shops/shops-list/shop-details/components/shop-id/shop-id.component.ts
+++ b/src/app/sections/payment-section/shops/shops-list/shop-details/components/shop-id/shop-id.component.ts
@@ -1,5 +1,6 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
import { TranslocoService } from '@jsverse/transloco';
+
import { NotifyLogService } from '@vality/matez';
@Component({
diff --git a/src/app/sections/payment-section/shops/shops-list/shop-details/components/shop-info/shop-info.component.ts b/src/app/sections/payment-section/shops/shops-list/shop-details/components/shop-info/shop-info.component.ts
index e860006db..3d54eea29 100644
--- a/src/app/sections/payment-section/shops/shops-list/shop-details/components/shop-info/shop-info.component.ts
+++ b/src/app/sections/payment-section/shops/shops-list/shop-details/components/shop-info/shop-info.component.ts
@@ -1,8 +1,10 @@
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
-import { Category } from '@vality/swag-payments';
import isNil from 'lodash-es/isNil';
import { Observable } from 'rxjs';
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+
+import { Category } from '@vality/swag-payments';
+
import { ShopItem, isShopLocationUrl } from '../../../../types/shop-item';
import { CategoryService } from '../../services/category/category.service';
diff --git a/src/app/sections/payment-section/shops/shops-list/shop-details/services/category/category.service.ts b/src/app/sections/payment-section/shops/shops-list/shop-details/services/category/category.service.ts
index 270908a8f..5b5c00b6d 100644
--- a/src/app/sections/payment-section/shops/shops-list/shop-details/services/category/category.service.ts
+++ b/src/app/sections/payment-section/shops/shops-list/shop-details/services/category/category.service.ts
@@ -1,10 +1,11 @@
-import { Injectable } from '@angular/core';
-import { Category } from '@vality/swag-payments';
import { ReplaySubject, combineLatest, defer } from 'rxjs';
import { map, shareReplay } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
import { CategoriesService } from '@dsh/app/api/payments';
+import { Category } from '@vality/swag-payments';
+
@Injectable()
export class CategoryService {
category$ = combineLatest([
diff --git a/src/app/sections/payment-section/shops/shops-list/shop-details/services/shop-actions/shop-actions.service.ts b/src/app/sections/payment-section/shops/shops-list/shop-details/services/shop-actions/shop-actions.service.ts
index aaf0d1ca8..67168a382 100644
--- a/src/app/sections/payment-section/shops/shops-list/shop-details/services/shop-actions/shop-actions.service.ts
+++ b/src/app/sections/payment-section/shops/shops-list/shop-details/services/shop-actions/shop-actions.service.ts
@@ -1,12 +1,14 @@
-import { Injectable } from '@angular/core';
-import { MatDialog } from '@angular/material/dialog';
-import { TranslocoService } from '@jsverse/transloco';
-import { DialogResponseStatus, NotifyLogService } from '@vality/matez';
import { Observable, of } from 'rxjs';
import { catchError, filter, map, switchMap } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
+import { MatDialog } from '@angular/material/dialog';
import { ShopsService } from '@dsh/app/api/payments';
import { ConfirmActionDialogComponent } from '@dsh/components/popups';
+import { TranslocoService } from '@jsverse/transloco';
+
+import { DialogResponseStatus, NotifyLogService } from '@vality/matez';
+
import { ShopActionResult } from '../../types/shop-action-result';
diff --git a/src/app/sections/payment-section/shops/shops-list/shop-details/shop-details.module.ts b/src/app/sections/payment-section/shops/shops-list/shop-details/shop-details.module.ts
index da31e60c7..c1ffcec20 100644
--- a/src/app/sections/payment-section/shops/shops-list/shop-details/shop-details.module.ts
+++ b/src/app/sections/payment-section/shops/shops-list/shop-details/shop-details.module.ts
@@ -1,3 +1,5 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { ClipboardModule } from '@angular/cdk/clipboard';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
@@ -5,10 +7,9 @@ import { MatButtonModule } from '@angular/material/button';
import { MatDialogModule } from '@angular/material/dialog';
import { MatDividerModule } from '@angular/material/divider';
import { MatSnackBarModule } from '@angular/material/snack-bar';
+import { DetailsItemModule } from '@dsh/components/layout';
import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-import { DetailsItemModule } from '@dsh/components/layout';
import { ShopBalanceModule } from '../shop-balance';
diff --git a/src/app/sections/payment-section/shops/shops-list/shop-list.module.ts b/src/app/sections/payment-section/shops/shops-list/shop-list.module.ts
index b1b61de2d..915a3cd8d 100644
--- a/src/app/sections/payment-section/shops/shops-list/shop-list.module.ts
+++ b/src/app/sections/payment-section/shops/shops-list/shop-list.module.ts
@@ -1,13 +1,13 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { TranslocoModule } from '@jsverse/transloco';
import { FlexLayoutModule } from 'ng-flex-layout';
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
import { EmptySearchResultModule } from '@dsh/components/empty-search-result';
import { SpinnerModule } from '@dsh/components/indicators';
import { LastUpdatedModule } from '@dsh/components/indicators/last-updated/last-updated.module';
import { AccordionModule, CardModule, RowModule } from '@dsh/components/layout';
import { ShowMorePanelModule } from '@dsh/components/show-more-panel';
+import { TranslocoModule } from '@jsverse/transloco';
import { ShopRowComponent } from './components/shop-row/shop-row.component';
import { ShopRowHeaderComponent } from './components/shop-row-header/shop-row-header.component';
diff --git a/src/app/sections/payment-section/shops/shops-list/shops-list.component.ts b/src/app/sections/payment-section/shops/shops-list/shops-list.component.ts
index 16197f44d..12c10f4d2 100644
--- a/src/app/sections/payment-section/shops/shops-list/shops-list.component.ts
+++ b/src/app/sections/payment-section/shops/shops-list/shops-list.component.ts
@@ -1,7 +1,8 @@
-import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
import isNil from 'lodash-es/isNil';
import { Observable } from 'rxjs';
+import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
+
import { ShopItem } from '../types/shop-item';
import { ShopsExpandedIdManagerService } from './services/shops-expanded-id-manager/shops-expanded-id-manager.service';
diff --git a/src/app/sections/payment-section/shops/shops.component.ts b/src/app/sections/payment-section/shops/shops.component.ts
index 28229c328..6c16bf6ec 100644
--- a/src/app/sections/payment-section/shops/shops.component.ts
+++ b/src/app/sections/payment-section/shops/shops.component.ts
@@ -1,6 +1,7 @@
+import { take } from 'rxjs/operators';
+
import { ChangeDetectionStrategy, Component, DestroyRef, OnInit } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { take } from 'rxjs/operators';
import { PaymentInstitutionRealmService, RealmShopsService } from '../services';
diff --git a/src/app/sections/payment-section/shops/shops.module.ts b/src/app/sections/payment-section/shops/shops.module.ts
index 42166c533..40798e5ea 100644
--- a/src/app/sections/payment-section/shops/shops.module.ts
+++ b/src/app/sections/payment-section/shops/shops.module.ts
@@ -1,11 +1,12 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
import { RouterModule } from '@angular/router';
+import { AuthModule } from '@dsh/app/auth';
import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-import { AuthModule } from '@dsh/app/auth';
import { FetchShopsService } from './services/fetch-shops/fetch-shops.service';
import { ShopsBalanceService } from './services/shops-balance/shops-balance.service';
diff --git a/src/app/sections/payment-section/shops/types/shop-item.ts b/src/app/sections/payment-section/shops/types/shop-item.ts
index ecda65a0a..7f2c4dd20 100644
--- a/src/app/sections/payment-section/shops/types/shop-item.ts
+++ b/src/app/sections/payment-section/shops/types/shop-item.ts
@@ -1,6 +1,7 @@
+import isNil from 'lodash-es/isNil';
+
import { AmountResult } from '@vality/swag-anapi-v2';
import { Shop as ApiShop, ShopLocation, ShopLocationUrl } from '@vality/swag-payments';
-import isNil from 'lodash-es/isNil';
export interface ShopItem extends ApiShop {
balance: AmountResult;
diff --git a/src/app/sections/sections.module.ts b/src/app/sections/sections.module.ts
index c5eff9c0e..e4fe1764b 100644
--- a/src/app/sections/sections.module.ts
+++ b/src/app/sections/sections.module.ts
@@ -1,6 +1,5 @@
import { NgModule } from '@angular/core';
import { MAT_DIALOG_DEFAULT_OPTIONS } from '@angular/material/dialog';
-
import {
DEBOUNCE_FETCHER_ACTION_TIME,
DEFAULT_FETCHER_DEBOUNCE_ACTION_TIME,
diff --git a/src/app/sections/sections.service.ts b/src/app/sections/sections.service.ts
index 3e6b2463c..2dbf333ee 100644
--- a/src/app/sections/sections.service.ts
+++ b/src/app/sections/sections.service.ts
@@ -1,9 +1,9 @@
-import { DestroyRef, Injectable } from '@angular/core';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { Router } from '@angular/router';
import { EMPTY, combineLatest, of, switchMap } from 'rxjs';
import { map, shareReplay } from 'rxjs/operators';
+import { DestroyRef, Injectable } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { Router } from '@angular/router';
import { WalletsService } from '@dsh/app/api/wallet';
import { ShopsDataService } from '@dsh/app/shared';
diff --git a/src/app/sections/wallet-section/deposits/deposit-panels/components/deposit-row/deposit-row.component.ts b/src/app/sections/wallet-section/deposits/deposit-panels/components/deposit-row/deposit-row.component.ts
index 84f94cd28..819949e57 100644
--- a/src/app/sections/wallet-section/deposits/deposit-panels/components/deposit-row/deposit-row.component.ts
+++ b/src/app/sections/wallet-section/deposits/deposit-panels/components/deposit-row/deposit-row.component.ts
@@ -1,7 +1,8 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { WalletDictionaryService } from '@dsh/app/api/wallet';
+
import { Deposit } from '@vality/swag-wallets';
-import { WalletDictionaryService } from '@dsh/app/api/wallet';
@Component({
selector: 'dsh-deposit-row',
diff --git a/src/app/sections/wallet-section/deposits/deposit-panels/deposit-details/deposit-details.component.ts b/src/app/sections/wallet-section/deposits/deposit-panels/deposit-details/deposit-details.component.ts
index 544e5ae96..793471bb8 100644
--- a/src/app/sections/wallet-section/deposits/deposit-panels/deposit-details/deposit-details.component.ts
+++ b/src/app/sections/wallet-section/deposits/deposit-panels/deposit-details/deposit-details.component.ts
@@ -1,7 +1,8 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { WalletDictionaryService } from '@dsh/app/api/wallet';
+
import { Deposit } from '@vality/swag-wallets';
-import { WalletDictionaryService } from '@dsh/app/api/wallet';
@Component({
selector: 'dsh-deposit-details',
diff --git a/src/app/sections/wallet-section/deposits/deposit-panels/deposit-details/deposit-details.module.ts b/src/app/sections/wallet-section/deposits/deposit-panels/deposit-details/deposit-details.module.ts
index 3e5ff3b03..2cef5cb99 100644
--- a/src/app/sections/wallet-section/deposits/deposit-panels/deposit-details/deposit-details.module.ts
+++ b/src/app/sections/wallet-section/deposits/deposit-panels/deposit-details/deposit-details.module.ts
@@ -1,11 +1,11 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { TranslocoModule } from '@jsverse/transloco';
import { FlexModule, GridModule } from 'ng-flex-layout';
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
import { AmountCurrencyModule, ApiModelRefsModule, ApiModelTypesModule } from '@dsh/app/shared';
import { StatusModule } from '@dsh/components/indicators';
import { LayoutModule } from '@dsh/components/layout';
+import { TranslocoModule } from '@jsverse/transloco';
import { DepositDetailsComponent } from './deposit-details.component';
diff --git a/src/app/sections/wallet-section/deposits/deposit-panels/deposit-panels.component.ts b/src/app/sections/wallet-section/deposits/deposit-panels/deposit-panels.component.ts
index 93d33e7cf..d6dcc04b4 100644
--- a/src/app/sections/wallet-section/deposits/deposit-panels/deposit-panels.component.ts
+++ b/src/app/sections/wallet-section/deposits/deposit-panels/deposit-panels.component.ts
@@ -1,6 +1,8 @@
+import isEmpty from 'lodash-es/isEmpty';
+
import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
+
import { Deposit } from '@vality/swag-wallets';
-import isEmpty from 'lodash-es/isEmpty';
@Component({
selector: 'dsh-deposit-panels',
diff --git a/src/app/sections/wallet-section/deposits/deposit-panels/deposit-panels.module.ts b/src/app/sections/wallet-section/deposits/deposit-panels/deposit-panels.module.ts
index 9b8e4c6a2..cee2cba7d 100644
--- a/src/app/sections/wallet-section/deposits/deposit-panels/deposit-panels.module.ts
+++ b/src/app/sections/wallet-section/deposits/deposit-panels/deposit-panels.module.ts
@@ -1,14 +1,14 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatDividerModule } from '@angular/material/divider';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { AmountCurrencyModule, ApiModelRefsModule, ApiModelTypesModule } from '@dsh/app/shared';
import { EmptySearchResultModule } from '@dsh/components/empty-search-result';
import { IndicatorsModule } from '@dsh/components/indicators';
import { LayoutModule } from '@dsh/components/layout';
import { ShowMorePanelModule } from '@dsh/components/show-more-panel';
+import { TranslocoModule } from '@jsverse/transloco';
import { DepositRowComponent } from './components/deposit-row/deposit-row.component';
import { DepositRowHeaderComponent } from './components/deposit-row-header/deposit-row-header.component';
diff --git a/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/additional-filters.module.ts b/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/additional-filters.module.ts
index a5702a113..aa59d3777 100644
--- a/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/additional-filters.module.ts
+++ b/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/additional-filters.module.ts
@@ -1,11 +1,12 @@
+import { FlexModule } from 'ng-flex-layout';
+
import { NgModule } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
import { MatDialogModule } from '@angular/material/dialog';
import { MatDividerModule } from '@angular/material/divider';
+import { DialogModule } from '@dsh/app/shared/components/dialog';
import { TranslocoModule } from '@jsverse/transloco';
-import { FlexModule } from 'ng-flex-layout';
-import { DialogModule } from '@dsh/app/shared/components/dialog';
import { DialogFiltersComponent } from './components/dialog-filters/dialog-filters.component';
import { DepositStatusFilterModule } from './deposit-status-filter';
diff --git a/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/components/dialog-filters/dialog-filters.component.ts b/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/components/dialog-filters/dialog-filters.component.ts
index 35e389edb..6f881464b 100644
--- a/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/components/dialog-filters/dialog-filters.component.ts
+++ b/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/components/dialog-filters/dialog-filters.component.ts
@@ -1,12 +1,12 @@
import { ChangeDetectionStrategy, Component, Inject, OnInit } from '@angular/core';
import { AbstractControl, FormBuilder, FormControl, FormGroup } from '@angular/forms';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { FormGroupByValue } from '@vality/matez';
-
import { getAbstractControl } from '@dsh/app/shared/utils';
import { formatMajorAmountToStr, getAmountNum } from '@dsh/app/shared/utils/amount-formatters';
import { removeDictEmptyFields } from '@dsh/utils';
+import { FormGroupByValue } from '@vality/matez';
+
import { DepositStatusFilterValue } from '../../deposit-status-filter/types/deposit-status-filter-value';
import { depositStatusValidator } from '../../deposit-status-filter/validators/deposit-status-validator';
import { DepositSumFilter } from '../../deposit-sum-filter';
diff --git a/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/deposit-status-filter/deposit-status-filter.component.ts b/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/deposit-status-filter/deposit-status-filter.component.ts
index cc987cb76..007f94f4a 100644
--- a/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/deposit-status-filter/deposit-status-filter.component.ts
+++ b/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/deposit-status-filter/deposit-status-filter.component.ts
@@ -1,8 +1,9 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
import { FormControl } from '@angular/forms';
+import { WalletDictionaryService } from '@dsh/app/api/wallet';
+
import { DepositStatus } from '@vality/swag-wallets';
-import { WalletDictionaryService } from '@dsh/app/api/wallet';
import { DEPOSIT_STATUSES_LIST } from './consts';
import { DepositStatusFilterValue } from './types/deposit-status-filter-value';
diff --git a/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/deposit-status-filter/deposit-status-filter.module.ts b/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/deposit-status-filter/deposit-status-filter.module.ts
index abac59bdd..865ccd636 100644
--- a/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/deposit-status-filter/deposit-status-filter.module.ts
+++ b/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/deposit-status-filter/deposit-status-filter.module.ts
@@ -1,10 +1,10 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { TranslocoModule } from '@jsverse/transloco';
import { FlexModule } from 'ng-flex-layout';
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
import { ApiModelTypesModule } from '@dsh/app/shared';
import { RadioButtonsModule } from '@dsh/app/shared/components/radio-buttons';
+import { TranslocoModule } from '@jsverse/transloco';
import { DepositStatusFilterComponent } from './deposit-status-filter.component';
diff --git a/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/deposit-status-filter/validators/deposit-status-validator.ts b/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/deposit-status-filter/validators/deposit-status-validator.ts
index 3ce13979d..11da8a069 100644
--- a/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/deposit-status-filter/validators/deposit-status-validator.ts
+++ b/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/deposit-status-filter/validators/deposit-status-validator.ts
@@ -1,6 +1,7 @@
-import { FormControl, ValidatorFn } from '@angular/forms';
import isNil from 'lodash-es/isNil';
+import { FormControl, ValidatorFn } from '@angular/forms';
+
import { DEPOSIT_STATUSES_LIST } from '../consts';
import { DepositStatusFilterValue } from '../types/deposit-status-filter-value';
diff --git a/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/deposit-sum-filter/deposit-sum-filter.component.ts b/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/deposit-sum-filter/deposit-sum-filter.component.ts
index db367a251..f2c61e4d8 100644
--- a/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/deposit-sum-filter/deposit-sum-filter.component.ts
+++ b/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/deposit-sum-filter/deposit-sum-filter.component.ts
@@ -1,4 +1,5 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+
import { FormGroupByValue } from '@vality/matez';
import { DepositSumFilter } from './types/deposit-sum-filter';
diff --git a/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/deposit-sum-filter/deposit-sum-filter.module.ts b/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/deposit-sum-filter/deposit-sum-filter.module.ts
index 00c4a12e8..40afba046 100644
--- a/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/deposit-sum-filter/deposit-sum-filter.module.ts
+++ b/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/deposit-sum-filter/deposit-sum-filter.module.ts
@@ -1,10 +1,11 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatInputModule } from '@angular/material/input';
import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
import { DepositSumFilterComponent } from './deposit-sum-filter.component';
diff --git a/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/main-info-filters/main-info-filters.component.ts b/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/main-info-filters/main-info-filters.component.ts
index 0987f0d09..7a0db751a 100644
--- a/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/main-info-filters/main-info-filters.component.ts
+++ b/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/main-info-filters/main-info-filters.component.ts
@@ -1,4 +1,5 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+
import { FormGroupByValue } from '@vality/matez';
import { MainInfoFilters } from './types/main-info-filters';
diff --git a/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/main-info-filters/main-info-filters.module.ts b/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/main-info-filters/main-info-filters.module.ts
index 4acc1e598..23085de8a 100644
--- a/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/main-info-filters/main-info-filters.module.ts
+++ b/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/main-info-filters/main-info-filters.module.ts
@@ -1,12 +1,13 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatInputModule } from '@angular/material/input';
+import { WalletAutocompleteFieldModule } from '@dsh/app/shared/components/inputs/wallet-autocomplete-field';
import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-import { WalletAutocompleteFieldModule } from '@dsh/app/shared/components/inputs/wallet-autocomplete-field';
import { MainInfoFiltersComponent } from './main-info-filters.component';
diff --git a/src/app/sections/wallet-section/deposits/deposits-filters/deposits-filters.component.ts b/src/app/sections/wallet-section/deposits/deposits-filters/deposits-filters.component.ts
index 81b4d5807..89a75aa9d 100644
--- a/src/app/sections/wallet-section/deposits/deposits-filters/deposits-filters.component.ts
+++ b/src/app/sections/wallet-section/deposits/deposits-filters/deposits-filters.component.ts
@@ -1,3 +1,11 @@
+import isEmpty from 'lodash-es/isEmpty';
+import isEqual from 'lodash-es/isEqual';
+import negate from 'lodash-es/negate';
+import omit from 'lodash-es/omit';
+import pick from 'lodash-es/pick';
+import { ReplaySubject, combineLatest, defer } from 'rxjs';
+import { filter, map } from 'rxjs/operators';
+
import {
ChangeDetectionStrategy,
Component,
@@ -11,18 +19,11 @@ import {
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { FormBuilder } from '@angular/forms';
import { MatDialog } from '@angular/material/dialog';
-import { ComponentChanges } from '@vality/matez';
-import isEmpty from 'lodash-es/isEmpty';
-import isEqual from 'lodash-es/isEqual';
-import negate from 'lodash-es/negate';
-import omit from 'lodash-es/omit';
-import pick from 'lodash-es/pick';
-import { ReplaySubject, combineLatest, defer } from 'rxjs';
-import { filter, map } from 'rxjs/operators';
-
import { Preset, createDateRangeWithPreset } from '@dsh/components/date-range-filter';
import { getFormValueChanges } from '@dsh/utils';
+import { ComponentChanges } from '@vality/matez';
+
import { DialogFiltersComponent } from './additional-filters/components/dialog-filters/dialog-filters.component';
import { AdditionalFilters } from './additional-filters/types/additional-filters';
import { DepositsFilters } from './types/deposits-filters';
diff --git a/src/app/sections/wallet-section/deposits/deposits-filters/deposits-filters.module.ts b/src/app/sections/wallet-section/deposits/deposits-filters/deposits-filters.module.ts
index a422c60d5..f07d2ee17 100644
--- a/src/app/sections/wallet-section/deposits/deposits-filters/deposits-filters.module.ts
+++ b/src/app/sections/wallet-section/deposits/deposits-filters/deposits-filters.module.ts
@@ -1,13 +1,13 @@
+import { FlexModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexModule } from 'ng-flex-layout';
-
import { DaterangeManagerModule } from '@dsh/app/shared/services/date-range-manager';
import { DateRangeFilterModule } from '@dsh/components/date-range-filter';
import { FilterModule } from '@dsh/components/filter';
import { FiltersGroupModule } from '@dsh/components/filters-group';
+import { TranslocoModule } from '@jsverse/transloco';
import { AdditionalFiltersModule } from './additional-filters';
import { DepositsFiltersComponent } from './deposits-filters.component';
diff --git a/src/app/sections/wallet-section/deposits/deposits.component.ts b/src/app/sections/wallet-section/deposits/deposits.component.ts
index 0979ecf2f..132100232 100644
--- a/src/app/sections/wallet-section/deposits/deposits.component.ts
+++ b/src/app/sections/wallet-section/deposits/deposits.component.ts
@@ -1,8 +1,9 @@
import { ChangeDetectionStrategy, Component, DestroyRef } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { ErrorService } from '@dsh/app/shared';
+
import { QueryParamsService } from '@vality/matez';
-import { ErrorService } from '@dsh/app/shared';
import { DepositsFilters } from './deposits-filters/types/deposits-filters';
import { DepositsExpandedIdManagerService } from './services/deposits-expanded-id-manager/deposits-expanded-id-manager.service';
diff --git a/src/app/sections/wallet-section/deposits/deposits.module.ts b/src/app/sections/wallet-section/deposits/deposits.module.ts
index 6092c40fa..10c86ff7a 100644
--- a/src/app/sections/wallet-section/deposits/deposits.module.ts
+++ b/src/app/sections/wallet-section/deposits/deposits.module.ts
@@ -1,3 +1,5 @@
+import { FlexModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
@@ -5,13 +7,11 @@ import { MatButtonModule } from '@angular/material/button';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatInputModule } from '@angular/material/input';
import { MatSelectModule } from '@angular/material/select';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexModule } from 'ng-flex-layout';
-
import { SEARCH_LIMIT } from '@dsh/app/sections/tokens';
import { IndicatorsModule, SpinnerModule } from '@dsh/components/indicators';
import { ScrollUpModule } from '@dsh/components/navigation';
import { ShowMorePanelModule } from '@dsh/components/show-more-panel';
+import { TranslocoModule } from '@jsverse/transloco';
import { DEPOSITS_UPDATE_DELAY, UPDATE_DELAY_TOKEN } from './consts';
import { DepositPanelsModule } from './deposit-panels';
diff --git a/src/app/sections/wallet-section/deposits/services/deposits-expanded-id-manager/deposits-expanded-id-manager.service.ts b/src/app/sections/wallet-section/deposits/services/deposits-expanded-id-manager/deposits-expanded-id-manager.service.ts
index 56feca1e1..21d815137 100644
--- a/src/app/sections/wallet-section/deposits/services/deposits-expanded-id-manager/deposits-expanded-id-manager.service.ts
+++ b/src/app/sections/wallet-section/deposits/services/deposits-expanded-id-manager/deposits-expanded-id-manager.service.ts
@@ -1,9 +1,11 @@
+import { Observable } from 'rxjs';
+
import { Injectable } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
+import { ExpandedIdManager, Fragment } from '@dsh/app/shared/services';
+
import { Deposit } from '@vality/swag-wallets';
-import { Observable } from 'rxjs';
-import { ExpandedIdManager, Fragment } from '@dsh/app/shared/services';
import { FetchDepositsService } from '../fetch-deposits/fetch-deposits.service';
diff --git a/src/app/sections/wallet-section/deposits/services/fetch-deposits/fetch-deposits.service.ts b/src/app/sections/wallet-section/deposits/services/fetch-deposits/fetch-deposits.service.ts
index fdeacd455..5b671644b 100644
--- a/src/app/sections/wallet-section/deposits/services/fetch-deposits/fetch-deposits.service.ts
+++ b/src/app/sections/wallet-section/deposits/services/fetch-deposits/fetch-deposits.service.ts
@@ -1,15 +1,16 @@
-import { Inject, Injectable } from '@angular/core';
-import { TranslocoService } from '@jsverse/transloco';
-import { NotifyLogService } from '@vality/matez';
-import { Deposit, ListDepositsRequestParams } from '@vality/swag-wallets';
import { isNumber } from 'lodash-es';
import { Observable, of } from 'rxjs';
import { catchError, shareReplay } from 'rxjs/operators';
+import { Inject, Injectable } from '@angular/core';
import { DepositsService } from '@dsh/app/api/wallet';
import { mapToTimestamp } from '@dsh/app/custom-operators';
import { SEARCH_LIMIT } from '@dsh/app/sections/tokens';
import { DEBOUNCE_FETCHER_ACTION_TIME, PartialFetcher } from '@dsh/app/shared';
+import { TranslocoService } from '@jsverse/transloco';
+
+import { NotifyLogService } from '@vality/matez';
+import { Deposit, ListDepositsRequestParams } from '@vality/swag-wallets';
@Injectable()
export class FetchDepositsService extends PartialFetcher<
diff --git a/src/app/sections/wallet-section/integrations/integrations.module.ts b/src/app/sections/wallet-section/integrations/integrations.module.ts
index 48c6122e5..913596873 100644
--- a/src/app/sections/wallet-section/integrations/integrations.module.ts
+++ b/src/app/sections/wallet-section/integrations/integrations.module.ts
@@ -1,11 +1,11 @@
+import { FlexModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatTabsModule } from '@angular/material/tabs';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexModule } from 'ng-flex-layout';
-
import { LayoutModule } from '@dsh/components/layout';
import { ScrollUpModule } from '@dsh/components/navigation';
+import { TranslocoModule } from '@jsverse/transloco';
import { IntegrationsRoutingModule } from './integrations-routing.module';
import { IntegrationsComponent } from './integrations.component';
diff --git a/src/app/sections/wallet-section/integrations/webhooks/create-webhook/create-webhook-dialog.component.ts b/src/app/sections/wallet-section/integrations/webhooks/create-webhook/create-webhook-dialog.component.ts
index 4f9e393a6..031a5cf4b 100644
--- a/src/app/sections/wallet-section/integrations/webhooks/create-webhook/create-webhook-dialog.component.ts
+++ b/src/app/sections/wallet-section/integrations/webhooks/create-webhook/create-webhook-dialog.component.ts
@@ -1,8 +1,10 @@
+import { filter } from 'rxjs/operators';
+
import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
import { MatDialogRef } from '@angular/material/dialog';
import { TranslocoService } from '@jsverse/transloco';
+
import { NotifyLogService } from '@vality/matez';
-import { filter } from 'rxjs/operators';
import { CreateWebhookDialogService } from './create-webhook-dialog.service';
diff --git a/src/app/sections/wallet-section/integrations/webhooks/create-webhook/create-webhook-dialog.service.ts b/src/app/sections/wallet-section/integrations/webhooks/create-webhook/create-webhook-dialog.service.ts
index fb2c53dd6..86882f80b 100644
--- a/src/app/sections/wallet-section/integrations/webhooks/create-webhook/create-webhook-dialog.service.ts
+++ b/src/app/sections/wallet-section/integrations/webhooks/create-webhook/create-webhook-dialog.service.ts
@@ -1,8 +1,8 @@
-import { Injectable } from '@angular/core';
-import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
import { BehaviorSubject, Subject, of } from 'rxjs';
import { catchError, filter, map, switchMap, withLatestFrom } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
import { WebhooksService } from '@dsh/app/api/wallet';
import { ContextOrganizationService } from '@dsh/app/shared';
import { oneMustBeSelected } from '@dsh/components/form-controls';
diff --git a/src/app/sections/wallet-section/integrations/webhooks/create-webhook/create-webhook-form/create-webhook-form.component.ts b/src/app/sections/wallet-section/integrations/webhooks/create-webhook/create-webhook-form/create-webhook-form.component.ts
index 8cf9fc9a0..e3a2841ac 100644
--- a/src/app/sections/wallet-section/integrations/webhooks/create-webhook/create-webhook-form/create-webhook-form.component.ts
+++ b/src/app/sections/wallet-section/integrations/webhooks/create-webhook/create-webhook-form/create-webhook-form.component.ts
@@ -1,13 +1,14 @@
-import { ChangeDetectionStrategy, Component, DestroyRef, Input, OnInit } from '@angular/core';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { UntypedFormArray, UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
-import { WebhookScope } from '@vality/swag-wallets';
import { BehaviorSubject, combineLatest } from 'rxjs';
import { map } from 'rxjs/operators';
+import { ChangeDetectionStrategy, Component, DestroyRef, Input, OnInit } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { UntypedFormArray, UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
import { WalletDictionaryService } from '@dsh/app/api/wallet';
import { oneMustBeSelected } from '@dsh/components/form-controls';
+import { WebhookScope } from '@vality/swag-wallets';
+
import { getEventsByTopic } from '../get-events-by-topic';
import TopicEnum = WebhookScope.TopicEnum;
diff --git a/src/app/sections/wallet-section/integrations/webhooks/create-webhook/create-webhook.module.ts b/src/app/sections/wallet-section/integrations/webhooks/create-webhook/create-webhook.module.ts
index 1c74377ab..606cf4ad4 100644
--- a/src/app/sections/wallet-section/integrations/webhooks/create-webhook/create-webhook.module.ts
+++ b/src/app/sections/wallet-section/integrations/webhooks/create-webhook/create-webhook.module.ts
@@ -1,3 +1,5 @@
+import { FlexModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
@@ -10,11 +12,9 @@ import { MatFormFieldModule } from '@angular/material/form-field';
import { MatInputModule } from '@angular/material/input';
import { MatRadioModule } from '@angular/material/radio';
import { MatSelectModule } from '@angular/material/select';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexModule } from 'ng-flex-layout';
-
import { BaseDialogModule } from '@dsh/app/shared/components/dialog/base-dialog';
import { WalletAutocompleteFieldModule } from '@dsh/app/shared/components/inputs/wallet-autocomplete-field';
+import { TranslocoModule } from '@jsverse/transloco';
import { CreateWebhookDialogComponent } from './create-webhook-dialog.component';
import { CreateWebhookFormComponent } from './create-webhook-form';
diff --git a/src/app/sections/wallet-section/integrations/webhooks/create-webhook/create-webhook.service.ts b/src/app/sections/wallet-section/integrations/webhooks/create-webhook/create-webhook.service.ts
index 587612b1f..f4dddb84f 100644
--- a/src/app/sections/wallet-section/integrations/webhooks/create-webhook/create-webhook.service.ts
+++ b/src/app/sections/wallet-section/integrations/webhooks/create-webhook/create-webhook.service.ts
@@ -1,8 +1,9 @@
-import { Injectable } from '@angular/core';
-import { MatDialog } from '@angular/material/dialog';
import { Observable, Subject } from 'rxjs';
import { filter, switchMap, takeUntil } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
+import { MatDialog } from '@angular/material/dialog';
+
import { CreateWebhookDialogComponent } from './create-webhook-dialog.component';
@Injectable()
diff --git a/src/app/sections/wallet-section/integrations/webhooks/delete-webhook/delete-webhook.service.ts b/src/app/sections/wallet-section/integrations/webhooks/delete-webhook/delete-webhook.service.ts
index a69af1cb7..98609e06b 100644
--- a/src/app/sections/wallet-section/integrations/webhooks/delete-webhook/delete-webhook.service.ts
+++ b/src/app/sections/wallet-section/integrations/webhooks/delete-webhook/delete-webhook.service.ts
@@ -1,12 +1,14 @@
-import { Injectable } from '@angular/core';
-import { MatDialog } from '@angular/material/dialog';
-import { TranslocoService } from '@jsverse/transloco';
-import { DialogResponseStatus, NotifyLogService } from '@vality/matez';
import { Observable, Subject, combineLatest, of } from 'rxjs';
import { catchError, filter, switchMap, takeUntil } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
+import { MatDialog } from '@angular/material/dialog';
import { WebhooksService } from '@dsh/app/api/wallet';
import { ConfirmActionDialogComponent } from '@dsh/components/popups';
+import { TranslocoService } from '@jsverse/transloco';
+
+import { DialogResponseStatus, NotifyLogService } from '@vality/matez';
+
import { DeleteWebhookParams } from '../webhook-details/webhook-actions';
diff --git a/src/app/sections/wallet-section/integrations/webhooks/receive-webhooks.service.ts b/src/app/sections/wallet-section/integrations/webhooks/receive-webhooks.service.ts
index b02852902..b31ffad84 100644
--- a/src/app/sections/wallet-section/integrations/webhooks/receive-webhooks.service.ts
+++ b/src/app/sections/wallet-section/integrations/webhooks/receive-webhooks.service.ts
@@ -1,12 +1,14 @@
-import { Injectable } from '@angular/core';
-import { TranslocoService } from '@jsverse/transloco';
-import { NotifyLogService } from '@vality/matez';
-import { Webhook } from '@vality/swag-wallets';
import sortBy from 'lodash-es/sortBy';
import { BehaviorSubject, Observable, Subject, of } from 'rxjs';
import { catchError, filter, map, shareReplay, switchMap } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
import { WebhooksService } from '@dsh/app/api/wallet';
+import { TranslocoService } from '@jsverse/transloco';
+
+import { NotifyLogService } from '@vality/matez';
+import { Webhook } from '@vality/swag-wallets';
+
import { mapToTimestamp, progress } from '../../../../custom-operators';
diff --git a/src/app/sections/wallet-section/integrations/webhooks/webhook-details/webhook-details.component.ts b/src/app/sections/wallet-section/integrations/webhooks/webhook-details/webhook-details.component.ts
index 60f7bb36f..9ba99577b 100644
--- a/src/app/sections/wallet-section/integrations/webhooks/webhook-details/webhook-details.component.ts
+++ b/src/app/sections/wallet-section/integrations/webhooks/webhook-details/webhook-details.component.ts
@@ -1,4 +1,5 @@
import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
+
import { Webhook, WebhookScope, WithdrawalsTopic } from '@vality/swag-wallets';
import { DeleteWebhookParams } from './webhook-actions';
diff --git a/src/app/sections/wallet-section/integrations/webhooks/webhook-details/webhook-details.module.ts b/src/app/sections/wallet-section/integrations/webhooks/webhook-details/webhook-details.module.ts
index 02372993e..aee62dafe 100644
--- a/src/app/sections/wallet-section/integrations/webhooks/webhook-details/webhook-details.module.ts
+++ b/src/app/sections/wallet-section/integrations/webhooks/webhook-details/webhook-details.module.ts
@@ -1,16 +1,16 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { ClipboardModule } from '@angular/cdk/clipboard';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
import { MatDividerModule } from '@angular/material/divider';
import { MatSnackBarModule } from '@angular/material/snack-bar';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { WebhookApiKeyModule } from '@dsh/app/shared/components';
import { ApiModelRefsModule } from '@dsh/app/shared/pipes';
import { IndicatorsModule } from '@dsh/components/indicators';
import { LayoutModule } from '@dsh/components/layout';
+import { TranslocoModule } from '@jsverse/transloco';
import { WebhookActionsComponent } from './webhook-actions';
import { WebhookDetailsComponent } from './webhook-details.component';
diff --git a/src/app/sections/wallet-section/integrations/webhooks/webhook-details/webhook-events/webhook-events.component.ts b/src/app/sections/wallet-section/integrations/webhooks/webhook-details/webhook-events/webhook-events.component.ts
index 0d0fc17c4..0ed70900b 100644
--- a/src/app/sections/wallet-section/integrations/webhooks/webhook-details/webhook-events/webhook-events.component.ts
+++ b/src/app/sections/wallet-section/integrations/webhooks/webhook-details/webhook-events/webhook-events.component.ts
@@ -1,10 +1,11 @@
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
-import { DestinationsTopic, WebhookScope, WithdrawalsTopic } from '@vality/swag-wallets';
import { combineLatest } from 'rxjs';
import { map } from 'rxjs/operators';
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
import { WalletDictionaryService } from '@dsh/app/api/wallet';
+import { DestinationsTopic, WebhookScope, WithdrawalsTopic } from '@vality/swag-wallets';
+
@Component({
selector: 'dsh-webhook-events',
templateUrl: 'webhook-events.component.html',
diff --git a/src/app/sections/wallet-section/integrations/webhooks/webhook-list/webhook-list.component.ts b/src/app/sections/wallet-section/integrations/webhooks/webhook-list/webhook-list.component.ts
index 4e37be5eb..f452596ef 100644
--- a/src/app/sections/wallet-section/integrations/webhooks/webhook-list/webhook-list.component.ts
+++ b/src/app/sections/wallet-section/integrations/webhooks/webhook-list/webhook-list.component.ts
@@ -8,6 +8,7 @@ import {
Output,
} from '@angular/core';
import { TranslocoService } from '@jsverse/transloco';
+
import { NotifyLogService } from '@vality/matez';
import { Webhook } from '@vality/swag-wallets';
diff --git a/src/app/sections/wallet-section/integrations/webhooks/webhook-list/webhook-list.module.ts b/src/app/sections/wallet-section/integrations/webhooks/webhook-list/webhook-list.module.ts
index 52dad2ce8..b8ee84780 100644
--- a/src/app/sections/wallet-section/integrations/webhooks/webhook-list/webhook-list.module.ts
+++ b/src/app/sections/wallet-section/integrations/webhooks/webhook-list/webhook-list.module.ts
@@ -1,11 +1,11 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatSnackBarModule } from '@angular/material/snack-bar';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { IndicatorsModule } from '@dsh/components/indicators';
import { LayoutModule } from '@dsh/components/layout';
+import { TranslocoModule } from '@jsverse/transloco';
import { DeleteWebhookModule } from '../delete-webhook';
import { WebhookDetailsModule } from '../webhook-details';
diff --git a/src/app/sections/wallet-section/integrations/webhooks/webhooks-expanded-id-manager.service.ts b/src/app/sections/wallet-section/integrations/webhooks/webhooks-expanded-id-manager.service.ts
index 898acf9dd..8750698f4 100644
--- a/src/app/sections/wallet-section/integrations/webhooks/webhooks-expanded-id-manager.service.ts
+++ b/src/app/sections/wallet-section/integrations/webhooks/webhooks-expanded-id-manager.service.ts
@@ -1,9 +1,11 @@
+import { Observable } from 'rxjs';
+
import { Injectable } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
+import { ExpandedIdManager } from '@dsh/app/shared/services';
+
import { Webhook } from '@vality/swag-wallets';
-import { Observable } from 'rxjs';
-import { ExpandedIdManager } from '@dsh/app/shared/services';
import { ReceiveWebhooksService } from './receive-webhooks.service';
diff --git a/src/app/sections/wallet-section/integrations/webhooks/webhooks.component.ts b/src/app/sections/wallet-section/integrations/webhooks/webhooks.component.ts
index ece7797fc..bfccd7aa0 100644
--- a/src/app/sections/wallet-section/integrations/webhooks/webhooks.component.ts
+++ b/src/app/sections/wallet-section/integrations/webhooks/webhooks.component.ts
@@ -1,5 +1,6 @@
import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core';
import { TranslocoService } from '@jsverse/transloco';
+
import { NotifyLogService } from '@vality/matez';
import { CreateWebhookService } from './create-webhook';
diff --git a/src/app/sections/wallet-section/integrations/webhooks/webhooks.module.ts b/src/app/sections/wallet-section/integrations/webhooks/webhooks.module.ts
index 5c9d8830c..871d57c0a 100644
--- a/src/app/sections/wallet-section/integrations/webhooks/webhooks.module.ts
+++ b/src/app/sections/wallet-section/integrations/webhooks/webhooks.module.ts
@@ -1,11 +1,11 @@
+import { FlexModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexModule } from 'ng-flex-layout';
-
import { EmptySearchResultModule } from '@dsh/components/empty-search-result';
import { SpinnerModule } from '@dsh/components/indicators';
+import { TranslocoModule } from '@jsverse/transloco';
import { CreateWebhookModule } from './create-webhook';
import { ReceiveWebhooksService } from './receive-webhooks.service';
diff --git a/src/app/sections/wallet-section/reports/components/create-report-dialog/create-report-dialog.component.ts b/src/app/sections/wallet-section/reports/components/create-report-dialog/create-report-dialog.component.ts
index 715d724a8..14ffbd325 100644
--- a/src/app/sections/wallet-section/reports/components/create-report-dialog/create-report-dialog.component.ts
+++ b/src/app/sections/wallet-section/reports/components/create-report-dialog/create-report-dialog.component.ts
@@ -1,15 +1,16 @@
+import moment from 'moment/moment';
+import { BehaviorSubject } from 'rxjs';
+
import { ChangeDetectionStrategy, Component, DestroyRef } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { NonNullableFormBuilder, Validators } from '@angular/forms';
import { MatDialogRef } from '@angular/material/dialog';
-import { TranslocoService } from '@jsverse/transloco';
-import { NotifyLogService, progressTo } from '@vality/matez';
-import moment from 'moment/moment';
-import { BehaviorSubject } from 'rxjs';
-
import { ReportsService } from '@dsh/app/api/wallet';
import { getDateWithTime } from '@dsh/app/sections/payment-section/reports/create-report/form-value-to-create-value';
import { BaseDialogResponseStatus } from '@dsh/app/shared/components/dialog/base-dialog';
+import { TranslocoService } from '@jsverse/transloco';
+
+import { NotifyLogService, progressTo } from '@vality/matez';
const TIME_PATTERN = /^([0-9]|0[0-9]|1[0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]$/;
diff --git a/src/app/sections/wallet-section/reports/components/files/files.component.ts b/src/app/sections/wallet-section/reports/components/files/files.component.ts
index 9b282483c..cdeee3098 100644
--- a/src/app/sections/wallet-section/reports/components/files/files.component.ts
+++ b/src/app/sections/wallet-section/reports/components/files/files.component.ts
@@ -1,13 +1,15 @@
+import { BehaviorSubject, EMPTY, forkJoin } from 'rxjs';
+import { catchError } from 'rxjs/operators';
+
import { ChangeDetectionStrategy, Component, DestroyRef, Input } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { DownloadsService } from '@dsh/app/api/wallet';
+import { multipleDownload } from '@dsh/utils';
import { TranslocoService } from '@jsverse/transloco';
+
import { NotifyLogService, progressTo } from '@vality/matez';
import { ReportFilesInner } from '@vality/swag-wallets';
-import { BehaviorSubject, EMPTY, forkJoin } from 'rxjs';
-import { catchError } from 'rxjs/operators';
-import { DownloadsService } from '@dsh/app/api/wallet';
-import { multipleDownload } from '@dsh/utils';
@Component({
selector: 'dsh-files',
diff --git a/src/app/sections/wallet-section/reports/fetch-reports.service.ts b/src/app/sections/wallet-section/reports/fetch-reports.service.ts
index e2b6c3d8e..78c3ca27b 100644
--- a/src/app/sections/wallet-section/reports/fetch-reports.service.ts
+++ b/src/app/sections/wallet-section/reports/fetch-reports.service.ts
@@ -1,11 +1,13 @@
-import { Injectable } from '@angular/core';
-import { FetchResult, FetchSuperclass, NotifyLogService } from '@vality/matez';
-import { GetReportsRequestParams, Report } from '@vality/swag-wallets';
import { Observable, of } from 'rxjs';
import { catchError, map } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
import { ReportsService } from '@dsh/app/api/wallet';
+import { FetchResult, FetchSuperclass, NotifyLogService } from '@vality/matez';
+import { GetReportsRequestParams, Report } from '@vality/swag-wallets';
+
+
@Injectable()
export class FetchReportsService extends FetchSuperclass<
Report,
diff --git a/src/app/sections/wallet-section/reports/reports.component.ts b/src/app/sections/wallet-section/reports/reports.component.ts
index 2d6f5931c..f455883d0 100644
--- a/src/app/sections/wallet-section/reports/reports.component.ts
+++ b/src/app/sections/wallet-section/reports/reports.component.ts
@@ -1,21 +1,22 @@
+import isEqual from 'lodash-es/isEqual';
+import moment from 'moment';
+import { distinctUntilChanged, filter, map, startWith } from 'rxjs/operators';
+
import { Breakpoints } from '@angular/cdk/layout';
import { ChangeDetectionStrategy, Component, DestroyRef, OnInit } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { NonNullableFormBuilder } from '@angular/forms';
import { MatDialog } from '@angular/material/dialog';
-import { TranslocoService } from '@jsverse/transloco';
-import { QueryParamsService } from '@vality/matez';
-import { Report } from '@vality/swag-wallets';
-import isEqual from 'lodash-es/isEqual';
-import moment from 'moment';
-import { distinctUntilChanged, filter, map, startWith } from 'rxjs/operators';
-
import { WalletDictionaryService } from '@dsh/app/api/wallet';
import { mapToTimestamp } from '@dsh/app/custom-operators';
import { Column, ExpandedFragment } from '@dsh/app/shared/components/accordion-table';
import { BaseDialogResponseStatus } from '@dsh/app/shared/components/dialog/base-dialog';
import { StatusColor } from '@dsh/app/theme-manager';
import { DateRange, Preset, createDateRangeWithPreset } from '@dsh/components/date-range-filter';
+import { TranslocoService } from '@jsverse/transloco';
+
+import { QueryParamsService } from '@vality/matez';
+import { Report } from '@vality/swag-wallets';
import { CreateReportDialogComponent } from './components/create-report-dialog/create-report-dialog.component';
import { FetchReportsService } from './fetch-reports.service';
diff --git a/src/app/sections/wallet-section/reports/reports.module.ts b/src/app/sections/wallet-section/reports/reports.module.ts
index 3216f71d6..b4abecc8b 100644
--- a/src/app/sections/wallet-section/reports/reports.module.ts
+++ b/src/app/sections/wallet-section/reports/reports.module.ts
@@ -1,3 +1,5 @@
+import { ExtendedModule, FlexModule, GridModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
@@ -9,9 +11,6 @@ import { MatDividerModule } from '@angular/material/divider';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatInputModule } from '@angular/material/input';
import { MatSelectModule } from '@angular/material/select';
-import { TranslocoModule } from '@jsverse/transloco';
-import { ExtendedModule, FlexModule, GridModule } from 'ng-flex-layout';
-
import { ApiModelRefsModule } from '@dsh/app/shared';
import { AccordionTableModule } from '@dsh/app/shared/components/accordion-table';
import { DialogModule } from '@dsh/app/shared/components/dialog';
@@ -20,6 +19,7 @@ import { FilterModule } from '@dsh/components/filter';
import { FiltersGroupModule } from '@dsh/components/filters-group';
import { BootstrapIconModule, StatusModule } from '@dsh/components/indicators';
import { DetailsItemModule } from '@dsh/components/layout';
+import { TranslocoModule } from '@jsverse/transloco';
import { CreateReportDialogComponent } from './components/create-report-dialog/create-report-dialog.component';
import { FilesComponent } from './components/files/files.component';
diff --git a/src/app/sections/wallet-section/status-to-color.pipe.ts b/src/app/sections/wallet-section/status-to-color.pipe.ts
index 2b7d9f4f8..64fcba1fc 100644
--- a/src/app/sections/wallet-section/status-to-color.pipe.ts
+++ b/src/app/sections/wallet-section/status-to-color.pipe.ts
@@ -1,4 +1,5 @@
import { Pipe, PipeTransform } from '@angular/core';
+
import { DepositStatus, WithdrawalStatus } from '@vality/swag-wallets';
import { StatusColor as Color } from '../../theme-manager';
diff --git a/src/app/sections/wallet-section/wallet-section.component.ts b/src/app/sections/wallet-section/wallet-section.component.ts
index 27c6bca7d..d2349a965 100644
--- a/src/app/sections/wallet-section/wallet-section.component.ts
+++ b/src/app/sections/wallet-section/wallet-section.component.ts
@@ -1,8 +1,9 @@
-import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
-import { TranslocoService } from '@jsverse/transloco';
import { Observable, Subject } from 'rxjs';
import { map, pluck } from 'rxjs/operators';
+import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
+import { TranslocoService } from '@jsverse/transloco';
+
import { NavbarItemConfig, toNavbarItemConfig } from './utils';
@Component({
diff --git a/src/app/sections/wallet-section/wallet-section.module.ts b/src/app/sections/wallet-section/wallet-section.module.ts
index cf3e517ad..05bf65b7a 100644
--- a/src/app/sections/wallet-section/wallet-section.module.ts
+++ b/src/app/sections/wallet-section/wallet-section.module.ts
@@ -1,11 +1,11 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatIconModule } from '@angular/material/icon';
-import { TRANSLOCO_SCOPE, TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { RouteNavbarLayoutModule } from '@dsh/app/shared/components/route-navbar-layout';
import { NavbarItemModule } from '@dsh/components/navigation';
+import { TRANSLOCO_SCOPE, TranslocoModule } from '@jsverse/transloco';
import { StatusToColorPipe } from './status-to-color.pipe';
import { WalletSectionRoutingModule } from './wallet-section-routing.module';
diff --git a/src/app/sections/wallet-section/wallets/services/fetch-wallets/fetch-wallets.service.ts b/src/app/sections/wallet-section/wallets/services/fetch-wallets/fetch-wallets.service.ts
index 148af4d33..ae9842941 100644
--- a/src/app/sections/wallet-section/wallets/services/fetch-wallets/fetch-wallets.service.ts
+++ b/src/app/sections/wallet-section/wallets/services/fetch-wallets/fetch-wallets.service.ts
@@ -1,13 +1,14 @@
-import { DestroyRef, Inject, Injectable } from '@angular/core';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { ListWalletsRequestParams, Wallet } from '@vality/swag-wallets';
import { Observable, shareReplay } from 'rxjs';
+import { DestroyRef, Inject, Injectable } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { WalletsService } from '@dsh/app/api/wallet';
import { mapToTimestamp } from '@dsh/app/custom-operators';
import { SEARCH_LIMIT } from '@dsh/app/sections/tokens';
import { ContextOrganizationService, FetchResult, PartialFetcher } from '@dsh/app/shared';
+import { ListWalletsRequestParams, Wallet } from '@vality/swag-wallets';
+
@Injectable()
export class FetchWalletsService extends PartialFetcher<
Wallet,
diff --git a/src/app/sections/wallet-section/wallets/services/wallets-expanded-id-manager/wallets-expanded-id-manager.service.ts b/src/app/sections/wallet-section/wallets/services/wallets-expanded-id-manager/wallets-expanded-id-manager.service.ts
index 50892cf34..0016d3b60 100644
--- a/src/app/sections/wallet-section/wallets/services/wallets-expanded-id-manager/wallets-expanded-id-manager.service.ts
+++ b/src/app/sections/wallet-section/wallets/services/wallets-expanded-id-manager/wallets-expanded-id-manager.service.ts
@@ -1,9 +1,11 @@
+import { Observable } from 'rxjs';
+
import { Injectable } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
+import { ExpandedIdManager } from '@dsh/app/shared/services';
+
import { Wallet } from '@vality/swag-wallets';
-import { Observable } from 'rxjs';
-import { ExpandedIdManager } from '@dsh/app/shared/services';
import { FetchWalletsService } from '../fetch-wallets';
diff --git a/src/app/sections/wallet-section/wallets/wallets-list/components/wallet-details/wallet-details.component.ts b/src/app/sections/wallet-section/wallets/wallets-list/components/wallet-details/wallet-details.component.ts
index 8e8cf9385..3a7b30fb2 100644
--- a/src/app/sections/wallet-section/wallets/wallets-list/components/wallet-details/wallet-details.component.ts
+++ b/src/app/sections/wallet-section/wallets/wallets-list/components/wallet-details/wallet-details.component.ts
@@ -1,4 +1,5 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+
import { Wallet } from '@vality/swag-wallets';
@Component({
diff --git a/src/app/sections/wallet-section/wallets/wallets-list/wallet-account-info/services/fetch-wallet-account/fetch-wallet-account.service.ts b/src/app/sections/wallet-section/wallets/wallets-list/wallet-account-info/services/fetch-wallet-account/fetch-wallet-account.service.ts
index d14e557c0..dfb0ddac6 100644
--- a/src/app/sections/wallet-section/wallets/wallets-list/wallet-account-info/services/fetch-wallet-account/fetch-wallet-account.service.ts
+++ b/src/app/sections/wallet-section/wallets/wallets-list/wallet-account-info/services/fetch-wallet-account/fetch-wallet-account.service.ts
@@ -1,12 +1,13 @@
-import { DestroyRef, Injectable } from '@angular/core';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { WalletAccount } from '@vality/swag-wallets';
import { BehaviorSubject, EMPTY, Observable, ReplaySubject, defer } from 'rxjs';
import { catchError, map, shareReplay, switchMap } from 'rxjs/operators';
+import { DestroyRef, Injectable } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { WalletsService } from '@dsh/app/api/wallet';
import { errorTo, progressTo } from '@dsh/utils';
+import { WalletAccount } from '@vality/swag-wallets';
+
@Injectable()
export class FetchWalletAccountService {
walletAccount$: Observable = defer(() => this.fetchWalletAccount$).pipe(
diff --git a/src/app/sections/wallet-section/wallets/wallets-list/wallet-account-info/wallets-account-info.component.ts b/src/app/sections/wallet-section/wallets/wallets-list/wallet-account-info/wallets-account-info.component.ts
index e65b60f38..b75ca60a9 100644
--- a/src/app/sections/wallet-section/wallets/wallets-list/wallet-account-info/wallets-account-info.component.ts
+++ b/src/app/sections/wallet-section/wallets/wallets-list/wallet-account-info/wallets-account-info.component.ts
@@ -1,4 +1,5 @@
import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core';
+
import { ComponentChanges } from '@vality/matez';
import { FetchWalletAccountService } from './services';
diff --git a/src/app/sections/wallet-section/wallets/wallets-list/wallet-account-info/wallets-account-info.module.ts b/src/app/sections/wallet-section/wallets/wallets-list/wallet-account-info/wallets-account-info.module.ts
index 2b0d5706c..b347ea734 100644
--- a/src/app/sections/wallet-section/wallets/wallets-list/wallet-account-info/wallets-account-info.module.ts
+++ b/src/app/sections/wallet-section/wallets/wallets-list/wallet-account-info/wallets-account-info.module.ts
@@ -1,10 +1,10 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { TranslocoModule } from '@jsverse/transloco';
import { FlexModule, GridModule } from 'ng-flex-layout';
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
import { AmountCurrencyModule } from '@dsh/app/shared';
import { DetailsItemModule } from '@dsh/components/layout';
+import { TranslocoModule } from '@jsverse/transloco';
import { WalletsAccountInfoComponent } from './wallets-account-info.component';
diff --git a/src/app/sections/wallet-section/wallets/wallets-list/wallet-deposits/components/wallet-deposit-details/wallet-deposit-details.component.ts b/src/app/sections/wallet-section/wallets/wallets-list/wallet-deposits/components/wallet-deposit-details/wallet-deposit-details.component.ts
index a3fa1b039..2d74472ef 100644
--- a/src/app/sections/wallet-section/wallets/wallets-list/wallet-deposits/components/wallet-deposit-details/wallet-deposit-details.component.ts
+++ b/src/app/sections/wallet-section/wallets/wallets-list/wallet-deposits/components/wallet-deposit-details/wallet-deposit-details.component.ts
@@ -1,7 +1,8 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { WalletDictionaryService } from '@dsh/app/api/wallet';
+
import { Deposit } from '@vality/swag-wallets';
-import { WalletDictionaryService } from '@dsh/app/api/wallet';
@Component({
selector: 'dsh-wallet-deposit-details',
diff --git a/src/app/sections/wallet-section/wallets/wallets-list/wallet-deposits/services/fetch-wallet-deposits/fetch-wallet-deposits.service.ts b/src/app/sections/wallet-section/wallets/wallets-list/wallet-deposits/services/fetch-wallet-deposits/fetch-wallet-deposits.service.ts
index 88317b80d..2a4cf09cc 100644
--- a/src/app/sections/wallet-section/wallets/wallets-list/wallet-deposits/services/fetch-wallet-deposits/fetch-wallet-deposits.service.ts
+++ b/src/app/sections/wallet-section/wallets/wallets-list/wallet-deposits/services/fetch-wallet-deposits/fetch-wallet-deposits.service.ts
@@ -1,10 +1,10 @@
import { Inject, Injectable } from '@angular/core';
-import { Deposit } from '@vality/swag-wallets';
-
import { DepositsService } from '@dsh/app/api/wallet';
import { SEARCH_LIMIT } from '@dsh/app/sections/tokens';
import { PartialFetcher } from '@dsh/app/shared';
+import { Deposit } from '@vality/swag-wallets';
+
@Injectable()
export class FetchWalletDepositsService extends PartialFetcher {
constructor(
diff --git a/src/app/sections/wallet-section/wallets/wallets-list/wallet-deposits/wallet-deposits.component.ts b/src/app/sections/wallet-section/wallets/wallets-list/wallet-deposits/wallet-deposits.component.ts
index 70ab2524b..a329dff30 100644
--- a/src/app/sections/wallet-section/wallets/wallets-list/wallet-deposits/wallet-deposits.component.ts
+++ b/src/app/sections/wallet-section/wallets/wallets-list/wallet-deposits/wallet-deposits.component.ts
@@ -1,7 +1,8 @@
import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core';
+import { SEARCH_LIMIT } from '@dsh/app/sections/tokens';
+
import { ComponentChanges } from '@vality/matez';
-import { SEARCH_LIMIT } from '@dsh/app/sections/tokens';
import { FetchWalletDepositsService } from './services';
diff --git a/src/app/sections/wallet-section/wallets/wallets-list/wallet-deposits/wallet-deposits.module.ts b/src/app/sections/wallet-section/wallets/wallets-list/wallet-deposits/wallet-deposits.module.ts
index c0b74eefc..b95e653cb 100644
--- a/src/app/sections/wallet-section/wallets/wallets-list/wallet-deposits/wallet-deposits.module.ts
+++ b/src/app/sections/wallet-section/wallets/wallets-list/wallet-deposits/wallet-deposits.module.ts
@@ -1,10 +1,9 @@
+import { FlexModule, GridModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
import { MatDividerModule } from '@angular/material/divider';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexModule, GridModule } from 'ng-flex-layout';
-
import { AmountCurrencyModule, ApiModelTypesModule } from '@dsh/app/shared';
import { StatusModule, TextColorModule } from '@dsh/components/indicators';
import {
@@ -14,6 +13,7 @@ import {
RowModule,
} from '@dsh/components/layout';
import { ShowMorePanelModule } from '@dsh/components/show-more-panel';
+import { TranslocoModule } from '@jsverse/transloco';
import { WalletDepositDetailsComponent } from './components';
import { WalletDepositsComponent } from './wallet-deposits.component';
diff --git a/src/app/sections/wallet-section/wallets/wallets-list/wallet-main-info/wallets-main-info.component.ts b/src/app/sections/wallet-section/wallets/wallets-list/wallet-main-info/wallets-main-info.component.ts
index c5602384e..a4229e10f 100644
--- a/src/app/sections/wallet-section/wallets/wallets-list/wallet-main-info/wallets-main-info.component.ts
+++ b/src/app/sections/wallet-section/wallets/wallets-list/wallet-main-info/wallets-main-info.component.ts
@@ -1,4 +1,5 @@
import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core';
+
import { ComponentChanges } from '@vality/matez';
import { Wallet } from '@vality/swag-wallets';
diff --git a/src/app/sections/wallet-section/wallets/wallets-list/wallet-main-info/wallets-main-info.module.ts b/src/app/sections/wallet-section/wallets/wallets-list/wallet-main-info/wallets-main-info.module.ts
index 2129263e2..f5d504c96 100644
--- a/src/app/sections/wallet-section/wallets/wallets-list/wallet-main-info/wallets-main-info.module.ts
+++ b/src/app/sections/wallet-section/wallets/wallets-list/wallet-main-info/wallets-main-info.module.ts
@@ -1,11 +1,11 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { TranslocoModule } from '@jsverse/transloco';
import { FlexModule, GridModule } from 'ng-flex-layout';
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
import { AmountCurrencyModule } from '@dsh/app/shared';
import { SpinnerModule } from '@dsh/components/indicators';
import { DetailsItemModule } from '@dsh/components/layout';
+import { TranslocoModule } from '@jsverse/transloco';
import { WalletsMainInfoComponent } from './wallets-main-info.component';
diff --git a/src/app/sections/wallet-section/wallets/wallets-list/wallet-withdrawals/components/wallet-deposit-details/wallet-withdrawal-details.component.ts b/src/app/sections/wallet-section/wallets/wallets-list/wallet-withdrawals/components/wallet-deposit-details/wallet-withdrawal-details.component.ts
index e247343e4..b1d956232 100644
--- a/src/app/sections/wallet-section/wallets/wallets-list/wallet-withdrawals/components/wallet-deposit-details/wallet-withdrawal-details.component.ts
+++ b/src/app/sections/wallet-section/wallets/wallets-list/wallet-withdrawals/components/wallet-deposit-details/wallet-withdrawal-details.component.ts
@@ -1,7 +1,8 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { WalletDictionaryService } from '@dsh/app/api/wallet';
+
import { Withdrawal } from '@vality/swag-wallets';
-import { WalletDictionaryService } from '@dsh/app/api/wallet';
@Component({
selector: 'dsh-wallet-withdrawal-details',
diff --git a/src/app/sections/wallet-section/wallets/wallets-list/wallet-withdrawals/services/fetch-wallet-withdrawals/fetch-wallet-withdrawals.service.ts b/src/app/sections/wallet-section/wallets/wallets-list/wallet-withdrawals/services/fetch-wallet-withdrawals/fetch-wallet-withdrawals.service.ts
index 4938797ca..5dfd9431a 100644
--- a/src/app/sections/wallet-section/wallets/wallets-list/wallet-withdrawals/services/fetch-wallet-withdrawals/fetch-wallet-withdrawals.service.ts
+++ b/src/app/sections/wallet-section/wallets/wallets-list/wallet-withdrawals/services/fetch-wallet-withdrawals/fetch-wallet-withdrawals.service.ts
@@ -1,11 +1,12 @@
-import { Inject, Injectable } from '@angular/core';
-import { Withdrawal } from '@vality/swag-wallets';
import { Observable } from 'rxjs';
+import { Inject, Injectable } from '@angular/core';
import { WithdrawalsService } from '@dsh/app/api/wallet';
import { SEARCH_LIMIT } from '@dsh/app/sections/tokens';
import { PartialFetcher } from '@dsh/app/shared';
+import { Withdrawal } from '@vality/swag-wallets';
+
@Injectable()
export class FetchWalletWithdrawalsService extends PartialFetcher {
constructor(
diff --git a/src/app/sections/wallet-section/wallets/wallets-list/wallet-withdrawals/wallet-withdrawals.component.ts b/src/app/sections/wallet-section/wallets/wallets-list/wallet-withdrawals/wallet-withdrawals.component.ts
index de78f101a..1086acba5 100644
--- a/src/app/sections/wallet-section/wallets/wallets-list/wallet-withdrawals/wallet-withdrawals.component.ts
+++ b/src/app/sections/wallet-section/wallets/wallets-list/wallet-withdrawals/wallet-withdrawals.component.ts
@@ -1,7 +1,8 @@
import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core';
+import { SEARCH_LIMIT } from '@dsh/app/sections/tokens';
+
import { ComponentChanges } from '@vality/matez';
-import { SEARCH_LIMIT } from '@dsh/app/sections/tokens';
import { FetchWalletWithdrawalsService } from './services';
diff --git a/src/app/sections/wallet-section/wallets/wallets-list/wallet-withdrawals/wallet-withdrawals.module.ts b/src/app/sections/wallet-section/wallets/wallets-list/wallet-withdrawals/wallet-withdrawals.module.ts
index 8940f9b15..34eb64543 100644
--- a/src/app/sections/wallet-section/wallets/wallets-list/wallet-withdrawals/wallet-withdrawals.module.ts
+++ b/src/app/sections/wallet-section/wallets/wallets-list/wallet-withdrawals/wallet-withdrawals.module.ts
@@ -1,10 +1,9 @@
+import { FlexModule, GridModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
import { MatDividerModule } from '@angular/material/divider';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexModule, GridModule } from 'ng-flex-layout';
-
import { AmountCurrencyModule, ApiModelTypesModule } from '@dsh/app/shared';
import { StatusModule, TextColorModule } from '@dsh/components/indicators';
import {
@@ -14,6 +13,7 @@ import {
RowModule,
} from '@dsh/components/layout';
import { ShowMorePanelModule } from '@dsh/components/show-more-panel';
+import { TranslocoModule } from '@jsverse/transloco';
import { WalletWithdrawalDetailsComponent } from './components';
import { WalletWithdrawalsComponent } from './wallet-withdrawals.component';
diff --git a/src/app/sections/wallet-section/wallets/wallets-list/wallets-list.component.ts b/src/app/sections/wallet-section/wallets/wallets-list/wallets-list.component.ts
index 6a8aaae5b..961b3ea59 100644
--- a/src/app/sections/wallet-section/wallets/wallets-list/wallets-list.component.ts
+++ b/src/app/sections/wallet-section/wallets/wallets-list/wallets-list.component.ts
@@ -1,4 +1,5 @@
import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
+
import { Wallet } from '@vality/swag-wallets';
@Component({
diff --git a/src/app/sections/wallet-section/wallets/wallets-list/wallets-list.module.ts b/src/app/sections/wallet-section/wallets/wallets-list/wallets-list.module.ts
index b5607f463..c207d5a48 100644
--- a/src/app/sections/wallet-section/wallets/wallets-list/wallets-list.module.ts
+++ b/src/app/sections/wallet-section/wallets/wallets-list/wallets-list.module.ts
@@ -1,11 +1,11 @@
+import { FlexModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatDividerModule } from '@angular/material/divider';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexModule } from 'ng-flex-layout';
-
import { LastUpdatedModule } from '@dsh/components/indicators/last-updated/last-updated.module';
import { AccordionModule, CardModule, RowModule } from '@dsh/components/layout';
+import { TranslocoModule } from '@jsverse/transloco';
import { WalletDetailsComponent, WalletRowComponent, WalletRowHeaderComponent } from './components';
import { WalletsAccountInfoModule } from './wallet-account-info';
diff --git a/src/app/sections/wallet-section/wallets/wallets.module.ts b/src/app/sections/wallet-section/wallets/wallets.module.ts
index d6c86b533..9e15bc4af 100644
--- a/src/app/sections/wallet-section/wallets/wallets.module.ts
+++ b/src/app/sections/wallet-section/wallets/wallets.module.ts
@@ -1,12 +1,12 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { TranslocoModule } from '@jsverse/transloco';
import { FlexModule } from 'ng-flex-layout';
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
import { EmptySearchResultModule } from '@dsh/components/empty-search-result';
import { SpinnerModule } from '@dsh/components/indicators';
import { ScrollUpModule } from '@dsh/components/navigation';
import { ShowMorePanelModule } from '@dsh/components/show-more-panel';
+import { TranslocoModule } from '@jsverse/transloco';
import { WalletsListModule } from './wallets-list';
import { WalletsRoutingModule } from './wallets-routing.module';
diff --git a/src/app/sections/wallet-section/withdrawals/services/fetch-withdrawals/fetch-withdrawals.service.ts b/src/app/sections/wallet-section/withdrawals/services/fetch-withdrawals/fetch-withdrawals.service.ts
index 7a8c9efe0..d1279ba8d 100644
--- a/src/app/sections/wallet-section/withdrawals/services/fetch-withdrawals/fetch-withdrawals.service.ts
+++ b/src/app/sections/wallet-section/withdrawals/services/fetch-withdrawals/fetch-withdrawals.service.ts
@@ -1,18 +1,19 @@
+import { Observable, of } from 'rxjs';
+import { catchError, shareReplay } from 'rxjs/operators';
+
import { Inject, Injectable } from '@angular/core';
+import { WithdrawalsService } from '@dsh/app/api/wallet';
+import { mapToTimestamp } from '@dsh/app/custom-operators';
+import { SEARCH_LIMIT } from '@dsh/app/sections/tokens';
+import { DEBOUNCE_FETCHER_ACTION_TIME, PartialFetcher } from '@dsh/app/shared';
import { TranslocoService } from '@jsverse/transloco';
+
import { NotifyLogService } from '@vality/matez';
import {
ListWithdrawals200Response,
ListWithdrawalsRequestParams,
Withdrawal,
} from '@vality/swag-wallets';
-import { Observable, of } from 'rxjs';
-import { catchError, shareReplay } from 'rxjs/operators';
-
-import { WithdrawalsService } from '@dsh/app/api/wallet';
-import { mapToTimestamp } from '@dsh/app/custom-operators';
-import { SEARCH_LIMIT } from '@dsh/app/sections/tokens';
-import { DEBOUNCE_FETCHER_ACTION_TIME, PartialFetcher } from '@dsh/app/shared';
@Injectable()
export class FetchWithdrawalsService extends PartialFetcher<
diff --git a/src/app/sections/wallet-section/withdrawals/services/withdrawals-expanded-id-manager/withdrawals-expanded-id-manager.service.ts b/src/app/sections/wallet-section/withdrawals/services/withdrawals-expanded-id-manager/withdrawals-expanded-id-manager.service.ts
index 313ff3b0a..824047ec4 100644
--- a/src/app/sections/wallet-section/withdrawals/services/withdrawals-expanded-id-manager/withdrawals-expanded-id-manager.service.ts
+++ b/src/app/sections/wallet-section/withdrawals/services/withdrawals-expanded-id-manager/withdrawals-expanded-id-manager.service.ts
@@ -1,9 +1,11 @@
+import { Observable } from 'rxjs';
+
import { Injectable } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
+import { ExpandedIdManager } from '@dsh/app/shared/services';
+
import { Withdrawal } from '@vality/swag-wallets';
-import { Observable } from 'rxjs';
-import { ExpandedIdManager } from '@dsh/app/shared/services';
import { FetchWithdrawalsService } from '../fetch-withdrawals';
diff --git a/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/additional-filters.module.ts b/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/additional-filters.module.ts
index f0c685d03..60aa059de 100644
--- a/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/additional-filters.module.ts
+++ b/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/additional-filters.module.ts
@@ -1,13 +1,14 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
import { MatDividerModule } from '@angular/material/divider';
import { MatIconModule } from '@angular/material/icon';
+import { BaseDialogModule } from '@dsh/app/shared/components/dialog/base-dialog';
import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-import { BaseDialogModule } from '@dsh/app/shared/components/dialog/base-dialog';
import { DialogFiltersComponent } from './components';
import { MainInfoFiltersModule } from './main-info-filters';
diff --git a/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/components/dialog-filters/dialog-filters.component.ts b/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/components/dialog-filters/dialog-filters.component.ts
index 9d7268e25..8268d6df4 100644
--- a/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/components/dialog-filters/dialog-filters.component.ts
+++ b/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/components/dialog-filters/dialog-filters.component.ts
@@ -1,6 +1,7 @@
import { ChangeDetectionStrategy, Component, Inject, OnInit } from '@angular/core';
import { FormBuilder } from '@angular/forms';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+
import { FormGroupSuperclass } from '@vality/matez';
import { ListWithdrawalsRequestParams } from '@vality/swag-wallets';
diff --git a/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/main-info-filters/main-info-filters.component.ts b/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/main-info-filters/main-info-filters.component.ts
index fc360049a..970d27bf6 100644
--- a/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/main-info-filters/main-info-filters.component.ts
+++ b/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/main-info-filters/main-info-filters.component.ts
@@ -1,5 +1,6 @@
import { ChangeDetectionStrategy, Component } from '@angular/core';
import { FormBuilder } from '@angular/forms';
+
import { FormGroupSuperclass, createControlProviders } from '@vality/matez';
import { MainInfoForm } from './types';
diff --git a/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/main-info-filters/main-info-filters.module.ts b/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/main-info-filters/main-info-filters.module.ts
index 4acc1e598..23085de8a 100644
--- a/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/main-info-filters/main-info-filters.module.ts
+++ b/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/main-info-filters/main-info-filters.module.ts
@@ -1,12 +1,13 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatInputModule } from '@angular/material/input';
+import { WalletAutocompleteFieldModule } from '@dsh/app/shared/components/inputs/wallet-autocomplete-field';
import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-import { WalletAutocompleteFieldModule } from '@dsh/app/shared/components/inputs/wallet-autocomplete-field';
import { MainInfoFiltersComponent } from './main-info-filters.component';
diff --git a/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/withdrawal-status-filter/withdrawal-status-filter.component.ts b/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/withdrawal-status-filter/withdrawal-status-filter.component.ts
index 0ff8ba8ff..7a35d469d 100644
--- a/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/withdrawal-status-filter/withdrawal-status-filter.component.ts
+++ b/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/withdrawal-status-filter/withdrawal-status-filter.component.ts
@@ -1,11 +1,13 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { FormControlSuperclass, Option, createControlProviders } from '@vality/matez';
-import { WithdrawalStatus } from '@vality/swag-wallets';
import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
+import { ChangeDetectionStrategy, Component } from '@angular/core';
import { WalletDictionaryService } from '@dsh/app/api/wallet';
+import { FormControlSuperclass, Option, createControlProviders } from '@vality/matez';
+import { WithdrawalStatus } from '@vality/swag-wallets';
+
+
import StatusEnum = WithdrawalStatus.StatusEnum;
@Component({
diff --git a/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/withdrawal-status-filter/withdrawal-status-filter.module.ts b/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/withdrawal-status-filter/withdrawal-status-filter.module.ts
index df5f91aa4..90e512894 100644
--- a/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/withdrawal-status-filter/withdrawal-status-filter.module.ts
+++ b/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/withdrawal-status-filter/withdrawal-status-filter.module.ts
@@ -1,13 +1,13 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { MatDialogModule } from '@angular/material/dialog';
import { MatRadioModule } from '@angular/material/radio';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { ExpandableRadioGroupModule } from '@dsh/app/shared/components/radio-buttons/expandable-radio-group';
import { RadioGroupFieldModule } from '@dsh/components/form-controls/radio-group-field';
+import { TranslocoModule } from '@jsverse/transloco';
import { WithdrawalStatusFilterComponent } from './withdrawal-status-filter.component';
diff --git a/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/withdrawal-sum-filter/withdrawal-sum-filter.component.ts b/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/withdrawal-sum-filter/withdrawal-sum-filter.component.ts
index 534ec5ad4..f31e86d16 100644
--- a/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/withdrawal-sum-filter/withdrawal-sum-filter.component.ts
+++ b/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/withdrawal-sum-filter/withdrawal-sum-filter.component.ts
@@ -1,5 +1,6 @@
import { ChangeDetectionStrategy, Component } from '@angular/core';
import { FormBuilder } from '@angular/forms';
+
import { FormGroupSuperclass, createControlProviders } from '@vality/matez';
import { WithdrawalAmountForm } from './types';
diff --git a/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/withdrawal-sum-filter/withdrawal-sum-filter.module.ts b/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/withdrawal-sum-filter/withdrawal-sum-filter.module.ts
index 1fc0b996d..f64a7f6bc 100644
--- a/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/withdrawal-sum-filter/withdrawal-sum-filter.module.ts
+++ b/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/withdrawal-sum-filter/withdrawal-sum-filter.module.ts
@@ -1,10 +1,11 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatInputModule } from '@angular/material/input';
import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
import { WithdrawalSumFilterComponent } from './withdrawal-sum-filter.component';
diff --git a/src/app/sections/wallet-section/withdrawals/withdrawals-filters/withdrawals-filters.component.ts b/src/app/sections/wallet-section/withdrawals/withdrawals-filters/withdrawals-filters.component.ts
index e2971b44d..4b3c7c7ff 100644
--- a/src/app/sections/wallet-section/withdrawals/withdrawals-filters/withdrawals-filters.component.ts
+++ b/src/app/sections/wallet-section/withdrawals/withdrawals-filters/withdrawals-filters.component.ts
@@ -1,3 +1,11 @@
+import isEmpty from 'lodash-es/isEmpty';
+import isEqual from 'lodash-es/isEqual';
+import negate from 'lodash-es/negate';
+import omit from 'lodash-es/omit';
+import pick from 'lodash-es/pick';
+import { ReplaySubject, combineLatest, defer } from 'rxjs';
+import { filter, map } from 'rxjs/operators';
+
import {
ChangeDetectionStrategy,
Component,
@@ -11,18 +19,11 @@ import {
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { FormBuilder } from '@angular/forms';
import { MatDialog } from '@angular/material/dialog';
-import { ComponentChanges } from '@vality/matez';
-import isEmpty from 'lodash-es/isEmpty';
-import isEqual from 'lodash-es/isEqual';
-import negate from 'lodash-es/negate';
-import omit from 'lodash-es/omit';
-import pick from 'lodash-es/pick';
-import { ReplaySubject, combineLatest, defer } from 'rxjs';
-import { filter, map } from 'rxjs/operators';
-
import { Preset, createDateRangeWithPreset } from '@dsh/components/date-range-filter';
import { getFormValueChanges } from '@dsh/utils';
+import { ComponentChanges } from '@vality/matez';
+
import { AdditionalFilters, DialogFiltersComponent } from './additional-filters';
import { MainFilters, WithdrawalsFilters } from './types';
diff --git a/src/app/sections/wallet-section/withdrawals/withdrawals-filters/withdrawals-filters.module.ts b/src/app/sections/wallet-section/withdrawals/withdrawals-filters/withdrawals-filters.module.ts
index 039a2fc5c..b54433f51 100644
--- a/src/app/sections/wallet-section/withdrawals/withdrawals-filters/withdrawals-filters.module.ts
+++ b/src/app/sections/wallet-section/withdrawals/withdrawals-filters/withdrawals-filters.module.ts
@@ -1,13 +1,13 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { MatDialogModule } from '@angular/material/dialog';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { DateRangeFilterModule } from '@dsh/components/date-range-filter';
import { FilterModule } from '@dsh/components/filter';
import { FiltersGroupModule } from '@dsh/components/filters-group';
+import { TranslocoModule } from '@jsverse/transloco';
import { AdditionalFiltersModule } from './additional-filters';
import { WithdrawalsFiltersComponent } from './withdrawals-filters.component';
diff --git a/src/app/sections/wallet-section/withdrawals/withdrawals-list/components/withdrawal-details/pipes/withdrawal-error-message.pipe.ts b/src/app/sections/wallet-section/withdrawals/withdrawals-list/components/withdrawal-details/pipes/withdrawal-error-message.pipe.ts
index 57b1d2d0b..3a09f52d8 100644
--- a/src/app/sections/wallet-section/withdrawals/withdrawals-list/components/withdrawal-details/pipes/withdrawal-error-message.pipe.ts
+++ b/src/app/sections/wallet-section/withdrawals/withdrawals-list/components/withdrawal-details/pipes/withdrawal-error-message.pipe.ts
@@ -1,12 +1,14 @@
-import { Pipe, PipeTransform } from '@angular/core';
-import { TranslocoService } from '@jsverse/transloco';
-import { AsyncTransform, AsyncTransformParameters } from '@vality/matez';
-import { PaymentError } from '@vality/swag-payments';
import lowerCase from 'lodash-es/lowerCase';
import upperFirst from 'lodash-es/upperFirst';
import { Observable, isObservable, of, switchMap } from 'rxjs';
import { distinctUntilChanged } from 'rxjs/operators';
+import { Pipe, PipeTransform } from '@angular/core';
+import { TranslocoService } from '@jsverse/transloco';
+
+import { AsyncTransform, AsyncTransformParameters } from '@vality/matez';
+import { PaymentError } from '@vality/swag-payments';
+
function renderSubErrorMessage(error?: string, sub?: string) {
if (!error) {
return sub;
diff --git a/src/app/sections/wallet-section/withdrawals/withdrawals-list/components/withdrawal-details/withdrawal-details.component.ts b/src/app/sections/wallet-section/withdrawals/withdrawals-list/components/withdrawal-details/withdrawal-details.component.ts
index 078505ff4..d02e7e161 100644
--- a/src/app/sections/wallet-section/withdrawals/withdrawals-list/components/withdrawal-details/withdrawal-details.component.ts
+++ b/src/app/sections/wallet-section/withdrawals/withdrawals-list/components/withdrawal-details/withdrawal-details.component.ts
@@ -1,7 +1,8 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { WalletDictionaryService } from '@dsh/app/api/wallet';
+
import { Withdrawal } from '@vality/swag-wallets';
-import { WalletDictionaryService } from '@dsh/app/api/wallet';
@Component({
selector: 'dsh-withdrawal-details',
diff --git a/src/app/sections/wallet-section/withdrawals/withdrawals-list/components/withdrawal-row/withdrawal-row.component.ts b/src/app/sections/wallet-section/withdrawals/withdrawals-list/components/withdrawal-row/withdrawal-row.component.ts
index a0446878d..229db85c6 100644
--- a/src/app/sections/wallet-section/withdrawals/withdrawals-list/components/withdrawal-row/withdrawal-row.component.ts
+++ b/src/app/sections/wallet-section/withdrawals/withdrawals-list/components/withdrawal-row/withdrawal-row.component.ts
@@ -1,7 +1,8 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { WalletDictionaryService } from '@dsh/app/api/wallet';
+
import { Withdrawal } from '@vality/swag-wallets';
-import { WalletDictionaryService } from '@dsh/app/api/wallet';
@Component({
selector: 'dsh-withdrawal-row',
diff --git a/src/app/sections/wallet-section/withdrawals/withdrawals-list/withdrawals-list.component.ts b/src/app/sections/wallet-section/withdrawals/withdrawals-list/withdrawals-list.component.ts
index d9e87cad0..79285ab47 100644
--- a/src/app/sections/wallet-section/withdrawals/withdrawals-list/withdrawals-list.component.ts
+++ b/src/app/sections/wallet-section/withdrawals/withdrawals-list/withdrawals-list.component.ts
@@ -1,4 +1,5 @@
import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
+
import { Withdrawal } from '@vality/swag-wallets';
@Component({
diff --git a/src/app/sections/wallet-section/withdrawals/withdrawals-list/withdrawals-list.module.ts b/src/app/sections/wallet-section/withdrawals/withdrawals-list/withdrawals-list.module.ts
index c5db2673c..dffb49ee1 100644
--- a/src/app/sections/wallet-section/withdrawals/withdrawals-list/withdrawals-list.module.ts
+++ b/src/app/sections/wallet-section/withdrawals/withdrawals-list/withdrawals-list.module.ts
@@ -1,13 +1,13 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatSnackBarModule } from '@angular/material/snack-bar';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { AmountCurrencyModule, ApiModelRefsModule, ApiModelTypesModule } from '@dsh/app/shared';
import { StatusModule } from '@dsh/components/indicators';
import { LastUpdatedModule } from '@dsh/components/indicators/last-updated/last-updated.module';
import { LayoutModule } from '@dsh/components/layout';
+import { TranslocoModule } from '@jsverse/transloco';
import {
WithdrawalDetailsComponent,
diff --git a/src/app/sections/wallet-section/withdrawals/withdrawals.component.ts b/src/app/sections/wallet-section/withdrawals/withdrawals.component.ts
index 8e0d38d8f..fe6a0e197 100644
--- a/src/app/sections/wallet-section/withdrawals/withdrawals.component.ts
+++ b/src/app/sections/wallet-section/withdrawals/withdrawals.component.ts
@@ -1,7 +1,9 @@
+import { shareReplay } from 'rxjs';
+
import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
import { TranslocoService } from '@jsverse/transloco';
+
import { NotifyLogService, QueryParamsService } from '@vality/matez';
-import { shareReplay } from 'rxjs';
import { FetchWithdrawalsService, WithdrawalsExpandedIdManager } from './services';
import { WithdrawalsFilters } from './withdrawals-filters';
diff --git a/src/app/sections/wallet-section/withdrawals/withdrawals.module.ts b/src/app/sections/wallet-section/withdrawals/withdrawals.module.ts
index b3a217b26..4a1677362 100644
--- a/src/app/sections/wallet-section/withdrawals/withdrawals.module.ts
+++ b/src/app/sections/wallet-section/withdrawals/withdrawals.module.ts
@@ -1,12 +1,12 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { TranslocoModule } from '@jsverse/transloco';
import { FlexModule } from 'ng-flex-layout';
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
import { EmptySearchResultModule } from '@dsh/components/empty-search-result';
import { SpinnerModule } from '@dsh/components/indicators';
import { ScrollUpModule } from '@dsh/components/navigation';
import { ShowMorePanelModule } from '@dsh/components/show-more-panel';
+import { TranslocoModule } from '@jsverse/transloco';
import { WithdrawalsFiltersModule } from './withdrawals-filters';
import { WithdrawalsListModule } from './withdrawals-list';
diff --git a/src/app/shared/components/accordion-table/accordion-table.component.ts b/src/app/shared/components/accordion-table/accordion-table.component.ts
index 7b9f92cfc..20c7d2f11 100644
--- a/src/app/shared/components/accordion-table/accordion-table.component.ts
+++ b/src/app/shared/components/accordion-table/accordion-table.component.ts
@@ -1,3 +1,6 @@
+import { Observable, of } from 'rxjs';
+import { map, startWith } from 'rxjs/operators';
+
import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';
import {
ChangeDetectionStrategy,
@@ -8,11 +11,10 @@ import {
Output,
TemplateRef,
} from '@angular/core';
+import { StatusColor } from '@dsh/app/theme-manager';
+
import { PossiblyAsync } from '@vality/matez';
-import { Observable, of } from 'rxjs';
-import { map, startWith } from 'rxjs/operators';
-import { StatusColor } from '@dsh/app/theme-manager';
import { ExpandedFragment } from './expanded-fragment';
diff --git a/src/app/shared/components/accordion-table/accordion-table.module.ts b/src/app/shared/components/accordion-table/accordion-table.module.ts
index cdd157449..714ec9862 100644
--- a/src/app/shared/components/accordion-table/accordion-table.module.ts
+++ b/src/app/shared/components/accordion-table/accordion-table.module.ts
@@ -1,13 +1,14 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { PipesModule } from '@vality/matez';
import { FlexLayoutModule } from 'ng-flex-layout';
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
import { EmptySearchResultModule } from '@dsh/components/empty-search-result';
import { IndicatorsModule } from '@dsh/components/indicators';
import { AccordionModule, CardModule, RowModule } from '@dsh/components/layout';
import { ShowMorePanelModule } from '@dsh/components/show-more-panel';
+import { PipesModule } from '@vality/matez';
+
import { AccordionTableComponent } from './accordion-table.component';
@NgModule({
diff --git a/src/app/shared/components/accordion-table/expanded-fragment.ts b/src/app/shared/components/accordion-table/expanded-fragment.ts
index e9aeffc04..aa4e765eb 100644
--- a/src/app/shared/components/accordion-table/expanded-fragment.ts
+++ b/src/app/shared/components/accordion-table/expanded-fragment.ts
@@ -1,6 +1,3 @@
-import { DestroyRef, inject } from '@angular/core';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { ActivatedRoute, Router } from '@angular/router';
import isNil from 'lodash-es/isNil';
import { BehaviorSubject, Observable, defer, of } from 'rxjs';
import {
@@ -13,6 +10,9 @@ import {
withLatestFrom,
} from 'rxjs/operators';
+import { DestroyRef, inject } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { ActivatedRoute, Router } from '@angular/router';
import { Fragment } from '@dsh/app/shared';
const EMIT_LIMIT = 4;
diff --git a/src/app/shared/components/actions/actions.module.ts b/src/app/shared/components/actions/actions.module.ts
index 0da24996c..18374b844 100644
--- a/src/app/shared/components/actions/actions.module.ts
+++ b/src/app/shared/components/actions/actions.module.ts
@@ -1,6 +1,7 @@
-import { NgModule } from '@angular/core';
import { FlexLayoutModule } from 'ng-flex-layout';
+import { NgModule } from '@angular/core';
+
import { ActionsComponent } from './actions.component';
@NgModule({
diff --git a/src/app/shared/components/api-model-details/invoice-details/invoice-details.component.ts b/src/app/shared/components/api-model-details/invoice-details/invoice-details.component.ts
index 4dded1430..3b3823d08 100644
--- a/src/app/shared/components/api-model-details/invoice-details/invoice-details.component.ts
+++ b/src/app/shared/components/api-model-details/invoice-details/invoice-details.component.ts
@@ -1,7 +1,8 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { AnapiDictionaryService } from '@dsh/app/api/anapi';
+
import { Invoice } from '@vality/swag-anapi-v2';
-import { AnapiDictionaryService } from '@dsh/app/api/anapi';
@Component({
selector: 'dsh-invoice-details',
diff --git a/src/app/shared/components/api-model-details/invoice-details/invoice-details.module.ts b/src/app/shared/components/api-model-details/invoice-details/invoice-details.module.ts
index dc9006fd4..69fddd795 100644
--- a/src/app/shared/components/api-model-details/invoice-details/invoice-details.module.ts
+++ b/src/app/shared/components/api-model-details/invoice-details/invoice-details.module.ts
@@ -1,11 +1,11 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { TranslocoModule } from '@jsverse/transloco';
import { FlexLayoutModule } from 'ng-flex-layout';
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
import { AmountCurrencyModule } from '@dsh/app/shared/pipes';
import { StatusModule } from '@dsh/components/indicators';
import { LayoutModule } from '@dsh/components/layout';
+import { TranslocoModule } from '@jsverse/transloco';
import { InvoiceDetailsComponent } from './invoice-details.component';
import { InvoiceStatusColorPipe } from './invoice-status-color.pipe';
diff --git a/src/app/shared/components/api-model-details/invoice-details/invoice-status-color.pipe.ts b/src/app/shared/components/api-model-details/invoice-details/invoice-status-color.pipe.ts
index b53a91c0c..25630e299 100644
--- a/src/app/shared/components/api-model-details/invoice-details/invoice-status-color.pipe.ts
+++ b/src/app/shared/components/api-model-details/invoice-details/invoice-status-color.pipe.ts
@@ -1,4 +1,5 @@
import { Pipe, PipeTransform } from '@angular/core';
+
import { Invoice } from '@vality/swag-anapi-v2';
import { StatusColor } from '../../../../theme-manager';
diff --git a/src/app/shared/components/api-model-details/payment-details/payment-details.component.ts b/src/app/shared/components/api-model-details/payment-details/payment-details.component.ts
index b75eff47a..838f30be2 100644
--- a/src/app/shared/components/api-model-details/payment-details/payment-details.component.ts
+++ b/src/app/shared/components/api-model-details/payment-details/payment-details.component.ts
@@ -1,4 +1,5 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+
import { Payment } from '@vality/swag-payments';
@Component({
diff --git a/src/app/shared/components/api-model-details/payment-details/payment-details.module.ts b/src/app/shared/components/api-model-details/payment-details/payment-details.module.ts
index ad86f825a..1b409723f 100644
--- a/src/app/shared/components/api-model-details/payment-details/payment-details.module.ts
+++ b/src/app/shared/components/api-model-details/payment-details/payment-details.module.ts
@@ -1,11 +1,11 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { TranslocoModule } from '@jsverse/transloco';
import { FlexLayoutModule } from 'ng-flex-layout';
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
import { AmountCurrencyModule } from '@dsh/app/shared/pipes';
import { StatusModule } from '@dsh/components/indicators';
import { LayoutModule } from '@dsh/components/layout';
+import { TranslocoModule } from '@jsverse/transloco';
import { PaymentStatusComponent } from '../../payment-status';
diff --git a/src/app/shared/components/api-model-details/payment-details/payment-status-color.pipe.ts b/src/app/shared/components/api-model-details/payment-details/payment-status-color.pipe.ts
index aeb648235..c14bc80e3 100644
--- a/src/app/shared/components/api-model-details/payment-details/payment-status-color.pipe.ts
+++ b/src/app/shared/components/api-model-details/payment-details/payment-status-color.pipe.ts
@@ -1,4 +1,5 @@
import { Pipe, PipeTransform } from '@angular/core';
+
import { Payment } from '@vality/swag-payments';
import { StatusColor } from '../../../../theme-manager';
diff --git a/src/app/shared/components/api-model-details/refund-details/refund-details.component.ts b/src/app/shared/components/api-model-details/refund-details/refund-details.component.ts
index dd8cb9e9e..af52ff252 100644
--- a/src/app/shared/components/api-model-details/refund-details/refund-details.component.ts
+++ b/src/app/shared/components/api-model-details/refund-details/refund-details.component.ts
@@ -1,7 +1,8 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { AnapiDictionaryService } from '@dsh/app/api/anapi';
+
import { Refund } from '@vality/swag-payments';
-import { AnapiDictionaryService } from '@dsh/app/api/anapi';
@Component({
selector: 'dsh-refund-details',
diff --git a/src/app/shared/components/api-model-details/refund-details/refund-details.module.ts b/src/app/shared/components/api-model-details/refund-details/refund-details.module.ts
index 763b7b84e..ecc8239b0 100644
--- a/src/app/shared/components/api-model-details/refund-details/refund-details.module.ts
+++ b/src/app/shared/components/api-model-details/refund-details/refund-details.module.ts
@@ -1,11 +1,11 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { TranslocoModule } from '@jsverse/transloco';
import { FlexLayoutModule } from 'ng-flex-layout';
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
import { AmountCurrencyModule } from '@dsh/app/shared/pipes';
import { StatusModule } from '@dsh/components/indicators';
import { LayoutModule } from '@dsh/components/layout';
+import { TranslocoModule } from '@jsverse/transloco';
import { RefundDetailsComponent } from './refund-details.component';
import { RefundStatusColorPipe } from './refund-status-color.pipe';
diff --git a/src/app/shared/components/api-model-details/refund-details/refund-status-color.pipe.ts b/src/app/shared/components/api-model-details/refund-details/refund-status-color.pipe.ts
index 23d6768e7..84831051b 100644
--- a/src/app/shared/components/api-model-details/refund-details/refund-status-color.pipe.ts
+++ b/src/app/shared/components/api-model-details/refund-details/refund-status-color.pipe.ts
@@ -1,4 +1,5 @@
import { Pipe, PipeTransform } from '@angular/core';
+
import { Refund } from '@vality/swag-payments';
import { StatusColor } from '../../../../theme-manager';
diff --git a/src/app/shared/components/api-model-details/webhook-api-key/webhook-api-key.component.ts b/src/app/shared/components/api-model-details/webhook-api-key/webhook-api-key.component.ts
index 9f87422a1..d1fdeaa15 100644
--- a/src/app/shared/components/api-model-details/webhook-api-key/webhook-api-key.component.ts
+++ b/src/app/shared/components/api-model-details/webhook-api-key/webhook-api-key.component.ts
@@ -1,5 +1,6 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
import { TranslocoService } from '@jsverse/transloco';
+
import { NotifyLogService } from '@vality/matez';
@Component({
diff --git a/src/app/shared/components/api-model-details/webhook-api-key/webhook-api-key.module.ts b/src/app/shared/components/api-model-details/webhook-api-key/webhook-api-key.module.ts
index 830ada16b..47c0d0e4c 100644
--- a/src/app/shared/components/api-model-details/webhook-api-key/webhook-api-key.module.ts
+++ b/src/app/shared/components/api-model-details/webhook-api-key/webhook-api-key.module.ts
@@ -1,8 +1,9 @@
+import { FlexModule } from 'ng-flex-layout';
+
import { ClipboardModule } from '@angular/cdk/clipboard';
import { NgModule } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
import { TranslocoModule } from '@jsverse/transloco';
-import { FlexModule } from 'ng-flex-layout';
import { WebhookApiKeyComponent } from './webhook-api-key.component';
diff --git a/src/app/shared/components/api-model-details/withdrawal-info/status-to-color.pipe.ts b/src/app/shared/components/api-model-details/withdrawal-info/status-to-color.pipe.ts
index 9387b648b..463cdf3b4 100644
--- a/src/app/shared/components/api-model-details/withdrawal-info/status-to-color.pipe.ts
+++ b/src/app/shared/components/api-model-details/withdrawal-info/status-to-color.pipe.ts
@@ -1,4 +1,5 @@
import { Pipe, PipeTransform } from '@angular/core';
+
import { WithdrawalStatus } from '@vality/swag-wallets';
import { StatusColor as Color } from '../../../../theme-manager';
diff --git a/src/app/shared/components/api-model-details/withdrawal-info/withdrawal-info.component.ts b/src/app/shared/components/api-model-details/withdrawal-info/withdrawal-info.component.ts
index b7315ef44..46da5e87f 100644
--- a/src/app/shared/components/api-model-details/withdrawal-info/withdrawal-info.component.ts
+++ b/src/app/shared/components/api-model-details/withdrawal-info/withdrawal-info.component.ts
@@ -1,4 +1,5 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+
import { Withdrawal } from '@vality/swag-wallets';
@Component({
diff --git a/src/app/shared/components/api-model-details/withdrawal-info/withdrawal-info.module.ts b/src/app/shared/components/api-model-details/withdrawal-info/withdrawal-info.module.ts
index 0d6d39742..a0ec959b8 100644
--- a/src/app/shared/components/api-model-details/withdrawal-info/withdrawal-info.module.ts
+++ b/src/app/shared/components/api-model-details/withdrawal-info/withdrawal-info.module.ts
@@ -1,10 +1,10 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { TranslocoModule } from '@jsverse/transloco';
import { FlexModule } from 'ng-flex-layout';
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
import { AmountCurrencyModule } from '@dsh/app/shared/pipes';
import { DetailsItemModule } from '@dsh/components/layout';
+import { TranslocoModule } from '@jsverse/transloco';
import { StatusToColorPipe } from './status-to-color.pipe';
import { WithdrawalInfoComponent } from './withdrawal-info.component';
diff --git a/src/app/shared/components/balance/balance.component.ts b/src/app/shared/components/balance/balance.component.ts
index de81efdb2..dde89255c 100644
--- a/src/app/shared/components/balance/balance.component.ts
+++ b/src/app/shared/components/balance/balance.component.ts
@@ -1,7 +1,8 @@
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
import { isNumber } from 'lodash-es';
import isEmpty from 'lodash-es/isEmpty';
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+
@Component({
selector: 'dsh-balance',
templateUrl: 'balance.component.html',
diff --git a/src/app/shared/components/balance/balance.module.ts b/src/app/shared/components/balance/balance.module.ts
index a654c5093..37a3c6402 100644
--- a/src/app/shared/components/balance/balance.module.ts
+++ b/src/app/shared/components/balance/balance.module.ts
@@ -1,6 +1,5 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
-
import { AmountCurrencyModule } from '@dsh/app/shared/pipes';
import { BalanceComponent } from './balance.component';
diff --git a/src/app/shared/components/buttons/buttons.module.ts b/src/app/shared/components/buttons/buttons.module.ts
index 70a1be5ed..68e7b1f0f 100644
--- a/src/app/shared/components/buttons/buttons.module.ts
+++ b/src/app/shared/components/buttons/buttons.module.ts
@@ -1,6 +1,5 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
-
import { InlineShowAllToggleModule } from '@dsh/app/shared/components/buttons/inline-show-all-toggle';
@NgModule({
diff --git a/src/app/shared/components/buttons/inline-show-all-toggle/inline-show-all-toggle.module.ts b/src/app/shared/components/buttons/inline-show-all-toggle/inline-show-all-toggle.module.ts
index 38de538d5..2dc1c209d 100644
--- a/src/app/shared/components/buttons/inline-show-all-toggle/inline-show-all-toggle.module.ts
+++ b/src/app/shared/components/buttons/inline-show-all-toggle/inline-show-all-toggle.module.ts
@@ -1,7 +1,7 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
import { FlexLayoutModule } from 'ng-flex-layout';
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
import { BootstrapIconModule } from '@dsh/components/indicators';
import { InlineShowAllToggleComponent } from './inline-show-all-toggle.component';
diff --git a/src/app/shared/components/create-invoice-form/create-invoice-form.component.ts b/src/app/shared/components/create-invoice-form/create-invoice-form.component.ts
index c041bb59b..55da83bb6 100644
--- a/src/app/shared/components/create-invoice-form/create-invoice-form.component.ts
+++ b/src/app/shared/components/create-invoice-form/create-invoice-form.component.ts
@@ -1,6 +1,11 @@
+import isNil from 'lodash-es/isNil';
+import moment, { Moment } from 'moment';
+
import { ChangeDetectionStrategy, Component, DestroyRef, Input, OnInit } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { FormBuilder } from '@angular/forms';
+import { getFormValueChanges } from '@dsh/utils';
+
import {
FormComponentSuperclass,
FormGroupByValue,
@@ -9,10 +14,7 @@ import {
toMinor,
} from '@vality/matez';
import { InvoiceParams, Shop } from '@vality/swag-payments';
-import isNil from 'lodash-es/isNil';
-import moment, { Moment } from 'moment';
-import { getFormValueChanges } from '@dsh/utils';
type FormData = InvoiceParams;
diff --git a/src/app/shared/components/create-invoice-form/create-invoice-form.module.ts b/src/app/shared/components/create-invoice-form/create-invoice-form.module.ts
index 804f287ee..86b2691f2 100644
--- a/src/app/shared/components/create-invoice-form/create-invoice-form.module.ts
+++ b/src/app/shared/components/create-invoice-form/create-invoice-form.module.ts
@@ -1,3 +1,5 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
@@ -12,12 +14,10 @@ import { MatMenuModule } from '@angular/material/menu';
import { MatSelectModule } from '@angular/material/select';
import { MatSnackBarModule } from '@angular/material/snack-bar';
import { MatMomentDateModule } from '@angular/material-moment-adapter';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { AmountCurrencyModule } from '@dsh/app/shared';
import { LayoutModule } from '@dsh/components/layout';
import { ConfirmActionDialogModule } from '@dsh/components/popups';
+import { TranslocoModule } from '@jsverse/transloco';
import { InvoiceRandomizeAmountModule } from '../invoice-randomize-amount-form';
diff --git a/src/app/shared/components/dialog/base-dialog/base-dialog.module.ts b/src/app/shared/components/dialog/base-dialog/base-dialog.module.ts
index 47fc2bb58..f71e47229 100644
--- a/src/app/shared/components/dialog/base-dialog/base-dialog.module.ts
+++ b/src/app/shared/components/dialog/base-dialog/base-dialog.module.ts
@@ -1,13 +1,13 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
import { MatDividerModule } from '@angular/material/divider';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { ActionsModule } from '@dsh/app/shared/components/actions';
import { NoContentModule } from '@dsh/app/shared/directives';
import { BootstrapIconModule } from '@dsh/components/indicators';
+import { TranslocoModule } from '@jsverse/transloco';
import { BaseDialogComponent } from './base-dialog.component';
import { BaseDialogActionsDirective } from './directives/base-dialog-actions/base-dialog-actions.directive';
diff --git a/src/app/shared/components/filters/currency-filter/currency-filter.component.ts b/src/app/shared/components/filters/currency-filter/currency-filter.component.ts
index 32131c152..8df549c15 100644
--- a/src/app/shared/components/filters/currency-filter/currency-filter.component.ts
+++ b/src/app/shared/components/filters/currency-filter/currency-filter.component.ts
@@ -1,11 +1,13 @@
+import { combineLatest } from 'rxjs';
+import { map } from 'rxjs/operators';
+
import { getCurrencySymbol } from '@angular/common';
import { ChangeDetectionStrategy, Component, Injector, Input } from '@angular/core';
+import { FilterSuperclass } from '@dsh/components/filter';
import { TranslocoService } from '@jsverse/transloco';
+
import { createControlProviders } from '@vality/matez';
-import { combineLatest } from 'rxjs';
-import { map } from 'rxjs/operators';
-import { FilterSuperclass } from '@dsh/components/filter';
@Component({
selector: 'dsh-currency-filter',
diff --git a/src/app/shared/components/filters/currency-filter/currency-filter.module.ts b/src/app/shared/components/filters/currency-filter/currency-filter.module.ts
index ff534018b..f6d2a7967 100644
--- a/src/app/shared/components/filters/currency-filter/currency-filter.module.ts
+++ b/src/app/shared/components/filters/currency-filter/currency-filter.module.ts
@@ -1,9 +1,9 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
+import { FilterModule } from '@dsh/components/filter';
import { TranslocoModule } from '@jsverse/transloco';
-import { FilterModule } from '@dsh/components/filter';
import { CurrencyFieldModule } from '../../inputs/currency-field';
diff --git a/src/app/shared/components/filters/invoice-status-filter/invoice-status-filter.component.ts b/src/app/shared/components/filters/invoice-status-filter/invoice-status-filter.component.ts
index e85857066..2e64e54ee 100644
--- a/src/app/shared/components/filters/invoice-status-filter/invoice-status-filter.component.ts
+++ b/src/app/shared/components/filters/invoice-status-filter/invoice-status-filter.component.ts
@@ -1,8 +1,9 @@
import { ChangeDetectionStrategy, Component, Injector } from '@angular/core';
+import { FilterSuperclass } from '@dsh/components/filter';
+
import { createControlProviders } from '@vality/matez';
import { InvoiceStatus } from '@vality/swag-anapi-v2';
-import { FilterSuperclass } from '@dsh/components/filter';
@Component({
selector: 'dsh-invoice-status-filter',
diff --git a/src/app/shared/components/filters/invoice-status-filter/invoice-status-filter.module.ts b/src/app/shared/components/filters/invoice-status-filter/invoice-status-filter.module.ts
index 6d59922b5..88359a2cd 100644
--- a/src/app/shared/components/filters/invoice-status-filter/invoice-status-filter.module.ts
+++ b/src/app/shared/components/filters/invoice-status-filter/invoice-status-filter.module.ts
@@ -1,10 +1,9 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
-import { TranslocoModule } from '@jsverse/transloco';
-
import { InvoiceStatusFieldModule } from '@dsh/app/shared/components/inputs/invoice-status-field/invoice-status-field.module';
import { FilterModule } from '@dsh/components/filter';
+import { TranslocoModule } from '@jsverse/transloco';
import { InvoiceStatusFilterComponent } from './invoice-status-filter.component';
diff --git a/src/app/shared/components/filters/invoices-filter/invoices-filter.component.ts b/src/app/shared/components/filters/invoices-filter/invoices-filter.component.ts
index fc92ed455..634e88662 100644
--- a/src/app/shared/components/filters/invoices-filter/invoices-filter.component.ts
+++ b/src/app/shared/components/filters/invoices-filter/invoices-filter.component.ts
@@ -1,7 +1,8 @@
import { ChangeDetectionStrategy, Component, Injector } from '@angular/core';
+import { FilterSuperclass } from '@dsh/components/filter';
+
import { createControlProviders } from '@vality/matez';
-import { FilterSuperclass } from '@dsh/components/filter';
@Component({
selector: 'dsh-invoices-filter',
diff --git a/src/app/shared/components/filters/invoices-filter/invoices-filter.module.ts b/src/app/shared/components/filters/invoices-filter/invoices-filter.module.ts
index b1079de6f..ffb0165d2 100644
--- a/src/app/shared/components/filters/invoices-filter/invoices-filter.module.ts
+++ b/src/app/shared/components/filters/invoices-filter/invoices-filter.module.ts
@@ -1,10 +1,9 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
-import { TranslocoModule } from '@jsverse/transloco';
-
import { InvoicesFieldModule } from '@dsh/app/shared/components/inputs/invoices-field';
import { FilterModule } from '@dsh/components/filter';
+import { TranslocoModule } from '@jsverse/transloco';
import { InvoicesFilterComponent } from './invoices-filter.component';
diff --git a/src/app/shared/components/filters/refund-status-filter/refund-status-filter.component.ts b/src/app/shared/components/filters/refund-status-filter/refund-status-filter.component.ts
index a36122429..bd6e00e33 100644
--- a/src/app/shared/components/filters/refund-status-filter/refund-status-filter.component.ts
+++ b/src/app/shared/components/filters/refund-status-filter/refund-status-filter.component.ts
@@ -1,8 +1,9 @@
import { ChangeDetectionStrategy, Component, Injector } from '@angular/core';
+import { FilterSuperclass } from '@dsh/components/filter';
+
import { createControlProviders } from '@vality/matez';
import { RefundStatus } from '@vality/swag-anapi-v2';
-import { FilterSuperclass } from '@dsh/components/filter';
@Component({
selector: 'dsh-refund-status-filter',
diff --git a/src/app/shared/components/filters/refund-status-filter/refund-status-filter.module.ts b/src/app/shared/components/filters/refund-status-filter/refund-status-filter.module.ts
index 159ff2ffc..befe92c03 100644
--- a/src/app/shared/components/filters/refund-status-filter/refund-status-filter.module.ts
+++ b/src/app/shared/components/filters/refund-status-filter/refund-status-filter.module.ts
@@ -2,10 +2,9 @@ import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { MatRadioModule } from '@angular/material/radio';
-import { TranslocoModule } from '@jsverse/transloco';
-
import { RefundStatusFieldModule } from '@dsh/app/shared/components/inputs/refund-status-field/refund-status-field.module';
import { FilterModule } from '@dsh/components/filter';
+import { TranslocoModule } from '@jsverse/transloco';
import { RefundStatusFilterComponent } from './refund-status-filter.component';
diff --git a/src/app/shared/components/filters/shops-filter/shops-filter.component.ts b/src/app/shared/components/filters/shops-filter/shops-filter.component.ts
index f99794f8f..0452121f6 100644
--- a/src/app/shared/components/filters/shops-filter/shops-filter.component.ts
+++ b/src/app/shared/components/filters/shops-filter/shops-filter.component.ts
@@ -1,12 +1,13 @@
-import { ChangeDetectionStrategy, Component, Injector, Input } from '@angular/core';
-import { createControlProviders } from '@vality/matez';
-import { Shop } from '@vality/swag-payments';
import { combineLatest } from 'rxjs';
import { map, share } from 'rxjs/operators';
+import { ChangeDetectionStrategy, Component, Injector, Input } from '@angular/core';
import { ShopsDataService } from '@dsh/app/shared';
import { FilterSuperclass } from '@dsh/components/filter';
+import { createControlProviders } from '@vality/matez';
+import { Shop } from '@vality/swag-payments';
+
@Component({
selector: 'dsh-shops-filter',
templateUrl: 'shops-filter.component.html',
diff --git a/src/app/shared/components/filters/shops-filter/shops-filter.module.ts b/src/app/shared/components/filters/shops-filter/shops-filter.module.ts
index a57469b0a..97b3a6dc1 100644
--- a/src/app/shared/components/filters/shops-filter/shops-filter.module.ts
+++ b/src/app/shared/components/filters/shops-filter/shops-filter.module.ts
@@ -1,10 +1,9 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
-import { TranslocoModule } from '@jsverse/transloco';
-
import { ShopsFieldModule } from '@dsh/app/shared/components/inputs/shops-field';
import { FilterModule } from '@dsh/components/filter';
+import { TranslocoModule } from '@jsverse/transloco';
import { ShopsFilterComponent } from './shops-filter.component';
diff --git a/src/app/shared/components/inputs/category-autocomplete-field/category-autocomplete-field.component.ts b/src/app/shared/components/inputs/category-autocomplete-field/category-autocomplete-field.component.ts
index af95dc850..c437988a2 100644
--- a/src/app/shared/components/inputs/category-autocomplete-field/category-autocomplete-field.component.ts
+++ b/src/app/shared/components/inputs/category-autocomplete-field/category-autocomplete-field.component.ts
@@ -1,11 +1,13 @@
-import { ChangeDetectionStrategy, Component, Input, booleanAttribute } from '@angular/core';
-import { FormControlSuperclass, Option, createControlProviders } from '@vality/matez';
-import { Category } from '@vality/swag-payments';
import { Observable } from 'rxjs';
import { map, shareReplay } from 'rxjs/operators';
+import { ChangeDetectionStrategy, Component, Input, booleanAttribute } from '@angular/core';
import { CategoriesService } from '@dsh/app/api/payments';
+import { FormControlSuperclass, Option, createControlProviders } from '@vality/matez';
+import { Category } from '@vality/swag-payments';
+
+
@Component({
selector: 'dsh-category-autocomplete-field',
templateUrl: 'category-autocomplete-field.component.html',
diff --git a/src/app/shared/components/inputs/category-autocomplete-field/category-autocomplete-field.module.ts b/src/app/shared/components/inputs/category-autocomplete-field/category-autocomplete-field.module.ts
index 999bb8f0f..69453d11c 100644
--- a/src/app/shared/components/inputs/category-autocomplete-field/category-autocomplete-field.module.ts
+++ b/src/app/shared/components/inputs/category-autocomplete-field/category-autocomplete-field.module.ts
@@ -1,6 +1,7 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
+
import { SelectFieldModule } from '@vality/matez';
import { CategoryAutocompleteFieldComponent } from './category-autocomplete-field.component';
diff --git a/src/app/shared/components/inputs/country-autocomplete-field/countries-autocomplete-field.component.ts b/src/app/shared/components/inputs/country-autocomplete-field/countries-autocomplete-field.component.ts
index 3b57684c2..d7e496eb3 100644
--- a/src/app/shared/components/inputs/country-autocomplete-field/countries-autocomplete-field.component.ts
+++ b/src/app/shared/components/inputs/country-autocomplete-field/countries-autocomplete-field.component.ts
@@ -1,9 +1,11 @@
-import { ChangeDetectionStrategy, Component, Input, booleanAttribute } from '@angular/core';
-import { FormControlSuperclass, createControlProviders } from '@vality/matez';
import { map } from 'rxjs/operators';
+import { ChangeDetectionStrategy, Component, Input, booleanAttribute } from '@angular/core';
import { CountriesService } from '@dsh/app/api/payments';
+import { FormControlSuperclass, createControlProviders } from '@vality/matez';
+
+
import { CountryId } from './types';
import { countriesToOptions } from './utils';
diff --git a/src/app/shared/components/inputs/country-autocomplete-field/country-autocomplete-field.module.ts b/src/app/shared/components/inputs/country-autocomplete-field/country-autocomplete-field.module.ts
index 11ed6e08c..c151d2b79 100644
--- a/src/app/shared/components/inputs/country-autocomplete-field/country-autocomplete-field.module.ts
+++ b/src/app/shared/components/inputs/country-autocomplete-field/country-autocomplete-field.module.ts
@@ -3,6 +3,7 @@ import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatInputModule } from '@angular/material/input';
+
import { SelectFieldModule } from '@vality/matez';
import { CountryAutocompleteFieldComponent } from './countries-autocomplete-field.component';
diff --git a/src/app/shared/components/inputs/currency-autocomplete-field/currency-autocomplete-field.component.ts b/src/app/shared/components/inputs/currency-autocomplete-field/currency-autocomplete-field.component.ts
index ba83f4a3b..c821e3aaf 100644
--- a/src/app/shared/components/inputs/currency-autocomplete-field/currency-autocomplete-field.component.ts
+++ b/src/app/shared/components/inputs/currency-autocomplete-field/currency-autocomplete-field.component.ts
@@ -1,7 +1,8 @@
import { ChangeDetectionStrategy, Component, Input, booleanAttribute } from '@angular/core';
+import { ConfigService } from '@dsh/app/config';
+
import { FormControlSuperclass, Option, createControlProviders } from '@vality/matez';
-import { ConfigService } from '@dsh/app/config';
@Component({
selector: 'dsh-currency-autocomplete-field',
diff --git a/src/app/shared/components/inputs/currency-autocomplete-field/currency-autocomplete-field.module.ts b/src/app/shared/components/inputs/currency-autocomplete-field/currency-autocomplete-field.module.ts
index dd6a000c6..27761da69 100644
--- a/src/app/shared/components/inputs/currency-autocomplete-field/currency-autocomplete-field.module.ts
+++ b/src/app/shared/components/inputs/currency-autocomplete-field/currency-autocomplete-field.module.ts
@@ -2,6 +2,7 @@ import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { TranslocoModule } from '@jsverse/transloco';
+
import { SelectFieldModule } from '@vality/matez';
import { CurrencyAutocompleteFieldComponent } from './currency-autocomplete-field.component';
diff --git a/src/app/shared/components/inputs/currency-field/currency-field.component.ts b/src/app/shared/components/inputs/currency-field/currency-field.component.ts
index e9367a8b4..f51048486 100644
--- a/src/app/shared/components/inputs/currency-field/currency-field.component.ts
+++ b/src/app/shared/components/inputs/currency-field/currency-field.component.ts
@@ -1,4 +1,5 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+
import { FormControlSuperclass, Option, createControlProviders } from '@vality/matez';
@Component({
diff --git a/src/app/shared/components/inputs/currency-field/currency-field.module.ts b/src/app/shared/components/inputs/currency-field/currency-field.module.ts
index 2852a1e94..2e08bb8a6 100644
--- a/src/app/shared/components/inputs/currency-field/currency-field.module.ts
+++ b/src/app/shared/components/inputs/currency-field/currency-field.module.ts
@@ -1,9 +1,9 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
+import { RadioGroupFieldModule } from '@dsh/components/form-controls/radio-group-field';
import { TranslocoModule } from '@jsverse/transloco';
-import { RadioGroupFieldModule } from '@dsh/components/form-controls/radio-group-field';
import { CurrencyFieldComponent } from './currency-field.component';
diff --git a/src/app/shared/components/inputs/invoice-status-field/invoice-status-field.component.ts b/src/app/shared/components/inputs/invoice-status-field/invoice-status-field.component.ts
index a907563fa..6de519fe8 100644
--- a/src/app/shared/components/inputs/invoice-status-field/invoice-status-field.component.ts
+++ b/src/app/shared/components/inputs/invoice-status-field/invoice-status-field.component.ts
@@ -1,8 +1,10 @@
+import { Observable, combineLatest } from 'rxjs';
+import { map } from 'rxjs/operators';
+
import { ChangeDetectionStrategy, Component } from '@angular/core';
+
import { FormControlSuperclass, Option, createControlProviders } from '@vality/matez';
import { InvoiceStatus } from '@vality/swag-anapi-v2';
-import { Observable, combineLatest } from 'rxjs';
-import { map } from 'rxjs/operators';
import { InvoiceStatusLabelPipe } from './pipes/invoice-status-label.pipe';
import { OPTION_LABELS } from './types/option-labels';
diff --git a/src/app/shared/components/inputs/invoice-status-field/invoice-status-field.module.ts b/src/app/shared/components/inputs/invoice-status-field/invoice-status-field.module.ts
index 1c9c99d3c..cbe3299cb 100644
--- a/src/app/shared/components/inputs/invoice-status-field/invoice-status-field.module.ts
+++ b/src/app/shared/components/inputs/invoice-status-field/invoice-status-field.module.ts
@@ -1,9 +1,9 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
+import { RadioGroupFieldModule } from '@dsh/components/form-controls/radio-group-field';
import { TranslocoModule } from '@jsverse/transloco';
-import { RadioGroupFieldModule } from '@dsh/components/form-controls/radio-group-field';
import { InvoiceStatusFieldComponent } from './invoice-status-field.component';
import { InvoiceStatusLabelPipe } from './pipes/invoice-status-label.pipe';
diff --git a/src/app/shared/components/inputs/invoice-status-field/pipes/invoice-status-label.pipe.ts b/src/app/shared/components/inputs/invoice-status-field/pipes/invoice-status-label.pipe.ts
index eceac3ce8..9c5cec01b 100644
--- a/src/app/shared/components/inputs/invoice-status-field/pipes/invoice-status-label.pipe.ts
+++ b/src/app/shared/components/inputs/invoice-status-field/pipes/invoice-status-label.pipe.ts
@@ -1,10 +1,11 @@
-import { Pipe, PipeTransform } from '@angular/core';
-import { InvoiceStatus } from '@vality/swag-anapi-v2';
import { Observable, of } from 'rxjs';
import { map } from 'rxjs/operators';
+import { Pipe, PipeTransform } from '@angular/core';
import { AnapiDictionaryService } from '@dsh/app/api/anapi';
+import { InvoiceStatus } from '@vality/swag-anapi-v2';
+
@Pipe({
name: 'invoiceStatusLabel',
standalone: false,
diff --git a/src/app/shared/components/inputs/invoices-field/invoices-field.component.ts b/src/app/shared/components/inputs/invoices-field/invoices-field.component.ts
index b2f639137..4eacc8681 100644
--- a/src/app/shared/components/inputs/invoices-field/invoices-field.component.ts
+++ b/src/app/shared/components/inputs/invoices-field/invoices-field.component.ts
@@ -1,4 +1,5 @@
import { ChangeDetectionStrategy, Component } from '@angular/core';
+
import { FormControlSuperclass, createControlProviders } from '@vality/matez';
@Component({
diff --git a/src/app/shared/components/inputs/invoices-field/invoices-field.module.ts b/src/app/shared/components/inputs/invoices-field/invoices-field.module.ts
index dffe35952..27b580e68 100644
--- a/src/app/shared/components/inputs/invoices-field/invoices-field.module.ts
+++ b/src/app/shared/components/inputs/invoices-field/invoices-field.module.ts
@@ -1,9 +1,9 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
+import { MultiInputFieldModule } from '@dsh/components/form-controls/multi-input-field';
import { TranslocoModule } from '@jsverse/transloco';
-import { MultiInputFieldModule } from '@dsh/components/form-controls/multi-input-field';
import { InvoicesFieldComponent } from './invoices-field.component';
diff --git a/src/app/shared/components/inputs/max-length-input/max-length-input.component.ts b/src/app/shared/components/inputs/max-length-input/max-length-input.component.ts
index 2a5f8ae2a..0cc09aeaf 100644
--- a/src/app/shared/components/inputs/max-length-input/max-length-input.component.ts
+++ b/src/app/shared/components/inputs/max-length-input/max-length-input.component.ts
@@ -1,3 +1,7 @@
+import isNil from 'lodash-es/isNil';
+import isObject from 'lodash-es/isObject';
+import { skip } from 'rxjs/operators';
+
import {
ChangeDetectionStrategy,
Component,
@@ -15,14 +19,11 @@ import {
ValidatorFn,
Validators,
} from '@angular/forms';
-import { ComponentChanges } from '@vality/matez';
-import isNil from 'lodash-es/isNil';
-import isObject from 'lodash-es/isObject';
-import { skip } from 'rxjs/operators';
-
import { ComponentInputError } from '@dsh/app/shared/services/error/models/component-input-error';
import { ErrorMatcher } from '@dsh/app/shared/utils';
+import { ComponentChanges } from '@vality/matez';
+
@Component({
selector: 'dsh-max-length-input',
templateUrl: './max-length-input.component.html',
diff --git a/src/app/shared/components/inputs/payment-institution-field/payment-institution-field.component.ts b/src/app/shared/components/inputs/payment-institution-field/payment-institution-field.component.ts
index 3d39f4f4c..b0e67bfb1 100644
--- a/src/app/shared/components/inputs/payment-institution-field/payment-institution-field.component.ts
+++ b/src/app/shared/components/inputs/payment-institution-field/payment-institution-field.component.ts
@@ -1,11 +1,13 @@
-import { ChangeDetectionStrategy, Component, Input, booleanAttribute } from '@angular/core';
-import { FormControlSuperclass, Option, createControlProviders } from '@vality/matez';
-import { PaymentInstitution } from '@vality/swag-payments';
import { Observable } from 'rxjs';
import { map, share } from 'rxjs/operators';
+import { ChangeDetectionStrategy, Component, Input, booleanAttribute } from '@angular/core';
import { PaymentInstitutionsService } from '@dsh/app/api/payments';
+import { FormControlSuperclass, Option, createControlProviders } from '@vality/matez';
+import { PaymentInstitution } from '@vality/swag-payments';
+
+
@Component({
selector: 'dsh-payment-institution-field',
templateUrl: 'payment-institution-field.component.html',
diff --git a/src/app/shared/components/inputs/payment-institution-field/payment-institution-field.module.ts b/src/app/shared/components/inputs/payment-institution-field/payment-institution-field.module.ts
index c555fb1fa..5ae2bc4e7 100644
--- a/src/app/shared/components/inputs/payment-institution-field/payment-institution-field.module.ts
+++ b/src/app/shared/components/inputs/payment-institution-field/payment-institution-field.module.ts
@@ -2,6 +2,7 @@ import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { TranslocoModule } from '@jsverse/transloco';
+
import { SelectFieldModule } from '@vality/matez';
import { PaymentInstitutionFieldComponent } from './payment-institution-field.component';
diff --git a/src/app/shared/components/inputs/refund-status-field/pipes/refund-status-label.pipe.ts b/src/app/shared/components/inputs/refund-status-field/pipes/refund-status-label.pipe.ts
index 5f75247ae..3b19394ca 100644
--- a/src/app/shared/components/inputs/refund-status-field/pipes/refund-status-label.pipe.ts
+++ b/src/app/shared/components/inputs/refund-status-field/pipes/refund-status-label.pipe.ts
@@ -1,10 +1,11 @@
-import { Pipe, PipeTransform } from '@angular/core';
-import { RefundStatus } from '@vality/swag-anapi-v2';
import { Observable, of } from 'rxjs';
import { map } from 'rxjs/operators';
+import { Pipe, PipeTransform } from '@angular/core';
import { AnapiDictionaryService } from '@dsh/app/api/anapi';
+import { RefundStatus } from '@vality/swag-anapi-v2';
+
@Pipe({
name: 'refundStatusLabel',
standalone: false,
diff --git a/src/app/shared/components/inputs/refund-status-field/refund-status-field.component.ts b/src/app/shared/components/inputs/refund-status-field/refund-status-field.component.ts
index c15c63c75..3e6b1828e 100644
--- a/src/app/shared/components/inputs/refund-status-field/refund-status-field.component.ts
+++ b/src/app/shared/components/inputs/refund-status-field/refund-status-field.component.ts
@@ -1,8 +1,10 @@
+import { Observable, combineLatest } from 'rxjs';
+import { map } from 'rxjs/operators';
+
import { ChangeDetectionStrategy, Component } from '@angular/core';
+
import { FormControlSuperclass, Option, createControlProviders } from '@vality/matez';
import { RefundStatus } from '@vality/swag-anapi-v2';
-import { Observable, combineLatest } from 'rxjs';
-import { map } from 'rxjs/operators';
import { RefundStatusLabelPipe } from './pipes/refund-status-label.pipe';
import { OPTION_LABELS } from './types/option-labels';
diff --git a/src/app/shared/components/inputs/refund-status-field/refund-status-field.module.ts b/src/app/shared/components/inputs/refund-status-field/refund-status-field.module.ts
index 4c5782845..9c364962e 100644
--- a/src/app/shared/components/inputs/refund-status-field/refund-status-field.module.ts
+++ b/src/app/shared/components/inputs/refund-status-field/refund-status-field.module.ts
@@ -1,9 +1,9 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
+import { RadioGroupFieldModule } from '@dsh/components/form-controls/radio-group-field';
import { TranslocoModule } from '@jsverse/transloco';
-import { RadioGroupFieldModule } from '@dsh/components/form-controls/radio-group-field';
import { RefundStatusLabelPipe } from './pipes/refund-status-label.pipe';
import { RefundStatusFieldComponent } from './refund-status-field.component';
diff --git a/src/app/shared/components/inputs/report-types-field/pipes/report-types-label.pipe.ts b/src/app/shared/components/inputs/report-types-field/pipes/report-types-label.pipe.ts
index da9def53f..ef236e38d 100644
--- a/src/app/shared/components/inputs/report-types-field/pipes/report-types-label.pipe.ts
+++ b/src/app/shared/components/inputs/report-types-field/pipes/report-types-label.pipe.ts
@@ -1,10 +1,11 @@
-import { Pipe, PipeTransform } from '@angular/core';
-import { Report } from '@vality/swag-anapi-v2';
import { Observable, of } from 'rxjs';
import { map } from 'rxjs/operators';
+import { Pipe, PipeTransform } from '@angular/core';
import { AnapiDictionaryService } from '@dsh/app/api/anapi';
+import { Report } from '@vality/swag-anapi-v2';
+
@Pipe({
name: 'reportTypesLabelPipe',
standalone: false,
diff --git a/src/app/shared/components/inputs/report-types-field/report-types-field.component.ts b/src/app/shared/components/inputs/report-types-field/report-types-field.component.ts
index 873006a75..44d1398b4 100644
--- a/src/app/shared/components/inputs/report-types-field/report-types-field.component.ts
+++ b/src/app/shared/components/inputs/report-types-field/report-types-field.component.ts
@@ -1,8 +1,9 @@
import { ChangeDetectionStrategy, Component, OnChanges } from '@angular/core';
+import { valuesToOptions } from '@dsh/components/form-controls/utils/values-to-options';
+
import { FormControlSuperclass, createControlProviders } from '@vality/matez';
import { Report } from '@vality/swag-anapi-v2';
-import { valuesToOptions } from '@dsh/components/form-controls/utils/values-to-options';
import { ReportTypesLabelPipe } from './pipes/report-types-label.pipe';
diff --git a/src/app/shared/components/inputs/report-types-field/report-types-field.module.ts b/src/app/shared/components/inputs/report-types-field/report-types-field.module.ts
index 1b199caa0..e5874f3bf 100644
--- a/src/app/shared/components/inputs/report-types-field/report-types-field.module.ts
+++ b/src/app/shared/components/inputs/report-types-field/report-types-field.module.ts
@@ -1,9 +1,9 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
+import { MultiSelectFieldModule } from '@dsh/components/form-controls/multi-select-field';
import { TranslocoModule } from '@jsverse/transloco';
-import { MultiSelectFieldModule } from '@dsh/components/form-controls/multi-select-field';
import { ReportTypesLabelPipe } from './pipes/report-types-label.pipe';
import { ReportTypesFieldComponent } from './report-types-field.component';
diff --git a/src/app/shared/components/inputs/shop-field/shop-field.component.ts b/src/app/shared/components/inputs/shop-field/shop-field.component.ts
index 6134ba38d..cbc016ad8 100644
--- a/src/app/shared/components/inputs/shop-field/shop-field.component.ts
+++ b/src/app/shared/components/inputs/shop-field/shop-field.component.ts
@@ -1,3 +1,6 @@
+import { Observable, defer } from 'rxjs';
+import { map, shareReplay } from 'rxjs/operators';
+
import {
ChangeDetectionStrategy,
Component,
@@ -6,14 +9,12 @@ import {
Optional,
booleanAttribute,
} from '@angular/core';
-import { FormControlSuperclass, Option, createControlProviders } from '@vality/matez';
-import { Shop } from '@vality/swag-payments';
-import { Observable, defer } from 'rxjs';
-import { map, shareReplay } from 'rxjs/operators';
-
import { toLiveShops } from '@dsh/app/api/payments';
import { ShopsDataService } from '@dsh/app/shared';
+import { FormControlSuperclass, Option, createControlProviders } from '@vality/matez';
+import { Shop } from '@vality/swag-payments';
+
import { SHOPS } from './shops-token';
import { shopToOption } from './utils/shops-to-options';
diff --git a/src/app/shared/components/inputs/shop-field/shop-field.module.ts b/src/app/shared/components/inputs/shop-field/shop-field.module.ts
index 9aad82b30..d15d8c636 100644
--- a/src/app/shared/components/inputs/shop-field/shop-field.module.ts
+++ b/src/app/shared/components/inputs/shop-field/shop-field.module.ts
@@ -1,6 +1,7 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
+
import { SelectFieldModule } from '@vality/matez';
import { ShopFieldComponent } from './shop-field.component';
diff --git a/src/app/shared/components/inputs/shop-field/shops-token.ts b/src/app/shared/components/inputs/shop-field/shops-token.ts
index f4eeebf9b..23def1679 100644
--- a/src/app/shared/components/inputs/shop-field/shops-token.ts
+++ b/src/app/shared/components/inputs/shop-field/shops-token.ts
@@ -1,5 +1,7 @@
+import { Observable } from 'rxjs';
+
import { InjectionToken } from '@angular/core';
+
import { Shop } from '@vality/swag-payments';
-import { Observable } from 'rxjs';
export const SHOPS = new InjectionToken>('Shops');
diff --git a/src/app/shared/components/inputs/shops-field/shops-field.component.ts b/src/app/shared/components/inputs/shops-field/shops-field.component.ts
index ca4ca57ab..4b2e1e874 100644
--- a/src/app/shared/components/inputs/shops-field/shops-field.component.ts
+++ b/src/app/shared/components/inputs/shops-field/shops-field.component.ts
@@ -1,8 +1,10 @@
+import { ReplaySubject, defer } from 'rxjs';
+import { map, shareReplay } from 'rxjs/operators';
+
import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core';
+
import { ComponentChanges, FormControlSuperclass, createControlProviders } from '@vality/matez';
import { Shop } from '@vality/swag-payments';
-import { ReplaySubject, defer } from 'rxjs';
-import { map, shareReplay } from 'rxjs/operators';
@Component({
selector: 'dsh-shops-field',
diff --git a/src/app/shared/components/inputs/shops-field/shops-field.module.ts b/src/app/shared/components/inputs/shops-field/shops-field.module.ts
index 99f6a81b6..6b7d91cc2 100644
--- a/src/app/shared/components/inputs/shops-field/shops-field.module.ts
+++ b/src/app/shared/components/inputs/shops-field/shops-field.module.ts
@@ -1,9 +1,9 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
+import { MultiSelectFieldModule } from '@dsh/components/form-controls/multi-select-field';
import { TranslocoModule } from '@jsverse/transloco';
-import { MultiSelectFieldModule } from '@dsh/components/form-controls/multi-select-field';
import { ShopsFieldComponent } from './shops-field.component';
diff --git a/src/app/shared/components/inputs/wallet-autocomplete-field/wallet-autocomplete-field.component.ts b/src/app/shared/components/inputs/wallet-autocomplete-field/wallet-autocomplete-field.component.ts
index 6df234542..7b59f31e9 100644
--- a/src/app/shared/components/inputs/wallet-autocomplete-field/wallet-autocomplete-field.component.ts
+++ b/src/app/shared/components/inputs/wallet-autocomplete-field/wallet-autocomplete-field.component.ts
@@ -1,9 +1,11 @@
-import { ChangeDetectionStrategy, Component, Input, booleanAttribute } from '@angular/core';
-import { FormControlSuperclass, createControlProviders } from '@vality/matez';
import { map } from 'rxjs/operators';
+import { ChangeDetectionStrategy, Component, Input, booleanAttribute } from '@angular/core';
import { WalletsService } from '@dsh/app/api/wallet';
+import { FormControlSuperclass, createControlProviders } from '@vality/matez';
+
+
import { WalletId } from './types';
import { walletsToOptions } from './utils';
diff --git a/src/app/shared/components/inputs/wallet-autocomplete-field/wallet-autocomplete-field.module.ts b/src/app/shared/components/inputs/wallet-autocomplete-field/wallet-autocomplete-field.module.ts
index add9a92ee..04d1632f5 100644
--- a/src/app/shared/components/inputs/wallet-autocomplete-field/wallet-autocomplete-field.module.ts
+++ b/src/app/shared/components/inputs/wallet-autocomplete-field/wallet-autocomplete-field.module.ts
@@ -3,6 +3,7 @@ import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatInputModule } from '@angular/material/input';
+
import { SelectFieldModule } from '@vality/matez';
import { WalletAutocompleteFieldComponent } from './wallet-autocomplete-field.component';
diff --git a/src/app/shared/components/invoice-randomize-amount-form/invoice-randomize-amount-form.component.ts b/src/app/shared/components/invoice-randomize-amount-form/invoice-randomize-amount-form.component.ts
index 96c141f7c..47a514702 100644
--- a/src/app/shared/components/invoice-randomize-amount-form/invoice-randomize-amount-form.component.ts
+++ b/src/app/shared/components/invoice-randomize-amount-form/invoice-randomize-amount-form.component.ts
@@ -1,6 +1,10 @@
+import isNil from 'lodash-es/isNil';
+
import { ChangeDetectionStrategy, Component, DestroyRef, Input, OnInit } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { FormBuilder } from '@angular/forms';
+import { getFormValueChanges } from '@dsh/utils';
+
import {
FormComponentSuperclass,
FormGroupByValue,
@@ -8,9 +12,7 @@ import {
getErrorsTree,
toMinor,
} from '@vality/matez';
-import isNil from 'lodash-es/isNil';
-import { getFormValueChanges } from '@dsh/utils';
const mapToMinor = (value: number | null, currency: string | null): number | undefined => {
if (isNil(value) || isNil(currency)) {
diff --git a/src/app/shared/components/invoice-randomize-amount-form/invoice-randomize-amount-form.module.ts b/src/app/shared/components/invoice-randomize-amount-form/invoice-randomize-amount-form.module.ts
index 17a4e6c63..eb1e8f174 100644
--- a/src/app/shared/components/invoice-randomize-amount-form/invoice-randomize-amount-form.module.ts
+++ b/src/app/shared/components/invoice-randomize-amount-form/invoice-randomize-amount-form.module.ts
@@ -1,3 +1,5 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
@@ -5,11 +7,9 @@ import { MatCheckboxModule } from '@angular/material/checkbox';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatInputModule } from '@angular/material/input';
import { MatRadioModule } from '@angular/material/radio';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { AmountCurrencyModule } from '@dsh/app/shared';
import { LayoutModule } from '@dsh/components/layout';
+import { TranslocoModule } from '@jsverse/transloco';
import { InvoiceRandomizeAmountFormComponent } from './invoice-randomize-amount-form.component';
diff --git a/src/app/shared/components/organization-roles/organization-roles.component.ts b/src/app/shared/components/organization-roles/organization-roles.component.ts
index b1ee7f92c..fedee1e7f 100644
--- a/src/app/shared/components/organization-roles/organization-roles.component.ts
+++ b/src/app/shared/components/organization-roles/organization-roles.component.ts
@@ -1,7 +1,8 @@
import { ChangeDetectionStrategy, Component, Input, booleanAttribute } from '@angular/core';
+import { OrganizationsDictionaryService } from '@dsh/app/api/organizations';
+
import { MemberRole } from '@vality/swag-organizations';
-import { OrganizationsDictionaryService } from '@dsh/app/api/organizations';
import { RoleGroup } from './types/role-group';
import { groupRoles } from './utils/group-roles';
diff --git a/src/app/shared/components/organization-roles/organization-roles.module.ts b/src/app/shared/components/organization-roles/organization-roles.module.ts
index aa96f22e9..ecd217358 100644
--- a/src/app/shared/components/organization-roles/organization-roles.module.ts
+++ b/src/app/shared/components/organization-roles/organization-roles.module.ts
@@ -1,10 +1,10 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { TranslocoModule } from '@jsverse/transloco';
import { FlexLayoutModule } from 'ng-flex-layout';
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
import { ApiModelRefsModule } from '@dsh/app/shared';
import { CollapseModule, LimitedListModule } from '@dsh/components/layout';
+import { TranslocoModule } from '@jsverse/transloco';
import { OrganizationRolesComponent } from './organization-roles.component';
diff --git a/src/app/shared/components/organization-roles/types/role-group.ts b/src/app/shared/components/organization-roles/types/role-group.ts
index c735bfa25..23661ed01 100644
--- a/src/app/shared/components/organization-roles/types/role-group.ts
+++ b/src/app/shared/components/organization-roles/types/role-group.ts
@@ -1,6 +1,7 @@
+import { RoleId } from '@dsh/app/auth/types/role-id';
+
import { ResourceScopeId } from '@vality/swag-organizations';
-import { RoleId } from '@dsh/app/auth/types/role-id';
export type ResourceId = string;
diff --git a/src/app/shared/components/organization-roles/utils/group-roles.ts b/src/app/shared/components/organization-roles/utils/group-roles.ts
index 48d520056..a0a5ee5a7 100644
--- a/src/app/shared/components/organization-roles/utils/group-roles.ts
+++ b/src/app/shared/components/organization-roles/utils/group-roles.ts
@@ -1,6 +1,7 @@
+import { RoleId } from '@dsh/app/auth/types/role-id';
+
import { MemberRole } from '@vality/swag-organizations';
-import { RoleId } from '@dsh/app/auth/types/role-id';
import { RoleGroup, RoleGroupScope } from '../types/role-group';
diff --git a/src/app/shared/components/payment-status/payment-status.component.ts b/src/app/shared/components/payment-status/payment-status.component.ts
index 881d018f2..3fe238cd3 100644
--- a/src/app/shared/components/payment-status/payment-status.component.ts
+++ b/src/app/shared/components/payment-status/payment-status.component.ts
@@ -1,10 +1,10 @@
import { CommonModule } from '@angular/common';
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
-import { PaymentSearchResult } from '@vality/swag-anapi-v2';
-
import { AnapiDictionaryService } from '@dsh/app/api/anapi';
import { StatusModule } from '@dsh/components/indicators';
+import { PaymentSearchResult } from '@vality/swag-anapi-v2';
+
import { PAYMENT_STATUS_COLOR } from './payment-status-color';
@Component({
diff --git a/src/app/shared/components/radio-buttons/expandable-radio-group/expandable-radio-group.component.ts b/src/app/shared/components/radio-buttons/expandable-radio-group/expandable-radio-group.component.ts
index 4781617e5..5d406e6a6 100644
--- a/src/app/shared/components/radio-buttons/expandable-radio-group/expandable-radio-group.component.ts
+++ b/src/app/shared/components/radio-buttons/expandable-radio-group/expandable-radio-group.component.ts
@@ -1,3 +1,5 @@
+import { isNumber } from 'lodash-es';
+
import {
AfterContentInit,
ChangeDetectionStrategy,
@@ -12,7 +14,6 @@ import {
booleanAttribute,
} from '@angular/core';
import { FormControl } from '@angular/forms';
-import { isNumber } from 'lodash-es';
import { ExpandableRadioGroupItemDirective } from './directives/expandable-radio-group-item/expandable-radio-group-item.directive';
import {
diff --git a/src/app/shared/components/radio-buttons/expandable-radio-group/expandable-radio-group.module.ts b/src/app/shared/components/radio-buttons/expandable-radio-group/expandable-radio-group.module.ts
index 6a95cebd9..835476730 100644
--- a/src/app/shared/components/radio-buttons/expandable-radio-group/expandable-radio-group.module.ts
+++ b/src/app/shared/components/radio-buttons/expandable-radio-group/expandable-radio-group.module.ts
@@ -1,11 +1,12 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { MatRadioModule } from '@angular/material/radio';
+import { InlineShowAllToggleModule } from '@dsh/app/shared/components/buttons/inline-show-all-toggle';
import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-import { InlineShowAllToggleModule } from '@dsh/app/shared/components/buttons/inline-show-all-toggle';
import { ExpandableRadioGroupItemDirective } from './directives/expandable-radio-group-item/expandable-radio-group-item.directive';
import { ExpandableRadioGroupComponent } from './expandable-radio-group.component';
diff --git a/src/app/shared/components/route-navbar-layout/route-navbar-layout.module.ts b/src/app/shared/components/route-navbar-layout/route-navbar-layout.module.ts
index a89feb2de..6e6d992bc 100644
--- a/src/app/shared/components/route-navbar-layout/route-navbar-layout.module.ts
+++ b/src/app/shared/components/route-navbar-layout/route-navbar-layout.module.ts
@@ -1,8 +1,8 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { SectionHeaderModule } from '@dsh/components/layout';
import { RouteNavbarLayoutComponent } from './route-navbar-layout.component';
diff --git a/src/app/shared/pipes/amount-currency/amount-currency.pipe.ts b/src/app/shared/pipes/amount-currency/amount-currency.pipe.ts
index 2a8030453..83831c0fb 100644
--- a/src/app/shared/pipes/amount-currency/amount-currency.pipe.ts
+++ b/src/app/shared/pipes/amount-currency/amount-currency.pipe.ts
@@ -1,5 +1,6 @@
import { formatCurrency, getCurrencySymbol } from '@angular/common';
import { DEFAULT_CURRENCY_CODE, Inject, LOCALE_ID, Pipe, PipeTransform } from '@angular/core';
+
import { toMajor } from '@vality/matez';
@Pipe({
diff --git a/src/app/shared/pipes/api-model-refs/shop-details.pipe.ts b/src/app/shared/pipes/api-model-refs/shop-details.pipe.ts
index 3715017be..22b61c11c 100644
--- a/src/app/shared/pipes/api-model-refs/shop-details.pipe.ts
+++ b/src/app/shared/pipes/api-model-refs/shop-details.pipe.ts
@@ -1,7 +1,7 @@
-import { ChangeDetectorRef, OnDestroy, Pipe, PipeTransform } from '@angular/core';
import { BehaviorSubject, Subject, combineLatest } from 'rxjs';
import { distinctUntilChanged, map, takeUntil } from 'rxjs/operators';
+import { ChangeDetectorRef, OnDestroy, Pipe, PipeTransform } from '@angular/core';
import { ShopsDataService } from '@dsh/app/shared';
@Pipe({
diff --git a/src/app/shared/pipes/api-model-refs/wallet-details.pipe.ts b/src/app/shared/pipes/api-model-refs/wallet-details.pipe.ts
index 9ec4627c1..a4843c2a4 100644
--- a/src/app/shared/pipes/api-model-refs/wallet-details.pipe.ts
+++ b/src/app/shared/pipes/api-model-refs/wallet-details.pipe.ts
@@ -1,7 +1,7 @@
-import { ChangeDetectorRef, OnDestroy, Pipe, PipeTransform } from '@angular/core';
import { BehaviorSubject, Subject, combineLatest } from 'rxjs';
import { distinctUntilChanged, map, pluck, takeUntil } from 'rxjs/operators';
+import { ChangeDetectorRef, OnDestroy, Pipe, PipeTransform } from '@angular/core';
import { WalletsService } from '@dsh/app/api/wallet';
@Pipe({
diff --git a/src/app/shared/pipes/api-model-types/deposit-status-color.pipe.ts b/src/app/shared/pipes/api-model-types/deposit-status-color.pipe.ts
index 96424c83e..9c9d088d7 100644
--- a/src/app/shared/pipes/api-model-types/deposit-status-color.pipe.ts
+++ b/src/app/shared/pipes/api-model-types/deposit-status-color.pipe.ts
@@ -1,4 +1,5 @@
import { Pipe, PipeTransform } from '@angular/core';
+
import { Deposit } from '@vality/swag-wallets';
import { StatusColor } from '../../../theme-manager';
diff --git a/src/app/shared/pipes/api-model-types/payout-tool-details-type.pipe.ts b/src/app/shared/pipes/api-model-types/payout-tool-details-type.pipe.ts
index bf61b8fad..f85eb0dcb 100644
--- a/src/app/shared/pipes/api-model-types/payout-tool-details-type.pipe.ts
+++ b/src/app/shared/pipes/api-model-types/payout-tool-details-type.pipe.ts
@@ -1,6 +1,7 @@
+import { Observable, of } from 'rxjs';
+
import { Pipe, PipeTransform } from '@angular/core';
import { TranslocoService } from '@jsverse/transloco';
-import { Observable, of } from 'rxjs';
@Pipe({
name: 'payoutToolDetailsType',
diff --git a/src/app/shared/pipes/api-model-types/withdrawal-status-color.pipe.ts b/src/app/shared/pipes/api-model-types/withdrawal-status-color.pipe.ts
index 54415637e..6a6a9f1ab 100644
--- a/src/app/shared/pipes/api-model-types/withdrawal-status-color.pipe.ts
+++ b/src/app/shared/pipes/api-model-types/withdrawal-status-color.pipe.ts
@@ -1,4 +1,5 @@
import { Pipe, PipeTransform } from '@angular/core';
+
import { Withdrawal } from '@vality/swag-wallets';
import { StatusColor } from '../../../theme-manager';
diff --git a/src/app/shared/pipes/error-message/error-message.pipe.ts b/src/app/shared/pipes/error-message/error-message.pipe.ts
index 67f9902a6..82d87c14c 100644
--- a/src/app/shared/pipes/error-message/error-message.pipe.ts
+++ b/src/app/shared/pipes/error-message/error-message.pipe.ts
@@ -1,8 +1,9 @@
-import { Pipe, PipeTransform } from '@angular/core';
-import { TranslocoService } from '@jsverse/transloco';
import { Observable, of } from 'rxjs';
+import { Pipe, PipeTransform } from '@angular/core';
import { CommonError } from '@dsh/app/shared';
+import { TranslocoService } from '@jsverse/transloco';
+
@Pipe({
name: 'errorMessage',
diff --git a/src/app/shared/services/context-organization/context-organization.service.ts b/src/app/shared/services/context-organization/context-organization.service.ts
index 4230c9cc1..a8b56d441 100644
--- a/src/app/shared/services/context-organization/context-organization.service.ts
+++ b/src/app/shared/services/context-organization/context-organization.service.ts
@@ -1,6 +1,3 @@
-import { HttpErrorResponse } from '@angular/common/http';
-import { Injectable } from '@angular/core';
-import { Member, Organization } from '@vality/swag-organizations';
import isNil from 'lodash-es/isNil';
import { Observable, ReplaySubject, combineLatest, concat, defer, of } from 'rxjs';
import {
@@ -13,10 +10,14 @@ import {
tap,
} from 'rxjs/operators';
+import { HttpErrorResponse } from '@angular/common/http';
+import { Injectable } from '@angular/core';
import { MembersService, OrgsService } from '@dsh/app/api/organizations';
import { RoleId } from '@dsh/app/auth/types/role-id';
import { KeycloakTokenInfoService } from '@dsh/app/shared/services/keycloak-token-info';
+import { Member, Organization } from '@vality/swag-organizations';
+
import { ErrorService } from '../error';
@Injectable({
diff --git a/src/app/shared/services/date-range-manager/daterange-manager.service.ts b/src/app/shared/services/date-range-manager/daterange-manager.service.ts
index c12e4ee5f..9ec2bd06a 100644
--- a/src/app/shared/services/date-range-manager/daterange-manager.service.ts
+++ b/src/app/shared/services/date-range-manager/daterange-manager.service.ts
@@ -1,7 +1,7 @@
-import { Inject, Injectable, Optional } from '@angular/core';
import isNil from 'lodash-es/isNil';
import moment from 'moment';
+import { Inject, Injectable, Optional } from '@angular/core';
import { DaterangeParams } from '@dsh/app/shared/services/date-range-manager/types/daterange-params';
import { DaterangeType } from '@dsh/app/shared/services/date-range-manager/types/daterange-type';
import { Daterange } from '@dsh/pipes/daterange';
diff --git a/src/app/shared/services/error/error.service.ts b/src/app/shared/services/error/error.service.ts
index 4ad8fdd5e..250d286bc 100644
--- a/src/app/shared/services/error/error.service.ts
+++ b/src/app/shared/services/error/error.service.ts
@@ -1,8 +1,10 @@
+import { Observable } from 'rxjs';
+
import { HttpErrorResponse } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { TranslocoService } from '@jsverse/transloco';
+
import { NotifyLogService } from '@vality/matez';
-import { Observable } from 'rxjs';
@Injectable()
/**
diff --git a/src/app/shared/services/error/models/component-input-error.ts b/src/app/shared/services/error/models/component-input-error.ts
index 74facd4fe..b36180390 100644
--- a/src/app/shared/services/error/models/component-input-error.ts
+++ b/src/app/shared/services/error/models/component-input-error.ts
@@ -1,5 +1,4 @@
import { Type } from '@angular/core';
-
import { CustomError } from '@dsh/app/shared/services/error/models/custom-error';
/**
diff --git a/src/app/shared/services/expanded-id-manager/expanded-id-manager.ts b/src/app/shared/services/expanded-id-manager/expanded-id-manager.ts
index 1499191aa..89c13a29b 100644
--- a/src/app/shared/services/expanded-id-manager/expanded-id-manager.ts
+++ b/src/app/shared/services/expanded-id-manager/expanded-id-manager.ts
@@ -1,6 +1,3 @@
-import { DestroyRef, Injectable, inject } from '@angular/core';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { ActivatedRoute, Router } from '@angular/router';
import isNil from 'lodash-es/isNil';
import { Observable, Subject, of } from 'rxjs';
import {
@@ -14,6 +11,10 @@ import {
withLatestFrom,
} from 'rxjs/operators';
+import { DestroyRef, Injectable, inject } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { ActivatedRoute, Router } from '@angular/router';
+
import { DatasetItemId } from './types/dataset-item-id';
export type ExpandedId = number;
diff --git a/src/app/shared/services/fake-paginator.service.ts b/src/app/shared/services/fake-paginator.service.ts
index cddc22910..659653fe8 100644
--- a/src/app/shared/services/fake-paginator.service.ts
+++ b/src/app/shared/services/fake-paginator.service.ts
@@ -1,7 +1,8 @@
-import { Injectable } from '@angular/core';
import { Observable, ReplaySubject, combineLatest } from 'rxjs';
import { map, pluck, scan, shareReplay, switchMapTo } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
+
const DEFAULT_PAGINATION_LIMIT = 3;
@Injectable()
diff --git a/src/app/shared/services/fetch-organizations/fetch-organizations.service.ts b/src/app/shared/services/fetch-organizations/fetch-organizations.service.ts
index 3e15e2b37..af653a9d7 100644
--- a/src/app/shared/services/fetch-organizations/fetch-organizations.service.ts
+++ b/src/app/shared/services/fetch-organizations/fetch-organizations.service.ts
@@ -1,13 +1,14 @@
-import { Inject, Injectable } from '@angular/core';
-import { Organization } from '@vality/swag-organizations';
import { Observable } from 'rxjs';
import { shareReplay } from 'rxjs/operators';
+import { Inject, Injectable } from '@angular/core';
import { OrgsService } from '@dsh/app/api/organizations';
import { mapToTimestamp } from '@dsh/app/custom-operators';
import { SEARCH_LIMIT } from '@dsh/app/sections/tokens';
import { DEBOUNCE_FETCHER_ACTION_TIME, FetchResult, PartialFetcher } from '@dsh/app/shared';
+import { Organization } from '@vality/swag-organizations';
+
@Injectable()
export class FetchOrganizationsService extends PartialFetcher {
lastUpdated$: Observable = this.searchResult$.pipe(mapToTimestamp, shareReplay(1));
diff --git a/src/app/shared/services/id-generator/id-generator.service.ts b/src/app/shared/services/id-generator/id-generator.service.ts
index b3e28786a..004ed7532 100644
--- a/src/app/shared/services/id-generator/id-generator.service.ts
+++ b/src/app/shared/services/id-generator/id-generator.service.ts
@@ -1,6 +1,7 @@
-import { Injectable } from '@angular/core';
import short from 'short-uuid';
+import { Injectable } from '@angular/core';
+
@Injectable({ providedIn: 'root' })
export class IdGeneratorService {
uuid(): string {
diff --git a/src/app/shared/services/keycloak-token-info/keycloak-token-info.service.ts b/src/app/shared/services/keycloak-token-info/keycloak-token-info.service.ts
index 2f54d331e..21f39e4cc 100644
--- a/src/app/shared/services/keycloak-token-info/keycloak-token-info.service.ts
+++ b/src/app/shared/services/keycloak-token-info/keycloak-token-info.service.ts
@@ -1,10 +1,11 @@
-import { DestroyRef, Injectable } from '@angular/core';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import jwtDecode, { JwtPayload } from 'jwt-decode';
import { KeycloakService } from 'keycloak-angular';
import { Observable, defer, from } from 'rxjs';
import { map, shareReplay } from 'rxjs/operators';
+import { DestroyRef, Injectable } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+
@Injectable({
providedIn: 'root',
})
diff --git a/src/app/shared/services/notification/notification.service.ts b/src/app/shared/services/notification/notification.service.ts
index 43adab1ed..f21624f62 100644
--- a/src/app/shared/services/notification/notification.service.ts
+++ b/src/app/shared/services/notification/notification.service.ts
@@ -1,7 +1,9 @@
+import { Observable } from 'rxjs';
+
import { Injectable } from '@angular/core';
import { TranslocoService } from '@jsverse/transloco';
+
import { NotifyLogService } from '@vality/matez';
-import { Observable } from 'rxjs';
@Injectable()
/**
diff --git a/src/app/shared/services/organization-management/organization-management.service.ts b/src/app/shared/services/organization-management/organization-management.service.ts
index c8838c4a5..489c3b442 100644
--- a/src/app/shared/services/organization-management/organization-management.service.ts
+++ b/src/app/shared/services/organization-management/organization-management.service.ts
@@ -1,12 +1,13 @@
-import { Injectable } from '@angular/core';
-import { Member, Organization } from '@vality/swag-organizations';
import { Observable, ReplaySubject, combineLatest, defer } from 'rxjs';
import { map, pluck, shareReplay, switchMap } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
import { MembersService } from '@dsh/app/api/organizations';
import { RoleId } from '@dsh/app/auth/types/role-id';
import { KeycloakTokenInfoService } from '@dsh/app/shared';
+import { Member, Organization } from '@vality/swag-organizations';
+
@Injectable()
export class OrganizationManagementService {
members$: Observable = defer(() => this.organization$).pipe(
diff --git a/src/app/shared/services/partial-fetcher/partial-fetcher.ts b/src/app/shared/services/partial-fetcher/partial-fetcher.ts
index 3e8c71182..fa15ef91a 100644
--- a/src/app/shared/services/partial-fetcher/partial-fetcher.ts
+++ b/src/app/shared/services/partial-fetcher/partial-fetcher.ts
@@ -1,5 +1,3 @@
-import { DestroyRef, inject } from '@angular/core';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { EMPTY, Observable, Subject, merge, of } from 'rxjs';
import {
debounceTime,
@@ -14,6 +12,9 @@ import {
tap,
} from 'rxjs/operators';
+import { DestroyRef, inject } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+
import { progress } from '../../../custom-operators';
import { FetchAction } from './fetch-action';
diff --git a/src/app/shared/services/query-params-store.ts b/src/app/shared/services/query-params-store.ts
index 7d17cb7f4..d52119c60 100644
--- a/src/app/shared/services/query-params-store.ts
+++ b/src/app/shared/services/query-params-store.ts
@@ -1,11 +1,12 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRoute, Params, Router } from '@angular/router';
import identity from 'lodash-es/identity';
import isEqual from 'lodash-es/isEqual';
import pickBy from 'lodash-es/pickBy';
import { Observable } from 'rxjs';
import { distinctUntilChanged, map, shareReplay } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
+import { ActivatedRoute, Params, Router } from '@angular/router';
+
const removeEmptyProperties = (s) => pickBy(s, identity);
@Injectable()
diff --git a/src/app/shared/services/sections-links/section-links.service.ts b/src/app/shared/services/sections-links/section-links.service.ts
index f3582f2da..c66a3d679 100644
--- a/src/app/shared/services/sections-links/section-links.service.ts
+++ b/src/app/shared/services/sections-links/section-links.service.ts
@@ -1,9 +1,9 @@
-import { Injectable } from '@angular/core';
-import { TranslocoService } from '@jsverse/transloco';
import { Observable, combineLatest } from 'rxjs';
import { map, shareReplay } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
import { AppSection, SectionsService } from '@dsh/app/sections/sections.service';
+import { TranslocoService } from '@jsverse/transloco';
import { SectionLink } from './types';
diff --git a/src/app/shared/services/shops-data/shops-data.service.ts b/src/app/shared/services/shops-data/shops-data.service.ts
index e5ae49a8c..33112cedc 100644
--- a/src/app/shared/services/shops-data/shops-data.service.ts
+++ b/src/app/shared/services/shops-data/shops-data.service.ts
@@ -1,11 +1,12 @@
-import { Injectable } from '@angular/core';
-import { Shop } from '@vality/swag-payments';
import { Observable, Subject, defer, merge, of } from 'rxjs';
import { catchError, map, shareReplay, switchMap } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
import { ShopsService } from '@dsh/app/api/payments';
import { ContextOrganizationService } from '@dsh/app/shared';
+import { Shop } from '@vality/swag-payments';
+
import { IdGeneratorService } from '../id-generator';
@Injectable({
diff --git a/src/app/shared/utils/get-controls.ts b/src/app/shared/utils/get-controls.ts
index 4976c2844..218f547c0 100644
--- a/src/app/shared/utils/get-controls.ts
+++ b/src/app/shared/utils/get-controls.ts
@@ -1,8 +1,10 @@
-import { AbstractControl } from '@angular/forms';
-import { FormGroupByValue } from '@vality/matez';
import isEmpty from 'lodash-es/isEmpty';
import isNil from 'lodash-es/isNil';
+import { AbstractControl } from '@angular/forms';
+
+import { FormGroupByValue } from '@vality/matez';
+
export function getAbstractControl(
form: FormGroupByValue,
path: string,
diff --git a/src/app/transloco-http-loader.service.ts b/src/app/transloco-http-loader.service.ts
index 8ae7c1e4f..8274e59a4 100644
--- a/src/app/transloco-http-loader.service.ts
+++ b/src/app/transloco-http-loader.service.ts
@@ -1,7 +1,8 @@
+import { Observable } from 'rxjs';
+
import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { Translation, TranslocoLoader } from '@jsverse/transloco';
-import { Observable } from 'rxjs';
@Injectable({ providedIn: 'root' })
export class TranslocoHttpLoaderService implements TranslocoLoader {
diff --git a/src/components/charts/bar-chart/bar-chart.component.ts b/src/components/charts/bar-chart/bar-chart.component.ts
index 7b30e74eb..98942d2ed 100644
--- a/src/components/charts/bar-chart/bar-chart.component.ts
+++ b/src/components/charts/bar-chart/bar-chart.component.ts
@@ -1,7 +1,8 @@
-import { ChangeDetectionStrategy, Component, Input, OnChanges, SimpleChanges } from '@angular/core';
import cloneDeep from 'lodash-es/cloneDeep';
import { ApexAxisChartSeries } from 'ng-apexcharts';
+import { ChangeDetectionStrategy, Component, Input, OnChanges, SimpleChanges } from '@angular/core';
+
import { DEFAULT_CONFIG } from './default-config';
@Component({
diff --git a/src/components/charts/bar-chart/bar-chart.module.ts b/src/components/charts/bar-chart/bar-chart.module.ts
index 4d0587094..0d002a7dd 100644
--- a/src/components/charts/bar-chart/bar-chart.module.ts
+++ b/src/components/charts/bar-chart/bar-chart.module.ts
@@ -1,6 +1,7 @@
+import { NgApexchartsModule } from 'ng-apexcharts';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
-import { NgApexchartsModule } from 'ng-apexcharts';
import { BarChartComponent } from './bar-chart.component';
diff --git a/src/components/charts/bar-chart/custom-tooltip.ts b/src/components/charts/bar-chart/custom-tooltip.ts
index 71f311ac4..b4324149d 100644
--- a/src/components/charts/bar-chart/custom-tooltip.ts
+++ b/src/components/charts/bar-chart/custom-tooltip.ts
@@ -1,6 +1,7 @@
-import { formatNumber } from '@angular/common';
import { locale } from 'moment';
+import { formatNumber } from '@angular/common';
+
const getGetTooltipTitle = (x: string | null): string =>
x.includes('hide') || x.includes('show') ? x.split('#')[0] : x;
diff --git a/src/components/charts/donut-chart/donut-chart.component.ts b/src/components/charts/donut-chart/donut-chart.component.ts
index 5b928426f..e512acfdc 100644
--- a/src/components/charts/donut-chart/donut-chart.component.ts
+++ b/src/components/charts/donut-chart/donut-chart.component.ts
@@ -1,3 +1,6 @@
+import cloneDeep from 'lodash-es/cloneDeep';
+import { ApexAxisChartSeries } from 'ng-apexcharts';
+
import {
ChangeDetectionStrategy,
Component,
@@ -6,8 +9,6 @@ import {
OnInit,
Output,
} from '@angular/core';
-import cloneDeep from 'lodash-es/cloneDeep';
-import { ApexAxisChartSeries } from 'ng-apexcharts';
import { DEFAULT_CONFIG } from './default-config';
diff --git a/src/components/charts/donut-chart/donut-chart.module.ts b/src/components/charts/donut-chart/donut-chart.module.ts
index c28f7fbbe..83252e976 100644
--- a/src/components/charts/donut-chart/donut-chart.module.ts
+++ b/src/components/charts/donut-chart/donut-chart.module.ts
@@ -1,6 +1,7 @@
+import { NgApexchartsModule } from 'ng-apexcharts';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
-import { NgApexchartsModule } from 'ng-apexcharts';
import { DonutChartComponent } from './donut-chart.component';
diff --git a/src/components/charts/format-amount.ts b/src/components/charts/format-amount.ts
index 9b017d9c6..1cca5ff6c 100644
--- a/src/components/charts/format-amount.ts
+++ b/src/components/charts/format-amount.ts
@@ -1,6 +1,7 @@
-import { formatNumber } from '@angular/common';
import { locale } from 'moment';
+import { formatNumber } from '@angular/common';
+
export const formatAmount = (num: number): string => {
for (const amountUnit of AMOUNT_UNITS) {
if (num >= amountUnit.amount) {
diff --git a/src/components/date-range-filter/date-range-filter.component.ts b/src/components/date-range-filter/date-range-filter.component.ts
index 2854d4431..141c6aa1e 100644
--- a/src/components/date-range-filter/date-range-filter.component.ts
+++ b/src/components/date-range-filter/date-range-filter.component.ts
@@ -1,11 +1,13 @@
+import { Moment } from 'moment';
+import { map, shareReplay, switchMap } from 'rxjs/operators';
+
import { ChangeDetectionStrategy, Component, Injector, Input } from '@angular/core';
import { DateRange as MatDateRange } from '@angular/material/datepicker';
+import { FilterSuperclass } from '@dsh/components/filter';
import { TranslocoService } from '@jsverse/transloco';
+
import { createControlProviders, getValueChanges } from '@vality/matez';
-import { Moment } from 'moment';
-import { map, shareReplay, switchMap } from 'rxjs/operators';
-import { FilterSuperclass } from '@dsh/components/filter';
import { DateRangeLocalizationService } from './services/date-range-localization/date-range-localization.service';
import { DateRangeWithPreset } from './types/date-range-with-preset';
diff --git a/src/components/date-range-filter/date-range-filter.module.ts b/src/components/date-range-filter/date-range-filter.module.ts
index d3b83e381..4196ef1e3 100644
--- a/src/components/date-range-filter/date-range-filter.module.ts
+++ b/src/components/date-range-filter/date-range-filter.module.ts
@@ -1,13 +1,13 @@
+import { FlexModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatDatepickerModule } from '@angular/material/datepicker';
import { MatListModule } from '@angular/material/list';
import { MatTooltipModule } from '@angular/material/tooltip';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexModule } from 'ng-flex-layout';
-
import { FilterModule } from '@dsh/components/filter';
import { DaterangeModule } from '@dsh/pipes/daterange';
+import { TranslocoModule } from '@jsverse/transloco';
import { DateRangeFilterComponent } from './date-range-filter.component';
diff --git a/src/components/date-range-filter/services/date-range-localization/date-range-localization.service.ts b/src/components/date-range-filter/services/date-range-localization/date-range-localization.service.ts
index 18aab24e1..b44dc1e8d 100644
--- a/src/components/date-range-filter/services/date-range-localization/date-range-localization.service.ts
+++ b/src/components/date-range-filter/services/date-range-localization/date-range-localization.service.ts
@@ -1,10 +1,11 @@
-import { Inject, Injectable, LOCALE_ID } from '@angular/core';
-import { DateRange } from '@angular/material/datepicker';
-import { TranslocoService } from '@jsverse/transloco';
import { Moment } from 'moment';
import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
+import { Inject, Injectable, LOCALE_ID } from '@angular/core';
+import { DateRange } from '@angular/material/datepicker';
+import { TranslocoService } from '@jsverse/transloco';
+
import { DATE_RANGE_WORDS } from './types/translations';
import { getLocalizedDateRange } from './utils/get-localized-date-range';
diff --git a/src/components/date-range-filter/services/date-range-localization/utils/get-date-range-current-type.ts b/src/components/date-range-filter/services/date-range-localization/utils/get-date-range-current-type.ts
index 2bdda25a2..8568018f1 100644
--- a/src/components/date-range-filter/services/date-range-localization/utils/get-date-range-current-type.ts
+++ b/src/components/date-range-filter/services/date-range-localization/utils/get-date-range-current-type.ts
@@ -1,6 +1,7 @@
-import { DateRange } from '@angular/material/datepicker';
import moment, { Moment } from 'moment';
+import { DateRange } from '@angular/material/datepicker';
+
export const isCurrentYear = (dateRange: DateRange): boolean =>
moment().isSame(dateRange.start, 'year') && moment().isSame(dateRange.end, 'year');
export const isCurrentWeek = ({ start, end }: DateRange): boolean =>
diff --git a/src/components/date-range-filter/services/date-range-localization/utils/get-date-range-type.ts b/src/components/date-range-filter/services/date-range-localization/utils/get-date-range-type.ts
index 9cbb7b6d3..425bf9013 100644
--- a/src/components/date-range-filter/services/date-range-localization/utils/get-date-range-type.ts
+++ b/src/components/date-range-filter/services/date-range-localization/utils/get-date-range-type.ts
@@ -1,6 +1,7 @@
-import { DateRange } from '@angular/material/datepicker';
import { Moment } from 'moment';
+import { DateRange } from '@angular/material/datepicker';
+
export const isYearsRange = ({ start, end }: DateRange): boolean =>
start.isSame(start.clone().startOf('year'), 'day') &&
end.isSame(end.clone().endOf('year'), 'day');
diff --git a/src/components/date-range-filter/services/date-range-localization/utils/get-localized-date-range.ts b/src/components/date-range-filter/services/date-range-localization/utils/get-localized-date-range.ts
index 6adfc0160..e64ba6420 100644
--- a/src/components/date-range-filter/services/date-range-localization/utils/get-localized-date-range.ts
+++ b/src/components/date-range-filter/services/date-range-localization/utils/get-localized-date-range.ts
@@ -1,6 +1,7 @@
-import { DateRange } from '@angular/material/datepicker';
import { Moment } from 'moment';
+import { DateRange } from '@angular/material/datepicker';
+
import { DateRangeTranslations } from '../types/translations';
import { isCurrentWeek, isToday } from './get-date-range-current-type';
diff --git a/src/components/date-range-filter/services/date-range-localization/utils/get-localized-date.ts b/src/components/date-range-filter/services/date-range-localization/utils/get-localized-date.ts
index d889e1884..44b737de3 100644
--- a/src/components/date-range-filter/services/date-range-localization/utils/get-localized-date.ts
+++ b/src/components/date-range-filter/services/date-range-localization/utils/get-localized-date.ts
@@ -1,6 +1,7 @@
-import { formatDate } from '@angular/common';
import { Moment } from 'moment';
+import { formatDate } from '@angular/common';
+
type Parts = Partial>;
export function getLocalizedDate(
diff --git a/src/components/date-range-filter/services/date-range-localization/utils/get-localized-day-range.ts b/src/components/date-range-filter/services/date-range-localization/utils/get-localized-day-range.ts
index 421df6c14..ed7779483 100644
--- a/src/components/date-range-filter/services/date-range-localization/utils/get-localized-day-range.ts
+++ b/src/components/date-range-filter/services/date-range-localization/utils/get-localized-day-range.ts
@@ -1,6 +1,7 @@
-import { DateRange } from '@angular/material/datepicker';
import { Moment } from 'moment';
+import { DateRange } from '@angular/material/datepicker';
+
import { capitalizeFirstLetter } from './capitilize-first-letter';
import { isCurrentYear } from './get-date-range-current-type';
import { isMonthsRange as getIsMonthsRange } from './get-date-range-type';
diff --git a/src/components/date-range-filter/services/date-range-localization/utils/get-localized-year-range.ts b/src/components/date-range-filter/services/date-range-localization/utils/get-localized-year-range.ts
index d326fb41c..5150f09bf 100644
--- a/src/components/date-range-filter/services/date-range-localization/utils/get-localized-year-range.ts
+++ b/src/components/date-range-filter/services/date-range-localization/utils/get-localized-year-range.ts
@@ -1,6 +1,7 @@
-import { DateRange } from '@angular/material/datepicker';
import { Moment } from 'moment';
+import { DateRange } from '@angular/material/datepicker';
+
/**
* 2020 год
* С 2019 по 2020 год
diff --git a/src/components/date-range-filter/utils/create-date-range-with-preset-serializer.ts b/src/components/date-range-filter/utils/create-date-range-with-preset-serializer.ts
index 4eec3e2ca..8f51763f1 100644
--- a/src/components/date-range-filter/utils/create-date-range-with-preset-serializer.ts
+++ b/src/components/date-range-filter/utils/create-date-range-with-preset-serializer.ts
@@ -1,7 +1,8 @@
-import { Serializer } from '@vality/matez';
import isNil from 'lodash-es/isNil';
import moment from 'moment';
+import { Serializer } from '@vality/matez';
+
import { DateRangeWithPreset } from '../types/date-range-with-preset';
import { Preset } from '../types/preset';
diff --git a/src/components/empty/empty.directive.ts b/src/components/empty/empty.directive.ts
index e0e7f2676..230ce2eed 100644
--- a/src/components/empty/empty.directive.ts
+++ b/src/components/empty/empty.directive.ts
@@ -10,6 +10,7 @@ import {
} from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { TranslocoService } from '@jsverse/transloco';
+
import { ComponentChanges } from '@vality/matez';
import { TextComponent } from './components/text/text.component';
diff --git a/src/components/filter/filter-superclass.ts b/src/components/filter/filter-superclass.ts
index bda06db09..031c9124b 100644
--- a/src/components/filter/filter-superclass.ts
+++ b/src/components/filter/filter-superclass.ts
@@ -1,10 +1,11 @@
-import { AbstractControl, FormControl } from '@angular/forms';
-import { FormComponentSuperclass } from '@vality/matez';
import isEqual from 'lodash-es/isEqual';
import { BehaviorSubject, Observable, defer } from 'rxjs';
+import { AbstractControl, FormControl } from '@angular/forms';
import { isEmptyValue } from '@dsh/utils';
+import { FormComponentSuperclass } from '@vality/matez';
+
export abstract class FilterSuperclass<
Inner,
Outer = Inner,
diff --git a/src/components/filter/filter.component.ts b/src/components/filter/filter.component.ts
index 37fd17313..9e8b4e109 100644
--- a/src/components/filter/filter.component.ts
+++ b/src/components/filter/filter.component.ts
@@ -1,3 +1,5 @@
+import { map, pluck } from 'rxjs/operators';
+
import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';
import {
ChangeDetectionStrategy,
@@ -11,7 +13,6 @@ import {
} from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { MatDialog } from '@angular/material/dialog';
-import { map, pluck } from 'rxjs/operators';
import { FilterDialogComponent } from './components/filter-dialog/filter-dialog.component';
diff --git a/src/components/filter/filter.module.ts b/src/components/filter/filter.module.ts
index d3f9df564..b91805aa3 100644
--- a/src/components/filter/filter.module.ts
+++ b/src/components/filter/filter.module.ts
@@ -1,14 +1,14 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
import { MatDividerModule } from '@angular/material/divider';
-import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { ActionsModule } from '@dsh/app/shared/components/actions';
import { BaseDialogModule } from '@dsh/app/shared/components/dialog/base-dialog';
import { FilterDialogComponent } from '@dsh/components/filter/components/filter-dialog/filter-dialog.component';
import { DropdownModule } from '@dsh/components/layout';
+import { TranslocoModule } from '@jsverse/transloco';
import { FilterButtonComponent } from './components/filter-button/filter-button.component';
import { FilterContentComponent } from './components/filter-content/filter-content.component';
diff --git a/src/components/filters-group/filters-group.module.ts b/src/components/filters-group/filters-group.module.ts
index 497738e73..06ef8e772 100644
--- a/src/components/filters-group/filters-group.module.ts
+++ b/src/components/filters-group/filters-group.module.ts
@@ -1,6 +1,7 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
-import { FlexLayoutModule } from 'ng-flex-layout';
import { FiltersGroupComponent } from './filters-group.component';
diff --git a/src/components/form-controls/multi-input-field/multi-input-field.component.ts b/src/components/form-controls/multi-input-field/multi-input-field.component.ts
index fb0f02273..940d13697 100644
--- a/src/components/form-controls/multi-input-field/multi-input-field.component.ts
+++ b/src/components/form-controls/multi-input-field/multi-input-field.component.ts
@@ -1,9 +1,11 @@
+import isEqual from 'lodash-es/isEqual';
+import { distinctUntilChanged, map } from 'rxjs/operators';
+
import { ChangeDetectionStrategy, Component, DestroyRef, Input, OnInit } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { FormArray, FormControl } from '@angular/forms';
+
import { FormControlSuperclass, createControlProviders } from '@vality/matez';
-import isEqual from 'lodash-es/isEqual';
-import { distinctUntilChanged, map } from 'rxjs/operators';
@Component({
selector: 'dsh-multi-input-field',
diff --git a/src/components/form-controls/multi-input-field/multi-input-field.module.ts b/src/components/form-controls/multi-input-field/multi-input-field.module.ts
index 657dbe147..5dc508e94 100644
--- a/src/components/form-controls/multi-input-field/multi-input-field.module.ts
+++ b/src/components/form-controls/multi-input-field/multi-input-field.module.ts
@@ -1,10 +1,10 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatInputModule } from '@angular/material/input';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { BootstrapIconModule } from '@dsh/components/indicators';
import { MultiInputFieldComponent } from './multi-input-field.component';
diff --git a/src/components/form-controls/multi-select-field/multi-select-field.component.ts b/src/components/form-controls/multi-select-field/multi-select-field.component.ts
index a3f20d49c..0f5485355 100644
--- a/src/components/form-controls/multi-select-field/multi-select-field.component.ts
+++ b/src/components/form-controls/multi-select-field/multi-select-field.component.ts
@@ -1,3 +1,5 @@
+import isNil from 'lodash-es/isNil';
+
import {
ChangeDetectionStrategy,
Component,
@@ -5,8 +7,8 @@ import {
OnChanges,
booleanAttribute,
} from '@angular/core';
+
import { ComponentChanges, FormControlSuperclass, createControlProviders } from '@vality/matez';
-import isNil from 'lodash-es/isNil';
export interface Option {
value: T;
diff --git a/src/components/form-controls/multi-select-field/multi-select-field.module.ts b/src/components/form-controls/multi-select-field/multi-select-field.module.ts
index b159bd223..50aad2753 100644
--- a/src/components/form-controls/multi-select-field/multi-select-field.module.ts
+++ b/src/components/form-controls/multi-select-field/multi-select-field.module.ts
@@ -1,10 +1,11 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { MatCheckboxModule } from '@angular/material/checkbox';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatInputModule } from '@angular/material/input';
-import { FlexLayoutModule } from 'ng-flex-layout';
import { MultiSelectFieldComponent } from './multi-select-field.component';
diff --git a/src/components/form-controls/radio-group-field/radio-group-field.component.ts b/src/components/form-controls/radio-group-field/radio-group-field.component.ts
index b9bf9d5bf..84caa80b6 100644
--- a/src/components/form-controls/radio-group-field/radio-group-field.component.ts
+++ b/src/components/form-controls/radio-group-field/radio-group-field.component.ts
@@ -1,7 +1,9 @@
+import { Overwrite } from 'utility-types';
+
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
import { MatRadioChange } from '@angular/material/radio';
+
import { FormControlSuperclass, Option, createControlProviders } from '@vality/matez';
-import { Overwrite } from 'utility-types';
@Component({
selector: 'dsh-radio-group-field',
diff --git a/src/components/form-controls/radio-group-field/radio-group-field.module.ts b/src/components/form-controls/radio-group-field/radio-group-field.module.ts
index d0065949a..e292975b3 100644
--- a/src/components/form-controls/radio-group-field/radio-group-field.module.ts
+++ b/src/components/form-controls/radio-group-field/radio-group-field.module.ts
@@ -1,7 +1,8 @@
+import { GridModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatRadioModule } from '@angular/material/radio';
-import { GridModule } from 'ng-flex-layout';
import { RadioGroupFieldComponent } from './radio-group-field.component';
diff --git a/src/components/indicators/last-updated/last-updated.module.ts b/src/components/indicators/last-updated/last-updated.module.ts
index 064385da3..dd4c6fd2c 100644
--- a/src/components/indicators/last-updated/last-updated.module.ts
+++ b/src/components/indicators/last-updated/last-updated.module.ts
@@ -1,7 +1,8 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
import { HumanizeDurationModule } from '../../../app/humanize-duration';
diff --git a/src/components/indicators/spinner/spinner.component.ts b/src/components/indicators/spinner/spinner.component.ts
index 48bf7e4d2..99ba8bd59 100644
--- a/src/components/indicators/spinner/spinner.component.ts
+++ b/src/components/indicators/spinner/spinner.component.ts
@@ -1,5 +1,4 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
-
import { ThemeManager, ThemeName } from '@dsh/app/theme-manager';
@Component({
diff --git a/src/components/indicators/status/status.component.ts b/src/components/indicators/status/status.component.ts
index d9c98d0ca..6812272a4 100644
--- a/src/components/indicators/status/status.component.ts
+++ b/src/components/indicators/status/status.component.ts
@@ -5,7 +5,6 @@ import {
Input,
booleanAttribute,
} from '@angular/core';
-
import { StatusColor } from '@dsh/app/theme-manager';
@Component({
diff --git a/src/components/indicators/text-color/text-color.directive.ts b/src/components/indicators/text-color/text-color.directive.ts
index b3a44b281..059bc8270 100644
--- a/src/components/indicators/text-color/text-color.directive.ts
+++ b/src/components/indicators/text-color/text-color.directive.ts
@@ -1,5 +1,4 @@
import { Directive, HostBinding, Input } from '@angular/core';
-
import { Color } from '@dsh/components/indicators/text-color/types/color';
const PREFIX = 'dsh-text-color';
diff --git a/src/components/layout/accordion/accordion-item/accordion-item.component.ts b/src/components/layout/accordion/accordion-item/accordion-item.component.ts
index 56552c24a..5098ef8bc 100644
--- a/src/components/layout/accordion/accordion-item/accordion-item.component.ts
+++ b/src/components/layout/accordion/accordion-item/accordion-item.component.ts
@@ -7,6 +7,7 @@ import {
OnChanges,
Output,
} from '@angular/core';
+
import { ComponentChanges } from '@vality/matez';
import { AccordionItemContentComponent } from '../accordion-item-content';
diff --git a/src/components/layout/accordion/accordion.component.ts b/src/components/layout/accordion/accordion.component.ts
index 8ac23fe6c..f782b0ebb 100644
--- a/src/components/layout/accordion/accordion.component.ts
+++ b/src/components/layout/accordion/accordion.component.ts
@@ -1,3 +1,14 @@
+import { combineLatest, merge, of } from 'rxjs';
+import {
+ delay,
+ distinctUntilChanged,
+ filter,
+ map,
+ startWith,
+ switchMap,
+ take,
+} from 'rxjs/operators';
+
import {
AfterViewInit,
ChangeDetectionStrategy,
@@ -9,16 +20,6 @@ import {
QueryList,
ViewContainerRef,
} from '@angular/core';
-import { combineLatest, merge, of } from 'rxjs';
-import {
- delay,
- distinctUntilChanged,
- filter,
- map,
- startWith,
- switchMap,
- take,
-} from 'rxjs/operators';
import { smoothChangeTo } from '../../../utils';
diff --git a/src/components/layout/accordion/accordion.module.ts b/src/components/layout/accordion/accordion.module.ts
index ae975441d..160693c07 100644
--- a/src/components/layout/accordion/accordion.module.ts
+++ b/src/components/layout/accordion/accordion.module.ts
@@ -1,9 +1,9 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
import { MatDividerModule } from '@angular/material/divider';
-import { FlexLayoutModule } from 'ng-flex-layout';
-
import { BootstrapIconModule } from '@dsh/components/indicators';
import { AccordionItemComponent, LazyPanelContentDirective } from './accordion-item';
diff --git a/src/components/layout/collapse/collapse.module.ts b/src/components/layout/collapse/collapse.module.ts
index ccf70ffb4..af6256686 100644
--- a/src/components/layout/collapse/collapse.module.ts
+++ b/src/components/layout/collapse/collapse.module.ts
@@ -1,7 +1,7 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
import { FlexLayoutModule } from 'ng-flex-layout';
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
import { BootstrapIconModule } from '@dsh/components/indicators';
import { CollapseComponent } from './collapse.component';
diff --git a/src/components/layout/dropdown/dropdown.component.ts b/src/components/layout/dropdown/dropdown.component.ts
index 309c16c94..f0122e7ea 100644
--- a/src/components/layout/dropdown/dropdown.component.ts
+++ b/src/components/layout/dropdown/dropdown.component.ts
@@ -1,3 +1,6 @@
+import { BehaviorSubject, Subject } from 'rxjs';
+import { filter, takeUntil } from 'rxjs/operators';
+
import {
ChangeDetectionStrategy,
Component,
@@ -11,8 +14,6 @@ import {
ViewChild,
booleanAttribute,
} from '@angular/core';
-import { BehaviorSubject, Subject } from 'rxjs';
-import { filter, takeUntil } from 'rxjs/operators';
import { OPEN_CLOSE_ANIMATION, State } from './open-close-animation';
diff --git a/src/components/layout/limited-list/limited-list.module.ts b/src/components/layout/limited-list/limited-list.module.ts
index a0b67d8c6..b90c01053 100644
--- a/src/components/layout/limited-list/limited-list.module.ts
+++ b/src/components/layout/limited-list/limited-list.module.ts
@@ -1,7 +1,8 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
import { LimitedListItemComponent } from './components/limited-list-item/limited-list-item.component';
import { LimitedListComponent } from './limited-list.component';
diff --git a/src/components/layout/limited-panel/limited-panel.component.ts b/src/components/layout/limited-panel/limited-panel.component.ts
index 0110abd87..625d72a84 100644
--- a/src/components/layout/limited-panel/limited-panel.component.ts
+++ b/src/components/layout/limited-panel/limited-panel.component.ts
@@ -1,6 +1,7 @@
+import { FlexModule } from 'ng-flex-layout';
+
import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
import { TranslocoModule } from '@jsverse/transloco';
-import { FlexModule } from 'ng-flex-layout';
@Component({
selector: 'dsh-limited-panel',
diff --git a/src/components/layout/link-label/link-label.module.ts b/src/components/layout/link-label/link-label.module.ts
index 9895dafe1..25c5ab0a0 100644
--- a/src/components/layout/link-label/link-label.module.ts
+++ b/src/components/layout/link-label/link-label.module.ts
@@ -1,6 +1,6 @@
-import { NgModule } from '@angular/core';
import { FlexLayoutModule } from 'ng-flex-layout';
+import { NgModule } from '@angular/core';
import { BootstrapIconModule } from '@dsh/components/indicators';
import { LinkLabelComponent } from './link-label.component';
diff --git a/src/components/layout/panel/panel.module.ts b/src/components/layout/panel/panel.module.ts
index 55cf65e3d..4d7db4502 100644
--- a/src/components/layout/panel/panel.module.ts
+++ b/src/components/layout/panel/panel.module.ts
@@ -1,6 +1,5 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
-
import { BootstrapIconModule } from '@dsh/components/indicators';
import {
diff --git a/src/components/layout/section-header/section-header.module.ts b/src/components/layout/section-header/section-header.module.ts
index 75982f886..36396f1e7 100644
--- a/src/components/layout/section-header/section-header.module.ts
+++ b/src/components/layout/section-header/section-header.module.ts
@@ -1,6 +1,8 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { NgModule } from '@angular/core';
+
import { ContentLoadingComponent } from '@vality/matez';
-import { FlexLayoutModule } from 'ng-flex-layout';
import { SectionHeaderComponent } from './section-header.component';
diff --git a/src/components/navigation-link/navigation-link.module.ts b/src/components/navigation-link/navigation-link.module.ts
index 3eebbe7f2..9c6503cdf 100644
--- a/src/components/navigation-link/navigation-link.module.ts
+++ b/src/components/navigation-link/navigation-link.module.ts
@@ -1,6 +1,7 @@
-import { NgModule } from '@angular/core';
import { FlexModule } from 'ng-flex-layout';
+import { NgModule } from '@angular/core';
+
import { NavigationLinkComponent } from './navigation-link.component';
@NgModule({
diff --git a/src/components/navigation/navbar-item/navbar-item.component.ts b/src/components/navigation/navbar-item/navbar-item.component.ts
index 709029774..7f9d2d933 100644
--- a/src/components/navigation/navbar-item/navbar-item.component.ts
+++ b/src/components/navigation/navbar-item/navbar-item.component.ts
@@ -1,3 +1,6 @@
+import { Observable } from 'rxjs';
+import { map, pluck } from 'rxjs/operators';
+
import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';
import {
ChangeDetectionStrategy,
@@ -9,11 +12,10 @@ import {
ViewChild,
} from '@angular/core';
import { MatSlideToggle, MatSlideToggleChange } from '@angular/material/slide-toggle';
+import { BootstrapIconSize } from '@dsh/components/indicators/bootstrap-icon';
+
import { ComponentChanges } from '@vality/matez';
-import { Observable } from 'rxjs';
-import { map, pluck } from 'rxjs/operators';
-import { BootstrapIconSize } from '@dsh/components/indicators/bootstrap-icon';
@Component({
selector: 'dsh-navbar-item',
diff --git a/src/components/navigation/navbar-item/navbar-item.module.ts b/src/components/navigation/navbar-item/navbar-item.module.ts
index 5e4a6b470..08431d29a 100644
--- a/src/components/navigation/navbar-item/navbar-item.module.ts
+++ b/src/components/navigation/navbar-item/navbar-item.module.ts
@@ -1,8 +1,9 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatIconModule } from '@angular/material/icon';
import { MatSlideToggleModule } from '@angular/material/slide-toggle';
-import { FlexLayoutModule } from 'ng-flex-layout';
import { BootstrapIconModule } from '../../indicators';
diff --git a/src/components/navigation/scroll-up/scroll-up.component.ts b/src/components/navigation/scroll-up/scroll-up.component.ts
index 74920d66b..712480011 100644
--- a/src/components/navigation/scroll-up/scroll-up.component.ts
+++ b/src/components/navigation/scroll-up/scroll-up.component.ts
@@ -1,6 +1,7 @@
-import { ChangeDetectionStrategy, Component, Input, OnDestroy, OnInit } from '@angular/core';
import { BehaviorSubject } from 'rxjs';
+import { ChangeDetectionStrategy, Component, Input, OnDestroy, OnInit } from '@angular/core';
+
import { smoothChangeTo } from '../../../utils';
import { HIDE_ANIMATION } from './hide-animation';
diff --git a/src/components/navigation/scroll-up/scroll-up.module.ts b/src/components/navigation/scroll-up/scroll-up.module.ts
index 476f3609f..fdedd55b2 100644
--- a/src/components/navigation/scroll-up/scroll-up.module.ts
+++ b/src/components/navigation/scroll-up/scroll-up.module.ts
@@ -1,7 +1,6 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
-
import { BootstrapIconModule } from '@dsh/components/indicators';
import { ScrollUpComponent } from './scroll-up.component';
diff --git a/src/components/navigation/state-nav/state-nav-item/state-nav-item.component.ts b/src/components/navigation/state-nav/state-nav-item/state-nav-item.component.ts
index b65790ce3..2f30521b0 100644
--- a/src/components/navigation/state-nav/state-nav-item/state-nav-item.component.ts
+++ b/src/components/navigation/state-nav/state-nav-item/state-nav-item.component.ts
@@ -1,3 +1,5 @@
+import { Subject } from 'rxjs';
+
import {
ChangeDetectionStrategy,
Component,
@@ -6,7 +8,6 @@ import {
Renderer2,
booleanAttribute,
} from '@angular/core';
-import { Subject } from 'rxjs';
export enum Color {
Success = 'success',
diff --git a/src/components/navigation/state-nav/state-nav.component.ts b/src/components/navigation/state-nav/state-nav.component.ts
index 3fe2185e0..5b1a18634 100644
--- a/src/components/navigation/state-nav/state-nav.component.ts
+++ b/src/components/navigation/state-nav/state-nav.component.ts
@@ -1,3 +1,5 @@
+import { Subscription } from 'rxjs';
+
import {
ChangeDetectionStrategy,
Component,
@@ -10,7 +12,6 @@ import {
ViewEncapsulation,
booleanAttribute,
} from '@angular/core';
-import { Subscription } from 'rxjs';
import { StateNavItemComponent } from './state-nav-item';
diff --git a/src/components/navigation/state-nav/state-nav.module.ts b/src/components/navigation/state-nav/state-nav.module.ts
index 0759a3ea0..0734fd9e1 100644
--- a/src/components/navigation/state-nav/state-nav.module.ts
+++ b/src/components/navigation/state-nav/state-nav.module.ts
@@ -1,7 +1,7 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
import { FlexModule } from 'ng-flex-layout';
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
import { BootstrapIconModule } from '@dsh/components/indicators';
import { StateNavItemComponent } from './state-nav-item';
diff --git a/src/components/nested-table/nested-table.component.ts b/src/components/nested-table/nested-table.component.ts
index 721fcee07..ff66e3485 100644
--- a/src/components/nested-table/nested-table.component.ts
+++ b/src/components/nested-table/nested-table.component.ts
@@ -1,3 +1,6 @@
+import { of } from 'rxjs';
+import { first } from 'rxjs/operators';
+
import { FlatTreeControl } from '@angular/cdk/tree';
import {
ChangeDetectionStrategy,
@@ -9,9 +12,8 @@ import {
} from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree';
+
import { ComponentChanges } from '@vality/matez';
-import { of } from 'rxjs';
-import { first } from 'rxjs/operators';
export interface NestedTableNode {
value: T;
diff --git a/src/components/nested-table/nested-table.module.ts b/src/components/nested-table/nested-table.module.ts
index 9c1c87f7f..34c52a71b 100644
--- a/src/components/nested-table/nested-table.module.ts
+++ b/src/components/nested-table/nested-table.module.ts
@@ -2,9 +2,9 @@ import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
import { MatTableModule } from '@angular/material/table';
+import { BootstrapIconModule } from '@dsh/components/indicators';
import { TranslocoModule } from '@jsverse/transloco';
-import { BootstrapIconModule } from '@dsh/components/indicators';
import { NestedTableComponent } from './nested-table.component';
diff --git a/src/components/popups/confirm-action-dialog/confirm-action-dialog.component.ts b/src/components/popups/confirm-action-dialog/confirm-action-dialog.component.ts
index eef399b3e..7988c1934 100644
--- a/src/components/popups/confirm-action-dialog/confirm-action-dialog.component.ts
+++ b/src/components/popups/confirm-action-dialog/confirm-action-dialog.component.ts
@@ -1,4 +1,5 @@
import { ChangeDetectionStrategy, Component } from '@angular/core';
+
import { DialogSuperclass } from '@vality/matez';
@Component({
diff --git a/src/components/popups/confirm-action-dialog/confirm-action-dialog.module.ts b/src/components/popups/confirm-action-dialog/confirm-action-dialog.module.ts
index 3c7a5c54a..db40cb6f5 100644
--- a/src/components/popups/confirm-action-dialog/confirm-action-dialog.module.ts
+++ b/src/components/popups/confirm-action-dialog/confirm-action-dialog.module.ts
@@ -1,9 +1,10 @@
+import { FlexLayoutModule } from 'ng-flex-layout';
+
import { NgModule } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
+import { BaseDialogModule } from '@dsh/app/shared/components/dialog/base-dialog';
import { TranslocoModule } from '@jsverse/transloco';
-import { FlexLayoutModule } from 'ng-flex-layout';
-import { BaseDialogModule } from '@dsh/app/shared/components/dialog/base-dialog';
import { ConfirmActionDialogComponent } from './confirm-action-dialog.component';
diff --git a/src/pipes/daterange/daterange.pipe.ts b/src/pipes/daterange/daterange.pipe.ts
index 09f47929d..e6286c3d9 100644
--- a/src/pipes/daterange/daterange.pipe.ts
+++ b/src/pipes/daterange/daterange.pipe.ts
@@ -1,7 +1,8 @@
-import { ChangeDetectorRef, Pipe, PipeTransform } from '@angular/core';
import { BehaviorSubject } from 'rxjs';
import { distinctUntilChanged, switchMap } from 'rxjs/operators';
+import { ChangeDetectorRef, Pipe, PipeTransform } from '@angular/core';
+
import { Daterange } from './daterange';
import { DaterangeService } from './daterange.service';
diff --git a/src/pipes/daterange/daterange.service.ts b/src/pipes/daterange/daterange.service.ts
index ddb4e0ea5..d70611c56 100644
--- a/src/pipes/daterange/daterange.service.ts
+++ b/src/pipes/daterange/daterange.service.ts
@@ -1,10 +1,11 @@
-import { formatDate } from '@angular/common';
-import { Inject, Injectable, LOCALE_ID } from '@angular/core';
-import { TranslocoService } from '@jsverse/transloco';
import { Moment } from 'moment';
import { Observable, of } from 'rxjs';
import { map, pluck } from 'rxjs/operators';
+import { formatDate } from '@angular/common';
+import { Inject, Injectable, LOCALE_ID } from '@angular/core';
+import { TranslocoService } from '@jsverse/transloco';
+
import { Daterange, isDaterange } from './daterange';
import { isCurrentWeek, isCurrentYear, isToday } from './daterange-current-type';
import { isMonth, isMonthsRange, isYearsRange } from './daterange-type';
diff --git a/src/utils/form/get-form-value-changes.ts b/src/utils/form/get-form-value-changes.ts
index 7ec2c6204..fda2a7770 100644
--- a/src/utils/form/get-form-value-changes.ts
+++ b/src/utils/form/get-form-value-changes.ts
@@ -1,8 +1,10 @@
-import { AbstractControl } from '@angular/forms';
-import { getValue } from '@vality/matez';
import { Observable } from 'rxjs';
import { map, startWith } from 'rxjs/operators';
+import { AbstractControl } from '@angular/forms';
+
+import { getValue } from '@vality/matez';
+
export function getFormValueChanges(form: AbstractControl): Observable {
return form.valueChanges.pipe(
startWith(form.value),
diff --git a/src/utils/query-list-started-array-changes/query-list-started-array-changes.ts b/src/utils/query-list-started-array-changes/query-list-started-array-changes.ts
index 53774eaa5..1d383a1a3 100644
--- a/src/utils/query-list-started-array-changes/query-list-started-array-changes.ts
+++ b/src/utils/query-list-started-array-changes/query-list-started-array-changes.ts
@@ -1,7 +1,8 @@
-import { QueryList } from '@angular/core';
import { Observable } from 'rxjs';
import { map, startWith } from 'rxjs/operators';
+import { QueryList } from '@angular/core';
+
export function queryListStartedArrayChanges(queryList: QueryList): Observable {
return (queryList.changes as Observable>).pipe(
startWith(queryList),
diff --git a/src/utils/query-params-to-str.ts b/src/utils/query-params-to-str.ts
index 3fcbff8ed..48424feb7 100644
--- a/src/utils/query-params-to-str.ts
+++ b/src/utils/query-params-to-str.ts
@@ -1,7 +1,8 @@
-import { Params } from '@angular/router';
import isEmpty from 'lodash-es/isEmpty';
import isNil from 'lodash-es/isNil';
+import { Params } from '@angular/router';
+
export function queryParamsToStr(params: Params): string {
return Object.entries(params)
.reduce((acc, [key, value]) => {
From 052e91c46da62b89c3fc6a82d32ac714a8c8dd41 Mon Sep 17 00:00:00 2001
From: Ray <11846445+A77AY@users.noreply.github.com>
Date: Mon, 22 Jun 2026 22:28:57 +0400
Subject: [PATCH 12/14] refactor: remove unnecessary blank lines in various
components and modules
- Cleaned up code by removing redundant blank lines in multiple files across the application, enhancing readability and maintainability.
---
src/app/api/payments/invoice-templates.service.ts | 1 -
src/app/api/payments/invoices.service.ts | 1 -
src/app/api/payments/webhooks.service.ts | 1 -
src/app/api/wallet/deposits.service.ts | 1 -
src/app/api/wallet/reports.service.ts | 1 -
src/app/api/wallet/webhooks.service.ts | 1 -
src/app/api/wallet/withdrawals.service.ts | 1 -
.../change-roles-table/change-roles-table.component.ts | 5 ++++-
.../services/role-accesses-dictionary.service.ts | 1 -
.../invitations-expanded-id-manager.service.ts | 1 -
.../edit-roles-dialog/edit-roles-dialog.component.ts | 1 -
.../members-expanded-id-manager.service.ts | 1 -
.../organization-details/organization-details.component.ts | 1 -
.../analytics-search-filters.component.ts | 1 -
.../payment-split-amount/split-amount-to-chart-data.ts | 4 +---
.../payment-split-count/payment-split-count.component.ts | 1 -
src/app/sections/payment-section/balances/balances.module.ts | 1 -
.../api-keys/api-key-details/api-key-details.component.ts | 1 -
.../api-keys/api-key-details/api-key-details.module.ts | 1 -
.../api-key-delete-dialog/api-key-delete-dialog.component.ts | 1 -
.../integrations/api-keys/api-keys.component.ts | 1 -
.../integrations/api-keys/fetch-api-keys.service.ts | 1 -
.../integrations/api-keys/types/api-key-status-color.ts | 1 -
.../payment-section/integrations/integrations.component.ts | 1 -
.../webhooks/create-webhook/create-webhook.module.ts | 1 -
.../webhooks/delete-webhook/delete-webhook.service.ts | 1 -
.../webhook-events/webhook-events.component.ts | 1 -
.../webhooks/webhooks-expanded-id-manager.service.ts | 1 -
.../payment-section/no-shops-alert/no-shops-alert.module.ts | 1 -
.../create-invoice-dialog/create-invoice-dialog.component.ts | 1 -
.../invoices/create-invoice/create-invoice.service.ts | 1 -
.../components/invoice-row/invoice-row.component.ts | 1 -
.../invoice-details/cancel-invoice/cancel-invoice.module.ts | 1 -
.../invoice-details/cancel-invoice/cancel-invoice.service.ts | 1 -
.../invoice-payments/invoice-payments.component.ts | 1 -
.../fulfill-invoice/fulfill-invoice.module.ts | 1 -
.../fulfill-invoice/fulfill-invoice.service.ts | 1 -
.../services/receive-invoice/receive-invoice.service.ts | 1 -
.../additional-filters/additional-filters.module.ts | 1 -
.../invoice-status-filter/invoice-status-filter.component.ts | 1 -
.../invoices-filter/invoices-filter.module.ts | 1 -
.../shops-filter/shops-filter.component.ts | 1 -
.../additional-filters/shops-filter/shops-filter.module.ts | 1 -
.../operations/invoices/invoices.component.ts | 1 -
.../invoices-expanded-id-manager.service.ts | 1 -
.../payment-section/operations/operations.component.ts | 1 -
.../additional-filters/additional-filters.module.ts | 1 -
.../additional-filters/card-filter/card-filter.component.ts | 1 -
.../invoices-filter/invoices-filter.module.ts | 1 -
.../payment-status-filter/payment-status-filter.component.ts | 1 -
.../payment-system-filter/payment-system-filter.component.ts | 1 -
.../payment-system-filter/payment-system-filter.module.ts | 1 -
.../shops-filter/shops-filter.component.ts | 1 -
.../additional-filters/shops-filter/shops-filter.module.ts | 1 -
.../token-provider-filter/token-provider-filter.component.ts | 1 -
.../token-provider-filter/token-provider-filter.module.ts | 1 -
.../card-bin-pan-filter/card-bin-pan-filter.module.ts | 1 -
.../payments-details/hold-details/hold-details.component.ts | 1 -
.../payment-invoice-info/payment-invoice-info.module.ts | 1 -
.../payment-tool/components/bank-card/bank-card.component.ts | 1 -
.../payment-main-info/payment-tool/payment-tool.component.ts | 1 -
.../payment-main-info/payment-tool/payment-tool.module.ts | 1 -
.../payments-details/payments-details.module.ts | 1 -
.../create-refund-dialog/create-refund-dialog.component.ts | 1 -
.../payments-details/refunds/refunds.module.ts | 1 -
.../payments-expanded-id-manager.service.ts | 1 -
.../refunds/refunds-expanded-id-manager.service.ts | 1 -
.../components/refund-row/refund-row.component.ts | 1 -
.../additional-filters/additional-filters.module.ts | 1 -
.../invoices-filter/invoices-filter.module.ts | 1 -
.../refund-status-filter/refund-status-filter.component.ts | 1 -
.../shops-filter/shops-filter.component.ts | 1 -
.../additional-filters/shops-filter/shops-filter.module.ts | 1 -
.../refunds-expanded-id-manager.service.ts | 1 -
.../sections/payment-section/payment-section.component.ts | 1 -
.../reports/cancel-report/cancel-report.module.ts | 1 -
.../reports/cancel-report/cancel-report.service.ts | 1 -
.../reports/create-report/create-report-dialog.component.ts | 1 -
.../report-main-info/report-main-info.component.ts | 1 -
.../reports/report-files/report-files.module.ts | 1 -
.../reports/reports-expanded-id-manager.service.ts | 1 -
.../reports/reports-list/report-row/report-row.component.ts | 1 -
.../reports-search-filters.component.ts | 1 -
.../shops-expanded-id-manager.service.ts | 1 -
.../services/shop-actions/shop-actions.service.ts | 1 -
.../shops/shops-list/shop-details/shop-details.module.ts | 1 -
src/app/sections/payment-section/shops/shops.module.ts | 1 -
.../components/deposit-row/deposit-row.component.ts | 1 -
.../deposit-details/deposit-details.component.ts | 1 -
.../additional-filters/additional-filters.module.ts | 1 -
.../deposit-status-filter/deposit-status-filter.component.ts | 1 -
.../main-info-filters/main-info-filters.module.ts | 1 -
.../sections/wallet-section/deposits/deposits.component.ts | 1 -
.../deposits-expanded-id-manager.service.ts | 1 -
.../webhooks/delete-webhook/delete-webhook.service.ts | 1 -
.../integrations/webhooks/receive-webhooks.service.ts | 1 -
.../webhooks/webhooks-expanded-id-manager.service.ts | 1 -
.../reports/components/files/files.component.ts | 1 -
.../sections/wallet-section/reports/fetch-reports.service.ts | 1 -
.../wallets-expanded-id-manager.service.ts | 1 -
.../wallet-deposit-details.component.ts | 1 -
.../wallet-deposits/wallet-deposits.component.ts | 1 -
.../wallet-withdrawal-details.component.ts | 1 -
.../wallet-withdrawals/wallet-withdrawals.component.ts | 1 -
.../withdrawals-expanded-id-manager.service.ts | 1 -
.../additional-filters/additional-filters.module.ts | 1 -
.../main-info-filters/main-info-filters.module.ts | 1 -
.../withdrawal-status-filter.component.ts | 1 -
.../withdrawal-details/withdrawal-details.component.ts | 1 -
.../components/withdrawal-row/withdrawal-row.component.ts | 1 -
.../components/accordion-table/accordion-table.component.ts | 1 -
.../invoice-details/invoice-details.component.ts | 1 -
.../refund-details/refund-details.component.ts | 1 -
.../create-invoice-form/create-invoice-form.component.ts | 1 -
.../filters/currency-filter/currency-filter.component.ts | 1 -
.../filters/currency-filter/currency-filter.module.ts | 1 -
.../invoice-status-filter/invoice-status-filter.component.ts | 1 -
.../filters/invoices-filter/invoices-filter.component.ts | 1 -
.../refund-status-filter/refund-status-filter.component.ts | 1 -
.../category-autocomplete-field.component.ts | 1 -
.../countries-autocomplete-field.component.ts | 1 -
.../currency-autocomplete-field.component.ts | 1 -
.../inputs/currency-field/currency-field.module.ts | 1 -
.../invoice-status-field/invoice-status-field.module.ts | 1 -
.../inputs/invoices-field/invoices-field.module.ts | 1 -
.../payment-institution-field.component.ts | 1 -
.../inputs/refund-status-field/refund-status-field.module.ts | 1 -
.../report-types-field/report-types-field.component.ts | 1 -
.../inputs/report-types-field/report-types-field.module.ts | 1 -
.../components/inputs/shops-field/shops-field.module.ts | 1 -
.../wallet-autocomplete-field.component.ts | 1 -
.../invoice-randomize-amount-form.component.ts | 1 -
.../organization-roles/organization-roles.component.ts | 1 -
.../shared/components/organization-roles/types/role-group.ts | 1 -
.../components/organization-roles/utils/group-roles.ts | 1 -
.../expandable-radio-group/expandable-radio-group.module.ts | 1 -
src/app/shared/pipes/error-message/error-message.pipe.ts | 1 -
.../services/expanded-id-manager/types/dataset-item-id.ts | 4 +++-
.../date-range-filter/date-range-filter.component.ts | 1 -
src/components/layout/collapse/collapse.component.ts | 5 ++++-
.../navigation/navbar-item/navbar-item.component.ts | 1 -
src/components/nested-table/nested-table.module.ts | 1 -
.../confirm-action-dialog/confirm-action-dialog.module.ts | 1 -
143 files changed, 12 insertions(+), 145 deletions(-)
diff --git a/src/app/api/payments/invoice-templates.service.ts b/src/app/api/payments/invoice-templates.service.ts
index e03b5d410..cd8e7618f 100644
--- a/src/app/api/payments/invoice-templates.service.ts
+++ b/src/app/api/payments/invoice-templates.service.ts
@@ -3,7 +3,6 @@ import { PartyIdPatchMethodService } from '@dsh/app/api/utils/extensions';
import { InvoiceTemplatesService as ApiInvoiceTemplatesService } from '@vality/swag-payments';
-
import { createApi } from '../utils';
@Injectable({
diff --git a/src/app/api/payments/invoices.service.ts b/src/app/api/payments/invoices.service.ts
index b2932a28d..a305c6aef 100644
--- a/src/app/api/payments/invoices.service.ts
+++ b/src/app/api/payments/invoices.service.ts
@@ -3,7 +3,6 @@ import { PartyIdPatchMethodService } from '@dsh/app/api/utils/extensions';
import { InvoicesService as ApiInvoicesService } from '@vality/swag-payments';
-
import { createApi } from '../utils';
@Injectable({
diff --git a/src/app/api/payments/webhooks.service.ts b/src/app/api/payments/webhooks.service.ts
index 07008aa24..756509175 100644
--- a/src/app/api/payments/webhooks.service.ts
+++ b/src/app/api/payments/webhooks.service.ts
@@ -3,7 +3,6 @@ import { PartyIdExtension, PartyIdPatchMethodService } from '@dsh/app/api/utils/
import { WebhooksService as ApiWebhooksService } from '@vality/swag-payments';
-
import { createApi } from '../utils';
@Injectable({
diff --git a/src/app/api/wallet/deposits.service.ts b/src/app/api/wallet/deposits.service.ts
index e08ce55ca..7226a6697 100644
--- a/src/app/api/wallet/deposits.service.ts
+++ b/src/app/api/wallet/deposits.service.ts
@@ -3,7 +3,6 @@ import { PartyIdExtension } from '@dsh/app/api/utils/extensions';
import { DepositsService as ApiDepositsService } from '@vality/swag-wallets';
-
import { createApi } from '../utils';
@Injectable({
diff --git a/src/app/api/wallet/reports.service.ts b/src/app/api/wallet/reports.service.ts
index b4f6ccafd..59f1e2dee 100644
--- a/src/app/api/wallet/reports.service.ts
+++ b/src/app/api/wallet/reports.service.ts
@@ -3,7 +3,6 @@ import { PartyIdExtension } from '@dsh/app/api/utils/extensions';
import { ReportsService as ApiService } from '@vality/swag-wallets';
-
import { createApi } from '../utils';
@Injectable({
diff --git a/src/app/api/wallet/webhooks.service.ts b/src/app/api/wallet/webhooks.service.ts
index 18b260c9d..e075185c1 100644
--- a/src/app/api/wallet/webhooks.service.ts
+++ b/src/app/api/wallet/webhooks.service.ts
@@ -3,7 +3,6 @@ import { PartyIdExtension } from '@dsh/app/api/utils/extensions';
import { WebhooksService as ApiWebhooksService } from '@vality/swag-wallets';
-
import { createApi } from '../utils';
@Injectable({
diff --git a/src/app/api/wallet/withdrawals.service.ts b/src/app/api/wallet/withdrawals.service.ts
index 09ce540c8..da0c266be 100644
--- a/src/app/api/wallet/withdrawals.service.ts
+++ b/src/app/api/wallet/withdrawals.service.ts
@@ -3,7 +3,6 @@ import { PartyIdExtension } from '@dsh/app/api/utils/extensions';
import { WithdrawalsService as ApiWithdrawalsService } from '@vality/swag-wallets';
-
import { createApi } from '../utils';
@Injectable({
diff --git a/src/app/sections/organization-section/organization-details/change-roles-table/change-roles-table.component.ts b/src/app/sections/organization-section/organization-details/change-roles-table/change-roles-table.component.ts
index 455a819e9..70fcd5f82 100644
--- a/src/app/sections/organization-section/organization-details/change-roles-table/change-roles-table.component.ts
+++ b/src/app/sections/organization-section/organization-details/change-roles-table/change-roles-table.component.ts
@@ -45,7 +45,10 @@ import { equalRoles } from '../members/components/edit-roles-dialog/utils/equal-
import { SelectRoleDialogComponent } from './components/select-role-dialog/select-role-dialog.component';
-interface DataItem { shop?: Pick; scope?: ResourceScopeIdInternal }
+interface DataItem {
+ shop?: Pick;
+ scope?: ResourceScopeIdInternal;
+}
@Component({
selector: 'dsh-change-roles-table',
diff --git a/src/app/sections/organization-section/organization-details/change-roles-table/components/select-role-dialog/services/role-accesses-dictionary.service.ts b/src/app/sections/organization-section/organization-details/change-roles-table/components/select-role-dialog/services/role-accesses-dictionary.service.ts
index c523750cb..1a1045777 100644
--- a/src/app/sections/organization-section/organization-details/change-roles-table/components/select-role-dialog/services/role-accesses-dictionary.service.ts
+++ b/src/app/sections/organization-section/organization-details/change-roles-table/components/select-role-dialog/services/role-accesses-dictionary.service.ts
@@ -4,7 +4,6 @@ import { Injectable } from '@angular/core';
import { RoleAccessName } from '@dsh/app/auth';
import { TranslocoService } from '@jsverse/transloco';
-
@Injectable({
providedIn: 'root',
})
diff --git a/src/app/sections/organization-section/organization-details/invitations/services/invitations-expanded-id-manager/invitations-expanded-id-manager.service.ts b/src/app/sections/organization-section/organization-details/invitations/services/invitations-expanded-id-manager/invitations-expanded-id-manager.service.ts
index e8e7c8323..9acbf4a19 100644
--- a/src/app/sections/organization-section/organization-details/invitations/services/invitations-expanded-id-manager/invitations-expanded-id-manager.service.ts
+++ b/src/app/sections/organization-section/organization-details/invitations/services/invitations-expanded-id-manager/invitations-expanded-id-manager.service.ts
@@ -6,7 +6,6 @@ import { ExpandedIdManager } from '@dsh/app/shared/services';
import { Invitation } from '@vality/swag-organizations';
-
import { FetchInvitationsService } from '../fetch-invitations/fetch-invitations.service';
@Injectable()
diff --git a/src/app/sections/organization-section/organization-details/members/components/edit-roles-dialog/edit-roles-dialog.component.ts b/src/app/sections/organization-section/organization-details/members/components/edit-roles-dialog/edit-roles-dialog.component.ts
index f48ee8362..a272da1dd 100644
--- a/src/app/sections/organization-section/organization-details/members/components/edit-roles-dialog/edit-roles-dialog.component.ts
+++ b/src/app/sections/organization-section/organization-details/members/components/edit-roles-dialog/edit-roles-dialog.component.ts
@@ -9,7 +9,6 @@ import { ErrorService } from '@dsh/app/shared';
import { DEFAULT_DIALOG_CONFIG, DialogSuperclass, progressTo } from '@vality/matez';
import { MemberRole } from '@vality/swag-organizations';
-
import { EditRolesDialogData } from './types/edit-roles-dialog-data';
@Component({
diff --git a/src/app/sections/organization-section/organization-details/members/services/members-expanded-id-manager/members-expanded-id-manager.service.ts b/src/app/sections/organization-section/organization-details/members/services/members-expanded-id-manager/members-expanded-id-manager.service.ts
index 1a1cb0b06..ac4c07162 100644
--- a/src/app/sections/organization-section/organization-details/members/services/members-expanded-id-manager/members-expanded-id-manager.service.ts
+++ b/src/app/sections/organization-section/organization-details/members/services/members-expanded-id-manager/members-expanded-id-manager.service.ts
@@ -6,7 +6,6 @@ import { ExpandedIdManager } from '@dsh/app/shared/services';
import { Member } from '@vality/swag-organizations';
-
import { FetchMembersService } from '../fetch-members/fetch-members.service';
@Injectable()
diff --git a/src/app/sections/organization-section/organization-details/organization-details.component.ts b/src/app/sections/organization-section/organization-details/organization-details.component.ts
index 94c56b726..300146feb 100644
--- a/src/app/sections/organization-section/organization-details/organization-details.component.ts
+++ b/src/app/sections/organization-section/organization-details/organization-details.component.ts
@@ -6,7 +6,6 @@ import { ActivatedRoute } from '@angular/router';
import { OrgsService } from '@dsh/app/api/organizations';
import { TranslocoService } from '@jsverse/transloco';
-
@Component({
selector: 'dsh-organization-details',
templateUrl: 'organization-details.component.html',
diff --git a/src/app/sections/payment-section/analytics/analytics-search-filters/analytics-search-filters.component.ts b/src/app/sections/payment-section/analytics/analytics-search-filters/analytics-search-filters.component.ts
index de69856e7..05b588c5b 100644
--- a/src/app/sections/payment-section/analytics/analytics-search-filters/analytics-search-filters.component.ts
+++ b/src/app/sections/payment-section/analytics/analytics-search-filters/analytics-search-filters.component.ts
@@ -23,7 +23,6 @@ import { getFormValueChanges } from '@dsh/utils';
import { ComponentChanges } from '@vality/matez';
import { Shop } from '@vality/swag-payments';
-
import { RealmShopsService } from '../../services';
import { shopsToCurrencies } from './shops-to-currencies';
diff --git a/src/app/sections/payment-section/analytics/payment-split-amount/split-amount-to-chart-data.ts b/src/app/sections/payment-section/analytics/payment-split-amount/split-amount-to-chart-data.ts
index 45bf6a770..deaa526a7 100644
--- a/src/app/sections/payment-section/analytics/payment-split-amount/split-amount-to-chart-data.ts
+++ b/src/app/sections/payment-section/analytics/payment-split-amount/split-amount-to-chart-data.ts
@@ -24,9 +24,7 @@ const offsetAmountsToSeries = (
},
];
-export const splitAmountToChartData = (
- paymentsSplitAmount: SplitAmountResult[],
-): ChartData[] =>
+export const splitAmountToChartData = (paymentsSplitAmount: SplitAmountResult[]): ChartData[] =>
paymentsSplitAmount.map(({ currency, offsetAmounts, splitUnit }) => ({
currency,
series: offsetAmountsToSeries(offsetAmounts, currency, splitUnit),
diff --git a/src/app/sections/payment-section/analytics/payment-split-count/payment-split-count.component.ts b/src/app/sections/payment-section/analytics/payment-split-count/payment-split-count.component.ts
index 5e4472837..6c123bb55 100644
--- a/src/app/sections/payment-section/analytics/payment-split-count/payment-split-count.component.ts
+++ b/src/app/sections/payment-section/analytics/payment-split-count/payment-split-count.component.ts
@@ -3,7 +3,6 @@ import { SpinnerType } from '@dsh/components/indicators';
import { ComponentChanges } from '@vality/matez';
-
import { CHARTS_THEME, ChartsThemeProvider } from '../charts-theme';
import { SearchParams } from '../search-params';
diff --git a/src/app/sections/payment-section/balances/balances.module.ts b/src/app/sections/payment-section/balances/balances.module.ts
index d62f28caf..6b340faa7 100644
--- a/src/app/sections/payment-section/balances/balances.module.ts
+++ b/src/app/sections/payment-section/balances/balances.module.ts
@@ -5,7 +5,6 @@ import { NgModule } from '@angular/core';
import { AmountCurrencyModule } from '@dsh/app/shared/pipes';
import { TranslocoModule } from '@jsverse/transloco';
-
import { BalancesComponent } from './balances.component';
@NgModule({
diff --git a/src/app/sections/payment-section/integrations/api-keys/api-key-details/api-key-details.component.ts b/src/app/sections/payment-section/integrations/api-keys/api-key-details/api-key-details.component.ts
index d5c176edf..bbdb41958 100644
--- a/src/app/sections/payment-section/integrations/api-keys/api-key-details/api-key-details.component.ts
+++ b/src/app/sections/payment-section/integrations/api-keys/api-key-details/api-key-details.component.ts
@@ -4,7 +4,6 @@ import { ApiKeysDictionaryService } from '@dsh/app/api/api-keys';
import { DialogService } from '@vality/matez';
import { ApiKey } from '@vality/swag-api-keys-v2';
-
import { API_KEY_STATUS_COLOR } from '../types/api-key-status-color';
import { ApiKeyDeleteDialogComponent } from './components/api-key-delete-dialog/api-key-delete-dialog.component';
diff --git a/src/app/sections/payment-section/integrations/api-keys/api-key-details/api-key-details.module.ts b/src/app/sections/payment-section/integrations/api-keys/api-key-details/api-key-details.module.ts
index e932f716d..0d56cea5b 100644
--- a/src/app/sections/payment-section/integrations/api-keys/api-key-details/api-key-details.module.ts
+++ b/src/app/sections/payment-section/integrations/api-keys/api-key-details/api-key-details.module.ts
@@ -11,7 +11,6 @@ import { TranslocoModule } from '@jsverse/transloco';
import { DialogModule } from '@vality/matez';
-
import { ApiKeyDetailsComponent } from './api-key-details.component';
import { ApiKeyDeleteDialogComponent } from './components/api-key-delete-dialog/api-key-delete-dialog.component';
diff --git a/src/app/sections/payment-section/integrations/api-keys/api-key-details/components/api-key-delete-dialog/api-key-delete-dialog.component.ts b/src/app/sections/payment-section/integrations/api-keys/api-key-details/components/api-key-delete-dialog/api-key-delete-dialog.component.ts
index abc7baacd..c7ad58c74 100644
--- a/src/app/sections/payment-section/integrations/api-keys/api-key-details/components/api-key-delete-dialog/api-key-delete-dialog.component.ts
+++ b/src/app/sections/payment-section/integrations/api-keys/api-key-details/components/api-key-delete-dialog/api-key-delete-dialog.component.ts
@@ -13,7 +13,6 @@ import { TranslocoModule, TranslocoService } from '@jsverse/transloco';
import { DialogSuperclass, NotifyLogService, progressTo } from '@vality/matez';
import { RequestRevokeApiKeyRequestParams } from '@vality/swag-api-keys-v2';
-
@Component({
selector: 'dsh-api-key-delete-dialog',
templateUrl: './api-key-delete-dialog.component.html',
diff --git a/src/app/sections/payment-section/integrations/api-keys/api-keys.component.ts b/src/app/sections/payment-section/integrations/api-keys/api-keys.component.ts
index 5d25b0379..5cdb383d4 100644
--- a/src/app/sections/payment-section/integrations/api-keys/api-keys.component.ts
+++ b/src/app/sections/payment-section/integrations/api-keys/api-keys.component.ts
@@ -15,7 +15,6 @@ import { TranslocoService } from '@jsverse/transloco';
import { DialogService, QueryParamsService } from '@vality/matez';
import { ApiKey, ApiKeyStatus } from '@vality/swag-api-keys-v2';
-
import { ApiKeyCreateDialogComponent } from './components/api-key-create-dialog/api-key-create-dialog.component';
import { FetchApiKeysService } from './fetch-api-keys.service';
import { API_KEY_STATUS_COLOR } from './types/api-key-status-color';
diff --git a/src/app/sections/payment-section/integrations/api-keys/fetch-api-keys.service.ts b/src/app/sections/payment-section/integrations/api-keys/fetch-api-keys.service.ts
index cba5c437d..63b13f686 100644
--- a/src/app/sections/payment-section/integrations/api-keys/fetch-api-keys.service.ts
+++ b/src/app/sections/payment-section/integrations/api-keys/fetch-api-keys.service.ts
@@ -8,7 +8,6 @@ import { TranslocoService } from '@jsverse/transloco';
import { FetchOptions, FetchResult, FetchSuperclass, NotifyLogService } from '@vality/matez';
import { ApiKey, ListApiKeysRequestParams } from '@vality/swag-api-keys-v2';
-
@Injectable()
export class FetchApiKeysService extends FetchSuperclass<
ApiKey,
diff --git a/src/app/sections/payment-section/integrations/api-keys/types/api-key-status-color.ts b/src/app/sections/payment-section/integrations/api-keys/types/api-key-status-color.ts
index 5c638d879..6c53edb6b 100644
--- a/src/app/sections/payment-section/integrations/api-keys/types/api-key-status-color.ts
+++ b/src/app/sections/payment-section/integrations/api-keys/types/api-key-status-color.ts
@@ -2,7 +2,6 @@ import { StatusColor } from '@dsh/app/theme-manager';
import { ApiKeyStatus } from '@vality/swag-api-keys-v2';
-
export const API_KEY_STATUS_COLOR = {
[ApiKeyStatus.Active]: StatusColor.Success,
[ApiKeyStatus.Revoked]: StatusColor.Warn,
diff --git a/src/app/sections/payment-section/integrations/integrations.component.ts b/src/app/sections/payment-section/integrations/integrations.component.ts
index 48f9ab5dd..1b25f74d3 100644
--- a/src/app/sections/payment-section/integrations/integrations.component.ts
+++ b/src/app/sections/payment-section/integrations/integrations.component.ts
@@ -2,7 +2,6 @@ import { ChangeDetectionStrategy, Component } from '@angular/core';
import { RoleAccessName } from '@dsh/app/auth';
import { TranslocoService } from '@jsverse/transloco';
-
@Component({
templateUrl: 'integrations.component.html',
changeDetection: ChangeDetectionStrategy.Eager,
diff --git a/src/app/sections/payment-section/integrations/webhooks/create-webhook/create-webhook.module.ts b/src/app/sections/payment-section/integrations/webhooks/create-webhook/create-webhook.module.ts
index 3a1b28d56..35aa60b6a 100644
--- a/src/app/sections/payment-section/integrations/webhooks/create-webhook/create-webhook.module.ts
+++ b/src/app/sections/payment-section/integrations/webhooks/create-webhook/create-webhook.module.ts
@@ -13,7 +13,6 @@ import { MatSelectModule } from '@angular/material/select';
import { BaseDialogModule } from '@dsh/app/shared/components/dialog/base-dialog';
import { TranslocoModule } from '@jsverse/transloco';
-
import { CreateWebhookDialogComponent } from './create-webhook-dialog.component';
import { CreateWebhookFormComponent } from './create-webhook-form';
import { CreateWebhookService } from './create-webhook.service';
diff --git a/src/app/sections/payment-section/integrations/webhooks/delete-webhook/delete-webhook.service.ts b/src/app/sections/payment-section/integrations/webhooks/delete-webhook/delete-webhook.service.ts
index 843303e93..e5d14d25b 100644
--- a/src/app/sections/payment-section/integrations/webhooks/delete-webhook/delete-webhook.service.ts
+++ b/src/app/sections/payment-section/integrations/webhooks/delete-webhook/delete-webhook.service.ts
@@ -9,7 +9,6 @@ import { TranslocoService } from '@jsverse/transloco';
import { DialogResponseStatus, NotifyLogService } from '@vality/matez';
-
@Injectable()
export class DeleteWebhookService {
private destroy$ = new Subject();
diff --git a/src/app/sections/payment-section/integrations/webhooks/webhook-details/webhook-events/webhook-events.component.ts b/src/app/sections/payment-section/integrations/webhooks/webhook-details/webhook-events/webhook-events.component.ts
index c9ca12da2..240470434 100644
--- a/src/app/sections/payment-section/integrations/webhooks/webhook-details/webhook-events/webhook-events.component.ts
+++ b/src/app/sections/payment-section/integrations/webhooks/webhook-details/webhook-events/webhook-events.component.ts
@@ -5,7 +5,6 @@ import { PaymentsDictionaryService } from '@dsh/app/api/payments';
import { InvoicesTopic, WebhookScope } from '@vality/swag-payments';
-
@Component({
selector: 'dsh-webhook-events',
templateUrl: 'webhook-events.component.html',
diff --git a/src/app/sections/payment-section/integrations/webhooks/webhooks-expanded-id-manager.service.ts b/src/app/sections/payment-section/integrations/webhooks/webhooks-expanded-id-manager.service.ts
index 65863d2e0..6cbf84836 100644
--- a/src/app/sections/payment-section/integrations/webhooks/webhooks-expanded-id-manager.service.ts
+++ b/src/app/sections/payment-section/integrations/webhooks/webhooks-expanded-id-manager.service.ts
@@ -6,7 +6,6 @@ import { ExpandedIdManager } from '@dsh/app/shared/services';
import { Webhook } from '@vality/swag-payments';
-
import { ReceiveWebhooksService } from './receive-webhooks.service';
@Injectable()
diff --git a/src/app/sections/payment-section/no-shops-alert/no-shops-alert.module.ts b/src/app/sections/payment-section/no-shops-alert/no-shops-alert.module.ts
index 9aaed2fb7..76848b5f1 100644
--- a/src/app/sections/payment-section/no-shops-alert/no-shops-alert.module.ts
+++ b/src/app/sections/payment-section/no-shops-alert/no-shops-alert.module.ts
@@ -2,7 +2,6 @@ import { NgModule } from '@angular/core';
import { AlertModule } from '@dsh/components/layout';
import { TranslocoModule } from '@jsverse/transloco';
-
import { NoShopsComponent } from './no-shops-alert.component';
@NgModule({
diff --git a/src/app/sections/payment-section/operations/invoices/create-invoice/components/create-invoice-dialog/create-invoice-dialog.component.ts b/src/app/sections/payment-section/operations/invoices/create-invoice/components/create-invoice-dialog/create-invoice-dialog.component.ts
index 787444d90..9180459e4 100644
--- a/src/app/sections/payment-section/operations/invoices/create-invoice/components/create-invoice-dialog/create-invoice-dialog.component.ts
+++ b/src/app/sections/payment-section/operations/invoices/create-invoice/components/create-invoice-dialog/create-invoice-dialog.component.ts
@@ -6,7 +6,6 @@ import { InvoicesService } from '@dsh/app/api/payments';
import { Shop } from '@vality/swag-payments';
-
import { CreateInvoiceDialogResponse } from '../../types/create-invoice-dialog-response';
@Component({
diff --git a/src/app/sections/payment-section/operations/invoices/create-invoice/create-invoice.service.ts b/src/app/sections/payment-section/operations/invoices/create-invoice/create-invoice.service.ts
index 98cffc8df..0c35a4cb9 100644
--- a/src/app/sections/payment-section/operations/invoices/create-invoice/create-invoice.service.ts
+++ b/src/app/sections/payment-section/operations/invoices/create-invoice/create-invoice.service.ts
@@ -9,7 +9,6 @@ import { TranslocoService } from '@jsverse/transloco';
import { NotifyLogService } from '@vality/matez';
import { PaymentInstitution, Shop } from '@vality/swag-payments';
-
import { filterShopsByRealm } from '../../operators';
import { CreateInvoiceDialogComponent } from './components/create-invoice-dialog/create-invoice-dialog.component';
diff --git a/src/app/sections/payment-section/operations/invoices/invoices-list/components/invoice-row/invoice-row.component.ts b/src/app/sections/payment-section/operations/invoices/invoices-list/components/invoice-row/invoice-row.component.ts
index 6caf45e0f..2486a6700 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices-list/components/invoice-row/invoice-row.component.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices-list/components/invoice-row/invoice-row.component.ts
@@ -3,7 +3,6 @@ import { AnapiDictionaryService } from '@dsh/app/api/anapi';
import { Invoice } from '@vality/swag-anapi-v2';
-
@Component({
selector: 'dsh-invoice-row',
templateUrl: 'invoice-row.component.html',
diff --git a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/cancel-invoice/cancel-invoice.module.ts b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/cancel-invoice/cancel-invoice.module.ts
index c6794019e..bf47776e0 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/cancel-invoice/cancel-invoice.module.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/cancel-invoice/cancel-invoice.module.ts
@@ -9,7 +9,6 @@ import { MatInputModule } from '@angular/material/input';
import { BaseDialogModule } from '@dsh/app/shared/components/dialog/base-dialog';
import { TranslocoModule } from '@jsverse/transloco';
-
import { CancelInvoiceDialogComponent } from './components/cancel-invoice-dialog/cancel-invoice-dialog.component';
@NgModule({
diff --git a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/cancel-invoice/cancel-invoice.service.ts b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/cancel-invoice/cancel-invoice.service.ts
index edbb5facc..9e584ca3d 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/cancel-invoice/cancel-invoice.service.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/cancel-invoice/cancel-invoice.service.ts
@@ -8,7 +8,6 @@ import { TranslocoService } from '@jsverse/transloco';
import { NotifyLogService } from '@vality/matez';
-
import { CancelInvoiceDialogComponent } from './components/cancel-invoice-dialog/cancel-invoice-dialog.component';
@Injectable()
diff --git a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/components/invoice-payments/invoice-payments.component.ts b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/components/invoice-payments/invoice-payments.component.ts
index cedf0ba5b..dcdd15a03 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/components/invoice-payments/invoice-payments.component.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/components/invoice-payments/invoice-payments.component.ts
@@ -3,7 +3,6 @@ import { FakePaginatorService } from '@dsh/app/shared/services';
import { Payment } from '@vality/swag-payments';
-
@Component({
selector: 'dsh-invoice-payments',
templateUrl: 'invoice-payments.component.html',
diff --git a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/fulfill-invoice/fulfill-invoice.module.ts b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/fulfill-invoice/fulfill-invoice.module.ts
index 0190f678b..30310f97b 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/fulfill-invoice/fulfill-invoice.module.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/fulfill-invoice/fulfill-invoice.module.ts
@@ -9,7 +9,6 @@ import { MatInputModule } from '@angular/material/input';
import { BaseDialogModule } from '@dsh/app/shared/components/dialog/base-dialog';
import { TranslocoModule } from '@jsverse/transloco';
-
import { FulfillInvoiceDialogComponent } from './components/cancel-invoice-dialog/fulfill-invoice-dialog.component';
@NgModule({
diff --git a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/fulfill-invoice/fulfill-invoice.service.ts b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/fulfill-invoice/fulfill-invoice.service.ts
index 99ad3d0fb..5095c62a3 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/fulfill-invoice/fulfill-invoice.service.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/fulfill-invoice/fulfill-invoice.service.ts
@@ -8,7 +8,6 @@ import { TranslocoService } from '@jsverse/transloco';
import { NotifyLogService } from '@vality/matez';
-
import { FulfillInvoiceDialogComponent } from './components/cancel-invoice-dialog/fulfill-invoice-dialog.component';
@Injectable()
diff --git a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/services/receive-invoice/receive-invoice.service.ts b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/services/receive-invoice/receive-invoice.service.ts
index fc6bd6f45..23b5e4077 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/services/receive-invoice/receive-invoice.service.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/services/receive-invoice/receive-invoice.service.ts
@@ -7,7 +7,6 @@ import { InvoicesService } from '@dsh/app/api/payments';
import { Invoice } from '@vality/swag-payments';
-
@Injectable()
export class ReceiveInvoiceService {
isLoading$: Observable;
diff --git a/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/additional-filters.module.ts b/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/additional-filters.module.ts
index 7c7a18a17..bb01bc32d 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/additional-filters.module.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/additional-filters.module.ts
@@ -9,7 +9,6 @@ import { MatIconModule } from '@angular/material/icon';
import { BaseDialogModule } from '@dsh/app/shared/components/dialog/base-dialog';
import { TranslocoModule } from '@jsverse/transloco';
-
import { DialogFiltersComponent } from './components';
import { InvoiceStatusFilterModule } from './invoice-status-filter';
import { InvoicesFilterModule } from './invoices-filter';
diff --git a/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/invoice-status-filter/invoice-status-filter.component.ts b/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/invoice-status-filter/invoice-status-filter.component.ts
index 212344b45..86d71924c 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/invoice-status-filter/invoice-status-filter.component.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/invoice-status-filter/invoice-status-filter.component.ts
@@ -4,7 +4,6 @@ import { AnapiDictionaryService } from '@dsh/app/api/anapi';
import { FormControlSuperclass, createControlProviders } from '@vality/matez';
import { InvoiceStatus } from '@vality/swag-anapi-v2';
-
@Component({
selector: 'dsh-invoice-status-filter',
templateUrl: './invoice-status-filter.component.html',
diff --git a/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/invoices-filter/invoices-filter.module.ts b/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/invoices-filter/invoices-filter.module.ts
index 3d934a8f3..15918480c 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/invoices-filter/invoices-filter.module.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/invoices-filter/invoices-filter.module.ts
@@ -6,7 +6,6 @@ import { ReactiveFormsModule } from '@angular/forms';
import { InvoicesFieldModule } from '@dsh/app/shared/components/inputs/invoices-field';
import { TranslocoModule } from '@jsverse/transloco';
-
import { InvoicesFilterComponent } from './invoices-filter.component';
@NgModule({
diff --git a/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/shops-filter/shops-filter.component.ts b/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/shops-filter/shops-filter.component.ts
index 5b9cae38b..4b7df2c76 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/shops-filter/shops-filter.component.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/shops-filter/shops-filter.component.ts
@@ -4,7 +4,6 @@ import { ShopsDataService } from '@dsh/app/shared';
import { FormControlSuperclass, createControlProviders } from '@vality/matez';
-
@Component({
selector: 'dsh-shops-filter',
templateUrl: './shops-filter.component.html',
diff --git a/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/shops-filter/shops-filter.module.ts b/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/shops-filter/shops-filter.module.ts
index 1cf2a4372..5e4b7641d 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/shops-filter/shops-filter.module.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/shops-filter/shops-filter.module.ts
@@ -7,7 +7,6 @@ import { MatFormFieldModule } from '@angular/material/form-field';
import { ShopsFieldModule } from '@dsh/app/shared/components/inputs/shops-field';
import { TranslocoModule } from '@jsverse/transloco';
-
import { ShopsFilterComponent } from './shops-filter.component';
@NgModule({
diff --git a/src/app/sections/payment-section/operations/invoices/invoices.component.ts b/src/app/sections/payment-section/operations/invoices/invoices.component.ts
index 9335f3bcd..961e7f4a1 100644
--- a/src/app/sections/payment-section/operations/invoices/invoices.component.ts
+++ b/src/app/sections/payment-section/operations/invoices/invoices.component.ts
@@ -8,7 +8,6 @@ import { TranslocoService } from '@jsverse/transloco';
import { NotifyLogService, QueryParamsService } from '@vality/matez';
-
import { PaymentInstitutionRealmService, RealmMixService } from '../../services';
import { filterShopsByRealm } from '../operators';
diff --git a/src/app/sections/payment-section/operations/invoices/services/invoices-expanded-id-manager/invoices-expanded-id-manager.service.ts b/src/app/sections/payment-section/operations/invoices/services/invoices-expanded-id-manager/invoices-expanded-id-manager.service.ts
index 06960746c..c50fa3c81 100644
--- a/src/app/sections/payment-section/operations/invoices/services/invoices-expanded-id-manager/invoices-expanded-id-manager.service.ts
+++ b/src/app/sections/payment-section/operations/invoices/services/invoices-expanded-id-manager/invoices-expanded-id-manager.service.ts
@@ -6,7 +6,6 @@ import { ExpandedIdManager } from '@dsh/app/shared/services';
import { Invoice } from '@vality/swag-anapi-v2';
-
import { FetchInvoicesService } from '../fetch-invoices/fetch-invoices.service';
@Injectable()
diff --git a/src/app/sections/payment-section/operations/operations.component.ts b/src/app/sections/payment-section/operations/operations.component.ts
index aeb52d03e..86d2e8ec0 100644
--- a/src/app/sections/payment-section/operations/operations.component.ts
+++ b/src/app/sections/payment-section/operations/operations.component.ts
@@ -2,7 +2,6 @@ import { ChangeDetectionStrategy, Component } from '@angular/core';
import { RoleAccessName } from '@dsh/app/auth';
import { TranslocoService } from '@jsverse/transloco';
-
@Component({
templateUrl: 'operations.component.html',
changeDetection: ChangeDetectionStrategy.Eager,
diff --git a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/additional-filters.module.ts b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/additional-filters.module.ts
index 3a0defcd4..2ddbff8f5 100644
--- a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/additional-filters.module.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/additional-filters.module.ts
@@ -9,7 +9,6 @@ import { MatIconModule } from '@angular/material/icon';
import { BaseDialogModule } from '@dsh/app/shared/components/dialog/base-dialog';
import { TranslocoModule } from '@jsverse/transloco';
-
import { CardFilterModule } from './card-filter';
import { DialogFiltersComponent } from './components/dialog-filters/dialog-filters.component';
import { InvoicesFilterModule } from './invoices-filter';
diff --git a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/card-filter/card-filter.component.ts b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/card-filter/card-filter.component.ts
index 4812fb410..e4bf07e2d 100644
--- a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/card-filter/card-filter.component.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/card-filter/card-filter.component.ts
@@ -4,7 +4,6 @@ import { binValidator, panValidator } from '@dsh/components/form-controls';
import { FormGroupSuperclass, createControlProviders } from '@vality/matez';
-
import { CardFilterForm } from './types';
@Component({
diff --git a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/invoices-filter/invoices-filter.module.ts b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/invoices-filter/invoices-filter.module.ts
index 3d934a8f3..15918480c 100644
--- a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/invoices-filter/invoices-filter.module.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/invoices-filter/invoices-filter.module.ts
@@ -6,7 +6,6 @@ import { ReactiveFormsModule } from '@angular/forms';
import { InvoicesFieldModule } from '@dsh/app/shared/components/inputs/invoices-field';
import { TranslocoModule } from '@jsverse/transloco';
-
import { InvoicesFilterComponent } from './invoices-filter.component';
@NgModule({
diff --git a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-status-filter/payment-status-filter.component.ts b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-status-filter/payment-status-filter.component.ts
index 2f5d80aba..13b04aab8 100644
--- a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-status-filter/payment-status-filter.component.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-status-filter/payment-status-filter.component.ts
@@ -4,7 +4,6 @@ import { AnapiDictionaryService } from '@dsh/app/api/anapi';
import { FormControlSuperclass, createControlProviders } from '@vality/matez';
import { PaymentStatus } from '@vality/swag-anapi-v2';
-
@Component({
selector: 'dsh-payment-status-filter',
templateUrl: './payment-status-filter.component.html',
diff --git a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-system-filter/payment-system-filter.component.ts b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-system-filter/payment-system-filter.component.ts
index 0595b4c43..002d710e5 100644
--- a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-system-filter/payment-system-filter.component.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-system-filter/payment-system-filter.component.ts
@@ -5,7 +5,6 @@ import { PaymentSystem } from '@dsh/app/api/payments';
import { FormControlSuperclass, createControlProviders } from '@vality/matez';
import { SearchPaymentsRequestParams } from '@vality/swag-anapi-v2';
-
@Component({
selector: 'dsh-payment-system-filter',
templateUrl: './payment-system-filter.component.html',
diff --git a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-system-filter/payment-system-filter.module.ts b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-system-filter/payment-system-filter.module.ts
index d85937566..a6569e9f2 100644
--- a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-system-filter/payment-system-filter.module.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-system-filter/payment-system-filter.module.ts
@@ -5,7 +5,6 @@ import { NgModule } from '@angular/core';
import { ExpandableRadioGroupModule } from '@dsh/app/shared/components/radio-buttons/expandable-radio-group';
import { TranslocoModule } from '@jsverse/transloco';
-
import { PaymentSystemFilterComponent } from './payment-system-filter.component';
@NgModule({
diff --git a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/shops-filter/shops-filter.component.ts b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/shops-filter/shops-filter.component.ts
index ff48cfd9b..04388f8d4 100644
--- a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/shops-filter/shops-filter.component.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/shops-filter/shops-filter.component.ts
@@ -4,7 +4,6 @@ import { ShopsDataService } from '@dsh/app/shared';
import { FormGroupSuperclass, createControlProviders } from '@vality/matez';
-
import { ShopsFilterForm } from './types';
@Component({
diff --git a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/shops-filter/shops-filter.module.ts b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/shops-filter/shops-filter.module.ts
index 1cf2a4372..5e4b7641d 100644
--- a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/shops-filter/shops-filter.module.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/shops-filter/shops-filter.module.ts
@@ -7,7 +7,6 @@ import { MatFormFieldModule } from '@angular/material/form-field';
import { ShopsFieldModule } from '@dsh/app/shared/components/inputs/shops-field';
import { TranslocoModule } from '@jsverse/transloco';
-
import { ShopsFilterComponent } from './shops-filter.component';
@NgModule({
diff --git a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/token-provider-filter/token-provider-filter.component.ts b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/token-provider-filter/token-provider-filter.component.ts
index 0dd839605..caea4c7aa 100644
--- a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/token-provider-filter/token-provider-filter.component.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/token-provider-filter/token-provider-filter.component.ts
@@ -5,7 +5,6 @@ import { TokenProvider } from '@dsh/app/api/payments';
import { FormControlSuperclass, createControlProviders } from '@vality/matez';
import { SearchPaymentsRequestParams } from '@vality/swag-anapi-v2';
-
@Component({
selector: 'dsh-token-provider-filter',
templateUrl: './token-provider-filter.component.html',
diff --git a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/token-provider-filter/token-provider-filter.module.ts b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/token-provider-filter/token-provider-filter.module.ts
index d7edd04b3..e61deafec 100644
--- a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/token-provider-filter/token-provider-filter.module.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/token-provider-filter/token-provider-filter.module.ts
@@ -5,7 +5,6 @@ import { NgModule } from '@angular/core';
import { ExpandableRadioGroupModule } from '@dsh/app/shared/components/radio-buttons/expandable-radio-group';
import { TranslocoModule } from '@jsverse/transloco';
-
import { TokenProviderFilterComponent } from './token-provider-filter.component';
@NgModule({
diff --git a/src/app/sections/payment-section/operations/payments/payments-filters/card-bin-pan-filter/card-bin-pan-filter.module.ts b/src/app/sections/payment-section/operations/payments/payments-filters/card-bin-pan-filter/card-bin-pan-filter.module.ts
index 43f33f5b5..eb709a223 100644
--- a/src/app/sections/payment-section/operations/payments/payments-filters/card-bin-pan-filter/card-bin-pan-filter.module.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-filters/card-bin-pan-filter/card-bin-pan-filter.module.ts
@@ -8,7 +8,6 @@ import { MatInputModule } from '@angular/material/input';
import { FilterModule } from '@dsh/components/filter';
import { TranslocoModule } from '@jsverse/transloco';
-
import { CardBinPanFilterComponent } from './card-bin-pan-filter.component';
import { CardBinPanLabelPipe } from './pipes/card-bin-pan-label.pipe';
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/hold-details.component.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/hold-details.component.ts
index 428aa1ff1..94d147c62 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/hold-details.component.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/hold-details.component.ts
@@ -13,7 +13,6 @@ import { BaseDialogResponseStatus } from '@dsh/app/shared/components/dialog/base
import { PaymentFlowHold, PaymentSearchResult } from '@vality/swag-anapi-v2';
-
import { PaymentIds } from '../../../types/payment-ids';
import { CancelHoldService } from './cancel-hold';
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-invoice-info/payment-invoice-info.module.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-invoice-info/payment-invoice-info.module.ts
index a404bbe1e..efb38d978 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-invoice-info/payment-invoice-info.module.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-invoice-info/payment-invoice-info.module.ts
@@ -7,7 +7,6 @@ import { RouterModule } from '@angular/router';
import { InvoiceDetailsModule } from '@dsh/app/shared/components';
import { TranslocoModule } from '@jsverse/transloco';
-
import { PaymentInvoiceInfoComponent } from './payment-invoice-info.component';
@NgModule({
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/components/bank-card/bank-card.component.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/components/bank-card/bank-card.component.ts
index d2638b6e0..701acfd40 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/components/bank-card/bank-card.component.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/components/bank-card/bank-card.component.ts
@@ -3,7 +3,6 @@ import { PaymentSystem, TokenProvider } from '@dsh/app/api/payments';
import { BankCardDetails } from '@vality/swag-payments';
-
interface BankCardIconConfig {
iconName: string;
width: string;
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/payment-tool.component.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/payment-tool.component.ts
index 729bca236..95257eb3a 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/payment-tool.component.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/payment-tool.component.ts
@@ -3,7 +3,6 @@ import { PaymentToolDetailsType } from '@dsh/app/api/payments';
import { PaymentToolDetails } from '@vality/swag-payments';
-
@Component({
selector: 'dsh-payment-tool',
templateUrl: 'payment-tool.component.html',
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/payment-tool.module.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/payment-tool.module.ts
index 7c78b5c62..5194ef55d 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/payment-tool.module.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/payment-tool.module.ts
@@ -6,7 +6,6 @@ import { MatIconModule } from '@angular/material/icon';
import { DetailsItemModule } from '@dsh/components/layout';
import { TranslocoModule } from '@jsverse/transloco';
-
import { BankCardComponent } from './components/bank-card/bank-card.component';
import { DigitalWalletComponent } from './components/digital-wallet/digital-wallet.component';
import { MobileCommerceComponent } from './components/mobile-commerce/mobile-commerce.component';
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payments-details.module.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payments-details.module.ts
index 2fee43e62..1452774f8 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payments-details.module.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payments-details.module.ts
@@ -6,7 +6,6 @@ import { MatDividerModule } from '@angular/material/divider';
import { ErrorModule } from '@dsh/app/shared/services';
import { TranslocoModule } from '@jsverse/transloco';
-
import { HoldDetailsModule } from './hold-details';
import { PaymentDetailsComponent } from './payment-details.component';
import { PaymentInvoiceInfoModule } from './payment-invoice-info';
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/create-refund/components/create-refund-dialog/create-refund-dialog.component.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/create-refund/components/create-refund-dialog/create-refund-dialog.component.ts
index e93dfd32a..45634f5b6 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/create-refund/components/create-refund-dialog/create-refund-dialog.component.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/create-refund/components/create-refund-dialog/create-refund-dialog.component.ts
@@ -13,7 +13,6 @@ import { TranslocoService } from '@jsverse/transloco';
import { FormGroupByValue, NotifyLogService, toMajor, toMinor } from '@vality/matez';
import { Refund, RefundParams } from '@vality/swag-payments';
-
import { RefundsService } from '../../services/refunds/refunds.service';
import { Balance } from '../../types/balance';
import { CreateRefundDialogData } from '../../types/create-refund-dialog-data';
diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/refunds.module.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/refunds.module.ts
index c11ef2bfc..d4ea26f83 100644
--- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/refunds.module.ts
+++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/refunds.module.ts
@@ -6,7 +6,6 @@ import { MatButtonModule } from '@angular/material/button';
import { AuthModule } from '@dsh/app/auth';
import { TranslocoModule } from '@jsverse/transloco';
-
import { CreateRefundModule } from './create-refund';
import { RefundsListModule } from './refunds-list';
import { RefundsComponent } from './refunds.component';
diff --git a/src/app/sections/payment-section/operations/payments/services/payments-expanded-id-manager/payments-expanded-id-manager.service.ts b/src/app/sections/payment-section/operations/payments/services/payments-expanded-id-manager/payments-expanded-id-manager.service.ts
index e014ffca4..4304c8195 100644
--- a/src/app/sections/payment-section/operations/payments/services/payments-expanded-id-manager/payments-expanded-id-manager.service.ts
+++ b/src/app/sections/payment-section/operations/payments/services/payments-expanded-id-manager/payments-expanded-id-manager.service.ts
@@ -6,7 +6,6 @@ import { ExpandedIdManager, Fragment } from '@dsh/app/shared/services';
import { PaymentSearchResult } from '@vality/swag-anapi-v2';
-
import { getPaymentId } from '../../utils/get-payment-id';
import { FetchPaymentsService } from '../fetch-payments/fetch-payments.service';
diff --git a/src/app/sections/payment-section/operations/refunds/refunds-expanded-id-manager.service.ts b/src/app/sections/payment-section/operations/refunds/refunds-expanded-id-manager.service.ts
index 438d5cb29..aac8619c5 100644
--- a/src/app/sections/payment-section/operations/refunds/refunds-expanded-id-manager.service.ts
+++ b/src/app/sections/payment-section/operations/refunds/refunds-expanded-id-manager.service.ts
@@ -6,7 +6,6 @@ import { ExpandedIdManager, Fragment } from '@dsh/app/shared/services';
import { Refund } from '@vality/swag-payments';
-
import { FetchRefundsService } from './services/fetch-refunds/fetch-refunds.service';
@Injectable()
diff --git a/src/app/sections/payment-section/operations/refunds/refunds-list/components/refund-row/refund-row.component.ts b/src/app/sections/payment-section/operations/refunds/refunds-list/components/refund-row/refund-row.component.ts
index aca5b8982..9bedce998 100644
--- a/src/app/sections/payment-section/operations/refunds/refunds-list/components/refund-row/refund-row.component.ts
+++ b/src/app/sections/payment-section/operations/refunds/refunds-list/components/refund-row/refund-row.component.ts
@@ -3,7 +3,6 @@ import { AnapiDictionaryService } from '@dsh/app/api/anapi';
import { RefundSearchResult } from '@vality/swag-anapi-v2';
-
@Component({
selector: 'dsh-refund-row',
templateUrl: 'refund-row.component.html',
diff --git a/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/additional-filters.module.ts b/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/additional-filters.module.ts
index 940e3fb8d..419c8807f 100644
--- a/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/additional-filters.module.ts
+++ b/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/additional-filters.module.ts
@@ -9,7 +9,6 @@ import { MatIconModule } from '@angular/material/icon';
import { BaseDialogModule } from '@dsh/app/shared/components/dialog/base-dialog';
import { TranslocoModule } from '@jsverse/transloco';
-
import { DialogFiltersComponent } from './components';
import { InvoicesFilterModule } from './invoices-filter';
import { RefundStatusFilterModule } from './refund-status-filter';
diff --git a/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/invoices-filter/invoices-filter.module.ts b/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/invoices-filter/invoices-filter.module.ts
index 3d934a8f3..15918480c 100644
--- a/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/invoices-filter/invoices-filter.module.ts
+++ b/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/invoices-filter/invoices-filter.module.ts
@@ -6,7 +6,6 @@ import { ReactiveFormsModule } from '@angular/forms';
import { InvoicesFieldModule } from '@dsh/app/shared/components/inputs/invoices-field';
import { TranslocoModule } from '@jsverse/transloco';
-
import { InvoicesFilterComponent } from './invoices-filter.component';
@NgModule({
diff --git a/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/refund-status-filter/refund-status-filter.component.ts b/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/refund-status-filter/refund-status-filter.component.ts
index 2f904c864..a0ae6394e 100644
--- a/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/refund-status-filter/refund-status-filter.component.ts
+++ b/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/refund-status-filter/refund-status-filter.component.ts
@@ -4,7 +4,6 @@ import { AnapiDictionaryService } from '@dsh/app/api/anapi';
import { FormControlSuperclass, createControlProviders } from '@vality/matez';
import { RefundStatus } from '@vality/swag-anapi-v2';
-
@Component({
selector: 'dsh-refund-status-filter',
templateUrl: './refund-status-filter.component.html',
diff --git a/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/shops-filter/shops-filter.component.ts b/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/shops-filter/shops-filter.component.ts
index 5b9cae38b..4b7df2c76 100644
--- a/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/shops-filter/shops-filter.component.ts
+++ b/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/shops-filter/shops-filter.component.ts
@@ -4,7 +4,6 @@ import { ShopsDataService } from '@dsh/app/shared';
import { FormControlSuperclass, createControlProviders } from '@vality/matez';
-
@Component({
selector: 'dsh-shops-filter',
templateUrl: './shops-filter.component.html',
diff --git a/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/shops-filter/shops-filter.module.ts b/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/shops-filter/shops-filter.module.ts
index 1cf2a4372..5e4b7641d 100644
--- a/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/shops-filter/shops-filter.module.ts
+++ b/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/shops-filter/shops-filter.module.ts
@@ -7,7 +7,6 @@ import { MatFormFieldModule } from '@angular/material/form-field';
import { ShopsFieldModule } from '@dsh/app/shared/components/inputs/shops-field';
import { TranslocoModule } from '@jsverse/transloco';
-
import { ShopsFilterComponent } from './shops-filter.component';
@NgModule({
diff --git a/src/app/sections/payment-section/operations/refunds/services/refunds-expanded-id-manager/refunds-expanded-id-manager.service.ts b/src/app/sections/payment-section/operations/refunds/services/refunds-expanded-id-manager/refunds-expanded-id-manager.service.ts
index c8cd89f6c..26207fa3c 100644
--- a/src/app/sections/payment-section/operations/refunds/services/refunds-expanded-id-manager/refunds-expanded-id-manager.service.ts
+++ b/src/app/sections/payment-section/operations/refunds/services/refunds-expanded-id-manager/refunds-expanded-id-manager.service.ts
@@ -6,7 +6,6 @@ import { ExpandedIdManager, Fragment } from '@dsh/app/shared/services';
import { RefundSearchResult } from '@vality/swag-anapi-v2';
-
import { FetchRefundsService } from '../fetch-refunds/fetch-refunds.service';
@Injectable()
diff --git a/src/app/sections/payment-section/payment-section.component.ts b/src/app/sections/payment-section/payment-section.component.ts
index b9c006cd3..7971df3ba 100644
--- a/src/app/sections/payment-section/payment-section.component.ts
+++ b/src/app/sections/payment-section/payment-section.component.ts
@@ -9,7 +9,6 @@ import { TranslocoService } from '@jsverse/transloco';
import { PaymentInstitution } from '@vality/swag-payments';
-
import { PaymentInstitutionRealmService, RealmShopsService } from './services';
import { NavbarItemConfig, toNavbarItemConfig } from './utils';
diff --git a/src/app/sections/payment-section/reports/cancel-report/cancel-report.module.ts b/src/app/sections/payment-section/reports/cancel-report/cancel-report.module.ts
index d2b3eced2..932f4c4cb 100644
--- a/src/app/sections/payment-section/reports/cancel-report/cancel-report.module.ts
+++ b/src/app/sections/payment-section/reports/cancel-report/cancel-report.module.ts
@@ -4,7 +4,6 @@ import { MatSnackBarModule } from '@angular/material/snack-bar';
import { ConfirmActionDialogModule } from '@dsh/components/popups';
import { TranslocoModule } from '@jsverse/transloco';
-
import { CancelReportService } from './cancel-report.service';
@NgModule({
diff --git a/src/app/sections/payment-section/reports/cancel-report/cancel-report.service.ts b/src/app/sections/payment-section/reports/cancel-report/cancel-report.service.ts
index 7759cd1ab..cec75d19b 100644
--- a/src/app/sections/payment-section/reports/cancel-report/cancel-report.service.ts
+++ b/src/app/sections/payment-section/reports/cancel-report/cancel-report.service.ts
@@ -10,7 +10,6 @@ import { TranslocoService } from '@jsverse/transloco';
import { DialogResponseStatus } from '@vality/matez';
-
@Injectable()
export class CancelReportService {
private destroy$ = new Subject();
diff --git a/src/app/sections/payment-section/reports/create-report/create-report-dialog.component.ts b/src/app/sections/payment-section/reports/create-report/create-report-dialog.component.ts
index 5143e29bd..27fb93e49 100644
--- a/src/app/sections/payment-section/reports/create-report/create-report-dialog.component.ts
+++ b/src/app/sections/payment-section/reports/create-report/create-report-dialog.component.ts
@@ -10,7 +10,6 @@ import { MatSnackBar } from '@angular/material/snack-bar';
import { ShopsDataService } from '@dsh/app/shared';
import { TranslocoService } from '@jsverse/transloco';
-
import { filterShopsByRealm, mapToShopInfo } from '../../operations/operators';
import { CreateReportDialogService } from './create-report-dialog.service';
diff --git a/src/app/sections/payment-section/reports/report-details/report-main-info/report-main-info.component.ts b/src/app/sections/payment-section/reports/report-details/report-main-info/report-main-info.component.ts
index 8eb5b649b..efd3bd7cd 100644
--- a/src/app/sections/payment-section/reports/report-details/report-main-info/report-main-info.component.ts
+++ b/src/app/sections/payment-section/reports/report-details/report-main-info/report-main-info.component.ts
@@ -3,7 +3,6 @@ import { AnapiDictionaryService } from '@dsh/app/api/anapi';
import { Report } from '@vality/swag-anapi-v2';
-
@Component({
selector: 'dsh-report-main-info',
templateUrl: 'report-main-info.component.html',
diff --git a/src/app/sections/payment-section/reports/report-files/report-files.module.ts b/src/app/sections/payment-section/reports/report-files/report-files.module.ts
index b8049930c..b27f8d9d1 100644
--- a/src/app/sections/payment-section/reports/report-files/report-files.module.ts
+++ b/src/app/sections/payment-section/reports/report-files/report-files.module.ts
@@ -7,7 +7,6 @@ import { MatSnackBarModule } from '@angular/material/snack-bar';
import { BootstrapIconModule } from '@dsh/components/indicators';
import { TranslocoModule } from '@jsverse/transloco';
-
import { ReportFileComponent } from './report-file';
import { ReportFilesComponent } from './report-files.component';
diff --git a/src/app/sections/payment-section/reports/reports-expanded-id-manager.service.ts b/src/app/sections/payment-section/reports/reports-expanded-id-manager.service.ts
index 58b09c192..2be28c1e6 100644
--- a/src/app/sections/payment-section/reports/reports-expanded-id-manager.service.ts
+++ b/src/app/sections/payment-section/reports/reports-expanded-id-manager.service.ts
@@ -6,7 +6,6 @@ import { ExpandedIdManager } from '@dsh/app/shared/services';
import { Report } from '@vality/swag-anapi-v2';
-
import { FetchReportsService } from './fetch-reports.service';
@Injectable()
diff --git a/src/app/sections/payment-section/reports/reports-list/report-row/report-row.component.ts b/src/app/sections/payment-section/reports/reports-list/report-row/report-row.component.ts
index 70575849e..26cd2a8c9 100644
--- a/src/app/sections/payment-section/reports/reports-list/report-row/report-row.component.ts
+++ b/src/app/sections/payment-section/reports/reports-list/report-row/report-row.component.ts
@@ -3,7 +3,6 @@ import { AnapiDictionaryService } from '@dsh/app/api/anapi';
import { Report } from '@vality/swag-anapi-v2';
-
@Component({
selector: 'dsh-report-row',
templateUrl: 'report-row.component.html',
diff --git a/src/app/sections/payment-section/reports/reports-search-filters/reports-search-filters.component.ts b/src/app/sections/payment-section/reports/reports-search-filters/reports-search-filters.component.ts
index 67f2db106..a377cbcb1 100644
--- a/src/app/sections/payment-section/reports/reports-search-filters/reports-search-filters.component.ts
+++ b/src/app/sections/payment-section/reports/reports-search-filters/reports-search-filters.component.ts
@@ -20,7 +20,6 @@ import { getFormValueChanges } from '@dsh/utils';
import { ComponentChanges } from '@vality/matez';
import { Report } from '@vality/swag-anapi-v2';
-
export interface Filters {
reportTypes: Report.ReportTypeEnum[];
dateRange: DateRangeWithPreset;
diff --git a/src/app/sections/payment-section/shops/shops-list/services/shops-expanded-id-manager/shops-expanded-id-manager.service.ts b/src/app/sections/payment-section/shops/shops-list/services/shops-expanded-id-manager/shops-expanded-id-manager.service.ts
index af8cbf4a5..bf72f0630 100644
--- a/src/app/sections/payment-section/shops/shops-list/services/shops-expanded-id-manager/shops-expanded-id-manager.service.ts
+++ b/src/app/sections/payment-section/shops/shops-list/services/shops-expanded-id-manager/shops-expanded-id-manager.service.ts
@@ -6,7 +6,6 @@ import { ExpandedIdManager } from '@dsh/app/shared/services';
import { Shop } from '@vality/swag-payments';
-
import { FetchShopsService } from '../../../services/fetch-shops/fetch-shops.service';
@Injectable()
diff --git a/src/app/sections/payment-section/shops/shops-list/shop-details/services/shop-actions/shop-actions.service.ts b/src/app/sections/payment-section/shops/shops-list/shop-details/services/shop-actions/shop-actions.service.ts
index 67168a382..5950d0c2a 100644
--- a/src/app/sections/payment-section/shops/shops-list/shop-details/services/shop-actions/shop-actions.service.ts
+++ b/src/app/sections/payment-section/shops/shops-list/shop-details/services/shop-actions/shop-actions.service.ts
@@ -9,7 +9,6 @@ import { TranslocoService } from '@jsverse/transloco';
import { DialogResponseStatus, NotifyLogService } from '@vality/matez';
-
import { ShopActionResult } from '../../types/shop-action-result';
@Injectable()
diff --git a/src/app/sections/payment-section/shops/shops-list/shop-details/shop-details.module.ts b/src/app/sections/payment-section/shops/shops-list/shop-details/shop-details.module.ts
index c1ffcec20..0b4cd6ac4 100644
--- a/src/app/sections/payment-section/shops/shops-list/shop-details/shop-details.module.ts
+++ b/src/app/sections/payment-section/shops/shops-list/shop-details/shop-details.module.ts
@@ -10,7 +10,6 @@ import { MatSnackBarModule } from '@angular/material/snack-bar';
import { DetailsItemModule } from '@dsh/components/layout';
import { TranslocoModule } from '@jsverse/transloco';
-
import { ShopBalanceModule } from '../shop-balance';
import { ShopIdComponent } from './components/shop-id/shop-id.component';
diff --git a/src/app/sections/payment-section/shops/shops.module.ts b/src/app/sections/payment-section/shops/shops.module.ts
index 40798e5ea..072bb6066 100644
--- a/src/app/sections/payment-section/shops/shops.module.ts
+++ b/src/app/sections/payment-section/shops/shops.module.ts
@@ -7,7 +7,6 @@ import { RouterModule } from '@angular/router';
import { AuthModule } from '@dsh/app/auth';
import { TranslocoModule } from '@jsverse/transloco';
-
import { FetchShopsService } from './services/fetch-shops/fetch-shops.service';
import { ShopsBalanceService } from './services/shops-balance/shops-balance.service';
import { ShopsFiltersService } from './services/shops-filters/shops-filters.service';
diff --git a/src/app/sections/wallet-section/deposits/deposit-panels/components/deposit-row/deposit-row.component.ts b/src/app/sections/wallet-section/deposits/deposit-panels/components/deposit-row/deposit-row.component.ts
index 819949e57..95192809d 100644
--- a/src/app/sections/wallet-section/deposits/deposit-panels/components/deposit-row/deposit-row.component.ts
+++ b/src/app/sections/wallet-section/deposits/deposit-panels/components/deposit-row/deposit-row.component.ts
@@ -3,7 +3,6 @@ import { WalletDictionaryService } from '@dsh/app/api/wallet';
import { Deposit } from '@vality/swag-wallets';
-
@Component({
selector: 'dsh-deposit-row',
templateUrl: 'deposit-row.component.html',
diff --git a/src/app/sections/wallet-section/deposits/deposit-panels/deposit-details/deposit-details.component.ts b/src/app/sections/wallet-section/deposits/deposit-panels/deposit-details/deposit-details.component.ts
index 793471bb8..bc7f1ed98 100644
--- a/src/app/sections/wallet-section/deposits/deposit-panels/deposit-details/deposit-details.component.ts
+++ b/src/app/sections/wallet-section/deposits/deposit-panels/deposit-details/deposit-details.component.ts
@@ -3,7 +3,6 @@ import { WalletDictionaryService } from '@dsh/app/api/wallet';
import { Deposit } from '@vality/swag-wallets';
-
@Component({
selector: 'dsh-deposit-details',
templateUrl: 'deposit-details.component.html',
diff --git a/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/additional-filters.module.ts b/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/additional-filters.module.ts
index aa59d3777..c5c5e57dd 100644
--- a/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/additional-filters.module.ts
+++ b/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/additional-filters.module.ts
@@ -7,7 +7,6 @@ import { MatDividerModule } from '@angular/material/divider';
import { DialogModule } from '@dsh/app/shared/components/dialog';
import { TranslocoModule } from '@jsverse/transloco';
-
import { DialogFiltersComponent } from './components/dialog-filters/dialog-filters.component';
import { DepositStatusFilterModule } from './deposit-status-filter';
import { DepositSumFilterModule } from './deposit-sum-filter';
diff --git a/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/deposit-status-filter/deposit-status-filter.component.ts b/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/deposit-status-filter/deposit-status-filter.component.ts
index 007f94f4a..086fb3e6a 100644
--- a/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/deposit-status-filter/deposit-status-filter.component.ts
+++ b/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/deposit-status-filter/deposit-status-filter.component.ts
@@ -4,7 +4,6 @@ import { WalletDictionaryService } from '@dsh/app/api/wallet';
import { DepositStatus } from '@vality/swag-wallets';
-
import { DEPOSIT_STATUSES_LIST } from './consts';
import { DepositStatusFilterValue } from './types/deposit-status-filter-value';
diff --git a/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/main-info-filters/main-info-filters.module.ts b/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/main-info-filters/main-info-filters.module.ts
index 23085de8a..135d9fe57 100644
--- a/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/main-info-filters/main-info-filters.module.ts
+++ b/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/main-info-filters/main-info-filters.module.ts
@@ -8,7 +8,6 @@ import { MatInputModule } from '@angular/material/input';
import { WalletAutocompleteFieldModule } from '@dsh/app/shared/components/inputs/wallet-autocomplete-field';
import { TranslocoModule } from '@jsverse/transloco';
-
import { MainInfoFiltersComponent } from './main-info-filters.component';
@NgModule({
diff --git a/src/app/sections/wallet-section/deposits/deposits.component.ts b/src/app/sections/wallet-section/deposits/deposits.component.ts
index 132100232..a279ca3c1 100644
--- a/src/app/sections/wallet-section/deposits/deposits.component.ts
+++ b/src/app/sections/wallet-section/deposits/deposits.component.ts
@@ -4,7 +4,6 @@ import { ErrorService } from '@dsh/app/shared';
import { QueryParamsService } from '@vality/matez';
-
import { DepositsFilters } from './deposits-filters/types/deposits-filters';
import { DepositsExpandedIdManagerService } from './services/deposits-expanded-id-manager/deposits-expanded-id-manager.service';
import { FetchDepositsService } from './services/fetch-deposits/fetch-deposits.service';
diff --git a/src/app/sections/wallet-section/deposits/services/deposits-expanded-id-manager/deposits-expanded-id-manager.service.ts b/src/app/sections/wallet-section/deposits/services/deposits-expanded-id-manager/deposits-expanded-id-manager.service.ts
index 21d815137..2afcfe0cf 100644
--- a/src/app/sections/wallet-section/deposits/services/deposits-expanded-id-manager/deposits-expanded-id-manager.service.ts
+++ b/src/app/sections/wallet-section/deposits/services/deposits-expanded-id-manager/deposits-expanded-id-manager.service.ts
@@ -6,7 +6,6 @@ import { ExpandedIdManager, Fragment } from '@dsh/app/shared/services';
import { Deposit } from '@vality/swag-wallets';
-
import { FetchDepositsService } from '../fetch-deposits/fetch-deposits.service';
@Injectable()
diff --git a/src/app/sections/wallet-section/integrations/webhooks/delete-webhook/delete-webhook.service.ts b/src/app/sections/wallet-section/integrations/webhooks/delete-webhook/delete-webhook.service.ts
index 98609e06b..ef871ae23 100644
--- a/src/app/sections/wallet-section/integrations/webhooks/delete-webhook/delete-webhook.service.ts
+++ b/src/app/sections/wallet-section/integrations/webhooks/delete-webhook/delete-webhook.service.ts
@@ -9,7 +9,6 @@ import { TranslocoService } from '@jsverse/transloco';
import { DialogResponseStatus, NotifyLogService } from '@vality/matez';
-
import { DeleteWebhookParams } from '../webhook-details/webhook-actions';
@Injectable()
diff --git a/src/app/sections/wallet-section/integrations/webhooks/receive-webhooks.service.ts b/src/app/sections/wallet-section/integrations/webhooks/receive-webhooks.service.ts
index b31ffad84..dc1ca5c92 100644
--- a/src/app/sections/wallet-section/integrations/webhooks/receive-webhooks.service.ts
+++ b/src/app/sections/wallet-section/integrations/webhooks/receive-webhooks.service.ts
@@ -9,7 +9,6 @@ import { TranslocoService } from '@jsverse/transloco';
import { NotifyLogService } from '@vality/matez';
import { Webhook } from '@vality/swag-wallets';
-
import { mapToTimestamp, progress } from '../../../../custom-operators';
@Injectable()
diff --git a/src/app/sections/wallet-section/integrations/webhooks/webhooks-expanded-id-manager.service.ts b/src/app/sections/wallet-section/integrations/webhooks/webhooks-expanded-id-manager.service.ts
index 8750698f4..3ee549c11 100644
--- a/src/app/sections/wallet-section/integrations/webhooks/webhooks-expanded-id-manager.service.ts
+++ b/src/app/sections/wallet-section/integrations/webhooks/webhooks-expanded-id-manager.service.ts
@@ -6,7 +6,6 @@ import { ExpandedIdManager } from '@dsh/app/shared/services';
import { Webhook } from '@vality/swag-wallets';
-
import { ReceiveWebhooksService } from './receive-webhooks.service';
@Injectable()
diff --git a/src/app/sections/wallet-section/reports/components/files/files.component.ts b/src/app/sections/wallet-section/reports/components/files/files.component.ts
index cdeee3098..ae123f4f8 100644
--- a/src/app/sections/wallet-section/reports/components/files/files.component.ts
+++ b/src/app/sections/wallet-section/reports/components/files/files.component.ts
@@ -10,7 +10,6 @@ import { TranslocoService } from '@jsverse/transloco';
import { NotifyLogService, progressTo } from '@vality/matez';
import { ReportFilesInner } from '@vality/swag-wallets';
-
@Component({
selector: 'dsh-files',
templateUrl: './files.component.html',
diff --git a/src/app/sections/wallet-section/reports/fetch-reports.service.ts b/src/app/sections/wallet-section/reports/fetch-reports.service.ts
index 78c3ca27b..7e48fb0ef 100644
--- a/src/app/sections/wallet-section/reports/fetch-reports.service.ts
+++ b/src/app/sections/wallet-section/reports/fetch-reports.service.ts
@@ -7,7 +7,6 @@ import { ReportsService } from '@dsh/app/api/wallet';
import { FetchResult, FetchSuperclass, NotifyLogService } from '@vality/matez';
import { GetReportsRequestParams, Report } from '@vality/swag-wallets';
-
@Injectable()
export class FetchReportsService extends FetchSuperclass<
Report,
diff --git a/src/app/sections/wallet-section/wallets/services/wallets-expanded-id-manager/wallets-expanded-id-manager.service.ts b/src/app/sections/wallet-section/wallets/services/wallets-expanded-id-manager/wallets-expanded-id-manager.service.ts
index 0016d3b60..a3ab22703 100644
--- a/src/app/sections/wallet-section/wallets/services/wallets-expanded-id-manager/wallets-expanded-id-manager.service.ts
+++ b/src/app/sections/wallet-section/wallets/services/wallets-expanded-id-manager/wallets-expanded-id-manager.service.ts
@@ -6,7 +6,6 @@ import { ExpandedIdManager } from '@dsh/app/shared/services';
import { Wallet } from '@vality/swag-wallets';
-
import { FetchWalletsService } from '../fetch-wallets';
@Injectable()
diff --git a/src/app/sections/wallet-section/wallets/wallets-list/wallet-deposits/components/wallet-deposit-details/wallet-deposit-details.component.ts b/src/app/sections/wallet-section/wallets/wallets-list/wallet-deposits/components/wallet-deposit-details/wallet-deposit-details.component.ts
index 2d74472ef..813cad4e3 100644
--- a/src/app/sections/wallet-section/wallets/wallets-list/wallet-deposits/components/wallet-deposit-details/wallet-deposit-details.component.ts
+++ b/src/app/sections/wallet-section/wallets/wallets-list/wallet-deposits/components/wallet-deposit-details/wallet-deposit-details.component.ts
@@ -3,7 +3,6 @@ import { WalletDictionaryService } from '@dsh/app/api/wallet';
import { Deposit } from '@vality/swag-wallets';
-
@Component({
selector: 'dsh-wallet-deposit-details',
templateUrl: 'wallet-deposit-details.component.html',
diff --git a/src/app/sections/wallet-section/wallets/wallets-list/wallet-deposits/wallet-deposits.component.ts b/src/app/sections/wallet-section/wallets/wallets-list/wallet-deposits/wallet-deposits.component.ts
index a329dff30..444513d4a 100644
--- a/src/app/sections/wallet-section/wallets/wallets-list/wallet-deposits/wallet-deposits.component.ts
+++ b/src/app/sections/wallet-section/wallets/wallets-list/wallet-deposits/wallet-deposits.component.ts
@@ -3,7 +3,6 @@ import { SEARCH_LIMIT } from '@dsh/app/sections/tokens';
import { ComponentChanges } from '@vality/matez';
-
import { FetchWalletDepositsService } from './services';
@Component({
diff --git a/src/app/sections/wallet-section/wallets/wallets-list/wallet-withdrawals/components/wallet-deposit-details/wallet-withdrawal-details.component.ts b/src/app/sections/wallet-section/wallets/wallets-list/wallet-withdrawals/components/wallet-deposit-details/wallet-withdrawal-details.component.ts
index b1d956232..d0ade2dc6 100644
--- a/src/app/sections/wallet-section/wallets/wallets-list/wallet-withdrawals/components/wallet-deposit-details/wallet-withdrawal-details.component.ts
+++ b/src/app/sections/wallet-section/wallets/wallets-list/wallet-withdrawals/components/wallet-deposit-details/wallet-withdrawal-details.component.ts
@@ -3,7 +3,6 @@ import { WalletDictionaryService } from '@dsh/app/api/wallet';
import { Withdrawal } from '@vality/swag-wallets';
-
@Component({
selector: 'dsh-wallet-withdrawal-details',
templateUrl: 'wallet-withdrawal-details.component.html',
diff --git a/src/app/sections/wallet-section/wallets/wallets-list/wallet-withdrawals/wallet-withdrawals.component.ts b/src/app/sections/wallet-section/wallets/wallets-list/wallet-withdrawals/wallet-withdrawals.component.ts
index 1086acba5..180e41f53 100644
--- a/src/app/sections/wallet-section/wallets/wallets-list/wallet-withdrawals/wallet-withdrawals.component.ts
+++ b/src/app/sections/wallet-section/wallets/wallets-list/wallet-withdrawals/wallet-withdrawals.component.ts
@@ -3,7 +3,6 @@ import { SEARCH_LIMIT } from '@dsh/app/sections/tokens';
import { ComponentChanges } from '@vality/matez';
-
import { FetchWalletWithdrawalsService } from './services';
@Component({
diff --git a/src/app/sections/wallet-section/withdrawals/services/withdrawals-expanded-id-manager/withdrawals-expanded-id-manager.service.ts b/src/app/sections/wallet-section/withdrawals/services/withdrawals-expanded-id-manager/withdrawals-expanded-id-manager.service.ts
index 824047ec4..01ed5074c 100644
--- a/src/app/sections/wallet-section/withdrawals/services/withdrawals-expanded-id-manager/withdrawals-expanded-id-manager.service.ts
+++ b/src/app/sections/wallet-section/withdrawals/services/withdrawals-expanded-id-manager/withdrawals-expanded-id-manager.service.ts
@@ -6,7 +6,6 @@ import { ExpandedIdManager } from '@dsh/app/shared/services';
import { Withdrawal } from '@vality/swag-wallets';
-
import { FetchWithdrawalsService } from '../fetch-withdrawals';
@Injectable()
diff --git a/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/additional-filters.module.ts b/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/additional-filters.module.ts
index 60aa059de..34078b416 100644
--- a/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/additional-filters.module.ts
+++ b/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/additional-filters.module.ts
@@ -9,7 +9,6 @@ import { MatIconModule } from '@angular/material/icon';
import { BaseDialogModule } from '@dsh/app/shared/components/dialog/base-dialog';
import { TranslocoModule } from '@jsverse/transloco';
-
import { DialogFiltersComponent } from './components';
import { MainInfoFiltersModule } from './main-info-filters';
import { WithdrawalStatusFilterModule } from './withdrawal-status-filter';
diff --git a/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/main-info-filters/main-info-filters.module.ts b/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/main-info-filters/main-info-filters.module.ts
index 23085de8a..135d9fe57 100644
--- a/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/main-info-filters/main-info-filters.module.ts
+++ b/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/main-info-filters/main-info-filters.module.ts
@@ -8,7 +8,6 @@ import { MatInputModule } from '@angular/material/input';
import { WalletAutocompleteFieldModule } from '@dsh/app/shared/components/inputs/wallet-autocomplete-field';
import { TranslocoModule } from '@jsverse/transloco';
-
import { MainInfoFiltersComponent } from './main-info-filters.component';
@NgModule({
diff --git a/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/withdrawal-status-filter/withdrawal-status-filter.component.ts b/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/withdrawal-status-filter/withdrawal-status-filter.component.ts
index 7a35d469d..9f7efaf04 100644
--- a/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/withdrawal-status-filter/withdrawal-status-filter.component.ts
+++ b/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/withdrawal-status-filter/withdrawal-status-filter.component.ts
@@ -7,7 +7,6 @@ import { WalletDictionaryService } from '@dsh/app/api/wallet';
import { FormControlSuperclass, Option, createControlProviders } from '@vality/matez';
import { WithdrawalStatus } from '@vality/swag-wallets';
-
import StatusEnum = WithdrawalStatus.StatusEnum;
@Component({
diff --git a/src/app/sections/wallet-section/withdrawals/withdrawals-list/components/withdrawal-details/withdrawal-details.component.ts b/src/app/sections/wallet-section/withdrawals/withdrawals-list/components/withdrawal-details/withdrawal-details.component.ts
index d02e7e161..50503f4bf 100644
--- a/src/app/sections/wallet-section/withdrawals/withdrawals-list/components/withdrawal-details/withdrawal-details.component.ts
+++ b/src/app/sections/wallet-section/withdrawals/withdrawals-list/components/withdrawal-details/withdrawal-details.component.ts
@@ -3,7 +3,6 @@ import { WalletDictionaryService } from '@dsh/app/api/wallet';
import { Withdrawal } from '@vality/swag-wallets';
-
@Component({
selector: 'dsh-withdrawal-details',
templateUrl: 'withdrawal-details.component.html',
diff --git a/src/app/sections/wallet-section/withdrawals/withdrawals-list/components/withdrawal-row/withdrawal-row.component.ts b/src/app/sections/wallet-section/withdrawals/withdrawals-list/components/withdrawal-row/withdrawal-row.component.ts
index 229db85c6..8ec4a671a 100644
--- a/src/app/sections/wallet-section/withdrawals/withdrawals-list/components/withdrawal-row/withdrawal-row.component.ts
+++ b/src/app/sections/wallet-section/withdrawals/withdrawals-list/components/withdrawal-row/withdrawal-row.component.ts
@@ -3,7 +3,6 @@ import { WalletDictionaryService } from '@dsh/app/api/wallet';
import { Withdrawal } from '@vality/swag-wallets';
-
@Component({
selector: 'dsh-withdrawal-row',
templateUrl: 'withdrawal-row.component.html',
diff --git a/src/app/shared/components/accordion-table/accordion-table.component.ts b/src/app/shared/components/accordion-table/accordion-table.component.ts
index 20c7d2f11..ec5033443 100644
--- a/src/app/shared/components/accordion-table/accordion-table.component.ts
+++ b/src/app/shared/components/accordion-table/accordion-table.component.ts
@@ -15,7 +15,6 @@ import { StatusColor } from '@dsh/app/theme-manager';
import { PossiblyAsync } from '@vality/matez';
-
import { ExpandedFragment } from './expanded-fragment';
const HIDED_BREAKPOINTS = [
diff --git a/src/app/shared/components/api-model-details/invoice-details/invoice-details.component.ts b/src/app/shared/components/api-model-details/invoice-details/invoice-details.component.ts
index 3b3823d08..ff31ec74b 100644
--- a/src/app/shared/components/api-model-details/invoice-details/invoice-details.component.ts
+++ b/src/app/shared/components/api-model-details/invoice-details/invoice-details.component.ts
@@ -3,7 +3,6 @@ import { AnapiDictionaryService } from '@dsh/app/api/anapi';
import { Invoice } from '@vality/swag-anapi-v2';
-
@Component({
selector: 'dsh-invoice-details',
templateUrl: 'invoice-details.component.html',
diff --git a/src/app/shared/components/api-model-details/refund-details/refund-details.component.ts b/src/app/shared/components/api-model-details/refund-details/refund-details.component.ts
index af52ff252..a272fd9b2 100644
--- a/src/app/shared/components/api-model-details/refund-details/refund-details.component.ts
+++ b/src/app/shared/components/api-model-details/refund-details/refund-details.component.ts
@@ -3,7 +3,6 @@ import { AnapiDictionaryService } from '@dsh/app/api/anapi';
import { Refund } from '@vality/swag-payments';
-
@Component({
selector: 'dsh-refund-details',
templateUrl: 'refund-details.component.html',
diff --git a/src/app/shared/components/create-invoice-form/create-invoice-form.component.ts b/src/app/shared/components/create-invoice-form/create-invoice-form.component.ts
index 55da83bb6..a0c304dc5 100644
--- a/src/app/shared/components/create-invoice-form/create-invoice-form.component.ts
+++ b/src/app/shared/components/create-invoice-form/create-invoice-form.component.ts
@@ -15,7 +15,6 @@ import {
} from '@vality/matez';
import { InvoiceParams, Shop } from '@vality/swag-payments';
-
type FormData = InvoiceParams;
const mapToMinor = (value: number | null, currency: string | null): number | null => {
diff --git a/src/app/shared/components/filters/currency-filter/currency-filter.component.ts b/src/app/shared/components/filters/currency-filter/currency-filter.component.ts
index 8df549c15..82fdef17a 100644
--- a/src/app/shared/components/filters/currency-filter/currency-filter.component.ts
+++ b/src/app/shared/components/filters/currency-filter/currency-filter.component.ts
@@ -8,7 +8,6 @@ import { TranslocoService } from '@jsverse/transloco';
import { createControlProviders } from '@vality/matez';
-
@Component({
selector: 'dsh-currency-filter',
templateUrl: 'currency-filter.component.html',
diff --git a/src/app/shared/components/filters/currency-filter/currency-filter.module.ts b/src/app/shared/components/filters/currency-filter/currency-filter.module.ts
index f6d2a7967..9164dd3da 100644
--- a/src/app/shared/components/filters/currency-filter/currency-filter.module.ts
+++ b/src/app/shared/components/filters/currency-filter/currency-filter.module.ts
@@ -4,7 +4,6 @@ import { ReactiveFormsModule } from '@angular/forms';
import { FilterModule } from '@dsh/components/filter';
import { TranslocoModule } from '@jsverse/transloco';
-
import { CurrencyFieldModule } from '../../inputs/currency-field';
import { CurrencyFilterComponent } from './currency-filter.component';
diff --git a/src/app/shared/components/filters/invoice-status-filter/invoice-status-filter.component.ts b/src/app/shared/components/filters/invoice-status-filter/invoice-status-filter.component.ts
index 2e64e54ee..5df4f577d 100644
--- a/src/app/shared/components/filters/invoice-status-filter/invoice-status-filter.component.ts
+++ b/src/app/shared/components/filters/invoice-status-filter/invoice-status-filter.component.ts
@@ -4,7 +4,6 @@ import { FilterSuperclass } from '@dsh/components/filter';
import { createControlProviders } from '@vality/matez';
import { InvoiceStatus } from '@vality/swag-anapi-v2';
-
@Component({
selector: 'dsh-invoice-status-filter',
templateUrl: 'invoice-status-filter.component.html',
diff --git a/src/app/shared/components/filters/invoices-filter/invoices-filter.component.ts b/src/app/shared/components/filters/invoices-filter/invoices-filter.component.ts
index 634e88662..2611cb595 100644
--- a/src/app/shared/components/filters/invoices-filter/invoices-filter.component.ts
+++ b/src/app/shared/components/filters/invoices-filter/invoices-filter.component.ts
@@ -3,7 +3,6 @@ import { FilterSuperclass } from '@dsh/components/filter';
import { createControlProviders } from '@vality/matez';
-
@Component({
selector: 'dsh-invoices-filter',
templateUrl: 'invoices-filter.component.html',
diff --git a/src/app/shared/components/filters/refund-status-filter/refund-status-filter.component.ts b/src/app/shared/components/filters/refund-status-filter/refund-status-filter.component.ts
index bd6e00e33..be71b9f67 100644
--- a/src/app/shared/components/filters/refund-status-filter/refund-status-filter.component.ts
+++ b/src/app/shared/components/filters/refund-status-filter/refund-status-filter.component.ts
@@ -4,7 +4,6 @@ import { FilterSuperclass } from '@dsh/components/filter';
import { createControlProviders } from '@vality/matez';
import { RefundStatus } from '@vality/swag-anapi-v2';
-
@Component({
selector: 'dsh-refund-status-filter',
templateUrl: 'refund-status-filter.component.html',
diff --git a/src/app/shared/components/inputs/category-autocomplete-field/category-autocomplete-field.component.ts b/src/app/shared/components/inputs/category-autocomplete-field/category-autocomplete-field.component.ts
index c437988a2..7c1700ea7 100644
--- a/src/app/shared/components/inputs/category-autocomplete-field/category-autocomplete-field.component.ts
+++ b/src/app/shared/components/inputs/category-autocomplete-field/category-autocomplete-field.component.ts
@@ -7,7 +7,6 @@ import { CategoriesService } from '@dsh/app/api/payments';
import { FormControlSuperclass, Option, createControlProviders } from '@vality/matez';
import { Category } from '@vality/swag-payments';
-
@Component({
selector: 'dsh-category-autocomplete-field',
templateUrl: 'category-autocomplete-field.component.html',
diff --git a/src/app/shared/components/inputs/country-autocomplete-field/countries-autocomplete-field.component.ts b/src/app/shared/components/inputs/country-autocomplete-field/countries-autocomplete-field.component.ts
index d7e496eb3..4e0e11976 100644
--- a/src/app/shared/components/inputs/country-autocomplete-field/countries-autocomplete-field.component.ts
+++ b/src/app/shared/components/inputs/country-autocomplete-field/countries-autocomplete-field.component.ts
@@ -5,7 +5,6 @@ import { CountriesService } from '@dsh/app/api/payments';
import { FormControlSuperclass, createControlProviders } from '@vality/matez';
-
import { CountryId } from './types';
import { countriesToOptions } from './utils';
diff --git a/src/app/shared/components/inputs/currency-autocomplete-field/currency-autocomplete-field.component.ts b/src/app/shared/components/inputs/currency-autocomplete-field/currency-autocomplete-field.component.ts
index c821e3aaf..1a79bedbe 100644
--- a/src/app/shared/components/inputs/currency-autocomplete-field/currency-autocomplete-field.component.ts
+++ b/src/app/shared/components/inputs/currency-autocomplete-field/currency-autocomplete-field.component.ts
@@ -3,7 +3,6 @@ import { ConfigService } from '@dsh/app/config';
import { FormControlSuperclass, Option, createControlProviders } from '@vality/matez';
-
@Component({
selector: 'dsh-currency-autocomplete-field',
templateUrl: 'currency-autocomplete-field.component.html',
diff --git a/src/app/shared/components/inputs/currency-field/currency-field.module.ts b/src/app/shared/components/inputs/currency-field/currency-field.module.ts
index 2e08bb8a6..957a03e2f 100644
--- a/src/app/shared/components/inputs/currency-field/currency-field.module.ts
+++ b/src/app/shared/components/inputs/currency-field/currency-field.module.ts
@@ -4,7 +4,6 @@ import { ReactiveFormsModule } from '@angular/forms';
import { RadioGroupFieldModule } from '@dsh/components/form-controls/radio-group-field';
import { TranslocoModule } from '@jsverse/transloco';
-
import { CurrencyFieldComponent } from './currency-field.component';
@NgModule({
diff --git a/src/app/shared/components/inputs/invoice-status-field/invoice-status-field.module.ts b/src/app/shared/components/inputs/invoice-status-field/invoice-status-field.module.ts
index cbe3299cb..e2e765f5c 100644
--- a/src/app/shared/components/inputs/invoice-status-field/invoice-status-field.module.ts
+++ b/src/app/shared/components/inputs/invoice-status-field/invoice-status-field.module.ts
@@ -4,7 +4,6 @@ import { ReactiveFormsModule } from '@angular/forms';
import { RadioGroupFieldModule } from '@dsh/components/form-controls/radio-group-field';
import { TranslocoModule } from '@jsverse/transloco';
-
import { InvoiceStatusFieldComponent } from './invoice-status-field.component';
import { InvoiceStatusLabelPipe } from './pipes/invoice-status-label.pipe';
diff --git a/src/app/shared/components/inputs/invoices-field/invoices-field.module.ts b/src/app/shared/components/inputs/invoices-field/invoices-field.module.ts
index 27b580e68..ee43d2446 100644
--- a/src/app/shared/components/inputs/invoices-field/invoices-field.module.ts
+++ b/src/app/shared/components/inputs/invoices-field/invoices-field.module.ts
@@ -4,7 +4,6 @@ import { ReactiveFormsModule } from '@angular/forms';
import { MultiInputFieldModule } from '@dsh/components/form-controls/multi-input-field';
import { TranslocoModule } from '@jsverse/transloco';
-
import { InvoicesFieldComponent } from './invoices-field.component';
@NgModule({
diff --git a/src/app/shared/components/inputs/payment-institution-field/payment-institution-field.component.ts b/src/app/shared/components/inputs/payment-institution-field/payment-institution-field.component.ts
index b0e67bfb1..be738d37b 100644
--- a/src/app/shared/components/inputs/payment-institution-field/payment-institution-field.component.ts
+++ b/src/app/shared/components/inputs/payment-institution-field/payment-institution-field.component.ts
@@ -7,7 +7,6 @@ import { PaymentInstitutionsService } from '@dsh/app/api/payments';
import { FormControlSuperclass, Option, createControlProviders } from '@vality/matez';
import { PaymentInstitution } from '@vality/swag-payments';
-
@Component({
selector: 'dsh-payment-institution-field',
templateUrl: 'payment-institution-field.component.html',
diff --git a/src/app/shared/components/inputs/refund-status-field/refund-status-field.module.ts b/src/app/shared/components/inputs/refund-status-field/refund-status-field.module.ts
index 9c364962e..bbd526a07 100644
--- a/src/app/shared/components/inputs/refund-status-field/refund-status-field.module.ts
+++ b/src/app/shared/components/inputs/refund-status-field/refund-status-field.module.ts
@@ -4,7 +4,6 @@ import { ReactiveFormsModule } from '@angular/forms';
import { RadioGroupFieldModule } from '@dsh/components/form-controls/radio-group-field';
import { TranslocoModule } from '@jsverse/transloco';
-
import { RefundStatusLabelPipe } from './pipes/refund-status-label.pipe';
import { RefundStatusFieldComponent } from './refund-status-field.component';
diff --git a/src/app/shared/components/inputs/report-types-field/report-types-field.component.ts b/src/app/shared/components/inputs/report-types-field/report-types-field.component.ts
index 44d1398b4..b5e0f56fe 100644
--- a/src/app/shared/components/inputs/report-types-field/report-types-field.component.ts
+++ b/src/app/shared/components/inputs/report-types-field/report-types-field.component.ts
@@ -4,7 +4,6 @@ import { valuesToOptions } from '@dsh/components/form-controls/utils/values-to-o
import { FormControlSuperclass, createControlProviders } from '@vality/matez';
import { Report } from '@vality/swag-anapi-v2';
-
import { ReportTypesLabelPipe } from './pipes/report-types-label.pipe';
import ReportTypeEnum = Report.ReportTypeEnum;
diff --git a/src/app/shared/components/inputs/report-types-field/report-types-field.module.ts b/src/app/shared/components/inputs/report-types-field/report-types-field.module.ts
index e5874f3bf..72d836817 100644
--- a/src/app/shared/components/inputs/report-types-field/report-types-field.module.ts
+++ b/src/app/shared/components/inputs/report-types-field/report-types-field.module.ts
@@ -4,7 +4,6 @@ import { ReactiveFormsModule } from '@angular/forms';
import { MultiSelectFieldModule } from '@dsh/components/form-controls/multi-select-field';
import { TranslocoModule } from '@jsverse/transloco';
-
import { ReportTypesLabelPipe } from './pipes/report-types-label.pipe';
import { ReportTypesFieldComponent } from './report-types-field.component';
diff --git a/src/app/shared/components/inputs/shops-field/shops-field.module.ts b/src/app/shared/components/inputs/shops-field/shops-field.module.ts
index 6b7d91cc2..1555b4e72 100644
--- a/src/app/shared/components/inputs/shops-field/shops-field.module.ts
+++ b/src/app/shared/components/inputs/shops-field/shops-field.module.ts
@@ -4,7 +4,6 @@ import { ReactiveFormsModule } from '@angular/forms';
import { MultiSelectFieldModule } from '@dsh/components/form-controls/multi-select-field';
import { TranslocoModule } from '@jsverse/transloco';
-
import { ShopsFieldComponent } from './shops-field.component';
@NgModule({
diff --git a/src/app/shared/components/inputs/wallet-autocomplete-field/wallet-autocomplete-field.component.ts b/src/app/shared/components/inputs/wallet-autocomplete-field/wallet-autocomplete-field.component.ts
index 7b59f31e9..64c1af8f4 100644
--- a/src/app/shared/components/inputs/wallet-autocomplete-field/wallet-autocomplete-field.component.ts
+++ b/src/app/shared/components/inputs/wallet-autocomplete-field/wallet-autocomplete-field.component.ts
@@ -5,7 +5,6 @@ import { WalletsService } from '@dsh/app/api/wallet';
import { FormControlSuperclass, createControlProviders } from '@vality/matez';
-
import { WalletId } from './types';
import { walletsToOptions } from './utils';
diff --git a/src/app/shared/components/invoice-randomize-amount-form/invoice-randomize-amount-form.component.ts b/src/app/shared/components/invoice-randomize-amount-form/invoice-randomize-amount-form.component.ts
index 47a514702..8a6ef015e 100644
--- a/src/app/shared/components/invoice-randomize-amount-form/invoice-randomize-amount-form.component.ts
+++ b/src/app/shared/components/invoice-randomize-amount-form/invoice-randomize-amount-form.component.ts
@@ -13,7 +13,6 @@ import {
toMinor,
} from '@vality/matez';
-
const mapToMinor = (value: number | null, currency: string | null): number | undefined => {
if (isNil(value) || isNil(currency)) {
return undefined;
diff --git a/src/app/shared/components/organization-roles/organization-roles.component.ts b/src/app/shared/components/organization-roles/organization-roles.component.ts
index fedee1e7f..a274f8e0f 100644
--- a/src/app/shared/components/organization-roles/organization-roles.component.ts
+++ b/src/app/shared/components/organization-roles/organization-roles.component.ts
@@ -3,7 +3,6 @@ import { OrganizationsDictionaryService } from '@dsh/app/api/organizations';
import { MemberRole } from '@vality/swag-organizations';
-
import { RoleGroup } from './types/role-group';
import { groupRoles } from './utils/group-roles';
diff --git a/src/app/shared/components/organization-roles/types/role-group.ts b/src/app/shared/components/organization-roles/types/role-group.ts
index 23661ed01..5f6ccb843 100644
--- a/src/app/shared/components/organization-roles/types/role-group.ts
+++ b/src/app/shared/components/organization-roles/types/role-group.ts
@@ -2,7 +2,6 @@ import { RoleId } from '@dsh/app/auth/types/role-id';
import { ResourceScopeId } from '@vality/swag-organizations';
-
export type ResourceId = string;
export interface RoleGroupScope {
diff --git a/src/app/shared/components/organization-roles/utils/group-roles.ts b/src/app/shared/components/organization-roles/utils/group-roles.ts
index a0a5ee5a7..7542979e2 100644
--- a/src/app/shared/components/organization-roles/utils/group-roles.ts
+++ b/src/app/shared/components/organization-roles/utils/group-roles.ts
@@ -2,7 +2,6 @@ import { RoleId } from '@dsh/app/auth/types/role-id';
import { MemberRole } from '@vality/swag-organizations';
-
import { RoleGroup, RoleGroupScope } from '../types/role-group';
import { sortRoleIds } from './sort-role-ids';
diff --git a/src/app/shared/components/radio-buttons/expandable-radio-group/expandable-radio-group.module.ts b/src/app/shared/components/radio-buttons/expandable-radio-group/expandable-radio-group.module.ts
index 835476730..3f446a518 100644
--- a/src/app/shared/components/radio-buttons/expandable-radio-group/expandable-radio-group.module.ts
+++ b/src/app/shared/components/radio-buttons/expandable-radio-group/expandable-radio-group.module.ts
@@ -7,7 +7,6 @@ import { MatRadioModule } from '@angular/material/radio';
import { InlineShowAllToggleModule } from '@dsh/app/shared/components/buttons/inline-show-all-toggle';
import { TranslocoModule } from '@jsverse/transloco';
-
import { ExpandableRadioGroupItemDirective } from './directives/expandable-radio-group-item/expandable-radio-group-item.directive';
import { ExpandableRadioGroupComponent } from './expandable-radio-group.component';
diff --git a/src/app/shared/pipes/error-message/error-message.pipe.ts b/src/app/shared/pipes/error-message/error-message.pipe.ts
index 82d87c14c..01a3b749d 100644
--- a/src/app/shared/pipes/error-message/error-message.pipe.ts
+++ b/src/app/shared/pipes/error-message/error-message.pipe.ts
@@ -4,7 +4,6 @@ import { Pipe, PipeTransform } from '@angular/core';
import { CommonError } from '@dsh/app/shared';
import { TranslocoService } from '@jsverse/transloco';
-
@Pipe({
name: 'errorMessage',
standalone: false,
diff --git a/src/app/shared/services/expanded-id-manager/types/dataset-item-id.ts b/src/app/shared/services/expanded-id-manager/types/dataset-item-id.ts
index dda34bf43..644197435 100644
--- a/src/app/shared/services/expanded-id-manager/types/dataset-item-id.ts
+++ b/src/app/shared/services/expanded-id-manager/types/dataset-item-id.ts
@@ -1 +1,3 @@
-export interface DatasetItemId { id?: string | number }
+export interface DatasetItemId {
+ id?: string | number;
+}
diff --git a/src/components/date-range-filter/date-range-filter.component.ts b/src/components/date-range-filter/date-range-filter.component.ts
index 141c6aa1e..ae0bf8dbb 100644
--- a/src/components/date-range-filter/date-range-filter.component.ts
+++ b/src/components/date-range-filter/date-range-filter.component.ts
@@ -8,7 +8,6 @@ import { TranslocoService } from '@jsverse/transloco';
import { createControlProviders, getValueChanges } from '@vality/matez';
-
import { DateRangeLocalizationService } from './services/date-range-localization/date-range-localization.service';
import { DateRangeWithPreset } from './types/date-range-with-preset';
import { Preset } from './types/preset';
diff --git a/src/components/layout/collapse/collapse.component.ts b/src/components/layout/collapse/collapse.component.ts
index 30944434e..1b3efca89 100644
--- a/src/components/layout/collapse/collapse.component.ts
+++ b/src/components/layout/collapse/collapse.component.ts
@@ -4,7 +4,10 @@ import { BODY_EXPANSION, INDICATOR_ROTATE } from './collapse-animation';
import { CollapseAnimationState } from './types/collapse-animation-state';
type ExpandDirection = 'up' | 'down';
-interface AnimationState { value: CollapseAnimationState; params: { rotateDeg: number } }
+interface AnimationState {
+ value: CollapseAnimationState;
+ params: { rotateDeg: number };
+}
const EXPAND_DIRECTION: ExpandDirection = 'down';
const EXPANDED = false;
diff --git a/src/components/navigation/navbar-item/navbar-item.component.ts b/src/components/navigation/navbar-item/navbar-item.component.ts
index 7f9d2d933..9ef62a4c9 100644
--- a/src/components/navigation/navbar-item/navbar-item.component.ts
+++ b/src/components/navigation/navbar-item/navbar-item.component.ts
@@ -16,7 +16,6 @@ import { BootstrapIconSize } from '@dsh/components/indicators/bootstrap-icon';
import { ComponentChanges } from '@vality/matez';
-
@Component({
selector: 'dsh-navbar-item',
templateUrl: 'navbar-item.component.html',
diff --git a/src/components/nested-table/nested-table.module.ts b/src/components/nested-table/nested-table.module.ts
index 34c52a71b..50aa4d29a 100644
--- a/src/components/nested-table/nested-table.module.ts
+++ b/src/components/nested-table/nested-table.module.ts
@@ -5,7 +5,6 @@ import { MatTableModule } from '@angular/material/table';
import { BootstrapIconModule } from '@dsh/components/indicators';
import { TranslocoModule } from '@jsverse/transloco';
-
import { NestedTableComponent } from './nested-table.component';
@NgModule({
diff --git a/src/components/popups/confirm-action-dialog/confirm-action-dialog.module.ts b/src/components/popups/confirm-action-dialog/confirm-action-dialog.module.ts
index db40cb6f5..5120e2fe1 100644
--- a/src/components/popups/confirm-action-dialog/confirm-action-dialog.module.ts
+++ b/src/components/popups/confirm-action-dialog/confirm-action-dialog.module.ts
@@ -5,7 +5,6 @@ import { MatButtonModule } from '@angular/material/button';
import { BaseDialogModule } from '@dsh/app/shared/components/dialog/base-dialog';
import { TranslocoModule } from '@jsverse/transloco';
-
import { ConfirmActionDialogComponent } from './confirm-action-dialog.component';
@NgModule({
From b020db691d57290334ca992f566d747d8814d054 Mon Sep 17 00:00:00 2001
From: Ray <11846445+A77AY@users.noreply.github.com>
Date: Mon, 22 Jun 2026 22:38:32 +0400
Subject: [PATCH 13/14] refactor: add eslint disable comments for empty
functions and unnecessary assignments
---
src/app/config/config-stub.service.ts | 1 +
.../create-invoice-form/create-invoice-form.component.ts | 1 +
.../inputs/invoice-status-field/types/option-labels.ts | 2 +-
.../inputs/max-length-input/max-length-input.component.ts | 4 +++-
.../invoice-randomize-amount-form.component.ts | 1 +
src/app/shared/services/index.ts | 1 -
.../utils/create-date-range-with-preset-serializer.ts | 2 ++
src/components/filter/filter-superclass.ts | 1 +
src/components/layout/accordion/accordion.component.ts | 1 +
9 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/app/config/config-stub.service.ts b/src/app/config/config-stub.service.ts
index 6f9bcc378..e2ae9eeeb 100644
--- a/src/app/config/config-stub.service.ts
+++ b/src/app/config/config-stub.service.ts
@@ -12,5 +12,6 @@ export class ConfigStubService extends BASE_CONFIG {
}
}
+ // eslint-disable-next-line @typescript-eslint/no-empty-function
async init() {}
}
diff --git a/src/app/shared/components/create-invoice-form/create-invoice-form.component.ts b/src/app/shared/components/create-invoice-form/create-invoice-form.component.ts
index a0c304dc5..d18f1d7d2 100644
--- a/src/app/shared/components/create-invoice-form/create-invoice-form.component.ts
+++ b/src/app/shared/components/create-invoice-form/create-invoice-form.component.ts
@@ -88,5 +88,6 @@ export class CreateInvoiceFormComponent
return getErrorsTree(this.control);
}
+ // eslint-disable-next-line @typescript-eslint/no-empty-function
handleIncomingValue(_value: FormData): void {}
}
diff --git a/src/app/shared/components/inputs/invoice-status-field/types/option-labels.ts b/src/app/shared/components/inputs/invoice-status-field/types/option-labels.ts
index 7db3128d7..d13c03eb4 100644
--- a/src/app/shared/components/inputs/invoice-status-field/types/option-labels.ts
+++ b/src/app/shared/components/inputs/invoice-status-field/types/option-labels.ts
@@ -1,6 +1,6 @@
import { InvoiceStatus } from '@vality/swag-anapi-v2';
-export const OPTION_LABELS: Record = {
+export const OPTION_LABELS: Record = {
paid: 'paid',
cancelled: 'cancelled',
fulfilled: 'fulfilled',
diff --git a/src/app/shared/components/inputs/max-length-input/max-length-input.component.ts b/src/app/shared/components/inputs/max-length-input/max-length-input.component.ts
index 0cc09aeaf..7edc0f56a 100644
--- a/src/app/shared/components/inputs/max-length-input/max-length-input.component.ts
+++ b/src/app/shared/components/inputs/max-length-input/max-length-input.component.ts
@@ -98,7 +98,9 @@ export class MaxLengthInputComponent implements OnChanges, ControlValueAccessor
this.formControl.setValue(value);
}
- private innerOnTouched = () => {};
+ private innerOnTouched = () => {
+ /* empty */
+ };
private updateValidators(): void {
const validators: ValidatorFn[] = [];
diff --git a/src/app/shared/components/invoice-randomize-amount-form/invoice-randomize-amount-form.component.ts b/src/app/shared/components/invoice-randomize-amount-form/invoice-randomize-amount-form.component.ts
index 8a6ef015e..562adb56b 100644
--- a/src/app/shared/components/invoice-randomize-amount-form/invoice-randomize-amount-form.component.ts
+++ b/src/app/shared/components/invoice-randomize-amount-form/invoice-randomize-amount-form.component.ts
@@ -83,5 +83,6 @@ export class InvoiceRandomizeAmountFormComponent
return getErrorsTree(this.control);
}
+ // eslint-disable-next-line @typescript-eslint/no-empty-function
handleIncomingValue(_value: FormData): void {}
}
diff --git a/src/app/shared/services/index.ts b/src/app/shared/services/index.ts
index e86e76e1b..10b8f7c44 100644
--- a/src/app/shared/services/index.ts
+++ b/src/app/shared/services/index.ts
@@ -1,4 +1,3 @@
-export * from './country-codes';
export * from './query-params-store';
export * from './expanded-id-manager/expanded-id-manager';
export * from './fake-paginator.service';
diff --git a/src/components/date-range-filter/utils/create-date-range-with-preset-serializer.ts b/src/components/date-range-filter/utils/create-date-range-with-preset-serializer.ts
index 8f51763f1..44c1f7ada 100644
--- a/src/components/date-range-filter/utils/create-date-range-with-preset-serializer.ts
+++ b/src/components/date-range-filter/utils/create-date-range-with-preset-serializer.ts
@@ -34,7 +34,9 @@ export function createDateRangeWithPresetSerializer(id = 'dr'): Serializer
typeof v === 'object' &&
+ // eslint-disable-next-line no-prototype-builtins
v.hasOwnProperty('start') &&
+ // eslint-disable-next-line no-prototype-builtins
v.hasOwnProperty('end') &&
(isNil(v.start) || moment.isMoment(v.start)) &&
(isNil(v.end) || moment.isMoment(v.end)),
diff --git a/src/components/filter/filter-superclass.ts b/src/components/filter/filter-superclass.ts
index 031c9124b..0ac29527b 100644
--- a/src/components/filter/filter-superclass.ts
+++ b/src/components/filter/filter-superclass.ts
@@ -28,6 +28,7 @@ export abstract class FilterSuperclass<
return !this.isEmpty(this._savedValue$.getValue());
}
+ // eslint-disable-next-line @typescript-eslint/class-literal-property-style
protected get empty(): Inner {
return null;
}
diff --git a/src/components/layout/accordion/accordion.component.ts b/src/components/layout/accordion/accordion.component.ts
index f782b0ebb..db8055c8c 100644
--- a/src/components/layout/accordion/accordion.component.ts
+++ b/src/components/layout/accordion/accordion.component.ts
@@ -109,6 +109,7 @@ export class AccordionComponent implements AfterViewInit {
}
private toggle(idx: number, isExpand: boolean) {
+ // eslint-disable-next-line no-useless-assignment
let expanded = idx;
if (isExpand) {
this.accordionItems
From f33636ca8752d5b22853e0849d4bf958425860d5 Mon Sep 17 00:00:00 2001
From: Ray <11846445+A77AY@users.noreply.github.com>
Date: Tue, 23 Jun 2026 17:52:45 +0400
Subject: [PATCH 14/14] refactor: remove extended diagnostics from
angularCompilerOptions in tsconfig files
---
tsconfig.app.json | 9 +--------
tsconfig.spec.json | 9 +--------
2 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/tsconfig.app.json b/tsconfig.app.json
index 7636fd3fa..9a43a590f 100644
--- a/tsconfig.app.json
+++ b/tsconfig.app.json
@@ -7,12 +7,5 @@
},
"files": ["src/main.ts"],
"include": ["src/**/*.d.ts"],
- "angularCompilerOptions": {
- "extendedDiagnostics": {
- "checks": {
- "nullishCoalescingNotNullable": "suppress",
- "optionalChainNotNullable": "suppress"
- }
- }
- }
+ "angularCompilerOptions": {}
}
diff --git a/tsconfig.spec.json b/tsconfig.spec.json
index a32fc8bd2..4794bc9cc 100644
--- a/tsconfig.spec.json
+++ b/tsconfig.spec.json
@@ -6,12 +6,5 @@
"types": ["vitest/globals"]
},
"include": ["src/**/*.spec.ts", "src/**/*.d.ts"],
- "angularCompilerOptions": {
- "extendedDiagnostics": {
- "checks": {
- "nullishCoalescingNotNullable": "suppress",
- "optionalChainNotNullable": "suppress"
- }
- }
- }
+ "angularCompilerOptions": {}
}