Skip to content

Commit 83cbb86

Browse files
clauxxclauxx
committed
ref: renamed data-transformations to data-store
1 parent 03472fa commit 83cbb86

File tree

14 files changed

+59
-59
lines changed

14 files changed

+59
-59
lines changed

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

+3-3
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.utils.data-transformations :as data-transformations]
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]))
@@ -108,11 +108,11 @@
108108
:render-fn (fn [{:keys [topic pairingTopic name url iconUrl]}]
109109
[quo/dapp
110110
{:dapp {:avatar
111-
(data-transformations/compute-dapp-icon-path
111+
(data-store/compute-dapp-icon-path
112112
iconUrl
113113
url)
114114
:name
115-
(data-transformations/compute-dapp-name
115+
(data-store/compute-dapp-name
116116
name
117117
url)
118118
:value url

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
(ns status-im.contexts.wallet.wallet-connect.events.session-proposals
22
(:require [re-frame.core :as rf]
33
[react-native.wallet-connect :as wallet-connect]
4-
[status-im.contexts.wallet.wallet-connect.utils.data-transformations :as
5-
data-transformations]
4+
[status-im.contexts.wallet.wallet-connect.utils.data-store :as
5+
data-store]
66
[status-im.contexts.wallet.wallet-connect.utils.networks :as networks]
77
[status-im.contexts.wallet.wallet-connect.utils.sessions :as sessions]
88
[status-im.contexts.wallet.wallet-connect.utils.uri :as uri]
@@ -79,13 +79,13 @@
7979
(rf/reg-event-fx
8080
:wallet-connect/show-session-networks-unsupported-toast
8181
(fn [{:keys [db]} [proposal]]
82-
(let [{:keys [name url]} (data-transformations/get-session-dapp-metadata proposal)]
82+
(let [{:keys [name url]} (data-store/get-session-dapp-metadata proposal)]
8383
{:fx [[:dispatch
8484
[:toasts/upsert
8585
{:type :negative
8686
:theme (:theme db)
8787
:text (i18n/label :t/wallet-connect-networks-not-supported
88-
{:dapp (data-transformations/compute-dapp-name name url)})}]]]})))
88+
{:dapp (data-store/compute-dapp-name name url)})}]]]})))
8989

9090
(rf/reg-event-fx
9191
:wallet-connect/reset-current-session-proposal

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

+15-15
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
[native-module.core :as native-module]
55
[re-frame.core :as rf]
66
[status-im.constants :as constants]
7-
[status-im.contexts.wallet.wallet-connect.utils.data-transformations :as
8-
data-transformations]
7+
[status-im.contexts.wallet.wallet-connect.utils.data-store :as
8+
data-store]
99
[status-im.contexts.wallet.wallet-connect.utils.networks :as networks]
1010
[status-im.contexts.wallet.wallet-connect.utils.signing :as signing]
1111
[status-im.contexts.wallet.wallet-connect.utils.transactions :as transactions]
@@ -17,8 +17,8 @@
1717
:wallet-connect/show-request-modal
1818
(fn [{:keys [db]}]
1919
(let [event (get-in db [:wallet-connect/current-request :event])
20-
method (data-transformations/get-request-method event)
21-
screen (data-transformations/method-to-screen method)]
20+
method (data-store/get-request-method event)
21+
screen (data-store/method-to-screen method)]
2222
(if screen
2323
{:fx [[:dispatch [:open-modal screen]]]}
2424
(log/error "Didn't find screen for Wallet Connect method"
@@ -27,7 +27,7 @@
2727
(rf/reg-event-fx
2828
:wallet-connect/process-session-request
2929
(fn [{:keys [db]} [event]]
30-
(let [method (data-transformations/get-request-method event)
30+
(let [method (data-store/get-request-method event)
3131
existing-event (get-in db [:wallet-connect/current-request :event])]
3232
(log/info "Processing Wallet Connect session request" method)
3333
;; NOTE: make sure we don't show two requests at the same time
@@ -57,7 +57,7 @@
5757
(rf/reg-event-fx
5858
:wallet-connect/process-personal-sign
5959
(fn [{:keys [db]}]
60-
(let [[raw-data address] (data-transformations/get-db-current-request-params db)
60+
(let [[raw-data address] (data-store/get-db-current-request-params db)
6161
parsed-data (native-module/hex-to-utf8 raw-data)]
6262
{:db (update-in db
6363
[:wallet-connect/current-request]
@@ -70,7 +70,7 @@
7070
(rf/reg-event-fx
7171
:wallet-connect/process-eth-sign
7272
(fn [{:keys [db]}]
73-
(let [[address raw-data] (data-transformations/get-db-current-request-params db)
73+
(let [[address raw-data] (data-store/get-db-current-request-params db)
7474
parsed-data (native-module/hex-to-utf8 raw-data)]
7575
{:db (update-in db
7676
[:wallet-connect/current-request]
@@ -100,8 +100,8 @@
100100
(rf/reg-event-fx
101101
:wallet-connect/process-eth-send-transaction
102102
(fn [{:keys [db]}]
103-
(let [event (data-transformations/get-db-current-request-event db)
104-
tx (-> event data-transformations/get-request-params first)
103+
(let [event (data-store/get-db-current-request-event db)
104+
tx (-> event data-store/get-request-params first)
105105
chain-id (-> event
106106
(get-in [:params :chainId])
107107
networks/eip155->chain-id)]
@@ -114,8 +114,8 @@
114114
(rf/reg-event-fx
115115
:wallet-connect/process-eth-sign-transaction
116116
(fn [{:keys [db]}]
117-
(let [event (data-transformations/get-db-current-request-event db)
118-
tx (-> event data-transformations/get-request-params first)
117+
(let [event (data-store/get-db-current-request-event db)
118+
tx (-> event data-store/get-request-params first)
119119
chain-id (-> event
120120
(get-in [:params :chainId])
121121
networks/eip155->chain-id)]
@@ -129,9 +129,9 @@
129129
:wallet-connect/process-sign-typed
130130
(fn [{:keys [db]}]
131131
(try
132-
(let [[address raw-data] (data-transformations/get-db-current-request-params db)
132+
(let [[address raw-data] (data-store/get-db-current-request-params db)
133133
parsed-raw-data (transforms/js-parse raw-data)
134-
session-chain-id (-> (data-transformations/get-db-current-request-event db)
134+
session-chain-id (-> (data-store/get-db-current-request-event db)
135135
(get-in [:params :chainId])
136136
networks/eip155->chain-id)
137137
data-chain-id (-> parsed-raw-data
@@ -158,7 +158,7 @@
158158
[:wallet-connect/on-processing-error
159159
(ex-info "Failed to parse JSON typed data"
160160
{:error err
161-
:data (data-transformations/get-db-current-request-params db)})]]]}))))
161+
:data (data-store/get-db-current-request-params db)})]]]}))))
162162

163163
(rf/reg-event-fx
164164
:wallet-connect/wrong-typed-data-chain-id
@@ -188,7 +188,7 @@
188188
:wallet-connect/on-processing-error
189189
(fn [{:keys [db]} [error]]
190190
(let [{:keys [address event]} (get db :wallet-connect/current-request)
191-
method (data-transformations/get-request-method event)]
191+
method (data-store/get-request-method event)]
192192
(log/error "Failed to process Wallet Connect request"
193193
{:error error
194194
:address address

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

+10-10
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
(:require [re-frame.core :as rf]
33
[react-native.wallet-connect :as wallet-connect]
44
[status-im.constants :as constants]
5-
[status-im.contexts.wallet.wallet-connect.utils.data-transformations :as
6-
data-transformations]
5+
[status-im.contexts.wallet.wallet-connect.utils.data-store :as
6+
data-store]
77
[status-im.contexts.wallet.wallet-connect.utils.uri :as uri]
88
[taoensso.timbre :as log]
99
[utils.i18n :as i18n]
@@ -13,8 +13,8 @@
1313
:wallet-connect/respond-current-session
1414
(fn [{:keys [db]} [password]]
1515
(let [event (get-in db [:wallet-connect/current-request :event])
16-
method (data-transformations/get-request-method event)
17-
screen (data-transformations/method-to-screen method)
16+
method (data-store/get-request-method event)
17+
screen (data-store/method-to-screen method)
1818
expiry (get-in event [:params :request :expiryTimestamp])]
1919
(if (uri/timestamp-expired? expiry)
2020
{:fx [[:dispatch
@@ -100,7 +100,7 @@
100100
:wallet-connect/on-sign-error
101101
(fn [{:keys [db]} [error]]
102102
(let [{:keys [raw-data address event]} (get db :wallet-connect/current-request)
103-
method (data-transformations/get-request-method event)]
103+
method (data-store/get-request-method event)]
104104
(log/error "Failed to sign Wallet Connect request"
105105
{:error error
106106
:address address
@@ -118,7 +118,7 @@
118118
:wallet-connect/send-response
119119
(fn [{:keys [db]} [{:keys [result error]}]]
120120
(when-let [{:keys [id topic] :as event} (get-in db [:wallet-connect/current-request :event])]
121-
(let [method (data-transformations/get-request-method event)
121+
(let [method (data-store/get-request-method event)
122122
web3-wallet (get db :wallet-connect/web3-wallet)]
123123
{:db (assoc-in db [:wallet-connect/current-request :response-sent?] true)
124124
:fx [[:effects.wallet-connect/respond-session-request
@@ -142,20 +142,20 @@
142142
(fn [{:keys [db]} [url]]
143143
(let [redirect-url (or url
144144
(->> (get db :wallet-connect/current-request)
145-
(data-transformations/get-current-request-dapp
145+
(data-store/get-current-request-dapp
146146
(get db :wallet-connect/sessions))
147147
:sessionJson
148148
transforms/json->clj
149-
data-transformations/get-dapp-redirect-url))]
149+
data-store/get-dapp-redirect-url))]
150150
{:fx [[:open-url redirect-url]]})))
151151

152152
(rf/reg-event-fx
153153
:wallet-connect/dismiss-request-modal
154154
(fn [{:keys [db]} _]
155155
(let [screen (-> db
156156
(get-in [:wallet-connect/current-request :event])
157-
data-transformations/get-request-method
158-
data-transformations/method-to-screen)]
157+
data-store/get-request-method
158+
data-store/method-to-screen)]
159159
{:fx [[:dispatch [:dismiss-modal screen]]]})))
160160

161161
(rf/reg-event-fx

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
matcher-combinators.test
55
[re-frame.db :as rf-db]
66
status-im.contexts.wallet.wallet-connect.events.session-responses
7-
[status-im.contexts.wallet.wallet-connect.utils.data-transformations :as data-transformations]
7+
[status-im.contexts.wallet.wallet-connect.utils.data-store :as data-store]
88
[test-helpers.unit :as h]
99
[utils.transforms :as transforms]))
1010

@@ -16,11 +16,11 @@
1616
:sessionJson session-json}]]
1717
(reset! rf-db/app-db {:wallet-connect {:current-request current-request
1818
:sessions sessions}})
19-
(with-redefs [data-transformations/get-current-request-dapp
19+
(with-redefs [data-store/get-current-request-dapp
2020
(fn [_ _] (first sessions))
2121
transforms/json->clj
2222
(fn [json] (js/JSON.parse json))
23-
data-transformations/get-dapp-redirect-url
23+
data-store/get-dapp-redirect-url
2424
(fn [_] "native://redirect-url")]
2525

2626
(is (match? {:fx [[:open-url "native://redirect-url"]]}

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
(:require [re-frame.core :as rf]
33
[react-native.wallet-connect :as wallet-connect]
44
[status-im.constants :as constants]
5-
[status-im.contexts.wallet.wallet-connect.utils.data-transformations :as
6-
data-transformations]
5+
[status-im.contexts.wallet.wallet-connect.utils.data-store :as
6+
data-store]
77
[status-im.contexts.wallet.wallet-connect.utils.networks :as networks]
88
[status-im.contexts.wallet.wallet-connect.utils.sessions :as sessions]
99
[taoensso.timbre :as log]
@@ -114,7 +114,7 @@
114114
(fn [_ [session-info]]
115115
(let [redirect-url (-> session-info
116116
(js->clj :keywordize-keys true)
117-
(data-transformations/get-dapp-redirect-url))]
117+
(data-store/get-dapp-redirect-url))]
118118
{:fx [[:json-rpc/call
119119
[{:method "wallet_addWalletConnectSession"
120120
:params [(js/JSON.stringify session-info)]

‎src/status_im/contexts/wallet/wallet_connect/modals/common/header/view.cljs

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
[quo.core :as quo]
44
[react-native.core :as rn]
55
[status-im.contexts.wallet.wallet-connect.modals.common.header.style :as style]
6-
[status-im.contexts.wallet.wallet-connect.utils.data-transformations :as
7-
data-transformations]))
6+
[status-im.contexts.wallet.wallet-connect.utils.data-store :as
7+
data-store]))
88

99
(defn view
1010
[{:keys [label dapp account]}]
1111
[rn/view {:style style/header-container}
1212
(let [{:keys [name iconUrl url]} dapp
13-
image-source (data-transformations/compute-dapp-icon-path iconUrl url)]
13+
image-source (data-store/compute-dapp-icon-path iconUrl url)]
1414
[rn/view {:style style/dapp-container}
1515
[quo/summary-tag
1616
{:type :dapp

‎src/status_im/contexts/wallet/wallet_connect/modals/session_proposal/view.cljs

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
[react-native.core :as rn]
88
[status-im.common.floating-button-page.view :as floating-button-page]
99
[status-im.contexts.wallet.wallet-connect.modals.session-proposal.style :as style]
10-
[status-im.contexts.wallet.wallet-connect.utils.data-transformations :as data-transformations]
10+
[status-im.contexts.wallet.wallet-connect.utils.data-store :as data-store]
1111
[utils.i18n :as i18n]
1212
[utils.re-frame :as rf]
1313
[utils.string]))
@@ -17,8 +17,8 @@
1717
(let [proposer (rf/sub [:wallet-connect/session-proposer])
1818
{:keys [icons name url]} (:metadata proposer)
1919
first-icon (first icons)
20-
dapp-name (data-transformations/compute-dapp-name name url)
21-
profile-picture (data-transformations/compute-dapp-icon-path first-icon url)]
20+
dapp-name (data-store/compute-dapp-name name url)
21+
profile-picture (data-store/compute-dapp-icon-path first-icon url)]
2222
[:<>
2323
[rn/view {:style style/dapp-avatar}
2424
[quo/user-avatar

‎src/status_im/contexts/wallet/wallet_connect/utils/data_transformations.cljs ‎src/status_im/contexts/wallet/wallet_connect/utils/data_store.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(ns status-im.contexts.wallet.wallet-connect.utils.data-transformations
1+
(ns status-im.contexts.wallet.wallet-connect.utils.data-store
22
(:require
33
[clojure.string :as string]
44
[status-im.constants :as constants]

‎src/status_im/contexts/wallet/wallet_connect/utils/data_transformations_test.cljs ‎src/status_im/contexts/wallet/wallet_connect/utils/data_store_test.cljs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
(ns status-im.contexts.wallet.wallet-connect.utils.data-transformations-test
1+
(ns status-im.contexts.wallet.wallet-connect.utils.data-store-test
22
(:require
33
[cljs.test :refer-macros [deftest is testing]]
4-
[status-im.contexts.wallet.wallet-connect.utils.data-transformations :as sut]))
4+
[status-im.contexts.wallet.wallet-connect.utils.data-store :as sut]))
55

66
(deftest get-current-request-dapp-test
77
(testing "returns the correct dapp based on the request's origin"

‎src/status_im/contexts/wallet/wallet_connect/utils/signing.cljs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
(ns status-im.contexts.wallet.wallet-connect.utils.signing
22
(:require [native-module.core :as native-module]
33
[promesa.core :as promesa]
4-
[status-im.contexts.wallet.wallet-connect.utils.data-transformations :as
5-
data-transformations]
4+
[status-im.contexts.wallet.wallet-connect.utils.data-store :as
5+
data-store]
66
[status-im.contexts.wallet.wallet-connect.utils.networks :as networks]
77
[status-im.contexts.wallet.wallet-connect.utils.rpc :as rpc]
88
[utils.hex :as hex]
@@ -31,7 +31,7 @@
3131
:password password}
3232
transforms/clj->json
3333
native-module/sign-message
34-
(promesa/then data-transformations/extract-native-call-signature)))
34+
(promesa/then data-store/extract-native-call-signature)))
3535

3636
(defn personal-sign
3737
[password address data]

‎src/status_im/contexts/wallet/wallet_connect/utils/transactions.cljs

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
[native-module.core :as native-module]
55
[promesa.core :as promesa]
66
[status-im.constants :as constants]
7-
[status-im.contexts.wallet.wallet-connect.utils.data-transformations :as
8-
data-transformations]
7+
[status-im.contexts.wallet.wallet-connect.utils.data-store :as
8+
data-store]
99
[status-im.contexts.wallet.wallet-connect.utils.rpc :as rpc]
1010
[utils.money :as money]
1111
[utils.transforms :as transforms]))
1212

1313
(defn transaction-request?
1414
[event]
15-
(->> (data-transformations/get-request-method event)
15+
(->> (data-store/get-request-method event)
1616
(contains? #{constants/wallet-connect-eth-send-transaction-method
1717
constants/wallet-connect-eth-sign-transaction-method})))
1818

‎src/status_im/subs/wallet/dapps/proposals.cljs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
(ns status-im.subs.wallet.dapps.proposals
22
(:require [re-frame.core :as rf]
3-
[status-im.contexts.wallet.wallet-connect.utils.data-transformations :as
4-
data-transformations]
3+
[status-im.contexts.wallet.wallet-connect.utils.data-store :as
4+
data-store]
55
[utils.string]))
66

77
(rf/reg-sub
@@ -25,7 +25,7 @@
2525
:<- [:wallet-connect/session-proposer]
2626
(fn [proposer]
2727
(let [{:keys [name url]} (-> proposer :metadata)]
28-
(data-transformations/compute-dapp-name name url))))
28+
(data-store/compute-dapp-name name url))))
2929

3030
(rf/reg-sub
3131
:wallet-connect/session-proposal-network-details

‎src/status_im/subs/wallet/dapps/requests.cljs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
(ns status-im.subs.wallet.dapps.requests
22
(:require [re-frame.core :as rf]
33
[status-im.contexts.wallet.common.utils :as wallet-utils]
4-
[status-im.contexts.wallet.wallet-connect.utils.data-transformations :as
5-
data-transformations]
4+
[status-im.contexts.wallet.wallet-connect.utils.data-store :as
5+
data-store]
66
[status-im.contexts.wallet.wallet-connect.utils.networks :as networks]
77
[utils.string]))
88

@@ -31,7 +31,7 @@
3131
:<- [:wallet-connect/current-request]
3232
:<- [:wallet-connect/sessions]
3333
(fn [[request sessions]]
34-
(data-transformations/get-current-request-dapp request sessions)))
34+
(data-store/get-current-request-dapp request sessions)))
3535

3636
(rf/reg-sub
3737
:wallet-connect/chain-id

0 commit comments

Comments
 (0)