|
10 | 10 | [utils.re-frame :as rf]
|
11 | 11 | [utils.i18n :as i18n]
|
12 | 12 | [status-im.utils.utils :as utils]
|
13 |
| - [taoensso.timbre :as log] |
14 |
| - [status-im.ui.screens.chat.components.input :as input])) |
| 13 | + [taoensso.timbre :as log])) |
15 | 14 |
|
16 | 15 | (defn text->emoji
|
17 | 16 | "Replaces emojis in a specified `text`"
|
|
92 | 91 | [{:keys [db] :as cofx} message]
|
93 | 92 | (let [current-chat-id (:current-chat-id db)
|
94 | 93 | text (get-in message [:content :text])]
|
95 |
| - (rf/merge cofx |
96 |
| - {:db (-> db |
97 |
| - (assoc-in [:chat/inputs current-chat-id :metadata :editing-message] |
98 |
| - message) |
99 |
| - (assoc-in [:chat/inputs current-chat-id :metadata :responding-to-message] nil) |
100 |
| - (update-in [:chat/inputs current-chat-id :metadata] |
101 |
| - dissoc |
102 |
| - :sending-image))} |
103 |
| - (input/set-input-text text current-chat-id)))) |
| 94 | + {:db (-> db |
| 95 | + (assoc-in [:chat/inputs current-chat-id :metadata :editing-message] |
| 96 | + message) |
| 97 | + (assoc-in [:chat/inputs current-chat-id :metadata :responding-to-message] nil) |
| 98 | + (update-in [:chat/inputs current-chat-id :metadata] |
| 99 | + dissoc |
| 100 | + :sending-image)) |
| 101 | + :dispatch [:mention/to-input-field text current-chat-id]})) |
104 | 102 |
|
105 | 103 | (rf/defn show-contact-request-input
|
106 | 104 | "Sets reference to previous chat message and focuses on input"
|
|
270 | 268 | {:events [:contacts/send-contact-request]}
|
271 | 269 | [{:keys [db] :as cofx} public-key message]
|
272 | 270 | (rf/merge cofx
|
273 |
| - {:chat.ui/clear-inputs nil |
274 |
| - :chat.ui/clear-inputs-old nil |
275 |
| - :json-rpc/call [{:method "wakuext_sendContactRequest" |
276 |
| - :js-response true |
277 |
| - :params [{:id public-key :message message}] |
278 |
| - :on-error #(log/warn "failed to send a contact request" %) |
279 |
| - :on-success #(re-frame/dispatch [:transport/message-sent %])}]} |
| 271 | + {:chat.ui/clear-inputs nil |
| 272 | + :json-rpc/call [{:method "wakuext_sendContactRequest" |
| 273 | + :js-response true |
| 274 | + :params [{:id public-key :message message}] |
| 275 | + :on-error #(log/warn "failed to send a contact request" %) |
| 276 | + :on-success #(re-frame/dispatch [:transport/message-sent %])}]} |
280 | 277 | (mentions/clear-mentions)
|
281 | 278 | (clean-input (:current-chat-id db))))
|
282 | 279 |
|
|
0 commit comments