diff --git a/KkuMulKum/Source/MeetingInfo/View/MeetingInfoView.swift b/KkuMulKum/Source/MeetingInfo/View/MeetingInfoView.swift index e802e016..480ae715 100644 --- a/KkuMulKum/Source/MeetingInfo/View/MeetingInfoView.swift +++ b/KkuMulKum/Source/MeetingInfo/View/MeetingInfoView.swift @@ -74,7 +74,9 @@ final class MeetingInfoView: BaseView { $0.setText("남은 약속을 확인해보세요", style: .body01, color: .gray7) } - private let segmentedControl = UnderlineSegmentedControl(items: ["내가 속한 약속", "모든 약속"]) + private let segmentedControl = UnderlineSegmentedControl(items: ["내가 속한 약속", "모든 약속"]).then { + $0.selectedSegmentIndex = 0 + } private let emptyDescriptionView = UIView(backgroundColor: .white).then { $0.layer.cornerRadius = 8 diff --git a/KkuMulKum/Source/MeetingInfo/ViewModel/MeetingInfoViewModel.swift b/KkuMulKum/Source/MeetingInfo/ViewModel/MeetingInfoViewModel.swift index 2de15d98..75a5b942 100644 --- a/KkuMulKum/Source/MeetingInfo/ViewModel/MeetingInfoViewModel.swift +++ b/KkuMulKum/Source/MeetingInfo/ViewModel/MeetingInfoViewModel.swift @@ -15,13 +15,12 @@ final class MeetingInfoViewModel { var meetingName: String { infoRelay.value?.name ?? "" } var meetingInvitationCode: String? { infoRelay.value?.invitationCode } - var meetingPromises: [MeetingPromise] { meetingPromisesModelRelay.value?.promises ?? [] } private let service: MeetingInfoServiceProtocol private let infoRelay = BehaviorRelay(value: nil) private let meetingMemberModelRelay = BehaviorRelay(value: nil) private let meetingPromisesModelRelay = BehaviorRelay(value: nil) - private let partipatedPromisesModelRelay = BehaviorRelay(value: nil) + private let participatedPromisesModelRelay = BehaviorRelay(value: nil) init(meetingID: Int, service: MeetingInfoServiceProtocol) { self.meetingID = meetingID @@ -109,7 +108,7 @@ extension MeetingInfoViewModel: ViewModelType { return Observable.just([]) } - let source = index == 0 ? self.partipatedPromisesModelRelay : self.meetingPromisesModelRelay + let source = index == 0 ? self.participatedPromisesModelRelay : self.meetingPromisesModelRelay return source .compactMap { $0?.promises } .map { self.convertToMeetingInfoPromiseModels(from: $0) } @@ -135,7 +134,7 @@ extension MeetingInfoViewModel: ViewModelType { } .map { [weak self] selectedIndex, selectedItem in let promises = selectedIndex == 0 - ? self?.partipatedPromisesModelRelay.value?.promises + ? self?.participatedPromisesModelRelay.value?.promises : self?.meetingPromisesModelRelay.value?.promises return promises?[selectedItem].promiseID