Skip to content

Commit 9135e91

Browse files
Restructure wallet-connect namespaces (#21167)
Co-authored-by: Mohsen <[email protected]>
1 parent d7242f1 commit 9135e91

33 files changed

+903
-863
lines changed

src/status_im/contexts/shell/qr_reader/view.cljs

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[status-im.common.scan-qr-code.view :as scan-qr-code]
77
[status-im.common.validation.general :as validators]
88
[status-im.contexts.communities.events]
9-
[status-im.contexts.wallet.wallet-connect.utils :as wc-utils]
9+
[status-im.contexts.wallet.wallet-connect.utils.uri :as wc-uri]
1010
[status-im.feature-flags :as ff]
1111
[utils.address :as utils-address]
1212
[utils.debounce :as debounce]
@@ -100,7 +100,7 @@
100100
nil
101101

102102
(and
103-
(wc-utils/valid-uri? scanned-text)
103+
(wc-uri/valid-uri? scanned-text)
104104
(ff/enabled? ::ff/wallet.wallet-connect))
105105
(handle-wallet-connect scanned-text)
106106

src/status_im/contexts/wallet/connected_dapps/view.cljs

+9-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
[status-im.common.resources :as resources]
1010
[status-im.contexts.wallet.connected-dapps.disconnect-dapp.view :as disconnect-dapp]
1111
[status-im.contexts.wallet.connected-dapps.style :as style]
12-
[status-im.contexts.wallet.wallet-connect.core :as core]
12+
[status-im.contexts.wallet.wallet-connect.utils.data-store :as data-store]
1313
[utils.i18n :as i18n]
1414
[utils.re-frame :as rf]
1515
[utils.string]))
@@ -107,9 +107,14 @@
107107
:content-container-style (style/dapps-list theme)
108108
:render-fn (fn [{:keys [topic pairingTopic name url iconUrl]}]
109109
[quo/dapp
110-
{:dapp {:avatar (core/compute-dapp-icon-path iconUrl
111-
url)
112-
:name (core/compute-dapp-name name url)
110+
{:dapp {:avatar
111+
(data-store/compute-dapp-icon-path
112+
iconUrl
113+
url)
114+
:name
115+
(data-store/compute-dapp-name
116+
name
117+
url)
113118
:value url
114119
:topic topic
115120
:pairing-topic pairingTopic

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

-204
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,27 +0,0 @@
1-
(ns status-im.contexts.wallet.wallet-connect.core-test
2-
(:require
3-
[cljs.test :refer-macros [deftest is testing]]
4-
[status-im.contexts.wallet.wallet-connect.core :as sut]))
5-
6-
(deftest get-current-request-dapp-test
7-
(testing "returns the correct dapp based on the request's origin"
8-
(let [request {:event {:verifyContext {:verified {:origin "https://dapp.com"}}}}
9-
sessions [{:url "https://dapp.com"}
10-
{:url "https://anotherdapp.com"}]]
11-
(is (= {:url "https://dapp.com"}
12-
(sut/get-current-request-dapp request sessions)))))
13-
14-
(testing "returns nil if no matching dapp is found"
15-
(let [request {:event {:verifyContext {:verified {:origin "https://dapp.com"}}}}
16-
sessions [{:url "https://anotherdapp.com"}]]
17-
(is (nil? (sut/get-current-request-dapp request sessions))))))
18-
19-
(deftest get-dapp-redirect-url-test
20-
(testing "returns the native redirect URL if it exists"
21-
(let [session {:peer {:metadata {:redirect {:native "native://redirect-url"}}}}]
22-
(is (= "native://redirect-url"
23-
(sut/get-dapp-redirect-url session)))))
24-
25-
(testing "returns nil if no redirect URL is found"
26-
(let [session {:peer {:metadata {}}}]
27-
(is (nil? (sut/get-dapp-redirect-url session))))))

0 commit comments

Comments
 (0)