fix send marshall error

2024-07-23 12:13:33 +04:00
1 changed files with 22 additions and 21 deletions
@@ -450,27 +450,28 @@
                         network-preferences
                         gas-rates
                         from-locked-amount]]
-     {:db            (cond-> db
+     (when (and to-address from-address amount-in token-id)
-                       :always (assoc-in [:wallet :ui :send :amount] amount)
+       {:db            (cond-> db
-                       :always (assoc-in [:wallet :ui :send :loading-suggested-routes?] true)
+                               :always (assoc-in [:wallet :ui :send :amount] amount)
-                       :always (assoc-in [:wallet :ui :send :sender-network-values]
+                               :always (assoc-in [:wallet :ui :send :loading-suggested-routes?] true)
-                                sender-network-values)
+                               :always (assoc-in [:wallet :ui :send :sender-network-values]
-                       :always (assoc-in [:wallet :ui :send :receiver-network-values]
+                                                 sender-network-values)
-                                receiver-network-values)
+                               :always (assoc-in [:wallet :ui :send :receiver-network-values]
-                       :always (assoc-in [:wallet :ui :send :suggested-routes-call-timestamp] now)
+                                                 receiver-network-values)
-                       :always (update-in [:wallet :ui :send] dissoc :network-links)
+                               :always (assoc-in [:wallet :ui :send :suggested-routes-call-timestamp] now)
-                       token   (assoc-in [:wallet :ui :send :token] token))
+                               :always (update-in [:wallet :ui :send] dissoc :network-links)
-      :json-rpc/call [{:method     "wallet_getSuggestedRoutes"
+                               token   (assoc-in [:wallet :ui :send :token] token))
-                       :params     request-params
+        :json-rpc/call [{:method     "wallet_getSuggestedRoutes"
-                       :on-success (fn [suggested-routes]
+                         :params     request-params
-                                     (rf/dispatch [:wallet/suggested-routes-success suggested-routes
+                         :on-success (fn [suggested-routes]
-                                                   now]))
+                                       (rf/dispatch [:wallet/suggested-routes-success suggested-routes
-                       :on-error   (fn [error]
+                                                     now]))
-                                     (rf/dispatch [:wallet/suggested-routes-error error])
+                         :on-error   (fn [error]
-                                     (log/error "failed to get suggested routes"
+                                       (rf/dispatch [:wallet/suggested-routes-error error])
-                                                {:event  :wallet/get-suggested-routes
+                                       (log/error "failed to get suggested routes"
-                                                 :error  error
+                                                  {:event  :wallet/get-suggested-routes
-                                                 :params request-params}))}]})))
+                                                   :error  error
                                                   :params request-params}))}]}))))
 (rf/reg-event-fx :wallet/add-authorized-transaction
 (fn [{:keys [db]} [transaction]]