diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapScreenContent.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapScreenContent.kt index acad315b28..4059a1157d 100644 --- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapScreenContent.kt +++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapScreenContent.kt @@ -326,16 +326,8 @@ private fun SwapWarnings(warnings: List) { @Composable private fun MainButton(state: SwapStateHolder, onPermissionWarningClick: () -> Unit) { + // order is important when { - state.warnings.any { it is SwapWarning.PermissionNeeded } -> { - PrimaryButton( - modifier = Modifier.fillMaxWidth(), - text = stringResource(id = R.string.swapping_give_permission), - enabled = true, - showProgress = state.swapButton.loading, - onClick = onPermissionWarningClick, - ) - } state.warnings.any { it is SwapWarning.InsufficientFunds } -> { PrimaryButton( modifier = Modifier.fillMaxWidth(), @@ -345,6 +337,15 @@ private fun MainButton(state: SwapStateHolder, onPermissionWarningClick: () -> U onClick = state.swapButton.onClick, ) } + state.warnings.any { it is SwapWarning.PermissionNeeded } -> { + PrimaryButton( + modifier = Modifier.fillMaxWidth(), + text = stringResource(id = R.string.swapping_give_permission), + enabled = true, + showProgress = state.swapButton.loading, + onClick = onPermissionWarningClick, + ) + } else -> { PrimaryButtonIconEnd( modifier = Modifier.fillMaxWidth(),