#1086 Added multiline support to signature badge

FlowCrypt/App/GeneralConstants.swift

@@ -23,6 +23,7 @@ enum GeneralConstants {
 
     enum Global {
         static let attachmentSizeLimit = 10_000_000
+        static let signatureSeparator = "______"
     }
 
     enum Mock {

FlowCrypt/Controllers/Threads/Extensions/ThreadDetailsDecorator.swift

@@ -80,11 +80,14 @@ extension ThreadMessageInfoCellNode.Input {
             return nil
         }
 
+        let components = signature.message.components(separatedBy: GeneralConstants.Global.signatureSeparator)
         return BadgeNode.Input(
             icon: signature.icon,
-            text: NSAttributedString.text(from: signature.message, style: .regular(12), color: .white),
+            text: components[safe: 0]?.attributed(.regular(12), color: .white),
+            additionalText: components[safe: 1]?.attributed(.regular(12), color: .white),
             color: signature.color,
-            textAccessibilityIdentifier: "aid-signature-badge"
+            textAccessibilityIdentifier: "aid-signature-badge",
+            additionalTextAccessibilityIdentifier: "aid-signature-additional-text"
         )
     }
 }

FlowCrypt/Functionality/Mail Provider/Message Provider/ProcessedMessage.swift

@@ -36,10 +36,12 @@ struct ProcessedMessage {
             case .unsigned:
                 return "message_not_signed".localized
             case let .error(message):
-                return "message_signature_verify_error".localizeWithArguments(message.lowercasingFirstLetter())
+                let signaturErrorString = "message_signature_verify_error".localized
+                return signaturErrorString + GeneralConstants.Global.signatureSeparator + message.lowercasingFirstLetter()
             case let .missingPubkey(longid):
-                let message = "message_missing_pubkey".localizeWithArguments(longid)
-                return "message_signature_verify_error".localizeWithArguments(message)
+                let missigngPubKeyString = "message_missing_pubkey".localizeWithArguments(longid.spaced(every: 4))
+                let signaturErrorString = "message_signature_verify_error".localized
+                return signaturErrorString + GeneralConstants.Global.signatureSeparator + missigngPubKeyString
             case .partial:
                 return "message_signature_partial".localized
             case .bad:

FlowCrypt/Resources/en.lproj/Localizable.strings

@@ -64,7 +64,7 @@
 "message_not_signed" = "not signed";
 "message_missing_pubkey" = "no public key %@";
 "message_signature_partial" = "only partially signed";
-"message_signature_verify_error" = "cannot verify signature: %@";
+"message_signature_verify_error" = "cannot verify signature";
 "message_bad_signature" = "bad signature";
 "message_signature_pending" = "verifying signature...";
 "message_signature_fail_reason" = "Failed to verify signature due to: %@";

FlowCryptUI/Cell Nodes/ThreadMessageInfoCellNode.swift

@@ -137,6 +137,8 @@ public final class ThreadMessageInfoCellNode: CellNode {
         let spacer = ASLayoutSpec()
         spacer.style.flexGrow = 1.0
 
+        signatureNode?.style.flexShrink = 1.0
+
         return ASStackLayoutSpec(
             direction: .horizontal,
             spacing: 4,

FlowCryptUI/Nodes/BadgeNode.swift

@@ -12,17 +12,23 @@ public final class BadgeNode: ASDisplayNode {
     public struct Input {
         public let icon: String?
         public let text: NSAttributedString?
+        public let additionalText: NSAttributedString?
         public let color: UIColor?
         public let textAccessibilityIdentifier: String
+        public let additionalTextAccessibilityIdentifier: String?
 
         public init(icon: String?,
                     text: NSAttributedString?,
+                    additionalText: NSAttributedString? = nil,
                     color: UIColor?,
-                    textAccessibilityIdentifier: String) {
+                    textAccessibilityIdentifier: String,
+                    additionalTextAccessibilityIdentifier: String? = nil) {
             self.icon = icon
             self.text = text
+            self.additionalText = additionalText
             self.color = color
             self.textAccessibilityIdentifier = textAccessibilityIdentifier
+            self.additionalTextAccessibilityIdentifier = additionalTextAccessibilityIdentifier
         }
     }
 
@@ -36,7 +42,9 @@ public final class BadgeNode: ASDisplayNode {
     }()
 
     private let textNode = ASTextNode2()
+    private let additionalTextNode = ASTextNode2()
     private let input: BadgeNode.Input
+    private var showAdditionalText = false
 
     init(input: BadgeNode.Input) {
         self.input = input
@@ -45,18 +53,37 @@ public final class BadgeNode: ASDisplayNode {
         automaticallyManagesSubnodes = true
 
         textNode.attributedText = input.text
+        additionalTextNode.attributedText = input.additionalText
         textNode.accessibilityIdentifier = input.textAccessibilityIdentifier
+        additionalTextNode.accessibilityIdentifier = input.additionalTextAccessibilityIdentifier
         backgroundColor = input.color
         cornerRadius = 4
+        DispatchQueue.main.async {
+            self.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.handleTap)))
+        }
+    }
+
+    @objc private func handleTap() {
+        if input.additionalText != nil {
+            showAdditionalText = !showAdditionalText
+            setNeedsLayout()
+        }
     }
 
     override public func layoutSpecThatFits(_: ASSizeRange) -> ASLayoutSpec {
+        let textSpec = ASStackLayoutSpec(
+            direction: .vertical,
+            spacing: 5.0,
+            justifyContent: .start,
+            alignItems: .start,
+            children: showAdditionalText ? [textNode, additionalTextNode] : [textNode]
+        )
         let contentSpec = ASStackLayoutSpec(
             direction: .horizontal,
             spacing: 2,
             justifyContent: .spaceBetween,
             alignItems: .center,
-            children: [iconNode, textNode].compactMap { $0 }
+            children: [iconNode, textSpec].compactMap { $0 }
         )
 
         return ASInsetLayoutSpec(

appium/tests/screenobjects/email.screen.ts

@@ -29,6 +29,7 @@ const SELECTORS = {
   SENDER_EMAIL: '~aid-message-sender-label',
   ENCRYPTION_BADGE: '~aid-encryption-badge',
   SIGNATURE_BADGE: '~aid-signature-badge',
+  SIGNATURE_ADDITIONAL_TEXT_BADGE: '~aid-signature-additional-text',
   ATTACHMENT_TEXT_VIEW: '~aid-attachment-text-view',
   PUBLIC_KEY_LABEL: '~aid-public-key-label',
   FINGEPRINT_LABEL_VALUE: '~aid-fingerprint-value',
@@ -143,6 +144,10 @@ class EmailScreen extends BaseScreen {
     return $(SELECTORS.SIGNATURE_BADGE);
   }
 
+  get additionalSignatureTextBadge() {
+    return $(SELECTORS.SIGNATURE_ADDITIONAL_TEXT_BADGE);
+  }
+
   get publicKeyLabel() {
     return $(SELECTORS.PUBLIC_KEY_LABEL);
   }
@@ -348,8 +353,13 @@ class EmailScreen extends BaseScreen {
     await ElementHelper.checkStaticText(await this.encryptionBadge, value);
   };
 
-  checkSignatureBadge = async (value: string) => {
+  checkSignatureBadge = async (value: string, additionalText?: string) => {
+    const signatureBadge = await this.signatureBadge;
     await ElementHelper.checkStaticText(await this.signatureBadge, value);
+    if (additionalText) {
+      await ElementHelper.waitAndClick(signatureBadge);
+      await ElementHelper.checkStaticText(await this.additionalSignatureTextBadge, additionalText);
+    }
   };
 
   checkAttachmentTextView = async (value: string) => {

appium/tests/specs/mock/inbox/CheckAllEmailSignatureCases.spec.ts

@@ -63,13 +63,13 @@ describe('INBOX: ', () => {
       await MailFolderScreen.clickOnEmailBySubject('Signed only message where the pubkey is not available');
 
       await EmailScreen.checkEncryptionBadge('not encrypted');
-      await EmailScreen.checkSignatureBadge('cannot verify signature: no public key A54D82BE1521D20E');
+      await EmailScreen.checkSignatureBadge('cannot verify signature', 'no public key A54D 82BE 1521 D20E');
       await EmailScreen.clickBackButton();
 
       // signed only message that was tempered during transit
       await MailFolderScreen.clickOnEmailBySubject('Signed only message that was tempered during transit');
       await EmailScreen.checkEncryptionBadge('not encrypted');
-      await EmailScreen.checkSignatureBadge('cannot verify signature: signed digest did not match');
+      await EmailScreen.checkSignatureBadge('cannot verify signature', 'signed digest did not match');
       await EmailScreen.clickBackButton();
 
       // partially signed only message