diff --git a/AlphaWallet/AppCoordinator.swift b/AlphaWallet/AppCoordinator.swift index 643da0a81f..0da6bdfd79 100644 --- a/AlphaWallet/AppCoordinator.swift +++ b/AlphaWallet/AppCoordinator.swift @@ -9,6 +9,7 @@ import AlphaWalletFoundation import AlphaWalletLogger import AlphaWalletTrackAPICalls import AlphaWalletNotifications + class AppCoordinator: NSObject, Coordinator, ApplicationNavigatable { private let navigationSubject = CurrentValueSubject(.onboarding) diff --git a/AlphaWallet/Features/FeaturesViewController.swift b/AlphaWallet/Features/FeaturesViewController.swift index 0ccdf198cd..c61b9cedd0 100644 --- a/AlphaWallet/Features/FeaturesViewController.swift +++ b/AlphaWallet/Features/FeaturesViewController.swift @@ -39,7 +39,7 @@ class FeaturesViewController: UIViewController { private func configureViewController() { addTableViewController() addButton() - navigationItem.title = R.string.localizable.advancedSettingsFeaturesTitle(preferredLanguages: nil) + navigationItem.title = R.string.localizable.advancedSettingsFeaturesTitle() } private func addTableViewController() { diff --git a/AlphaWallet/Settings/ViewControllers/SaveCustomRpcBrowseViewController.swift b/AlphaWallet/Settings/ViewControllers/SaveCustomRpcBrowseViewController.swift index 272896f60e..785a11399c 100644 --- a/AlphaWallet/Settings/ViewControllers/SaveCustomRpcBrowseViewController.swift +++ b/AlphaWallet/Settings/ViewControllers/SaveCustomRpcBrowseViewController.swift @@ -140,8 +140,8 @@ class SaveCustomRpcBrowseViewController: UIViewController { private func configureAddNetworkButton() { buttonsBar.configure() - buttonsBar.buttons[0].setTitle(R.string.localizable.addrpcServerSaveButtonTitle(preferredLanguages: nil), for: .normal) - addSaveButtonTarget(self, action: #selector(handleAddButtonAction(_:))) + buttonsBar.buttons[0].setTitle(R.string.localizable.addrpcServerSaveButtonTitle(), for: .normal) + addSaveButtonTarget(self, action: #selector(handleAddButtonAction(_:))) enableAddFunction(false) view.addSubview(footerView) @@ -248,11 +248,11 @@ extension SaveCustomRpcBrowseViewController: HandleAddMultipleCustomRpcViewContr tableViewController.tableView.reloadData() var errorMessage: String = "" if let failed: [CustomRPC] = failed as? [CustomRPC], !failed.isEmpty { - errorMessage = R.string.localizable.addMultipleCustomRpcError(preferredLanguages: nil) + errorMessage = R.string.localizable.addMultipleCustomRpcError() reportFailures(customRpcs: failed) } if let duplicates: [CustomRPC] = duplicates as? [CustomRPC], !duplicates.isEmpty { - errorMessage = R.string.localizable.addMultipleCustomRpcError(preferredLanguages: nil) + errorMessage = R.string.localizable.addMultipleCustomRpcError() } if !errorMessage.isEmpty { displayError(message: errorMessage) diff --git a/AlphaWallet/Settings/ViewControllers/SaveCustomRpcManualEntryViewController.swift b/AlphaWallet/Settings/ViewControllers/SaveCustomRpcManualEntryViewController.swift index 0d318b94e1..0483467509 100644 --- a/AlphaWallet/Settings/ViewControllers/SaveCustomRpcManualEntryViewController.swift +++ b/AlphaWallet/Settings/ViewControllers/SaveCustomRpcManualEntryViewController.swift @@ -115,7 +115,7 @@ class SaveCustomRpcManualEntryViewController: UIViewController, SaveCustomRpcHan case .explorerEndpointInvalidField: editView.explorerEndpointTextField.status = .error(R.string.localizable.addrpcServerBlockExplorerUrlError()) case .chainIDDuplicateField: - editView.chainIDTextField.status = .error(R.string.localizable.editCustomRPCChainIDErrorDuplicate(preferredLanguages: nil)) + editView.chainIDTextField.status = .error(R.string.localizable.editCustomRPCChainIDErrorDuplicate()) } } editView.allTextFields.first(where: { !$0.statusLabel.text.isEmpty })?.becomeFirstResponder() diff --git a/AlphaWallet/Settings/Views/SaveCustomRpcManualEntryView.swift b/AlphaWallet/Settings/Views/SaveCustomRpcManualEntryView.swift index 8199e26e7c..9cf52e0a82 100644 --- a/AlphaWallet/Settings/Views/SaveCustomRpcManualEntryView.swift +++ b/AlphaWallet/Settings/Views/SaveCustomRpcManualEntryView.swift @@ -120,7 +120,7 @@ class SaveCustomRpcManualEntryView: UIView { func configureView() { buttonsBar.configure() - buttonsBar.buttons[0].setTitle(R.string.localizable.editCustomRPCSaveButtonTitle(preferredLanguages: nil), for: .normal) + buttonsBar.buttons[0].setTitle(R.string.localizable.editCustomRPCSaveButtonTitle(), for: .normal) configureInputAccessoryView() } diff --git a/Podfile b/Podfile index 4e621f421c..638e9cfafa 100644 --- a/Podfile +++ b/Podfile @@ -5,7 +5,7 @@ source 'https://cdn.cocoapods.org/' target 'AlphaWallet' do use_frameworks! pod 'BigInt', '~> 3.1' - pod 'R.swift' + pod 'R.swift','7.3.2' pod 'MBProgressHUD' pod 'StatefulViewController' pod 'QRCodeReaderViewController', :git=>'https://github.com/AlphaWallet/QRCodeReaderViewController.git', :commit=>'09da2d4b835589972ecacd022a75bc27b2c1d1bd'