[#20150] fix: reviewer's feedback

Author: mohsen-ghafouri

src/status_im/common/router.cljs

@@ -38,9 +38,12 @@
   [path]
   (map #(str % path) status-web-urls))
 
-
 (def handled-schemes (set (into uri-schemes status-web-urls)))
 
+(defn wc-normalize-uri
+  [uri]
+  (if (string/includes? uri "//wc:") (string/replace-first uri "/?" "?") uri))
+
 (def group-chat-extractor
   {[#"(.*)" :params] {""  :group-chat
                       "/" :group-chat}})
@@ -96,16 +99,16 @@
         (if equal-end-of-base64url (string/replace-first uri equal-end-of-base64url "") uri)
 
         ;;bidi has issue to detect wc regex with /?, couldn't fine any other workaround
-        normalize-url
-        (if (string/includes? uri "//wc:") (string/replace-first uri "/?" "?") uri-without-equal-in-path)
+        normalize-uri
+        (wc-normalize-uri uri-without-equal-in-path)
 
         ;; fragment is the one after `#`, usually user-id, ens-name, community-id
         fragment (parse-fragment uri)
         ens? (utils.ens/is-valid-eth-name? fragment)
         compressed-key? (validators/valid-compressed-key? fragment)
 
         {:keys [handler route-params query-params] :as parsed}
-        (assoc (bidi/match-route routes normalize-url)
+        (assoc (bidi/match-route routes normalize-uri)
                :uri          uri
                :query-params (parse-query-params uri))]
     (cond-> parsed
@@ -148,7 +151,7 @@
       (assoc-in [:route-params :uri]
        (if (get query-params "uri")
          (get query-params "uri")
-         (remove-scheme normalize-url))))))
+         (remove-scheme normalize-uri))))))
 
 (defn match-contact-async
   [chain {:keys [user-id ens-name]} callback]

src/status_im/contexts/wallet/wallet_connect/core.cljs

@@ -59,12 +59,11 @@
          (filter (fn [session]
                    (= (utils.string/remove-trailing-slash dapp-url)
                       (utils.string/remove-trailing-slash (get session :url)))))
-         (first))))
+         first)))
 
 (defn get-dapp-redirect-url
   [session]
-  (let [peer-metadata (get-in session [:peer :metadata])]
-    (get-in peer-metadata [:redirect :native])))
+  (get-in session [:peer :metadata :redirect :native]))
 
 (defn get-db-current-request-params
   [db]

src/status_im/contexts/wallet/wallet_connect/events.cljs

@@ -317,13 +317,17 @@
 (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 (fn []
-                          (log/info "Wallet Connect session persisted")
-                          (rf/dispatch [:wallet-connect/fetch-persisted-sessions]))
-            :on-error   #(log/info "Wallet Connect session persistence failed" %)}]]]}))
+   (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 [:wallet-connect/redirect-to-dapp redirect-url]))
+              :on-error   #(log/info "Wallet Connect session persistence failed" %)}]]]})))
 
 (rf/reg-event-fx
  :wallet-connect/disconnect-session

src/status_im/contexts/wallet/wallet_connect/responding_events.cljs

@@ -1,6 +1,5 @@
 (ns status-im.contexts.wallet.wallet-connect.responding-events
   (:require [re-frame.core :as rf]
-            [react-native.platform :as platform]
             [react-native.wallet-connect :as wallet-connect]
             [status-im.constants :as constants]
             [status-im.contexts.wallet.wallet-connect.core :as wallet-connect-core]
@@ -134,18 +133,19 @@
                                           :event                :wallet-connect/send-response
                                           :wallet-connect-event event}))
                :on-success  (fn []
-                              (when platform/android?
-                                (rf/dispatch [:wallet-connect/redirect-to-dapp]))
+                              (rf/dispatch [:wallet-connect/redirect-to-dapp])
                               (log/info "Successfully sent Wallet Connect response to dApp"))}]]}))))
 
 (rf/reg-event-fx
  :wallet-connect/redirect-to-dapp
- (fn [{:keys [db]} _]
-   (let [current-request (get db :wallet-connect/current-request)
-         sessions        (get db :wallet-connect/sessions)
-         dapp            (wallet-connect-core/get-current-request-dapp current-request sessions)
-         session         (transforms/json->clj (dapp :sessionJson))
-         redirect-url    (wallet-connect-core/get-dapp-redirect-url session)]
+ (fn [{:keys [db]} [url]]
+   (let [redirect-url (or url
+                          (->> (get db :wallet-connect/current-request)
+                               (wallet-connect-core/get-current-request-dapp
+                                (get db :wallet-connect/sessions))
+                               :sessionJson
+                               transforms/json->clj
+                               wallet-connect-core/get-dapp-redirect-url))]
      {:fx [[:open-url redirect-url]]})))
 
 (rf/reg-event-fx