diff --git a/GoMoney/Scences/AddExpense/AddExpenseForm.swift b/GoMoney/Scences/AddExpense/AddExpenseForm.swift index f0563f9..f3c4088 100644 --- a/GoMoney/Scences/AddExpense/AddExpenseForm.swift +++ b/GoMoney/Scences/AddExpense/AddExpenseForm.swift @@ -51,7 +51,7 @@ class AddExpenseForm: UIView { if let inputView = field?.inputView as? CategoryPickerInputView { // change category type if user create different icon type. if tag.type != self?.transType.rawValue { - self?.controller?.title = "Add \(tag.type)" + self?.controller?.title = "Add \(tag.type.capitalized)" if let changedType = ExpenseType(rawValue: tag.type) { self?.transType = changedType inputView.type = changedType diff --git a/GoMoney/Scences/Detail/DetailView.swift b/GoMoney/Scences/Detail/DetailView.swift index 6d0d6af..ae2163b 100644 --- a/GoMoney/Scences/Detail/DetailView.swift +++ b/GoMoney/Scences/Detail/DetailView.swift @@ -105,10 +105,13 @@ class DetailView: UIView { $0.removeFromSuperview() } + let currency = SettingsManager.shared.getValue(for: .currencyUnit) + let amount = "\(transaction.amount.formatWithCommas()) \(currency)" + stackView.addArrangedSubviews( - DetailCell(key: "Transaction type", value: transaction.type), + DetailCell(key: "Transaction type", value: transaction.type.capitalized), DetailCell(key: "Tag", value: tag.name), - DetailCell(key: "Amount", value: String(transaction.amount)), + DetailCell(key: "Amount", value: amount), DetailCell(key: "When", value: DateFormatter.dmy().string(from: transaction.occuredOn)), DetailCell(key: "Note", value: transaction.note)) diff --git a/GoMoney/Scences/Home/HomeViewController.swift b/GoMoney/Scences/Home/HomeViewController.swift index 4ea1d86..c09ed61 100644 --- a/GoMoney/Scences/Home/HomeViewController.swift +++ b/GoMoney/Scences/Home/HomeViewController.swift @@ -275,8 +275,8 @@ extension HomeViewController { extension HomeViewController { private enum Content { - static let myExpense = "My Expenses" - static let recentExpense = "Recent Expenses" + static let myExpense = "My Transactions" + static let recentExpense = "Recent Transactions" } private enum Constant { diff --git a/GoMoney/Scences/Tags/NewTagViewController.swift b/GoMoney/Scences/Tags/NewTagViewController.swift index abac0d8..c3327da 100644 --- a/GoMoney/Scences/Tags/NewTagViewController.swift +++ b/GoMoney/Scences/Tags/NewTagViewController.swift @@ -41,8 +41,8 @@ class NewTagViewController: GMMainViewController { private lazy var radioGroup: RadioGroup = { let radioGroup = RadioGroup(titles: [ - ExpenseType.expense.rawValue, - ExpenseType.income.rawValue, + ExpenseType.expense.rawValue.capitalized, + ExpenseType.income.rawValue.capitalized, ]) radioGroup.selectedIndex = 0