From 8a408774b89520032c7a9f77a9a4d20f19b64e27 Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 21 Oct 2020 17:05:02 +0300 Subject: [PATCH] Updated on 2026-08-14 --- app/src/main/ic_launcher-playstore.png | Bin 13028 -> 12979 bytes .../com/tangem/tap/domain/PayIdManager.kt | 1 + .../com/tangem/tap/domain/TapWalletManager.kt | 10 +++++++--- .../com/tangem/tap/domain/TapWorkarounds.kt | 17 +++++++++++++++++ .../tap/features/wallet/redux/WalletAction.kt | 2 ++ .../features/wallet/redux/WalletReducer.kt | 3 +++ dependencies.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 8 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 app/src/main/java/com/tangem/tap/domain/TapWorkarounds.kt diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png index 4c55d07eb370f80fd96871f09565bbab0f90a8c5..8e9c7d91623d273969e1afc1e497b720d8a022a3 100644 GIT binary patch literal 12979 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 literal 13028 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 diff --git a/app/src/main/java/com/tangem/tap/domain/PayIdManager.kt b/app/src/main/java/com/tangem/tap/domain/PayIdManager.kt index 591473e9cb..3773bd41b7 100644 --- a/app/src/main/java/com/tangem/tap/domain/PayIdManager.kt +++ b/app/src/main/java/com/tangem/tap/domain/PayIdManager.kt @@ -73,6 +73,7 @@ class PayIdManager { Blockchain.BitcoinCash, Blockchain.Binance, Blockchain.RSK, + Blockchain.Tezos ) fun isPayId(value: String?): Boolean = value?.contains(payIdRegExp) ?: false diff --git a/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt b/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt index c6e77e8a9f..cea0ea99b2 100644 --- a/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt +++ b/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt @@ -12,7 +12,6 @@ import com.tangem.tap.common.redux.global.GlobalAction import com.tangem.tap.domain.extensions.amountToCreateAccount import com.tangem.tap.domain.extensions.isNoAccountError import com.tangem.tap.domain.tasks.ScanNoteResponse -import com.tangem.tap.features.wallet.redux.PayIdState import com.tangem.tap.features.wallet.redux.WalletAction import com.tangem.tap.network.NetworkConnectivity import com.tangem.tap.network.coinmarketcap.CoinMarketCapService @@ -25,6 +24,7 @@ import java.math.BigDecimal class TapWalletManager { private val payIdManager = PayIdManager() private val coinMarketCapService = CoinMarketCapService() + private var tapWorkarounds: TapWorkarounds? = null suspend fun loadWalletData() { val walletManager = store.state.globalState.scanNoteResponse?.walletManager @@ -78,6 +78,7 @@ class TapWalletManager { } suspend fun onCardScanned(data: ScanNoteResponse) { + tapWorkarounds = TapWorkarounds(data.card) withContext(Dispatchers.Main) { store.dispatch(WalletAction.ResetState) store.dispatch(GlobalAction.SaveScanNoteResponse(data)) @@ -142,7 +143,6 @@ class TapWalletManager { private suspend fun loadPayIdIfNeeded(): Result? { val scanNoteResponse = store.state.globalState.scanNoteResponse if (!TapConfig.usePayId || - store.state.walletState.payIdData.payIdState == PayIdState.Disabled || scanNoteResponse?.walletManager?.wallet?.blockchain?.isPayIdSupported() == false) { return null } @@ -160,7 +160,11 @@ class TapWalletManager { is Result.Success -> { val payId = result.data if (payId == null) { - store.dispatch(WalletAction.LoadPayId.NotCreated) + if (tapWorkarounds?.isPayIdCreationEnabled() == false) { + store.dispatch(WalletAction.DisablePayId) + } else { + store.dispatch(WalletAction.LoadPayId.NotCreated) + } } else { store.dispatch(WalletAction.LoadPayId.Success(payId)) } diff --git a/app/src/main/java/com/tangem/tap/domain/TapWorkarounds.kt b/app/src/main/java/com/tangem/tap/domain/TapWorkarounds.kt new file mode 100644 index 0000000000..7764650537 --- /dev/null +++ b/app/src/main/java/com/tangem/tap/domain/TapWorkarounds.kt @@ -0,0 +1,17 @@ +package com.tangem.tap.domain + +import com.tangem.commands.Card + +class TapWorkarounds(val card: Card) { + + private val isStart2Coin: Boolean = card.cardData?.issuerName == START_2_COIN_ISSUER + + fun isPayIdCreationEnabled(): Boolean { + if (isStart2Coin) return false + return true + } + + companion object { + const val START_2_COIN_ISSUER = "start2coin" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletAction.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletAction.kt index 3bbbda0d1c..1a573776e6 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletAction.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletAction.kt @@ -50,6 +50,8 @@ sealed class WalletAction : Action { object Failure : WalletAction() } + object DisablePayId: WalletAction() + data class LoadArtwork(val card: Card, val artworkId: String?) : WalletAction() { data class Success(val artwork: Artwork) : WalletAction() object Failure : WalletAction() diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletReducer.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletReducer.kt index 9e1930ca1e..b8f66e0aeb 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletReducer.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletReducer.kt @@ -176,6 +176,9 @@ private fun internalReduce(action: Action, state: AppState): WalletState { is WalletAction.LoadPayId.NotCreated -> newState = newState.copy( payIdData = PayIdData(PayIdState.NotCreated, null) ) + is WalletAction.DisablePayId -> newState = newState.copy( + payIdData = PayIdData(PayIdState.Disabled, null) + ) is WalletAction.CreatePayId, is WalletAction.CreatePayId.Failure -> newState = newState.copy( walletDialog = WalletDialog.CreatePayIdDialog(CreatingPayIdState.EnterPayId) diff --git a/dependencies.gradle b/dependencies.gradle index 2fb6558f75..2010dc13b7 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,4 +1,4 @@ ext.versions = [ kotlin : '1.4.0', - build_gradle: '4.0.1', + build_gradle: '4.1.0', ] diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 01e71a44df..385ee4fcc0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Jun 11 11:33:17 MSK 2020 +#Wed Oct 21 13:51:19 MSK 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip