From a25bfe419e365ff4e45082a627a99a25980b31ee Mon Sep 17 00:00:00 2001
From: Vitaliy Vlasov <siphiuel@gmail.com>
Date: Fri, 16 Feb 2018 13:06:35 +0200
Subject: [PATCH] Revert "Revert "[FIX #187] Fix address dropdown in My Payment
 Details""

---
 src/cljs/commiteth/common.cljs         | 15 ++++++++-------
 src/cljs/commiteth/handlers.cljs       |  2 +-
 src/cljs/commiteth/update_address.cljs | 25 +++++++++++++++++++------
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/src/cljs/commiteth/common.cljs b/src/cljs/commiteth/common.cljs
index 1213395..4399156 100644
--- a/src/cljs/commiteth/common.cljs
+++ b/src/cljs/commiteth/common.cljs
@@ -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.)
diff --git a/src/cljs/commiteth/handlers.cljs b/src/cljs/commiteth/handlers.cljs
index 20fdd74..3c6cbcd 100644
--- a/src/cljs/commiteth/handlers.cljs
+++ b/src/cljs/commiteth/handlers.cljs
@@ -328,7 +328,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"]))
diff --git a/src/cljs/commiteth/update_address.cljs b/src/cljs/commiteth/update_address.cljs
index b5eb0af..0e6e0df 100644
--- a/src/cljs/commiteth/update_address.cljs
+++ b/src/cljs/commiteth/update_address.cljs
@@ -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]))
 
 (defn update-address-page-contents []
@@ -21,13 +22,25 @@
           [:p "Insert your Ethereum address in hex format."]
           [:div.field
            (if-not (empty? web3-accounts)
-             [dropdown {:class "address-input"} "Select address"
-              address
-              (vec
-               (for [acc web3-accounts]
-                 acc))]
+             ; 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
+                items])
              [:div.ui.input.address-input
-              [input address {:placeholder  "0x0000000000000000000000000000000000000000"
+              [input address {:placeholder "0x0000000000000000000000000000000000000000"
                               :auto-complete "off"
                               :auto-correct "off"
                               :spell-check "false"