mirror of
https://github.com/simplex-chat/simplex-chat.git
synced 2026-07-19 00:47:03 +00:00
fix validation
This commit is contained in:
+1
-2
@@ -39,7 +39,6 @@ import chat.simplex.common.views.onboarding.ReadableText
|
||||
import chat.simplex.common.views.usersettings.*
|
||||
import chat.simplex.res.MR
|
||||
import kotlinx.coroutines.launch
|
||||
import java.time.Clock
|
||||
|
||||
@Composable
|
||||
fun ModalData.NetworkAndServersView(close: () -> Unit) {
|
||||
@@ -816,7 +815,7 @@ fun updateOperatorsConditionsAcceptance(usvs: MutableState<List<UserOperatorServ
|
||||
usvs.value = modified
|
||||
}
|
||||
|
||||
suspend fun validateServers(
|
||||
suspend fun validateServers_(
|
||||
rhId: Long?,
|
||||
userServersToValidate: List<UserOperatorServers>,
|
||||
serverErrors: MutableState<List<UserServersError>>
|
||||
|
||||
-7
@@ -22,13 +22,6 @@ fun ModalData.NewServerView(
|
||||
val scope = rememberCoroutineScope()
|
||||
val newServer = remember { mutableStateOf(UserServer.empty) }
|
||||
|
||||
LaunchedEffect(userServers) {
|
||||
snapshotFlow { userServers.value }
|
||||
.collect { updatedServers ->
|
||||
validateServers(rhId = rhId, userServersToValidate = updatedServers, serverErrors = serverErrors)
|
||||
}
|
||||
}
|
||||
|
||||
ModalView(close = {
|
||||
addServer(
|
||||
scope,
|
||||
|
||||
+1
-2
@@ -6,7 +6,6 @@ import SectionDividerSpaced
|
||||
import SectionItemView
|
||||
import SectionTextFooter
|
||||
import SectionView
|
||||
import TextIconSpaced
|
||||
import androidx.compose.foundation.*
|
||||
import androidx.compose.foundation.layout.*
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
@@ -48,7 +47,7 @@ fun ModalData.OperatorView(
|
||||
LaunchedEffect(userServers) {
|
||||
snapshotFlow { userServers.value }
|
||||
.collect { updatedServers ->
|
||||
validateServers(rhId = rhId, userServersToValidate = updatedServers, serverErrors = serverErrors)
|
||||
validateServers_(rhId = rhId, userServersToValidate = updatedServers, serverErrors = serverErrors)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+7
@@ -37,6 +37,13 @@ fun ModalData.YourServersView(
|
||||
val currentUser = remember { chatModel.currentUser }.value
|
||||
val scope = rememberCoroutineScope()
|
||||
|
||||
LaunchedEffect(userServers) {
|
||||
snapshotFlow { userServers.value }
|
||||
.collect { updatedServers ->
|
||||
validateServers_(rhId = rhId, userServersToValidate = updatedServers, serverErrors = serverErrors)
|
||||
}
|
||||
}
|
||||
|
||||
Box {
|
||||
ColumnWithScrollBar {
|
||||
AppBarTitle(stringResource(MR.strings.your_servers))
|
||||
|
||||
Reference in New Issue
Block a user