Resolve conflicts on Rebase/Element-1.9.10 into Tchap

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,7 +2,6 @@
 
 - [ ] I read the [contributing guide](https://github.com/element-hq/element-ios/blob/develop/CONTRIBUTING.md).
 - [ ] Pull request contains a [changelog label](https://github.com/element-hq/element-x-ios/blob/develop/CONTRIBUTING.md#changelog).
-- [ ] Pull request includes a [sign off](https://github.com/matrix-org/matrix-ios-sdk/blob/develop/CONTRIBUTING.md#sign-off).
 
 **UI changes have been tested with:**
 - [ ] iPhone and iPad simulators in portrait and landscape orientations.

.swiftlint.yml

@@ -9,6 +9,7 @@ opt_in_rules:
   - private_action
   - explicit_init
   - shorthand_optional_binding
+  - trailing_closure
 
 included:
   - ElementX

CHANGES.md

@@ -1,3 +1,52 @@
+## Changes in 1.9.9 (2024-12-05)
+
+### What's Changed
+
+🙌 Improvements
+* Added historical message error label string by @Velin92 in https://github.com/element-hq/element-x-ios/pull/3580
+* increase ringing timeout from 15 seconds to 90 seconds by @fkwp in https://github.com/element-hq/element-x-ios/pull/3584
+* Compound SendButton v2 by @pixlwave in https://github.com/element-hq/element-x-ios/pull/3589
+
+🧱 Build
+* Add new development assets and use in mocks/previews. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/3581
+* Fix UI snapshots. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/3585
+
+Others
+* Update sdk to 1.0.78 by @Velin92 in https://github.com/element-hq/element-x-ios/pull/3586
+
+### New Contributors
+* @fkwp made their first contribution in https://github.com/element-hq/element-x-ios/pull/3584
+
+**Full Changelog**: https://github.com/element-hq/element-x-ios/compare/1.9.8...1.9.9
+
+## Changes in 1.9.8 (2024-12-03)
+
+### What's Changed
+
+✨ Features
+* Enable local echoes for media uploads for all builds. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/3579
+
+🙌 Improvements
+* Add support for copying a caption. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/3563
+* Move pinned messages button in details by @Velin92 in https://github.com/element-hq/element-x-ios/pull/3575
+* Add a warning to the media caption composer. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/3574
+* Knock a room - added a char counter for the message by @Velin92 in https://github.com/element-hq/element-x-ios/pull/3570
+
+🐛 Bugfixes
+* Small Knock adjustments by @Velin92 in https://github.com/element-hq/element-x-ios/pull/3568
+* Wait until the sync has stopped before marking a background task as complete. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/3564
+* Handle media source validation more gracefully. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/3571
+
+🗣 Translations
+* Translations update by @RiotRobot in https://github.com/element-hq/element-x-ios/pull/3576
+
+Others
+* Make the Unit Test media files into development assets. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/3569
+* Update SDK 1.0.77 by @Velin92 in https://github.com/element-hq/element-x-ios/pull/3578
+
+
+**Full Changelog**: https://github.com/element-hq/element-x-ios/compare/1.9.7...1.9.8
+
 ## Changes in 1.9.7 (2024-11-28)
 
 ### What's Changed

Dangerfile.swift

@@ -24,47 +24,10 @@ if danger.github.pullRequest.body?.isEmpty ?? true {
     warn("Please provide a description for this PR.")
 }
 
-// Check for a ticket number
-if let ticketNumberRegex = try? NSRegularExpression(pattern: "#\\d+") {
-    let missingTicketNumber = !danger.git.commits.filter {
-        !$0.message.contains("element-hq/element-x-ios/issues/") &&
-            ticketNumberRegex.firstMatch(in: $0.message, options: [], range: .init(location: 0, length: $0.message.utf16.count)) == nil
-    }.isEmpty
-
-    if missingTicketNumber {
-        warn("Some of the commits are missing ticket numbers. Please consider squashing all commits that don't have a tracking number.")
-    }
-}
-
-// Check for a sign-off
-let signOff = "Signed-off-by:"
-
-let allowList = ["stefanceriu",
-                 "pixlwave",
-                 "langleyd",
-                 "manuroe",
-                 "Velin92"]
-
-let requiresSignOff = !allowList.contains(where: {
-    $0.caseInsensitiveCompare(danger.github.pullRequest.user.login) == .orderedSame
-})
-
-if requiresSignOff {
-    let hasPRBodySignOff = danger.github.pullRequest.body?.contains(signOff) ?? false
-
-    let isMissingCommitsSignOff = !danger.git.commits.filter {
-        !$0.message.contains(signOff)
-    }.isEmpty
-
-    if !hasPRBodySignOff, isMissingCommitsSignOff {
-        warn("Please add a sign-off to either the PR description or to the commits themselves.")
-    }
-}
-
 // Check for screenshots on view changes
 let hasChangedViews = !editedFiles.filter { $0.lowercased().contains("/view") }.isEmpty
 if hasChangedViews {
-    if (danger.github.pullRequest.body?.contains("user-images") ?? false) == false {
+    if (danger.github.pullRequest.body?.contains("user-attachments") ?? false) == false {
         warn("You seem to have made changes to views. Please consider adding screenshots.")
     }
 }
@@ -75,11 +38,15 @@ if hasPngs {
     warn("You seem to have made changes to some resource images. Please consider using an SVG or PDF.")
 }
 
+// Check for nice PR titles
+let prTitle = danger.github.pullRequest.title
 let fixesRegex = try! Regex("(Fixes|Fix) #\\d+")
-if danger.github.pullRequest.title.hasSuffix("…") || danger.github.pullRequest.title.starts(with: fixesRegex) {
+let semanticRegex = try! Regex("\\w+\\(\\w+\\):")
+if prTitle.hasSuffix("…") || prTitle.starts(with: fixesRegex) || prTitle.starts(with: semanticRegex) {
     fail("Please provide a complete title that can be used as a changelog entry.")
 }
 
+// Check for changelog tags
 if danger.github.issue.labels.filter({ $0.name.hasPrefix("pr-") }).count != 1 {
     fail("Please add a `pr-` label to categorise the changelog entry.")
 }