From fe97ea3093555e5233be81974f05ef0be01d6bac Mon Sep 17 00:00:00 2001
From: Mauro <34335419+Velin92@users.noreply.github.com>
Date: Mon, 26 Jun 2023 12:33:15 +0200
Subject: [PATCH] Handling cancelled as a sendingFailed case (#1161)

* handling cancelled as a sendingFailed case

* changelog
---
 .../View/Supplementary/TimelineItemStatusView.swift         | 2 --
 ElementX/Sources/Services/Timeline/TimelineItemProxy.swift  | 6 ++----
 changelog.d/1160.bugfix                                     | 1 +
 3 files changed, 3 insertions(+), 6 deletions(-)
 create mode 100644 changelog.d/1160.bugfix

diff --git a/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineItemStatusView.swift b/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineItemStatusView.swift
index ff542bbcc..f4f8068b7 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineItemStatusView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineItemStatusView.swift
@@ -74,8 +74,6 @@ struct TimelineItemStatusView: View {
                         context.sendFailedConfirmationDialogInfo = .init(transactionID: timelineItem.properties.transactionID)
                     }
             }
-        case .cancelled:
-            EmptyView()
         }
     }
 
diff --git a/ElementX/Sources/Services/Timeline/TimelineItemProxy.swift b/ElementX/Sources/Services/Timeline/TimelineItemProxy.swift
index aee9fa4be..0b82acdc6 100644
--- a/ElementX/Sources/Services/Timeline/TimelineItemProxy.swift
+++ b/ElementX/Sources/Services/Timeline/TimelineItemProxy.swift
@@ -39,7 +39,6 @@ enum TimelineItemDeliveryStatus: Hashable {
     case sending
     case sent
     case sendingFailed
-    case cancelled
 }
 
 /// A light wrapper around event timeline items returned from Rust.
@@ -66,12 +65,11 @@ struct EventTimelineItemProxy {
         switch localSendState {
         case .notSentYet:
             return .sending
-        case .sendingFailed:
+        // cancelled is exactly like sendingFailed but does not contain an error
+        case .sendingFailed, .cancelled:
             return .sendingFailed
         case .sent:
             return .sent
-        case .cancelled:
-            return .cancelled
         }
     }
         
diff --git a/changelog.d/1160.bugfix b/changelog.d/1160.bugfix
new file mode 100644
index 000000000..41e786733
--- /dev/null
+++ b/changelog.d/1160.bugfix
@@ -0,0 +1 @@
+Handled the cancelled state of a message properly as a failure state.
\ No newline at end of file