diff --git a/App iOS/Screens/Accounts/AccountsListViewController.swift b/App iOS/Screens/Accounts/AccountsListViewController.swift index 3a7d2722..8df7368a 100644 --- a/App iOS/Screens/Accounts/AccountsListViewController.swift +++ b/App iOS/Screens/Accounts/AccountsListViewController.swift @@ -74,12 +74,12 @@ class AccountsListViewController: UIViewController, DataStateContainer { if forWalletSelection { if selectAccountAction?.initiallyConnectedProviders.isEmpty ?? true { - navigationItem.title = Strings.selectAccount.capitalized + navigationItem.title = Strings.selectAccount } else { - navigationItem.title = Strings.switchAccount.capitalized + navigationItem.title = Strings.switchAccount } } else { - navigationItem.title = Strings.wallets.capitalized + navigationItem.title = Strings.wallets } navigationController?.navigationBar.prefersLargeTitles = true diff --git a/App iOS/Screens/Accounts/EditAccountsViewController.swift b/App iOS/Screens/Accounts/EditAccountsViewController.swift index dd850dbf..39fb16c1 100644 --- a/App iOS/Screens/Accounts/EditAccountsViewController.swift +++ b/App iOS/Screens/Accounts/EditAccountsViewController.swift @@ -35,7 +35,7 @@ class EditAccountsViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() okButton.setTitle(Strings.ok, for: .normal) - navigationItem.title = Strings.editAccounts.capitalized + navigationItem.title = Strings.editAccounts navigationController?.navigationBar.prefersLargeTitles = true navigationItem.largeTitleDisplayMode = .always navigationItem.leftBarButtonItem = UIBarButtonItem(title: Strings.cancel, style: .plain, target: self, action: #selector(dismissAnimated)) diff --git a/App iOS/Screens/Approve/ApproveTransactionViewController.swift b/App iOS/Screens/Approve/ApproveTransactionViewController.swift index 7ceef3e6..b694d590 100644 --- a/App iOS/Screens/Approve/ApproveTransactionViewController.swift +++ b/App iOS/Screens/Approve/ApproveTransactionViewController.swift @@ -61,7 +61,7 @@ class ApproveTransactionViewController: UIViewController { cancelButton.setTitle(Strings.cancel, for: .normal) priceService.update() - navigationItem.title = Strings.sendTransaction.capitalized + navigationItem.title = Strings.sendTransaction navigationController?.navigationBar.prefersLargeTitles = true navigationItem.largeTitleDisplayMode = .always navigationItem.rightBarButtonItem = UIBarButtonItem(image: Images.preferences, style: .plain, target: self, action: #selector(editTransactionButtonTapped)) @@ -116,7 +116,7 @@ class ApproveTransactionViewController: UIViewController { var cellModels: [CellModel] = [ .textWithImage(text: peerMeta?.name ?? Strings.unknownWebsite, extraText: nil, imageURL: peerMeta?.iconURLString, image: nil), .textWithImage(text: account.croppedAddress, extraText: balance, imageURL: nil, image: account.image), - .textWithImage(text: chain.name.lowercased(), extraText: nil, imageURL: nil, image: Images.network) + .textWithImage(text: chain.name, extraText: nil, imageURL: nil, image: Images.network) ] let price = priceService.forNetwork(chain) diff --git a/App iOS/Screens/Approve/ApproveViewController.swift b/App iOS/Screens/Approve/ApproveViewController.swift index 8ae1b8ce..8fc41ef2 100644 --- a/App iOS/Screens/Approve/ApproveViewController.swift +++ b/App iOS/Screens/Approve/ApproveViewController.swift @@ -48,7 +48,7 @@ class ApproveViewController: UIViewController { super.viewDidLoad() okButton.setTitle(Strings.ok, for: .normal) cancelButton.setTitle(Strings.cancel, for: .normal) - navigationItem.title = approveTitle.capitalized + navigationItem.title = approveTitle navigationController?.navigationBar.prefersLargeTitles = true navigationItem.largeTitleDisplayMode = .always isModalInPresentation = true diff --git a/App iOS/Screens/ImportViewController.swift b/App iOS/Screens/ImportViewController.swift index 3ccd97f2..ed5199fd 100644 --- a/App iOS/Screens/ImportViewController.swift +++ b/App iOS/Screens/ImportViewController.swift @@ -35,7 +35,7 @@ class ImportViewController: UIViewController { navigationController?.navigationBar.prefersLargeTitles = true navigationItem.largeTitleDisplayMode = .always - navigationItem.title = Strings.importWallet.capitalized + navigationItem.title = Strings.importWallet navigationItem.leftBarButtonItem = UIBarButtonItem(title: Strings.cancel, style: .plain, target: self, action: #selector(dismissAnimated)) okButton.configurationUpdateHandler = { [weak self] button in diff --git a/App iOS/Screens/PasswordViewController.swift b/App iOS/Screens/PasswordViewController.swift index 842d10ba..ae04de15 100644 --- a/App iOS/Screens/PasswordViewController.swift +++ b/App iOS/Screens/PasswordViewController.swift @@ -70,11 +70,11 @@ class PasswordViewController: UIViewController { self.mode = mode switch mode { case .create: - navigationItem.title = Strings.createPassword.capitalized + navigationItem.title = Strings.createPassword case .repeatAfterCreate: - navigationItem.title = Strings.repeatPassword.capitalized + navigationItem.title = Strings.repeatPassword case .enter: - navigationItem.title = Strings.enterPassword.capitalized + navigationItem.title = Strings.enterPassword } } diff --git a/App macOS/Screens/AccountsListViewController.swift b/App macOS/Screens/AccountsListViewController.swift index aa4516e6..f4446565 100644 --- a/App macOS/Screens/AccountsListViewController.swift +++ b/App macOS/Screens/AccountsListViewController.swift @@ -152,12 +152,12 @@ class AccountsListViewController: NSViewController { let canSelectAccount = selectAccountAction != nil && !wallets.isEmpty if canSelectAccount { if selectAccountAction?.initiallyConnectedProviders.isEmpty ?? true { - titleLabel.stringValue = Strings.selectAccount.replacingOccurrences(of: " ", with: "\n").capitalized + titleLabel.stringValue = Strings.selectAccount.replacingOccurrences(of: " ", with: "\n") } else { - titleLabel.stringValue = Strings.switchAccount.replacingOccurrences(of: " ", with: "\n").capitalized + titleLabel.stringValue = Strings.switchAccount.replacingOccurrences(of: " ", with: "\n") } } else { - titleLabel.stringValue = Strings.wallets.capitalized + titleLabel.stringValue = Strings.wallets } addButton.isHidden = wallets.isEmpty diff --git a/Shared/Ethereum/Transaction.swift b/Shared/Ethereum/Transaction.swift index 1e0caa3e..0c357722 100644 --- a/Shared/Ethereum/Transaction.swift +++ b/Shared/Ethereum/Transaction.swift @@ -42,7 +42,7 @@ struct Transaction { } func description(chain: EthereumNetwork, price: Double?) -> String { - var result = ["🌐 " + chain.name.lowercased()] + var result = ["🌐 " + chain.name] if let value = valueWithSymbol(chain: chain, price: price, withLabel: false) { result.append(value) } diff --git a/Shared/Supporting Files/Strings.swift b/Shared/Supporting Files/Strings.swift index 690befae..80c17c7f 100644 --- a/Shared/Supporting Files/Strings.swift +++ b/Shared/Supporting Files/Strings.swift @@ -105,6 +105,9 @@ struct Strings { static let connect = "connect" static let paste = "paste" static let getStarted = "get started" + + // MARK: - Helpers + static let isVisionPro = loc("isVisionPro") == "isVisionPro" private static func loc(_ string: String.LocalizationValue) -> String { diff --git a/Shared/Views/NetworksListView.swift b/Shared/Views/NetworksListView.swift index d6b71a05..1f763ed8 100644 --- a/Shared/Views/NetworksListView.swift +++ b/Shared/Views/NetworksListView.swift @@ -19,7 +19,7 @@ struct NetworksListView: View { VStack { list() } - .navigationBarTitle(Strings.selectNetwork.capitalized, displayMode: .large) + .navigationBarTitle(Strings.selectNetwork, displayMode: .large) .navigationBarItems(leading: Button(action: { completion(selectedNetwork) presentationMode.wrappedValue.dismiss() }) { @@ -57,7 +57,7 @@ struct NetworksListView: View { Section(header: title.map { Text($0) }) { ForEach(networks, id: \.self) { network in HStack { - Text(network.name.lowercased()) + Text(network.name) Spacer() if selectedNetwork?.chainId == network.chainId { Image.checkmark.foregroundStyle(.tint)