diff --git a/app/libs/rekotlin-1.0.4.jar b/app/libs/rekotlin-1.0.4.jar new file mode 100644 index 0000000000..3221e554be Binary files /dev/null and b/app/libs/rekotlin-1.0.4.jar differ diff --git a/app/libs/ripple-core-0.0.1.jar b/app/libs/ripple-core-0.0.1.jar deleted file mode 100644 index 617db52b2d..0000000000 Binary files a/app/libs/ripple-core-0.0.1.jar and /dev/null differ diff --git a/app/libs/walletconnect-1.5.6.aar b/app/libs/walletconnect-1.5.6.aar deleted file mode 100644 index 30c576fb89..0000000000 Binary files a/app/libs/walletconnect-1.5.6.aar and /dev/null differ diff --git a/core/featuretoggles/src/main/assets/configs/feature_toggles_config.json b/core/featuretoggles/src/main/assets/configs/feature_toggles_config.json index c3f822ed71..f13343fc36 100644 --- a/core/featuretoggles/src/main/assets/configs/feature_toggles_config.json +++ b/core/featuretoggles/src/main/assets/configs/feature_toggles_config.json @@ -5,7 +5,7 @@ }, { "name": "LOCAL_USER_LOGS_ENABLED", - "version": "5.13.0" + "version": "undefined" }, { "name": "GENERATE_XPUB_ENABLED", diff --git a/features/details/impl/build.gradle.kts b/features/details/impl/build.gradle.kts index 82ca657a96..865ab65f7b 100644 --- a/features/details/impl/build.gradle.kts +++ b/features/details/impl/build.gradle.kts @@ -66,5 +66,6 @@ dependencies { /* Other */ implementation(deps.kotlin.immutable.collections) + implementation(deps.reKotlin) implementation(deps.timber) } \ No newline at end of file diff --git a/features/details/impl/src/main/kotlin/com/tangem/features/details/model/DetailsModel.kt b/features/details/impl/src/main/kotlin/com/tangem/features/details/model/DetailsModel.kt index 8bd54c48e9..fd592c79b8 100644 --- a/features/details/impl/src/main/kotlin/com/tangem/features/details/model/DetailsModel.kt +++ b/features/details/impl/src/main/kotlin/com/tangem/features/details/model/DetailsModel.kt @@ -5,9 +5,8 @@ import com.tangem.core.decompose.di.ComponentScoped import com.tangem.core.decompose.model.Model import com.tangem.core.decompose.model.ParamsContainer import com.tangem.core.decompose.navigation.Router -import com.tangem.domain.feedback.FeedbackManager -import com.tangem.domain.feedback.GetCardInfoUseCase -import com.tangem.domain.feedback.models.FeedbackEmailType +import com.tangem.domain.redux.LegacyAction +import com.tangem.domain.redux.ReduxStateHolder import com.tangem.domain.walletconnect.CheckIsWalletConnectAvailableUseCase import com.tangem.domain.wallets.usecase.GetSelectedWalletSyncUseCase import com.tangem.features.details.component.DetailsComponent @@ -31,15 +30,14 @@ import javax.inject.Inject @ComponentScoped @Suppress("LongParameterList") internal class DetailsModel @Inject constructor( - private val socialsBuilder: SocialsBuilder, + socialsBuilder: SocialsBuilder, private val itemsBuilder: ItemsBuilder, private val appVersionProvider: AppVersionProvider, private val checkIsWalletConnectAvailableUseCase: CheckIsWalletConnectAvailableUseCase, private val router: Router, - private val paramsContainer: ParamsContainer, + paramsContainer: ParamsContainer, private val getSelectedWalletSyncUseCase: GetSelectedWalletSyncUseCase, - private val getCardInfoUseCase: GetCardInfoUseCase, - private val feedbackManager: FeedbackManager, + private val appStateHolder: ReduxStateHolder, override val dispatchers: CoroutineDispatcherProvider, ) : Model() { @@ -84,18 +82,13 @@ internal class DetailsModel @Inject constructor( val scanResponse = getSelectedWalletSyncUseCase().getOrNull()?.scanResponse ?: error("Selected wallet is null") - val cardInfo = getCardInfoUseCase(scanResponse = scanResponse).getOrNull() - ?: error("CardInfo must be not null") - - feedbackManager.sendEmail(type = FeedbackEmailType.DirectUserRequest(cardInfo)) + appStateHolder.dispatch(LegacyAction.SendEmailSupport(scanResponse)) } } - private suspend fun updateState(items: ImmutableList) { + private fun updateState(items: ImmutableList) { state.update { prevState -> - prevState.copy( - items = items, - ) + prevState.copy(items = items) } } diff --git a/settings.gradle.kts b/settings.gradle.kts index 4af0388ca6..740ce7ce0c 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -24,6 +24,9 @@ dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { + flatDir { + dirs("app/libs") + } google { content { includeGroupAndSubgroups("androidx") @@ -92,11 +95,6 @@ dependencyResolutionManagement { includeGroupAndSubgroups("com.tangem.vico") } } - jcenter { // unable to replace with mavenCentral() due to rekotlin - content { - includeModule("org.rekotlin", "rekotlin") - } - } maven("https://jitpack.io") maven("https://clients-nexus.sprinklr.com/") }