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

Revert "Fixed incorrect parameters provided to Command#yield-control" 

This reverts commit ac1de8c690.

Signed-off-by: Igor Mandrigin <i@mandrigin.ru>
This commit is contained in:
Igor Mandrigin 2019-01-17 14:20:10 +01:00
parent ac1de8c690
commit 4af2073388
No known key found for this signature in database
GPG Key ID: 4A0EDDE26E66BC8B
3 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/status_im/chat/commands/core.cljs
View File

@ -6,7 +6,6 @@
[status-im.chat.constants :as chat.constants] [status-im.chat.constants :as chat.constants]
[status-im.chat.commands.protocol :as protocol] [status-im.chat.commands.protocol :as protocol]
[status-im.chat.commands.impl.transactions :as transactions] [status-im.chat.commands.impl.transactions :as transactions]
[status-im.contact.db :as db]
[status-im.utils.handlers :as handlers] [status-im.utils.handlers :as handlers]
[status-im.utils.fx :as fx])) [status-im.utils.fx :as fx]))
@ -35,16 +34,13 @@
[type] [type]
(keyword (str (protocol/id type) "-button"))) (keyword (str (protocol/id type) "-button")))
(defn- contact->address [contact]
(str "0x" (db/public-key->address contact)))
(defn add-chat-contacts (defn add-chat-contacts
"Enrich command-message by adding contact list of the current private or group chat" "Enrich command-message by adding contact list of the current private or group chat"
[contacts {:keys [public? group-chat] :as command-message}] [contacts {:keys [public? group-chat] :as command-message}]
(cond (cond
public? command-message public? command-message
group-chat (assoc command-message :contacts (map contact->address contacts)) group-chat (assoc command-message :contacts (map status-im.contact.db/public-key->address contacts))
:else (assoc command-message :contact (contact->address (first contacts))))) :else (assoc command-message :contact (status-im.contact.db/public-key->address (first contacts)))))
(defn enrich-command-message-for-events (defn enrich-command-message-for-events
"adds new pairs to command-message to be consumed by extension events" "adds new pairs to command-message to be consumed by extension events"

12
src/status_im/chat/commands/sending.cljs
View File

@ -31,13 +31,13 @@
;; errors during validation ;; errors during validation
{:db (chat/set-chat-ui-props db {:validation-messages validation-error})} {:db (chat/set-chat-ui-props db {:validation-messages validation-error})}
;; no errors ;; no errors
(let [command-message (commands/enrich-command-message-for-events db (create-command-message chat-id type parameter-map cofx))] (if (satisfies? protocol/Yielding type)
(if (satisfies? protocol/Yielding type) ;; yield control implemented, don't send the message
;; yield control implemented, don't send the message (protocol/yield-control type parameter-map cofx)
(protocol/yield-control type command-message cofx) ;; no yield control, proceed with sending the command message
;; no yield control, proceed with sending the command message (let [command-message (create-command-message chat-id type parameter-map cofx)]
(fx/merge cofx (fx/merge cofx
#(protocol/on-send type command-message %) #(protocol/on-send type (commands/enrich-command-message-for-events db command-message) %)
(commands.input/set-command-reference nil) (commands.input/set-command-reference nil)
(chat.message/send-message command-message))))))) (chat.message/send-message command-message)))))))

6
test/cljs/status_im/test/chat/commands/core.cljs
View File

@ -111,9 +111,9 @@
"0x04b790f2c3f4079f35a1fa396465ceb243cc446c9af211d0a1774f869eb9632a67a6e664e24075ec5c5a8a95a509a2a8173dbfeb88af372e784a37fecc1b5c0ba5" "0x04b790f2c3f4079f35a1fa396465ceb243cc446c9af211d0a1774f869eb9632a67a6e664e24075ec5c5a8a95a509a2a8173dbfeb88af372e784a37fecc1b5c0ba5"
"0x04cc3cec3f88dc1a39e224388f0304023fc78c2a7d05e4ebd61638192cc592d2c13d8f081b5d9995dbfcbe45a4ca7eb80d5c505eee660e8fee0df2da222f047287"}) "0x04cc3cec3f88dc1a39e224388f0304023fc78c2a7d05e4ebd61638192cc592d2c13d8f081b5d9995dbfcbe45a4ca7eb80d5c505eee660e8fee0df2da222f047287"})
(def contacts_addresses '("0x5adf1b9e1fa4bd4889fecd598b45079045d98f0e" (def contacts_addresses '("5adf1b9e1fa4bd4889fecd598b45079045d98f0e"
"0x21631d18d9681d4ffdd460fc45fa52159fcd95c8" "21631d18d9681d4ffdd460fc45fa52159fcd95c8"
"0x5541e3be81b76d76cdbf968516caa5a5b773763b")) "5541e3be81b76d76cdbf968516caa5a5b773763b"))
(deftest enrich-command-message-for-events-test-public (deftest enrich-command-message-for-events-test-public
(let [db {:chats {"1" {:contacts nil :public? true :group-chat false}}} (let [db {:chats {"1" {:contacts nil :public? true :group-chat false}}}