status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Denormalize message on replying 

Before we stored only the message-id and had a subscription pulling the
message from the database when replying to the message.
This broke once we implemented offloading of messages, as the message
might not be in the database anymore.
This commit fixes the issue by storing the full message in the database,
so in the event of it being offloaded it is still shown.

Signed-off-by: Andrea Maria Piana <andrea.maria.piana@gmail.com>
This commit is contained in:
Andrea Maria Piana 2020-05-18 15:52:12 +02:00
parent 6a42969e31
commit 80c6a516d8
No known key found for this signature in database
GPG Key ID: AA6CCA6DE0E06424
5 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/status_im/chat/models/input.cljs
View File

@ -75,11 +75,11 @@
(fx/defn reply-to-message
"Sets reference to previous chat message and focuses on input"
[{:keys [db] :as cofx} message-id]
[{:keys [db] :as cofx} message]
(let [current-chat-id (:current-chat-id db)]
(fx/merge cofx
{:db (assoc-in db [:chats current-chat-id :metadata :responding-to-message]
{:message-id message-id})}
message)}
(chat-input-focus :input-ref))))
(fx/defn cancel-message-reply

4
src/status_im/events.cljs
View File

@ -546,8 +546,8 @@
(handlers/register-handler-fx
:chat.ui/reply-to-message
(fn [cofx [_ message-id]]
(chat.input/reply-to-message cofx message-id)))
(fn [cofx [_ message]]
(chat.input/reply-to-message cofx message)))
(handlers/register-handler-fx
:chat.ui/send-current-message

5
src/status_im/i18n_resources.cljs
View File

@ -13,8 +13,7 @@
(conj #{:en} default-device-language)))
(def translations
{
:ar (js/require "../translations/ar.json")
{:ar (js/require "../translations/ar.json")
:en (js/require "../translations/en.json")
:es (js/require "../translations/es.json")
:es_419 (js/require "../translations/es_419.json")
@ -47,7 +46,7 @@
;; translations
(def translations-by-locale
(cond->
{:en (require-translation :en)}
{:en (require-translation :en)}
(not= :en default-device-language)
(assoc default-device-language
(require-translation (-> (name default-device-language)

4
src/status_im/subs.cljs
View File

@ -834,8 +834,8 @@
(re-frame/reg-sub
:chats/reply-message
:<- [:chats/current-chat]
(fn [{:keys [metadata messages]}]
(get messages (get-in metadata [:responding-to-message :message-id]))))
(fn [{:keys [metadata]}]
(:responding-to-message metadata)))
(re-frame/reg-sub
:public-chat.new/topic-error-message

4
src/status_im/ui/screens/chat/sheets.cljs
View File

@ -162,7 +162,7 @@
:accessibility-label :delete-transaction-button
:on-press #(hide-sheet-and-dispatch [:chat.ui/delete-message chat-id message-id])}]]))
(defn message-long-press [{:keys [message-id content identicon from outgoing]}]
(defn message-long-press [{:keys [content identicon from outgoing] :as message}]
(fn []
(let [{:keys [ens-name alias]} @(re-frame/subscribe [:contacts/contact-name-by-identity from])]
[react/view
@ -180,7 +180,7 @@
{:theme :action
:title :t/message-reply
:icon :main-icons/reply
:on-press #(hide-sheet-and-dispatch [:chat.ui/reply-to-message message-id])}]
:on-press #(hide-sheet-and-dispatch [:chat.ui/reply-to-message message])}]
[list-item/list-item
{:theme :action
:title :t/sharing-copy-to-clipboard