From a2fb7e2ce12d625128fcc494cdf023e249a431d7 Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 31 May 2022 17:58:50 +0400 Subject: [PATCH 1/4] Updated on 2026-08-14 --- .../tap/domain/tokens/LoadAvailableCoinsService.kt | 11 ++++++++++- .../tap/features/tokens/ui/AddTokensFragment.kt | 8 +++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/domain/tokens/LoadAvailableCoinsService.kt b/app/src/main/java/com/tangem/tap/domain/tokens/LoadAvailableCoinsService.kt index b195457e4f..a0be7dc18a 100644 --- a/app/src/main/java/com/tangem/tap/domain/tokens/LoadAvailableCoinsService.kt +++ b/app/src/main/java/com/tangem/tap/domain/tokens/LoadAvailableCoinsService.kt @@ -21,7 +21,7 @@ class LoadAvailableCoinsService( if (isTestNet) { return Result.Success( LoadedCoins( - currencies = currenciesRepository.getTestnetCoins(), + currencies = currenciesRepository.getTestnetCoins().filter(searchInput), moreAvailable = false, ) ) @@ -59,6 +59,15 @@ class LoadAvailableCoinsService( ) } + private fun List.filter(searchInput: String?): List { + if (searchInput.isNullOrBlank()) return this + + return filter{ + it.symbol.contains(searchInput, ignoreCase = true) || + it.name.contains(searchInput, ignoreCase = true) + } + } + companion object { const val LOAD_PER_PAGE = 100 } diff --git a/app/src/main/java/com/tangem/tap/features/tokens/ui/AddTokensFragment.kt b/app/src/main/java/com/tangem/tap/features/tokens/ui/AddTokensFragment.kt index fae99d7af4..deeabe4c9e 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/ui/AddTokensFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/ui/AddTokensFragment.kt @@ -84,7 +84,13 @@ class AddTokensFragment : Fragment(R.layout.fragment_add_tokens), } val onLoadMore = { - store.dispatch(TokensAction.LoadCurrencies(scanResponse = store.state.globalState.scanResponse)) + if (store.state.tokensState.needToLoadMore) { + store.dispatch( + TokensAction.LoadCurrencies( + scanResponse = store.state.globalState.scanResponse + ) + ) + } } cvCurrencies.setContent { From 68e9dbd071f969903f3c08db8046fc25c38d2aef Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 31 May 2022 22:39:00 +0300 Subject: [PATCH 2/4] Updated on 2026-08-14 --- app/build.gradle | 2 +- app/src/main/assets/tangem-app-config | 2 +- domain/build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3e16223f89..3b143c4890 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -93,7 +93,7 @@ dependencies { implementation 'com.google.android.play:core-ktx:1.8.1' coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' - implementation 'com.tangem:blockchain:develop-85' + implementation 'com.tangem:blockchain:develop-86' // implementation 'com.tangem:blockchain:0.0.1' implementation 'com.tangem.tangem-sdk-kotlin:core:develop-142' implementation 'com.tangem.tangem-sdk-kotlin:android:develop-142' diff --git a/app/src/main/assets/tangem-app-config b/app/src/main/assets/tangem-app-config index 7f058ec409..64ae04d208 160000 --- a/app/src/main/assets/tangem-app-config +++ b/app/src/main/assets/tangem-app-config @@ -1 +1 @@ -Subproject commit 7f058ec409b4eaaf8688ecd4bf944ef8d58d3564 +Subproject commit 64ae04d2086e5a605dd4da3cba4af32a60d46c79 diff --git a/domain/build.gradle b/domain/build.gradle index ea723c1e44..accc5daa5d 100644 --- a/domain/build.gradle +++ b/domain/build.gradle @@ -59,7 +59,7 @@ dependencies { implementation implementation(project(path: ':network')) implementation implementation(project(path: ':common')) - implementation 'com.tangem:blockchain:develop-85' + implementation 'com.tangem:blockchain:develop-86' // implementation 'com.tangem:blockchain:0.0.1' implementation 'com.tangem.tangem-sdk-kotlin:core:develop-142' implementation 'com.tangem.tangem-sdk-kotlin:android:develop-142' From 0f50e65aafb7d820b13af1c95135d299a0c0d4f9 Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 1 Jun 2022 10:18:20 +0300 Subject: [PATCH 3/4] Updated on 2026-08-14 --- app/build.gradle | 4 ++-- app/src/main/assets/tangem-app-config | 2 +- .../tap/domain/twins/WriteProtectedIssuerDataTask.kt | 12 +++++++++--- domain/build.gradle | 4 ++-- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3e16223f89..983517a922 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -95,8 +95,8 @@ dependencies { implementation 'com.tangem:blockchain:develop-85' // implementation 'com.tangem:blockchain:0.0.1' - implementation 'com.tangem.tangem-sdk-kotlin:core:develop-142' - implementation 'com.tangem.tangem-sdk-kotlin:android:develop-142' + implementation 'com.tangem.tangem-sdk-kotlin:core:develop-154' + implementation 'com.tangem.tangem-sdk-kotlin:android:develop-154' // WebView implementation "androidx.browser:browser:1.3.0" diff --git a/app/src/main/assets/tangem-app-config b/app/src/main/assets/tangem-app-config index 7f058ec409..64ae04d208 160000 --- a/app/src/main/assets/tangem-app-config +++ b/app/src/main/assets/tangem-app-config @@ -1 +1 @@ -Subproject commit 7f058ec409b4eaaf8688ecd4bf944ef8d58d3564 +Subproject commit 64ae04d2086e5a605dd4da3cba4af32a60d46c79 diff --git a/app/src/main/java/com/tangem/tap/domain/twins/WriteProtectedIssuerDataTask.kt b/app/src/main/java/com/tangem/tap/domain/twins/WriteProtectedIssuerDataTask.kt index 37f9715e19..e4ae0109bd 100644 --- a/app/src/main/java/com/tangem/tap/domain/twins/WriteProtectedIssuerDataTask.kt +++ b/app/src/main/java/com/tangem/tap/domain/twins/WriteProtectedIssuerDataTask.kt @@ -63,11 +63,17 @@ class WriteProtectedIssuerDataTask( val counter = (readResponse.issuerDataCounter ?: 0) + 1 val data = twinPublicKey + cardSignature val signedByIssuer = FileHashHelper.prepareHashes( - cardId, data, counter, issuerKeys.privateKey + cardId = cardId, + fileData = data, + fileCounter = counter, + fileName = null, + privateKey = issuerKeys.privateKey, ) WriteIssuerDataCommand( - data, signedByIssuer.finalizingSignature!!, - counter, issuerKeys.publicKey + issuerData = data, + issuerDataSignature = signedByIssuer.finalizingSignature!!, + issuerDataCounter = counter, + issuerPublicKey = issuerKeys.publicKey, ).run(session, callback) } } \ No newline at end of file diff --git a/domain/build.gradle b/domain/build.gradle index ea723c1e44..23c33965c7 100644 --- a/domain/build.gradle +++ b/domain/build.gradle @@ -61,8 +61,8 @@ dependencies { implementation 'com.tangem:blockchain:develop-85' // implementation 'com.tangem:blockchain:0.0.1' - implementation 'com.tangem.tangem-sdk-kotlin:core:develop-142' - implementation 'com.tangem.tangem-sdk-kotlin:android:develop-142' + implementation 'com.tangem.tangem-sdk-kotlin:core:develop-154' + implementation 'com.tangem.tangem-sdk-kotlin:android:develop-154' // Kotlin coroutines implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2' From db300ced60c0e39451b4e9bb05a5984ac2f0a90b Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 1 Jun 2022 10:39:30 +0300 Subject: [PATCH 4/4] Updated on 2026-08-14 --- .../src/main/java/com/tangem/domain/common/TapWorkarounds.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/domain/src/main/java/com/tangem/domain/common/TapWorkarounds.kt b/domain/src/main/java/com/tangem/domain/common/TapWorkarounds.kt index a5ce7922c8..644cc7525e 100644 --- a/domain/src/main/java/com/tangem/domain/common/TapWorkarounds.kt +++ b/domain/src/main/java/com/tangem/domain/common/TapWorkarounds.kt @@ -75,6 +75,10 @@ object TapWorkarounds { "AB06" to Blockchain.XRP, "AB07" to Blockchain.Bitcoin, "AB08" to Blockchain.Ethereum, + "AB09" to Blockchain.Bitcoin, // new batches for 3.34 + "AB10" to Blockchain.Ethereum, + "AB11" to Blockchain.Bitcoin, + "AB12" to Blockchain.Ethereum, ) private val tangemWalletBatchesWithStandardDerivationType = listOf(