Merge pull request #240 from status-im/fix/metamask-address-not-updated-#187

[FIX #187] Fix address dropdown in My Payment Details
This commit is contained in:
Vitaliy Vlasov 2018-02-06 16:21:35 +02:00 committed by GitHub
commit 83d37cd5e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 14 deletions

View File

@ -12,16 +12,17 @@
:on-change #(reset! val-ratom (-> % .-target .-value))})]))
(defn dropdown [props title val-ratom items]
"If val-ratom is set, preselect it in the dropdown.
Otherwise, prepend title as a disabled option."
(fn []
(if (= 1 (count items))
(reset! val-ratom (first items)))
[:select.ui.basic.selection.dropdown
(merge props {:on-change
#(reset! val-ratom (-> % .-target .-value))})
(doall (for [item items]
^{:key item} [:option
{:value item}
item]))]))
#(reset! val-ratom (-> % .-target .-value))
:default-value (or @val-ratom title)})
(for [item items]
^{:key item} [:option {:value item
:disabled (= item title)}
item])]))
(defn moment-timestamp [time]
(let [now (.now js/Date.)

View File

@ -327,7 +327,7 @@
:http {:method POST
:url "/api/user/address"
:on-success #(do
(dispatch [:assoc-in [:user [:address] address]])
(dispatch [:assoc-in [:user :address] address])
(dispatch [:set-flash-message
:success
"Address saved"]))

View File

@ -3,6 +3,7 @@
[commiteth.common :refer [input dropdown]]
[reagent.core :as r]
[reagent.crypt :as crypt]
[clojure.string :as str]
[cljs-web3.eth :as web3-eth]))
@ -22,11 +23,23 @@
[:p "Insert your Ethereum address in hex format."]
[:div.field
(if-not (empty? web3-accounts)
[dropdown {:class "address-input"} "Select address"
; Add value of address if it's missing from items list.
; If address is empty, add title
(let [accounts (map str/lower-case web3-accounts)
addr @address
title "Select address"
addr-not-in-web3? (and addr (as-> web3-accounts acc
(map str/lower-case acc)
(set acc)
(contains? acc addr)
(not acc)))
items (cond->> web3-accounts
addr-not-in-web3? (into [addr])
(not addr) (into [title]))]
[dropdown {:class "address-input"}
title
address
(vec
(for [acc web3-accounts]
acc))]
items])
[:div.ui.input.address-input
[input address {:placeholder "0x0000000000000000000000000000000000000000"
:auto-complete "off"