diff --git a/.browserslistrc b/.browserslistrc
deleted file mode 100644
index 164189e7..00000000
--- a/.browserslistrc
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
-# For additional information regarding the format and rule options, please see:
-# https://github.com/browserslist/browserslist#queries
-
-# For the full list of supported browsers by the Angular framework, please see:
-# https://angular.io/guide/browser-support
-
-# You can see what browsers were selected by your queries by running:
-# npx browserslist
-
-> 0.5%
-last 2 versions
-Firefox ESR
-not dead
-not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line.
diff --git a/.npmrc b/.npmrc
deleted file mode 100644
index cffe8cde..00000000
--- a/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-save-exact=true
diff --git a/angular.json b/angular.json
index 80f0ce3f..42a23e7d 100644
--- a/angular.json
+++ b/angular.json
@@ -34,12 +34,13 @@
"moment",
"flat",
"base64-js",
- "js-sha256"
+ "js-sha256",
+ "utility-types"
],
"outputPath": "dist",
"index": "src/index.html",
"main": "src/main.ts",
- "polyfills": "src/polyfills.ts",
+ "polyfills": ["zone.js"],
"tsConfig": "tsconfig.app.json",
"inlineStyleLanguage": "scss",
"assets": [
@@ -136,7 +137,7 @@
"builder": "@angular-builders/custom-webpack:karma",
"options": {
"main": "src/test.ts",
- "polyfills": "src/polyfills.ts",
+ "polyfills": ["zone.js"],
"tsConfig": "tsconfig.spec.json",
"karmaConfig": "karma.conf.js",
"inlineStyleLanguage": "scss",
diff --git a/package-lock.json b/package-lock.json
index 3473989e..fff9ceac 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -31,7 +31,7 @@
"@sentry/angular": "7.54.0",
"@sentry/integrations": "7.54.0",
"@sentry/tracing": "7.54.0",
- "@vality/ng-core": "0.7.1-2a1b72f.0",
+ "@vality/ng-core": "15.0.0",
"@vality/swag-anapi-v2": "2.0.1-38f360b.0",
"@vality/swag-api-keys": "1.0.1-55db9ab.0",
"@vality/swag-claim-management": "0.1.1-29260c7.0",
@@ -55,7 +55,7 @@
"lodash-es": "4.17.21",
"moment": "2.29.4",
"ng-apexcharts": "1.7.1",
- "ngx-mat-select-search": "6.0.0",
+ "ngx-mat-select-search": "7.0.2",
"rxjs": "7.5.6",
"short-uuid": "4.2.0",
"tslib": "2.4.0",
@@ -82,7 +82,6 @@
"@types/jwt-decode": "^3.1.0",
"@types/lodash-es": "4.17.6",
"@types/moment": "2.13.0",
- "@types/node": "18.6.1",
"@types/prettier": "2.4.3",
"@typescript-eslint/eslint-plugin": "5.57.0",
"@typescript-eslint/parser": "5.57.0",
@@ -106,7 +105,7 @@
"karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "^1.5.0",
"karma-spec-reporter": "0.0.32",
- "prettier": "2.5.1",
+ "prettier": "~2.8.8",
"ts-mockito": "^2.6.1",
"ts-node": "10.9.1",
"typescript": "4.9.5"
@@ -6008,9 +6007,9 @@
}
},
"node_modules/@vality/ng-core": {
- "version": "0.7.1-2a1b72f.0",
- "resolved": "https://registry.npmjs.org/@vality/ng-core/-/ng-core-0.7.1-2a1b72f.0.tgz",
- "integrity": "sha512-LhMLijiVuJ0cjZ7UPpCAc5s2svjFJI6+wGq0/zfLs5vBfM43D8BNiGfnD2dARtG6CEaHCuh7wvsTyzNMv+p9/w==",
+ "version": "15.0.0",
+ "resolved": "https://registry.npmjs.org/@vality/ng-core/-/ng-core-15.0.0.tgz",
+ "integrity": "sha512-7ux9yH80Bu7QnONFzmY8BSlxCZojvervVuecZdLAhvCo0/W6/NysOjzt3skSsi4S9I0vEtfaJ2kYpFqfqLjuJA==",
"dependencies": {
"@ng-matero/extensions": "^15.0.0",
"@s-libs/js-core": "^15.2.0",
@@ -13332,14 +13331,14 @@
}
},
"node_modules/ngx-mat-select-search": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/ngx-mat-select-search/-/ngx-mat-select-search-6.0.0.tgz",
- "integrity": "sha512-arrWZg2N/Pv3hCE2EV0qj3rqEUKImntmhW8qvo/aYxeN9iWPsseOpokcfMeC9I/SrLrqQFdfyPgHOgB9DqF2Hw==",
+ "version": "7.0.2",
+ "resolved": "https://registry.npmjs.org/ngx-mat-select-search/-/ngx-mat-select-search-7.0.2.tgz",
+ "integrity": "sha512-69vy/mWh7pnnR6rw1BWxO8E4HyylUvvBlmhrtWqXIYqfIx3mfvWuNj0tE1v+ERPg8a4vViFpfilRUUvvbrv1cA==",
"dependencies": {
"tslib": "^2.4.0"
},
"peerDependencies": {
- "@angular/material": "^15.0.0"
+ "@angular/material": "^15.0.0 || ^16.0.0"
}
},
"node_modules/nice-napi": {
@@ -14476,14 +14475,18 @@
}
},
"node_modules/prettier": {
- "version": "2.5.1",
+ "version": "2.8.8",
+ "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
+ "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
"dev": true,
- "license": "MIT",
"bin": {
"prettier": "bin-prettier.js"
},
"engines": {
"node": ">=10.13.0"
+ },
+ "funding": {
+ "url": "https://github.com/prettier/prettier?sponsor=1"
}
},
"node_modules/pretty-bytes": {
@@ -22381,9 +22384,9 @@
}
},
"@vality/ng-core": {
- "version": "0.7.1-2a1b72f.0",
- "resolved": "https://registry.npmjs.org/@vality/ng-core/-/ng-core-0.7.1-2a1b72f.0.tgz",
- "integrity": "sha512-LhMLijiVuJ0cjZ7UPpCAc5s2svjFJI6+wGq0/zfLs5vBfM43D8BNiGfnD2dARtG6CEaHCuh7wvsTyzNMv+p9/w==",
+ "version": "15.0.0",
+ "resolved": "https://registry.npmjs.org/@vality/ng-core/-/ng-core-15.0.0.tgz",
+ "integrity": "sha512-7ux9yH80Bu7QnONFzmY8BSlxCZojvervVuecZdLAhvCo0/W6/NysOjzt3skSsi4S9I0vEtfaJ2kYpFqfqLjuJA==",
"requires": {
"@ng-matero/extensions": "^15.0.0",
"@s-libs/js-core": "^15.2.0",
@@ -27576,9 +27579,9 @@
}
},
"ngx-mat-select-search": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/ngx-mat-select-search/-/ngx-mat-select-search-6.0.0.tgz",
- "integrity": "sha512-arrWZg2N/Pv3hCE2EV0qj3rqEUKImntmhW8qvo/aYxeN9iWPsseOpokcfMeC9I/SrLrqQFdfyPgHOgB9DqF2Hw==",
+ "version": "7.0.2",
+ "resolved": "https://registry.npmjs.org/ngx-mat-select-search/-/ngx-mat-select-search-7.0.2.tgz",
+ "integrity": "sha512-69vy/mWh7pnnR6rw1BWxO8E4HyylUvvBlmhrtWqXIYqfIx3mfvWuNj0tE1v+ERPg8a4vViFpfilRUUvvbrv1cA==",
"requires": {
"tslib": "^2.4.0"
}
@@ -28368,7 +28371,9 @@
"dev": true
},
"prettier": {
- "version": "2.5.1",
+ "version": "2.8.8",
+ "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
+ "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
"dev": true
},
"pretty-bytes": {
diff --git a/package.json b/package.json
index 27834c8c..41db464b 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
"@sentry/angular": "7.54.0",
"@sentry/integrations": "7.54.0",
"@sentry/tracing": "7.54.0",
- "@vality/ng-core": "0.7.1-2a1b72f.0",
+ "@vality/ng-core": "15.0.0",
"@vality/swag-anapi-v2": "2.0.1-38f360b.0",
"@vality/swag-api-keys": "1.0.1-55db9ab.0",
"@vality/swag-claim-management": "0.1.1-29260c7.0",
@@ -72,7 +72,7 @@
"lodash-es": "4.17.21",
"moment": "2.29.4",
"ng-apexcharts": "1.7.1",
- "ngx-mat-select-search": "6.0.0",
+ "ngx-mat-select-search": "7.0.2",
"rxjs": "7.5.6",
"short-uuid": "4.2.0",
"tslib": "2.4.0",
@@ -99,7 +99,6 @@
"@types/jwt-decode": "^3.1.0",
"@types/lodash-es": "4.17.6",
"@types/moment": "2.13.0",
- "@types/node": "18.6.1",
"@types/prettier": "2.4.3",
"@typescript-eslint/eslint-plugin": "5.57.0",
"@typescript-eslint/parser": "5.57.0",
@@ -123,7 +122,7 @@
"karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "^1.5.0",
"karma-spec-reporter": "0.0.32",
- "prettier": "2.5.1",
+ "prettier": "~2.8.8",
"ts-mockito": "^2.6.1",
"ts-node": "10.9.1",
"typescript": "4.9.5"
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 716d5c22..0f71e31b 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -3,8 +3,8 @@ import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
import { APP_INITIALIZER, ErrorHandler, LOCALE_ID, NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MAT_RIPPLE_GLOBAL_OPTIONS } from '@angular/material/core';
-import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog';
-import { MAT_LEGACY_FORM_FIELD_DEFAULT_OPTIONS as MAT_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/legacy-form-field';
+import { MatDialogModule } from '@angular/material/dialog';
+import { MAT_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/form-field';
import {
MAT_MOMENT_DATE_ADAPTER_OPTIONS,
MAT_MOMENT_DATE_FORMATS,
diff --git a/src/app/dadata/dadata.component.html b/src/app/dadata/dadata.component.html
index 90f64b7e..98306c10 100644
--- a/src/app/dadata/dadata.component.html
+++ b/src/app/dadata/dadata.component.html
@@ -6,11 +6,11 @@
diff --git a/src/app/dadata/dadata.component.ts b/src/app/dadata/dadata.component.ts
index 46cf35e7..20747902 100644
--- a/src/app/dadata/dadata.component.ts
+++ b/src/app/dadata/dadata.component.ts
@@ -1,5 +1,5 @@
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { MatLegacyAutocompleteSelectedEvent as MatAutocompleteSelectedEvent } from '@angular/material/legacy-autocomplete';
+import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
import { WrappedFormControlSuperclass } from '@s-libs/ng-core';
import {
diff --git a/src/app/dadata/dadata.module.ts b/src/app/dadata/dadata.module.ts
index 399b2f4f..1e83db5f 100644
--- a/src/app/dadata/dadata.module.ts
+++ b/src/app/dadata/dadata.module.ts
@@ -2,9 +2,9 @@ import { CommonModule } from '@angular/common';
import { HttpClientModule } from '@angular/common/http';
import { NgModule } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { MatLegacyAutocompleteModule as MatAutocompleteModule } from '@angular/material/legacy-autocomplete';
-import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
-import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input';
+import { MatAutocompleteModule } from '@angular/material/autocomplete';
+import { MatButtonModule } from '@angular/material/button';
+import { MatInputModule } from '@angular/material/input';
import { FormControlsModule } from '@dsh/components/form-controls';
import { BootstrapIconModule } from '@dsh/components/indicators';
diff --git a/src/app/dadata/type.ts b/src/app/dadata/type.ts
index 64f27883..a58f599b 100644
--- a/src/app/dadata/type.ts
+++ b/src/app/dadata/type.ts
@@ -1,2 +1,2 @@
export const TYPE = ['address', 'party', 'bank', 'fio', 'fmsUnit', 'okved'] as const;
-export type Type = typeof TYPE[number];
+export type Type = (typeof TYPE)[number];
diff --git a/src/app/home/actionbar/actionbar.module.ts b/src/app/home/actionbar/actionbar.module.ts
index 5e9162f5..fd991c12 100644
--- a/src/app/home/actionbar/actionbar.module.ts
+++ b/src/app/home/actionbar/actionbar.module.ts
@@ -4,8 +4,8 @@ import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { FormsModule } from '@angular/forms';
import { MatDividerModule } from '@angular/material/divider';
-import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu';
-import { MatLegacyRadioModule as MatRadioModule } from '@angular/material/legacy-radio';
+import { MatMenuModule } from '@angular/material/menu';
+import { MatRadioModule } from '@angular/material/radio';
import { RouterModule } from '@angular/router';
import { TranslocoModule } from '@ngneat/transloco';
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 314725b8..ca4d1cb4 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,5 +1,5 @@
import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
-import { MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog';
+import { MatDialogRef } from '@angular/material/dialog';
import { Router } from '@angular/router';
import { untilDestroyed, UntilDestroy } from '@ngneat/until-destroy';
import { Organization } from '@vality/swag-organizations';
diff --git a/src/app/home/actionbar/components/user/user.component.ts b/src/app/home/actionbar/components/user/user.component.ts
index dc71aecb..6ef654d2 100644
--- a/src/app/home/actionbar/components/user/user.component.ts
+++ b/src/app/home/actionbar/components/user/user.component.ts
@@ -1,5 +1,5 @@
import { ChangeDetectionStrategy, Component, EventEmitter, Output, Inject } from '@angular/core';
-import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog';
+import { MatDialog } from '@angular/material/dialog';
import { Router } from '@angular/router';
import { TranslocoService } from '@ngneat/transloco';
import { Organization } from '@vality/swag-organizations';
diff --git a/src/app/home/mobile-grid/mobile-grid.component.scss b/src/app/home/mobile-grid/mobile-grid.component.scss
index e3520254..b65ca52d 100644
--- a/src/app/home/mobile-grid/mobile-grid.component.scss
+++ b/src/app/home/mobile-grid/mobile-grid.component.scss
@@ -9,6 +9,7 @@
.dsh-mobile-grid {
height: 100%;
width: 100%;
+ background-color: transparent !important;
&-drawer {
width: 75vw;
@@ -28,7 +29,7 @@
&-toggle-button {
cursor: pointer;
- &.mat-icon {
+ &.mat-mdc-icon {
width: 32px;
height: 32px;
}
diff --git a/src/app/home/toolbar/toolbar.component.html b/src/app/home/toolbar/toolbar.component.html
index 405a6914..25c19689 100644
--- a/src/app/home/toolbar/toolbar.component.html
+++ b/src/app/home/toolbar/toolbar.component.html
@@ -1,7 +1,7 @@
diff --git a/src/app/home/toolbar/toolbar.module.ts b/src/app/home/toolbar/toolbar.module.ts
index 1d482966..a4ed6195 100644
--- a/src/app/home/toolbar/toolbar.module.ts
+++ b/src/app/home/toolbar/toolbar.module.ts
@@ -1,7 +1,7 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
-import { MatLegacyTabsModule as MatTabsModule } from '@angular/material/legacy-tabs';
+import { MatTabsModule } from '@angular/material/tabs';
import { RouterModule } from '@angular/router';
import { SectionsLinksModule } from '@dsh/app/shared/services/sections-links';
diff --git a/src/app/sections/claim-section/claims/claims-list/claims-list.component.html b/src/app/sections/claim-section/claims/claims-list/claims-list.component.html
index 07c91d6b..da61522a 100644
--- a/src/app/sections/claim-section/claims/claims-list/claims-list.component.html
+++ b/src/app/sections/claim-section/claims/claims-list/claims-list.component.html
@@ -9,9 +9,7 @@
-
-
-
+
diff --git a/src/app/sections/claim-section/claims/claims-list/components/claim-row/claim-row.component.html b/src/app/sections/claim-section/claims/claims-list/components/claim-row/claim-row.component.html
index ef68a3e9..5d5d5197 100644
--- a/src/app/sections/claim-section/claims/claims-list/components/claim-row/claim-row.component.html
+++ b/src/app/sections/claim-section/claims/claims-list/components/claim-row/claim-row.component.html
@@ -15,7 +15,7 @@
>
- {{ item.updatedAt | date: 'dd MMMM yyyy, HH:mm' }}
- {{ item.updatedAt | date: 'dd.MM.yyyy, HH:mm' }}
+ {{ item.updatedAt | date : 'dd MMMM yyyy, HH:mm' }}
+ {{ item.updatedAt | date : 'dd.MM.yyyy, HH:mm' }}
diff --git a/src/app/sections/claim-section/claims/claims-search-filters/components/claim-statuses-filter/claim-statuses-filter.component.html b/src/app/sections/claim-section/claims/claims-search-filters/components/claim-statuses-filter/claim-statuses-filter.component.html
index 19eb3a07..b4e1b44f 100644
--- a/src/app/sections/claim-section/claims/claims-search-filters/components/claim-statuses-filter/claim-statuses-filter.component.html
+++ b/src/app/sections/claim-section/claims/claims-search-filters/components/claim-statuses-filter/claim-statuses-filter.component.html
@@ -2,7 +2,7 @@
*transloco="let t; scope: 'claim-section'; read: 'claimSection.claimStatusesFilter'"
[active]="isActive"
[label]="t('label')"
- [activeLabel]="t('label') | listLabel: (labels$ | async)"
+ [activeLabel]="t('label') | listLabel : (labels$ | async)"
[content]="content"
(save)="save()"
(clear)="clear()"
diff --git a/src/app/sections/claim-section/claims/claims.module.ts b/src/app/sections/claim-section/claims/claims.module.ts
index 22e2f3a3..65a10192 100644
--- a/src/app/sections/claim-section/claims/claims.module.ts
+++ b/src/app/sections/claim-section/claims/claims.module.ts
@@ -2,11 +2,11 @@ import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
+import { MatOptionModule } from '@angular/material/core';
+import { MatFormFieldModule } from '@angular/material/form-field';
import { MatIconModule } from '@angular/material/icon';
-import { MatLegacyOptionModule as MatOptionModule } from '@angular/material/legacy-core';
-import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field';
-import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input';
-import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select';
+import { MatInputModule } from '@angular/material/input';
+import { MatSelectModule } from '@angular/material/select';
import { TranslocoModule } from '@ngneat/transloco';
import { ClaimsService } from '@dsh/app/api/claim-management';
diff --git a/src/app/sections/claim-section/claims/fetch-claims.service.spec.ts b/src/app/sections/claim-section/claims/fetch-claims.service.spec.ts
index e69dc2dc..fd1a9afd 100644
--- a/src/app/sections/claim-section/claims/fetch-claims.service.spec.ts
+++ b/src/app/sections/claim-section/claims/fetch-claims.service.spec.ts
@@ -1,5 +1,5 @@
import { TestBed } from '@angular/core/testing';
-import { MatLegacySnackBarModule as MatSnackBarModule } from '@angular/material/legacy-snack-bar';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
import { TranslocoTestingModule } from '@ngneat/transloco';
import { FetchClaimsService } from './services/fetch-claims/fetch-claims.service';
diff --git a/src/app/sections/claim-section/claims/services/fetch-claims/fetch-claims.service.ts b/src/app/sections/claim-section/claims/services/fetch-claims/fetch-claims.service.ts
index 327b361b..eab90400 100644
--- a/src/app/sections/claim-section/claims/services/fetch-claims/fetch-claims.service.ts
+++ b/src/app/sections/claim-section/claims/services/fetch-claims/fetch-claims.service.ts
@@ -1,5 +1,5 @@
import { Injectable } from '@angular/core';
-import { MatLegacySnackBar as MatSnackBar } from '@angular/material/legacy-snack-bar';
+import { MatSnackBar } from '@angular/material/snack-bar';
import { TranslocoService } from '@ngneat/transloco';
import { Claim } from '@vality/swag-claim-management';
import { Observable } from 'rxjs';
diff --git a/src/app/sections/organization-section/organization-details/change-roles-table/change-roles-table.component.spec.ts b/src/app/sections/organization-section/organization-details/change-roles-table/change-roles-table.component.spec.ts
index 7fd1178d..d9c1259f 100644
--- a/src/app/sections/organization-section/organization-details/change-roles-table/change-roles-table.component.spec.ts
+++ b/src/app/sections/organization-section/organization-details/change-roles-table/change-roles-table.component.spec.ts
@@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common';
import { Component, DebugElement } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ReactiveFormsModule } from '@angular/forms';
-import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog';
+import { MatDialog } from '@angular/material/dialog';
import { By } from '@angular/platform-browser';
import { ApiShopsService } from '@dsh/app/api';
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 bc52fcff..50c8bab2 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,5 +1,5 @@
import { ChangeDetectorRef, Component, EventEmitter, Inject, Input, OnInit, Output } from '@angular/core';
-import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog';
+import { MatDialog } from '@angular/material/dialog';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
import { MemberRole, ResourceScopeId, RoleId } from '@vality/swag-organizations';
import { coerceBoolean } from 'coerce-property';
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 25de3ccd..c52fa26c 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
@@ -2,8 +2,8 @@ import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
-import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox';
-import { MatLegacyRadioModule as MatRadioModule } from '@angular/material/legacy-radio';
+import { MatCheckboxModule } from '@angular/material/checkbox';
+import { MatRadioModule } from '@angular/material/radio';
import { TranslocoModule } from '@ngneat/transloco';
import { BaseDialogModule } from '@dsh/app/shared/components/dialog/base-dialog';
diff --git a/src/app/sections/organization-section/organization-details/change-roles-table/components/select-role-dialog/select-role-dialog.component.spec.ts b/src/app/sections/organization-section/organization-details/change-roles-table/components/select-role-dialog/select-role-dialog.component.spec.ts
index 09b92a8b..95b3d5d3 100644
--- a/src/app/sections/organization-section/organization-details/change-roles-table/components/select-role-dialog/select-role-dialog.component.spec.ts
+++ b/src/app/sections/organization-section/organization-details/change-roles-table/components/select-role-dialog/select-role-dialog.component.spec.ts
@@ -1,10 +1,7 @@
import { Component, DebugElement } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ReactiveFormsModule } from '@angular/forms';
-import {
- MatLegacyDialogRef as MatDialogRef,
- MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA,
-} from '@angular/material/legacy-dialog';
+import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { By } from '@angular/platform-browser';
import { RoleId } from '@vality/swag-organizations';
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 48ffe55d..91283bf9 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,9 +1,6 @@
import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
import { Validators } from '@angular/forms';
-import {
- MatLegacyDialogRef as MatDialogRef,
- MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA,
-} from '@angular/material/legacy-dialog';
+import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { FormBuilder } from '@ngneat/reactive-forms';
import { RoleId } from '@vality/swag-organizations';
diff --git a/src/app/sections/organization-section/organization-details/invitations/components/create-invitation-dialog/create-invitation-dialog.component.spec.ts b/src/app/sections/organization-section/organization-details/invitations/components/create-invitation-dialog/create-invitation-dialog.component.spec.ts
index df11f251..b0d5f806 100644
--- a/src/app/sections/organization-section/organization-details/invitations/components/create-invitation-dialog/create-invitation-dialog.component.spec.ts
+++ b/src/app/sections/organization-section/organization-details/invitations/components/create-invitation-dialog/create-invitation-dialog.component.spec.ts
@@ -1,9 +1,6 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import {
- MatLegacyDialogRef as MatDialogRef,
- MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA,
-} from '@angular/material/legacy-dialog';
+import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { TranslocoTestingModule } from '@ngneat/transloco';
import { InviteeContact } from '@vality/swag-organizations';
import { Shop } from '@vality/swag-payments';
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 f00a2622..907e8384 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,9 +1,6 @@
import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
import { Validators } from '@angular/forms';
-import {
- MatLegacyDialogRef as MatDialogRef,
- MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA,
-} from '@angular/material/legacy-dialog';
+import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { FormBuilder } from '@ngneat/reactive-forms';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
import { InviteeContact, MemberRole } from '@vality/swag-organizations';
diff --git a/src/app/sections/organization-section/organization-details/invitations/components/invitation/invitation.component.html b/src/app/sections/organization-section/organization-details/invitations/components/invitation/invitation.component.html
index cd5858ba..a1e9fa2a 100644
--- a/src/app/sections/organization-section/organization-details/invitations/components/invitation/invitation.component.html
+++ b/src/app/sections/organization-section/organization-details/invitations/components/invitation/invitation.component.html
@@ -7,10 +7,10 @@
- {{ invitation.createdAt | date: 'dd MMMM yyyy, HH:mm' }}
+ {{ invitation.createdAt | date : 'dd MMMM yyyy, HH:mm' }}
- {{ invitation.expiresAt | date: 'dd MMMM yyyy, HH:mm' }}
+ {{ invitation.expiresAt | date : 'dd MMMM yyyy, HH:mm' }}
diff --git a/src/app/sections/organization-section/organization-details/invitations/components/invitation/invitation.component.spec.ts b/src/app/sections/organization-section/organization-details/invitations/components/invitation/invitation.component.spec.ts
index 49261830..44190943 100644
--- a/src/app/sections/organization-section/organization-details/invitations/components/invitation/invitation.component.spec.ts
+++ b/src/app/sections/organization-section/organization-details/invitations/components/invitation/invitation.component.spec.ts
@@ -1,6 +1,6 @@
import { Component, DebugElement } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog';
+import { MatDialog } from '@angular/material/dialog';
import { By } from '@angular/platform-browser';
import { OrgsService } from '@dsh/app/api/organizations';
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 d10b5c75..9524d361 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,5 +1,5 @@
import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
-import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog';
+import { MatDialog } from '@angular/material/dialog';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
import { InlineObject1, Invitation, Organization } from '@vality/swag-organizations';
import { filter, switchMap } from 'rxjs/operators';
diff --git a/src/app/sections/organization-section/organization-details/invitations/invitations.component.spec.ts b/src/app/sections/organization-section/organization-details/invitations/invitations.component.spec.ts
index adb7b4cd..a628eb6f 100644
--- a/src/app/sections/organization-section/organization-details/invitations/invitations.component.spec.ts
+++ b/src/app/sections/organization-section/organization-details/invitations/invitations.component.spec.ts
@@ -1,5 +1,5 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog';
+import { MatDialog } from '@angular/material/dialog';
import { ActivatedRoute } from '@angular/router';
import { InvitationListResult } from '@vality/swag-organizations';
import { cold } from 'jasmine-marbles';
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 e3b54129..91dd5353 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,5 +1,5 @@
import { Component, Inject } from '@angular/core';
-import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog';
+import { MatDialog } from '@angular/material/dialog';
import { ActivatedRoute } from '@angular/router';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
import { filter, first, shareReplay, switchMap } from 'rxjs/operators';
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 56524c0e..7a9c532c 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
@@ -2,11 +2,11 @@ import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexModule, GridModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
+import { MatCheckboxModule } from '@angular/material/checkbox';
import { MatDatepickerModule } from '@angular/material/datepicker';
import { MatDividerModule } from '@angular/material/divider';
-import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox';
-import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input';
-import { MatLegacyRadioModule as MatRadioModule } from '@angular/material/legacy-radio';
+import { MatInputModule } from '@angular/material/input';
+import { MatRadioModule } from '@angular/material/radio';
import { MatMomentDateModule } from '@angular/material-moment-adapter';
import { TranslocoModule } from '@ngneat/transloco';
diff --git a/src/app/sections/organization-section/organization-details/members/components/edit-roles-dialog/edit-roles-dialog.component.spec.ts b/src/app/sections/organization-section/organization-details/members/components/edit-roles-dialog/edit-roles-dialog.component.spec.ts
index b8c46226..6dd0f4fa 100644
--- a/src/app/sections/organization-section/organization-details/members/components/edit-roles-dialog/edit-roles-dialog.component.spec.ts
+++ b/src/app/sections/organization-section/organization-details/members/components/edit-roles-dialog/edit-roles-dialog.component.spec.ts
@@ -1,8 +1,5 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
-import {
- MatLegacyDialogRef as MatDialogRef,
- MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA,
-} from '@angular/material/legacy-dialog';
+import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { OrgsService } from '@dsh/app/api/organizations';
import { ErrorService } from '@dsh/app/shared';
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 15d33c04..fd3610bc 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,8 +1,5 @@
import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
-import {
- MatLegacyDialogRef as MatDialogRef,
- MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA,
-} from '@angular/material/legacy-dialog';
+import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { UntilDestroy } from '@ngneat/until-destroy';
import { MemberRole } from '@vality/swag-organizations';
import { BehaviorSubject, defer, forkJoin, of, Subscription } from 'rxjs';
diff --git a/src/app/sections/organization-section/organization-details/members/components/member/member.component.spec.ts b/src/app/sections/organization-section/organization-details/members/components/member/member.component.spec.ts
index da72f828..d9b3c9e4 100644
--- a/src/app/sections/organization-section/organization-details/members/components/member/member.component.spec.ts
+++ b/src/app/sections/organization-section/organization-details/members/components/member/member.component.spec.ts
@@ -1,6 +1,6 @@
import { Component, DebugElement } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog';
+import { MatDialogModule } from '@angular/material/dialog';
import { By } from '@angular/platform-browser';
import { OrgsService } from '@dsh/app/api/organizations';
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 a43e182d..be1039f7 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,5 +1,5 @@
import { ChangeDetectionStrategy, Component, EventEmitter, Inject, Input, OnChanges, Output } from '@angular/core';
-import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog';
+import { MatDialog } from '@angular/material/dialog';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
import { Member, Organization } from '@vality/swag-organizations';
import { filter, switchMap } from 'rxjs/operators';
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 1ef32323..cc4ceddc 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
@@ -2,11 +2,11 @@ import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { MatDialogModule } from '@angular/material/dialog';
import { MatDividerModule } from '@angular/material/divider';
-import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog';
-import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field';
-import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input';
-import { MatLegacySnackBarModule as MatSnackBarModule } from '@angular/material/legacy-snack-bar';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatInputModule } from '@angular/material/input';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
import { TranslocoModule } from '@ngneat/transloco';
import { OrganizationsModule as OrganizationsAPIModule } from '@dsh/app/api/organizations';
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 0ece9993..9639d865 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,7 +1,7 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
-import { MatLegacyTabsModule as MatTabsModule } from '@angular/material/legacy-tabs';
+import { MatTabsModule } from '@angular/material/tabs';
import { TranslocoModule } from '@ngneat/transloco';
import { OrganizationManagementModule } from '@dsh/app/shared/services/organization-management/organization-management.module';
diff --git a/src/app/sections/organization-section/organizations/components/create-organization-dialog/create-organization-dialog.component.spec.ts b/src/app/sections/organization-section/organizations/components/create-organization-dialog/create-organization-dialog.component.spec.ts
index 47091b11..252190d5 100644
--- a/src/app/sections/organization-section/organizations/components/create-organization-dialog/create-organization-dialog.component.spec.ts
+++ b/src/app/sections/organization-section/organizations/components/create-organization-dialog/create-organization-dialog.component.spec.ts
@@ -1,6 +1,6 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog';
+import { MatDialogRef } from '@angular/material/dialog';
import { By } from '@angular/platform-browser';
import { TranslocoTestingModule } from '@ngneat/transloco';
import { of, throwError } from 'rxjs';
diff --git a/src/app/sections/organization-section/organizations/components/create-organization-dialog/create-organization-dialog.component.ts b/src/app/sections/organization-section/organizations/components/create-organization-dialog/create-organization-dialog.component.ts
index 9ef145d1..3517fbee 100644
--- a/src/app/sections/organization-section/organizations/components/create-organization-dialog/create-organization-dialog.component.ts
+++ b/src/app/sections/organization-section/organizations/components/create-organization-dialog/create-organization-dialog.component.ts
@@ -1,5 +1,5 @@
import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog';
+import { MatDialogRef } from '@angular/material/dialog';
import { FormBuilder } from '@ngneat/reactive-forms';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
import { BehaviorSubject, switchMap } from 'rxjs';
diff --git a/src/app/sections/organization-section/organizations/components/organization/organization.component.spec.ts b/src/app/sections/organization-section/organizations/components/organization/organization.component.spec.ts
index ca743fc0..a3f30539 100644
--- a/src/app/sections/organization-section/organizations/components/organization/organization.component.spec.ts
+++ b/src/app/sections/organization-section/organizations/components/organization/organization.component.spec.ts
@@ -1,12 +1,8 @@
import { Component, DebugElement } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { FlexLayoutModule } from '@angular/flex-layout';
+import { MatDialog, MatDialogModule, MatDialogRef } from '@angular/material/dialog';
import { MatDividerModule } from '@angular/material/divider';
-import {
- MatLegacyDialog as MatDialog,
- MatLegacyDialogModule as MatDialogModule,
- MatLegacyDialogRef as MatDialogRef,
-} from '@angular/material/legacy-dialog';
import { By } from '@angular/platform-browser';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { TranslocoTestingModule } from '@ngneat/transloco';
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 623dc3a0..7d479da8 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,5 +1,5 @@
import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnChanges, Output } from '@angular/core';
-import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog';
+import { MatDialog } from '@angular/material/dialog';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
import { Organization } from '@vality/swag-organizations';
import isNil from 'lodash-es/isNil';
diff --git a/src/app/sections/organization-section/organizations/components/organizations-list/organizations-list.component.html b/src/app/sections/organization-section/organizations/components/organizations-list/organizations-list.component.html
index 3ffe38d1..783e3d27 100644
--- a/src/app/sections/organization-section/organizations/components/organizations-list/organizations-list.component.html
+++ b/src/app/sections/organization-section/organizations/components/organizations-list/organizations-list.component.html
@@ -24,7 +24,7 @@
{{ organization.id }}
-
{{ organization.createdAt | date: 'dd MMMM yyyy, HH:mm' }}
+
{{ organization.createdAt | date : 'dd MMMM yyyy, HH:mm' }}
diff --git a/src/app/sections/organization-section/organizations/components/rename-organization-dialog/rename-organization-dialog.component.spec.ts b/src/app/sections/organization-section/organizations/components/rename-organization-dialog/rename-organization-dialog.component.spec.ts
index 74c3bed1..ed4a1570 100644
--- a/src/app/sections/organization-section/organizations/components/rename-organization-dialog/rename-organization-dialog.component.spec.ts
+++ b/src/app/sections/organization-section/organizations/components/rename-organization-dialog/rename-organization-dialog.component.spec.ts
@@ -1,11 +1,8 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import {
- MatLegacyDialogRef as MatDialogRef,
- MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA,
-} from '@angular/material/legacy-dialog';
-import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field';
-import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input';
+import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatInputModule } from '@angular/material/input';
import { By } from '@angular/platform-browser';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { TranslocoTestingModule } from '@ngneat/transloco';
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 66783800..ea1178ba 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,8 +1,5 @@
import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
-import {
- MatLegacyDialogRef as MatDialogRef,
- MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA,
-} from '@angular/material/legacy-dialog';
+import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { FormBuilder, FormGroup } from '@ngneat/reactive-forms';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
import { BehaviorSubject } from 'rxjs';
diff --git a/src/app/sections/organization-section/organizations/organizations.component.spec.ts b/src/app/sections/organization-section/organizations/organizations.component.spec.ts
index 6cf29e25..60c8e7f9 100644
--- a/src/app/sections/organization-section/organizations/organizations.component.spec.ts
+++ b/src/app/sections/organization-section/organizations/organizations.component.spec.ts
@@ -1,6 +1,6 @@
import { Component, DebugElement } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { MatLegacyDialog as MatDialog, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog';
+import { MatDialog, MatDialogRef } from '@angular/material/dialog';
import { By } from '@angular/platform-browser';
import { TranslocoTestingModule } from '@ngneat/transloco';
import { of } from 'rxjs';
diff --git a/src/app/sections/organization-section/organizations/organizations.component.ts b/src/app/sections/organization-section/organizations/organizations.component.ts
index 475b0649..a0512af9 100644
--- a/src/app/sections/organization-section/organizations/organizations.component.ts
+++ b/src/app/sections/organization-section/organizations/organizations.component.ts
@@ -1,5 +1,5 @@
import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
-import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog';
+import { MatDialog } from '@angular/material/dialog';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
import { filter } from 'rxjs/operators';
diff --git a/src/app/sections/organization-section/organizations/organizations.module.ts b/src/app/sections/organization-section/organizations/organizations.module.ts
index b454573c..91b9b215 100644
--- a/src/app/sections/organization-section/organizations/organizations.module.ts
+++ b/src/app/sections/organization-section/organizations/organizations.module.ts
@@ -2,11 +2,11 @@ import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { MatDialogModule } from '@angular/material/dialog';
import { MatDividerModule } from '@angular/material/divider';
-import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog';
-import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field';
-import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input';
-import { MatLegacySnackBarModule as MatSnackBarModule } from '@angular/material/legacy-snack-bar';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatInputModule } from '@angular/material/input';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
import { TranslocoModule } from '@ngneat/transloco';
import { OrganizationsModule as OrganizationsAPIModule } from '@dsh/app/api/organizations';
diff --git a/src/app/sections/payment-section/analytics/analytics.module.ts b/src/app/sections/payment-section/analytics/analytics.module.ts
index 134ee14f..d1715c5c 100644
--- a/src/app/sections/payment-section/analytics/analytics.module.ts
+++ b/src/app/sections/payment-section/analytics/analytics.module.ts
@@ -2,8 +2,8 @@ import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog';
-import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select';
+import { MatDialogModule } from '@angular/material/dialog';
+import { MatSelectModule } from '@angular/material/select';
import { TranslocoModule } from '@ngneat/transloco';
import { BarChartModule, DonutChartModule } from '@dsh/components/charts';
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 05e6ffbe..adcbb84e 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,7 +1,7 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
-import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select';
+import { MatSelectModule } from '@angular/material/select';
import { TranslocoModule } from '@ngneat/transloco';
import { SpinnerModule } from '@dsh/components/indicators';
diff --git a/src/app/sections/payment-section/analytics/bar-chart-item/bar-chart-item.component.html b/src/app/sections/payment-section/analytics/bar-chart-item/bar-chart-item.component.html
index 3a3ebed6..c3c75448 100644
--- a/src/app/sections/payment-section/analytics/bar-chart-item/bar-chart-item.component.html
+++ b/src/app/sections/payment-section/analytics/bar-chart-item/bar-chart-item.component.html
@@ -1,6 +1,6 @@
- {{ title }}
+ {{ title }}
diff --git a/src/app/sections/payment-section/analytics/donut-chart-item/donut-chart-item.component.html b/src/app/sections/payment-section/analytics/donut-chart-item/donut-chart-item.component.html
index 4c63f6b5..cda86360 100644
--- a/src/app/sections/payment-section/analytics/donut-chart-item/donut-chart-item.component.html
+++ b/src/app/sections/payment-section/analytics/donut-chart-item/donut-chart-item.component.html
@@ -1,6 +1,6 @@
- {{ title }}
+ {{ title }}
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 328d5e5d..bb881bab 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,7 +1,7 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
-import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select';
+import { MatSelectModule } from '@angular/material/select';
import { TranslocoModule } from '@ngneat/transloco';
import { SpinnerModule } from '@dsh/components/indicators';
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 ce3b5a4b..85242d32 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,7 +1,7 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
-import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select';
+import { MatSelectModule } from '@angular/material/select';
import { TranslocoModule } from '@ngneat/transloco';
import { SpinnerModule } from '@dsh/components/indicators';
diff --git a/src/app/sections/payment-section/analytics/payments-error-distribution/error-distribution.ts b/src/app/sections/payment-section/analytics/payments-error-distribution/error-distribution.ts
index e0989191..e180d0ad 100644
--- a/src/app/sections/payment-section/analytics/payments-error-distribution/error-distribution.ts
+++ b/src/app/sections/payment-section/analytics/payments-error-distribution/error-distribution.ts
@@ -1,7 +1,7 @@
import { KNOWN_ERRORS } from './known-errors';
export interface ErrorDistribution {
- errorCode: typeof KNOWN_ERRORS[number] | 'other';
+ errorCode: (typeof KNOWN_ERRORS)[number] | 'other';
percents: number;
subErrors: ErrorDistribution[];
}
diff --git a/src/app/sections/payment-section/analytics/payments-error-distribution/sub-errors-to-error-distribution.ts b/src/app/sections/payment-section/analytics/payments-error-distribution/sub-errors-to-error-distribution.ts
index 7d99e91c..4d5f1f70 100644
--- a/src/app/sections/payment-section/analytics/payments-error-distribution/sub-errors-to-error-distribution.ts
+++ b/src/app/sections/payment-section/analytics/payments-error-distribution/sub-errors-to-error-distribution.ts
@@ -5,8 +5,8 @@ import { ErrorDistribution } from './error-distribution';
import { KNOWN_ERRORS } from './known-errors';
function getDistributionErrorCode(errorCode: string): ErrorDistribution['errorCode'] {
- return KNOWN_ERRORS.includes(errorCode as typeof KNOWN_ERRORS[number])
- ? (errorCode as typeof KNOWN_ERRORS[number])
+ return KNOWN_ERRORS.includes(errorCode as (typeof KNOWN_ERRORS)[number])
+ ? (errorCode as (typeof KNOWN_ERRORS)[number])
: 'other';
}
diff --git a/src/app/sections/payment-section/analytics/percent-difference/percent-difference.component.html b/src/app/sections/payment-section/analytics/percent-difference/percent-difference.component.html
index 8700dd3f..807f6e6b 100644
--- a/src/app/sections/payment-section/analytics/percent-difference/percent-difference.component.html
+++ b/src/app/sections/payment-section/analytics/percent-difference/percent-difference.component.html
@@ -4,6 +4,6 @@
[class.negative-percent-difference]="percents < 0"
[class.positive-percent-difference]="percents > 0"
>
- {{ percents >= 0 ? '+' : '' }}{{ percents | percent: '1.0-2':'en' }}
+ {{ percents >= 0 ? '+' : '' }}{{ percents | percent : '1.0-2' : 'en' }}
-
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 03ff19e6..dbb14036 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,7 +1,7 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
-import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select';
+import { MatSelectModule } from '@angular/material/select';
import { TranslocoModule } from '@ngneat/transloco';
import { SpinnerModule } from '@dsh/components/indicators';
diff --git a/src/app/sections/payment-section/analytics/stat-item/stat-item.component.html b/src/app/sections/payment-section/analytics/stat-item/stat-item.component.html
index 75b791fa..de3540d2 100644
--- a/src/app/sections/payment-section/analytics/stat-item/stat-item.component.html
+++ b/src/app/sections/payment-section/analytics/stat-item/stat-item.component.html
@@ -6,13 +6,13 @@
fxLayoutAlign="space-between"
fxLayoutGap="10px"
>
-
+
{{ statData.current | number }}
- {{ statData.current | amountCurrency: statData.currency:'short' }}
+ {{ statData.current | amountCurrency : statData.currency : 'short' }}
diff --git a/src/app/sections/payment-section/balances/balances.component.html b/src/app/sections/payment-section/balances/balances.component.html
index 570f7419..6e8e1588 100644
--- a/src/app/sections/payment-section/balances/balances.component.html
+++ b/src/app/sections/payment-section/balances/balances.component.html
@@ -10,7 +10,7 @@
*ngFor="let balance of balances$ | async"
[ngClass]="(balancesCount$ | async) <= 3 ? 'dsh-balances-balance-lg' : 'dsh-balances-balance-md'"
>
- {{ balance.amount | amountCurrency: balance.currency:'short' }}
+ {{ balance.amount | amountCurrency : balance.currency : 'short' }}
--/--
diff --git a/src/app/sections/payment-section/integrations/api-key/api-key.module.ts b/src/app/sections/payment-section/integrations/api-key/api-key.module.ts
index a42e99fe..7f38eb97 100644
--- a/src/app/sections/payment-section/integrations/api-key/api-key.module.ts
+++ b/src/app/sections/payment-section/integrations/api-key/api-key.module.ts
@@ -2,7 +2,7 @@ import { ClipboardModule } from '@angular/cdk/clipboard';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexModule } from '@angular/flex-layout';
-import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input';
+import { MatInputModule } from '@angular/material/input';
import { TranslocoModule } from '@ngneat/transloco';
import { ButtonModule } from '@dsh/components/buttons';
diff --git a/src/app/sections/payment-section/integrations/api-keys/api-keys-list/api-keys-list.component.html b/src/app/sections/payment-section/integrations/api-keys/api-keys-list/api-keys-list.component.html
index 76d13102..bf9f43dc 100644
--- a/src/app/sections/payment-section/integrations/api-keys/api-keys-list/api-keys-list.component.html
+++ b/src/app/sections/payment-section/integrations/api-keys/api-keys-list/api-keys-list.component.html
@@ -21,7 +21,7 @@
{{ apiKey.name }}
{{
- apiKey.createdAt | date: 'dd MMMM yyyy, HH:mm'
+ apiKey.createdAt | date : 'dd MMMM yyyy, HH:mm'
}}
{{ apiKey.status }}
@@ -30,7 +30,7 @@
{{ t('details') }} #{{ apiKey.id }}
-
{{ apiKey.createdAt | date: 'dd MMMM yyyy, HH:mm' }}
+
{{ apiKey.createdAt | date : 'dd MMMM yyyy, HH:mm' }}
@@ -44,7 +44,7 @@
{{ apiKey.status }}
- {{ apiKey.createdAt | date: 'dd MMMM yyyy, HH:mm' }}
+ {{ apiKey.createdAt | date : 'dd MMMM yyyy, HH:mm' }}
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 c4d8b11a..40cf432d 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
@@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common';
import { Component, Injector } from '@angular/core';
import { FlexModule } from '@angular/flex-layout';
import { ReactiveFormsModule, NonNullableFormBuilder } from '@angular/forms';
-import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input';
+import { MatInputModule } from '@angular/material/input';
import { TranslocoModule, TranslocoService } from '@ngneat/transloco';
import { untilDestroyed, UntilDestroy } from '@ngneat/until-destroy';
import { DialogSuperclass } from '@vality/ng-core';
diff --git a/src/app/sections/payment-section/integrations/integrations.component.html b/src/app/sections/payment-section/integrations/integrations.component.html
index 93a20e7f..9a6e17c8 100644
--- a/src/app/sections/payment-section/integrations/integrations.component.html
+++ b/src/app/sections/payment-section/integrations/integrations.component.html
@@ -3,7 +3,7 @@
fxLayout="column"
fxLayoutGap="32px"
>
-