Skip to content

Commit

Permalink
review notes fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
vkjr committed Jul 30, 2024
1 parent 8a38102 commit fb352d7
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 15 deletions.
8 changes: 4 additions & 4 deletions src/status_im/contexts/shell/qr_reader/view.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
:theme :dark
:text (i18n/label :t/invalid-qr)})

(defn- is-text-a-status-url-for-path?
(defn- text-a-status-url-for-path?
[text path]
(some #(string/starts-with? text %) (router/prepend-status-urls path)))

Expand Down Expand Up @@ -71,11 +71,11 @@
[scanned-text]
(cond
(or
(is-text-a-status-url-for-path? scanned-text router/community-with-data-path)
(is-text-a-status-url-for-path? scanned-text router/channel-path))
(text-a-status-url-for-path? scanned-text router/community-with-data-path)
(text-a-status-url-for-path? scanned-text router/channel-path))
(debounce/debounce-and-dispatch [:universal-links/handle-url scanned-text] 300)

(is-text-a-status-url-for-path? scanned-text router/user-with-data-path)
(text-a-status-url-for-path? scanned-text router/user-with-data-path)
(let [address (extract-id scanned-text)]
(load-and-show-profile address))

Expand Down
17 changes: 9 additions & 8 deletions src/utils/address.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,14 @@
"0xa" "oeth:"
nil))

(defn is-metamask-address?
(defn split-metamask-address
[address]
(re-find regx-metamask-address address))

(defn metamask-address?
[address]
(boolean (split-metamask-address address)))

(defn eip-3770-address?
"Checks if address follows EIP-3770 format which is default for Status"
[s]
Expand All @@ -98,11 +102,11 @@
(defn supported-address?
[s]
(boolean (or (eip-3770-address? s)
(is-metamask-address? s))))
(metamask-address? s))))

(defn metamask-address->status-address
[metamask-address]
(when-let [[_ address metamask-network-suffix] (is-metamask-address? metamask-address)]
(when-let [[_ address metamask-network-suffix] (split-metamask-address metamask-address)]
(when-let [status-network-prefix (eip-155-suffix->eip-3770-prefix metamask-network-suffix)]
(str status-network-prefix address))))

Expand All @@ -112,11 +116,8 @@
(eip-3770-address? address)
address

(is-metamask-address? address)
(metamask-address->status-address address)

:else
nil))
(metamask-address? address)
(metamask-address->status-address address)))

(defn extract-address-without-chains-info
[address]
Expand Down
6 changes: 3 additions & 3 deletions src/utils/address_test.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,15 @@
{:metamask "ethereum:0x38cf6E0Ba4C4530735616e1Ee7ff5FbCB726fBd2:0xa" :status nil}
{:metamask "ethereum:0x38cf6E0Ba4C4530735616e1Ee7ff5FbCB726fBd2" :status nil}])

(deftest is-metamask-address?-test
(deftest metamask-address?-test
(testing "Check valid metamask addresses"
(dorun
(for [address valid-metamask-addresses]
(is (utils.address/is-metamask-address? address)))))
(is (utils.address/metamask-address? address)))))
(testing "Check invalid metamask addresses"
(dorun
(for [address invalid-metamask-addresses]
(is (not (utils.address/is-metamask-address? address)))))))
(is (not (utils.address/metamask-address? address)))))))

(deftest metamask-address->status-address-test
(testing "Check metamask to status address conversion is valid"
Expand Down

0 comments on commit fb352d7

Please sign in to comment.