fix error handling for web-push

district0x · Sep 29, 2023 · c690bc2 · c690bc2
1 parent 9642873
commit c690bc2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/streamtide/ui/components/error_notification.cljs b/src/streamtide/ui/components/error_notification.cljs
@@ -17,8 +17,8 @@
 
 (defn- parse-error [js-error]
   (let [js-error (if (and (coll? js-error) (not (map? js-error))) (first js-error) js-error)]
-  (-> (js->clj js-error :keywordize-keys true)
-      :message)))
+    (let [{:keys [:message :error]} (js->clj js-error :keywordize-keys true)]
+      (or message error))))
 
 (re-frame/reg-event-fx
   ::show-error

diff --git a/src/streamtide/ui/components/web_push.cljs b/src/streamtide/ui/components/web_push.cljs
@@ -154,6 +154,5 @@
 (re-frame/reg-event-fx
   ::log-and-show
   (fn [{:keys [db]} [_ message details]]
-    (merge
-      {:dispatch-n [[::logging/error message details]
-                    [::error-notification/show-error "Cannot subscribe to push notifications" details]]})))
+    {:dispatch-n [[::logging/error message details]
+                  [::error-notification/show-error "Cannot subscribe to push notifications" [details]]]}))