From 4e98e9f64ae51ac6e706e99900dacc5b840a1047 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            | 4 ++--
 src/core/features/comments/pages/viewer/viewer.html | 3 ++-
 src/core/features/comments/pages/viewer/viewer.ts   | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/core/components/message/message.html b/src/core/components/message/message.html
index c4815fdb9..9380c0137 100644
--- a/src/core/components/message/message.html
+++ b/src/core/components/message/message.html
@@ -35,8 +35,8 @@
             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 b941f87e2..cee1b18af 100644
--- a/src/core/features/comments/pages/viewer/viewer.html
+++ b/src/core/features/comments/pages/viewer/viewer.html
@@ -12,7 +12,8 @@
         <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"
diff --git a/src/core/features/comments/pages/viewer/viewer.ts b/src/core/features/comments/pages/viewer/viewer.ts
index 43a98924e..ba750924b 100644
--- a/src/core/features/comments/pages/viewer/viewer.ts
+++ b/src/core/features/comments/pages/viewer/viewer.ts
@@ -222,6 +222,7 @@ export class CoreCommentsViewerPage implements OnInit, OnDestroy {
         comment.showDate = this.showDate(comment, prevComment);
         comment.showUserData = this.showUserData(comment, prevComment);
         comment.showTail = this.showTail(comment, prevComment);
+        comment.delete = comment.delete ?? false; // If this property is undefined, core-message assumes comment can be deleted.
     }
 
     /**