Cleanup: dead Date helper, swiftier String predicates, README env vars

dadachi · claude · dadachi · commit 8e1638b7a8f3 · 2026-04-30T19:26:38.000+09:00
- Drop unused cardTimeAgoInWordsDateString and its timeAgoInWordsDateFormatter
- Move isBlank and validateEmail from Utility static helpers to String
  computed-property extensions (isBlank, isValidEmail) and update all call
  sites in production and tests
- Fold UtilityTest cases into StringExtensionsTest and delete UtilityTest
- README: clarify that Xcode is in practice the only NATEMPLATE_API_* env
  var injector, so the hardcoded fallbacks are what keep Debug builds
  working when launched from SpringBoard or after Xcode disconnects

Co-Authored-By: Claude Opus 4.7 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/NativeAppTemplate/Extensions/Date+Extensions.swift b/NativeAppTemplate/Extensions/Date+Extensions.swift
@@ -24,9 +24,4 @@ extension Date {
     var cardDateTimeString: String {
         "\(cardDateString) \(cardTimeString)"
     }
-
-    var cardTimeAgoInWordsDateString: String {
-        let formatter = DateFormatter.timeAgoInWordsDateFormatter
-        return formatter.string(from: self)
-    }
 }
diff --git a/NativeAppTemplate/Extensions/DateFormatter+Extensions.swift b/NativeAppTemplate/Extensions/DateFormatter+Extensions.swift
@@ -33,14 +33,6 @@ extension DateFormatter {
 
     static let cardTimeFormatter: DateFormatter = .formatter(for: "HH:mm")
 
-    static let timeAgoInWordsDateFormatter: DateFormatter = {
-        let dateFormatter = DateFormatter()
-        dateFormatter.dateStyle = .short
-        dateFormatter.timeStyle = .medium
-        dateFormatter.doesRelativeDateFormatting = true
-        return dateFormatter
-    }()
-
     static func formatter(for dateString: String) -> DateFormatter {
         let dateFormatter = DateFormatter()
         dateFormatter.dateFormat = dateString
diff --git a/NativeAppTemplate/Extensions/String+Extensions.swift b/NativeAppTemplate/Extensions/String+Extensions.swift
@@ -35,4 +35,13 @@ extension String {
             isAlphanumeric()
         }
     }
+
+    var isBlank: Bool {
+        trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
+    }
+
+    var isValidEmail: Bool {
+        let emailRegex = "[A-Z0-9a-z._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,64}"
+        return NSPredicate(format: "SELF MATCHES %@", emailRegex).evaluate(with: self)
+    }
 }
diff --git a/NativeAppTemplate/UI/App Root/ForgotPasswordViewModel.swift b/NativeAppTemplate/UI/App Root/ForgotPasswordViewModel.swift
@@ -25,23 +25,23 @@ final class ForgotPasswordViewModel {
     }
 
     var hasInvalidData: Bool {
-        if Utility.isBlank(email) {
+        if email.isBlank {
             return true
         }
 
-        if !Utility.validateEmail(email) {
+        if !email.isValidEmail {
             return true
         }
 
         return false
     }
 
     var isEmailBlank: Bool {
-        Utility.isBlank(email)
+        email.isBlank
     }
 
     var isEmailInvalid: Bool {
-        !Utility.isBlank(email) && !Utility.validateEmail(email)
+        !email.isBlank && !email.isValidEmail
     }
 
     func sendMeResetPasswordInstructionsTapped() {
diff --git a/NativeAppTemplate/UI/App Root/ResendConfirmationInstructionsViewModel.swift b/NativeAppTemplate/UI/App Root/ResendConfirmationInstructionsViewModel.swift
@@ -25,23 +25,23 @@ final class ResendConfirmationInstructionsViewModel {
     }
 
     var hasInvalidData: Bool {
-        if Utility.isBlank(email) {
+        if email.isBlank {
             return true
         }
 
-        if !Utility.validateEmail(email) {
+        if !email.isValidEmail {
             return true
         }
 
         return false
     }
 
     var isEmailBlank: Bool {
-        Utility.isBlank(email)
+        email.isBlank
     }
 
     var isEmailInvalid: Bool {
-        !Utility.isBlank(email) && !Utility.validateEmail(email)
+        !email.isBlank && !email.isValidEmail
     }
 
     func sendMeConfirmationInstructionsTapped() {
diff --git a/NativeAppTemplate/UI/App Root/SignInEmailAndPasswordViewModel.swift b/NativeAppTemplate/UI/App Root/SignInEmailAndPasswordViewModel.swift
@@ -25,11 +25,11 @@ final class SignInEmailAndPasswordViewModel {
     }
 
     var hasInvalidData: Bool {
-        if Utility.isBlank(email) || Utility.isBlank(password) {
+        if email.isBlank || password.isBlank {
             return true
         }
 
-        if !Utility.validateEmail(email) {
+        if !email.isValidEmail {
             return true
         }
 
@@ -41,23 +41,23 @@ final class SignInEmailAndPasswordViewModel {
     }
 
     var hasInvalidDataPassword: Bool {
-        if Utility.isBlank(password) {
+        if password.isBlank {
             return true
         }
 
         return false
     }
 
     var isEmailBlank: Bool {
-        Utility.isBlank(email)
+        email.isBlank
     }
 
     var isEmailInvalid: Bool {
-        Utility.isBlank(email) || !Utility.validateEmail(email)
+        email.isBlank || !email.isValidEmail
     }
 
     var isPasswordBlank: Bool {
-        Utility.isBlank(password)
+        password.isBlank
     }
 
     func signIn() {
diff --git a/NativeAppTemplate/UI/App Root/SignUpViewModel.swift b/NativeAppTemplate/UI/App Root/SignUpViewModel.swift
@@ -31,7 +31,7 @@ final class SignUpViewModel {
     }
 
     var hasInvalidData: Bool {
-        if Utility.isBlank(name) {
+        if name.isBlank {
             return true
         }
 
@@ -47,19 +47,19 @@ final class SignUpViewModel {
     }
 
     var hasInvalidDataEmail: Bool {
-        if Utility.isBlank(email) {
+        if email.isBlank {
             return true
         }
 
-        if !Utility.validateEmail(email) {
+        if !email.isValidEmail {
             return true
         }
 
         return false
     }
 
     var hasInvalidDataPassword: Bool {
-        if Utility.isBlank(password) {
+        if password.isBlank {
             return true
         }
 
@@ -71,15 +71,15 @@ final class SignUpViewModel {
     }
 
     var isNameBlank: Bool {
-        Utility.isBlank(name)
+        name.isBlank
     }
 
     var isEmailBlank: Bool {
-        Utility.isBlank(email)
+        email.isBlank
     }
 
     var isPasswordBlank: Bool {
-        Utility.isBlank(password)
+        password.isBlank
     }
 
     func createShopkeeper() {
diff --git a/NativeAppTemplate/UI/Settings/PasswordEditView.swift b/NativeAppTemplate/UI/Settings/PasswordEditView.swift
@@ -52,7 +52,7 @@ private extension PasswordEditView {
                     Text(Strings.weNeedYourCurrentPassword)
                         .font(.uiFootnote)
                     Text(Strings.currentPasswordIsRequired)
-                        .foregroundStyle(Utility.isBlank(viewModel.currentPassword) ? .validationError : .clear)
+                        .foregroundStyle(viewModel.currentPassword.isBlank ? .validationError : .clear)
                         .font(.uiFootnote)
                 }
             }
@@ -68,7 +68,7 @@ private extension PasswordEditView {
                     Text("\(viewModel.minimumPasswordLength) characters minimum.")
                         .font(.uiFootnote)
 
-                    if Utility.isBlank(viewModel.password) {
+                    if viewModel.password.isBlank {
                         Text(Strings.newPasswordIsRequired)
                             .foregroundStyle(.validationError)
                             .font(.uiFootnote)
@@ -89,7 +89,7 @@ private extension PasswordEditView {
             } footer: {
                 Text(Strings.confirmNewPasswordIsRequired)
                     .font(.uiFootnote)
-                    .foregroundStyle(Utility.isBlank(viewModel.passwordConfirmation) ? .validationError : .clear)
+                    .foregroundStyle(viewModel.passwordConfirmation.isBlank ? .validationError : .clear)
             }
         }
         .navigationTitle(Strings.updatePassword)
diff --git a/NativeAppTemplate/UI/Settings/PasswordEditViewModel.swift b/NativeAppTemplate/UI/Settings/PasswordEditViewModel.swift
@@ -31,9 +31,9 @@ final class PasswordEditViewModel {
     }
 
     var hasInvalidData: Bool {
-        if Utility.isBlank(currentPassword) ||
-            Utility.isBlank(password) ||
-            Utility.isBlank(passwordConfirmation) {
+        if currentPassword.isBlank ||
+            password.isBlank ||
+            passwordConfirmation.isBlank {
             return true
         }
 
@@ -45,7 +45,7 @@ final class PasswordEditViewModel {
     }
 
     var hasInvalidDataPassword: Bool {
-        if Utility.isBlank(password) {
+        if password.isBlank {
             return true
         }
 
diff --git a/NativeAppTemplate/UI/Settings/ShopkeeperEditView.swift b/NativeAppTemplate/UI/Settings/ShopkeeperEditView.swift
@@ -47,7 +47,7 @@ private extension ShopkeeperEditView {
                 Text(Strings.fullName)
             } footer: {
                 Text(Strings.fullNameIsRequired)
-                    .foregroundStyle(Utility.isBlank(viewModel.name) ? .validationError : .clear)
+                    .foregroundStyle(viewModel.name.isBlank ? .validationError : .clear)
             }
 
             Section {
@@ -57,7 +57,7 @@ private extension ShopkeeperEditView {
             } header: {
                 Text(Strings.email)
             } footer: {
-                if Utility.isBlank(viewModel.email) {
+                if viewModel.email.isBlank {
                     Text(Strings.emailIsRequired)
                         .foregroundStyle(.validationError)
                 } else if viewModel.hasInvalidDataEmail {
diff --git a/NativeAppTemplate/UI/Settings/ShopkeeperEditViewModel.swift b/NativeAppTemplate/UI/Settings/ShopkeeperEditViewModel.swift
@@ -45,7 +45,7 @@ final class ShopkeeperEditViewModel {
     }
 
     var hasInvalidData: Bool {
-        if Utility.isBlank(name) {
+        if name.isBlank {
             return true
         }
 
@@ -63,11 +63,11 @@ final class ShopkeeperEditViewModel {
     }
 
     var hasInvalidDataEmail: Bool {
-        if Utility.isBlank(email) {
+        if email.isBlank {
             return true
         }
 
-        if !Utility.validateEmail(email) {
+        if !email.isValidEmail {
             return true
         }
 
diff --git a/NativeAppTemplate/UI/Shop List/ShopCreateViewModel.swift b/NativeAppTemplate/UI/Shop List/ShopCreateViewModel.swift
@@ -35,7 +35,7 @@ final class ShopCreateViewModel {
     }
 
     var hasInvalidDataName: Bool {
-        if Utility.isBlank(name) {
+        if name.isBlank {
             return true
         }
         if name.count > maximumNameLength {
diff --git a/NativeAppTemplate/UI/Shop Settings/ItemTag Detail/ItemTagEditViewModel.swift b/NativeAppTemplate/UI/Shop Settings/ItemTag Detail/ItemTagEditViewModel.swift
@@ -53,7 +53,7 @@ final class ItemTagEditViewModel {
     }
 
     var hasInvalidDataName: Bool {
-        if Utility.isBlank(name) {
+        if name.isBlank {
             return true
         }
         if name.count > maximumNameLength {
diff --git a/NativeAppTemplate/UI/Shop Settings/ItemTag List/ItemTagCreateViewModel.swift b/NativeAppTemplate/UI/Shop Settings/ItemTag List/ItemTagCreateViewModel.swift
@@ -37,7 +37,7 @@ final class ItemTagCreateViewModel {
     }
 
     var hasInvalidDataName: Bool {
-        if Utility.isBlank(name) {
+        if name.isBlank {
             return true
         }
         if name.count > maximumNameLength {
diff --git a/NativeAppTemplate/UI/Shop Settings/ShopBasicSettingsViewModel.swift b/NativeAppTemplate/UI/Shop Settings/ShopBasicSettingsViewModel.swift
@@ -59,7 +59,7 @@ final class ShopBasicSettingsViewModel {
     }
 
     var hasInvalidDataName: Bool {
-        if Utility.isBlank(name) {
+        if name.isBlank {
             return true
         }
         if name.count > maximumNameLength {
diff --git a/NativeAppTemplate/Utilities/Utility.swift b/NativeAppTemplate/Utilities/Utility.swift
@@ -46,16 +46,6 @@ enum Utility {
         return optionalString ?? "N/A"
     }
 
-    static func isBlank(_ text: String) -> Bool {
-        let trimmed = text.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines)
-        return trimmed.isEmpty
-    }
-
-    static func validateEmail(_ email: String) -> Bool {
-        let emailRegex = "[A-Z0-9a-z._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,64}"
-        return NSPredicate(format: "SELF MATCHES %@", emailRegex).evaluate(with: email)
-    }
-
     private static func currentTimeZoneHour() -> (Int, Int) {
         let secondsFromGmt: Int = TimeZone.current.secondsFromGMT()
         let hoursFromGmt = (secondsFromGmt / 3_600)
diff --git a/NativeAppTemplateTests/Extensions/StringExtensionsTest.swift b/NativeAppTemplateTests/Extensions/StringExtensionsTest.swift
@@ -35,4 +35,30 @@ struct StringExtensionsTest {
         let image = "A".image(size: CGSize(width: 50, height: 50))
         #expect(image != nil)
     }
+
+    @Test(arguments: [
+        ("", true),
+        ("   ", true),
+        ("\n", true),
+        (" \t\n ", true),
+        ("hello", false),
+        (" hello ", false),
+    ])
+    func isBlank(text: String, expected: Bool) {
+        #expect(text.isBlank == expected)
+    }
+
+    @Test(arguments: [
+        ("test@example.com", true),
+        ("user.name+tag@domain.co", true),
+        ("user@domain.com", true),
+        ("", false),
+        ("notanemail", false),
+        ("@domain.com", false),
+        ("user@", false),
+        ("user@.com", false),
+    ])
+    func isValidEmail(email: String, expected: Bool) {
+        #expect(email.isValidEmail == expected)
+    }
 }
diff --git a/NativeAppTemplateTests/UI/App Root/ForgotPasswordViewModelTest.swift b/NativeAppTemplateTests/UI/App Root/ForgotPasswordViewModelTest.swift
diff --git a/NativeAppTemplateTests/UI/App Root/ResendConfirmationInstructionsViewModelTest.swift b/NativeAppTemplateTests/UI/App Root/ResendConfirmationInstructionsViewModelTest.swift
diff --git a/NativeAppTemplateTests/Utilities/UtilityTest.swift b/NativeAppTemplateTests/Utilities/UtilityTest.swift
diff --git a/README.md b/README.md

Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,4 @@ extension Date {`
`24`	`24`	`var cardDateTimeString: String {`
`25`	`25`	`"\(cardDateString) \(cardTimeString)"`
`26`	`26`	`}`
`27`		`-`
`28`		`- var cardTimeAgoInWordsDateString: String {`
`29`		`- let formatter = DateFormatter.timeAgoInWordsDateFormatter`
`30`		`- return formatter.string(from: self)`
`31`		`- }`
`32`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,4 +35,13 @@ extension String {`
`35`	`35`	`isAlphanumeric()`
`36`	`36`	`}`
`37`	`37`	`}`
	`38`	`+`
	`39`	`+ var isBlank: Bool {`
	`40`	`+ trimmingCharacters(in: .whitespacesAndNewlines).isEmpty`
	`41`	`+ }`
	`42`	`+`
	`43`	`+ var isValidEmail: Bool {`
	`44`	`+ let emailRegex = "[A-Z0-9a-z._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,64}"`
	`45`	`+ return NSPredicate(format: "SELF MATCHES %@", emailRegex).evaluate(with: self)`
	`46`	`+ }`
`38`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,23 +25,23 @@ final class ForgotPasswordViewModel {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`var hasInvalidData: Bool {`
`28`		`- if Utility.isBlank(email) {`
	`28`	`+ if email.isBlank {`
`29`	`29`	`return true`
`30`	`30`	`}`
`31`	`31`
`32`		`- if !Utility.validateEmail(email) {`
	`32`	`+ if !email.isValidEmail {`
`33`	`33`	`return true`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`return false`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`var isEmailBlank: Bool {`
`40`		`- Utility.isBlank(email)`
	`40`	`+ email.isBlank`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`var isEmailInvalid: Bool {`
`44`		`- !Utility.isBlank(email) && !Utility.validateEmail(email)`
	`44`	`+ !email.isBlank && !email.isValidEmail`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`func sendMeResetPasswordInstructionsTapped() {`
Original file line number	Diff line number	Diff line change
`@@ -25,23 +25,23 @@ final class ResendConfirmationInstructionsViewModel {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`var hasInvalidData: Bool {`
`28`		`- if Utility.isBlank(email) {`
	`28`	`+ if email.isBlank {`
`29`	`29`	`return true`
`30`	`30`	`}`
`31`	`31`
`32`		`- if !Utility.validateEmail(email) {`
	`32`	`+ if !email.isValidEmail {`
`33`	`33`	`return true`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`return false`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`var isEmailBlank: Bool {`
`40`		`- Utility.isBlank(email)`
	`40`	`+ email.isBlank`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`var isEmailInvalid: Bool {`
`44`		`- !Utility.isBlank(email) && !Utility.validateEmail(email)`
	`44`	`+ !email.isBlank && !email.isValidEmail`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`func sendMeConfirmationInstructionsTapped() {`
Original file line number	Diff line number	Diff line change
`@@ -25,11 +25,11 @@ final class SignInEmailAndPasswordViewModel {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`var hasInvalidData: Bool {`
`28`		`- if Utility.isBlank(email) \|\| Utility.isBlank(password) {`
	`28`	`+ if email.isBlank \|\| password.isBlank {`
`29`	`29`	`return true`
`30`	`30`	`}`
`31`	`31`
`32`		`- if !Utility.validateEmail(email) {`
	`32`	`+ if !email.isValidEmail {`
`33`	`33`	`return true`
`34`	`34`	`}`
`35`	`35`
`@@ -41,23 +41,23 @@ final class SignInEmailAndPasswordViewModel {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`var hasInvalidDataPassword: Bool {`
`44`		`- if Utility.isBlank(password) {`
	`44`	`+ if password.isBlank {`
`45`	`45`	`return true`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`return false`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`var isEmailBlank: Bool {`
`52`		`- Utility.isBlank(email)`
	`52`	`+ email.isBlank`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`var isEmailInvalid: Bool {`
`56`		`- Utility.isBlank(email) \|\| !Utility.validateEmail(email)`
	`56`	`+ email.isBlank \|\| !email.isValidEmail`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`var isPasswordBlank: Bool {`
`60`		`- Utility.isBlank(password)`
	`60`	`+ password.isBlank`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`func signIn() {`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ final class SignUpViewModel {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`var hasInvalidData: Bool {`
`34`		`- if Utility.isBlank(name) {`
	`34`	`+ if name.isBlank {`
`35`	`35`	`return true`
`36`	`36`	`}`
`37`	`37`
`@@ -47,19 +47,19 @@ final class SignUpViewModel {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`var hasInvalidDataEmail: Bool {`
`50`		`- if Utility.isBlank(email) {`
	`50`	`+ if email.isBlank {`
`51`	`51`	`return true`
`52`	`52`	`}`
`53`	`53`
`54`		`- if !Utility.validateEmail(email) {`
	`54`	`+ if !email.isValidEmail {`
`55`	`55`	`return true`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`return false`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`var hasInvalidDataPassword: Bool {`
`62`		`- if Utility.isBlank(password) {`
	`62`	`+ if password.isBlank {`
`63`	`63`	`return true`
`64`	`64`	`}`
`65`	`65`
`@@ -71,15 +71,15 @@ final class SignUpViewModel {`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`var isNameBlank: Bool {`
`74`		`- Utility.isBlank(name)`
	`74`	`+ name.isBlank`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`var isEmailBlank: Bool {`
`78`		`- Utility.isBlank(email)`
	`78`	`+ email.isBlank`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`var isPasswordBlank: Bool {`
`82`		`- Utility.isBlank(password)`
	`82`	`+ password.isBlank`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`func createShopkeeper() {`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ private extension PasswordEditView {`
`52`	`52`	`Text(Strings.weNeedYourCurrentPassword)`
`53`	`53`	`.font(.uiFootnote)`
`54`	`54`	`Text(Strings.currentPasswordIsRequired)`
`55`		`- .foregroundStyle(Utility.isBlank(viewModel.currentPassword) ? .validationError : .clear)`
	`55`	`+ .foregroundStyle(viewModel.currentPassword.isBlank ? .validationError : .clear)`
`56`	`56`	`.font(.uiFootnote)`
`57`	`57`	`}`
`58`	`58`	`}`
`@@ -68,7 +68,7 @@ private extension PasswordEditView {`
`68`	`68`	`Text("\(viewModel.minimumPasswordLength) characters minimum.")`
`69`	`69`	`.font(.uiFootnote)`
`70`	`70`
`71`		`- if Utility.isBlank(viewModel.password) {`
	`71`	`+ if viewModel.password.isBlank {`
`72`	`72`	`Text(Strings.newPasswordIsRequired)`
`73`	`73`	`.foregroundStyle(.validationError)`
`74`	`74`	`.font(.uiFootnote)`
`@@ -89,7 +89,7 @@ private extension PasswordEditView {`
`89`	`89`	`} footer: {`
`90`	`90`	`Text(Strings.confirmNewPasswordIsRequired)`
`91`	`91`	`.font(.uiFootnote)`
`92`		`- .foregroundStyle(Utility.isBlank(viewModel.passwordConfirmation) ? .validationError : .clear)`
	`92`	`+ .foregroundStyle(viewModel.passwordConfirmation.isBlank ? .validationError : .clear)`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`	`.navigationTitle(Strings.updatePassword)`
Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,9 @@ final class PasswordEditViewModel {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`var hasInvalidData: Bool {`
`34`		`- if Utility.isBlank(currentPassword) \|\|`
`35`		`- Utility.isBlank(password) \|\|`
`36`		`- Utility.isBlank(passwordConfirmation) {`
	`34`	`+ if currentPassword.isBlank \|\|`
	`35`	`+ password.isBlank \|\|`
	`36`	`+ passwordConfirmation.isBlank {`
`37`	`37`	`return true`
`38`	`38`	`}`
`39`	`39`
`@@ -45,7 +45,7 @@ final class PasswordEditViewModel {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`var hasInvalidDataPassword: Bool {`
`48`		`- if Utility.isBlank(password) {`
	`48`	`+ if password.isBlank {`
`49`	`49`	`return true`
`50`	`50`	`}`
`51`	`51`