diff --git a/.maestro/tests/account/verifySession.yaml b/.maestro/tests/account/verifySession.yaml index a59f60b88f..20b3d1b8ac 100644 --- a/.maestro/tests/account/verifySession.yaml +++ b/.maestro/tests/account/verifySession.yaml @@ -1,10 +1,10 @@ appId: ${MAESTRO_APP_ID} --- - extendedWaitUntil: - visible: "Enter recovery key" + visible: "Use recovery key" timeout: 30000 - takeScreenshot: build/maestro/150-Verify -- tapOn: "Enter recovery key" +- tapOn: "Use recovery key" - tapOn: id: "verification-recovery_key" - inputText: ${MAESTRO_RECOVERY_KEY} diff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModePresenter.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModePresenter.kt index ace890be9c..06d3dbf392 100644 --- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModePresenter.kt +++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModePresenter.kt @@ -30,7 +30,7 @@ class ChooseSelfVerificationModePresenter( @Composable override fun present(): ChooseSelfVerificationModeState { val hasDevicesToVerifyAgainst by encryptionService.hasDevicesToVerifyAgainst.collectAsState() - val canEnterRecoveryKey by encryptionService.recoveryStateStateFlow + val canUseRecoveryKey by encryptionService.recoveryStateStateFlow .mapState { recoveryState -> when (recoveryState) { RecoveryState.WAITING_FOR_SYNC, @@ -44,14 +44,14 @@ class ChooseSelfVerificationModePresenter( val buttonsState by remember { derivedStateOf { val canUseAnotherDevice = hasDevicesToVerifyAgainst.dataOrNull() - val canEnterRecoveryKey = canEnterRecoveryKey.dataOrNull() - if (canUseAnotherDevice == null || canEnterRecoveryKey == null) { + val canUseRecoveryKey = canUseRecoveryKey.dataOrNull() + if (canUseAnotherDevice == null || canUseRecoveryKey == null) { AsyncData.Loading() } else { AsyncData.Success( ChooseSelfVerificationModeState.ButtonsState( canUseAnotherDevice = canUseAnotherDevice, - canEnterRecoveryKey = canEnterRecoveryKey, + canUseRecoveryKey = canUseRecoveryKey, ) ) } diff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeState.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeState.kt index 4e27043f40..0512636fca 100644 --- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeState.kt +++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeState.kt @@ -18,6 +18,6 @@ data class ChooseSelfVerificationModeState( ) { data class ButtonsState( val canUseAnotherDevice: Boolean, - val canEnterRecoveryKey: Boolean, + val canUseRecoveryKey: Boolean, ) } diff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeStateProvider.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeStateProvider.kt index 676c77211f..b35a9624b9 100644 --- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeStateProvider.kt +++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeStateProvider.kt @@ -17,22 +17,22 @@ class ChooseSelfVerificationModeStateProvider : override val values = sequenceOf( aChooseSelfVerificationModeState( buttonsState = AsyncData.Success( - aButtonsState(canUseAnotherDevice = false, canEnterRecoveryKey = true), + aButtonsState(canUseAnotherDevice = false, canUseRecoveryKey = true), ), ), aChooseSelfVerificationModeState( buttonsState = AsyncData.Success( - aButtonsState(canUseAnotherDevice = false, canEnterRecoveryKey = false), + aButtonsState(canUseAnotherDevice = false, canUseRecoveryKey = false), ), ), aChooseSelfVerificationModeState( buttonsState = AsyncData.Success( - aButtonsState(canUseAnotherDevice = true, canEnterRecoveryKey = true), + aButtonsState(canUseAnotherDevice = true, canUseRecoveryKey = true), ), ), aChooseSelfVerificationModeState( buttonsState = AsyncData.Success( - aButtonsState(canUseAnotherDevice = true, canEnterRecoveryKey = false), + aButtonsState(canUseAnotherDevice = true, canUseRecoveryKey = false), ), ), aChooseSelfVerificationModeState( @@ -51,8 +51,8 @@ fun aChooseSelfVerificationModeState( fun aButtonsState( canUseAnotherDevice: Boolean = true, - canEnterRecoveryKey: Boolean = true, + canUseRecoveryKey: Boolean = true, ) = ChooseSelfVerificationModeState.ButtonsState( canUseAnotherDevice = canUseAnotherDevice, - canEnterRecoveryKey = canEnterRecoveryKey, + canUseRecoveryKey = canUseRecoveryKey, ) diff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeView.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeView.kt index 8f72f038de..0ca25c9455 100644 --- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeView.kt +++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeView.kt @@ -122,10 +122,10 @@ private fun ChooseSelfVerificationModeButtons( onClick = onUseAnotherDevice, ) } - if (state.buttonsState.data.canEnterRecoveryKey) { + if (state.buttonsState.data.canUseRecoveryKey) { Button( modifier = Modifier.fillMaxWidth(), - text = stringResource(R.string.screen_session_verification_enter_recovery_key), + text = stringResource(R.string.screen_identity_confirmation_use_recovery_key), onClick = onUseRecoveryKey, ) } diff --git a/features/ftue/impl/src/main/res/values-be/translations.xml b/features/ftue/impl/src/main/res/values-be/translations.xml index 949410ce73..cd09d1ee32 100644 --- a/features/ftue/impl/src/main/res/values-be/translations.xml +++ b/features/ftue/impl/src/main/res/values-be/translations.xml @@ -12,5 +12,4 @@ "Чаканне на іншай прыладзе…" "Вы можаце змяніць налады пазней." "Дазвольце апавяшчэнні і ніколі не прапускайце іх" - "Увядзіце ключ аднаўлення" diff --git a/features/ftue/impl/src/main/res/values-bg/translations.xml b/features/ftue/impl/src/main/res/values-bg/translations.xml index 0b7bd3de3e..60a7304b42 100644 --- a/features/ftue/impl/src/main/res/values-bg/translations.xml +++ b/features/ftue/impl/src/main/res/values-bg/translations.xml @@ -9,5 +9,4 @@ "Използване на друго устройство" "Можете да промените настройките си по-късно." "Разрешете известията и никога не пропускайте съобщение" - "Въвеждане на ключ за възстановяване" diff --git a/features/ftue/impl/src/main/res/values-cs/translations.xml b/features/ftue/impl/src/main/res/values-cs/translations.xml index 6190f04faa..30d6998ac6 100644 --- a/features/ftue/impl/src/main/res/values-cs/translations.xml +++ b/features/ftue/impl/src/main/res/values-cs/translations.xml @@ -12,5 +12,4 @@ "Čekání na jiném zařízení…" "Nastavení můžete později změnit." "Povolte oznámení a nezmeškejte žádnou zprávu" - "Zadejte klíč pro obnovení" diff --git a/features/ftue/impl/src/main/res/values-cy/translations.xml b/features/ftue/impl/src/main/res/values-cy/translations.xml index c9ed3c04e1..ce940e9546 100644 --- a/features/ftue/impl/src/main/res/values-cy/translations.xml +++ b/features/ftue/impl/src/main/res/values-cy/translations.xml @@ -12,5 +12,4 @@ "Yn aros ar ddyfais arall…" "Gallwch newid eich gosodiadau yn nes ymlaen." "Caniatáu hysbysiadau a pheidio byth â cholli neges" - "Rhowch eich allwedd adfer" diff --git a/features/ftue/impl/src/main/res/values-da/translations.xml b/features/ftue/impl/src/main/res/values-da/translations.xml index abbf00f49d..9c3720ac00 100644 --- a/features/ftue/impl/src/main/res/values-da/translations.xml +++ b/features/ftue/impl/src/main/res/values-da/translations.xml @@ -12,5 +12,4 @@ "Venter på en anden enhed…" "Du kan ændre dine indstillinger senere." "Tillad notifikationer, og gå aldrig glip af en besked" - "Indtast gendannelsesnøgle" diff --git a/features/ftue/impl/src/main/res/values-de/translations.xml b/features/ftue/impl/src/main/res/values-de/translations.xml index 6d902ab8d4..474d085df0 100644 --- a/features/ftue/impl/src/main/res/values-de/translations.xml +++ b/features/ftue/impl/src/main/res/values-de/translations.xml @@ -12,5 +12,4 @@ "Bitte warten bis das andere Gerät bereit ist." "Du kannst deine Einstellungen später ändern." "Erlaube Benachrichtigungen und verpasse keine Nachricht" - "Wiederherstellungsschlüssel eingeben" diff --git a/features/ftue/impl/src/main/res/values-el/translations.xml b/features/ftue/impl/src/main/res/values-el/translations.xml index 3e169a2e7f..b5f2428831 100644 --- a/features/ftue/impl/src/main/res/values-el/translations.xml +++ b/features/ftue/impl/src/main/res/values-el/translations.xml @@ -12,5 +12,4 @@ "Αναμονή σε άλλη συσκευή…" "Μπορείς να αλλάξεις τις ρυθμίσεις σου αργότερα." "Επέτρεψε τις ειδοποιήσεις και μην χάσεις ούτε ένα μήνυμα" - "Εισαγωγή κλειδιού ανάκτησης" diff --git a/features/ftue/impl/src/main/res/values-es/translations.xml b/features/ftue/impl/src/main/res/values-es/translations.xml index 111821f026..8f49a77e0d 100644 --- a/features/ftue/impl/src/main/res/values-es/translations.xml +++ b/features/ftue/impl/src/main/res/values-es/translations.xml @@ -12,5 +12,4 @@ "Esperando en otro dispositivo…" "Puedes cambiar la configuración más tarde." "Activa las notificaciones y nunca te pierdas un mensaje" - "Introduce la clave de recuperación" diff --git a/features/ftue/impl/src/main/res/values-et/translations.xml b/features/ftue/impl/src/main/res/values-et/translations.xml index c1898c3ce1..4790fdb716 100644 --- a/features/ftue/impl/src/main/res/values-et/translations.xml +++ b/features/ftue/impl/src/main/res/values-et/translations.xml @@ -12,5 +12,4 @@ "Ootame teise seadme järgi…" "Sa võid seadistusi hiljem alati muuta." "Luba teavitused ja kunagi ei jää sul sõnumid märkamata" - "Sisesta taastevõti" diff --git a/features/ftue/impl/src/main/res/values-eu/translations.xml b/features/ftue/impl/src/main/res/values-eu/translations.xml index f512a62a33..125b89301a 100644 --- a/features/ftue/impl/src/main/res/values-eu/translations.xml +++ b/features/ftue/impl/src/main/res/values-eu/translations.xml @@ -12,5 +12,4 @@ "Beste gailuaren zain…" "Geroago alda ditzakezu ezarpenak." "Baimendu jakinarazpenak eta ez galdu inoiz mezurik" - "Sartu berreskuratze-gakoa" diff --git a/features/ftue/impl/src/main/res/values-fa/translations.xml b/features/ftue/impl/src/main/res/values-fa/translations.xml index 8c2b5ae2bc..d41e2e26f1 100644 --- a/features/ftue/impl/src/main/res/values-fa/translations.xml +++ b/features/ftue/impl/src/main/res/values-fa/translations.xml @@ -12,5 +12,4 @@ "منتظر افزارهٔ دیگر…" "می‌توانید بعداً تنظیماتتان را تغییر دهید." "اجازه به آگاهی‌ها و از دست ندادن پیام‌ها" - "ورود کلید بازیابی" diff --git a/features/ftue/impl/src/main/res/values-fi/translations.xml b/features/ftue/impl/src/main/res/values-fi/translations.xml index 6a1eadd025..36cb035c3f 100644 --- a/features/ftue/impl/src/main/res/values-fi/translations.xml +++ b/features/ftue/impl/src/main/res/values-fi/translations.xml @@ -12,5 +12,4 @@ "Odotetaan toista laitetta…" "Voit muuttaa asetuksia myöhemmin." "Salli ilmoitukset ja älä koskaan missaa viestejä" - "Anna palautusavain" diff --git a/features/ftue/impl/src/main/res/values-fr/translations.xml b/features/ftue/impl/src/main/res/values-fr/translations.xml index 43bc6e0b44..7120e70ddc 100644 --- a/features/ftue/impl/src/main/res/values-fr/translations.xml +++ b/features/ftue/impl/src/main/res/values-fr/translations.xml @@ -12,5 +12,4 @@ "En attente d’une autre session…" "Vous pourrez modifier vos paramètres ultérieurement." "Autorisez les notifications et ne manquez aucun message" - "Utiliser la clé de récupération" diff --git a/features/ftue/impl/src/main/res/values-hr/translations.xml b/features/ftue/impl/src/main/res/values-hr/translations.xml index cb0e330872..d535c660a2 100644 --- a/features/ftue/impl/src/main/res/values-hr/translations.xml +++ b/features/ftue/impl/src/main/res/values-hr/translations.xml @@ -12,5 +12,4 @@ "Čekanje na drugi uređaj…" "Postavke možete promijeniti poslije." "Omogućite obavijesti i nikada ne propustite poruku" - "Unesi ključ za oporavak" diff --git a/features/ftue/impl/src/main/res/values-hu/translations.xml b/features/ftue/impl/src/main/res/values-hu/translations.xml index aba333f0ab..56dae06d9b 100644 --- a/features/ftue/impl/src/main/res/values-hu/translations.xml +++ b/features/ftue/impl/src/main/res/values-hu/translations.xml @@ -12,5 +12,4 @@ "Várakozás a másik eszközre…" "A beállításokat később is módosíthatja." "Értesítések engedélyezése, hogy soha ne maradjon le egyetlen üzenetről sem" - "Adja meg a helyreállítási kulcsot" diff --git a/features/ftue/impl/src/main/res/values-in/translations.xml b/features/ftue/impl/src/main/res/values-in/translations.xml index 3b6f878afc..0255251f97 100644 --- a/features/ftue/impl/src/main/res/values-in/translations.xml +++ b/features/ftue/impl/src/main/res/values-in/translations.xml @@ -12,5 +12,4 @@ "Menunggu di perangkat lain…" "Anda dapat mengubah pengaturan Anda nanti." "Izinkan pemberitahuan dan jangan pernah melewatkan pesan" - "Masukkan kunci pemulihan" diff --git a/features/ftue/impl/src/main/res/values-it/translations.xml b/features/ftue/impl/src/main/res/values-it/translations.xml index c8c4766d2f..25ba544d00 100644 --- a/features/ftue/impl/src/main/res/values-it/translations.xml +++ b/features/ftue/impl/src/main/res/values-it/translations.xml @@ -12,5 +12,4 @@ "In attesa sull\'altro dispositivo…" "Potrai modificare le tue impostazioni in seguito." "Consenti le notifiche e non perdere mai un messaggio" - "Inserisci la chiave di recupero" diff --git a/features/ftue/impl/src/main/res/values-ka/translations.xml b/features/ftue/impl/src/main/res/values-ka/translations.xml index 7118eaf913..381fb4d22e 100644 --- a/features/ftue/impl/src/main/res/values-ka/translations.xml +++ b/features/ftue/impl/src/main/res/values-ka/translations.xml @@ -8,5 +8,4 @@ "ველოდებით სხვა მოწყობილობას…" "თქვენ შეგიძლიათ შეცვალოთ თქვენი პარამეტრები მოგვიანებით." "ყველა შეტყობინებაზე შეტყობინებების მიღება" - "შეიყვანეთ აღდგენის გასაღები" diff --git a/features/ftue/impl/src/main/res/values-ko/translations.xml b/features/ftue/impl/src/main/res/values-ko/translations.xml index cb7c9e32dc..5b13a79b27 100644 --- a/features/ftue/impl/src/main/res/values-ko/translations.xml +++ b/features/ftue/impl/src/main/res/values-ko/translations.xml @@ -12,5 +12,4 @@ "다른 기기에서 대기 중…" "나중에 설정을 변경할 수 있습니다." "알림을 허용하고 메시지를 놓치지 마세요." - "복구 키를 입력하세요" diff --git a/features/ftue/impl/src/main/res/values-nb/translations.xml b/features/ftue/impl/src/main/res/values-nb/translations.xml index aa0f4a1443..a285ffdc38 100644 --- a/features/ftue/impl/src/main/res/values-nb/translations.xml +++ b/features/ftue/impl/src/main/res/values-nb/translations.xml @@ -12,5 +12,4 @@ "Venter på en annen enhet…" "Du kan endre innstillingene dine senere." "Tillat varslinger og gå aldri glipp av en melding" - "Skriv inn gjenopprettingsnøkkel" diff --git a/features/ftue/impl/src/main/res/values-nl/translations.xml b/features/ftue/impl/src/main/res/values-nl/translations.xml index ca49c620af..f3cb3e90ac 100644 --- a/features/ftue/impl/src/main/res/values-nl/translations.xml +++ b/features/ftue/impl/src/main/res/values-nl/translations.xml @@ -12,5 +12,4 @@ "Wachten op ander apparaat…" "Je kunt je instellingen later wijzigen." "Sta meldingen toe en mis nooit meer een bericht" - "Voer herstelsleutel in" diff --git a/features/ftue/impl/src/main/res/values-pl/translations.xml b/features/ftue/impl/src/main/res/values-pl/translations.xml index c348c9b4f5..5d77c57994 100644 --- a/features/ftue/impl/src/main/res/values-pl/translations.xml +++ b/features/ftue/impl/src/main/res/values-pl/translations.xml @@ -12,5 +12,4 @@ "Oczekiwanie na inne urządzenie…" "Możesz zmienić ustawienia później." "Zezwól na powiadomienia i nie przegap żadnej wiadomości" - "Wprowadź klucz przywracania" diff --git a/features/ftue/impl/src/main/res/values-pt-rBR/translations.xml b/features/ftue/impl/src/main/res/values-pt-rBR/translations.xml index 8629bbfd11..62100e9897 100644 --- a/features/ftue/impl/src/main/res/values-pt-rBR/translations.xml +++ b/features/ftue/impl/src/main/res/values-pt-rBR/translations.xml @@ -12,5 +12,4 @@ "Aguardando o outro dispositivo…" "Você pode alterar suas configurações mais tarde." "Permita as notificações e nunca perca uma mensagem" - "Digitar chave de recuperação" diff --git a/features/ftue/impl/src/main/res/values-pt/translations.xml b/features/ftue/impl/src/main/res/values-pt/translations.xml index c05eca2af5..5b6729f04e 100644 --- a/features/ftue/impl/src/main/res/values-pt/translations.xml +++ b/features/ftue/impl/src/main/res/values-pt/translations.xml @@ -12,5 +12,4 @@ "A aguardar por outros dispositivos…" "Podes alterar as tuas definições mais tarde." "Permite as notificações e nunca percas uma mensagem" - "Insere a chave de recuperação" diff --git a/features/ftue/impl/src/main/res/values-ro/translations.xml b/features/ftue/impl/src/main/res/values-ro/translations.xml index b58414a275..abf72140e8 100644 --- a/features/ftue/impl/src/main/res/values-ro/translations.xml +++ b/features/ftue/impl/src/main/res/values-ro/translations.xml @@ -12,5 +12,4 @@ "Se așteaptă celălalt dispozitiv…" "Puteți modifica setările mai târziu." "Permiteți notificările și nu pierdeți niciodată un mesaj" - "Introduceți cheia de recuperare" diff --git a/features/ftue/impl/src/main/res/values-ru/translations.xml b/features/ftue/impl/src/main/res/values-ru/translations.xml index 8da06f4507..b2f0925813 100644 --- a/features/ftue/impl/src/main/res/values-ru/translations.xml +++ b/features/ftue/impl/src/main/res/values-ru/translations.xml @@ -12,5 +12,4 @@ "Ожидание другого устройства…" "Вы можете изменить настройки позже." "Разрешите отправку уведомлений" - "Введите ключ восстановления" diff --git a/features/ftue/impl/src/main/res/values-sk/translations.xml b/features/ftue/impl/src/main/res/values-sk/translations.xml index ca2cc3ec63..5d1a7fce43 100644 --- a/features/ftue/impl/src/main/res/values-sk/translations.xml +++ b/features/ftue/impl/src/main/res/values-sk/translations.xml @@ -12,5 +12,4 @@ "Čaká sa na druhom zariadení…" "Svoje nastavenia môžete neskôr zmeniť." "Povoľte oznámenia a nikdy nezmeškajte žiadnu správu" - "Zadajte kľúč na obnovenie" diff --git a/features/ftue/impl/src/main/res/values-sv/translations.xml b/features/ftue/impl/src/main/res/values-sv/translations.xml index 0bca53cf1d..92f9c9fee7 100644 --- a/features/ftue/impl/src/main/res/values-sv/translations.xml +++ b/features/ftue/impl/src/main/res/values-sv/translations.xml @@ -12,5 +12,4 @@ "Väntar på annan enhet …" "Du kan ändra dina inställningar senare." "Tillåt aviseringar och missa aldrig ett meddelande" - "Ange återställningsnyckel" diff --git a/features/ftue/impl/src/main/res/values-tr/translations.xml b/features/ftue/impl/src/main/res/values-tr/translations.xml index dbdfe557f1..dd59159140 100644 --- a/features/ftue/impl/src/main/res/values-tr/translations.xml +++ b/features/ftue/impl/src/main/res/values-tr/translations.xml @@ -12,5 +12,4 @@ "Diğer cihazda bekleniyor…" "Ayarlarınızı daha sonra değiştirebilirsiniz." "Bildirimlere izin verin ve hiçbir mesajı kaçırmayın" - "Kurtarma anahtarını girin" diff --git a/features/ftue/impl/src/main/res/values-uk/translations.xml b/features/ftue/impl/src/main/res/values-uk/translations.xml index 14ee57af8a..eb00ebf09d 100644 --- a/features/ftue/impl/src/main/res/values-uk/translations.xml +++ b/features/ftue/impl/src/main/res/values-uk/translations.xml @@ -12,5 +12,4 @@ "Чекає на інше пристрій…" "Ви можете змінити свої налаштування пізніше." "Дозволити сповіщення і ніколи не пропускати повідомлення" - "Введіть ключ відновлення" diff --git a/features/ftue/impl/src/main/res/values-ur/translations.xml b/features/ftue/impl/src/main/res/values-ur/translations.xml index 402140ed71..89756a217b 100644 --- a/features/ftue/impl/src/main/res/values-ur/translations.xml +++ b/features/ftue/impl/src/main/res/values-ur/translations.xml @@ -12,5 +12,4 @@ "دوسرے آلہ پر منتظر…" "آپ بعد میں اپنی ترتیبات تبدیل کر سکتے ہیں۔" "اطلاعات کی اجازت دیں اور کبھی بھی کسی پیغام سے محروم نہ ہوں۔" - "بازیابی کلید درج کریں" diff --git a/features/ftue/impl/src/main/res/values-uz/translations.xml b/features/ftue/impl/src/main/res/values-uz/translations.xml index 9ed2a2b86d..8edff2c305 100644 --- a/features/ftue/impl/src/main/res/values-uz/translations.xml +++ b/features/ftue/impl/src/main/res/values-uz/translations.xml @@ -12,5 +12,4 @@ "Boshqa qurilmada kutilmoqda…" "Sozlamalaringizni keyinroq o\'zgartirishingiz mumkin." "Bildirishnomalarga ruxsat bering va hech qachon xabarni o\'tkazib yubormang" - "Tiklash kalitini kiriting" diff --git a/features/ftue/impl/src/main/res/values-zh-rTW/translations.xml b/features/ftue/impl/src/main/res/values-zh-rTW/translations.xml index 93ef03932b..6340efdbc3 100644 --- a/features/ftue/impl/src/main/res/values-zh-rTW/translations.xml +++ b/features/ftue/impl/src/main/res/values-zh-rTW/translations.xml @@ -12,5 +12,4 @@ "正在等待其他裝置…" "您稍後仍可變更設定。" "允許通知，永遠不會錯誤任何訊息" - "輸入復原金鑰" diff --git a/features/ftue/impl/src/main/res/values-zh/translations.xml b/features/ftue/impl/src/main/res/values-zh/translations.xml index 1c72ad8c30..669a316243 100644 --- a/features/ftue/impl/src/main/res/values-zh/translations.xml +++ b/features/ftue/impl/src/main/res/values-zh/translations.xml @@ -12,5 +12,4 @@ "正在等待其他设备……" "您可以稍后更改设置。" "允许通知，绝不错过任何消息" - "输入恢复密钥" diff --git a/features/ftue/impl/src/main/res/values/localazy.xml b/features/ftue/impl/src/main/res/values/localazy.xml index 159d5792a1..8e208278a0 100644 --- a/features/ftue/impl/src/main/res/values/localazy.xml +++ b/features/ftue/impl/src/main/res/values/localazy.xml @@ -12,5 +12,4 @@ "Waiting on other device…" "You can change your settings later." "Allow notifications and never miss a message" - "Enter recovery key" diff --git a/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSessionVerificationModePresenterTest.kt b/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSessionVerificationModePresenterTest.kt index c95c455bfd..697c51f776 100644 --- a/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSessionVerificationModePresenterTest.kt +++ b/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSessionVerificationModePresenterTest.kt @@ -47,7 +47,7 @@ class ChooseSessionVerificationModePresenterTest { assertThat(awaitItem().buttonsState.dataOrNull()).isEqualTo( ChooseSelfVerificationModeState.ButtonsState( canUseAnotherDevice = false, - canEnterRecoveryKey = false, + canUseRecoveryKey = false, ) ) } @@ -66,7 +66,7 @@ class ChooseSessionVerificationModePresenterTest { assertThat(awaitItem().buttonsState.dataOrNull()).isEqualTo( ChooseSelfVerificationModeState.ButtonsState( canUseAnotherDevice = false, - canEnterRecoveryKey = false, + canUseRecoveryKey = false, ) ) } @@ -85,7 +85,7 @@ class ChooseSessionVerificationModePresenterTest { assertThat(awaitItem().buttonsState.dataOrNull()).isEqualTo( ChooseSelfVerificationModeState.ButtonsState( canUseAnotherDevice = true, - canEnterRecoveryKey = false, + canUseRecoveryKey = false, ) ) } @@ -104,7 +104,7 @@ class ChooseSessionVerificationModePresenterTest { assertThat(awaitItem().buttonsState.dataOrNull()).isEqualTo( ChooseSelfVerificationModeState.ButtonsState( canUseAnotherDevice = false, - canEnterRecoveryKey = true, + canUseRecoveryKey = true, ) ) } diff --git a/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSessionVerificationModeViewTest.kt b/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSessionVerificationModeViewTest.kt index f201cb6c41..521bf91b37 100644 --- a/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSessionVerificationModeViewTest.kt +++ b/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSessionVerificationModeViewTest.kt @@ -57,10 +57,10 @@ class ChooseSessionVerificationModeViewTest { fun `clicking on enter recovery key calls the callback`() { ensureCalledOnce { callback -> rule.setChooseSelfVerificationModeView( - aChooseSelfVerificationModeState(AsyncData.Success(aButtonsState(canEnterRecoveryKey = true))), + aChooseSelfVerificationModeState(AsyncData.Success(aButtonsState(canUseRecoveryKey = true))), onEnterRecoveryKey = callback, ) - rule.clickOn(R.string.screen_session_verification_enter_recovery_key) + rule.clickOn(R.string.screen_identity_confirmation_use_recovery_key) } } diff --git a/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_0_en.png index f80e063f19..79a04cabd2 100644 --- a/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_0_en.png +++ b/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_0_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e8ba90f09dc29ee33f1de9e231276c8db99f23e8ad59f1db0a060a29da81d3b9 -size 33160 +oid sha256:2e9a888c7a1f33cfd74fd9c43618a2ce332fe87e3b41854dc441c56efeda3ef4 +size 33140 diff --git a/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_2_en.png index 7e3cd73a63..15a473ed91 100644 --- a/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_2_en.png +++ b/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_2_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba8e5e44efb509da416310497b10e30bb9c05cb84a0a88985ad5491b251b1097 -size 37820 +oid sha256:fc4437cb6325885164c42f83d3fbd4b0611a6a1ae8a6375dc09778541ba79ec1 +size 37789 diff --git a/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_0_en.png index f352d2fb5b..71cf744c55 100644 --- a/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_0_en.png +++ b/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_0_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b1691fe8247aab5a53884e8139da1c63b8fca09a508e39a5b595a8d98d927dd -size 32033 +oid sha256:161e2f9c5fff0819d163460177915f96eef9e097dd7dde73a088d69ac9a46422 +size 32083 diff --git a/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_2_en.png index fd70b706a4..f53e728dd4 100644 --- a/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_2_en.png +++ b/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_2_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:87a4ab294875c56f3ce1e52ad6b9aec050f70b146f7ad1987e4ffef9f64a633f -size 36509 +oid sha256:607317d585a1e676105df799127d467d21443a52cb7c9ade0c68fa880b0ec999 +size 36556 diff --git a/tools/localazy/config.json b/tools/localazy/config.json index e416efd8bc..d9c5e088e1 100644 --- a/tools/localazy/config.json +++ b/tools/localazy/config.json @@ -288,8 +288,7 @@ "includeRegex" : [ "screen_welcome_.*", "screen_notification_optin_.*", - "screen_identity_.*", - "screen_session_verification_enter_recovery_key" + "screen_identity_.*" ] }, {