diff --git a/app/src/main/assets/tangem-app-config b/app/src/main/assets/tangem-app-config index 8c1c53b739..b791bd4cf6 160000 --- a/app/src/main/assets/tangem-app-config +++ b/app/src/main/assets/tangem-app-config @@ -1 +1 @@ -Subproject commit 8c1c53b73950698d4acfa4d925b8c14bf6f0da63 +Subproject commit b791bd4cf6c5eca9778f89e87cd62b72d24f5ce9 diff --git a/app/src/main/java/com/tangem/tap/proxy/TxHistoryManagerImpl.kt b/app/src/main/java/com/tangem/tap/proxy/TxHistoryManagerImpl.kt index ff8b430a00..f09737e428 100644 --- a/app/src/main/java/com/tangem/tap/proxy/TxHistoryManagerImpl.kt +++ b/app/src/main/java/com/tangem/tap/proxy/TxHistoryManagerImpl.kt @@ -40,7 +40,7 @@ class TxHistoryManagerImpl( ) return when (itemsResult) { - is Result.Success -> itemsResult.data.map { historyItem -> historyItem.mapToProxy() } + is Result.Success -> itemsResult.data.items.map { historyItem -> historyItem.mapToProxy() } is Result.Failure -> error(itemsResult.error.message ?: itemsResult.error.customMessage) } } 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 b2d4da3602..8cd92e9d2f 100644 --- a/core/featuretoggles/src/main/assets/configs/feature_toggles_config.json +++ b/core/featuretoggles/src/main/assets/configs/feature_toggles_config.json @@ -9,7 +9,7 @@ }, { "name": "NEW_CARD_SCANNING_ENABLED", - "version": "4.10.0" + "version": "4.11.0" }, { "name": "REDESIGNED_WALLET_SCREEN_ENABLED", @@ -17,7 +17,7 @@ }, { "name": "1INCH_LEARN_2_EARN_ENABLED", - "version": "4.9.0" + "version": "undefined" }, { "name": "REDESIGNED_TOKEN_DETAIL_SCREEN_ENABLED", diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index edb6ad70d8..0ef1abab1c 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -80,9 +80,9 @@ okHttp-prettyLogging = "3.1.0" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "develop-297" +tangemBlockchainSdk = "release-app_4.10-305" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds -tangemCardSdk = "develop-280" +tangemCardSdk = "release-app_4.10-281" #tangemCardSdk = "0.0.1" # Keep it! - used for local builds # endregion Tangem