Merge pull request #867 from Adamant-im/trello.com/c/aIVBEdjR

[trello.com/c/aIVBEdjR] Improve coin tx sending algorithm

Author: Lainaaa

Adamant/Models/BTCRawTransaction.swift

@@ -27,15 +27,14 @@ struct BTCRawTransaction {
 
     func asBtcTransaction<T: BaseBtcTransaction>(_ as: T.Type, for address: String, blockId: String? = nil) -> T {
         // MARK: Known values
-        let confirmationsValue: String?
-        let transactionStatus: TransactionStatus
+        var confirmationsValue: String? = nil
+        var transactionStatus: TransactionStatus = .registered
 
         if let confirmations = confirmations {
             confirmationsValue = String(confirmations)
-            transactionStatus = confirmations > 0 ? .success : .pending
-        } else {
-            confirmationsValue = nil
-            transactionStatus = .registered
+            if confirmations > 0 {
+                transactionStatus = .success
+            }
         }
 
         // Transfers

Adamant/Modules/Wallets/Bitcoin/BtcWalletService+RichMessageProviderWithStatusCheck.swift

@@ -44,6 +44,8 @@ extension BtcWalletService {
         transaction: CoinTransaction,
         btcTransaction: BtcTransaction
     ) async -> TransactionStatus {
+        // Before we already stored another status in RawBtcTransactionResponse.asBtcTransaction(_:for:height:).
+        // So we don't need to double check anything here because it is already at least "registered".
         guard let status = btcTransaction.transactionStatus else {
             return .inconsistent(.unknown)
         }

Adamant/Modules/Wallets/Bitcoin/DTO/BtcTransactionResponse.swift

@@ -69,7 +69,7 @@ struct RawBtcStatus: Decodable {
 
 extension RawBtcTransactionResponse {
     func asBtcTransaction<T: BaseBtcTransaction>(_ as: T.Type, for address: String, height: Decimal? = nil) -> T {
-        let transactionStatus: TransactionStatus = status.confirmed ? .success : .pending
+        let transactionStatus: TransactionStatus = status.confirmed ? .success : .registered
 
         var date: Date?
         if let time = status.time {

Adamant/Modules/Wallets/Doge/DogeTransactionDetailsViewController.swift

@@ -97,10 +97,9 @@ final class DogeTransactionDetailsViewController: TransactionDetailsViewControll
         }
 
         let trs = try await service.getTransaction(by: id, waitsForConnectivity: false)
+        
 
-        if let blockInfo = cachedBlockInfo,
-            blockInfo.hash == trs.blockHash
-        {
+        if let blockInfo = cachedBlockInfo, blockInfo.hash == trs.blockHash {
             transaction = trs.asBtcTransaction(
                 DogeTransaction.self,
                 for: address,

Adamant/Modules/Wallets/Doge/DogeWalletService+RichMessageProviderWithStatusCheck.swift

@@ -30,13 +30,15 @@ extension DogeWalletService {
         } catch {
             return .init(error: error)
         }
+        
+        let status = await getStatus(
+            dogeTransaction: dogeTransaction,
+            transaction: transaction
+        )
 
-        return await .init(
+        return .init(
             sentDate: dogeTransaction.date,
-            status: getStatus(
-                dogeTransaction: dogeTransaction,
-                transaction: transaction
-            )
+            status: status
         )
     }
 }
@@ -51,7 +53,7 @@ extension DogeWalletService {
             let dogeDate = dogeTransaction.date,
             confirmations > 0 || dogeDate.timeIntervalSinceNow > -60 * 15
         else {
-            return .pending
+            return .registered
         }
 
         // MARK: Check amount & address

Adamant/Modules/Wallets/TransactionDetailsViewControllerBase.swift

@@ -185,6 +185,7 @@ class TransactionDetailsViewControllerBase: FormViewController {
             )
         }
     }
+    
     private lazy var dateFormatter: DateFormatter = {
         let dateFormatter = DateFormatter()
         dateFormatter.dateStyle = .medium
@@ -597,9 +598,7 @@ class TransactionDetailsViewControllerBase: FormViewController {
             cell.textLabel?.textColor = UIColor.adamant.textColor
             cell.detailTextLabel?.textColor = self?.transactionStatus?.color ?? UIColor.adamant.textColor
 
-            if let value = self?.transactionStatus?.localized,
-                !value.isEmpty
-            {
+            if let value = self?.transactionStatus?.localized, !value.isEmpty {
                 row.value = value
             } else {
                 row.value = TransactionStatus.registered.localized