diff --git a/SodaLive/Sources/Settings/SignOut/SignOutView.swift b/SodaLive/Sources/Settings/SignOut/SignOutView.swift index d34fd22..23bec6d 100644 --- a/SodaLive/Sources/Settings/SignOut/SignOutView.swift +++ b/SodaLive/Sources/Settings/SignOut/SignOutView.swift @@ -91,6 +91,13 @@ struct SignOutView: View { .padding(.top, 20) .padding(.horizontal, 26.7) + Text("※ 소셜 로그인 이용자는 비밀번호를 입력하지 말고 '탈퇴하기'를 클릭하면 자동 탈퇴됩니다.") + .font(.custom(Font.medium.rawValue, size: 12)) + .foregroundColor(.grayee) + .fixedSize(horizontal: false, vertical: true) + .padding(.horizontal, 26.7) + .padding(.top, 8) + Text("탈퇴하기") .font(.custom(Font.bold.rawValue, size: 15)) .foregroundColor(.white) diff --git a/SodaLive/Sources/Settings/SignOut/SignOutViewModel.swift b/SodaLive/Sources/Settings/SignOut/SignOutViewModel.swift index 20d585e..1ce6f5b 100644 --- a/SodaLive/Sources/Settings/SignOut/SignOutViewModel.swift +++ b/SodaLive/Sources/Settings/SignOut/SignOutViewModel.swift @@ -38,7 +38,7 @@ final class SignOutViewModel: ObservableObject { if validate() { isLoading = true let reason = reasonSelectedIndex == reasons.count - 1 ? self.reason : reasons[reasonSelectedIndex] - repository.signOut(reason: reason, password: password) + repository.signOut(reason: reason, password: password.trimmingCharacters(in: .whitespacesAndNewlines)) .sink { result in switch result { case .finished: @@ -83,12 +83,6 @@ final class SignOutViewModel: ObservableObject { return false } - if password.isEmpty { - errorMessage = "비밀번호를 입력해 주세요." - isShowPopup = true - return false - } - return true } }