diff --git a/app/src/main/assets/tangem-app-config b/app/src/main/assets/tangem-app-config index 59ee0bff06..f33f020823 160000 --- a/app/src/main/assets/tangem-app-config +++ b/app/src/main/assets/tangem-app-config @@ -1 +1 @@ -Subproject commit 59ee0bff06ee54f3202421c28f7fb6e3d421dad8 +Subproject commit f33f020823031f1c532cf5a9d5cf3fbecadcf050 diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsScreenState.kt b/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsScreenState.kt index 7a74e5ec20..9f2b6ed9e3 100644 --- a/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsScreenState.kt +++ b/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsScreenState.kt @@ -50,8 +50,8 @@ sealed class CardInfo( ) object ResetToFactorySettings : CardInfo( - titleRes = TextReference.Res(R.string.details_row_title_reset_factory_settings), - subtitle = TextReference.Res(R.string.card_settings_reset_factory_footer), + titleRes = TextReference.Res(R.string.card_settings_reset_card_to_factory), + subtitle = TextReference.Res(R.string.card_settings_reset_card_to_factory_footer), clickable = true, ) } diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardScreen.kt b/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardScreen.kt index 08fdd1baca..1b8fec5cdb 100644 --- a/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardScreen.kt +++ b/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardScreen.kt @@ -36,7 +36,7 @@ fun ResetCardScreen( content = { ResetCardView(state = state, modifier = modifier) }, background = { Image(painter = painterResource(id = R.drawable.ic_reset_background), contentDescription = "") }, - titleRes = R.string.details_row_title_reset_factory_settings, + titleRes = R.string.reset_card_to_factory_navigation_title, onBackClick = onBackPressed, ) } @@ -62,7 +62,7 @@ fun ResetCardView( Spacer(modifier = modifier.size(24.dp)) Text( - text = stringResource(id = R.string.reset_factory_warning), + text = stringResource(id = R.string.reset_card_to_factory_message), modifier = modifier.padding(start = 20.dp, end = 20.dp), style = TangemTypography.body1, color = colorResource(id = R.color.text_secondary), @@ -96,7 +96,7 @@ fun ResetCardView( ) } Text( - text = stringResource(id = R.string.reset_factory_confirmation), + text = stringResource(id = R.string.reset_card_to_factory_warning_message), style = TangemTypography.body2, color = colorResource(id = R.color.text_secondary), ) @@ -108,7 +108,7 @@ fun ResetCardView( .padding(start = 16.dp, end = 16.dp, bottom = 32.dp), ) { DetailsMainButton( - title = stringResource(id = R.string.reset_factory_button), + title = stringResource(id = R.string.reset_card_to_factory_button_title), onClick = state.onResetButtonClick, enabled = state.resetButtonEnabled, ) diff --git a/app/src/main/res/values-de/strings_final.xml b/app/src/main/res/values-de/strings_final.xml index 2d132a1ac5..cb51a59e81 100644 --- a/app/src/main/res/values-de/strings_final.xml +++ b/app/src/main/res/values-de/strings_final.xml @@ -87,10 +87,10 @@ Privacy policy - This action will lead to the complete removal of the wallet from the selected card and it will not be possible to restore the current wallet on it or use the card to recover the password - I understand that after performing this action, I will no longer have access to the current wallet - Reset the card - Factory Reset will completely delete the wallet from the selected card and you will not be able to restore the current wallet or use the card to recover the access code. - - + Reset to factory settings + This action will completely remove the wallet from the selected card. You will not be able to restore the current wallet or use the card to recover the access code. + I understand that after performing this action, I will no longer have access to the current wallet + Reset the card + Reset to Factory Settings + Factory Reset will completely delete the wallet from the selected card. You will not be able to restore the current wallet or use the card to recover the access code. \ No newline at end of file diff --git a/app/src/main/res/values-fr/strings_final.xml b/app/src/main/res/values-fr/strings_final.xml index 2212277ceb..db5cb3bd3d 100644 --- a/app/src/main/res/values-fr/strings_final.xml +++ b/app/src/main/res/values-fr/strings_final.xml @@ -87,9 +87,10 @@ Privacy policy - This action will lead to the complete removal of the wallet from the selected card and it will not be possible to restore the current wallet on it or use the card to recover the password - I understand that after performing this action, I will no longer have access to the current wallet - Reset the card - Factory Reset will completely delete the wallet from the selected card and you will not be able to restore the current wallet or use the card to recover the access code. - + Reset to factory settings + This action will completely remove the wallet from the selected card. You will not be able to restore the current wallet or use the card to recover the access code. + I understand that after performing this action, I will no longer have access to the current wallet + Reset the card + Reset to Factory Settings + Factory Reset will completely delete the wallet from the selected card. You will not be able to restore the current wallet or use the card to recover the access code. \ No newline at end of file diff --git a/app/src/main/res/values-it/strings_final.xml b/app/src/main/res/values-it/strings_final.xml index 96a8c364ac..aa671c19a4 100644 --- a/app/src/main/res/values-it/strings_final.xml +++ b/app/src/main/res/values-it/strings_final.xml @@ -88,9 +88,10 @@ Privacy policy - This action will lead to the complete removal of the wallet from the selected card and it will not be possible to restore the current wallet on it or use the card to recover the password - I understand that after performing this action, I will no longer have access to the current wallet - Reset the card - Factory Reset will completely delete the wallet from the selected card and you will not be able to restore the current wallet or use the card to recover the access code. - + Reset to factory settings + This action will completely remove the wallet from the selected card. You will not be able to restore the current wallet or use the card to recover the access code. + I understand that after performing this action, I will no longer have access to the current wallet + Reset the card + Reset to Factory Settings + Factory Reset will completely delete the wallet from the selected card. You will not be able to restore the current wallet or use the card to recover the access code. \ No newline at end of file diff --git a/app/src/main/res/values-ru/strings_final.xml b/app/src/main/res/values-ru/strings_final.xml index 3e221ac924..9c4dc47dd3 100644 --- a/app/src/main/res/values-ru/strings_final.xml +++ b/app/src/main/res/values-ru/strings_final.xml @@ -104,9 +104,10 @@ Privacy policy - Данное действие приведет к полному удалению кошелька с выбранной карты. Восстановить на ней текущий кошелек или использовать карту для восстановления пароля будет невозможно - Я понимаю, что после выполнения этого действия у меня больше не будет доступа к текущему кошельку - Сбросить карту - Сброс к заводским настройкам полностью удалит кошелек с выбранной карты, и вы не сможете восстановить текущий кошелек или использовать карту для восстановления кода доступа. - + Сброс к заводским настройкам + Это действие приведет к полному удалению кошелька на этой карте. Кошелек невозможно будет восстановить или использовать данную карту для восстановления кода доступа + Я понимаю, что после выполнения этого действия у меня больше не будет доступа к текущему кошельку + Сбросить карту + Сброс к заводским настройкам + Сброс к заводским настройкам приведет к полному удалению кошелька с выбранной карты. Вы не сможете восстановить текущий кошелек или использовать эту карту для восстановления кода доступа. diff --git a/app/src/main/res/values/strings_final.xml b/app/src/main/res/values/strings_final.xml index 6d4137103f..44984bde11 100644 --- a/app/src/main/res/values/strings_final.xml +++ b/app/src/main/res/values/strings_final.xml @@ -106,10 +106,10 @@ Privacy policy - This action will lead to the complete removal of the wallet from the selected card and it will not be possible to restore the current wallet on it or use the card to recover the password - I understand that after performing this action, I will no longer have access to the current wallet - Reset the card - Factory Reset will completely delete the wallet from the selected card and you will not be able to restore the current wallet or use the card to recover the access code. - - + Reset to factory settings + This action will completely remove the wallet from the selected card. You will not be able to restore the current wallet or use the card to recover the access code. + I understand that after performing this action, I will no longer have access to the current wallet + Reset the card + Reset to Factory Settings + Factory Reset will completely delete the wallet from the selected card. You will not be able to restore the current wallet or use the card to recover the access code.