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

pending wallet in default contacts

This commit is contained in:
Andrey Shovkoplyas 2017-10-13 14:18:34 +03:00 committed by Roman Volosovskyi
parent 6b9095d235
commit c2ef0e4547
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/default_contact_groups.json
View File

@ -7,7 +7,6 @@
}, },
"contacts": "contacts":
[ [
"wallet",
"oaken-water-meter", "oaken-water-meter",
"melonport", "melonport",
"bchat", "bchat",

2
resources/default_contacts.json
View File

@ -23,6 +23,7 @@
}, },
"unremovable?": true "unremovable?": true
}, },
"wallet": "wallet":
{ {
"name": "name":
@ -34,6 +35,7 @@
}, },
"photo-path": "icon_wallet_avatar", "photo-path": "icon_wallet_avatar",
"dapp?": true, "dapp?": true,
"pending?": true,
"has-global-command?": true, "has-global-command?": true,
"bot-url": "local://wallet-bot", "bot-url": "local://wallet-bot",
"unremovable?": true "unremovable?": true

5
src/status_im/ui/screens/contacts/events.cljs
View File

@ -214,7 +214,7 @@
(defn- prepare-default-contacts-events [contacts default-contacts] (defn- prepare-default-contacts-events [contacts default-contacts]
[[:add-contacts [[:add-contacts
(for [[id {:keys [name photo-path public-key add-chat? global-command (for [[id {:keys [name photo-path public-key add-chat? global-command
dapp? dapp-url dapp-hash bot-url unremovable?]}] default-contacts dapp? dapp-url dapp-hash bot-url unremovable? pending?]}] default-contacts
:let [id' (clojure.core/name id)] :let [id' (clojure.core/name id)]
:when (not (get contacts id'))] :when (not (get contacts id'))]
{:whisper-identity id' {:whisper-identity id'
@ -227,7 +227,8 @@
:dapp-url (:en dapp-url) :dapp-url (:en dapp-url)
:bot-url bot-url :bot-url bot-url
:global-command global-command :global-command global-command
:dapp-hash dapp-hash})]]) :dapp-hash dapp-hash
:pending? pending?})]])
(defn- prepare-add-chat-events [contacts default-contacts] (defn- prepare-add-chat-events [contacts default-contacts]
(for [[id {:keys [name add-chat?]}] default-contacts (for [[id {:keys [name add-chat?]}] default-contacts

5
test/cljs/status_im/test/contacts/events.cljs
View File

@ -109,8 +109,7 @@
:name "ÐApps" :name "ÐApps"
:order 1 :order 1
:timestamp 0 :timestamp 0
:contacts [{:identity "wallet"} :contacts [{:identity "oaken-water-meter"}
{:identity "oaken-water-meter"}
{:identity "melonport"} {:identity "melonport"}
{:identity "bchat"} {:identity "bchat"}
{:identity "Dentacoin"} {:identity "Dentacoin"}
@ -129,7 +128,7 @@
:bot-url nil :bot-url nil
:whisper-identity "wallet" :whisper-identity "wallet"
:dapp? true :dapp? true
:pending? false :pending? true
:unremovable? true :unremovable? true
:public-key nil}) :public-key nil})