diff --git a/ui-ngx/src/app/modules/home/pages/notification/recipient/recipient-notification-dialog.componet.scss b/ui-ngx/src/app/modules/home/pages/notification/recipient/recipient-notification-dialog.componet.scss
index 25d51c040b..8406cae3fe 100644
--- a/ui-ngx/src/app/modules/home/pages/notification/recipient/recipient-notification-dialog.componet.scss
+++ b/ui-ngx/src/app/modules/home/pages/notification/recipient/recipient-notification-dialog.componet.scss
@@ -42,12 +42,8 @@
.mat-mdc-radio-button {
flex: 1 1 100%;
padding: 4px;
- border: 1px solid rgba(0, 0, 0, 0.1);
+ border: 1px solid rgba(0, 0, 0, 0.12);
border-radius: 6px;
-
- &.mat-mdc-radio-checked {
- border-color: map_get($tb-accent, 500);
- }
}
}
diff --git a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html
index 3d7f0b8ef3..dfe68d6c26 100644
--- a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html
@@ -112,7 +112,7 @@
notification.time
-
+
diff --git a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.componet.ts b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.componet.ts
index b910a4cb99..66ed42a3b7 100644
--- a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.componet.ts
+++ b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.componet.ts
@@ -129,7 +129,13 @@ export class SentNotificationDialogComponent extends
this.dialogTitle = 'notification.new-notification';
}
if (data.request) {
+ this.notificationRequestForm.reset({}, {emitEvent: false});
this.notificationRequestForm.patchValue(this.data.request, {emitEvent: false});
+ // eslint-disable-next-line guard-for-in
+ for (const method in this.data.request.template.configuration.deliveryMethodsTemplates) {
+ this.deliveryMethodFormsMap.get(NotificationDeliveryMethod[method])
+ .patchValue(this.data.request.template.configuration.deliveryMethodsTemplates[method]);
+ }
}
}
diff --git a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-table-config.resolver.ts b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-table-config.resolver.ts
index a71951a28b..285d6c1434 100644
--- a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-table-config.resolver.ts
+++ b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-table-config.resolver.ts
@@ -173,7 +173,7 @@ export class SentTableConfigResolver implements Resolve
${countError} ${this.translate.instant('notification.fails')} >
`;
@@ -182,8 +182,7 @@ export class SentTableConfigResolver implements Resolve