[#20905] fix: notification seen state and context background

status-im · Sep 3, 2024 · cf6eef2 · cf6eef2
1 parent fb72c02
commit cf6eef2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/src/status_im/contexts/shell/activity_center/notification/dapp_connection/view.cljs b/src/status_im/contexts/shell/activity_center/notification/dapp_connection/view.cljs
@@ -25,11 +25,13 @@
        :context             [[quo/context-tag
                               {:type      :dapp
                                :size      24
+                               :blur?     true
                                :dapp-logo dapp-icon-url
                                :dapp-name (utils.url/url-host dapp-url)}]
                              (i18n/label :t/via)
                              [quo/context-tag
                               {:type      :dapp
                                :size      24
+                               :blur?     true
                                :dapp-logo (quo.resources/get-dapp :wallet-connect)
                                :dapp-name "WalletConnect"}]]}]]))
diff --git a/src/status_im/contexts/wallet/wallet_connect/events.cljs b/src/status_im/contexts/wallet/wallet_connect/events.cljs
@@ -316,19 +316,24 @@
 
 (rf/reg-event-fx
  :wallet-connect/persist-session
+ (fn [_ [session-info]]
+   {:fx [[:json-rpc/call
+          [{:method     "wallet_addWalletConnectSession"
+            :params     [(js/JSON.stringify session-info)]
+            :on-success [:wallet-connect/persist-session-success]
+            :on-error   #(log/info "Wallet Connect session persistence failed" %)}]]]}))
+
+(rf/reg-event-fx
+ :wallet-connect/persist-session-success
  (fn [_ [session-info]]
    (let [redirect-url (-> session-info
                           (js->clj :keywordize-keys true)
                           (wallet-connect-core/get-dapp-redirect-url))]
-     {:fx [[:json-rpc/call
-            [{:method     "wallet_addWalletConnectSession"
-              :params     [(js/JSON.stringify session-info)]
-              :on-success (fn []
-                            (log/info "Wallet Connect session persisted")
-                            (rf/dispatch [:wallet-connect/fetch-persisted-sessions])
-                            (rf/dispatch [:activity-center.notifications/fetch-unread-count])
-                            (rf/dispatch [:wallet-connect/redirect-to-dapp redirect-url]))
-              :on-error   #(log/info "Wallet Connect session persistence failed" %)}]]]})))
+     (log/info "Wallet Connect session persisted")
+     {:fx [[:dispatch [:wallet-connect/fetch-active-sessions]]
+           [:activity-center.notifications/fetch-unread-count]
+           [:activity-center/update-seen-state]
+           [[:dispatch [:wallet-connect/redirect-to-dapp redirect-url]]]]})))
 
 (rf/reg-event-fx
  :wallet-connect/disconnect-session