Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restructure wallet-connect namespaces #21167

Merged
merged 11 commits into from
Sep 10, 2024
Merged

Restructure wallet-connect namespaces #21167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
abbf210
ref: split events and moved into events dir
clauxx Aug 14, 2024
df9573a
ref: moved session-proposal to modal dir
clauxx Aug 14, 2024
389a1f9
ref: moved modal and utils ns
clauxx Aug 14, 2024
83d98d5
ref: added networks utils ns
clauxx Aug 16, 2024
ccaafc9
ref: moved all utils
clauxx Sep 2, 2024
384f255
ref: split up wallet-connect subs
clauxx Sep 2, 2024
fc094a9
lint: formatting
clauxx Sep 3, 2024
b7130ba
fix: removed duplicate event after conflicts
clauxx Sep 3, 2024
4170784
fix: wrong required ns
clauxx Sep 3, 2024
2c988f3
ref: renamed data-transformations to data-store
clauxx Sep 3, 2024
bb548da
[#21167] chore: resolve conflicts
mohsen-ghafouri Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/status_im/contexts/shell/qr_reader/view.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[status-im.common.scan-qr-code.view :as scan-qr-code]
[status-im.common.validation.general :as validators]
[status-im.contexts.communities.events]
[status-im.contexts.wallet.wallet-connect.utils :as wc-utils]
[status-im.contexts.wallet.wallet-connect.utils.uri :as wc-uri]
[status-im.feature-flags :as ff]
[utils.address :as utils-address]
[utils.debounce :as debounce]
Expand Down Expand Up @@ -100,7 +100,7 @@
nil

(and
(wc-utils/valid-uri? scanned-text)
(wc-uri/valid-uri? scanned-text)
(ff/enabled? ::ff/wallet.wallet-connect))
(handle-wallet-connect scanned-text)

Expand Down
13 changes: 9 additions & 4 deletions src/status_im/contexts/wallet/connected_dapps/view.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
[status-im.common.resources :as resources]
[status-im.contexts.wallet.connected-dapps.disconnect-dapp.view :as disconnect-dapp]
[status-im.contexts.wallet.connected-dapps.style :as style]
[status-im.contexts.wallet.wallet-connect.core :as core]
[status-im.contexts.wallet.wallet-connect.utils.data-store :as data-store]
[utils.i18n :as i18n]
[utils.re-frame :as rf]
[utils.string]))
Expand Down Expand Up @@ -107,9 +107,14 @@
:content-container-style (style/dapps-list theme)
:render-fn (fn [{:keys [topic pairingTopic name url iconUrl]}]
[quo/dapp
{:dapp {:avatar (core/compute-dapp-icon-path iconUrl
url)
:name (core/compute-dapp-name name url)
{:dapp {:avatar
(data-store/compute-dapp-icon-path
iconUrl
url)
:name
(data-store/compute-dapp-name
name
url)
:value url
:topic topic
:pairing-topic pairingTopic
Expand Down
204 changes: 0 additions & 204 deletions src/status_im/contexts/wallet/wallet_connect/core.cljs
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions src/status_im/contexts/wallet/wallet_connect/core_test.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +0,0 @@
(ns status-im.contexts.wallet.wallet-connect.core-test
(:require
[cljs.test :refer-macros [deftest is testing]]
[status-im.contexts.wallet.wallet-connect.core :as sut]))

(deftest get-current-request-dapp-test
(testing "returns the correct dapp based on the request's origin"
(let [request {:event {:verifyContext {:verified {:origin "https://dapp.com"}}}}
sessions [{:url "https://dapp.com"}
{:url "https://anotherdapp.com"}]]
(is (= {:url "https://dapp.com"}
(sut/get-current-request-dapp request sessions)))))

(testing "returns nil if no matching dapp is found"
(let [request {:event {:verifyContext {:verified {:origin "https://dapp.com"}}}}
sessions [{:url "https://anotherdapp.com"}]]
(is (nil? (sut/get-current-request-dapp request sessions))))))

(deftest get-dapp-redirect-url-test
(testing "returns the native redirect URL if it exists"
(let [session {:peer {:metadata {:redirect {:native "native://redirect-url"}}}}]
(is (= "native://redirect-url"
(sut/get-dapp-redirect-url session)))))

(testing "returns nil if no redirect URL is found"
(let [session {:peer {:metadata {}}}]
(is (nil? (sut/get-dapp-redirect-url session))))))
Loading