diff --git a/modules/AlphaWalletAddress/AlphaWalletAddress.podspec b/AlphaWalletAddress.podspec similarity index 93% rename from modules/AlphaWalletAddress/AlphaWalletAddress.podspec rename to AlphaWalletAddress.podspec index 41ea9112dc..5ed09f4dd5 100644 --- a/modules/AlphaWalletAddress/AlphaWalletAddress.podspec +++ b/AlphaWalletAddress.podspec @@ -20,7 +20,7 @@ Pod::Spec.new do |s| s.swift_version = '4.2' s.platform = :ios, "13.0" s.source = { :git => 'git@github.com:AlphaWallet/alpha-wallet-ios.git', :tag => "#{s.version}" } - s.source_files = 'AlphaWalletAddress/**/*.{h,m,swift}' + s.source_files = 'Modules/AlphaWalletAddress/AlphaWalletAddress/**/*.{h,m,swift}' s.pod_target_xcconfig = { 'SWIFT_OPTIMIZATION_LEVEL' => '-Owholemodule' } s.frameworks = 'Foundation' diff --git a/modules/AlphaWalletCore/AlphaWalletCore.podspec b/AlphaWalletCore.podspec similarity index 91% rename from modules/AlphaWalletCore/AlphaWalletCore.podspec rename to AlphaWalletCore.podspec index 9f3ff8cc72..77aee6a72b 100644 --- a/modules/AlphaWalletCore/AlphaWalletCore.podspec +++ b/AlphaWalletCore.podspec @@ -20,10 +20,11 @@ Pod::Spec.new do |s| s.swift_version = '4.2' s.platform = :ios, "13.0" s.source = { :git => 'git@github.com:AlphaWallet/alpha-wallet-ios.git', :tag => "#{s.version}" } - s.source_files = 'AlphaWalletCore/**/*.{h,m,swift}' + s.source_files = 'Modules/AlphaWalletCore/AlphaWalletCore/**/*.{h,m,swift}' s.pod_target_xcconfig = { 'SWIFT_OPTIMIZATION_LEVEL' => '-Owholemodule' } s.frameworks = 'Foundation' s.dependency 'PromiseKit' + s.dependency 'Alamofire' end diff --git a/modules/AlphaWalletENS/AlphaWalletENS.podspec b/AlphaWalletENS.podspec similarity index 93% rename from modules/AlphaWalletENS/AlphaWalletENS.podspec rename to AlphaWalletENS.podspec index fed37d5c2f..9166ad07d0 100644 --- a/modules/AlphaWalletENS/AlphaWalletENS.podspec +++ b/AlphaWalletENS.podspec @@ -19,7 +19,7 @@ Pod::Spec.new do |spec| spec.swift_version = '4.0' spec.platform = :ios, "13.0" spec.source = { :git => 'git@github.com:AlphaWallet/alpha-wallet-ios.git', :tag => "#{spec.version}" } - spec.source_files = 'AlphaWalletENS/**/*.{h,m,swift}' + spec.source_files = 'Modules/AlphaWalletENS/AlphaWalletENS/**/*.{h,m,swift}' spec.pod_target_xcconfig = { 'SWIFT_OPTIMIZATION_LEVEL' => '-Owholemodule' } spec.dependency 'AlphaWalletAddress' diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation.podspec b/AlphaWalletFoundation.podspec similarity index 88% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation.podspec rename to AlphaWalletFoundation.podspec index c3524cf863..530f39b66c 100644 --- a/modules/AlphaWalletFoundation/AlphaWalletFoundation.podspec +++ b/AlphaWalletFoundation.podspec @@ -18,8 +18,8 @@ Pod::Spec.new do |spec| spec.swift_version = '4.2' spec.platform = :ios, "13.0" spec.source = { :git => 'git@github.com:AlphaWallet/alpha-wallet-ios.git', :tag => "#{spec.version}" } - spec.source_files = 'AlphaWalletFoundation/**/*.{h,m,swift}' - spec.resource_bundles = {'AlphaWalletFoundation' => ['AlphaWalletFoundation/**/*.{graphql,json}'] } + spec.source_files = 'Modules/AlphaWalletFoundation/AlphaWalletFoundation/**/*.{h,m,swift}' + spec.resource_bundles = {'AlphaWalletFoundation' => ['Modules/AlphaWalletFoundation/AlphaWalletFoundation/**/*.{graphql,json}'] } spec.pod_target_xcconfig = { 'SWIFT_OPTIMIZATION_LEVEL' => '-Owholemodule' } spec.dependency 'BigInt', '~> 3.1' @@ -49,6 +49,6 @@ Pod::Spec.new do |spec| spec.dependency 'AlphaWalletOpenSea' spec.dependency 'Apollo' spec.dependency 'MailchimpSDK' - spec.dependency 'CombineExt' + spec.dependency 'CombineExt', '1.8.0' end diff --git a/modules/AlphaWalletGoBack/AlphaWalletGoBack.podspec b/AlphaWalletGoBack.podspec similarity index 93% rename from modules/AlphaWalletGoBack/AlphaWalletGoBack.podspec rename to AlphaWalletGoBack.podspec index de60ff15e3..836dc39783 100644 --- a/modules/AlphaWalletGoBack/AlphaWalletGoBack.podspec +++ b/AlphaWalletGoBack.podspec @@ -20,7 +20,7 @@ Pod::Spec.new do |s| s.swift_version = '4.0' s.platform = :ios, "12.0" s.source = { :git => 'git@github.com:AlphaWallet/alpha-wallet-ios.git', :tag => "#{s.version}" } - s.source_files = 'AlphaWalletGoBack/**/*.{h,m}' + s.source_files = 'Modules/AlphaWalletGoBack/AlphaWalletGoBack/**/*.{h,m}' s.pod_target_xcconfig = { 'SWIFT_OPTIMIZATION_LEVEL' => '-Owholemodule' } s.frameworks = 'UIKit' diff --git a/modules/AlphaWalletOpenSea/AlphaWalletOpenSea.podspec b/AlphaWalletOpenSea.podspec similarity index 90% rename from modules/AlphaWalletOpenSea/AlphaWalletOpenSea.podspec rename to AlphaWalletOpenSea.podspec index 23b01bd179..34b8dfcd9b 100644 --- a/modules/AlphaWalletOpenSea/AlphaWalletOpenSea.podspec +++ b/AlphaWalletOpenSea.podspec @@ -19,11 +19,11 @@ Pod::Spec.new do |spec| spec.swift_version = '4.0' spec.platform = :ios, "13.0" spec.source = { :git => 'git@github.com:AlphaWallet/alpha-wallet-ios.git', :tag => "#{spec.version}" } - spec.source_files = 'AlphaWalletOpenSea/**/*.{h,m,swift}' + spec.source_files = 'Modules/AlphaWalletOpenSea/AlphaWalletOpenSea/**/*.{h,m,swift}' spec.pod_target_xcconfig = { 'SWIFT_OPTIMIZATION_LEVEL' => '-Owholemodule' } spec.dependency 'AlphaWalletAddress' spec.dependency 'AlphaWalletCore' spec.dependency 'PromiseKit' - spec.dependency 'SwiftyJSON' + spec.dependency 'SwiftyJSON', '5.0.0' end diff --git a/Podfile b/Podfile index 4a4c8ded18..b8549a3008 100644 --- a/Podfile +++ b/Podfile @@ -33,17 +33,17 @@ target 'AlphaWallet' do pod 'PaperTrailLumberjack/Swift' pod 'Charts' pod 'CocoaLumberjack', '3.7.0' - pod 'AlphaWalletAddress', :path => 'modules/AlphaWalletAddress' - pod 'AlphaWalletCore', :path => 'modules/AlphaWalletCore' - pod 'AlphaWalletGoBack', :path => 'modules/AlphaWalletGoBack' - pod 'AlphaWalletENS', :path => 'modules/AlphaWalletENS' - pod 'AlphaWalletOpenSea', :path => 'modules/AlphaWalletOpenSea' - pod 'AlphaWalletFoundation', :path => 'modules/AlphaWalletFoundation' + pod 'AlphaWalletAddress', :path => '../alpha-wallet-ios' + pod 'AlphaWalletCore', :path => '../alpha-wallet-ios' + pod 'AlphaWalletGoBack', :path => '../alpha-wallet-ios' + pod 'AlphaWalletENS', :path => '../alpha-wallet-ios' + pod 'AlphaWalletOpenSea', :path => '../alpha-wallet-ios' + pod 'AlphaWalletFoundation', :path => '../alpha-wallet-ios' pod 'Apollo' pod 'MailchimpSDK' pod 'xcbeautify' pod 'FloatingPanel' - pod 'CombineExt' + pod 'CombineExt', '1.8.0' target 'AlphaWalletTests' do inherit! :search_paths diff --git a/Podfile.lock b/Podfile.lock index 007afa9b3f..f28c398c08 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -8,6 +8,7 @@ PODS: - TrustKeystore - web3swift - AlphaWalletCore (1.0.2): + - Alamofire - PromiseKit - AlphaWalletENS (1.0.0): - AlphaWalletAddress @@ -25,7 +26,7 @@ PODS: - Apollo - BigInt (~> 3.1) - BlockiesSwift - - CombineExt + - CombineExt (= 1.8.0) - CryptoSwift (~> 1.4) - EthereumABI - JSONRPCKit (~> 2.0.0) @@ -48,7 +49,7 @@ PODS: - AlphaWalletAddress - AlphaWalletCore - PromiseKit - - SwiftyJSON + - SwiftyJSON (= 5.0.0) - AlphaWalletWeb3Provider (0.3.0) - APIKit (5.1.0) - Apollo (0.50.0): @@ -66,7 +67,7 @@ PODS: - CocoaLumberjack/Core (3.7.0) - CocoaLumberjack/Swift (3.7.0): - CocoaLumberjack/Core - - CombineExt (1.6.1) + - CombineExt (1.8.0) - CryptoSwift (1.5.1) - EthereumABI (1.3.0): - BigInt (~> 3.1) @@ -154,12 +155,12 @@ PODS: - xcbeautify (0.11.0) DEPENDENCIES: - - AlphaWalletAddress (from `modules/AlphaWalletAddress`) - - AlphaWalletCore (from `modules/AlphaWalletCore`) - - AlphaWalletENS (from `modules/AlphaWalletENS`) - - AlphaWalletFoundation (from `modules/AlphaWalletFoundation`) - - AlphaWalletGoBack (from `modules/AlphaWalletGoBack`) - - AlphaWalletOpenSea (from `modules/AlphaWalletOpenSea`) + - AlphaWalletAddress (from `../alpha-wallet-ios`) + - AlphaWalletCore (from `../alpha-wallet-ios`) + - AlphaWalletENS (from `../alpha-wallet-ios`) + - AlphaWalletFoundation (from `../alpha-wallet-ios`) + - AlphaWalletGoBack (from `../alpha-wallet-ios`) + - AlphaWalletOpenSea (from `../alpha-wallet-ios`) - AlphaWalletWeb3Provider (from `https://github.com/AlphaWallet/AlphaWallet-web3-provider`, commit `9a4496d02b7ddb2f6307fd0510d8d7c9fcef9870`) - APIKit (= 5.1.0) - Apollo @@ -167,7 +168,7 @@ DEPENDENCIES: - BlockiesSwift - Charts - CocoaLumberjack (= 3.7.0) - - CombineExt + - CombineExt (= 1.8.0) - CryptoSwift (~> 1.4) - EthereumABI (from `https://github.com/AlphaWallet/EthereumABI.git`, commit `877b77e8e7cbc54ab0712d509b74fec21b79d1bb`) - FloatingPanel @@ -238,17 +239,17 @@ SPEC REPOS: EXTERNAL SOURCES: AlphaWalletAddress: - :path: modules/AlphaWalletAddress + :path: "../alpha-wallet-ios" AlphaWalletCore: - :path: modules/AlphaWalletCore + :path: "../alpha-wallet-ios" AlphaWalletENS: - :path: modules/AlphaWalletENS + :path: "../alpha-wallet-ios" AlphaWalletFoundation: - :path: modules/AlphaWalletFoundation + :path: "../alpha-wallet-ios" AlphaWalletGoBack: - :path: modules/AlphaWalletGoBack + :path: "../alpha-wallet-ios" AlphaWalletOpenSea: - :path: modules/AlphaWalletOpenSea + :path: "../alpha-wallet-ios" AlphaWalletWeb3Provider: :commit: 9a4496d02b7ddb2f6307fd0510d8d7c9fcef9870 :git: https://github.com/AlphaWallet/AlphaWallet-web3-provider @@ -303,12 +304,12 @@ CHECKOUT OPTIONS: SPEC CHECKSUMS: Alamofire: 85e8a02c69d6020a0d734f6054870d7ecb75cf18 Alamofire-Synchronous: eedf1e6e961c3795a63c74990b3f7d9fbfac7e50 - AlphaWalletAddress: 62a69f5ccc7d6d17abf878c4274f4c3d5fdc97ba - AlphaWalletCore: 451c8a4dfdba1d3b59a3ac47bf0dcabcf1f4c049 - AlphaWalletENS: a93a871ad5d8a8c78cd87b60eb59fccf4b23e841 - AlphaWalletFoundation: 25f271d526c6a02fcaafcd0a5caaf41e9fd00edd - AlphaWalletGoBack: 935efdbd98fa80039f2a350cde5b3a50cea46564 - AlphaWalletOpenSea: 11ccb06ae0200dadc2b3f7c3e223f407ac3a22b4 + AlphaWalletAddress: 185118bbbe43186b9dfce8d2183321f6401c8cf4 + AlphaWalletCore: 9591b209440193012da6df7d6a7cf4fa0e278505 + AlphaWalletENS: 91f50fce210c261499098033f659db6769e6c1fb + AlphaWalletFoundation: 4e5dca40d774b0b639d2bacf57f452e6fabf95f0 + AlphaWalletGoBack: b3a12f9647af9b4fbf2937d57123162282b9637e + AlphaWalletOpenSea: d11d07b69a26810ac91883bf64c720576354b0d9 AlphaWalletWeb3Provider: 7ca1e1c1dc841dc1915f970daace48bf34931655 APIKit: 9e1a4069608bf0ae5238811e6cfc26928ad4d01e Apollo: 5e4476a3236bd576686085b7cd99655c788e4d74 @@ -317,7 +318,7 @@ SPEC CHECKSUMS: Charts: b1e3a1f5a1c9ba5394438ca3b91bd8c9076310af CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 CocoaLumberjack: e8955b9d337ac307103b0a34fd141c32f27e53c5 - CombineExt: 57d5234da457f4dab303bac37929192cb4d9626f + CombineExt: c4daa97ef75754d8ef319bd79edeef82652f3eea CryptoSwift: c4f2debceb38bf44c80659afe009f71e23e4a082 EthereumABI: c021720744d260b87def6aa45d94554d260cb5a9 EthereumAddress: 39fe8e11cf04e4e9902b55ae653dbc4e0aee5f30 @@ -353,6 +354,6 @@ SPEC CHECKSUMS: web3swift: 06118d4c4edc801444aaa995bbbddeda176b97ef xcbeautify: b2c6b50c9cab6414296898e94cd153e4ea879662 -PODFILE CHECKSUM: b861336b56375f9503f4db359d57337321ff390c +PODFILE CHECKSUM: d54736e7cc45d3427afc6f5d53bb2dc0b9c29a99 COCOAPODS: 1.11.2 diff --git a/modules/AlphaWalletCore/AlphaWalletCore/Extensions/Publisher+Utils.swift.swift b/modules/AlphaWalletCore/AlphaWalletCore/Extensions/Publisher+Utils.swift.swift index a1d5683702..bdadf1f3fa 100644 --- a/modules/AlphaWalletCore/AlphaWalletCore/Extensions/Publisher+Utils.swift.swift +++ b/modules/AlphaWalletCore/AlphaWalletCore/Extensions/Publisher+Utils.swift.swift @@ -13,29 +13,25 @@ public extension Publisher { // The flatMapLatest operator behaves much like the standard FlatMap operator, except that whenever // a new item is emitted by the source Publisher, it will unsubscribe to and stop mirroring the Publisher // that was generated from the previously-emitted item, and begin only mirroring the current one. - public func flatMapLatest(_ transform: @escaping (Self.Output) -> T) -> Publishers.SwitchToLatest> where T.Failure == Self.Failure { + func flatMapLatest(_ transform: @escaping (Self.Output) -> T) -> Publishers.SwitchToLatest> where T.Failure == Self.Failure { map(transform).switchToLatest() } - public static func empty() -> AnyPublisher { + static func empty() -> AnyPublisher { return Empty().eraseToAnyPublisher() } - public static func just(_ output: Output) -> AnyPublisher { + static func just(_ output: Output) -> AnyPublisher { return Just(output) .setFailureType(to: Failure.self) .eraseToAnyPublisher() } - public static func fail(_ error: Failure) -> AnyPublisher { + static func fail(_ error: Failure) -> AnyPublisher { return Fail(error: error).eraseToAnyPublisher() } - public func unwrap() -> Publishers.CompactMap where Output == T? { + func unwrap() -> Publishers.CompactMap where Output == T? { compactMap { $0 } } - - public func mapToVoid() -> AnyPublisher { - map { _ in }.eraseToAnyPublisher() - } } diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Activities/ActivitiesService.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Activities/ActivitiesService.swift index 44efdb5840..be0c807a60 100644 --- a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Activities/ActivitiesService.swift +++ b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Activities/ActivitiesService.swift @@ -7,6 +7,7 @@ import Foundation import CoreFoundation +import CombineExt import Combine public protocol ActivitiesServiceType: class { diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/BuyToken/BuyTokenService.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/BuyToken/BuyTokenService.swift index 8e22fe9318..6c161c1d71 100644 --- a/modules/AlphaWalletFoundation/AlphaWalletFoundation/BuyToken/BuyTokenService.swift +++ b/modules/AlphaWalletFoundation/AlphaWalletFoundation/BuyToken/BuyTokenService.swift @@ -7,6 +7,7 @@ import Foundation import Combine +import CombineExt public protocol BuyTokenURLProviderType: TokenActionProvider { func url(token: TokenActionsIdentifiable, wallet: Wallet) -> URL? diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/CoinTicker/CoinGecko/CoinGeckoTickerIdsFetcher.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/CoinTicker/CoinGecko/CoinGeckoTickerIdsFetcher.swift index 68d09a19e8..079aa2d809 100644 --- a/modules/AlphaWalletFoundation/AlphaWalletFoundation/CoinTicker/CoinGecko/CoinGeckoTickerIdsFetcher.swift +++ b/modules/AlphaWalletFoundation/AlphaWalletFoundation/CoinTicker/CoinGecko/CoinGeckoTickerIdsFetcher.swift @@ -8,6 +8,7 @@ import Combine import Foundation import AlphaWalletCore +import CombineExt /// Ticker ids are havy objects, that don't change often, keep them cached and in separate fetcher to extract logic public class CoinGeckoTickerIdsFetcher: TickerIdsFetcher { diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/CoinTicker/CoinTickersStorage.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/CoinTicker/CoinTickersStorage.swift index 792357eb89..53b3b37f71 100644 --- a/modules/AlphaWalletFoundation/AlphaWalletFoundation/CoinTicker/CoinTickersStorage.swift +++ b/modules/AlphaWalletFoundation/AlphaWalletFoundation/CoinTicker/CoinTickersStorage.swift @@ -8,6 +8,7 @@ import Combine import RealmSwift import AlphaWalletCore +import CombineExt public typealias TickerIdString = String diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/ChainStateSchedulerProvider.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/ChainStateSchedulerProvider.swift index 2cb4de647a..c8c5cfc847 100644 --- a/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/ChainStateSchedulerProvider.swift +++ b/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/ChainStateSchedulerProvider.swift @@ -8,6 +8,7 @@ import Foundation import Combine import AlphaWalletCore +import CombineExt public protocol ChainStateSchedulerProviderDelegate: AnyObject { func didReceive(result: Result) diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/ReachabilityManager.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/ReachabilityManager.swift index 3a38b63029..6e7e7e8902 100644 --- a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/ReachabilityManager.swift +++ b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/ReachabilityManager.swift @@ -7,6 +7,7 @@ import Alamofire import Combine +import CombineExt public protocol ReachabilityManagerProtocol { var isReachable: Bool { get } diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/KeyManagement/JsonWalletAddressesStore.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/KeyManagement/JsonWalletAddressesStore.swift index 89671d34b5..4c870a37ea 100644 --- a/modules/AlphaWalletFoundation/AlphaWalletFoundation/KeyManagement/JsonWalletAddressesStore.swift +++ b/modules/AlphaWalletFoundation/AlphaWalletFoundation/KeyManagement/JsonWalletAddressesStore.swift @@ -11,7 +11,7 @@ import AlphaWalletCore public struct JsonWalletAddressesStore: WalletAddressesStore { private static let walletsFolderForTests = "testSuiteWalletsForWalletAddresses" - static func createStorage() -> StorageType { + public static func createStorage() -> StorageType { let directoryUrl: URL = { if isRunningTests() { let cacheDirectoryUrl = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask)[0] @@ -132,7 +132,7 @@ public struct JsonWalletAddressesStore: WalletAddressesStore { } } - init(storage: StorageType = JsonWalletAddressesStore.createStorage()) { + public init(storage: StorageType = JsonWalletAddressesStore.createStorage()) { self.storage = storage if let value: WalletAddresses = storage.load(forKey: Keys.walletAddresses) { diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenActions/SwapTokenProvider.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenActions/SwapTokenProvider.swift index d8aadcdaf0..860162542b 100644 --- a/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenActions/SwapTokenProvider.swift +++ b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenActions/SwapTokenProvider.swift @@ -7,6 +7,7 @@ import Foundation import Combine +import CombineExt public final class SwapTokenProvider: SupportedTokenActionsProvider, TokenActionProvider, TokenActionServiceProvidable { private let subProviders: [SupportedTokenActionsProvider & TokenActionProvider] diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenActions/TokenActionsService.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenActions/TokenActionsService.swift index 8804bb9cfb..72f88ce9ba 100644 --- a/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenActions/TokenActionsService.swift +++ b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenActions/TokenActionsService.swift @@ -7,6 +7,7 @@ import Foundation import Combine +import CombineExt public protocol TokenActionsIdentifiable { var contractAddress: AlphaWallet.Address { get } diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/CombineTimer.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/CombineTimer.swift index 133b5f12ca..8e9f5ce491 100644 --- a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/CombineTimer.swift +++ b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/CombineTimer.swift @@ -7,6 +7,7 @@ import Foundation import Combine +import CombineExt public final class CombineTimer { diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/NewlyAddedTransaction/NewlyAddedTransactionSchedulerProvider.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/NewlyAddedTransaction/NewlyAddedTransactionSchedulerProvider.swift index 85f83d9cd3..46ee7d3f74 100644 --- a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/NewlyAddedTransaction/NewlyAddedTransactionSchedulerProvider.swift +++ b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/NewlyAddedTransaction/NewlyAddedTransactionSchedulerProvider.swift @@ -7,6 +7,7 @@ import Foundation import Combine +import CombineExt protocol NewlyAddedTransactionSchedulerProviderDelegate: AnyObject { func didReceiveResponse(_ response: Swift.Result<[TransactionInstance], Covalent.CovalentError>, in provider: NewlyAddedTransactionSchedulerProvider) diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/OldestTransaction/OldestTransactionSchedulerProvider.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/OldestTransaction/OldestTransactionSchedulerProvider.swift index 301daa2e3d..2bccbebd00 100644 --- a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/OldestTransaction/OldestTransactionSchedulerProvider.swift +++ b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/OldestTransaction/OldestTransactionSchedulerProvider.swift @@ -7,6 +7,7 @@ import Foundation import Combine +import CombineExt protocol OldestTransactionSchedulerProviderDelegate: AnyObject { func didReceiveResponse(_ response: Swift.Result<[TransactionInstance], Covalent.CovalentError>, in provider: OldestTransactionSchedulerProvider) diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/PendingTransaction/PendingTransactionSchedulerProvider.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/PendingTransaction/PendingTransactionSchedulerProvider.swift index aaa78dc5dd..ad7b703f5f 100644 --- a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/PendingTransaction/PendingTransactionSchedulerProvider.swift +++ b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/PendingTransaction/PendingTransactionSchedulerProvider.swift @@ -8,6 +8,7 @@ import Foundation import Combine import APIKit +import CombineExt protocol PendingTransactionSchedulerProviderDelegate: AnyObject { func didReceiveResponse(_ response: Swift.Result, in provider: PendingTransactionSchedulerProvider) diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/RecipientResolver.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/RecipientResolver.swift index 5f3f939283..17c7847970 100644 --- a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/RecipientResolver.swift +++ b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/RecipientResolver.swift @@ -7,6 +7,7 @@ import Foundation import Combine +import CombineExt public class RecipientResolver { public enum Row: Int, CaseIterable {