Merge branch 'master' into master-ios

apps/ios/Shared/Views/Chat/ChatView.swift

@@ -493,7 +493,7 @@ struct ChatView: View {
                 if ci.meta.itemDeleted == nil,
                    let file = ci.file,
                    file.cancellable {
-                    menu.append(cancelFileUIAction(file.fileId))
+                    menu.append(cancelFileUIAction(file.fileId, sent: ci.chatDir.sent))
                 }
                 if !live || !ci.meta.isLive {
                     menu.append(deleteUIAction())
@@ -585,16 +585,15 @@ struct ChatView: View {
             }
         }
 
-        private func cancelFileUIAction(_ fileId: Int64) -> UIAction {
+        private func cancelFileUIAction(_ fileId: Int64, sent: Bool) -> UIAction {
             UIAction(
-                title: NSLocalizedString("Cancel", comment: "chat item action"),
-                image: UIImage(systemName: "xmark"),
-                attributes: [.destructive]
+                title: NSLocalizedString("Stop file", comment: "chat item action"),
+                image: UIImage(systemName: "xmark")
             ) { _ in
                 AlertManager.shared.showAlert(Alert(
-                    title: Text("Cancel file transfer?"),
-                    message: Text("File transfer will be cancelled. If it's in progress it will be stoppped."),
-                    primaryButton: .destructive(Text("Confirm")) {
+                    title: Text(sent ? "Stop sending file?" : "Stop receiving file?"),
+                    message: Text(sent ? "Sending file will be stopped." : "Receiving file will be stopped."),
+                    primaryButton: .destructive(Text("Stop")) {
                         Task {
                             if let user = ChatModel.shared.currentUser {
                                 await cancelFile(user: user, fileId: fileId)

package.yaml

@@ -1,5 +1,5 @@
 name: simplex-chat
-version: 4.6.1.2
+version: 5.0.0.0
 #synopsis:
 #description:
 homepage: https://github.com/simplex-chat/simplex-chat#readme

simplex-chat.cabal

@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack
 
 name:           simplex-chat
-version:        4.6.1.2
+version:        5.0.0.0
 category:       Web, System, Services, Cryptography
 homepage:       https://github.com/simplex-chat/simplex-chat#readme
 author:         simplex.chat