Merge pull request #753 from Infomaniak/signature

fix(ComposeMessageView): Add signature on reply and newMessage
Infomaniak · May 23, 2023 · b4556b9 · b4556b9
2 parents f1869be + 8011eb8
commit b4556b9
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/Mail/Views/New Message/ComposeMessageView.swift b/Mail/Views/New Message/ComposeMessageView.swift
@@ -236,6 +236,7 @@ struct ComposeMessageView: View {
         }
         .task {
             await prepareReplyForwardBodyAndAttachments()
+            await setSignature()
         }
         .navigationViewStyle(.stack)
         .defaultAppStorage(.shared)
@@ -333,29 +334,28 @@ struct ComposeMessageView: View {
             _ = try await prepareBodyTask.value
             _ = try await prepareAttachmentsTask.value
 
-            if draft.identityId == nil || draft.identityId?.isEmpty == true,
-               let signature = mailboxManager.getSignatureResponse() {
-                try await setSignature(signature)
-            }
             isLoadingContent = false
         } catch {
             dismiss()
             IKSnackBar.showSnackBar(message: MailError.unknownError.localizedDescription)
         }
     }
 
-    private func setSignature(_ signatureResponse: SignatureResponse) async throws {
-        $draft.identityId.wrappedValue = "\(signatureResponse.defaultSignatureId)"
-        guard let signature = signatureResponse.default else {
-            return
-        }
+    private func setSignature() async {
+        if draft.identityId == nil || draft.identityId?.isEmpty == true,
+           let signatureResponse = mailboxManager.getSignatureResponse() {
+            $draft.identityId.wrappedValue = "\(signatureResponse.defaultSignatureId)"
+            guard let signature = signatureResponse.default else {
+                return
+            }
 
-        let html = "<br><br><div class=\"editorUserSignature\">\(signature.content)</div>"
-        switch signature.position {
-        case .beforeReplyMessage:
-            $draft.body.wrappedValue.insert(contentsOf: html, at: draft.body.startIndex)
-        case .afterReplyMessage:
-            $draft.body.wrappedValue.append(contentsOf: html)
+            let html = "<br><br><div class=\"editorUserSignature\">\(signature.content)</div>"
+            switch signature.position {
+            case .beforeReplyMessage:
+                $draft.body.wrappedValue.insert(contentsOf: html, at: draft.body.startIndex)
+            case .afterReplyMessage:
+                $draft.body.wrappedValue.append(contentsOf: html)
+            }
         }
     }