Merge pull request #3428 from element-hq/feature/bma/removeWaitListScreen

Remove Wait list screen

Author: bmarty

features/login/impl/src/main/kotlin/io/element/android/features/login/impl/LoginFlowNode.kt

@@ -19,7 +19,6 @@ import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
 import com.bumble.appyx.navmodel.backstack.BackStack
-import com.bumble.appyx.navmodel.backstack.operation.newRoot
 import com.bumble.appyx.navmodel.backstack.operation.push
 import com.bumble.appyx.navmodel.backstack.operation.singleTop
 import dagger.assisted.Assisted
@@ -31,10 +30,8 @@ import io.element.android.features.login.impl.accountprovider.AccountProviderDat
 import io.element.android.features.login.impl.qrcode.QrCodeLoginFlowNode
 import io.element.android.features.login.impl.screens.changeaccountprovider.ChangeAccountProviderNode
 import io.element.android.features.login.impl.screens.confirmaccountprovider.ConfirmAccountProviderNode
-import io.element.android.features.login.impl.screens.loginpassword.LoginFormState
 import io.element.android.features.login.impl.screens.loginpassword.LoginPasswordNode
 import io.element.android.features.login.impl.screens.searchaccountprovider.SearchAccountProviderNode
-import io.element.android.features.login.impl.screens.waitlistscreen.WaitListNode
 import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
 import io.element.android.libraries.architecture.NodeInputs
@@ -112,9 +109,6 @@ class LoginFlowNode @AssistedInject constructor(
         @Parcelize
         data object LoginPassword : NavTarget
 
-        @Parcelize
-        data class WaitList(val loginFormState: LoginFormState) : NavTarget
-
         @Parcelize
         data class OidcView(val oidcDetails: OidcDetails) : NavTarget
     }
@@ -181,27 +175,11 @@ class LoginFlowNode @AssistedInject constructor(
                 createNode<SearchAccountProviderNode>(buildContext, plugins = listOf(callback))
             }
             NavTarget.LoginPassword -> {
-                val callback = object : LoginPasswordNode.Callback {
-                    override fun onWaitListError(loginFormState: LoginFormState) {
-                        backstack.newRoot(NavTarget.WaitList(loginFormState))
-                    }
-                }
-                createNode<LoginPasswordNode>(buildContext, plugins = listOf(callback))
+                createNode<LoginPasswordNode>(buildContext)
             }
             is NavTarget.OidcView -> {
                 oidcEntryPoint.createFallbackWebViewNode(this, buildContext, navTarget.oidcDetails.url)
             }
-            is NavTarget.WaitList -> {
-                val inputs = WaitListNode.Inputs(
-                    loginFormState = navTarget.loginFormState,
-                )
-                val callback = object : WaitListNode.Callback {
-                    override fun onCancelClick() {
-                        navigateUp()
-                    }
-                }
-                createNode<WaitListNode>(buildContext, plugins = listOf(callback, inputs))
-            }
         }
     }
 

features/login/impl/src/main/kotlin/io/element/android/features/login/impl/error/WaitListError.kt

@@ -12,7 +12,6 @@ import androidx.compose.ui.Modifier
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
-import com.bumble.appyx.core.plugin.plugins
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import io.element.android.anvilannotations.ContributesNode
@@ -24,22 +23,13 @@ class LoginPasswordNode @AssistedInject constructor(
     @Assisted plugins: List<Plugin>,
     private val presenter: LoginPasswordPresenter,
 ) : Node(buildContext, plugins = plugins) {
-    interface Callback : Plugin {
-        fun onWaitListError(loginFormState: LoginFormState)
-    }
-
-    private fun onWaitListError(loginFormState: LoginFormState) {
-        plugins<Callback>().forEach { it.onWaitListError(loginFormState) }
-    }
-
     @Composable
     override fun View(modifier: Modifier) {
         val state = presenter.present()
         LoginPasswordView(
             state = state,
             modifier = modifier,
             onBackClick = ::navigateUp,
-            onWaitListError = ::onWaitListError,
         )
     }
 }

features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordNode.kt

@@ -44,7 +44,6 @@ import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.features.login.impl.R
-import io.element.android.features.login.impl.error.isWaitListError
 import io.element.android.features.login.impl.error.loginError
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.designsystem.atomic.molecules.ButtonColumnMolecule
@@ -72,7 +71,6 @@ import io.element.android.libraries.ui.strings.CommonStrings
 fun LoginPasswordView(
     state: LoginPasswordState,
     onBackClick: () -> Unit,
-    onWaitListError: (LoginFormState) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val isLoading by remember(state.loginAction) {
@@ -149,16 +147,9 @@ fun LoginPasswordView(
             }
 
             if (state.loginAction is AsyncData.Failure) {
-                when {
-                    state.loginAction.error.isWaitListError() -> {
-                        onWaitListError(state.formState)
-                    }
-                    else -> {
-                        LoginErrorDialog(error = state.loginAction.error, onDismiss = {
-                            state.eventSink(LoginPasswordEvents.ClearError)
-                        })
-                    }
-                }
+                LoginErrorDialog(error = state.loginAction.error, onDismiss = {
+                    state.eventSink(LoginPasswordEvents.ClearError)
+                })
             }
         }
     }
@@ -302,6 +293,5 @@ internal fun LoginPasswordViewPreview(@PreviewParameter(LoginPasswordStateProvid
     LoginPasswordView(
         state = state,
         onBackClick = {},
-        onWaitListError = {},
     )
 }