Add Swap Status for cross chain swap tx view

Features/Settings/Sources/Settings/ViewModels/DeveloperViewModel.swift

@@ -166,7 +166,8 @@ public final class DeveloperViewModel {
                             fromValue: BigInt(2767611111).description,
                             toAsset: AssetId.init(chain: .solana),
                             toValue: BigInt(812312312).description,
-                            provider: .none
+                            provider: .none,
+                            swapResult: .none
                         )
                     ),
                 createdAt: Date().addingTimeInterval(-122223)
@@ -235,7 +236,8 @@ public final class DeveloperViewModel {
                             fromValue: BigInt(276767623311111111).description,
                             toAsset: AssetId.init(chain: .bitcoin),
                             toValue: BigInt(32312312).description,
-                            provider: .none
+                            provider: .none,
+                            swapResult: .none
                         )
                     ),
                 createdAt: Date().addingTimeInterval(-1344411)

Features/Transactions/Package.swift

@@ -37,6 +37,7 @@ let package = Package(
                 "PrimitivesComponents",
                 .product(name: "ExplorerService", package: "ChainServices"),
                 .product(name: "TransactionsService", package: "FeatureServices"),
+                .product(name: "SwapService", package: "FeatureServices"),
                 .product(name: "WalletService", package: "FeatureServices"),
                 "Preferences",
                 "InfoSheet"
@@ -49,7 +50,8 @@ let package = Package(
                 .product(name: "PrimitivesTestKit", package: "Primitives"),
                 .product(name: "PreferencesTestKit", package: "Preferences"),
                 "Transactions",
-                "PrimitivesComponents"
+                "PrimitivesComponents",
+                .product(name: "SwapService", package: "FeatureServices")
             ]
         ),
     ]

Features/Transactions/Sources/Types/TransactionSection.swift

@@ -20,6 +20,7 @@ public enum TransactionItem: Identifiable, Equatable, Sendable {
     case swapButton
     case date
     case status
+    case swapStatus
     case participant
     case memo
     case network

Features/Transactions/Sources/ViewModels/TransactionExplorerViewModel.swift

@@ -18,18 +18,14 @@ public struct TransactionExplorerViewModel: Sendable {
         self.explorerService = explorerService
     }
 
-    private var swapProvider: String? {
-        guard case let .swap(metadata) = transactionViewModel.transaction.transaction.metadata else {
-            return nil
-        }
-        return metadata.provider
-    }
-
     private var transactionLink: BlockExplorerLink {
-        explorerService.transactionUrl(
-            chain: transactionViewModel.transaction.transaction.assetId.chain,
-            hash: transactionViewModel.transaction.transaction.hash,
-            swapProvider: swapProvider
+        let chain = transactionViewModel.transaction.transaction.assetId.chain
+        let hash = transactionViewModel.transaction.transaction.hash
+        return explorerService.transactionLink(
+            chain: chain,
+            provider: transactionViewModel.transaction.transaction.swapProvider,
+            hash: hash,
+            recipient: transactionViewModel.transaction.transaction.to
         )
     }
 

Features/Transactions/Sources/ViewModels/TransactionSceneViewModel.swift

@@ -18,6 +18,10 @@ public final class TransactionSceneViewModel {
 
     var request: TransactionRequest
     var transactionExtended: TransactionExtended
+    var swapResult: SwapResult? { swapMetadata?.swapResult }
+
+    var isPresentingShareSheet = false
+    var isPresentingInfoSheet: InfoSheetType? = .none
     var isPresentingTransactionSheet: TransactionSheetType?
 
     public init(
@@ -43,7 +47,7 @@ extension TransactionSceneViewModel: ListSectionProvideable {
         [
             ListSection(type: .header, [.header]),
             ListSection(type: .swapAction, [.swapButton]),
-            ListSection(type: .details, [.date, .status, .participant, .memo, .network, .pnl, .price, .size, .provider, .fee]),
+            ListSection(type: .details, detailItems),
             ListSection(type: .explorer, [.explorerLink])
         ]
     }
@@ -53,7 +57,10 @@ extension TransactionSceneViewModel: ListSectionProvideable {
         case .header: headerViewModel
         case .swapButton: TransactionSwapButtonViewModel(transaction: transactionExtended)
         case .date: TransactionDateViewModel(date: model.transaction.transaction.createdAt)
-        case .status: TransactionStatusViewModel(state: model.transaction.transaction.state, onInfoAction: onSelectStatusInfo)
+        case .status:
+            TransactionStatusViewModel(state: model.transaction.transaction.state, onInfoAction: onSelectStatusInfo)
+        case .swapStatus:
+            TransactionStatusViewModel(title: model.swapStatusTitle, state: model.transaction.transaction.state, swapResult: swapResult, onInfoAction: onSelectStatusInfo)
         case .participant: TransactionParticipantViewModel(transactionViewModel: model)
         case .memo: TransactionMemoViewModel(transaction: model.transaction.transaction)
         case .network: TransactionNetworkViewModel(chain: model.transaction.asset.chain)
@@ -115,7 +122,7 @@ extension TransactionSceneViewModel {
             currency: preferences.currency
         )
     }
-    
+
     private var headerViewModel: TransactionHeaderViewModel {
         TransactionHeaderViewModel(
             transaction: model.transaction,
@@ -130,6 +137,30 @@ extension TransactionSceneViewModel {
         )
     }
 
+    private var detailItems: [TransactionItem] {
+        var items: [TransactionItem] = [.date]
+        if isCrossChainSwap {
+            items.append(.swapStatus)
+        }
+
+        if !isCrossChainSwap {
+            items.append(.status)
+        }
+
+        items.append(contentsOf: [.participant, .memo, .network, .pnl, .price, .size, .provider, .fee])
+        return items
+    }
+
+    private var swapMetadata: TransactionSwapMetadata? {
+        guard case let .swap(metadata) = transactionExtended.transaction.metadata else { return nil }
+        return metadata
+    }
+
+    private var isCrossChainSwap: Bool {
+        guard let metadata = swapMetadata else { return false }
+        return metadata.fromAsset.chain != metadata.toAsset.chain
+    }
+
     var feeDetailsViewModel: NetworkFeeSceneViewModel {
         NetworkFeeSceneViewModel(
             chain: model.transaction.transaction.assetId.chain,

Features/Transactions/Sources/ViewModels/TransactionStatusViewModel.swift

@@ -9,31 +9,78 @@ import Components
 import Style
 
 public struct TransactionStatusViewModel {
+    private let title: String
     private let state: TransactionState
+    private let swapResult: SwapResult?
     private let onInfoAction: VoidAction
 
     public init(
+        title: String = Localized.Transaction.status,
         state: TransactionState,
+        swapResult: SwapResult? = nil,
         onInfoAction: VoidAction
     ) {
+        self.title = title
         self.state = state
+        self.swapResult = swapResult
         self.onInfoAction = onInfoAction
     }
 
     private var stateViewModel: TransactionStateViewModel {
         TransactionStateViewModel(state: state)
     }
+
+    private var swapStateViewModel: TransactionStateViewModel? {
+        guard let swapResult else { return nil }
+        let mappedState: TransactionState = {
+            switch swapResult.status {
+            case .pending: .pending
+            case .completed: .confirmed
+            case .failed: .failed
+            case .refunded: .failed
+            }
+        }()
+        return TransactionStateViewModel(state: mappedState)
+    }
+
+    private var statusTitle: String {
+        if let swapResult {
+            switch swapResult.status {
+            case .pending: return Localized.Transaction.Status.pending
+            case .completed: return Localized.Transaction.Status.confirmed
+            case .failed: return Localized.Transaction.Status.failed
+            case .refunded: return Localized.Transaction.Status.refunded
+            }
+        }
+        return stateViewModel.title
+    }
+
+    private var statusColor: Color {
+        swapStateViewModel?.color ?? stateViewModel.color
+    }
+
+    private var statusBackground: Color {
+        swapStateViewModel?.background ?? stateViewModel.background
+    }
+
+    private var statusTag: TitleTagType {
+        if swapResult?.status == .pending || (swapResult == nil && state == .pending) {
+            return .progressView()
+        }
+        let image = (swapStateViewModel ?? stateViewModel).stateImage
+        return .image(image)
+    }
 }
 
 // MARK: - ItemModelProvidable
 
 extension TransactionStatusViewModel: ItemModelProvidable {
     public var itemModel: TransactionItemModel {
         .listItem(ListItemModel(
-            title: Localized.Transaction.status,
-            titleTagType: state == .pending ? .progressView() : .image(stateViewModel.stateImage),
-            subtitle: stateViewModel.title,
-            subtitleStyle: TextStyle(font: .callout, color: stateViewModel.color),
+            title: title,
+            titleTagType: statusTag,
+            subtitle: statusTitle,
+            subtitleStyle: TextStyle(font: .callout, color: statusColor, background: statusBackground),
             infoAction: onInfoAction
         ))
     }

Features/Transactions/Tests/TransactionsTests/ViewModels/TransactionSceneViewModelTests.swift

@@ -7,6 +7,7 @@ import PreferencesTestKit
 import PrimitivesComponents
 import Style
 import Components
+import ExplorerService
 
 @testable import Transactions
 @testable import Store
@@ -92,6 +93,70 @@ struct TransactionSceneViewModelTests {
         }
     }
 
+    @Test
+    func swapStatusReflectsSwapResult() {
+        let swapResult = SwapResult(
+            status: .completed,
+            fromChain: .ethereum,
+            fromTxHash: "0xsource",
+            toChain: .some(.arbitrum),
+            toTxHash: "0xdestination"
+        )
+
+        let metadata = TransactionMetadata.swap(
+            TransactionSwapMetadata(
+                fromAsset: AssetId(chain: .ethereum, tokenId: nil),
+                fromValue: "1",
+                toAsset: AssetId(chain: .arbitrum, tokenId: nil),
+                toValue: "1",
+                provider: "across",
+                swapResult: swapResult
+            )
+        )
+
+        let swapModel = TransactionSceneViewModel.mock(
+            type: .swap,
+            metadata: metadata
+        )
+
+        if case .listItem(let item) = swapModel.item(for: TransactionItem.swapStatus) {
+            #expect(item.title == Localized.Transaction.swapStatus)
+            #expect(item.subtitle == Localized.Transaction.Status.confirmed)
+        } else {
+            Issue.record("Expected swap status list item")
+        }
+
+    }
+
+    @Test
+    func swapStatusLoadsPersistedResult() {
+        let expected = SwapResult(
+            status: .completed,
+            fromChain: .ethereum,
+            fromTxHash: "0xsource",
+            toChain: .some(.arbitrum),
+            toTxHash: "0xdestination"
+        )
+
+        let metadata = TransactionMetadata.swap(
+            TransactionSwapMetadata(
+                fromAsset: .mock(.ethereum),
+                fromValue: "1",
+                toAsset: .mock(.arbitrum),
+                toValue: "1",
+                provider: "across",
+                swapResult: expected
+            )
+        )
+
+        let model = TransactionSceneViewModel.mock(
+            type: .swap,
+            metadata: metadata
+        )
+
+        #expect(model.swapResult == expected)
+    }
+
     @Test
     func participantItemModel() {
         let transaction = TransactionExtended.mock(
@@ -105,7 +170,8 @@ struct TransactionSceneViewModelTests {
         let modelWithAddresses = TransactionSceneViewModel(
             transaction: transaction,
             walletId: "test_wallet_id",
-            preferences: Preferences.standard
+            preferences: Preferences.standard,
+            explorerService: ExplorerService.standard
         )
 
         if case .participant(let item) = modelWithAddresses.item(for: TransactionItem.participant) {
@@ -170,11 +236,11 @@ struct TransactionSceneViewModelTests {
     func feeItemModel() {
         let model = TransactionSceneViewModel.mock()
 
-        if case .listItem(let item) = model.item(for: TransactionItem.fee) {
+        if case .fee(let item) = model.item(for: TransactionItem.fee) {
             #expect(item.title == Localized.Transfer.networkFee)
             #expect(item.infoAction != nil)
         } else {
-            Issue.record("Expected listItem for fee")
+            Issue.record("Expected fee item for network fee")
         }
     }
 
@@ -226,26 +292,30 @@ struct TransactionSceneViewModelTests {
 }
 
 extension TransactionSceneViewModel {
-    static func mock(
+    fileprivate static func mock(
         type: TransactionType = .transfer,
         state: TransactionState = .confirmed,
         direction: TransactionDirection = .outgoing,
         assetId: AssetId = .mock(),
         toAddress: String = "participant_address",
         memo: String? = nil,
-        createdAt: Date = Date()
+        createdAt: Date = Date(),
+        metadata: TransactionMetadata? = nil
     ) -> TransactionSceneViewModel {
-        TransactionSceneViewModel(
-            transaction: TransactionExtended.mock(
-                transaction: Transaction.mock(
-                    type: type,
-                    state: state,
-                    direction: direction,
-                    assetId: assetId,
-                    to: toAddress,
-                    memo: memo
-                )
-            ),
+        let transactionExtended = TransactionExtended.mock(
+            transaction: Transaction.mock(
+                type: type,
+                state: state,
+                direction: direction,
+                assetId: assetId,
+                to: toAddress,
+                memo: memo,
+                metadata: metadata
+            )
+        )
+
+        return TransactionSceneViewModel(
+            transaction: transactionExtended,
             walletId: "test_wallet_id",
             preferences: Preferences.standard
         )