GiftedHacker/tangem-app-android-audited
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Updated on 2026-08-14

Browse source
This commit is contained in:
Tangem 2026-01-18 17:39:48 +03:00
parent 2cfd260e31
commit 19bdc77d9f
4 changed files with 33 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
features/send-v2/api/src/main/java/com/tangem/features/send/v2/api/entity/FeeSelectorUM.kt
View file

@ -27,7 +27,10 @@ sealed class FeeSelectorUM {
override val isPrimaryButtonEnabled = false
}
data class Error(val error: GetFeeError) : FeeSelectorUM() {
data class Error(
val error: GetFeeError,
val isHidden: Boolean = false,
) : FeeSelectorUM() {
override val isPrimaryButtonEnabled = false
}

5
features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/model/FeeSelectorLogic.kt
View file

@ -75,9 +75,14 @@ internal class FeeSelectorLogic @AssistedInject constructor(
}
private fun loadFee() {
if (uiState.value is FeeSelectorUM.Error) {
return
}
if (uiState.value !is FeeSelectorUM.Content) {
uiState.update(FeeSelectorLoadingTransformer)
}
modelScope.launch {
callLoadFee()
.fold(

4
features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/ui/FeeSelectorBlockContent.kt
View file

@ -61,6 +61,10 @@ internal fun FeeSelectorBlockContent(
onReadMoreClick: () -> Unit,
modifier: Modifier = Modifier,
) {
if (state is FeeSelectorUM.Error && state.isHidden) {
return
}
Row(
modifier = modifier
.background(TangemTheme.colors.background.action)

22
features/swap/impl/src/main/java/com/tangem/feature/swap/model/SwapModel.kt
View file

@ -651,13 +651,13 @@ internal class SwapModel @Inject constructor(
modelScope.launch { feeSelectorReloadTrigger.triggerUpdate() }
}
} else {
feeSelectorRepository.state.value = FeeSelectorUM.Error(GetFeeError.UnknownError)
feeSelectorRepository.state.value = FeeSelectorUM.Error(GetFeeError.UnknownError, isHidden = true)
Timber.e("Accidentally empty quotes list")
}
},
onError = { error ->
Timber.e("Error when loading quotes: $error")
feeSelectorRepository.state.value = FeeSelectorUM.Error(GetFeeError.UnknownError)
feeSelectorRepository.state.value = FeeSelectorUM.Error(GetFeeError.UnknownError, isHidden = true)
uiState = stateBuilder.addNotification(uiState, null) { startLoadingQuotesFromLastState() }
},
)
@ -2016,6 +2016,10 @@ internal class SwapModel @Inject constructor(
return Either.Left(GetFeeError.UnknownError)
}
if (isPermissionNotificationShown()) {
return Either.Left(GetFeeError.UnknownError)
}
return swapInteractor.loadFeeForSwapTransaction(
fromToken = fromToken,
fromAccount = dataState.fromAccount,
@ -2029,6 +2033,11 @@ internal class SwapModel @Inject constructor(
}
override fun onResult(newState: FeeSelectorUM) {
if (isPermissionNotificationShown()) {
state.value = FeeSelectorUM.Error(GetFeeError.UnknownError, isHidden = true)
return
}
state.value = newState
// If fee currency is same as from currency, we need to reload quotes to update fee info
@ -2050,6 +2059,11 @@ internal class SwapModel @Inject constructor(
}
}
private fun isPermissionNotificationShown(): Boolean {
val permissionState = dataState.getCurrentLoadedSwapState()?.permissionState
return permissionState != null && permissionState !is PermissionDataState.Empty
}
override suspend fun loadFee(): Either<GetFeeError, TransactionFee> {
val sendCardData =
uiState.sendCardData as? SwapCardState.SwapCardData ?: return Either.Left(GetFeeError.UnknownError)
@ -2063,6 +2077,10 @@ internal class SwapModel @Inject constructor(
return Either.Left(GetFeeError.UnknownError)
}
if (isPermissionNotificationShown()) {
return Either.Left(GetFeeError.UnknownError)
}
return swapInteractor.loadFeeForSwapTransaction(
fromToken = fromToken,
fromAccount = dataState.fromAccount,