[#9748] not throwing an error on scanned qrcode with plain ethereum a…

…ddress or ens name
status-im · Jan 23, 2020 · 123968b · 123968b
1 parent ca50a77
commit 123968b
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/status_im/wallet/choose_recipient/core.cljs b/src/status_im/wallet/choose_recipient/core.cljs
@@ -149,7 +149,9 @@
 (fx/defn resolve-ens-addresses
   {:events [:wallet.send/resolve-ens-addresses :wallet.send/qr-code-request-scanned]}
   [{{:networks/keys [current-network] :wallet/keys [all-tokens] :as db} :db :as cofx} uri]
-  (if-let [message (eip681/parse-uri uri)]
+  (if-let [message (or (eip681/parse-uri uri)
+                       (when (ethereum/address? uri) {:address uri :chain-id (ethereum/chain-id db)})
+                       (when (ens/is-valid-eth-name? uri) {:address uri :chain-id (ethereum/chain-id db)}))]
   ;; first we get a vector of ens-names to resolve and a vector of paths of
   ;; these names
     (let [{:keys [paths ens-names]}