diff --git a/UnstoppableWallet/UnstoppableWallet/Core/Adapters/Evm/EvmTransactionsAdapter.swift b/UnstoppableWallet/UnstoppableWallet/Core/Adapters/Evm/EvmTransactionsAdapter.swift
index 4c82f2402f..6c366be6f8 100644
--- a/UnstoppableWallet/UnstoppableWallet/Core/Adapters/Evm/EvmTransactionsAdapter.swift
+++ b/UnstoppableWallet/UnstoppableWallet/Core/Adapters/Evm/EvmTransactionsAdapter.swift
@@ -42,7 +42,7 @@ class EvmTransactionsAdapter: BaseEvmAdapter {
         case .all: ()
         case .incoming: type = .incoming
         case .outgoing: type = .outgoing
-        case .swap: type = .swap
+//        case .swap: type = .swap
         case .approve: type = .approve
         }
 
diff --git a/UnstoppableWallet/UnstoppableWallet/Core/Adapters/Tron/TronTransactionAdapter.swift b/UnstoppableWallet/UnstoppableWallet/Core/Adapters/Tron/TronTransactionAdapter.swift
index 5979fa29b2..ff7ec2fc83 100644
--- a/UnstoppableWallet/UnstoppableWallet/Core/Adapters/Tron/TronTransactionAdapter.swift
+++ b/UnstoppableWallet/UnstoppableWallet/Core/Adapters/Tron/TronTransactionAdapter.swift
@@ -38,7 +38,7 @@ class TronTransactionsAdapter: BaseTronAdapter {
             case .all: ()
             case .incoming: type = .incoming
             case .outgoing: type = .outgoing
-            case .swap: type = .swap
+//            case .swap: type = .swap
             case .approve: type = .approve
         }
 
diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Transactions/TransactionTypeFilter.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Transactions/TransactionTypeFilter.swift
index 80f879826c..95eaad76f6 100644
--- a/UnstoppableWallet/UnstoppableWallet/Modules/Transactions/TransactionTypeFilter.swift
+++ b/UnstoppableWallet/UnstoppableWallet/Modules/Transactions/TransactionTypeFilter.swift
@@ -1,4 +1,4 @@
 enum TransactionTypeFilter: String, CaseIterable {
-    case all, incoming, outgoing, swap, approve
-//    case all, incoming, outgoing, approve
+//    case all, incoming, outgoing, swap, approve
+    case all, incoming, outgoing, approve
 }
diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/WalletViewItemFactory.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/WalletViewItemFactory.swift
index 64ffd49a66..e56f5ad09b 100644
--- a/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/WalletViewItemFactory.swift
+++ b/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/WalletViewItemFactory.swift
@@ -147,7 +147,7 @@ class WalletViewItemFactory {
         var buttons = [WalletModule.Button: ButtonState]()
 
         switch item.element {
-        case .wallet(let wallet):
+        case .wallet:
             if item.watchAccount {
                 buttons[.address] = .enabled
             } else {
@@ -156,9 +156,9 @@ class WalletViewItemFactory {
                 buttons[.send] = sendButtonState
                 buttons[.receive] = .enabled
 
-                if wallet.token.swappable {
-                    buttons[.swap] = sendButtonState
-                }
+//                if wallet.token.swappable {
+//                    buttons[.swap] = sendButtonState
+//                }
             }
         case .cexAsset(let cexAsset):
             buttons[.withdraw] = cexAsset.withdrawEnabled ? .enabled : .disabled