Updated on 2026-08-14

This commit is contained in:
Tangem 2022-06-01 12:23:54 +03:00
commit df1c81ae0c
7 changed files with 37 additions and 12 deletions

View file

@ -93,10 +93,10 @@ 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'
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"

@ -1 +1 @@
Subproject commit 7f058ec409b4eaaf8688ecd4bf944ef8d58d3564
Subproject commit 64ae04d2086e5a605dd4da3cba4af32a60d46c79

View file

@ -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<Currency>.filter(searchInput: String?): List<Currency> {
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
}

View file

@ -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)
}
}

View file

@ -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 {

View file

@ -59,10 +59,10 @@ 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'
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'

View file

@ -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(