fixup! Update PNs to use data-only messaging, and only encode/decode data values. Fixes #6772

Author: Pedro Pombeiro

src/status_im/chat/models/message.cljs

@@ -325,7 +325,7 @@
   (when (and fcm-token (= status :sent))
     (let [payload {:from (accounts.db/current-public-key cofx)
                    :to   (get-in cofx [:db :current-chat-id])}]
-      {:send-notification {:data-payload {:msg (js/JSON.stringify (clj->js payload))}
+      {:send-notification {:data-payload (notifications/create-notification-payload payload)
                            :tokens       [fcm-token]}})))
 
 (fx/defn update-message-status [{:keys [db]} chat-id message-id status]

src/status_im/notifications/core.cljs

@@ -32,8 +32,8 @@
 (defn create-notification-payload
   [{:keys [from to] :as payload}]
   (if (and from to)
-    #js {:msg (js/JSON.stringify #js {:from from
-                                      :to   to})}
+    {:msg (js/JSON.stringify #js {:from from
+                                  :to   to})}
     (throw (str "Invalid push notification payload" payload))))
 
 (when platform/desktop?
@@ -65,8 +65,8 @@
       (.. notification
           (setTitle title)
           (setBody body)
-          (setData (create-notification-payload {:from from
-                                                 :to   to}))
+          (setData (clj->js (create-notification-payload {:from from
+                                                          :to to})))
           (setSound sound-name))
       (when platform/android?
         (.. notification