From 202d8a1f07953fd574da30f48eb1c0503793bfee Mon Sep 17 00:00:00 2001
From: Pete Walters <pete@signal.org>
Date: Tue, 2 Jun 2026 13:00:37 -0500
Subject: [PATCH] Add two separate modes to the Safety Tip screen

Co-authored-by: Max Radermacher <max@signal.org>
---
 ...onViewController+CVComponentDelegate.swift |   1 +
 .../safetytip_48_04.imageset/Contents.json    |  12 +++++
 .../safetytip_48_pin.pdf                      | Bin 0 -> 4760 bytes
 .../safetytip_48_05.imageset/Contents.json    |  12 +++++
 .../safetytip_48_lock.pdf                     | Bin 0 -> 5289 bytes
 .../HomeView/Chat List/SafetyTipsSheet.swift  |   1 +
 .../SafetyTipsViewController.swift            |  44 ++++++++++++++++--
 .../translations/en.lproj/Localizable.strings |  12 +++++
 8 files changed, 79 insertions(+), 3 deletions(-)
 create mode 100644 Signal/Images.xcassets/safety-tips/safetytip_48_04.imageset/Contents.json
 create mode 100644 Signal/Images.xcassets/safety-tips/safetytip_48_04.imageset/safetytip_48_pin.pdf
 create mode 100644 Signal/Images.xcassets/safety-tips/safetytip_48_05.imageset/Contents.json
 create mode 100644 Signal/Images.xcassets/safety-tips/safetytip_48_05.imageset/safetytip_48_lock.pdf

diff --git a/Signal/ConversationView/ConversationViewController+CVComponentDelegate.swift b/Signal/ConversationView/ConversationViewController+CVComponentDelegate.swift
index afe7268ac7..9a9ea63f0b 100644
--- a/Signal/ConversationView/ConversationViewController+CVComponentDelegate.swift
+++ b/Signal/ConversationView/ConversationViewController+CVComponentDelegate.swift
@@ -1409,6 +1409,7 @@ extension ConversationViewController: CVComponentDelegate {
 
     public func didTapSafetyTips() {
         let viewController = SafetyTipsViewController(
+            mode: .messageRequest,
             primaryButton: SafetyTipsViewController.Button(
                 title: CommonStrings.viewMoreButton,
                 action: { [weak self] in
diff --git a/Signal/Images.xcassets/safety-tips/safetytip_48_04.imageset/Contents.json b/Signal/Images.xcassets/safety-tips/safetytip_48_04.imageset/Contents.json
new file mode 100644
index 0000000000..f5eeee6179
--- /dev/null
+++ b/Signal/Images.xcassets/safety-tips/safetytip_48_04.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "safetytip_48_pin.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Signal/Images.xcassets/safety-tips/safetytip_48_04.imageset/safetytip_48_pin.pdf b/Signal/Images.xcassets/safety-tips/safetytip_48_04.imageset/safetytip_48_pin.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..478d06b2a89044235bed9a3380edc516f6ad6eca
GIT binary patch
literal 4760
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

literal 0
HcmV?d00001

diff --git a/Signal/Images.xcassets/safety-tips/safetytip_48_05.imageset/Contents.json b/Signal/Images.xcassets/safety-tips/safetytip_48_05.imageset/Contents.json
new file mode 100644
index 0000000000..ebce133e4e
--- /dev/null
+++ b/Signal/Images.xcassets/safety-tips/safetytip_48_05.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "safetytip_48_lock.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Signal/Images.xcassets/safety-tips/safetytip_48_05.imageset/safetytip_48_lock.pdf b/Signal/Images.xcassets/safety-tips/safetytip_48_05.imageset/safetytip_48_lock.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..a956d60cabac8a7408caa665b8afe7a00966b614
GIT binary patch
literal 5289
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
Jr7hdc{saBx;GO^g

literal 0
HcmV?d00001

diff --git a/Signal/src/ViewControllers/HomeView/Chat List/SafetyTipsSheet.swift b/Signal/src/ViewControllers/HomeView/Chat List/SafetyTipsSheet.swift
index 1581661a45..5fc1adbbe7 100644
--- a/Signal/src/ViewControllers/HomeView/Chat List/SafetyTipsSheet.swift	
+++ b/Signal/src/ViewControllers/HomeView/Chat List/SafetyTipsSheet.swift	
@@ -50,6 +50,7 @@ enum SafetyTipsSheet {
             ),
             handler: { [weak fromViewController] _ in
                 let safetyTipsVC = SafetyTipsViewController(
+                    mode: .smsRequest,
                     primaryButton: SafetyTipsViewController.Button(
                         title: OWSLocalizedString(
                             "SETTINGS_ACCOUNT_BUTTON",
diff --git a/Signal/src/ViewControllers/SafetyTipsViewController.swift b/Signal/src/ViewControllers/SafetyTipsViewController.swift
index 1869ec1c13..c846519e1a 100644
--- a/Signal/src/ViewControllers/SafetyTipsViewController.swift
+++ b/Signal/src/ViewControllers/SafetyTipsViewController.swift
@@ -12,6 +12,11 @@ public enum SafetyTipsType {
     case group
 }
 
+public enum SafetyTipsMode {
+    case smsRequest
+    case messageRequest
+}
+
 public class SafetyTipsViewController: InteractiveSheetViewController, UIScrollViewDelegate {
     public struct Button {
         let title: String
@@ -20,15 +25,19 @@ public class SafetyTipsViewController: InteractiveSheetViewController, UIScrollV
 
     override public var placeOnGlassIfAvailable: Bool { true }
     let primaryButton: Button
+    let mode: SafetyTipsMode
 
-    init(primaryButton: Button) {
+    init(mode: SafetyTipsMode, primaryButton: Button) {
+        self.mode = mode
         self.primaryButton = primaryButton
     }
 
-    private enum SafetyTips: CaseIterable {
+    private enum SafetyTips {
         case chatsFromSignal
         case reviewNames
         case scams
+        case keepVerificationCodeSafe
+        case enableReglock
 
         var image: UIImage? {
             switch self {
@@ -38,6 +47,10 @@ public class SafetyTipsViewController: InteractiveSheetViewController, UIScrollV
                 return UIImage(resource: .safetytip4802)
             case .scams:
                 return UIImage(resource: .safetytip4803)
+            case .keepVerificationCodeSafe:
+                return UIImage(resource: .safetytip4804)
+            case .enableReglock:
+                return UIImage(resource: .safetytip4805)
             }
         }
 
@@ -58,6 +71,16 @@ public class SafetyTipsViewController: InteractiveSheetViewController, UIScrollV
                     "SAFETY_TIPS_LOOK_OUT_FOR_SCAMS_TITLE",
                     comment: "Message title describing the scams safety tip.",
                 )
+            case .keepVerificationCodeSafe:
+                return OWSLocalizedString(
+                    "SAFETY_TIPS_KEEP_CODE_SAFE_TITLE",
+                    comment: "Message title describing the keeping codes safe safety tip.",
+                )
+            case .enableReglock:
+                return OWSLocalizedString(
+                    "SAFETY_TIPS_ENABLE_REGLOCK_TITLE",
+                    comment: "Message title describing the enable reglock safety tip.",
+                )
             }
         }
 
@@ -78,6 +101,16 @@ public class SafetyTipsViewController: InteractiveSheetViewController, UIScrollV
                     "SAFETY_TIPS_LOOK_OUT_FOR_SCAMS_BODY",
                     comment: "Message body describing the scams safety tip.",
                 )
+            case .keepVerificationCodeSafe:
+                return OWSLocalizedString(
+                    "SAFETY_TIPS_KEEP_CODE_SAFE_BODY",
+                    comment: "Message body describing the keeping codes safe safety tip.",
+                )
+            case .enableReglock:
+                return OWSLocalizedString(
+                    "SAFETY_TIPS_ENABLE_REGLOCK_BODY",
+                    comment: "Message body describing the enable reglock safety tip.",
+                )
             }
         }
     }
@@ -129,7 +162,12 @@ public class SafetyTipsViewController: InteractiveSheetViewController, UIScrollV
             stackView.widthAnchor.constraint(equalTo: contentScrollView.frameLayoutGuide.widthAnchor, constant: -48),
         ])
 
-        for bullet in SafetyTips.allCases {
+        let cases: [SafetyTips] = switch mode {
+        case .smsRequest: [.chatsFromSignal, .keepVerificationCodeSafe, .enableReglock]
+        case .messageRequest: [.chatsFromSignal, .reviewNames, .scams]
+        }
+
+        for bullet in cases {
             let bulletView = SafetyBulletView(bullet)
             stackView.addArrangedSubview(bulletView)
         }
diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings
index 351101e7a6..8b60eec917 100644
--- a/Signal/translations/en.lproj/Localizable.strings
+++ b/Signal/translations/en.lproj/Localizable.strings
@@ -7993,6 +7993,12 @@
 /* Message title describing the crypto safety tip. */
 "SAFETY_TIPS_CRYPTO_TITLE" = "Crypto or money scams";
 
+/* Message body describing the enable reglock safety tip. */
+"SAFETY_TIPS_ENABLE_REGLOCK_BODY" = "Protect your account by requiring your Signal PIN, in addition to your verification code, when registering with Signal.";
+
+/* Message title describing the enable reglock safety tip. */
+"SAFETY_TIPS_ENABLE_REGLOCK_TITLE" = "Turn on registration lock in account settings";
+
 /* Message contents for the safety tip concerning fake businesses. */
 "SAFETY_TIPS_FAKE_BUSINESS_BODY" = "Be careful of businesses or government agencies contacting you. Messages involving tax agencies, couriers, and more can be spam.";
 
@@ -8002,6 +8008,12 @@
 /* Title for Safety Tips education screen. */
 "SAFETY_TIPS_HEADER_TITLE" = "Safety Tips";
 
+/* Message body describing the keeping codes safe safety tip. */
+"SAFETY_TIPS_KEEP_CODE_SAFE_BODY" = "If you received a verification code you didn’t request, someone may be attempting to access your account. Do not share your code.";
+
+/* Message title describing the keeping codes safe safety tip. */
+"SAFETY_TIPS_KEEP_CODE_SAFE_TITLE" = "Keep your verification code safe";
+
 /* Message body describing the scams safety tip. */
 "SAFETY_TIPS_LOOK_OUT_FOR_SCAMS_BODY" = "Avoid vague messages that try to get you to reply. Be aware of financial tips and suspicious web links.";