status-im
/
status-mobile
mirror of https://github.com/status-im/status-mobile.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: route not found when attempting to transfer assets to additional eth account (#18325) 

Signed-off-by: Brian Sztamfater <brian@status.im>
This commit is contained in:
Brian Sztamfater 2024-01-10 12:49:45 -03:00 committed by GitHub
parent da03989c88
commit 162c6dbf89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/status_im/contexts/wallet/events.cljs
View File

@ -301,6 +301,10 @@
(background-timer/clear-timeout current-timeout) (background-timer/clear-timeout current-timeout)
{:db (assoc db :wallet/local-suggestions [] :wallet/valid-ens-or-address? false)}))) {:db (assoc db :wallet/local-suggestions [] :wallet/valid-ens-or-address? false)})))
(rf/reg-event-fx :wallet/clean-account-selection
(fn [{:keys [db]}]
{:db (update-in db [:wallet :ui :send] dissoc :send-account-address)}))
(rf/reg-event-fx :wallet/get-address-details-success (rf/reg-event-fx :wallet/get-address-details-success
(fn [{:keys [db]} [{:keys [hasActivity]}]] (fn [{:keys [db]} [{:keys [hasActivity]}]]
{:db (assoc-in db {:db (assoc-in db

18
src/status_im/contexts/wallet/send/events.cljs
View File

@ -14,10 +14,6 @@
{:db (assoc-in db [:wallet :ui :send :select-address-tab] tab)})) {:db (assoc-in db [:wallet :ui :send :select-address-tab] tab)}))
(rf/reg-event-fx :wallet/select-send-account-address
(fn [{:keys [db]} [address]]
{:db (assoc db [:wallet :ui :send :send-account-address] address)}))
(rf/reg-event-fx :wallet/suggested-routes-success (rf/reg-event-fx :wallet/suggested-routes-success
(fn [{:keys [db]} [suggested-routes timestamp]] (fn [{:keys [db]} [suggested-routes timestamp]]
(when (= (get-in db [:wallet :ui :send :suggested-routes-call-timestamp]) timestamp) (when (= (get-in db [:wallet :ui :send :suggested-routes-call-timestamp]) timestamp)
@ -44,9 +40,18 @@
(update-in [:wallet :ui :send] dissoc :route) (update-in [:wallet :ui :send] dissoc :route)
(update-in [:wallet :ui :send] dissoc :loading-suggested-routes?))})) (update-in [:wallet :ui :send] dissoc :loading-suggested-routes?))}))
(rf/reg-event-fx :wallet/select-send-account-address
(fn [{:keys [db]} [{:keys [address stack-id]}]]
{:db (-> db
(assoc-in [:wallet :ui :send :send-account-address] address)
(update-in [:wallet :ui :send] dissoc :to-address))
:fx [[:navigate-to-within-stack [:wallet-select-asset stack-id]]]}))
(rf/reg-event-fx :wallet/select-send-address (rf/reg-event-fx :wallet/select-send-address
(fn [{:keys [db]} [{:keys [address stack-id]}]] (fn [{:keys [db]} [{:keys [address stack-id]}]]
{:db (assoc-in db [:wallet :ui :send :to-address] address) {:db (-> db
(assoc-in [:wallet :ui :send :to-address] address)
(update-in [:wallet :ui :send] dissoc :send-account-address))
:fx [[:navigate-to-within-stack [:wallet-select-asset stack-id]]]})) :fx [[:navigate-to-within-stack [:wallet-select-asset stack-id]]]}))
(rf/reg-event-fx :wallet/send-select-token (rf/reg-event-fx :wallet/send-select-token
@ -63,7 +68,8 @@
(fn [{:keys [db now]} [amount]] (fn [{:keys [db now]} [amount]]
(let [wallet-address (get-in db [:wallet :current-viewing-account-address]) (let [wallet-address (get-in db [:wallet :current-viewing-account-address])
token (get-in db [:wallet :ui :send :token]) token (get-in db [:wallet :ui :send :token])
to-address (get-in db [:wallet :ui :send :to-address]) account-address (get-in db [:wallet :ui :send :send-account-address])
to-address (or account-address (get-in db [:wallet :ui :send :to-address]))
token-decimal (:decimals token) token-decimal (:decimals token)
token-id (:symbol token) token-id (:symbol token)
network-preferences [] network-preferences []

7
src/status_im/contexts/wallet/send/select_address/tabs/view.cljs
View File

@ -12,10 +12,9 @@
[{:keys [color address] :as account}] [{:keys [color address] :as account}]
[quo/account-item [quo/account-item
{:account-props (assoc account :customization-color color) {:account-props (assoc account :customization-color color)
:on-press (fn [] :on-press #(rf/dispatch [:wallet/select-send-account-address
(rf/dispatch [:wallet/select-send-account-address address]) {:address address
(rf/dispatch [:navigate-to-within-stack :stack-id :wallet-select-address}])}])
[:wallet-select-asset :wallet-select-address]]))}])
(defn my-accounts (defn my-accounts
[theme] [theme]

4
src/status_im/contexts/wallet/send/select_address/view.cljs
View File

@ -117,6 +117,7 @@
(let [on-close (fn [] (let [on-close (fn []
(rf/dispatch [:wallet/clean-scanned-address]) (rf/dispatch [:wallet/clean-scanned-address])
(rf/dispatch [:wallet/clean-local-suggestions]) (rf/dispatch [:wallet/clean-local-suggestions])
(rf/dispatch [:wallet/clean-account-selection])
(rf/dispatch [:wallet/select-address-tab nil]) (rf/dispatch [:wallet/select-address-tab nil])
(rf/dispatch [:navigate-back])) (rf/dispatch [:navigate-back]))
on-change-tab #(rf/dispatch [:wallet/select-address-tab %]) on-change-tab #(rf/dispatch [:wallet/select-address-tab %])
@ -128,7 +129,8 @@
(rn/use-effect (fn [] (rn/use-effect (fn []
(fn [] (fn []
(rf/dispatch [:wallet/clean-scanned-address]) (rf/dispatch [:wallet/clean-scanned-address])
(rf/dispatch [:wallet/clean-local-suggestions])))) (rf/dispatch [:wallet/clean-local-suggestions])
(rf/dispatch [:wallet/clean-account-selection]))))
[floating-button-page/view [floating-button-page/view
{:header [account-switcher/view {:header [account-switcher/view
{:on-press on-close {:on-press on-close