chore(emojis): remove no longer needed default emoji reactions model

jrainville · jrainville · commit 40dc642995a4 · 2025-10-30T14:01:14.000-04:00
diff --git a/src/app/modules/main/chat_section/chat_content/input_area/view.nim b/src/app/modules/main/chat_section/chat_content/input_area/view.nim
@@ -4,7 +4,6 @@ import ./preserved_properties
 import ./urls_model
 import ../../../../../../app/modules/shared_models/link_preview_model as link_preview_model
 import ../../../../../../app/modules/shared_models/payment_request_model as payment_request_model
-import ../../../../../../app/modules/shared_models/default_emoji_reactions_model as default_emoji_reactions_model
 
 QtObject:
   type
@@ -20,8 +19,6 @@ QtObject:
       urlsModelVariant: QVariant
       sendingInProgress: bool
       askToEnableLinkPreview: bool
-      defaultEmojiReactionsModel: default_emoji_reactions_model.Model
-      defaultEmojiReactionsModelVariant: QVariant
 
   proc setSendingInProgress*(self: View, value: bool)
 
@@ -39,8 +36,6 @@ QtObject:
     result.urlsModel = newUrlsModel()
     result.urlsModelVariant = newQVariant(result.urlsModel)
     result.askToEnableLinkPreview = false
-    result.defaultEmojiReactionsModel = newDefaultEmojiReactionsModel()
-    result.defaultEmojiReactionsModelVariant = newQVariant(result.defaultEmojiReactionsModel)
 
   proc load*(self: View) =
     self.delegate.viewDidLoad()
diff --git a/src/app/modules/shared_models/default_emoji_reactions_model.nim b/src/app/modules/shared_models/default_emoji_reactions_model.nim
diff --git a/src/app/modules/shared_models/message_item.nim b/src/app/modules/shared_models/message_item.nim
@@ -7,7 +7,6 @@ import ../../../app_service/service/message/dto/link_preview
 import ../../../app_service/service/message/dto/payment_request
 import ./link_preview_model as link_preview_model
 import ./payment_request_model as payment_request_model
-import ./default_emoji_reactions_model as default_emoji_reactions_model
 
 export types.ContentType
 import message_reaction_model, message_transaction_parameters_item
@@ -53,7 +52,6 @@ type
     deletedByContactDetails: ContactDetails
     links: seq[string]
     linkPreviewModel: link_preview_model.Model
-    defaultEmojiReactionsModel: default_emoji_reactions_model.Model
     transactionParameters: TransactionParametersItem
     mentionedUsersPks: seq[string]
     senderTrustStatus: TrustStatus
@@ -172,7 +170,6 @@ proc initMessageItem*(
     result.pinned = true
   result.links = links
   result.linkPreviewModel = newLinkPreviewModel(linkPreviews)
-  result.defaultEmojiReactionsModel = newDefaultEmojiReactionsModel()
   result.transactionParameters = transactionParameters
   result.mentionedUsersPks = mentionedUsersPks
   result.gapFrom = 0
@@ -515,11 +512,9 @@ proc getReactionId*(self: Item, emoji: string, userPublicKey: string): string =
 proc addReaction*(self: Item, emoji: string, didIReactWithThisEmoji: bool, userPublicKey: string,
   userDisplayName: string, reactionId: string) =
   self.reactionsModel.addReaction(emoji, didIReactWithThisEmoji, userPublicKey, userDisplayName, reactionId)
-  self.defaultEmojiReactionsModel.setItemDidIReactWithThisEmoji(emoji, didIReactWithThisEmoji)
 
 proc removeReaction*(self: Item, emoji: string, reactionId: string, didIRemoveThisReaction: bool) =
   self.reactionsModel.removeReaction(emoji, reactionId, didIRemoveThisReaction)
-  self.defaultEmojiReactionsModel.setItemDidIReactWithThisEmoji(emoji, not didIRemoveThisReaction)
 
 proc messageAttachments*(self: Item): seq[string] {.inline.} =
   self.messageAttachments
@@ -536,9 +531,6 @@ proc linkPreviewModel*(self: Item): link_preview_model.Model {.inline.} =
 proc paymentRequestModel*(self: Item): payment_request_model.Model {.inline.} =
   return self.paymentRequestModel
 
-proc defaultEmojiReactionsModel*(self: Item): default_emoji_reactions_model.Model {.inline.} =
-  return self.defaultEmojiReactionsModel
-
 proc mentionedUsersPks*(self: Item): seq[string] {.inline.} =
   self.mentionedUsersPks
 
diff --git a/src/app/modules/shared_models/message_model.nim b/src/app/modules/shared_models/message_model.nim
@@ -50,7 +50,6 @@ type
     DeletedByContactIcon
     Links
     LinkPreviewModel
-    DefaultEmojiReactionsModel
     TransactionParameters
     MentionedUsersPks
     SenderTrustStatus
@@ -161,7 +160,6 @@ QtObject:
       ModelRole.DeletedByContactIcon.int: "deletedByContactIcon",
       ModelRole.Links.int: "links",
       ModelRole.LinkPreviewModel.int: "linkPreviewModel",
-      ModelRole.DefaultEmojiReactionsModel.int: "defaultEmojiReactionsModel",
       ModelRole.TransactionParameters.int: "transactionParameters",
       ModelRole.MentionedUsersPks.int: "mentionedUsersPks",
       ModelRole.SenderTrustStatus.int: "senderTrustStatus",
@@ -331,8 +329,6 @@ QtObject:
       result = newQVariant(item.links.join(" "))
     of ModelRole.LinkPreviewModel:
       result = newQVariant(item.linkPreviewModel)
-    of ModelRole.DefaultEmojiReactionsModel:
-      result = newQVariant(item.defaultEmojiReactionsModel)
     of ModelRole.TransactionParameters:
       result = newQVariant($(%*{
         "id": item.transactionParameters.id,
diff --git a/storybook/pages/MessageContextMenuViewPage.qml b/storybook/pages/MessageContextMenuViewPage.qml
@@ -15,40 +15,6 @@ SplitView {
 
     Logs { id: logs }
 
-    ListModel {
-        id: defaultEmojiReactionsModel
-        ListElement {
-            emoji: "❤️"
-            filename: "emojiReactions/heart"
-            didIReactWithThisEmoji: false
-        }
-        ListElement {
-            emoji: "👍"
-            filename: "emojiReactions/thumbsUp"
-            didIReactWithThisEmoji: false
-        }
-        ListElement {
-            emoji: "👎"
-            filename: "emojiReactions/thumbsDown"
-            didIReactWithThisEmoji: false
-        }
-        ListElement {
-            emoji: "😂"
-            filename: "emojiReactions/laughing"
-            didIReactWithThisEmoji: false
-        }
-        ListElement {
-            emoji: "😢"
-            filename: "emojiReactions/sad"
-            didIReactWithThisEmoji: false
-        }
-        ListElement {
-            emoji: "😡"
-            filename: "emojiReactions/angry"
-            didIReactWithThisEmoji: false
-        }
-    }
-
     SplitView {
         orientation: Qt.Vertical
         SplitView.fillWidth: true
@@ -71,7 +37,6 @@ SplitView {
                 closePolicy: Popup.NoAutoClose
 
                 messageId: "Oxdeadbeef"
-                defaultEmojiReactionsModel: defaultEmojiReactionsModel
                 emojiModel: StatusQUtils.Emoji.emojiModel
                 // Should still show only 5 emojis even if more are provided
                 recentEmojis: ["1f9de", "1f6fa", "1f44d", "1f44e", "1f602", "1f622", "1f621"]
diff --git a/ui/app/AppLayouts/Chat/stores/RootStore.qml b/ui/app/AppLayouts/Chat/stores/RootStore.qml
@@ -295,8 +295,6 @@ QtObject {
 
     property MessageStore messageStore: MessageStore { }
 
-    property var defaultEmojiReactionsModel
-
     property var globalUtilsInst: globalUtils
 
     property var mainModuleInst: mainModule
diff --git a/ui/app/AppLayouts/Chat/views/ChatMessagesView.qml b/ui/app/AppLayouts/Chat/views/ChatMessagesView.qml
@@ -348,7 +348,6 @@ Item {
             pinnedMessage: model.pinned
             messagePinnedBy: model.pinnedBy
             reactionsModel: model.reactions
-            defaultEmojiReactionsModel: model.defaultEmojiReactionsModel
             sticker: model.sticker
             stickerPack: model.stickerPack
             editModeOn: model.editMode
diff --git a/ui/app/mainui/AppMain.qml b/ui/app/mainui/AppMain.qml
@@ -104,7 +104,6 @@ Item {
         contactsStore: appMain.contactsStore
         currencyStore: appMain.currencyStore
         communityTokensStore: appMain.communityTokensStore
-        defaultEmojiReactionsModel: appMain.rootStore.defaultEmojiReactionsModel
         openCreateChat: createChatView.opened
         networkConnectionStore: appMain.networkConnectionStore
     }
@@ -1918,7 +1917,6 @@ Item {
                                 contactsStore: appMain.contactsStore
                                 currencyStore: appMain.currencyStore
                                 communityTokensStore: appMain.communityTokensStore
-                                defaultEmojiReactionsModel: appMain.rootStore.defaultEmojiReactionsModel
                                 openCreateChat: createChatView.opened
                                 networkConnectionStore: appMain.networkConnectionStore
                                 isChatSectionModule: true
@@ -2244,7 +2242,6 @@ Item {
                             contactsStore: appMain.contactsStore
                             currencyStore: appMain.currencyStore
                             communityTokensStore: appMain.communityTokensStore
-                            defaultEmojiReactionsModel: appMain.rootStore.defaultEmojiReactionsModel
                             openCreateChat: createChatView.opened
                             walletStore: WalletStores.RootStore
                             isChatSectionModule: true
@@ -2322,7 +2319,6 @@ Item {
                                 contactsStore: appMain.contactsStore
                                 currencyStore: appMain.currencyStore
                                 communityTokensStore: appMain.communityTokensStore
-                                defaultEmojiReactionsModel: appMain.rootStore.defaultEmojiReactionsModel
                                 openCreateChat: createChatView.opened
                                 isChatSectionModule: false
                                 communityId: model.id
@@ -2394,7 +2390,6 @@ Item {
                         contactsStore: appMain.contactsStore
                         currencyStore: appMain.currencyStore
                         communityTokensStore: appMain.communityTokensStore
-                        defaultEmojiReactionsModel: appMain.rootStore.defaultEmojiReactionsModel
                         openCreateChat: createChatView.opened
                         isChatSectionModule: true
                     }
diff --git a/ui/imports/shared/controls/chat/MessageReactionsRow.qml b/ui/imports/shared/controls/chat/MessageReactionsRow.qml
@@ -11,7 +11,6 @@ import SortFilterProxyModel
 Row {
     id: root
 
-    property var defaultEmojiReactionsModel
     required property StatusEmojiModel emojiModel
     required property var recentEmojis
     required property string skinColor
diff --git a/ui/imports/shared/views/chat/MessageContextMenuView.qml b/ui/imports/shared/views/chat/MessageContextMenuView.qml
@@ -12,8 +12,6 @@ import shared.controls.chat
 StatusMenu {
     id: root
 
-    // expected roles: emoji:string, filename:string, didIReactWithThisEmoji:bool
-    property var defaultEmojiReactionsModel
     property StatusEmojiModel emojiModel
     property var recentEmojis
     property string skinColor
@@ -54,7 +52,6 @@ StatusMenu {
     MessageReactionsRow {
         id: emojiRow
         visible: !root.emojiReactionLimitReached && (!root.disabledForChat || root.forceEnableEmojiReactions) && !!root.recentEmojis && root.recentEmojis.length > 0
-        defaultEmojiReactionsModel: root.defaultEmojiReactionsModel
         emojiModel: root.emojiModel
         recentEmojis: root.recentEmojis
         skinColor: root.skinColor
diff --git a/ui/imports/shared/views/chat/MessageView.qml b/ui/imports/shared/views/chat/MessageView.qml
@@ -80,7 +80,6 @@ Loader {
     property var paymentRequestModel
     property string messageAttachments: ""
     property var transactionParams
-    property var defaultEmojiReactionsModel
     property var formatBalance
 
     // These 2 properties can be dropped when the new unfurling flow supports GIFs
@@ -1283,7 +1282,6 @@ Loader {
         MessageContextMenuView {
             id: messageContextMenuView
             emojiReactionLimitReached: root.emojiReactionLimitReached
-            defaultEmojiReactionsModel: root.defaultEmojiReactionsModel
             emojiModel: emojiPopup.emojiModel
             recentEmojis: emojiPopup.recentEmojis
             skinColor: emojiPopup.skinColor
