From b3b0f92ac147d5019c4da7e0b2c64fc811922584 Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 4 Aug 2023 18:05:52 +0300 Subject: [PATCH 1/7] Updated on 2026-08-14 --- app/src/main/assets/tangem-app-config | 2 +- .../main/java/com/tangem/tap/proxy/TxHistoryManagerImpl.kt | 2 +- .../src/main/assets/configs/feature_toggles_config.json | 4 ++-- gradle/dependencies.toml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) 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 From 2305013d2a3614311c1bb52314b960d5a7df1cfb Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 7 Aug 2023 13:59:25 +0300 Subject: [PATCH 2/7] Updated on 2026-08-14 --- .../opener/implementation/ZendeskChatOpener.kt | 7 +++++-- .../tap/common/feedback/FeedbackManager.kt | 16 ++++++++++++---- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/common/chat/opener/implementation/ZendeskChatOpener.kt b/app/src/main/java/com/tangem/tap/common/chat/opener/implementation/ZendeskChatOpener.kt index 1c6198806c..a65749ce62 100644 --- a/app/src/main/java/com/tangem/tap/common/chat/opener/implementation/ZendeskChatOpener.kt +++ b/app/src/main/java/com/tangem/tap/common/chat/opener/implementation/ZendeskChatOpener.kt @@ -22,6 +22,7 @@ internal class ZendeskChatOpener( ) : ChatOpener { private var isInitialized = false + private var isFilesSent = false override fun open(createFeedbackFile: (Context) -> File?, createLogsFile: (Context) -> File?) { foregroundActivityObserver.withForegroundActivity { activity -> @@ -49,18 +50,20 @@ internal class ZendeskChatOpener( } private fun sendFeedbackFile(feedbackFile: File?) { - if (isInitialized && feedbackFile != null) { + if (isInitialized && feedbackFile != null && !isFilesSent) { Chat.INSTANCE.providers()?.chatProvider()?.sendFile(feedbackFile) { _, bytesUploaded, _ -> Timber.d("Log file sent", "bytesUploaded: $bytesUploaded") } + isFilesSent = true } } private fun sendLogsFile(logsFile: File?) { - if (isInitialized && logsFile != null) { + if (isInitialized && logsFile != null && !isFilesSent) { Chat.INSTANCE.providers()?.chatProvider()?.sendFile(logsFile) { _, bytesUploaded, _ -> Timber.d("Log file sent", "bytesUploaded: $bytesUploaded") } + isFilesSent = true } } diff --git a/app/src/main/java/com/tangem/tap/common/feedback/FeedbackManager.kt b/app/src/main/java/com/tangem/tap/common/feedback/FeedbackManager.kt index c1e9ae43b1..83a14893d8 100644 --- a/app/src/main/java/com/tangem/tap/common/feedback/FeedbackManager.kt +++ b/app/src/main/java/com/tangem/tap/common/feedback/FeedbackManager.kt @@ -63,8 +63,12 @@ class FeedbackManager( fileWriter.write(feedback) fileWriter.close() - sessionFeedbackFile = file - sessionFeedbackFile + if (file.exists()) { + sessionFeedbackFile = file + sessionFeedbackFile + } else { + null + } } catch (ex: Exception) { Timber.e(ex, "Can't create the logs file") null @@ -86,8 +90,12 @@ class FeedbackManager( fileWriter.write(stringWriter.toString()) fileWriter.close() logCollector.clearLogs() - sessionLogsFile = file - sessionLogsFile + if (file.exists()) { + sessionLogsFile = file + sessionLogsFile + } else { + null + } } catch (ex: Exception) { Timber.e(ex, "Can't create the logs file") null From 7a14595757b4965c53d51e9cc4ef0fe30f264a20 Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 9 Aug 2023 18:59:00 +0300 Subject: [PATCH 3/7] Updated on 2026-08-14 --- .../java/com/tangem/data/card/sdk/DefaultCardSdkProvider.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/card/src/main/java/com/tangem/data/card/sdk/DefaultCardSdkProvider.kt b/data/card/src/main/java/com/tangem/data/card/sdk/DefaultCardSdkProvider.kt index dddff7e3da..a66fca3546 100644 --- a/data/card/src/main/java/com/tangem/data/card/sdk/DefaultCardSdkProvider.kt +++ b/data/card/src/main/java/com/tangem/data/card/sdk/DefaultCardSdkProvider.kt @@ -38,7 +38,7 @@ internal class DefaultCardSdkProvider @Inject constructor() : CardSdkProvider, C allowUntrustedCards = true, filter = CardFilter( allowedCardTypes = FirmwareVersion.FirmwareType.values().toList(), - maxFirmwareVersion = FirmwareVersion(major = 4, minor = 52), + maxFirmwareVersion = FirmwareVersion(major = 6, minor = 21), ), ) } From 6fd44c0d8898192f16126cb3aac008e4b0c5c309 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 10 Aug 2023 15:54:21 +0300 Subject: [PATCH 4/7] Updated on 2026-08-14 --- gradle/dependencies.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index 0ef1abab1c..8f9dc6f917 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -80,7 +80,7 @@ okHttp-prettyLogging = "3.1.0" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "release-app_4.10-305" +tangemBlockchainSdk = "release-app_4.10-310" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds tangemCardSdk = "release-app_4.10-281" #tangemCardSdk = "0.0.1" # Keep it! - used for local builds From 8e123e0b61a09c646f66090390e36bb5a47d523b Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 11 Aug 2023 12:33:04 +0400 Subject: [PATCH 5/7] Updated on 2026-08-14 --- .../data/WalletConnectRepositoryImpl.kt | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/domain/walletconnect2/data/WalletConnectRepositoryImpl.kt b/app/src/main/java/com/tangem/tap/domain/walletconnect2/data/WalletConnectRepositoryImpl.kt index 3304faa535..02e8105ee4 100644 --- a/app/src/main/java/com/tangem/tap/domain/walletconnect2/data/WalletConnectRepositoryImpl.kt +++ b/app/src/main/java/com/tangem/tap/domain/walletconnect2/data/WalletConnectRepositoryImpl.kt @@ -294,16 +294,19 @@ class WalletConnectRepositoryImpl @Inject constructor( override fun sendRequest(requestData: RequestData, result: String) { val session = currentSessions.find { it.topic == requestData.topic } - analyticsHandler.send( - WalletConnect.RequestHandled( - WalletConnect.RequestHandledParams( - dAppName = session?.name ?: "", - dAppUrl = session?.url ?: "", - methodName = requestData.method, - blockchain = requestData.blockchain, + // Add Ethereum Chain method is processed without user input, skip logging it + if (requestData.method != WcJrpcMethods.WALLET_ADD_ETHEREUM_CHAIN.code) { + analyticsHandler.send( + WalletConnect.RequestHandled( + WalletConnect.RequestHandledParams( + dAppName = session?.name ?: "", + dAppUrl = session?.url ?: "", + methodName = requestData.method, + blockchain = requestData.blockchain, + ), ), - ), - ) + ) + } Web3Wallet.respondSessionRequest( params = Wallet.Params.SessionRequestResponse( sessionTopic = requestData.topic, From 34ba72dbb7ca84edca8cd9061e9c2e67250fd5ba Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 11 Aug 2023 15:10:19 +0300 Subject: [PATCH 6/7] Updated on 2026-08-14 --- .../main/java/com/tangem/domain/common/extensions/Blockchain.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/domain/legacy/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt b/domain/legacy/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt index c54218c39a..98f7c584ec 100644 --- a/domain/legacy/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt +++ b/domain/legacy/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt @@ -224,4 +224,6 @@ private val excludedBlockchains = listOf( Blockchain.Ducatus, Blockchain.Telos, // disable in 4.9 Blockchain.TelosTestnet, // disable in 4.9 + Blockchain.OctaSpace, + Blockchain.OctaSpaceTestnet, ) \ No newline at end of file From 9352e4d73eaaebbeb07c200e2520b1ca44b2e010 Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 14 Aug 2023 22:59:40 +0300 Subject: [PATCH 7/7] Updated on 2026-08-14 --- gradle/dependencies.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index 8a2db82671..1058197b94 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -80,7 +80,7 @@ okHttp-prettyLogging = "3.1.0" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "develop-312" +tangemBlockchainSdk = "develop-314" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds tangemCardSdk = "develop-288" #tangemCardSdk = "0.0.1" # Keep it! - used for local builds