[#22111 ] fix: set send type and correct the filter event

[#22111 ] fix: disabled bridge assets effect other list
2025-03-04 12:33:06 +03:00 · 2025-03-04 11:42:28 +03:00
5 changed files with 8 additions and 5 deletions
@@ -63,6 +63,7 @@
         :swap-action      (fn []
                             (rf/dispatch [:wallet/clean-send-data])
                             (rf/dispatch [:wallet.tokens/get-token-list])
+                             (rf/dispatch [:wallet/set-send-tx-type :tx/swap])
                             (rf/dispatch [:open-modal :screen/wallet.swap-select-asset-to-pay]))
         :bridge-disabled? testnet-mode?
         :swap-disabled?   testnet-mode?}])
@@ -9,7 +9,7 @@
  [{token-symbol  :symbol
    token-name    :name
    total-balance :total-balance
-    disabled?     :bridge-disabled?
+    disabled?     :disabled?
    fiat-value    :fiat-value
    :as           token}
   _ _
@@ -105,6 +105,7 @@
                               [multiple-accounts? first-account-address])
        on-swap-press         (rn/use-callback
                               (fn []
+                                 (rf/dispatch [:wallet/set-send-tx-type :tx/swap])
                                 (rf/dispatch [:wallet.tokens/get-token-list])
                                 (when-not multiple-accounts?
                                   (rf/dispatch [:wallet/switch-current-viewing-account
@@ -565,7 +565,8 @@
 (fn [{:keys [db]} [account]]
   (let [asset-to-pay     (get-in db [:wallet :ui :swap :asset-to-pay])
         asset-to-receive (get-in db [:wallet :ui :swap :asset-to-receive])]
-     {:fx (if asset-to-pay
+     {:db (assoc-in db [:wallet :ui :send :tx-type] :tx/swap)
+      :fx (if asset-to-pay
            [[:dispatch [:dismiss-modal :screen/wallet.swap-select-account]]
             [:dispatch
              [:wallet.swap/start
@@ -527,9 +527,9 @@
                                                    token
                                                    chain-ids)]
                                 (assoc token
-                                        :bridge-disabled? (and (= tx-type :tx/bridge)
-                                                               (send-utils/bridge-disabled? (:symbol
-                                                                                             token)))
+                                        :disabled? (and (= tx-type :tx/bridge)
+                                                        (send-utils/bridge-disabled? (:symbol
+                                                                                      token)))
                                        :networks (cond->>
                                                    (network-utils/network-list-with-positive-balance
                                                     token
Author	SHA1	Message	Date
Mohsen	92526be135	[#22111 ] fix: set send type and correct the filter event	2025-03-04 12:33:06 +03:00
Mohsen	9ee87b7d17	[#22111 ] fix: disabled bridge assets effect other list	2025-03-04 11:42:28 +03:00