Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Verification: always render the back button.

Browse source
This commit is contained in:
Benoit Marty 2026-01-08 16:19:46 +01:00
parent 070c80bd51
commit 1dfe26e67a
2 changed files with 13 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationView.kt
View file

@ -70,11 +70,7 @@ fun IncomingVerificationView(
TopAppBar( TopAppBar(
title = {}, title = {},
navigationIcon = { navigationIcon = {
when { BackButton(onClick = { state.eventSink(IncomingVerificationViewEvents.GoBack) })
step is Step.Initial && !step.isWaiting -> Unit
step is Step.Completed -> Unit
else -> BackButton(onClick = { state.eventSink(IncomingVerificationViewEvents.GoBack) })
}
}, },
colors = topAppBarColors(containerColor = Color.Transparent), colors = topAppBarColors(containerColor = Color.Transparent),
) )

6
features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationView.kt
View file

@ -94,10 +94,8 @@ fun OutgoingVerificationView(
topBar = { topBar = {
TopAppBar( TopAppBar(
title = {}, title = {},
navigationIcon = if (step != Step.Completed) { navigationIcon = {
{ BackButton(onClick = ::cancelOrResetFlow) } BackButton(onClick = ::cancelOrResetFlow)
} else {
{}
}, },
colors = topAppBarColors(containerColor = Color.Transparent) colors = topAppBarColors(containerColor = Color.Transparent)
) )