From 28ccab43f9029597854abedbd9700b5f78123708 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 27 Jan 2022 11:05:55 +0300 Subject: [PATCH 1/5] Updated on 2026-08-14 --- app/src/main/res/layout/fragment_onboarding_wallet.xml | 1 + app/src/main/res/layout/layout_backup_access_code_submit.xml | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/layout/fragment_onboarding_wallet.xml b/app/src/main/res/layout/fragment_onboarding_wallet.xml index e29397b2bb..5df3b30845 100644 --- a/app/src/main/res/layout/fragment_onboarding_wallet.xml +++ b/app/src/main/res/layout/fragment_onboarding_wallet.xml @@ -192,6 +192,7 @@ app:tabBackground="@drawable/selector_tabs_dots" app:tabIndicator="@null" app:tabPaddingStart="8dp" + android:layout_marginBottom="16dp" app:tabPaddingEnd="8dp" app:tabGravity="center"/> diff --git a/app/src/main/res/layout/layout_backup_access_code_submit.xml b/app/src/main/res/layout/layout_backup_access_code_submit.xml index eca2c05bbd..c9416e28f1 100644 --- a/app/src/main/res/layout/layout_backup_access_code_submit.xml +++ b/app/src/main/res/layout/layout_backup_access_code_submit.xml @@ -27,7 +27,7 @@ android:layout_marginTop="44dp" android:layout_marginEnd="16dp" android:layout_marginBottom="40dp" - android:hint="Access code" + android:hint="@string/onboarding_wallet_info_title_third" app:boxStrokeColor="@color/selector_edit_text" app:boxStrokeWidth="1dp" app:endIconDrawable="@drawable/selector_password_toggle" @@ -53,6 +53,9 @@ android:layout_marginStart="78dp" android:layout_marginEnd="78dp" android:layout_marginBottom="92dp" + android:layout_marginTop="32dp" + app:layout_constraintTop_toTopOf="@id/til_access_code" + app:layout_constraintVertical_bias="1" android:text="@string/common_create" android:textSize="16sp" app:layout_constraintBottom_toBottomOf="parent" /> From ef66e372e851abcf9665a823542d3b9964aca2ef Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 27 Jan 2022 11:17:12 +0300 Subject: [PATCH 2/5] Updated on 2026-08-14 --- app/src/main/res/layout/layout_backup_access_code_info.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/layout/layout_backup_access_code_info.xml b/app/src/main/res/layout/layout_backup_access_code_info.xml index fab2ddf46d..ac5a98171f 100644 --- a/app/src/main/res/layout/layout_backup_access_code_info.xml +++ b/app/src/main/res/layout/layout_backup_access_code_info.xml @@ -122,7 +122,7 @@ android:layout_marginStart="78dp" android:layout_marginEnd="78dp" android:layout_marginBottom="92dp" - android:text="@string/common_create" + android:text="@string/common_continue" android:textSize="16sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" From af1d83e20a09daa645c4826f230a2527692a653b Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 27 Jan 2022 11:19:09 +0300 Subject: [PATCH 3/5] Updated on 2026-08-14 --- .../onboarding/products/wallet/ui/OnboardingWalletFragment.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt index 2bfddfc8ae..30dc5affba 100644 --- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt @@ -13,7 +13,6 @@ import com.squareup.picasso.Picasso import com.tangem.common.CardIdFormatter import com.tangem.common.core.CardIdDisplayFormat import com.tangem.tangem_sdk_new.ui.widget.leapfrogWidget.LeapfrogWidget -import com.tangem.tap.common.extensions.dispatchOpenUrl import com.tangem.tap.common.extensions.hide import com.tangem.tap.common.extensions.show import com.tangem.tap.common.postUi @@ -326,7 +325,7 @@ class OnboardingWalletFragment : Fragment(R.layout.fragment_onboarding_wallet), tv_header.text = getString(R.string.onboarding_title_backup_card_format, cardNumber) tv_body.text = getString( - R.string.onboarding_subtitle_scan_primary_card_format, + R.string.onboarding_subtitle_scan_backup_card_format, cardIdFormatter.getFormattedCardId(state.backupCardIds[cardNumber - 1]) ) btn_main_action.text = getString( From b971e1a746459107a9ad74b903c49bb3afbd37a5 Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 28 Jan 2022 12:21:14 +0300 Subject: [PATCH 4/5] Updated on 2026-08-14 --- .../com/tangem/tap/features/details/ui/DetailsFragment.kt | 5 ++++- .../send/ui/stateSubscribers/SendStateSubscriber.kt | 5 +++++ .../tangem/tap/features/tokens/redux/TokensMiddleware.kt | 6 +++--- app/src/main/res/values/strings_untranslated.xml | 2 +- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/DetailsFragment.kt b/app/src/main/java/com/tangem/tap/features/details/ui/DetailsFragment.kt index 74d3f40fd9..acb76789ba 100644 --- a/app/src/main/java/com/tangem/tap/features/details/ui/DetailsFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/details/ui/DetailsFragment.kt @@ -73,7 +73,10 @@ class DetailsFragment : Fragment(R.layout.fragment_details), StoreSubscriber { action -> when (action) { - is TokensAction.LoadCurrencies -> handleLoadCurrencies(action) + is TokensAction.LoadCurrencies -> handleLoadCurrencies() is TokensAction.SaveChanges -> handleSaveChanges(action) } next(action) @@ -40,7 +40,7 @@ class TokensMiddleware { } } - private fun handleLoadCurrencies(action: TokensAction.LoadCurrencies) { + private fun handleLoadCurrencies() { val scanResponse = store.state.globalState.scanResponse ?: return val isTestcard = scanResponse.card.isTestCard @@ -48,7 +48,7 @@ class TokensMiddleware { val blockchains = currenciesRepository.getBlockchains( cardFirmware = scanResponse.card.firmwareVersion, isTestNet = isTestcard - ) + ).sortedBy { it.fullName } val currencies = CurrencyListItem.createListOfCurrencies(blockchains, tokens).toMutableList() store.dispatch(TokensAction.LoadCurrencies.Success(currencies)) diff --git a/app/src/main/res/values/strings_untranslated.xml b/app/src/main/res/values/strings_untranslated.xml index ce001133db..32f666e20c 100644 --- a/app/src/main/res/values/strings_untranslated.xml +++ b/app/src/main/res/values/strings_untranslated.xml @@ -27,7 +27,7 @@ Preparing card Creating wallet The wallet creation procedure consists of three steps. You must complete it to the end, otherwise you will have to start from the beginning. - Tap the card #%s + Scan the card #%s You have already started the process of recreating twin wallet. If you interrupt it, you won\'t be able to use your twin cards until you start it again and complete recreating the wallet. You\'ve tapped the same card. To create twin wallet you need to tap a second twin card. From 507a3f46f6d4160ec0330675af59e539f9c90c4b Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 28 Jan 2022 12:22:21 +0300 Subject: [PATCH 5/5] Updated on 2026-08-14 --- .../products/wallet/redux/OnboardingWalletMiddleware.kt | 2 ++ .../products/wallet/redux/OnboardingWalletReducer.kt | 2 +- .../products/wallet/ui/OnboardingWalletFragment.kt | 7 +------ 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt index 2f58bb300b..29cdd561b2 100644 --- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt +++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt @@ -237,11 +237,13 @@ private fun handleBackupAction(action: BackupAction) { AccessCodeError.CodeTooShort )) } else { + store.dispatch(BackupAction.SetAccessCodeError(null)) store.dispatch(BackupAction.SaveFirstAccessCode(action.accessCode)) } } is BackupAction.SaveAccessCodeConfirmation -> { if (action.accessCodeConfirmation == backupState.accessCode) { + store.dispatch(BackupAction.SetAccessCodeError(null)) backupService.setAccessCode(action.accessCodeConfirmation) store.dispatch(BackupAction.PrepareToWritePrimaryCard) } else { diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletReducer.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletReducer.kt index ce0c07b3c6..f46c1bf0ff 100644 --- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletReducer.kt +++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletReducer.kt @@ -60,7 +60,7 @@ class BackupReducer { state.copy(backupStep = BackupStep.SetAccessCode) } BackupAction.ShowEnterAccessCodeScreen -> { - state.copy(backupStep = BackupStep.EnterAccessCode) + state.copy(backupStep = BackupStep.EnterAccessCode, accessCodeError = null) } is BackupAction.SaveFirstAccessCode -> { state.copy( diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt index 30dc5affba..27fe4c8eb7 100644 --- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt @@ -15,7 +15,6 @@ import com.tangem.common.core.CardIdDisplayFormat import com.tangem.tangem_sdk_new.ui.widget.leapfrogWidget.LeapfrogWidget import com.tangem.tap.common.extensions.hide import com.tangem.tap.common.extensions.show -import com.tangem.tap.common.postUi import com.tangem.tap.features.FragmentOnBackPressedHandler import com.tangem.tap.features.addBackPressHandler import com.tangem.tap.features.onboarding.products.wallet.redux.* @@ -253,15 +252,11 @@ class OnboardingWalletFragment : Fragment(R.layout.fragment_onboarding_wallet), private fun showEnterAccessCode(state: BackupState) { accessCodeDialog?.showEnterAccessCode() accessCodeDialog?.showError(state.accessCodeError) - postUi(2000) { store.dispatch(BackupAction.SetAccessCodeError(null)) } - } private fun showReenterAccessCode(state: BackupState) { accessCodeDialog?.showReenterAccessCode() accessCodeDialog?.showError(state.accessCodeError) - postUi(2000) { store.dispatch(BackupAction.SetAccessCodeError(null)) } - } private fun showWritePrimaryCard(state: BackupState) { @@ -350,7 +345,7 @@ class OnboardingWalletFragment : Fragment(R.layout.fragment_onboarding_wallet), tab_layout_backup_info.hide() tv_body.text = text - btn_main_action.text = getText(R.string.common_continue) + btn_main_action.text = getText(R.string.onboarding_button_continue_wallet) btn_alternative_action.hide() btn_main_action.setOnClickListener { lav_confetti.cancelAnimation()