From 5dd9cd5831fda3deb27d6a46cb2f903de020cbd1 Mon Sep 17 00:00:00 2001
From: project_703_bot_497bb7eb186ca592c63b3e50cd5c69e1
 <project_703_bot_497bb7eb186ca592c63b3e50cd5c69e1@noreply.gitlab.knecon.com>
Date: Fri, 17 May 2024 01:03:44 +0000
Subject: [PATCH 1/3] push back localazy update

---
 apps/red-ui/src/assets/i18n/redact/de.json | 19 +++++++++++++++++++
 apps/red-ui/src/assets/i18n/scm/de.json    | 19 +++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/apps/red-ui/src/assets/i18n/redact/de.json b/apps/red-ui/src/assets/i18n/redact/de.json
index 73336c0c0..02c8abe6c 100644
--- a/apps/red-ui/src/assets/i18n/redact/de.json
+++ b/apps/red-ui/src/assets/i18n/redact/de.json
@@ -681,6 +681,25 @@
     }
   },
   "dev-mode": "DEV",
+  "dialog-defaults-form": {
+    "extra-option-label": "Apply to all active and future dossiers",
+    "hint": {
+      "add-dialog": "Add hint",
+      "remove-dialog": "Remove hint",
+      "title": "Hint"
+    },
+    "recommendation": {
+      "remove-dialog": "Remove recommendation",
+      "title": "Recommendation"
+    },
+    "redaction": {
+      "add-dialog": "Redact text",
+      "remove-dialog": "Remove redaction",
+      "title": "Redaction"
+    },
+    "system-default": "Use system default",
+    "title": "Dialog defaults"
+  },
   "dictionary": "Wörterbuch",
   "dictionary-overview": {
     "compare": {
diff --git a/apps/red-ui/src/assets/i18n/scm/de.json b/apps/red-ui/src/assets/i18n/scm/de.json
index 42aa67419..0824ef3ef 100644
--- a/apps/red-ui/src/assets/i18n/scm/de.json
+++ b/apps/red-ui/src/assets/i18n/scm/de.json
@@ -681,6 +681,25 @@
     }
   },
   "dev-mode": "DEV",
+  "dialog-defaults-form": {
+    "extra-option-label": "",
+    "hint": {
+      "add-dialog": "",
+      "remove-dialog": "",
+      "title": ""
+    },
+    "recommendation": {
+      "remove-dialog": "",
+      "title": ""
+    },
+    "redaction": {
+      "add-dialog": "",
+      "remove-dialog": "",
+      "title": ""
+    },
+    "system-default": "",
+    "title": ""
+  },
   "dictionary": "Wörterbuch",
   "dictionary-overview": {
     "compare": {

From 9a651e372559d7ebb7de48b88f46b79cffca3ddd Mon Sep 17 00:00:00 2001
From: Nicoleta Panaghiu <nicoleta.panaghiu.ext@knecon.com>
Date: Fri, 17 May 2024 13:10:19 +0300
Subject: [PATCH 2/3] RED-9131: implemented design changes.

---
 .../base-account-screen-component.html                |  2 +-
 .../base-account-screen-component.ts                  | 11 ++++++++---
 .../dialog-defaults/dialog-defaults.component.html    |  6 +++---
 .../dialog-defaults/dialog-defaults.component.scss    |  4 ++++
 .../screens/preferences/preferences.component.html    |  1 +
 .../screens/preferences/preferences.component.scss    |  1 -
 .../src/app/translations/account-translations.ts      |  1 -
 7 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/apps/red-ui/src/app/modules/account/base-account-screen/base-account-screen-component.html b/apps/red-ui/src/app/modules/account/base-account-screen/base-account-screen-component.html
index 1597a1874..081ea0edc 100644
--- a/apps/red-ui/src/app/modules/account/base-account-screen/base-account-screen-component.html
+++ b/apps/red-ui/src/app/modules/account/base-account-screen/base-account-screen-component.html
@@ -8,7 +8,7 @@
             <div class="content-container full-height">
                 <div class="overlay-shadow"></div>
                 <div class="dialog">
-                    <div class="dialog-header">
+                    <div *ngIf="!shouldHideTitle" class="dialog-header">
                         <div class="heading-l" [translate]="translations[path]"></div>
                     </div>
 
diff --git a/apps/red-ui/src/app/modules/account/base-account-screen/base-account-screen-component.ts b/apps/red-ui/src/app/modules/account/base-account-screen/base-account-screen-component.ts
index 2bb8b28f8..5345190e8 100644
--- a/apps/red-ui/src/app/modules/account/base-account-screen/base-account-screen-component.ts
+++ b/apps/red-ui/src/app/modules/account/base-account-screen/base-account-screen-component.ts
@@ -11,16 +11,21 @@ import { accountTranslations } from '@translations/account-translations';
 export class BaseAccountScreenComponent implements OnInit {
     readonly translations = accountTranslations;
     readonly path: string;
+    readonly shouldHideTitle: boolean;
 
-    constructor(private readonly _router: Router, private readonly _hostRef: ViewContainerRef) {
+    constructor(
+        private readonly _router: Router,
+        private readonly _hostRef: ViewContainerRef,
+    ) {
         this.path = this._router.url.split('/').pop();
+        this.shouldHideTitle = this.path === 'warnings-preferences';
     }
 
     ngOnInit(): void {
-        this._setDialogWidth();
+        this.#setDialogWidth();
     }
 
-    private _setDialogWidth() {
+    #setDialogWidth() {
         const element = this._hostRef.element.nativeElement as HTMLElement;
         element.style.setProperty('--width', this.path === 'user-profile' ? 'unset' : '100%');
     }
diff --git a/apps/red-ui/src/app/modules/account/screens/preferences/dialog-defaults/dialog-defaults.component.html b/apps/red-ui/src/app/modules/account/screens/preferences/dialog-defaults/dialog-defaults.component.html
index 67efc5106..11a3af117 100644
--- a/apps/red-ui/src/app/modules/account/screens/preferences/dialog-defaults/dialog-defaults.component.html
+++ b/apps/red-ui/src/app/modules/account/screens/preferences/dialog-defaults/dialog-defaults.component.html
@@ -1,7 +1,7 @@
 <form [formGroup]="form">
     <div class="dialog-content">
         <h1>{{ 'dialog-defaults-form.title' | translate }}</h1>
-        <h2>{{ 'dialog-defaults-form.redaction.title' | translate }}</h2>
+        <h3>{{ 'dialog-defaults-form.redaction.title' | translate }}</h3>
         <div class="iqser-input-group w-450">
             <label translate="dialog-defaults-form.redaction.add-dialog"></label>
             <mat-form-field>
@@ -28,7 +28,7 @@
                 'dialog-defaults-form.extra-option-label' | translate
             }}</mat-checkbox>
         </div>
-        <h2>{{ 'dialog-defaults-form.recommendation.title' | translate }}</h2>
+        <h3>{{ 'dialog-defaults-form.recommendation.title' | translate }}</h3>
         <div class="iqser-input-group w-450">
             <label translate="dialog-defaults-form.recommendation.remove-dialog"></label>
             <mat-form-field>
@@ -42,7 +42,7 @@
                 'dialog-defaults-form.extra-option-label' | translate
             }}</mat-checkbox>
         </div>
-        <h2>{{ 'dialog-defaults-form.hint.title' | translate }}</h2>
+        <h3>{{ 'dialog-defaults-form.hint.title' | translate }}</h3>
         <div class="iqser-input-group w-450">
             <label translate="dialog-defaults-form.hint.add-dialog"></label>
             <mat-form-field>
diff --git a/apps/red-ui/src/app/modules/account/screens/preferences/dialog-defaults/dialog-defaults.component.scss b/apps/red-ui/src/app/modules/account/screens/preferences/dialog-defaults/dialog-defaults.component.scss
index 8b82b1023..4584dd57c 100644
--- a/apps/red-ui/src/app/modules/account/screens/preferences/dialog-defaults/dialog-defaults.component.scss
+++ b/apps/red-ui/src/app/modules/account/screens/preferences/dialog-defaults/dialog-defaults.component.scss
@@ -1,3 +1,7 @@
 mat-checkbox {
     margin: 8px 0 0 8px;
 }
+
+.dialog-actions {
+    border-top: none;
+}
diff --git a/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.html b/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.html
index 1102780a9..d8954aa2d 100644
--- a/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.html
+++ b/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.html
@@ -1,4 +1,5 @@
 <redaction-dialog-defaults *ngIf="currentScreen === screens.WARNING_PREFERENCES && !config.IS_DOCUMINE"></redaction-dialog-defaults>
+<div *ngIf="currentScreen === screens.WARNING_PREFERENCES" class="content-delimiter"></div>
 
 <form [formGroup]="form">
     <div class="dialog-content">
diff --git a/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.scss b/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.scss
index 984c6af08..efe894308 100644
--- a/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.scss
+++ b/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.scss
@@ -2,7 +2,6 @@
 
 .content-delimiter {
     border-top: 1px solid var(--iqser-separator);
-    margin-bottom: 15px;
 }
 
 .warnings-description {
diff --git a/apps/red-ui/src/app/translations/account-translations.ts b/apps/red-ui/src/app/translations/account-translations.ts
index 77ca13811..88b9efac4 100644
--- a/apps/red-ui/src/app/translations/account-translations.ts
+++ b/apps/red-ui/src/app/translations/account-translations.ts
@@ -4,5 +4,4 @@ export const accountTranslations: Record<string, string> = {
     notifications: _('notifications-screen.title'),
     'user-profile': _('user-profile-screen.title'),
     preferences: _('preferences-screen.title'),
-    'warnings-preferences': _('preferences-screen.warnings-title'),
 };

From d4706a62bd6a81c2b4e98b5a461659919edc9f08 Mon Sep 17 00:00:00 2001
From: Nicoleta Panaghiu <nicoleta.panaghiu.ext@knecon.com>
Date: Fri, 17 May 2024 14:55:00 +0300
Subject: [PATCH 3/3] RED-9012: fixed cosmetical issue.

---
 .../redact-text-dialog/redact-text-dialog.component.html      | 4 ++--
 .../redact-text-dialog/redact-text-dialog.component.scss      | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.html
index f2d6315d2..b0906c3e3 100644
--- a/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.html
+++ b/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.html
@@ -33,7 +33,7 @@
                                 (action)="toggleEditingSelectedText()"
                                 *ngIf="dictionaryRequest && !isEditingSelectedText"
                                 [tooltip]="'redact-text.dialog.content.edit-text' | translate"
-                                [size]="18"
+                                [size]="20"
                                 [iconSize]="13"
                                 icon="iqser:edit"
                                 tooltipPosition="below"
@@ -44,7 +44,7 @@
                                 *ngIf="isEditingSelectedText"
                                 [showDot]="initialText !== form.get('selectedText').value"
                                 [tooltip]="'redact-text.dialog.content.revert-text' | translate"
-                                [size]="18"
+                                [size]="20"
                                 [iconSize]="13"
                                 class="undo-button"
                                 icon="red:undo"
diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.scss b/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.scss
index c774426d3..22fe3116d 100644
--- a/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.scss
+++ b/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.scss
@@ -19,6 +19,10 @@ iqser-circle-button {
     &.undo-button {
         margin-left: 8px;
     }
+
+    ::ng-deep mat-icon {
+        padding: 2px;
+    }
 }
 
 .w-full {