diff --git a/app/src/main/java/com/tangem/tap/common/compose/ComposeDialogManager.kt b/app/src/main/java/com/tangem/tap/common/compose/ComposeDialogManager.kt index aa0e7e71d0..d498d577f8 100644 --- a/app/src/main/java/com/tangem/tap/common/compose/ComposeDialogManager.kt +++ b/app/src/main/java/com/tangem/tap/common/compose/ComposeDialogManager.kt @@ -17,7 +17,6 @@ import androidx.compose.ui.unit.sp import androidx.compose.ui.window.Dialog import androidx.compose.ui.window.DialogProperties import com.tangem.domain.DomainDialog -import com.tangem.domain.DomainStateDialog import com.tangem.domain.redux.domainStore import com.tangem.domain.redux.global.DomainGlobalAction import com.tangem.domain.redux.global.DomainGlobalState @@ -28,7 +27,7 @@ import org.rekotlin.StoreSubscriber @Composable fun ComposeDialogManager() { - val dialogSate = remember { mutableStateOf(null) } + val dialogSate = remember { mutableStateOf(null) } val subscriber = remember { object : StoreSubscriber { override fun newState(state: DomainGlobalState) { @@ -52,7 +51,7 @@ fun ComposeDialogManager() { } @Composable -private fun ShowTheDialog(dialogState: MutableState) { +private fun ShowTheDialog(dialogState: MutableState) { if (dialogState.value == null) return val context = LocalContext.current diff --git a/domain/src/main/java/com/tangem/domain/DomainStateDialog.kt b/domain/src/main/java/com/tangem/domain/DomainDialog.kt similarity index 82% rename from domain/src/main/java/com/tangem/domain/DomainStateDialog.kt rename to domain/src/main/java/com/tangem/domain/DomainDialog.kt index a3c7aa9da2..e95abd7626 100644 --- a/domain/src/main/java/com/tangem/domain/DomainStateDialog.kt +++ b/domain/src/main/java/com/tangem/domain/DomainDialog.kt @@ -6,16 +6,14 @@ import com.tangem.network.api.tangemTech.Coins /** [REDACTED_AUTHOR] */ -interface DomainStateDialog +sealed interface DomainDialog { -sealed class DomainDialog : DomainStateDialog { - - data class DialogError(val error: DomainError) : DomainDialog() + data class DialogError(val error: DomainError) : DomainDialog data class SelectTokenDialog( val items: List, val networkIdConverter: (String) -> String, val onSelect: (Coins.CheckAddressResponse.Token.Contract) -> Unit, val onClose: VoidCallback = {} - ) : DomainDialog() + ) : DomainDialog } \ No newline at end of file diff --git a/domain/src/main/java/com/tangem/domain/redux/global/DomainGlobalAction.kt b/domain/src/main/java/com/tangem/domain/redux/global/DomainGlobalAction.kt index 1ce8b77035..a01a16315a 100644 --- a/domain/src/main/java/com/tangem/domain/redux/global/DomainGlobalAction.kt +++ b/domain/src/main/java/com/tangem/domain/redux/global/DomainGlobalAction.kt @@ -1,6 +1,6 @@ package com.tangem.domain.redux.global -import com.tangem.domain.DomainStateDialog +import com.tangem.domain.DomainDialog import com.tangem.domain.common.ScanResponse import org.rekotlin.Action @@ -10,5 +10,5 @@ import org.rekotlin.Action //TODO: refactoring: is alias for the GlobalAction sealed class DomainGlobalAction : Action { data class SetScanResponse(val scanResponse: ScanResponse?) : DomainGlobalAction() - data class ShowDialog(val stateDialog: DomainStateDialog?) : DomainGlobalAction() + data class ShowDialog(val stateDialog: DomainDialog?) : DomainGlobalAction() } \ No newline at end of file diff --git a/domain/src/main/java/com/tangem/domain/redux/global/DomainGlobalState.kt b/domain/src/main/java/com/tangem/domain/redux/global/DomainGlobalState.kt index b629778ccc..9bf5d7c15e 100644 --- a/domain/src/main/java/com/tangem/domain/redux/global/DomainGlobalState.kt +++ b/domain/src/main/java/com/tangem/domain/redux/global/DomainGlobalState.kt @@ -1,6 +1,6 @@ package com.tangem.domain.redux.global -import com.tangem.domain.DomainStateDialog +import com.tangem.domain.DomainDialog import com.tangem.domain.common.ScanResponse /** @@ -9,5 +9,5 @@ import com.tangem.domain.common.ScanResponse //TODO: refactoring: is alias for the GlobalState data class DomainGlobalState( val scanResponse: ScanResponse? = null, - val dialog: DomainStateDialog? = null, + val dialog: DomainDialog? = null, )