"First name" calculation is slightly off #8 [1.2.7]

district0x · Feb 21, 2017 · b80f7f1 · b80f7f1
1 parent 1ff9141
commit b80f7f1
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 5 deletions.
diff --git a/resources/public/index.html b/resources/public/index.html
@@ -26,7 +26,7 @@
   </head>
   <body>
     <div id="app"></div>
-    <script src="./js/compiled/app.js?v=1.2.6"></script>
+    <script src="./js/compiled/app.js?v=1.2.7"></script>
     <script>
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
       (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),

diff --git a/src/cljs/ethlance/components/main_panel.cljs b/src/cljs/ethlance/components/main_panel.cljs
@@ -141,7 +141,7 @@
              [user-anchor
               {:user @active-user}
               [:h3.bolder {:style styles/app-bar-user}
-               (u/first-word (:user/name @active-user))]]
+               (u/butlast-word (:user/name @active-user))]]
              [user-anchor
               {:user @active-user}
               [ui/avatar

diff --git a/src/cljs/ethlance/db.cljs b/src/cljs/ethlance/db.cljs
@@ -435,6 +435,7 @@
                    :ethlance-views {:name "EthlanceViews" :address "0xb7b882d1ea87da8506ba10bfbe8b751246bc3259"}
                    :ethlance-search {:name "EthlanceSearch" :address "0x8c8cf5f0fe7ce048baa9573278c4b44b7a8646e4"}}
    :my-addresses []
+   :my-addresses-forced []
    :active-address nil
    :active-user-events nil
    :my-users-loaded? false

diff --git a/src/cljs/ethlance/events.cljs b/src/cljs/ethlance/events.cljs
@@ -415,7 +415,8 @@
   :blockchain/my-addresses-loaded
   [interceptors (inject-cofx :localstorage)]
   (fn [{:keys [db localstorage]} [addresses]]
-    (let [addresses-map (reduce #(assoc %1 %2 {:address %2}) {} addresses)
+    (let [addresses (if (seq (:my-addresses-forced db)) (:my-addresses-forced db) addresses)
+          addresses-map (reduce #(assoc %1 %2 {:address %2}) {} addresses)
           active-address (if (contains? (set addresses) (:active-address localstorage))
                            (:active-address localstorage)
                            (first addresses))]

diff --git a/src/cljs/ethlance/pages/contract_detail_page.cljs b/src/cljs/ethlance/pages/contract_detail_page.cljs
@@ -17,10 +17,10 @@
   (get-in contract [:contract/job :job/employer]))
 
 (defn employer-first-name [contract]
-  (u/first-word (:user/name (get-employer contract))))
+  (u/butlast-word (:user/name (get-employer contract))))
 
 (defn freelancer-first-name [contract]
-  (u/first-word (:user/name (:contract/freelancer contract))))
+  (u/butlast-word (:user/name (:contract/freelancer contract))))
 
 (defn italic-description [text]
   [:div

diff --git a/src/cljs/ethlance/utils.cljs b/src/cljs/ethlance/utils.cljs
@@ -351,6 +351,13 @@
   (memoize (fn [x]
              (first (string/split x #" ")))))
 
+(def butlast-word
+  (memoize (fn [x]
+             (let [words (string/split x #" ")]
+               (if (> (count words) 1)
+                 (string/join " " (butlast words))
+                 x)))))
+
 (defn sort-by-desc [key-fn coll]
   (sort-by key-fn #(compare %2 %1) coll))