IOS-7227 Update content for activation error on send screen (#789)

tangem · Aug 6, 2024 · 3589f57 · 3589f57
1 parent cc8f557
commit 3589f57
Show file tree

Hide file tree

Showing 21 changed files with 65 additions and 44 deletions.
diff --git a/BlockchainSdk/Blockchains/Algorand/AlgorandNetworkService.swift b/BlockchainSdk/Blockchains/Algorand/AlgorandNetworkService.swift
@@ -63,7 +63,7 @@ class AlgorandNetworkService: MultiNetworkProvider {
                 .tryMap { response in
                     /// This paramenter mast be writen for building transaction
                     guard let genesisHash = Data(base64Encoded: response.genesisHash) else {
-                        throw WalletError.failedToParseNetworkResponse
+                        throw WalletError.failedToParseNetworkResponse()
                     }
 
                     let transactionParams = AlgorandTransactionBuildParams(
@@ -110,7 +110,7 @@ class AlgorandNetworkService: MultiNetworkProvider {
                     } else if confirmedRound == 0, !response.poolError.isEmpty {
                         return AlgorandTransactionInfo(transactionHash: transactionHash, status: .removed)
                     } else {
-                        throw WalletError.failedToParseNetworkResponse
+                        throw WalletError.failedToParseNetworkResponse()
                     }
                 }
                 .eraseToAnyPublisher()

diff --git a/BlockchainSdk/Blockchains/Aptos/AptosNetworkService.swift b/BlockchainSdk/Blockchains/Aptos/AptosNetworkService.swift
@@ -34,14 +34,14 @@ class AptosNetworkService: MultiNetworkProvider {
                         let accountJson = response.first(where: { $0.type == Constants.accountKeyPrefix }),
                         let coinJson = response.first(where: { $0.type == Constants.coinStoreKeyPrefix })
                     else {
-                        throw WalletError.failedToParseNetworkResponse
+                        throw WalletError.failedToParseNetworkResponse()
                     }
 
                     guard
                         let balanceValue = Decimal(coinJson.data.coin?.value),
                         let sequenceNumber = Decimal(accountJson.data.sequenceNumber)
                     else {
-                        throw WalletError.failedToParseNetworkResponse
+                        throw WalletError.failedToParseNetworkResponse()
                     }
 
                     return AptosAccountInfo(sequenceNumber: sequenceNumber.int64Value, balance: balanceValue)
@@ -98,7 +98,7 @@ class AptosNetworkService: MultiNetworkProvider {
                 .submitTransaction(data: data)
                 .tryMap { response in
                     guard let transactionHash = response.hash else {
-                        throw WalletError.failedToParseNetworkResponse
+                        throw WalletError.failedToParseNetworkResponse()
                     }
 
                     return transactionHash

diff --git a/BlockchainSdk/Blockchains/Chia/Provider/ChiaNetworkProvider.swift b/BlockchainSdk/Blockchains/Chia/Provider/ChiaNetworkProvider.swift
@@ -82,7 +82,7 @@ struct ChiaNetworkProvider: HostProvider {
                 return response
             }
             .mapError { error in
-                return WalletError.failedToParseNetworkResponse
+                return WalletError.failedToParseNetworkResponse()
             }
             .eraseToAnyPublisher()
     }

diff --git a/BlockchainSdk/Blockchains/Cosmos/CosmosNetworkService.swift b/BlockchainSdk/Blockchains/Cosmos/CosmosNetworkService.swift
@@ -36,7 +36,7 @@ class CosmosNetworkService: MultiNetworkProvider {
                         let self,
                         let sequenceNumber = UInt64(accountInfo?.account.sequence ?? "0")
                     else {
-                        throw WalletError.failedToParseNetworkResponse
+                        throw WalletError.failedToParseNetworkResponse()
                     }
 
                     let accountNumber: UInt64?
@@ -133,7 +133,7 @@ class CosmosNetworkService: MultiNetworkProvider {
     private func cw20TokenBalance(walletAddress: String, token: Token) -> AnyPublisher<(Token, Decimal), Error> {
         let request = CosmosCW20BalanceRequest(address: walletAddress)
         guard let query = try? JSONEncoder().encode(request) else {
-            return .anyFail(error: WalletError.failedToParseNetworkResponse)
+            return .anyFail(error: WalletError.failedToParseNetworkResponse())
         }
 
         return providerPublisher {
@@ -142,7 +142,7 @@ class CosmosNetworkService: MultiNetworkProvider {
                     (result: CosmosCW20QueryResult<CosmosCW20QueryBalanceData>) -> (Token, Decimal) in
 
                     guard let balanceInSmallestDenomination = Decimal(string: result.data.balance) else {
-                        throw WalletError.failedToParseNetworkResponse
+                        throw WalletError.failedToParseNetworkResponse()
                     }
 
                     let balance = balanceInSmallestDenomination / token.decimalValue
@@ -195,7 +195,7 @@ class CosmosNetworkService: MultiNetworkProvider {
         }
 
         guard let balanceInSmallestDenomination = Int(balanceAmountString) else {
-            throw WalletError.failedToParseNetworkResponse
+            throw WalletError.failedToParseNetworkResponse()
         }
 
         return Decimal(balanceInSmallestDenomination) / decimalValue

diff --git a/BlockchainSdk/Blockchains/Cosmos/CosmosRestProvider.swift b/BlockchainSdk/Blockchains/Cosmos/CosmosRestProvider.swift
@@ -70,7 +70,7 @@ class CosmosRestProvider: HostProvider {
                 }
 
                 if case .objectMapping = moyaError {
-                    return WalletError.failedToParseNetworkResponse
+                    return WalletError.failedToParseNetworkResponse()
                 }
                 return moyaError
             }

diff --git a/BlockchainSdk/Blockchains/Ducatus/DucatusNetworkService.swift b/BlockchainSdk/Blockchains/Ducatus/DucatusNetworkService.swift
@@ -25,7 +25,7 @@ class DucatusNetworkService: BitcoinNetworkProvider {
             .tryMap { balance, unspents throws -> BitcoinResponse in
                 guard let confirmed = balance.confirmed,
                     let unconfirmed = balance.unconfirmed else {
-                        throw WalletError.failedToParseNetworkResponse
+                        throw WalletError.failedToParseNetworkResponse()
                 }
 
                 let utxs: [BitcoinUnspentOutput] = unspents.compactMap { utxo -> BitcoinUnspentOutput?  in
@@ -52,7 +52,7 @@ class DucatusNetworkService: BitcoinNetworkProvider {
                 if let id = response.txid {
                     return id
                 } else {
-                    throw WalletError.failedToParseNetworkResponse
+                    throw WalletError.failedToParseNetworkResponse()
                 }
         }.eraseToAnyPublisher()
     }

diff --git a/BlockchainSdk/Blockchains/Kaspa/Network/KaspaNetworkProvider.swift b/BlockchainSdk/Blockchains/Kaspa/Network/KaspaNetworkProvider.swift
@@ -51,7 +51,7 @@ class KaspaNetworkProvider: HostProvider {
             .map(T.self, using: decoder)
             .mapError { moyaError in
                 if case .objectMapping = moyaError {
-                    return WalletError.failedToParseNetworkResponse
+                    return WalletError.failedToParseNetworkResponse()
                 }
                 return moyaError
             }

diff --git a/BlockchainSdk/Blockchains/NEAR/Network/NEARNetworkService.swift b/BlockchainSdk/Blockchains/NEAR/Network/NEARNetworkService.swift
@@ -29,7 +29,7 @@ final class NEARNetworkService: MultiNetworkProvider {
                 .getGasPrice()
                 .tryMap { result in
                     guard let gasPrice = Decimal(string: result.gasPrice) else {
-                        throw WalletError.failedToParseNetworkResponse
+                        throw WalletError.failedToParseNetworkResponse()
                     }
 
                     return gasPrice
@@ -98,7 +98,7 @@ final class NEARNetworkService: MultiNetworkProvider {
                 .getInfo(accountId: accountId)
                 .tryMap { result in
                     guard let rawAmount = Decimal(string: result.amount) else {
-                        throw WalletError.failedToParseNetworkResponse
+                        throw WalletError.failedToParseNetworkResponse()
                     }
 
                     let value = rawAmount / blockchain.decimalValue

diff --git a/BlockchainSdk/Blockchains/Stellar/StellarNetworkProvider.swift b/BlockchainSdk/Blockchains/Stellar/StellarNetworkProvider.swift
@@ -54,7 +54,7 @@ class StellarNetworkProvider: HostProvider {
 
                 let baseReserveStroops = Decimal(ledgerResponse.baseReserveInStroops)
                 guard let balance = Decimal(accountResponse.balances.first(where: {$0.assetType == AssetTypeAsString.NATIVE})?.balance) else {
-                    throw WalletError.failedToParseNetworkResponse
+                    throw WalletError.failedToParseNetworkResponse()
                 }
 
                 let sequence = accountResponse.sequenceNumber
@@ -64,7 +64,7 @@ class StellarNetworkProvider: HostProvider {
                         guard let code = assetBalance.assetCode,
                               let issuer = assetBalance.assetIssuer,
                               let balance = Decimal(assetBalance.balance) else {
-                            throw WalletError.failedToParseNetworkResponse
+                            throw WalletError.failedToParseNetworkResponse()
                         }
 
                         return StellarAssetResponse(code: code, issuer: issuer, balance: balance)

diff --git a/BlockchainSdk/Blockchains/TON/TONNetworkService.swift b/BlockchainSdk/Blockchains/TON/TONNetworkService.swift
@@ -36,7 +36,7 @@ class TONNetworkService: MultiNetworkProvider {
         )
         .tryMap { walletInfo, tokensInfo in
             guard let decimalBalance = Decimal(string: walletInfo.balance) else {
-                throw WalletError.failedToParseNetworkResponse
+                throw WalletError.failedToParseNetworkResponse()
             }
 
             return TONWalletInfo(

diff --git a/BlockchainSdk/Blockchains/Tezos/TezosNetworkService.swift b/BlockchainSdk/Blockchains/Tezos/TezosNetworkService.swift
@@ -29,7 +29,7 @@ class TezosNetworkService: MultiNetworkProvider {
                           let balance = Decimal(string: balanceString),
                           let counterString = tezosAddress.counter,
                           let counter = Int(counterString) else {
-                              throw WalletError.failedToParseNetworkResponse
+                              throw WalletError.failedToParseNetworkResponse()
                           }
 
                     let balanceConverted = balance / Blockchain.tezos(curve: .ed25519).decimalValue
@@ -51,7 +51,7 @@ class TezosNetworkService: MultiNetworkProvider {
             $0.getHeader()
                 .tryMap {headerResponse -> TezosHeader in
                     guard let proto = headerResponse.protocol, let hash = headerResponse.hash else {
-                        throw WalletError.failedToParseNetworkResponse
+                        throw WalletError.failedToParseNetworkResponse()
                     }
 
                     return TezosHeader(protocol: proto, hash: hash)

diff --git a/BlockchainSdk/Blockchains/Tron/TronJsonRpcProvider.swift b/BlockchainSdk/Blockchains/Tron/TronJsonRpcProvider.swift
@@ -60,8 +60,8 @@ class TronJsonRpcProvider: HostProvider {
             .filterSuccessfulStatusAndRedirectCodes()
             .map(T.self)
             .mapError { moyaError in
-                if case .objectMapping = moyaError {
-                    return WalletError.failedToParseNetworkResponse
+                if case let .objectMapping(_, response) = moyaError {
+                    return WalletError.failedToParseNetworkResponse(response)
                 }
                 return moyaError
             }

diff --git a/BlockchainSdk/Blockchains/Tron/TronNetworkService.swift b/BlockchainSdk/Blockchains/Tron/TronNetworkService.swift
@@ -37,7 +37,7 @@ class TronNetworkService: MultiNetworkProvider {
                         let dynamicEnergyIncreaseFactorParameter = $0.chainParameter.first(where: { $0.key == "getDynamicEnergyIncreaseFactor" }),
                         let dynamicEnergyIncreaseFactor = dynamicEnergyIncreaseFactorParameter.value
                     else {
-                        throw WalletError.failedToParseNetworkResponse
+                        throw WalletError.failedToParseNetworkResponse()
                     }
 
                     return TronChainParameters(
@@ -82,6 +82,17 @@ class TronNetworkService: MultiNetworkProvider {
     func getAccountResource(for address: String) -> AnyPublisher<TronGetAccountResourceResponse, Error> {
         providerPublisher {
             $0.getAccountResource(for: address)
+                .mapError { error in
+                    if case let WalletError.failedToParseNetworkResponse(response) = error,
+                       let data = response?.data,
+                       let string = String(data: data, encoding: .utf8),
+                       string.trimmingCharacters(in: .whitespacesAndNewlines) == "{}"
+                    {
+                        return WalletError.accountNotActivated
+                    }
+                    return error
+                }
+                .eraseToAnyPublisher()
         }
     }
 
@@ -163,7 +174,7 @@ class TronNetworkService: MultiNetworkProvider {
                     )
 
                     guard let decimalValue = Decimal(stringValue: formatted) else {
-                        throw WalletError.failedToParseNetworkResponse
+                        throw WalletError.failedToParseNetworkResponse()
                     }
 
                     return (token, decimalValue)

diff --git a/BlockchainSdk/Blockchains/Tron/TronUtils.swift b/BlockchainSdk/Blockchains/Tron/TronUtils.swift
@@ -12,7 +12,7 @@ import BigInt
 struct TronUtils {
     func combineBigUIntValueAtBalance(response constantResult: [String]) throws -> BigUInt {
         guard let hexValue = constantResult.first else {
-            throw WalletError.failedToParseNetworkResponse
+            throw WalletError.failedToParseNetworkResponse()
         }
 
         // Need use 32 byte for obtain right value

diff --git a/BlockchainSdk/Blockchains/VeChain/Network/VeChainNetworkService.swift b/BlockchainSdk/Blockchains/VeChain/Network/VeChainNetworkService.swift
@@ -72,7 +72,7 @@ final class VeChainNetworkService: MultiNetworkProvider {
                 .callContract(contractCall: contractCall)
                 .tryMap { contractCallResult in
                     guard let resultPayload = contractCallResult.first else {
-                        throw WalletError.failedToParseNetworkResponse
+                        throw WalletError.failedToParseNetworkResponse()
                     }
 
                     return resultPayload
@@ -87,7 +87,7 @@ final class VeChainNetworkService: MultiNetworkProvider {
                         return Amount(with: token, value: value)
                     }
 
-                    throw WalletError.failedToParseNetworkResponse
+                    throw WalletError.failedToParseNetworkResponse()
                 }
                 .eraseToAnyPublisher()
         }
@@ -118,7 +118,7 @@ final class VeChainNetworkService: MultiNetworkProvider {
                 .callContract(contractCall: contractCall)
                 .tryMap { contractCallResult in
                     guard let resultPayload = contractCallResult.first else {
-                        throw WalletError.failedToParseNetworkResponse
+                        throw WalletError.failedToParseNetworkResponse()
                     }
 
                     return resultPayload
@@ -143,7 +143,7 @@ final class VeChainNetworkService: MultiNetworkProvider {
                         return VeChainTransactionInfo(transactionHash: parsedStatus.id)
                     case .raw:
                         // `raw` output can't be easily parsed and therefore not supported
-                        throw WalletError.failedToParseNetworkResponse
+                        throw WalletError.failedToParseNetworkResponse()
                     case .notFound:
                         return VeChainTransactionInfo(transactionHash: nil)
                     }
@@ -168,7 +168,7 @@ final class VeChainNetworkService: MultiNetworkProvider {
             let bigUIntValue = BigUInt(balance.removeHexPrefix(), radix: Constants.radix),
             let decimalValue = bigUIntValue.decimal
         else {
-            throw WalletError.failedToParseNetworkResponse
+            throw WalletError.failedToParseNetworkResponse()
         }
 
         return decimalValue
@@ -184,7 +184,7 @@ final class VeChainNetworkService: MultiNetworkProvider {
             rawBlockRef.count == Constants.blockRefSize * 2,
             let blockRef = UInt(rawBlockRef, radix: Constants.radix)
         else {
-            throw WalletError.failedToParseNetworkResponse
+            throw WalletError.failedToParseNetworkResponse()
         }
 
         return VeChainBlockInfo(

diff --git a/BlockchainSdk/Common/API/MultiNetworkProvider.swift b/BlockchainSdk/Common/API/MultiNetworkProvider.swift
@@ -48,6 +48,10 @@ extension MultiNetworkProvider {
                     return .anyFail(error: error)
                 }
 
+                if case WalletError.accountNotActivated = error {
+                    return .anyFail(error: error)
+                }
+
                 Log.network("Switchable publisher catched error: \(error)")
 
                 let beforeSwitchIfNeededHost = self.host

diff --git a/BlockchainSdk/Common/TransactionHistory/Algorand/AlgorandTransactionHistoryProvider.swift b/BlockchainSdk/Common/TransactionHistory/Algorand/AlgorandTransactionHistoryProvider.swift
@@ -79,7 +79,7 @@ extension AlgorandTransactionHistoryProvider: TransactionHistoryProvider {
                 return .init(records: records)
             }
             .mapError { moyaError -> Swift.Error in
-                return WalletError.failedToParseNetworkResponse
+                return WalletError.failedToParseNetworkResponse()
             }
             .eraseToAnyPublisher()
     }

diff --git a/BlockchainSdk/Common/WalletError.swift b/BlockchainSdk/Common/WalletError.swift
@@ -7,17 +7,20 @@
 //
 
 import Foundation
+import Moya
 
 public enum WalletError: Error, LocalizedError {
     case noAccount(message: String, amountToCreate: Decimal)
     case failedToGetFee
     case failedToBuildTx
-    case failedToParseNetworkResponse
+    case failedToParseNetworkResponse(Response? = nil)
     case failedToSendTx
     case failedToCalculateTxSize
     case empty
     case blockchainUnavailable(underlyingError: Error)
 
+    case accountNotActivated
+
     public var errorDescription: String? {
         switch self {
         case .noAccount(let message, _):
@@ -32,7 +35,8 @@ public enum WalletError: Error, LocalizedError {
             return "Empty"
         case .failedToCalculateTxSize,
              .failedToParseNetworkResponse,
-             .blockchainUnavailable:
+             .blockchainUnavailable,
+             .accountNotActivated:
             return "generic_error_code".localized(errorCodeDescription)
         }
     }
@@ -55,6 +59,8 @@ public enum WalletError: Error, LocalizedError {
             return 7
         case .blockchainUnavailable:
             return 8
+        case .accountNotActivated:
+            return 9
         }
     }
 

diff --git a/BlockchainSdk/CommonNetworkServices/Blockchair/BlockchairNetworkProvider.swift b/BlockchainSdk/CommonNetworkServices/Blockchair/BlockchairNetworkProvider.swift
@@ -60,17 +60,17 @@ class BlockchairNetworkProvider: BitcoinNetworkProvider {
                 let script = address["script_hex"].stringValue
 
                 guard let decimalSatoshiBalance = Decimal(string: balance) else {
-                    throw WalletError.failedToParseNetworkResponse
+                    throw WalletError.failedToParseNetworkResponse()
                 }
 
                 guard let transactionsData = try? addr["transactions"].rawData(),
                       let transactions: [BlockchairTransactionShort] = try? self.jsonDecoder.decode([BlockchairTransactionShort].self, from: transactionsData) else {
-                    throw WalletError.failedToParseNetworkResponse
+                    throw WalletError.failedToParseNetworkResponse()
                 }
 
                 guard let utxoData = try? addr["utxo"].rawData(),
                       let utxos: [BlockchairUtxo] = try? self.jsonDecoder.decode([BlockchairUtxo].self, from: utxoData) else {
-                    throw WalletError.failedToParseNetworkResponse
+                    throw WalletError.failedToParseNetworkResponse()
                 }
 
                 // Unspents with blockId lower than or equal 1 is not currently available
@@ -174,7 +174,7 @@ class BlockchairNetworkProvider: BitcoinNetworkProvider {
                 let data = json["data"]
 
                 guard let hash = data["transaction_hash"].string else {
-                    throw WalletError.failedToParseNetworkResponse
+                    throw WalletError.failedToParseNetworkResponse()
                 }
 
                 return hash
@@ -213,7 +213,7 @@ class BlockchairNetworkProvider: BitcoinNetworkProvider {
                 let txJson = json["data"]["\(hash)"]
 
                 guard let tx = self.getTransactionDetails(from: txJson) else {
-                    throw WalletError.failedToParseNetworkResponse
+                    throw WalletError.failedToParseNetworkResponse()
                 }
 
                 return tx.toPendingTx(userAddress: address, decimalValue: self.endpoint.blockchain.decimalValue)