fix old stickers

status-im · Aug 31, 2022 · 2b42c61 · 2b42c61
1 parent ca8b721
commit 2b42c61
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/status_im/chat/models/input.cljs b/src/status_im/chat/models/input.cljs
@@ -244,12 +244,12 @@
                                      :text              (i18n/label :t/update-to-listen-audio {"locale" "en"})})))
 
 (fx/defn send-sticker-message
-  [cofx {:keys [hash packID]} current-chat-id]
-  (when-not (or (string/blank? hash) (string/blank? packID))
+  [cofx {:keys [hash packID pack]} current-chat-id]
+  (when-not (or (string/blank? hash) (and (string/blank? packID) (string/blank? pack)))
     (chat.message/send-message cofx {:chat-id      current-chat-id
                                      :content-type constants/content-type-sticker
                                      :sticker {:hash hash
-                                               :pack (int packID)}
+                                               :pack (int (if (string/blank? packID) pack packID))}
                                      :text    (i18n/label :t/update-to-see-sticker {"locale" "en"})})))
 
 (fx/defn send-edited-message [{:keys [db] :as cofx} text {:keys [message-id]}]
@@ -306,15 +306,15 @@
 
 (fx/defn chat-send-sticker
   {:events [:chat/send-sticker]}
-  [{{:keys [current-chat-id] :as db} :db :as cofx} {:keys [hash packID] :as sticker}]
+  [{{:keys [current-chat-id] :as db} :db :as cofx} {:keys [hash packID pack] :as sticker}]
   (fx/merge
    cofx
    {:db (update db
                 :stickers/recent-stickers
                 (fn [recent]
                   (conj (remove #(= hash (:hash %)) recent) sticker)))
     ::json-rpc/call [{:method     "stickers_addRecent"
-                      :params     [(int packID) hash]
+                      :params     [(int (if (string/blank? packID) pack packID)) hash]
                       :on-success #()}]}
    (send-sticker-message sticker current-chat-id)))
 

diff --git a/src/status_im/multiaccounts/update/core.cljs b/src/status_im/multiaccounts/update/core.cljs
@@ -44,7 +44,7 @@
   "Add 'url' parameter to stickers that are synchronized from other devices.
    It is not sent from aanother devices but we have it in our db."
   [synced-stickers stickers-from-db]
-  (mapv #(assoc % :url (->> (get stickers-from-db (:packID %))
+  (mapv #(assoc % :url (->> (get stickers-from-db (or (:packID %) (:pack %)))
                             (:stickers)
                             (filter (fn [sticker-db] (= (:hash sticker-db) (:hash %))))
                             (first)