Skip to content

Commit 04752d8

Browse files
committed
Fix duplicate transactions
1 parent 48d5142 commit 04752d8

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

UnstoppableWallet/UnstoppableWallet/Core/Adapters/Evm/EvmTransactionsAdapter.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ extension EvmTransactionsAdapter: ITransactionsAdapter {
9797
}
9898

9999
func transactionsSingle(from: TransactionRecord?, token: MarketKit.Token?, filter: TransactionTypeFilter, address: String?, limit: Int) -> Single<[TransactionRecord]> {
100-
evmKit.transactionsSingle(tagQueries: [tagQuery(token: token, filter: filter, address: address?.lowercased())], fromHash: from.flatMap { Data(hex: $0.transactionHash) }, limit: limit)
100+
evmKit.transactionsSingle(tagQueries: [tagQuery(token: token, filter: filter, address: address?.lowercased())], fromHash: from.flatMap { $0.transactionHash.hs.hexData }, limit: limit)
101101
.map { [weak self] transactions -> [TransactionRecord] in
102102
transactions.compactMap { self?.transactionConverter.transactionRecord(fromTransaction: $0) }
103103
}

UnstoppableWallet/UnstoppableWallet/Core/Adapters/Tron/TronTransactionAdapter.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ extension TronTransactionsAdapter: ITransactionsAdapter {
100100

101101
func transactionsSingle(from: TransactionRecord?, token: MarketKit.Token?, filter: TransactionTypeFilter, address: String?, limit: Int) -> Single<[TransactionRecord]> {
102102
let address = address.flatMap { try? TronKit.Address(address: $0) }?.hex
103-
let transactions = tronKit.transactions(tagQueries: [tagQuery(token: token, filter: filter, address: address)], fromHash: from.flatMap { Data(hex: $0.transactionHash) }, limit: limit)
103+
let transactions = tronKit.transactions(tagQueries: [tagQuery(token: token, filter: filter, address: address)], fromHash: from.flatMap { $0.transactionHash.hs.hexData }, limit: limit)
104104

105105
return Single.just(transactions.compactMap { transactionConverter.transactionRecord(fromTransaction: $0) })
106106
}

UnstoppableWallet/UnstoppableWallet/Modules/SendEvm/Confirmation/SendEvmConfirmationModule.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ enum SendEvmConfirmationModule {
107107
}
108108

109109
static func resendViewController(adapter: ITransactionsAdapter, type: ResendTransactionType, transactionHash: String) throws -> UIViewController {
110-
guard let adapter = adapter as? EvmTransactionsAdapter, let fullTransaction = adapter.evmKit.transaction(hash: Data(hex: transactionHash.hs.stripHexPrefix())) else {
110+
guard let adapter = adapter as? EvmTransactionsAdapter, let hash = transactionHash.hs.hexData, let fullTransaction = adapter.evmKit.transaction(hash: hash) else {
111111
throw CreateModuleError.wrongTransaction
112112
}
113113

UnstoppableWallet/UnstoppableWallet/UserInterface/Extensions/Decimal.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import BigInt
22
import Foundation
33

4-
private let max256ByteNumber = BigUInt(Data(hex: "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"))
4+
private let max256ByteNumber = BigUInt("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff".hs.hexData!)
55

66
extension Decimal {
77
init?(bigUInt: BigUInt, decimals: Int) {

0 commit comments

Comments
 (0)