From 6d80cd68426e459d1fc2de76000df6f9dc890121 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 11 Oct 2023 11:08:34 +0200
Subject: [PATCH] MOBILE-4362 comments: Fix delete button displayed when it
 shouldn't

The show delete button icon now also changes so it's clearer that something happened, otherwise if you cannot delete any of the comments you see it could seem that the button does nothing
---
 src/core/components/message/message.html            | 8 ++++----
 src/core/features/comments/pages/viewer/viewer.html | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/core/components/message/message.html b/src/core/components/message/message.html
index c4815fdb95b..1e912935b90 100644
--- a/src/core/components/message/message.html
+++ b/src/core/components/message/message.html
@@ -31,12 +31,12 @@
             <ion-icon *ngIf="message.pending" name="fas-clock" [attr.aria-label]="'core.notsent' | translate" role="status"></ion-icon>
         </div>
 
-        <ion-button *ngIf="showDelete && !message.deleted && message.delete !== false" fill="clear" [@coreSlideInOut]="'fromRight'"
-            color="danger" (click)="delete($event)" [attr.aria-label]="'addon.messages.deletemessage' | translate" class="delete-button">
+        <ion-button *ngIf="showDelete && !message.deleted && message.delete" fill="clear" [@coreSlideInOut]="'fromRight'" color="danger"
+            (click)="delete($event)" [attr.aria-label]="'addon.messages.deletemessage' | translate" class="delete-button">
             <ion-icon name="fas-trash" slot="icon-only" aria-hidden="true"></ion-icon>
         </ion-button>
-        <ion-button *ngIf="showDelete && message.deleted" fill="clear" color="danger" (click)="undoDelete($event)"
-            [attr.aria-label]="'core.restore' | translate" class="delete-button">
+        <ion-button *ngIf="showDelete && message.deleted" fill="clear" [@coreSlideInOut]="'fromRight'" color="danger"
+            (click)="undoDelete($event)" [attr.aria-label]="'core.restore' | translate" class="delete-button">
             <ion-icon name="fas-rotate-left" slot="icon-only" aria-hidden="true"></ion-icon>
         </ion-button>
     </div>
diff --git a/src/core/features/comments/pages/viewer/viewer.html b/src/core/features/comments/pages/viewer/viewer.html
index b941f87e2de..cee1b18afab 100644
--- a/src/core/features/comments/pages/viewer/viewer.html
+++ b/src/core/features/comments/pages/viewer/viewer.html
@@ -12,7 +12,8 @@ <h1>
         <ion-buttons slot="end">
             <ion-button *ngIf="canDeleteComments" slot="end" fill="clear" (click)="toggleDelete()"
                 [attr.aria-label]="'core.toggledelete' | translate">
-                <ion-icon name="fas-pen" slot="icon-only" aria-hidden="true"></ion-icon>
+                <ion-icon *ngIf="!showDelete" name="fas-pen" slot="icon-only" aria-hidden="true"></ion-icon>
+                <ion-icon *ngIf="showDelete" name="fas-check" slot="icon-only" aria-hidden="true"></ion-icon>
             </ion-button>
             <core-context-menu>
                 <core-context-menu-item [hidden]="!(commentsLoaded && !hasOffline)" [priority]="100" [content]="'core.refresh' | translate"