code review fixes

soramitsu · Aug 2, 2024 · 229e5e4 · 229e5e4
1 parent 8cd7da4
commit 229e5e4
Show file tree

Hide file tree

Showing 30 changed files with 136 additions and 136 deletions.
diff --git a/fearless.xcodeproj/project.pbxproj b/fearless.xcodeproj/project.pbxproj
@@ -1314,7 +1314,6 @@
 		85B1B7387F09A8405C4E688A /* WalletSendConfirmTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AF4258723E2FACBBA556D00 /* WalletSendConfirmTests.swift */; };
 		872DF7DE5A001DF5B8A4E288 /* StakingBondMoreConfirmationFlow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BA5883C1103D3A2218D839 /* StakingBondMoreConfirmationFlow.swift */; };
 		87C1FC2909A8360DDBA625E5 /* LiquidityPoolSupplyInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9BA528679A82B9A327853804 /* LiquidityPoolSupplyInteractor.swift */; };
-		8852522BE02B6244A00E85A1 /* AccountStatisticsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26222D0DBE5CEF0BA7DCCEF7 /* AccountStatisticsTests.swift */; };
 		885551F78A5926D16D5AF0CB /* ControllerAccountPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E5CB64B91B35804B3671456 /* ControllerAccountPresenter.swift */; };
 		886E8CF81EF2566D98D9693E /* ExportSeedViewFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62FA66143B25AA70B02CE461 /* ExportSeedViewFactory.swift */; };
 		887CE12C7C59F5DB092E9227 /* AccountStatisticsRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDD63BEB84A28855006BE680 /* AccountStatisticsRouter.swift */; };
@@ -3403,7 +3402,6 @@
 		25B80FDDB5C3032A0BBBD826 /* NftCollectionPresenter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = NftCollectionPresenter.swift; sourceTree = "<group>"; };
 		25D9454047EBBD8D8A0174A4 /* LiquidityPoolRemoveLiquidityRouter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = LiquidityPoolRemoveLiquidityRouter.swift; sourceTree = "<group>"; };
 		25FF82C2FD912021A1F20876 /* PolkaswapAdjustmentViewLayout.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PolkaswapAdjustmentViewLayout.swift; sourceTree = "<group>"; };
-		26222D0DBE5CEF0BA7DCCEF7 /* AccountStatisticsTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AccountStatisticsTests.swift; sourceTree = "<group>"; };
 		262F98DEF54FA9592BE22B94 /* AllDoneAssembly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AllDoneAssembly.swift; sourceTree = "<group>"; };
 		2648EEF96694A7FEC94520E8 /* WalletHistoryFilterTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = WalletHistoryFilterTests.swift; sourceTree = "<group>"; };
 		26635BD49FBF19DB1253906E /* NetworkInfoTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = NetworkInfoTests.swift; sourceTree = "<group>"; };
@@ -7321,14 +7319,6 @@
 			path = ExportMnemonicConfirm;
 			sourceTree = "<group>";
 		};
-		2CFE52D4FA09CD95EA70283E /* AccountStatistics */ = {
-			isa = PBXGroup;
-			children = (
-				26222D0DBE5CEF0BA7DCCEF7 /* AccountStatisticsTests.swift */,
-			);
-			path = AccountStatistics;
-			sourceTree = "<group>";
-		};
 		2E04CA9A3624EA1AD62722E8 /* WalletOption */ = {
 			isa = PBXGroup;
 			children = (
@@ -7760,7 +7750,6 @@
 				749EAA035EECE4D63C56C358 /* LiquidityPoolSupplyConfirm */,
 				48EAF80DCC0C537917FC5A23 /* LiquidityPoolRemoveLiquidity */,
 				BDB80385E6818AE7707DDFF8 /* LiquidityPoolRemoveLiquidityConfirm */,
-				2CFE52D4FA09CD95EA70283E /* AccountStatistics */,
 			);
 			path = Modules;
 			sourceTree = "<group>";
@@ -19266,7 +19255,6 @@
 				B40863AA7377BFE5F8A30259 /* LiquidityPoolSupplyConfirmTests.swift in Sources */,
 				6BF307ADE63FA92389340779 /* LiquidityPoolRemoveLiquidityTests.swift in Sources */,
 				ECA54AB8148BBA63084353FD /* LiquidityPoolRemoveLiquidityConfirmTests.swift in Sources */,
-				8852522BE02B6244A00E85A1 /* AccountStatisticsTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -19817,7 +19805,7 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/soramitsu/shared-features-spm.git";
 			requirement = {
-				branch = "network-module-update";
+				branch = "fearless-wallet";
 				kind = branch;
 			};
 		};

diff --git a/fearless.xcworkspace/xcshareddata/swiftpm/Package.resolved b/fearless.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -140,8 +140,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/soramitsu/shared-features-spm.git",
       "state" : {
-        "branch" : "network-module-update",
-        "revision" : "ef034cd4466dda1eadec92b1a8a0c4a1f4e8b71e"
+        "branch" : "fearless-wallet",
+        "revision" : "c914f1e729c4238bf6e18030e4f4c3895a94e088"
       }
     },
     {

diff --git a/...ess/ApplicationLayer/Services/AccountStatistics/Nomis/NomisAccountStatisticsFetcher.swift b/...ess/ApplicationLayer/Services/AccountStatistics/Nomis/NomisAccountStatisticsFetcher.swift
@@ -23,12 +23,8 @@ extension NomisAccountStatisticsFetcher: AccountStatisticsFetching {
         address: String,
         cacheOptions: CachedNetworkRequestTrigger
     ) async throws -> AsyncThrowingStream<CachedNetworkResponse<AccountStatisticsResponse>, Error> {
-        guard let baseURL = URL(string: "https://api.nomis.cc/api/v1/multichain-score/wallet/") else {
-            throw NomisAccountStatisticsFetcherError.badBaseURL
-        }
-
         let request = try NomisAccountStatisticsRequest(
-            baseURL: baseURL,
+            baseURL: ApplicationConfig.shared.nomisAccountScoreURL,
             address: address,
             endpoint: "score"
         )
@@ -38,12 +34,8 @@ extension NomisAccountStatisticsFetcher: AccountStatisticsFetching {
     }
 
     func fetchStatistics(address: String) async throws -> AccountStatisticsResponse? {
-        guard let baseURL = URL(string: "https://api.nomis.cc/api/v1/multichain-score/wallet/") else {
-            throw NomisAccountStatisticsFetcherError.badBaseURL
-        }
-
         let request = try NomisAccountStatisticsRequest(
-            baseURL: baseURL,
+            baseURL: ApplicationConfig.shared.nomisAccountScoreURL,
             address: address,
             endpoint: "score"
         )

diff --git a/fearless/ApplicationLayer/Services/ScamService/ScamInfoFetcher.swift b/fearless/ApplicationLayer/Services/ScamService/ScamInfoFetcher.swift
@@ -1,5 +1,6 @@
 import Foundation
 import SSFModels
+import SoraFoundation
 
 protocol ScamInfoFetching {
     func fetch(address: String, chain: ChainModel) async throws -> ScamInfo?
@@ -12,10 +13,13 @@ final class ScamInfoFetcher: ScamInfoFetching {
 
     init(
         scamServiceOperationFactory: ScamServiceOperationFactoryProtocol,
-        accountScoreFetching: AccountStatisticsFetching
+        accountScoreFetching: AccountStatisticsFetching,
+        localizationManager: LocalizationManagerProtocol
     ) {
         self.scamServiceOperationFactory = scamServiceOperationFactory
         self.accountScoreFetching = accountScoreFetching
+
+        self.localizationManager = localizationManager
     }
 
     func fetch(address: String, chain: ChainModel) async throws -> ScamInfo? {
@@ -59,13 +63,17 @@ final class ScamInfoFetcher: ScamInfoFetching {
             }
 
             return ScamInfo(
-                name: "Nomis multi-chain score",
+                name: R.string.localizable.scamInfoNomisName(preferredLanguages: selectedLocale.rLanguages),
                 address: address,
                 type: .lowScore,
-                subtype: "Proceed with caution"
+                subtype: R.string.localizable.scamInfoNomisSubtypeText(preferredLanguages: selectedLocale.rLanguages)
             )
         }
 
         return scamInfo
     }
 }
+
+extension ScamInfoFetcher: Localizable {
+    func applyLocalization() {}
+}
diff --git a/fearless/Common/Configs/ApplicationConfigs.swift b/fearless/Common/Configs/ApplicationConfigs.swift
@@ -221,6 +221,10 @@ extension ApplicationConfig: ApplicationConfigProtocol, XcmConfigProtocol {
             GitHubUrl.url(suffix: "appConfigs/onboarding/mobile v2.json")
         #endif
     }
+
+    var nomisAccountScoreURL: URL {
+        URL(string: "https://api.nomis.cc/api/v1/multichain-score/wallet/")!
+    }
 }
 
 private enum GitHubUrl {

diff --git a/fearless/Common/DataProvider/Sources/PriceDataSource.swift b/fearless/Common/DataProvider/Sources/PriceDataSource.swift
@@ -183,7 +183,6 @@ final class PriceDataSource: SingleValueProviderSourceProtocol {
     }
 
     private func createChainlinkOperations() -> [BaseOperation<PriceData>] {
-        return []
         guard currencies?.count == 1, currencies?.first?.id == Currency.defaultCurrency().id else {
             return []
         }

diff --git a/fearless/Common/Extension/Foundation/NumberFormatter.swift b/fearless/Common/Extension/Foundation/NumberFormatter.swift
@@ -123,12 +123,4 @@ extension NumberFormatter {
         formatter.usesGroupingSeparator = usesIntGrouping
         return formatter
     }
-
-    static var nomisHours: NumberFormatter {
-        let formatter = NumberFormatter.amount
-        formatter.roundingMode = .floor
-        formatter.minimumFractionDigits = 0
-        formatter.maximumFractionDigits = 8
-        return formatter
-    }
 }
diff --git a/fearless/Common/Services/ChainRegistry/ChainRegistry.swift b/fearless/Common/Services/ChainRegistry/ChainRegistry.swift
@@ -17,7 +17,6 @@ protocol ChainRegistryProtocol: AnyObject {
     func getConnection(for chainId: ChainModel.Id) -> ChainConnection?
     func getRuntimeProvider(for chainId: ChainModel.Id) -> RuntimeProviderProtocol?
     func getChain(for chainId: ChainModel.Id) -> ChainModel?
-    func getChainUnsafe(for chainId: ChainModel.Id) -> ChainModel?
     func chainsSubscribe(
         _ target: AnyObject,
         runningInQueue: DispatchQueue,
@@ -228,14 +227,24 @@ final class ChainRegistry {
         }
         chains.append(newChain)
 
-        _ = try? ethereumConnectionPool.setupConnection(for: newChain)
+        do {
+            _ = try ethereumConnectionPool.setupConnection(for: newChain)
+        } catch {
+            logger?.customError(error)
+        }
     }
 
     private func handleUpdatedEthereumChain(updatedChain: ChainModel) throws {
         guard let ethereumConnectionPool = self.ethereumConnectionPool else {
             return
         }
-        _ = try? ethereumConnectionPool.setupConnection(for: updatedChain)
+
+        do {
+            _ = try ethereumConnectionPool.setupConnection(for: updatedChain)
+        } catch {
+            logger?.customError(error)
+        }
+
         chains = chains.filter { $0.chainId != updatedChain.chainId }
         chains.append(updatedChain)
     }
@@ -312,26 +321,22 @@ extension ChainRegistry: ChainRegistryProtocol {
     }
 
     func getEthereumConnection(for chainId: ChainModel.Id) -> Web3.Eth? {
-//        readLock.concurrentlyRead {
-        guard
-            let ethereumConnectionPool = self.ethereumConnectionPool,
-            let chain = chains.first(where: { $0.chainId == chainId })
-        else {
-            return nil
-        }
+        readLock.concurrentlyRead {
+            guard
+                let ethereumConnectionPool = self.ethereumConnectionPool,
+                let chain = chains.first(where: { $0.chainId == chainId })
+            else {
+                return nil
+            }
 
-        return try? ethereumConnectionPool.setupConnection(for: chain)
-//        }
+            return try? ethereumConnectionPool.setupConnection(for: chain)
+        }
     }
 
     func getChain(for chainId: ChainModel.Id) -> ChainModel? {
         readLock.concurrentlyRead { chains.first(where: { $0.chainId == chainId }) }
     }
 
-    func getChainUnsafe(for chainId: ChainModel.Id) -> ChainModel? {
-        chains.first(where: { $0.chainId == chainId })
-    }
-
     func getRuntimeProvider(for chainId: ChainModel.Id) -> RuntimeProviderProtocol? {
         runtimeProviderPool.getRuntimeProvider(for: chainId)
     }

diff --git a/fearless/Common/View/AccountScore/AccountScoreView.swift b/fearless/Common/View/AccountScore/AccountScoreView.swift
@@ -3,6 +3,10 @@ import SoraUI
 import Cosmos
 
 class AccountScoreView: UIView {
+    private enum Constants {
+        static let skeletonSize = CGSize(width: 32, height: 15)
+    }
+
     private var viewModel: AccountScoreViewModel?
 
     private var skeletonView: SkrullableView?
@@ -151,12 +155,7 @@ extension AccountScoreView: SkeletonLoadable {
     }
 
     private func setupSkeleton() {
-        let spaceSize = CGSize(width: 32, height: 15)
-
-        guard spaceSize != .zero else {
-            self.skeletonView = Skrull(size: .zero, decorations: [], skeletons: []).build()
-            return
-        }
+        let spaceSize = Constants.skeletonSize
 
         let skeletonView = Skrull(
             size: spaceSize,
@@ -181,7 +180,7 @@ extension AccountScoreView: SkeletonLoadable {
             SingleSkeleton.createRow(
                 spaceSize: spaceSize,
                 position: CGPoint(x: 0, y: 0.5),
-                size: CGSize(width: 32, height: 15)
+                size: Constants.skeletonSize
             )
         ]
     }

diff --git a/fearless/Common/ViewModel/AccountScore/AccountScoreViewModel.swift b/fearless/Common/ViewModel/AccountScore/AccountScoreViewModel.swift
@@ -34,6 +34,8 @@ class AccountScoreViewModel {
     private let fetcher: AccountStatisticsFetching
     private let chain: ChainModel?
     private let settings: SettingsManagerProtocol
+    private let logger: LoggerProtocol?
+
     let address: String?
     var scoringEnabled: Bool
 
@@ -44,13 +46,15 @@ class AccountScoreViewModel {
         address: String?,
         chain: ChainModel?,
         settings: SettingsManagerProtocol,
-        eventCenter: EventCenterProtocol
+        eventCenter: EventCenterProtocol,
+        logger: LoggerProtocol?
     ) {
         self.fetcher = fetcher
         self.address = address
         self.chain = chain
         self.settings = settings
         self.eventCenter = eventCenter
+        self.logger = logger
 
         scoringEnabled = (chain?.isNomisSupported == true || chain == nil) && settings.accountScoreEnabled == true
     }
@@ -70,7 +74,7 @@ class AccountScoreViewModel {
                     handle(response: statistics.value)
                 }
             } catch {
-                print("Account statistics fetching error: ", error)
+                logger?.debug("Account statistics fetching error: \(error)")
             }
         }
     }

diff --git a/fearless/Modules/AccountStatistics/AccountStatisticsAssembly.swift b/fearless/Modules/AccountStatistics/AccountStatisticsAssembly.swift
@@ -14,7 +14,8 @@ final class AccountStatisticsAssembly {
             interactor: interactor,
             router: router,
             localizationManager: localizationManager,
-            viewModelFactory: AccountStatisticsViewModelFactoryImpl()
+            viewModelFactory: AccountStatisticsViewModelFactoryImpl(),
+            logger: Logger.shared
         )
 
         let view = AccountStatisticsViewController(

diff --git a/fearless/Modules/AccountStatistics/AccountStatisticsPresenter.swift b/fearless/Modules/AccountStatistics/AccountStatisticsPresenter.swift
@@ -18,6 +18,7 @@ final class AccountStatisticsPresenter {
     private let router: AccountStatisticsRouterInput
     private let interactor: AccountStatisticsInteractorInput
     private let viewModelFactory: AccountStatisticsViewModelFactory
+    private let logger: LoggerProtocol?
 
     private var accountStatistics: AccountStatistics?
 
@@ -27,11 +28,13 @@ final class AccountStatisticsPresenter {
         interactor: AccountStatisticsInteractorInput,
         router: AccountStatisticsRouterInput,
         localizationManager: LocalizationManagerProtocol,
-        viewModelFactory: AccountStatisticsViewModelFactory
+        viewModelFactory: AccountStatisticsViewModelFactory,
+        logger: LoggerProtocol?
     ) {
         self.interactor = interactor
         self.router = router
         self.viewModelFactory = viewModelFactory
+        self.logger = logger
 
         self.localizationManager = localizationManager
     }
@@ -81,7 +84,9 @@ extension AccountStatisticsPresenter: AccountStatisticsInteractorOutput {
         provideViewModel()
     }
 
-    func didReceiveAccountStatisticsError(_: Error) {}
+    func didReceiveAccountStatisticsError(_ error: Error) {
+        logger?.debug("didReceiveAccountStatisticsError \(error)")
+    }
 
     func didReceiveNoDataAvailableState() {
         view?.didReceiveError()

diff --git a/fearless/Modules/Contacts/View Models/AddressBookViewModelFactory.swift b/fearless/Modules/Contacts/View Models/AddressBookViewModelFactory.swift
@@ -44,7 +44,8 @@ final class AddressBookViewModelFactory: AddressBookViewModelFactoryProtocol {
                 address: contactType.address,
                 chain: chain,
                 settings: settings,
-                eventCenter: EventCenter.shared
+                eventCenter: EventCenter.shared,
+                logger: Logger.shared
             )
 
             return ContactTableCellModel(
@@ -74,7 +75,8 @@ final class AddressBookViewModelFactory: AddressBookViewModelFactoryProtocol {
                     address: contact.address,
                     chain: chain,
                     settings: settings,
-                    eventCenter: EventCenter.shared
+                    eventCenter: EventCenter.shared,
+                    logger: Logger.shared
                 )
 
                 return ContactTableCellModel(contactType: .saved(contact), delegate: cellsDelegate, accountScoreViewModel: accountScoreViewModel)

diff --git a/fearless/Modules/NFT/NftSend/NftSendAssembly.swift b/fearless/Modules/NFT/NftSend/NftSendAssembly.swift
@@ -47,7 +47,11 @@ enum NftSendAssembly {
             let accountInfoSubscriptionAdapter = AccountInfoSubscriptionAdapter(walletLocalSubscriptionFactory: walletLocalSubscriptionFactory, selectedMetaAccount: wallet)
 
             let accountStatisticsFetcher = NomisAccountStatisticsFetcher(networkWorker: NetworkWorkerImpl(), signer: NomisRequestSigner())
-            let scamInfoFetcher = ScamInfoFetcher(scamServiceOperationFactory: scamServiceOperationFactory, accountScoreFetching: accountStatisticsFetcher)
+            let scamInfoFetcher = ScamInfoFetcher(
+                scamServiceOperationFactory: scamServiceOperationFactory,
+                accountScoreFetching: accountStatisticsFetcher,
+                localizationManager: LocalizationManager.shared
+            )
             let interactor = NftSendInteractor(
                 transferService: transferService,
                 operationManager: OperationManagerFacade.sharedManager,

diff --git a/fearless/Modules/Send/SendAssembly.swift b/fearless/Modules/Send/SendAssembly.swift
@@ -59,7 +59,8 @@ final class SendAssembly {
         let accountStatisticsFetcher = NomisAccountStatisticsFetcher(networkWorker: NetworkWorkerImpl(), signer: NomisRequestSigner())
         let scamInfoFetcher = ScamInfoFetcher(
             scamServiceOperationFactory: scamServiceOperationFactory,
-            accountScoreFetching: accountStatisticsFetcher
+            accountScoreFetching: accountStatisticsFetcher,
+            localizationManager: LocalizationManager.shared
         )
         let interactor = SendInteractor(
             accountInfoSubscriptionAdapter: AccountInfoSubscriptionAdapter(