iOS-8282 analytics parameters update

Tangem/App/Services/Analytics/Analytics+Event.swift

@@ -12,7 +12,6 @@ extension Analytics {
     enum Event: String {
         case signedIn = "[Basic] Signed in"
         case toppedUp = "[Basic] Topped up"
-        case walletOpened = "[Basic] Wallet Opened"
         case balanceLoaded = "[Basic] Balance Loaded"
         case tokenBalanceLoaded = "[Basic] Token Balance"
         case cardWasScanned = "[Basic] Card Was Scanned"
@@ -54,12 +53,9 @@ extension Analytics {
         case twinSetupFinished = "[Onboarding / Twins] Twin Setup Finished"
         case onboardingButtonChat = "[Onboarding] Button - Chat"
         case mainScreenOpened = "[Main Screen] Screen opened"
-        case mainScreenWalletChangedBySwipe = "[Main Screen] Wallet Swipe"
         case noticeRateTheAppButtonTapped = "[Main Screen] Notice - Rate The App Button Tapped"
         case buttonManageTokens = "[Portfolio] Button - Manage Tokens"
-        case tokenIsTapped = "[Portfolio] Token is Tapped"
-        case mainRefreshed = "[Portfolio] Refreshed"
-        case buttonOrganizeTokens = "[Portfolio] Button - Organize Tokens"
+
         case organizeTokensScreenOpened = "[Portfolio / Organize Tokens] Organize Tokens Screen Opened"
         case organizeTokensButtonSortByBalance = "[Portfolio / Organize Tokens] Button - By Balance"
         case organizeTokensButtonGroup = "[Portfolio / Organize Tokens] Button - Group"
@@ -69,7 +65,6 @@ extension Analytics {
         case buttonRemoveToken = "[Token] Button - Remove Token"
         case buttonExplore = "[Token] Button - Explore"
         case buttonReload = "[Token] Button - Reload"
-        case refreshed = "[Token] Refreshed"
         case buttonBuy = "[Token] Button - Buy"
         case buttonSell = "[Token] Button - Sell"
         case buttonExchange = "[Token] Button - Exchange"
@@ -288,6 +283,7 @@ extension Analytics {
         case stakingConfirmationScreenOpened = "[Staking] Confirmation Screen Opened"
         case stakingErrors = "[Staking] Errors"
         case stakingErrorTransactionRejected = "[Staking] Error - Transaction Rejected"
+        case stakingAppErrors = "[Staking] App Errors"
         case stakingSelectedCurrency = "[Staking] Selected Currency"
         case stakingButtonShare = "[Staking] Button - Share"
         case stakingButtonExplore = "[Staking] Button - Explore"
@@ -311,6 +307,7 @@ extension Analytics {
         case marketsChartButtonReceive = "[Markets / Chart] Button - Receive"
         case marketsChartButtonSwap = "[Markets / Chart] Button - Swap"
         case marketsChartDataError = "[Markets / Chart] Data Error"
+        case marketsChartExchangesScreenOpened = "[Markets / Chart] Exchanges Screen Opened"
 
         // MARK: - Manage Tokens
 

Tangem/App/Services/Analytics/Analytics+ParameterKey.swift

@@ -15,6 +15,7 @@ extension Analytics {
         case action = "Action"
         case errorDescription = "Error Description"
         case errorCode = "Error Code"
+        case errorMessage = "Error Message"
         case newSecOption = "new_security_option"
         case errorKey = "Tangem SDK error key"
         case walletConnectAction = "wallet_connect_action"
@@ -26,6 +27,7 @@ extension Analytics {
         case currency = "Currency Type" // fiat
         case success
         case token = "Token"
+        case tokens = "Tokens"
         case derivationPath = "Derivation Path"
         case derivation = "Derivation"
         case network = "Network"

Tangem/App/Services/Analytics/CommonStakingAnalyticsLogger.swift

@@ -10,11 +10,29 @@ import Foundation
 import TangemStaking
 
 struct CommonStakingAnalyticsLogger: StakingAnalyticsLogger {
-    func logAPIError(errorDescription: String, currencySymbol: String?) {
-        var params: [Analytics.ParameterKey: String] = [.errorDescription: errorDescription]
-        if let currencySymbol {
-            params[.token] = currencySymbol
+    func logError(_ error: any Error, currencySymbol: String) {
+        let event: Analytics.Event
+        var parameters: [Analytics.ParameterKey: String] = [.token: currencySymbol]
+        switch error {
+        case let apiError as StakeKitAPIError:
+            if let code = apiError.code {
+                parameters[.errorCode] = code
+            }
+            if let message = apiError.message {
+                parameters[.errorMessage] = message
+            }
+            event = .stakingErrors
+        case let httpError as StakeKitHTTPError:
+            parameters[.errorDescription] = httpError.errorDescription
+            event = .stakingErrors
+        case let error as LocalizedError where error is StakingManagerError || error is StakeKitMapperError:
+            parameters[.errorDescription] = error.errorDescription
+            event = .stakingAppErrors
+        default: return
         }
-        Analytics.log(event: .stakingErrors, params: params)
+        Analytics.log(
+            event: event,
+            params: parameters
+        )
     }
 }

Tangem/App/Services/NotificationManagers/SingleTokenNotifications/TokenNotificationEvent.swift

@@ -11,7 +11,7 @@ import SwiftUI
 
 enum TokenNotificationEvent: Hashable {
     case networkUnreachable(currencySymbol: String)
-    case someNetworksUnreachable
+    case someNetworksUnreachable(networks: [WalletModel])
     case rentFee(rentMessage: String)
     case noAccount(message: String)
     case existentialDepositWarning(message: String)
@@ -255,8 +255,9 @@ extension TokenNotificationEvent {
             return [.token: currencySymbol]
         case .notEnoughFeeForTransaction(let configuration):
             return [.token: configuration.eventConfiguration.feeAmountTypeCurrencySymbol]
-        case .someNetworksUnreachable,
-             .rentFee,
+        case .someNetworksUnreachable(let networks):
+            return [.tokens: networks.map(\.tokenItem.currencySymbol).joined(separator: ", ")]
+        case .rentFee,
              .noAccount,
              .existentialDepositWarning,
              .bnbBeaconChainRetirement,

Tangem/App/Services/NotificationManagers/UserWalletNotifications/MultiWalletNotificationManager.swift

@@ -35,12 +35,13 @@ final class MultiWalletNotificationManager {
                     }
             }
             .sink { [weak self] walletModels in
-                guard walletModels.contains(where: { $0.state.isBlockchainUnreachable }) else {
+                let unreachableNetworks = walletModels.filter { $0.state.isBlockchainUnreachable }
+                guard !unreachableNetworks.isEmpty else {
                     self?.removeSomeNetworksUnreachable()
                     return
                 }
 
-                self?.setupSomeNetworksUnreachable()
+                self?.setupSomeNetworksUnreachable(unreachableNetworks)
             }
     }
 
@@ -49,14 +50,16 @@ final class MultiWalletNotificationManager {
             guard let event = $0.settings.event as? TokenNotificationEvent else {
                 return false
             }
-
-            return event == .someNetworksUnreachable
+            switch event {
+            case .someNetworksUnreachable: return true
+            default: return false
+            }
         }
     }
 
-    private func setupSomeNetworksUnreachable() {
+    private func setupSomeNetworksUnreachable(_ unreachableNetworks: [WalletModel]) {
         let factory = NotificationsFactory()
-        notificationInputsSubject.send([factory.buildNotificationInput(for: TokenNotificationEvent.someNetworksUnreachable)])
+        notificationInputsSubject.send([factory.buildNotificationInput(for: TokenNotificationEvent.someNetworksUnreachable(networks: unreachableNetworks))])
     }
 }
 

Tangem/Modules/Main/MainCoordinator.swift

@@ -193,8 +193,6 @@ extension MainCoordinator: MultiWalletMainContentRoutable {
     func openTokenDetails(for model: WalletModel, userWalletModel: UserWalletModel) {
         mainBottomSheetUIManager.hide()
 
-        Analytics.log(.tokenIsTapped)
-
         let dismissAction: Action<Void> = { [weak self] _ in
             self?.tokenDetailsCoordinator = nil
         }

Tangem/Modules/Main/MainViewModel.swift

@@ -147,8 +147,6 @@ final class MainViewModel: ObservableObject {
     }
 
     func onPullToRefresh(completionHandler: @escaping RefreshCompletionHandler) {
-        Analytics.log(.mainRefreshed)
-
         isHorizontalScrollDisabled = true
         let completion = { [weak self] in
             self?.isHorizontalScrollDisabled = false
@@ -186,8 +184,6 @@ final class MainViewModel: ObservableObject {
     func onPageChange(dueTo reason: CardsInfoPageChangeReason) {
         guard reason == .byGesture else { return }
 
-        Analytics.log(.mainScreenWalletChangedBySwipe)
-
         if !AppSettings.shared.userDidSwipeWalletsOnMainScreen {
             AppSettings.shared.userDidSwipeWalletsOnMainScreen = true
         }
@@ -346,7 +342,6 @@ final class MainViewModel: ObservableObject {
                 guard let userWalletId = viewModel.pages[safe: newIndex]?.id else {
                     return
                 }
-                Analytics.log(.walletOpened)
                 viewModel.userWalletRepository.setSelectedUserWalletId(
                     userWalletId,
                     reason: .userSelected

Tangem/Modules/Main/MultiWalletMainContent/MultiWalletMainContentViewModel.swift

@@ -130,7 +130,6 @@ final class MultiWalletMainContentViewModel: ObservableObject {
     }
 
     func onOpenOrganizeTokensButtonTap() {
-        Analytics.log(.buttonOrganizeTokens)
         openOrganizeTokens()
     }
 

Tangem/Modules/Markets/MarketsTokenDetails/MarketsTokenDetailsViewModel.swift

@@ -226,6 +226,8 @@ class MarketsTokenDetailsViewModel: MarketsBaseViewModel {
             return
         }
 
+        Analytics.log(event: .marketsChartExchangesScreenOpened, params: [.token: tokenInfo.symbol.uppercased()])
+
         coordinator?.openExchangesList(tokenId: tokenInfo.id, numberOfExchangesListedOn: numberOfExchangesListedOn, presentationStyle: presentationStyle)
     }
 

Tangem/Modules/Send/Services/TransactionDispatcher/StakingTransactionDispatcher.swift

@@ -106,12 +106,9 @@ private extension StakingTransactionDispatcher {
         do {
             try await pendingHashesSender.sendHash(hash)
         } catch {
-            Analytics.log(
-                event: .stakingErrors,
-                params: [
-                    .token: walletModel.tokenItem.currencySymbol,
-                    .errorDescription: error.localizedDescription,
-                ]
+            CommonStakingAnalyticsLogger().logError(
+                error,
+                currencySymbol: walletModel.tokenItem.currencySymbol
             )
         }
 

Tangem/Modules/SingleTokenBase/SingleTokenBaseViewModel.swift

@@ -128,8 +128,6 @@ class SingleTokenBaseViewModel: NotificationTapDelegate {
             return
         }
 
-        Analytics.log(.refreshed)
-
         if let id = walletModel.tokenItem.currencyId, miniChartsProvider.items.isEmpty {
             miniChartsProvider.fetch(for: [id], with: miniChartPriceIntervalType)
         }

Tangem/Modules/StakingDetails/StakingDetailsViewModel.swift

@@ -82,7 +82,10 @@ final class StakingDetailsViewModel: ObservableObject {
         let balances = stakingManager.state.balances.flatMap { String($0.count) } ?? String(0)
         Analytics.log(
             event: .stakingInfoScreenOpened,
-            params: [.validatorsCount: balances]
+            params: [
+                .validatorsCount: balances,
+                .token: walletModel.tokenItem.currencySymbol,
+            ]
         )
     }
 }

Tangem/UIComponents/ReceiveBottomSheetView/ReceiveBottomSheetViewModel.swift

@@ -49,7 +49,7 @@ class ReceiveBottomSheetViewModel: ObservableObject, Identifiable {
     }
 
     func onViewAppear() {
-        Analytics.log(.receiveScreenOpened)
+        Analytics.log(event: .receiveScreenOpened, params: [.token: tokenItem.currencySymbol])
     }
 
     func headerForAddress(with info: ReceiveAddressInfo) -> String {

TangemStaking/Services/StakeKitMapper/StakeKitMapper.swift

@@ -369,8 +369,18 @@ struct StakeKitMapper {
     }
 }
 
-enum StakeKitMapperError: Error {
+public enum StakeKitMapperError: Error {
     case notImplement
     case noData(String)
     case tronTransactionMappingFailed
 }
+
+extension StakeKitMapperError: LocalizedError {
+    public var errorDescription: String? {
+        switch self {
+        case .notImplement: "Not implemented"
+        case .noData(let string): string
+        case .tronTransactionMappingFailed: "TronTransactionMappingFailed"
+        }
+    }
+}

TangemStaking/Services/StakingAPIService/DTOs/StakeKitDTO.swift

@@ -8,15 +8,16 @@
 
 import Foundation
 
-enum StakeKitDTO {
-    // MARK: - Common
+public struct StakeKitAPIError: Decodable, LocalizedError {
+    public let code: String?
+    public let message: String?
+    let level: String?
 
-    struct APIError: Decodable, LocalizedError {
-        let message: String?
-        let level: String?
+    public var errorDescription: String? { message }
+}
 
-        var errorDescription: String? { message }
-    }
+enum StakeKitDTO {
+    // MARK: - Common
 
     struct Token: Codable {
         let network: String

TangemStaking/Services/StakingAPIService/StakeKitStakingAPIService.swift

@@ -109,20 +109,20 @@ private extension StakeKitStakingAPIService {
 
     func tryMapError(target: StakeKitTarget, response: Moya.Response) -> Error? {
         do {
-            let error = try JSONDecoder().decode(StakeKitDTO.APIError.self, from: response.data)
+            let error = try JSONDecoder().decode(StakeKitAPIError.self, from: response.data)
             return error
         } catch {
             return nil
         }
     }
 }
 
-private enum StakeKitHTTPError: Error {
+public enum StakeKitHTTPError: Error {
     case badStatusCode(response: String?, code: Int)
 }
 
 extension StakeKitHTTPError: LocalizedError {
-    var errorDescription: String? {
+    public var errorDescription: String? {
         switch self {
         case .badStatusCode(let response, let code): response ?? "HTTP error \(code)"
         }

TangemStaking/Services/StakingAnalytics/StakingAnalyticsLogger.swift

@@ -9,5 +9,5 @@
 import Foundation
 
 public protocol StakingAnalyticsLogger {
-    func logAPIError(errorDescription: String, currencySymbol: String?)
+    func logError(_ error: any Error, currencySymbol: String)
 }