diff --git a/Session/Home/HomeVC.swift b/Session/Home/HomeVC.swift index a7bf43470..c9f942da7 100644 --- a/Session/Home/HomeVC.swift +++ b/Session/Home/HomeVC.swift @@ -811,9 +811,7 @@ final class HomeVC: BaseVC, SessionUtilRespondingViewController, UITableViewData if let recoveryPasswordView: RecoveryPasswordView = try? RecoveryPasswordView() { let viewController: SessionHostingViewController = SessionHostingViewController(rootView: recoveryPasswordView) viewController.setNavBarTitle("recovery_password_title".localized()) - self.navigationController?.pushViewController(viewController, animated: true) { - Storage.shared.writeAsync { db in db[.hasViewedSeed] = true } - } + self.navigationController?.pushViewController(viewController, animated: true) } else { let targetViewController: UIViewController = ConfirmationModal( info: ConfirmationModal.Info( diff --git a/Session/Meta/Translations/ar.lproj/Localizable.strings b/Session/Meta/Translations/ar.lproj/Localizable.strings index 63a066b81..3f9cc99b8 100644 --- a/Session/Meta/Translations/ar.lproj/Localizable.strings +++ b/Session/Meta/Translations/ar.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/be.lproj/Localizable.strings b/Session/Meta/Translations/be.lproj/Localizable.strings index 46d142257..e6c43fc13 100644 --- a/Session/Meta/Translations/be.lproj/Localizable.strings +++ b/Session/Meta/Translations/be.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/bg.lproj/Localizable.strings b/Session/Meta/Translations/bg.lproj/Localizable.strings index 4aad63b65..98ea8685e 100644 --- a/Session/Meta/Translations/bg.lproj/Localizable.strings +++ b/Session/Meta/Translations/bg.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/bn.lproj/Localizable.strings b/Session/Meta/Translations/bn.lproj/Localizable.strings index ff24a22b8..877f1a928 100644 --- a/Session/Meta/Translations/bn.lproj/Localizable.strings +++ b/Session/Meta/Translations/bn.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/cs.lproj/Localizable.strings b/Session/Meta/Translations/cs.lproj/Localizable.strings index 777c08e54..851f2140a 100644 --- a/Session/Meta/Translations/cs.lproj/Localizable.strings +++ b/Session/Meta/Translations/cs.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/da.lproj/Localizable.strings b/Session/Meta/Translations/da.lproj/Localizable.strings index b62f22f79..8ddca521c 100644 --- a/Session/Meta/Translations/da.lproj/Localizable.strings +++ b/Session/Meta/Translations/da.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/de.lproj/Localizable.strings b/Session/Meta/Translations/de.lproj/Localizable.strings index c763fdc3c..8a21b5cec 100644 --- a/Session/Meta/Translations/de.lproj/Localizable.strings +++ b/Session/Meta/Translations/de.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/el.lproj/Localizable.strings b/Session/Meta/Translations/el.lproj/Localizable.strings index 986c3c48d..0a136ea4a 100644 --- a/Session/Meta/Translations/el.lproj/Localizable.strings +++ b/Session/Meta/Translations/el.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/en.lproj/Localizable.strings b/Session/Meta/Translations/en.lproj/Localizable.strings index e38a71f60..7a6848ff7 100644 --- a/Session/Meta/Translations/en.lproj/Localizable.strings +++ b/Session/Meta/Translations/en.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/eo.lproj/Localizable.strings b/Session/Meta/Translations/eo.lproj/Localizable.strings index 8b70ba50a..a4cb3fd03 100644 --- a/Session/Meta/Translations/eo.lproj/Localizable.strings +++ b/Session/Meta/Translations/eo.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/es-ES.lproj/Localizable.strings b/Session/Meta/Translations/es-ES.lproj/Localizable.strings index c3dc29866..08e0e0bf1 100644 --- a/Session/Meta/Translations/es-ES.lproj/Localizable.strings +++ b/Session/Meta/Translations/es-ES.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/fa.lproj/Localizable.strings b/Session/Meta/Translations/fa.lproj/Localizable.strings index cc692b7dc..018efb08b 100644 --- a/Session/Meta/Translations/fa.lproj/Localizable.strings +++ b/Session/Meta/Translations/fa.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/fi.lproj/Localizable.strings b/Session/Meta/Translations/fi.lproj/Localizable.strings index 38defb112..458785560 100644 --- a/Session/Meta/Translations/fi.lproj/Localizable.strings +++ b/Session/Meta/Translations/fi.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/fil.lproj/Localizable.strings b/Session/Meta/Translations/fil.lproj/Localizable.strings index fd31b55fb..73ec4bdba 100644 --- a/Session/Meta/Translations/fil.lproj/Localizable.strings +++ b/Session/Meta/Translations/fil.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/fr.lproj/Localizable.strings b/Session/Meta/Translations/fr.lproj/Localizable.strings index 2a304343b..019b655ad 100644 --- a/Session/Meta/Translations/fr.lproj/Localizable.strings +++ b/Session/Meta/Translations/fr.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/hi.lproj/Localizable.strings b/Session/Meta/Translations/hi.lproj/Localizable.strings index 763dc100f..fed485b96 100644 --- a/Session/Meta/Translations/hi.lproj/Localizable.strings +++ b/Session/Meta/Translations/hi.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/hr.lproj/Localizable.strings b/Session/Meta/Translations/hr.lproj/Localizable.strings index 5399a0fb2..d28da1ec6 100644 --- a/Session/Meta/Translations/hr.lproj/Localizable.strings +++ b/Session/Meta/Translations/hr.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/hu.lproj/Localizable.strings b/Session/Meta/Translations/hu.lproj/Localizable.strings index 279700c08..91fb0e039 100644 --- a/Session/Meta/Translations/hu.lproj/Localizable.strings +++ b/Session/Meta/Translations/hu.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/id.lproj/Localizable.strings b/Session/Meta/Translations/id.lproj/Localizable.strings index bd5b25174..76e6dfb13 100644 --- a/Session/Meta/Translations/id.lproj/Localizable.strings +++ b/Session/Meta/Translations/id.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/it.lproj/Localizable.strings b/Session/Meta/Translations/it.lproj/Localizable.strings index 6e7ce455e..0ac5fe9c2 100644 --- a/Session/Meta/Translations/it.lproj/Localizable.strings +++ b/Session/Meta/Translations/it.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/ja.lproj/Localizable.strings b/Session/Meta/Translations/ja.lproj/Localizable.strings index 53e25e915..68c0a5046 100644 --- a/Session/Meta/Translations/ja.lproj/Localizable.strings +++ b/Session/Meta/Translations/ja.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/ko.lproj/Localizable.strings b/Session/Meta/Translations/ko.lproj/Localizable.strings index e4977c738..ce3ff4f82 100644 --- a/Session/Meta/Translations/ko.lproj/Localizable.strings +++ b/Session/Meta/Translations/ko.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/ku.lproj/Localizable.strings b/Session/Meta/Translations/ku.lproj/Localizable.strings index c9c8547ce..6f40ec1c3 100644 --- a/Session/Meta/Translations/ku.lproj/Localizable.strings +++ b/Session/Meta/Translations/ku.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/lt.lproj/Localizable.strings b/Session/Meta/Translations/lt.lproj/Localizable.strings index a9eb32633..123df26f4 100644 --- a/Session/Meta/Translations/lt.lproj/Localizable.strings +++ b/Session/Meta/Translations/lt.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/lv.lproj/Localizable.strings b/Session/Meta/Translations/lv.lproj/Localizable.strings index 6c8401512..bbc486bef 100644 --- a/Session/Meta/Translations/lv.lproj/Localizable.strings +++ b/Session/Meta/Translations/lv.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/ne-NP.lproj/Localizable.strings b/Session/Meta/Translations/ne-NP.lproj/Localizable.strings index ab608e50e..a6bdbcd58 100644 --- a/Session/Meta/Translations/ne-NP.lproj/Localizable.strings +++ b/Session/Meta/Translations/ne-NP.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/nl.lproj/Localizable.strings b/Session/Meta/Translations/nl.lproj/Localizable.strings index e6b162116..a181dc12d 100644 --- a/Session/Meta/Translations/nl.lproj/Localizable.strings +++ b/Session/Meta/Translations/nl.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/no.lproj/Localizable.strings b/Session/Meta/Translations/no.lproj/Localizable.strings index 3ef772c2f..0f357acb6 100644 --- a/Session/Meta/Translations/no.lproj/Localizable.strings +++ b/Session/Meta/Translations/no.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/pl.lproj/Localizable.strings b/Session/Meta/Translations/pl.lproj/Localizable.strings index 8561c77f6..802e53d86 100644 --- a/Session/Meta/Translations/pl.lproj/Localizable.strings +++ b/Session/Meta/Translations/pl.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/pt-BR.lproj/Localizable.strings b/Session/Meta/Translations/pt-BR.lproj/Localizable.strings index a89b8ebf3..32e8b3ec6 100644 --- a/Session/Meta/Translations/pt-BR.lproj/Localizable.strings +++ b/Session/Meta/Translations/pt-BR.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/pt-PT.lproj/Localizable.strings b/Session/Meta/Translations/pt-PT.lproj/Localizable.strings index fd9b66744..21f8e0ef7 100644 --- a/Session/Meta/Translations/pt-PT.lproj/Localizable.strings +++ b/Session/Meta/Translations/pt-PT.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/ro.lproj/Localizable.strings b/Session/Meta/Translations/ro.lproj/Localizable.strings index a8d217459..c7325f2b8 100644 --- a/Session/Meta/Translations/ro.lproj/Localizable.strings +++ b/Session/Meta/Translations/ro.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/ru.lproj/Localizable.strings b/Session/Meta/Translations/ru.lproj/Localizable.strings index c96ad942e..c7906f528 100644 --- a/Session/Meta/Translations/ru.lproj/Localizable.strings +++ b/Session/Meta/Translations/ru.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/si-LK.lproj/Localizable.strings b/Session/Meta/Translations/si-LK.lproj/Localizable.strings index 5ad0b30ba..8db4bad3d 100644 --- a/Session/Meta/Translations/si-LK.lproj/Localizable.strings +++ b/Session/Meta/Translations/si-LK.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/sk.lproj/Localizable.strings b/Session/Meta/Translations/sk.lproj/Localizable.strings index 91c8373b6..e2135dff6 100644 --- a/Session/Meta/Translations/sk.lproj/Localizable.strings +++ b/Session/Meta/Translations/sk.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/sl.lproj/Localizable.strings b/Session/Meta/Translations/sl.lproj/Localizable.strings index 09fb70764..4835a23c2 100644 --- a/Session/Meta/Translations/sl.lproj/Localizable.strings +++ b/Session/Meta/Translations/sl.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/sv-SE.lproj/Localizable.strings b/Session/Meta/Translations/sv-SE.lproj/Localizable.strings index fc00cc824..c1055ecca 100644 --- a/Session/Meta/Translations/sv-SE.lproj/Localizable.strings +++ b/Session/Meta/Translations/sv-SE.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/th.lproj/Localizable.strings b/Session/Meta/Translations/th.lproj/Localizable.strings index eef445f99..424d08d85 100644 --- a/Session/Meta/Translations/th.lproj/Localizable.strings +++ b/Session/Meta/Translations/th.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/tr.lproj/Localizable.strings b/Session/Meta/Translations/tr.lproj/Localizable.strings index b9902cff1..ee499dc11 100644 --- a/Session/Meta/Translations/tr.lproj/Localizable.strings +++ b/Session/Meta/Translations/tr.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/uk.lproj/Localizable.strings b/Session/Meta/Translations/uk.lproj/Localizable.strings index 4ab070bf6..8737ff8d4 100644 --- a/Session/Meta/Translations/uk.lproj/Localizable.strings +++ b/Session/Meta/Translations/uk.lproj/Localizable.strings @@ -859,3 +859,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_warning_1" = "Without your recovery password, you cannot load your account on new devices."; "hide_recovery_password_modal_warning_2" = "We strongly recommend you save your recovery password in a safe and secure place before continuing."; "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/vi.lproj/Localizable.strings b/Session/Meta/Translations/vi.lproj/Localizable.strings index 10b1c72bd..fe0c14359 100644 --- a/Session/Meta/Translations/vi.lproj/Localizable.strings +++ b/Session/Meta/Translations/vi.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/zh-CN.lproj/Localizable.strings b/Session/Meta/Translations/zh-CN.lproj/Localizable.strings index 41a8b5e91..f72a8bd0d 100644 --- a/Session/Meta/Translations/zh-CN.lproj/Localizable.strings +++ b/Session/Meta/Translations/zh-CN.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Meta/Translations/zh-TW.lproj/Localizable.strings b/Session/Meta/Translations/zh-TW.lproj/Localizable.strings index 26dc635de..441911c81 100644 --- a/Session/Meta/Translations/zh-TW.lproj/Localizable.strings +++ b/Session/Meta/Translations/zh-TW.lproj/Localizable.strings @@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message "hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone."; "view_qr_code_button_title" = "View QR"; "view_mnemonic_button_title" = "View Password"; +"yes_button_title" = "Yes"; diff --git a/Session/Onboarding/Onboarding.swift b/Session/Onboarding/Onboarding.swift index 22aa5d0b4..2fd3dfaef 100644 --- a/Session/Onboarding/Onboarding.swift +++ b/Session/Onboarding/Onboarding.swift @@ -160,6 +160,7 @@ enum Onboarding { // Clear any data which gets set during Onboarding Storage.shared.write { db in db[.hasViewedSeed] = false + db[.hideRecoveryPasswordPermanently] = false try SessionThread.deleteAll(db) try Profile.deleteAll(db) diff --git a/Session/Settings/RecoveryPasswordView.swift b/Session/Settings/RecoveryPasswordView.swift index 7da766ec7..b8a646770 100644 --- a/Session/Settings/RecoveryPasswordView.swift +++ b/Session/Settings/RecoveryPasswordView.swift @@ -206,7 +206,7 @@ struct RecoveryPasswordView: View { ) Button { - + hideRecoveryPassword() } label: { Text("hide_button_title".localized()) .bold() @@ -226,7 +226,10 @@ struct RecoveryPasswordView: View { } } .padding(.horizontal, Values.largeSpacing) + .padding(.vertical, Values.mediumSpacing) } + }.onAppear { + Storage.shared.writeAsync { db in db[.hasViewedSeed] = true } } } @@ -234,10 +237,51 @@ struct RecoveryPasswordView: View { UIPasteboard.general.string = self.mnemonic self.copied = true } + + private func hideRecoveryPassword() { + let modal: ConfirmationModal = ConfirmationModal( + info: ConfirmationModal.Info( + title: "hide_recovery_password_modal_title".localized(), + body: .text( + "hide_recovery_password_modal_warning_1".localized() + + "\n\n" + + "hide_recovery_password_modal_warning_2".localized() + ), + confirmTitle: "continue_2".localized(), + confirmStyle: .danger, + cancelStyle: .textPrimary, + onConfirm: { modal in + guard let presentingViewController: UIViewController = modal.presentingViewController else { + return + } + + let continueModal: ConfirmationModal = ConfirmationModal( + info: ConfirmationModal.Info( + title: "hide_recovery_password_modal_title".localized(), + body: .text("hide_recovery_password_modal_confirmation".localized()), + confirmTitle: "TXT_CANCEL_TITLE".localized(), + confirmStyle: .textPrimary, + cancelTitle: "yes_button_title".localized(), + cancelStyle: .danger, + onCancel: { modal in + modal.dismiss(animated: true) { + Storage.shared.writeAsync { db in db[.hideRecoveryPasswordPermanently] = true } + self.host.controller?.navigationController?.popViewController(animated: true) + } + } + ) + ) + + return presentingViewController.present(continueModal, animated: true, completion: nil) + } + ) + ) + self.host.controller?.present(modal, animated: true) + } } struct RecoveryPasswordView_Previews: PreviewProvider { static var previews: some View { - RecoveryPasswordView(hardcode: "Voyage urban toyed maverick peculiar tuxedo penguin tree grass building listen speak withdraw terminal plane ") + RecoveryPasswordView(hardcode: "Voyage urban toyed maverick peculiar tuxedo penguin tree grass building listen speak withdraw terminal plane") } } diff --git a/Session/Settings/SettingsViewModel.swift b/Session/Settings/SettingsViewModel.swift index 9589701c8..4608aabd3 100644 --- a/Session/Settings/SettingsViewModel.swift +++ b/Session/Settings/SettingsViewModel.swift @@ -215,14 +215,21 @@ class SettingsViewModel: SessionTableViewModel, NavigationItemSource, Navigatabl .eraseToAnyPublisher() // MARK: - Content + private struct State: Equatable { + let profile: Profile + let hideRecoveryPasswordPermanently: Bool + } let title: String = "vc_settings_title".localized() lazy var observation: TargetObservation = ObservationBuilder - .databaseObservation(self) { [weak self, dependencies] db -> Profile in - Profile.fetchOrCreateCurrentUser(db, using: dependencies) + .databaseObservation(self) { [weak self, dependencies] db -> State in + State( + profile: Profile.fetchOrCreateCurrentUser(db, using: dependencies), + hideRecoveryPasswordPermanently: db[.hideRecoveryPasswordPermanently] + ) } - .map { [weak self] profile -> [SectionModel] in + .map { [weak self] state -> [SectionModel] in return [ SectionModel( model: .profileInfo, @@ -230,9 +237,9 @@ class SettingsViewModel: SessionTableViewModel, NavigationItemSource, Navigatabl SessionCell.Info( id: .avatar, accessory: .profile( - id: profile.id, + id: state.profile.id, size: .hero, - profile: profile + profile: state.profile ), styling: SessionCell.StyleInfo( alignment: .centerHugging, @@ -243,13 +250,13 @@ class SettingsViewModel: SessionTableViewModel, NavigationItemSource, Navigatabl label: "Profile picture" ), onTap: { - self?.updateProfilePicture(currentFileName: profile.profilePictureFileName) + self?.updateProfilePicture(currentFileName: state.profile.profilePictureFileName) } ), SessionCell.Info( id: .profileName, title: SessionCell.TextInfo( - profile.displayName(), + state.profile.displayName(), font: .titleLarge, alignment: .center, interaction: .editable @@ -261,7 +268,7 @@ class SettingsViewModel: SessionTableViewModel, NavigationItemSource, Navigatabl ), accessibility: Accessibility( identifier: "Username", - label: profile.displayName() + label: state.profile.displayName() ), onTap: { self?.setIsEditing(true) } ) @@ -273,7 +280,7 @@ class SettingsViewModel: SessionTableViewModel, NavigationItemSource, Navigatabl SessionCell.Info( id: .sessionId, title: SessionCell.TextInfo( - profile.id, + state.profile.id, font: .monoLarge, alignment: .center, interaction: .copy @@ -284,7 +291,7 @@ class SettingsViewModel: SessionTableViewModel, NavigationItemSource, Navigatabl ), accessibility: Accessibility( identifier: "Session ID", - label: profile.id + label: state.profile.id ) ), SessionCell.Info( @@ -293,14 +300,14 @@ class SettingsViewModel: SessionTableViewModel, NavigationItemSource, Navigatabl style: .bordered, title: "copy".localized(), run: { button in - self?.copySessionId(profile.id, button: button) + self?.copySessionId(state.profile.id, button: button) } ), rightAccessory: .button( style: .bordered, title: "share".localized(), run: { _ in - self?.shareSessionId(profile.id) + self?.shareSessionId(state.profile.id) } ), styling: SessionCell.StyleInfo( @@ -406,7 +413,7 @@ class SettingsViewModel: SessionTableViewModel, NavigationItemSource, Navigatabl ), title: "vc_settings_invite_a_friend_button_title".localized(), onTap: { - let invitation: String = "Hey, I've been using Session to chat with complete privacy and security. Come join me! Download it at https://getsession.org/. My Session ID is \(profile.id) !" + let invitation: String = "Hey, I've been using Session to chat with complete privacy and security. Come join me! Download it at https://getsession.org/. My Session ID is \(state.profile.id) !" self?.transitionToScreen( UIActivityViewController( @@ -416,7 +423,9 @@ class SettingsViewModel: SessionTableViewModel, NavigationItemSource, Navigatabl transitionType: .present ) } - ), + ) + ].appending( + state.hideRecoveryPasswordPermanently ? nil : SessionCell.Info( id: .recoveryPhrase, leftAccessory: .icon( @@ -441,33 +450,36 @@ class SettingsViewModel: SessionTableViewModel, NavigationItemSource, Navigatabl self?.transitionToScreen(targetViewController, transitionType: .present) } } - ), - SessionCell.Info( - id: .help, - leftAccessory: .icon( - UIImage(named: "icon_help")? - .withRenderingMode(.alwaysTemplate) - ), - title: "HELP_TITLE".localized(), - onTap: { - self?.transitionToScreen( - SessionTableViewController(viewModel: HelpViewModel()) - ) - } - ), - SessionCell.Info( - id: .clearData, - leftAccessory: .icon( - UIImage(named: "icon_bin")? - .withRenderingMode(.alwaysTemplate) - ), - title: "vc_settings_clear_all_data_button_title".localized(), - styling: SessionCell.StyleInfo(tintColor: .danger), - onTap: { - self?.transitionToScreen(NukeDataModal(), transitionType: .present) - } ) - ] + ).appending( + contentsOf: [ + SessionCell.Info( + id: .help, + leftAccessory: .icon( + UIImage(named: "icon_help")? + .withRenderingMode(.alwaysTemplate) + ), + title: "HELP_TITLE".localized(), + onTap: { + self?.transitionToScreen( + SessionTableViewController(viewModel: HelpViewModel()) + ) + } + ), + SessionCell.Info( + id: .clearData, + leftAccessory: .icon( + UIImage(named: "icon_bin")? + .withRenderingMode(.alwaysTemplate) + ), + title: "vc_settings_clear_all_data_button_title".localized(), + styling: SessionCell.StyleInfo(tintColor: .danger), + onTap: { + self?.transitionToScreen(NukeDataModal(), transitionType: .present) + } + ) + ] + ) ) ] } diff --git a/SessionMessagingKit/Utilities/Preferences.swift b/SessionMessagingKit/Utilities/Preferences.swift index 4713e8ce1..03e2283ab 100644 --- a/SessionMessagingKit/Utilities/Preferences.swift +++ b/SessionMessagingKit/Utilities/Preferences.swift @@ -53,6 +53,9 @@ public extension Setting.BoolKey { /// A flag indicating whether the user has ever viewed their seed static let hasViewedSeed: Setting.BoolKey = "hasViewedSeed" + /// A flag indicating whether the user hides the recovery password permanently + static let hideRecoveryPasswordPermanently: Setting.BoolKey = "hideRecoveryPasswordPermanently" + /// A flag indicating whether the user has ever saved a thread static let hasSavedThread: Setting.BoolKey = "hasSavedThread" diff --git a/SessionUIKit/Components/ConfirmationModal.swift b/SessionUIKit/Components/ConfirmationModal.swift index a7f4088d7..8d224f2c9 100644 --- a/SessionUIKit/Components/ConfirmationModal.swift +++ b/SessionUIKit/Components/ConfirmationModal.swift @@ -113,9 +113,9 @@ public class ConfirmationModal: Modal, UITextFieldDelegate { result.isLayoutMarginsRelativeArrangement = true result.layoutMargins = UIEdgeInsets( top: Values.largeSpacing, - left: Values.largeSpacing, + left: Values.veryLargeSpacing, bottom: Values.verySmallSpacing, - right: Values.largeSpacing + right: Values.veryLargeSpacing ) return result