Merge fixes

Author: ps2

Loop/Managers/Alerts/AlertManager.swift

@@ -785,7 +785,7 @@ extension AlertManager: AlertPermissionsCheckerDelegate {
 
 extension AlertManager {
     func presentConfirmCrashAlert(confirmAction: @escaping (@escaping () -> Void) -> Void) {
-        let alert = UIAlertController(title: "New Study Product Detected", message: "We've detected a new study product is selected. In order to show use this study product, Tidepool Loop will need to restart.", preferredStyle: .alert)
+        let alert = UIAlertController(title: "New Study Product Detected", message: "We've detected a new study product is selected. In order to show use this study product, Loop will need to restart.", preferredStyle: .alert)
         alert.addAction(UIAlertAction(title: "Confirm", style: .default, handler: { _ in
             confirmAction() {
                 fatalError("DEBUG: Resetting Loop")
@@ -797,7 +797,7 @@ extension AlertManager {
     }
 
     func presentCouldNotResetLoopAlert(error: Error) {
-        let alert = UIAlertController(title: "Could Not Restart Tidepool Loop", message: "While trying to restart Tidepool Loop an error occured.\n\n\(error.localizedDescription)", preferredStyle: .alert)
+        let alert = UIAlertController(title: "Could Not Restart Loop", message: "While trying to restart Loop an error occured.\n\n\(error.localizedDescription)", preferredStyle: .alert)
         alert.addAction(UIAlertAction(title: "Cancel", style: .cancel))
 
         alertPresenter.present(alert, animated: true)

Loop/Views/HowMuteAlertWorkView.swift

@@ -32,7 +32,7 @@ When using Mute Alerts, also consider the impact of using iOS Focus Modes.
                                 .background(guidanceColors.warning)
                                 .clipShape(RoundedRectangle(cornerRadius: 5, style: .continuous))
 
-                            Text(NSLocalizedString("Tidepool Loop Mute Alerts", comment: "Section title for description that mute alerts is temporary"))
+                            Text(NSLocalizedString("Loop Mute Alerts", comment: "Section title for description that mute alerts is temporary"))
                                 .bold()
                                 .fixedSize(horizontal: false, vertical: true)
                         }
@@ -52,7 +52,7 @@ After the mute period ends, your alert sounds will resume.
                             Text(NSLocalizedString("iOS Focus Mode", comment: "Section title for description of how mute alerts work with focus mode"))
                                 .bold()
                         }
-                        Text(NSLocalizedString("If iOS Focus Mode is ON and Mute Alerts is OFF, Critical Alerts will still be delivered, but non-Critical Alerts will be silenced until Tidepool Loop is added to each Focus mode as an Allowed App.", comment: "Description of how mute alerts works with focus mode"))
+                        Text(NSLocalizedString("If iOS Focus Mode is ON and Mute Alerts is OFF, Critical Alerts will still be delivered, but non-Critical Alerts will be silenced until Loop is added to each Focus mode as an Allowed App.", comment: "Description of how mute alerts works with focus mode"))
                             .fixedSize(horizontal: false, vertical: true)
                     }
                     .padding()

StatusWidget/StatusWidget.swift

@@ -223,7 +223,6 @@ extension Date {
     }
 }
 
-#if NOT_USED_IN_TIDEPOOL_LOOP
 struct SmallStatusWidget: Widget {
     let kind: String = "SmallStatusWidget"
 
@@ -236,13 +235,10 @@ struct SmallStatusWidget: Widget {
         .supportedFamilies([.systemSmall])
     }
 }
-#endif
 
 @main
 struct SmallStatusWidgets: WidgetBundle {
     var body: some Widget {
-#if NOT_USED_IN_TIDEPOOL_LOOP
         SmallStatusWidget()
-#endif
    }
 }