From 993d83045b7e6f8804fd948f79c4c74f144b2eb7 Mon Sep 17 00:00:00 2001
From: Bryce Covert <contact.bryce@brycecovertoperations.com>
Date: Sat, 4 May 2019 07:36:39 -0700
Subject: [PATCH] minor cleanup.

---
 src/cljs/auto_ap/views/pages/transactions.cljs       |  7 ++++---
 src/cljs/auto_ap/views/pages/transactions/table.cljs | 11 +----------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/cljs/auto_ap/views/pages/transactions.cljs b/src/cljs/auto_ap/views/pages/transactions.cljs
index 6f4afc77..373b9098 100644
--- a/src/cljs/auto_ap/views/pages/transactions.cljs
+++ b/src/cljs/auto_ap/views/pages/transactions.cljs
@@ -120,7 +120,7 @@
                      [:li (:description-original transaction) "-" (:details error)])]])))
             [:div.is-pulled-right
              [:div.buttons 
-              [:button.button.is-danger {:on-click (dispatch-event [::manual/opening])}
+              [:button.button.is-outlined.is-primary {:on-click (dispatch-event [::manual/opening])}
                "Manual Yodlee Import"]]]])
          [table/table {:id :transactions
                        :params (re-frame/subscribe [::params])
@@ -128,7 +128,7 @@
                        :status (re-frame/subscribe [::subs/status])
                        :on-params-change (fn [params]
                                            (re-frame/dispatch [::params-change params]))}]
-         [manual/modal {:import-completed [::manual-import-completed ]}]]))
+         ]))
     {:component-will-mount #(re-frame/dispatch-sync [::params-change {}]) }))
 
 (defn transactions-page []
@@ -155,7 +155,8 @@
 
       :bottom [:div [vendor-dialog {:vendor @(re-frame/subscribe [::subs/user-editing-vendor])
                                     :save-event [::events/save-vendor]
-                                    :change-event [::events/change-nested-form-state [:user-editing-vendor]] :id :auto-ap.views.main/user-editing-vendor}]]
+                                    :change-event [::events/change-nested-form-state [:user-editing-vendor]] :id :auto-ap.views.main/user-editing-vendor}]
+               [manual/modal {:import-completed [::manual-import-completed ]}]]
       :right-side-bar [appearing-side-bar
                        {:visible? transaction-bar-active?}
                        [edit/form {:edit-completed [::edit-completed]}]]}]))
diff --git a/src/cljs/auto_ap/views/pages/transactions/table.cljs b/src/cljs/auto_ap/views/pages/transactions/table.cljs
index 41dc6f2e..d95c3435 100644
--- a/src/cljs/auto_ap/views/pages/transactions/table.cljs
+++ b/src/cljs/auto_ap/views/pages/transactions/table.cljs
@@ -79,14 +79,6 @@
                             :asc asc}
              "Amount"]
 
-            [sorted-column {:on-sort opc
-                            :style {:width "8em" :cursor "pointer"}
-                            :sort-key "account"
-                            :class "has-text-right"
-                            :sort-by sort-by
-                            :asc asc}
-             "Account"]
-
             [sorted-column {:on-sort opc
                             :style {:width "8em" :cursor "pointer"}
                             :sort-key "status"
@@ -111,11 +103,10 @@
                        [:i.has-text-grey (str "Merchant '" (:name yodlee-merchant)  "'")]
 
                        :else
-                       [:i.has-text-grey (str "Unknown Merchant")])]
+                       [:i.has-text-grey (str description-original)])]
                 #_[:td description-original]
                 [:td (date->str date) ]
                 [:td.has-text-right (nf amount )]
-                [:td (:name account)]
                 [:td status]
                 [:td (:name bank-account )]
                 [:td.expandable