diff --git a/src/cljs/auto_ap/effects.cljs b/src/cljs/auto_ap/effects.cljs
index 726b1a15..535d54d3 100644
--- a/src/cljs/auto_ap/effects.cljs
+++ b/src/cljs/auto_ap/effects.cljs
@@ -20,5 +20,5 @@
                         :url uri})
          (<! )
          :body
-         (conj [on-success])
+         (conj on-success)
          (re-frame/dispatch)))))
diff --git a/src/cljs/auto_ap/events.cljs b/src/cljs/auto_ap/events.cljs
index 9b0d58e5..3f6f451d 100644
--- a/src/cljs/auto_ap/events.cljs
+++ b/src/cljs/auto_ap/events.cljs
@@ -21,30 +21,27 @@
  (fn  [db [_ new-invoices]]
    (assoc-in db [:invoices] new-invoices)))
 
-(re-frame/reg-event-db
- ::invoices-approved
- (fn  [db [_ new-invoices]]
-   (assoc-in db [:invoices :pending] new-invoices)))
-
-(re-frame/reg-event-db
- ::invoices-rejected
- (fn  [db [_ new-invoices]]
-   (assoc-in db [:invoices :pending] new-invoices)))
-
 (re-frame/reg-event-fx
  ::approve-invoices
  (fn  [cofx [_]]
    {:http {:method :post
            :uri "/api/invoices/approve"
-           :on-success ::invoices-approved
+           :on-success [::received-invoices :pending]
            }}))
 
+(re-frame/reg-event-fx
+ ::view-unpaid-invoices
+ (fn [cofx []]
+   {:http {:method :get
+           :uri "/api/invoices/unpaid"
+           :on-success [::received-invoices :unpaid]}}))
+
 (re-frame/reg-event-fx
  ::reject-invoices
  (fn  [cofx [_]]
    {:http {:method :post
            :uri "/api/invoices/reject"
-           :on-success ::invoices-rejected
+           :on-success [::received-invoices :pending]
            }}))
 
 (re-frame/reg-event-db
diff --git a/src/cljs/auto_ap/views.cljs b/src/cljs/auto_ap/views.cljs
index 50cdc2a9..6a20d72a 100644
--- a/src/cljs/auto_ap/views.cljs
+++ b/src/cljs/auto_ap/views.cljs
@@ -67,12 +67,7 @@
                       [:td invoice-number]
                       [:td date]
                       [:td total]])]]]))
-     {:component-did-mount (fn []
-                             (go
-                               (->> (<! (http/get "/api/invoices/unpaid"))
-                                    :body
-                                    (conj [::events/received-invoices :unpaid])
-                                    (re-frame/dispatch))))})])
+     {:component-did-mount #(re-frame/dispatch [::events/view-unpaid-invoices]) })])
 
 (defmethod active-page :paid-invoices []
   [:div {:class "inbox-messages"}