✨[feat]: 이름 변경 로직 수정

DDD-Community · Nov 22, 2023 · 7c6923b · 7c6923b
1 parent 704d392
commit 7c6923b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/...Pong/Projects/Feature/Profile/Sources/UI/View/ChangeNickNameView/ChangeNickNameView.swift b/...Pong/Projects/Feature/Profile/Sources/UI/View/ChangeNickNameView/ChangeNickNameView.swift
@@ -38,15 +38,11 @@ struct ChangeNickNameView: View {
 
             changeNicknameTextField()
 
-
             Spacer()
 
             changeNickNameButton()
 
         }
-        .task {
-            viewModel.changeNickName = ""
-        }
 
 
 
@@ -64,11 +60,19 @@ struct ChangeNickNameView: View {
                             .foregroundColor(Color.black)
                             .padding(EdgeInsets(top: 0, leading: 12, bottom: 0, trailing: 34))
                             .preferredColorScheme(.light)
+                            .onAppear{
+                                viewModel.changeNickName = authViewModel.signupModel?.data?.nickname ?? ""
+                            }
+
                             .onChange(of: viewModel.changeNickName, perform: { newValue in
+                                if viewModel.changeNickName != authViewModel.signupModel?.data?.nickname {
+//                                    viewModel.changeNickName = newValue
+                                    authViewModel.userNickNameValidateRequest(nickname: newValue)
+                                    let nicknamdValidaion = viewModel.validateNickname(nickname: newValue)
+                                    viewModel.allValidateNikname(nicknameValidate: nicknamdValidaion, duplicateValidate: authViewModel.nickNameInvalid)
+                                }
                                 viewModel.changeNickName = newValue
-                                authViewModel.userNickNameValidateRequest(nickname: newValue)
-                                let nicknamdValidaion = viewModel.validateNickname(nickname: newValue)
-                                viewModel.allValidateNikname(nicknameValidate: nicknamdValidaion, duplicateValidate: authViewModel.nickNameInvalid)
+
 
                             })
 

diff --git a/PingPong/Projects/Feature/Profile/Sources/UI/View/OtherSetting/OtherSettingView.swift b/PingPong/Projects/Feature/Profile/Sources/UI/View/OtherSetting/OtherSettingView.swift
@@ -103,7 +103,7 @@ public struct OtherSettingView: View {
             .overlay {
                 VStack {
                     ForEach(OhterSettingItem.allCases, id: \.self){ item in
-                        listItemView(showArrow: item != .appVersion ? true : false, showLine: item == .privacyPolicy || item == .withDraw ? true : false , text: item.description, versionText: item == .appVersion ? "v.\(profileViewModel.appVersion )": "") {
+                        listItemView(showArrow: item != .appVersion ? true : false, showLine: item == .privacyPolicy || item == .withDraw  || item == .termsOfService ? true : false , text: item.description, versionText: item == .appVersion ? "v.\(profileViewModel.appVersion )": "") {
                             switch item  {
 
                             case .privacyPolicy: