Merge branch 'hotfix/1.22.1' into develop

# Conflicts: # db/schema.rb
2021-11-22 23:35:44 +05:30
parent 1a8b8f0900 791d90c6b7
commit 0033a35ab8
38 changed files with 211 additions and 95 deletions
--- a/spec/models/conversation_spec.rb
+++ b/spec/models/conversation_spec.rb
@@ -399,7 +399,8 @@ RSpec.describe Conversation, type: :model do
        additional_attributes: {},
        meta: {
          sender: conversation.contact.push_event_data,
-          assignee: conversation.assignee
+          assignee: conversation.assignee,
+          hmac_verified: conversation.contact_inbox.hmac_verified
        },
        id: conversation.display_id,
        messages: [],