Cleanup after rebase.
This commit is contained in:
parent
1ea9d41d27
commit
544b4b4389
1 changed files with 15 additions and 17 deletions
|
|
@ -228,9 +228,9 @@ private fun RoomListContent(
|
|||
// FAB height is 56dp, bottom padding is 16dp, we add 8dp as extra margin -> 56+16+8 = 80
|
||||
contentPadding = PaddingValues(bottom = 80.dp)
|
||||
) {
|
||||
if (state.displayEmptyState.not()) {
|
||||
when (state.securityBannerState) {
|
||||
SecurityBannerState.SessionVerification -> {
|
||||
when {
|
||||
state.displayEmptyState -> Unit
|
||||
state.securityBannerState == SecurityBannerState.SessionVerification -> {
|
||||
item {
|
||||
RequestVerificationHeader(
|
||||
onVerifyClicked = onVerifyClicked,
|
||||
|
|
@ -238,7 +238,7 @@ private fun RoomListContent(
|
|||
)
|
||||
}
|
||||
}
|
||||
SecurityBannerState.RecoveryKeyConfirmation -> {
|
||||
state.securityBannerState == SecurityBannerState.RecoveryKeyConfirmation -> {
|
||||
item {
|
||||
ConfirmRecoveryKeyBanner(
|
||||
onContinueClicked = onConfirmRecoveryKeyClicked,
|
||||
|
|
@ -246,8 +246,6 @@ private fun RoomListContent(
|
|||
)
|
||||
}
|
||||
}
|
||||
SecurityBannerState.None -> Unit
|
||||
}
|
||||
}
|
||||
|
||||
if (state.invitesState != InvitesState.NoInvites) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue