Skip to content

Commit 945e594

Browse files
committed
Merge remote-tracking branch 'origin/develop' into feature/jaino/#205
2 parents 712e1b5 + a243cab commit 945e594

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

feature/message/src/main/kotlin/com/bff/wespot/message/screen/send/MessageEditScreen.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,8 @@ fun MessageEditScreen(
117117
topBar = {
118118
WSTopBar(
119119
title = "",
120-
canNavigateBack = true,
120+
// 예약된 쪽지인 경우, action 버튼과 중복되는 동작을 수행하여, 뒤로가기 버튼은 숨김 처리한다.
121+
canNavigateBack = state.isReservedMessage.not(),
121122
navigateUp = {
122123
navigator.navigateUp()
123124
},

feature/message/src/main/kotlin/com/bff/wespot/message/state/send/SendAction.kt

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ sealed class SendAction {
1010
data class OnMessageEditScreenEntered(val isReservedMessage: Boolean, val messageId: Int) : SendAction()
1111
data class OnEditButtonClicked(val messageId: Int) : SendAction()
1212
data object OnSendButtonClicked : SendAction()
13-
data object OnInviteFriendTextClicked : SendAction()
1413
data object OnReceiverScreenEntered : SendAction()
1514
data object OnWriteScreenEntered : SendAction()
1615
data object OnReservedMessageScreenEntered : SendAction()

feature/message/src/main/kotlin/com/bff/wespot/message/viewmodel/SendViewModel.kt

-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ class SendViewModel @Inject constructor(
6969
is SendAction.OnSendButtonClicked -> handleMessageSent()
7070
is SendAction.OnRandomNameToggled -> handleRandomNameToggled()
7171
is SendAction.OnEditButtonClicked -> handleEditButtonClicked(action.messageId)
72-
SendAction.OnInviteFriendTextClicked -> {}
7372
SendAction.OnReservedMessageScreenEntered, SendAction.OnMessageScreenEntered -> {
7473
clearSendUiState()
7574
}

0 commit comments

Comments
 (0)