From c6782ec33f69dc123e1a835bc71af24636e50615 Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 4 Mar 2022 15:38:52 +0300 Subject: [PATCH 1/5] Updated on 2026-08-14 --- .../wallet/ui/wallet/SingleWalletView.kt | 12 +-- .../layout/layout_wallet_short_buttons.xml | 77 +++++++++---------- 2 files changed, 44 insertions(+), 45 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SingleWalletView.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SingleWalletView.kt index 84d2795401..224f717a2a 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SingleWalletView.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SingleWalletView.kt @@ -128,7 +128,7 @@ class SingleWalletView : WalletView { val btnConfirm = if (state.tradeCryptoState.sellingAllowed || state.tradeCryptoState.buyingAllowed ) { - lButtonsShort.btnConfirmShort + lButtonsShort.btnConfirm } else { lButtonsLong.btnConfirmLong } @@ -136,7 +136,7 @@ class SingleWalletView : WalletView { val btnScan = if (state.tradeCryptoState.sellingAllowed || state.tradeCryptoState.buyingAllowed ) { - lButtonsShort.btnScanShort + lButtonsShort.btnScan } else { lButtonsLong.btnScanLong } @@ -175,14 +175,14 @@ class SingleWalletView : WalletView { else -> R.string.wallet_button_trade } val icon = when { - allowedToBuy && !allowedToSell -> R.drawable.ic_arrow_up_short_btn - !allowedToBuy && allowedToSell -> R.drawable.ic_arrow_down_short_button - allowedToBuy && allowedToSell -> R.drawable.ic_arrows_up_down_short_btn + allowedToBuy && !allowedToSell -> R.drawable.ic_arrow_up + !allowedToBuy && allowedToSell -> R.drawable.ic_arrow_down + allowedToBuy && allowedToSell -> R.drawable.ic_arrows_up_down else -> null } with(binding) { lButtonsShort.btnTrade.text = fragment?.getText(text) - lButtonsShort.btnTrade.setCompoundDrawablesWithIntrinsicBounds(0, icon ?: 0, 0, 0) + icon?.let { lButtonsShort.btnTrade.setIconResource(it) } lButtonsShort.btnTrade.setOnClickListener { if (action != null) store.dispatch(action) } } } diff --git a/app/src/main/res/layout/layout_wallet_short_buttons.xml b/app/src/main/res/layout/layout_wallet_short_buttons.xml index 09318739b7..08bdfeef5a 100644 --- a/app/src/main/res/layout/layout_wallet_short_buttons.xml +++ b/app/src/main/res/layout/layout_wallet_short_buttons.xml @@ -6,58 +6,57 @@ - - + + + + \ No newline at end of file From 9dfff46b537086676f51a7a8515281d480943783 Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 4 Mar 2022 17:29:34 +0300 Subject: [PATCH 2/5] Updated on 2026-08-14 --- app/src/main/res/values-ru/strings_final.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-ru/strings_final.xml b/app/src/main/res/values-ru/strings_final.xml index 6105f6b3d6..288761b97c 100644 --- a/app/src/main/res/values-ru/strings_final.xml +++ b/app/src/main/res/values-ru/strings_final.xml @@ -30,7 +30,7 @@ Обменивайте, покупайте NFT, получайте займы и делайте вклады в более чем 100 различных децентрализованных сервисах Кошелек для каждого Используйте его на ходу, в любом месте, в любое время. Без проводов и батареек. Как только понадобится крипта, просто приложите карту к телефону. - Заказать карту + Купить Поиск токенов Поиск токенов Приложение работает в демонстрационном режиме. Средства на всех счетах ненастоящие. From bd428b0ee335b7ef3efcd98ea76409bc4ac9f353 Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 4 Mar 2022 17:43:56 +0300 Subject: [PATCH 3/5] Updated on 2026-08-14 --- app/build.gradle | 6 +++--- .../features/wallet/redux/middlewares/WalletMiddleware.kt | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8d4485d03b..2ce9b450b9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -38,7 +38,7 @@ android { } debug_beta { initWith release - debuggable false + debuggable true versionNameSuffix "-beta" applicationIdSuffix ".debug" buildConfigField 'String', 'CONFIG_ENVIRONMENT', '\"prod\"' @@ -80,8 +80,8 @@ dependencies { coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' implementation 'com.tangem:blockchain:develop-64' - implementation 'com.tangem.tangem-sdk-kotlin:core:develop-134' - implementation 'com.tangem.tangem-sdk-kotlin:android:develop-134' + implementation 'com.tangem.tangem-sdk-kotlin:core:develop-137' + implementation 'com.tangem.tangem-sdk-kotlin:android:develop-137' // WebView implementation "androidx.browser:browser:1.3.0" diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt index 088fe72d40..379008a18b 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt @@ -11,6 +11,7 @@ import com.tangem.common.CompletionResult import com.tangem.common.core.TangemSdkError import com.tangem.common.extensions.isZero import com.tangem.common.services.Result +import com.tangem.operations.attestation.Attestation import com.tangem.operations.attestation.OnlineCardVerifier import com.tangem.tap.common.analytics.Analytics import com.tangem.tap.common.extensions.* @@ -147,6 +148,9 @@ class WalletMiddleware { store.dispatch(NavigationAction.PopBackTo(AppScreen.Home)) } is WalletAction.LoadCardInfo -> { + val attestationFailed = action.card.attestation.status == Attestation.Status.Failed + store.dispatchOnMain(GlobalAction.SetIfCardVerifiedOnline(!attestationFailed)) + scope.launch { val response = OnlineCardVerifier().getCardInfo( action.card.cardId, action.card.cardPublicKey @@ -156,13 +160,9 @@ class WalletMiddleware { val actionList = listOf( WalletAction.SetArtworkId(response.data.artwork?.id), WalletAction.LoadArtwork(action.card, response.data.artwork?.id), - GlobalAction.SetIfCardVerifiedOnline(response.data.passed) ) withMainContext { actionList.forEach { store.dispatch(it) } } } - is Result.Failure -> { - store.dispatchOnMain(GlobalAction.SetIfCardVerifiedOnline(false)) - } } store.dispatchOnMain(WalletAction.Warnings.CheckIfNeeded) } From 0270e3f84ff534b9e3136fe552f71819035e84b5 Mon Sep 17 00:00:00 2001 From: Tangem Date: Sat, 5 Mar 2022 09:42:31 +0300 Subject: [PATCH 4/5] Updated on 2026-08-14 --- .../features/onboarding/products/wallet/ui/WalletCardsWidget.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/WalletCardsWidget.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/WalletCardsWidget.kt index eb5ae173af..9f42b3be0b 100644 --- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/WalletCardsWidget.kt +++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/WalletCardsWidget.kt @@ -71,7 +71,7 @@ class WalletCardsWidget( ) leapfrogWidget.fold { animator.doOnEnd { -// leapfrogWidget.initViews() + leapfrogWidget.initViews() leapfrogWidget.unfold() } animator.start() From d8517d6387edc1949f6f700ef2be2eae7a8b0fb8 Mon Sep 17 00:00:00 2001 From: Tangem Date: Sat, 5 Mar 2022 14:49:55 +0300 Subject: [PATCH 5/5] Updated on 2026-08-14 --- app/build.gradle | 6 +++--- app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 2ce9b450b9..a670cb5c27 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -38,7 +38,7 @@ android { } debug_beta { initWith release - debuggable true + debuggable false versionNameSuffix "-beta" applicationIdSuffix ".debug" buildConfigField 'String', 'CONFIG_ENVIRONMENT', '\"prod\"' @@ -80,8 +80,8 @@ dependencies { coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' implementation 'com.tangem:blockchain:develop-64' - implementation 'com.tangem.tangem-sdk-kotlin:core:develop-137' - implementation 'com.tangem.tangem-sdk-kotlin:android:develop-137' + implementation 'com.tangem.tangem-sdk-kotlin:core:develop-139' + implementation 'com.tangem.tangem-sdk-kotlin:android:develop-139' // WebView implementation "androidx.browser:browser:1.3.0" diff --git a/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt b/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt index 5712a5df13..bb104a4c80 100644 --- a/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt +++ b/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt @@ -153,7 +153,7 @@ class TangemSdkManager(private val tangemSdk: TangemSdk, private val context: Co fun changeDisplayedCardIdNumbersCount(scanResponse: ScanResponse) { tangemSdk.config.cardIdDisplayFormat = if (scanResponse.isTangemTwins()) { - CardIdDisplayFormat.LastLunh(4) + CardIdDisplayFormat.LastLuhn(4) } else { CardIdDisplayFormat.Full }