Merge branch 'release/4.1.0' into develop

1 files changed, 8 insertions, 2 deletions

diff --git a/client/src/app/modal/confirm.component.ts b/client/src/app/modal/confirm.component.ts
index 457dd1f3f..ec4e1d60f 100644
--- a/client/src/app/modal/confirm.component.ts
+++ b/client/src/app/modal/confirm.component.ts
@@ -1,4 +1,5 @@
 import { Component, ElementRef, OnInit, ViewChild } from '@angular/core'
+import { HtmlRendererService } from '@app/core'
 import { ConfirmService } from '@app/core/confirm/confirm.service'
 import { POP_STATE_MODAL_DISMISS } from '@app/helpers'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
@@ -24,6 +25,7 @@ export class ConfirmComponent implements OnInit {
 
   constructor (
     private modalService: NgbModal,
+    private html: HtmlRendererService,
     private confirmService: ConfirmService
   ) { }
 
@@ -31,14 +33,18 @@ export class ConfirmComponent implements OnInit {
     this.confirmService.showConfirm.subscribe(
       ({ title, message, expectedInputValue, inputLabel, confirmButtonText }) => {
         this.title = title
-        this.message = message
 
         this.inputLabel = inputLabel
         this.expectedInputValue = expectedInputValue
 
         this.confirmButtonText = confirmButtonText || $localize`Confirm`
 
-        this.showModal()
+        this.html.toSafeHtml(message)
+          .then(message => {
+            this.message = message
+
+            this.showModal()
+          })
       }
     )
   }