Skip to content

Commit 32df2a1

Browse files
[#20909] fix: dapp wrong network refusal
1 parent 110475a commit 32df2a1

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

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

+5-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,11 @@
5050

5151
(defn get-session-dapp-metadata
5252
[proposal]
53-
(get-in proposal [:params :proposer :metadata]))
53+
(let [metadata (get-in proposal [:params :proposer :metadata])
54+
origin (get-in proposal [:verifyContext :verified :origin])]
55+
(if metadata
56+
metadata
57+
{:url origin})))
5458

5559
(defn get-current-request-dapp
5660
[request sessions]

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

+5-2
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,12 @@
109109
(if (wallet-connect-core/event-should-be-handled? db event)
110110
{:fx [[:dispatch [:wallet-connect/process-session-request event]]]}
111111
{:fx [[:dispatch
112+
[:wallet-connect/show-session-networks-unsupported-toast event]]
113+
[:dispatch
112114
[:wallet-connect/send-response
113-
{:error (wallet-connect/get-sdk-error
114-
constants/wallet-connect-user-rejected-chains-error-key)}]]]})))
115+
{:request event
116+
:error (wallet-connect/get-sdk-error
117+
constants/wallet-connect-user-rejected-chains-error-key)}]]]})))
115118

116119
(rf/reg-event-fx
117120
:wallet-connect/on-session-delete

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,9 @@
115115

116116
(rf/reg-event-fx
117117
:wallet-connect/send-response
118-
(fn [{:keys [db]} [{:keys [result error]}]]
119-
(when-let [{:keys [id topic] :as event} (get-in db [:wallet-connect/current-request :event])]
118+
(fn [{:keys [db]} [{:keys [request result error]}]]
119+
(when-let [{:keys [id topic] :as event} (or request
120+
(get-in db [:wallet-connect/current-request :event]))]
120121
(let [method (wallet-connect-core/get-request-method event)
121122
web3-wallet (get db :wallet-connect/web3-wallet)]
122123
{:db (assoc-in db [:wallet-connect/current-request :response-sent?] true)

0 commit comments

Comments
 (0)