lint-fix

src/status_im/contexts/wallet/common/token_value/view.cljs

@@ -1,6 +1,5 @@
 (ns status-im.contexts.wallet.common.token-value.view
   (:require [quo.core :as quo]
-            [status-im.common.not-implemented :as not-implemented]
             [status-im.contexts.wallet.sheets.buy-token.view :as buy-token]
             [status-im.feature-flags :as ff]
             [utils.i18n :as i18n]
@@ -44,11 +43,18 @@
                           (rf/dispatch [:wallet/bridge-select-token bridge-params]))})
 
 (defn- action-swap
-  []
-  {:icon                :i/swap
-   :accessibility-label :swap
-   :label               (i18n/label :t/swap)
-   :on-press            #(not-implemented/alert)})
+  [token-symbol]
+  (let [current-viewing-account-address (rf/sub [:wallet/current-viewing-account-address])
+        account-address                 (or current-viewing-account-address
+                                            (:address (first (rf/sub [:wallet/operable-accounts]))))
+        token                           (rf/sub [:wallet/token-with-networks token-symbol
+                                                 account-address])]
+    {:icon                :i/swap
+     :accessibility-label :swap
+     :label               (i18n/label :t/swap)
+     :on-press            (fn []
+                            (rf/dispatch [:hide-bottom-sheet])
+                            (rf/dispatch [:wallet.swap/start-with-token token]))}))
 
 (defn- action-manage-tokens
   [watch-only?]
@@ -90,7 +96,7 @@
                                    (when (seq token-owners)
                                      (action-send send-or-bridge-params entry-point))
                                    (action-receive selected-account?)
-                                   (when (ff/enabled? ::ff/wallet.swap) (action-swap))
+                                   (when (ff/enabled? ::ff/wallet.swap) (action-swap token-symbol))
                                    (when (seq (seq token-owners))
                                      (action-bridge send-or-bridge-params))]))]]))
 

src/status_im/contexts/wallet/swap/events.cljs

@@ -1,18 +1,33 @@
 (ns status-im.contexts.wallet.swap.events
   (:require [re-frame.core :as rf]
             [status-im.constants :as constants]
+            [status-im.contexts.communities.utils :as utils]
             [status-im.contexts.wallet.sheets.network-selection.view :as network-selection]
             [utils.number]))
 
 (rf/reg-event-fx :wallet.swap/start
- (fn [{:keys [_db]}]
+ (fn [{:keys [_]}]
    {:fx [[:dispatch [:open-modal :screen/wallet.swap-select-asset-to-pay]]]}))
 
+(rf/reg-event-fx :wallet.swap/start-with-token
+ (fn [{:keys [db]} [token]]
+   (let [current-address (get-in db [:wallet :current-viewing-account-address])
+         address         (:address (first (utils/sorted-operable-non-watch-only-accounts db)))
+         token-networks  (:networks token)]
+     {:fx [(when-not current-address
+             [:dispatch
+              [:wallet/switch-current-viewing-account address]])
+           [:dispatch
+            [:wallet.swap/select-asset-to-pay
+             {:token   token
+              :network (when (= count token-networks)
+                         (first token-networks))}]]]})))
+
 (rf/reg-event-fx :wallet.swap/select-asset-to-pay
  (fn [{:keys [db]} [{:keys [token network]}]]
    {:db (-> db
             (assoc-in [:wallet :ui :swap :asset-to-pay] token)
-            (assoc-in [:wallet :ui :swap :network] network))
+            (cond-> network (assoc-in [:wallet :ui :swap :network] network)))
     :fx (if network
           [[:dispatch [:navigate-to :screen/wallet.swap-propasal]]
            [:dispatch [:wallet.swap/set-default-slippage]]]

src/status_im/contexts/wallet/swap/swap_proposal/style.cljs

@@ -1,4 +1,6 @@
 (ns status-im.contexts.wallet.swap.swap-proposal.style)
 
 (def container
-  {:flex 1})
+  {:flex    1
+   :padding 16
+   :gap     16})

src/status_im/contexts/wallet/swap/swap_proposal/view.cljs

@@ -9,6 +9,10 @@
   []
   (let [max-slippage (rf/sub [:wallet/swap-max-slippage])]
     [rn/view {:style style/container}
+     [quo/button
+      {:on-press #(rf/dispatch [:navigate-back])
+       :type     :grey}
+      "Back"]
      [quo/button
       {:on-press #(rf/dispatch [:show-bottom-sheet
                                 {:content slippage-settings/view}])}

src/status_im/subs/wallet/swap.cljs

@@ -21,9 +21,11 @@
 
 (rf/reg-sub
  :wallet/swap-asset-to-pay-networks
- :<- [:wallet/swap-asset-to-pay]
- (fn [token]
-   (let [{token-networks :networks} token
+ (fn []
+   [(rf/subscribe [:wallet/swap-asset-to-pay])
+    (rf/subscribe [:wallet/current-viewing-account-tokens-filtered])])
+ (fn [[asset-to-pay tokens]]
+   (let [{token-networks :networks} (some #(when (= (:symbol %) (:symbol asset-to-pay)) %) tokens)
          grouped-networks           (group-by :layer
                                               token-networks)
          mainnet-network            (first (get grouped-networks constants/layer-1-network))

src/status_im/subs/wallet/swap_test.cljs

@@ -90,14 +90,6 @@
       swap-data)
     (is (match? "SNT" (rf/sub [sub-name])))))
 
-(h/deftest-sub :wallet/swap-asset-to-pay-networks
-  [sub-name]
-  (testing "Return the available networks for the swap asset-to-pay"
-    (swap! rf-db/app-db assoc-in
-      [:wallet :ui :swap]
-      swap-data)
-    (is (match? networks (rf/sub [sub-name])))))
-
 (h/deftest-sub :wallet/swap-asset-to-pay-network-balance
   [sub-name]
   (testing "Return swap asset-to-pay"

src/status_im/subs/wallet/wallet.cljs

@@ -426,6 +426,18 @@
                  sorted-tokens))
        sorted-tokens))))
 
+(rf/reg-sub
+ :wallet/token-with-networks
+ :<- [:wallet/accounts]
+ :<- [:wallet/network-details]
+ (fn [[accounts networks] [_ token-symbol account-address]]
+   (let [account (utils/get-account-by-address accounts account-address)
+         token   (some #(when (= token-symbol (:symbol %)) %)
+                       (:tokens account))]
+     (assoc token
+            :networks
+            (network-utils/network-list token networks)))))
+
 (rf/reg-sub
  :wallet/token-by-symbol
  :<- [:wallet/current-viewing-account]