From 24c33d952fdc8454196e08e8edd090a5dfb8d4b3 Mon Sep 17 00:00:00 2001 From: "pikagreen@nate.com" Date: Sun, 8 Sep 2024 01:13:10 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E2=9C=A8=20::=20[#1293]=20=EC=A4=91?= =?UTF-8?q?=EB=B3=B5=EB=8B=89=EB=84=A4=EC=9E=84=20=EC=97=90=EB=9F=AC=20?= =?UTF-8?q?=EC=BA=90=EC=B9=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Domains/UserDomain/Sources/API/UserAPI.swift | 2 ++ .../MultiPurposePopupViewController.swift | 3 +-- .../Sources/Reactors/MyInfoReactor.swift | 12 ++++++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Projects/Domains/UserDomain/Sources/API/UserAPI.swift b/Projects/Domains/UserDomain/Sources/API/UserAPI.swift index 3b88ee49d..90f56a558 100644 --- a/Projects/Domains/UserDomain/Sources/API/UserAPI.swift +++ b/Projects/Domains/UserDomain/Sources/API/UserAPI.swift @@ -141,7 +141,9 @@ extension UserAPI: WMAPI { return [ 400: .badRequest, 401: .tokenExpired, + 403: .forbidden, 404: .notFound, + 409: .conflict, 429: .tooManyRequest, 500: .internalServerError ] diff --git a/Projects/Features/BaseFeature/Sources/ViewControllers/MultiPurposePopupViewController.swift b/Projects/Features/BaseFeature/Sources/ViewControllers/MultiPurposePopupViewController.swift index 7e2740ebd..704619da2 100644 --- a/Projects/Features/BaseFeature/Sources/ViewControllers/MultiPurposePopupViewController.swift +++ b/Projects/Features/BaseFeature/Sources/ViewControllers/MultiPurposePopupViewController.swift @@ -117,8 +117,6 @@ private extension MultiPurposePopupViewController { private extension MultiPurposePopupViewController { func configureUI() { - limitLabel.text = "/\(viewModel.type.textLimitCount)" - titleLabel.text = viewModel.type.title titleLabel.font = DesignSystemFontFamily.Pretendard.medium.font(size: 18) titleLabel.textColor = DesignSystemAsset.BlueGrayColor.gray900.color @@ -155,6 +153,7 @@ private extension MultiPurposePopupViewController { confirmLabel.font = DesignSystemFontFamily.Pretendard.light.font(size: 12) confirmLabel.isHidden = true + limitLabel.text = "/\(viewModel.type.textLimitCount)자" limitLabel.font = DesignSystemFontFamily.Pretendard.light.font(size: 12) limitLabel.textColor = DesignSystemAsset.BlueGrayColor.gray500.color diff --git a/Projects/Features/MyInfoFeature/Sources/Reactors/MyInfoReactor.swift b/Projects/Features/MyInfoFeature/Sources/Reactors/MyInfoReactor.swift index f7ffbbc91..6db4d725d 100644 --- a/Projects/Features/MyInfoFeature/Sources/Reactors/MyInfoReactor.swift +++ b/Projects/Features/MyInfoFeature/Sources/Reactors/MyInfoReactor.swift @@ -295,10 +295,14 @@ private extension MyInfoReactor { ) .catch { error in let error = error.asWMError - return .concat( - .just(.showToast(error.errorDescription ?? LocalizationStrings.unknownErrorWarning)), - .just(.dismissEditSheet) - ) + if error == .conflict { + return .just(.showToast("키워드 혹은 중복된 닉네임은 사용할 수 없습니다.")) + } else { + return .concat( + .just(.showToast(error.errorDescription ?? LocalizationStrings.unknownErrorWarning)), + .just(.dismissEditSheet) + ) + } } } From c3d7d5b0305d99fd0414fc503fc0bee62dbe933e Mon Sep 17 00:00:00 2001 From: KTH Date: Sun, 8 Sep 2024 03:02:03 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E2=9C=A8=20::=20[#1293]=20=EB=AC=B8?= =?UTF-8?q?=EA=B5=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Features/MyInfoFeature/Sources/Reactors/MyInfoReactor.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Projects/Features/MyInfoFeature/Sources/Reactors/MyInfoReactor.swift b/Projects/Features/MyInfoFeature/Sources/Reactors/MyInfoReactor.swift index 6db4d725d..06f465b98 100644 --- a/Projects/Features/MyInfoFeature/Sources/Reactors/MyInfoReactor.swift +++ b/Projects/Features/MyInfoFeature/Sources/Reactors/MyInfoReactor.swift @@ -296,7 +296,7 @@ private extension MyInfoReactor { .catch { error in let error = error.asWMError if error == .conflict { - return .just(.showToast("키워드 혹은 중복된 닉네임은 사용할 수 없습니다.")) + return .just(.showToast("키워드 또는 중복된 닉네임은 사용할 수 없습니다.")) } else { return .concat( .just(.showToast(error.errorDescription ?? LocalizationStrings.unknownErrorWarning)),