Adding Subscribe type callout VPN subscription

Sources/Brave/Frontend/Browser/BrowserViewController/BrowserViewController+Callout.swift

@@ -20,7 +20,9 @@ extension BrowserViewController {
 
   // Priority: P3A - Bottom Bar - VPN - Default Browser - Rewards - Cookie Notification - Link Receipt
   func presentFullScreenCallouts() {
-    presentVPNChurnPromoCallout(for: .autoRenewSoonExpire)
+    for type in FullScreenCalloutType.allCases {
+      presentScreenCallout(for: type)
+    }
   }
 
   private func presentScreenCallout(for type: FullScreenCalloutType, skipSafeGuards: Bool = false) {

Sources/BraveStrings/BraveStrings.swift

@@ -2968,8 +2968,7 @@ extension Strings {
       NSLocalizedString("vpn.vpnRegionSelectorButtonSubTitle", tableName: "BraveShared", bundle: .module,
         value: "Current Setting: %@",
         comment: "Button subtitle for VPN region selection in menu. %@ will be replaced with country name or automatic ex: Current Setting: Automatic")
-
-
+
     public static let autoRenewSoonExpirePopOverTitle =
       NSLocalizedString("vpn.autoRenewSoonExpireTitle", tableName: "BraveShared", bundle: .module,
         value: "Oh no! Your Brave VPN subscription is about to expire.",
@@ -3024,6 +3023,41 @@ extension Strings {
       NSLocalizedString("vpn.updatePaymentActionButtonTitle", tableName: "BraveShared", bundle: .module,
         value: "Update Payment",
         comment: "Action button title that updates method payment")
+
+    public static let subscribeVPNActionButtonTitle =
+      NSLocalizedString("vpn.subscribeVPNActionButtonTitle", tableName: "BraveShared", bundle: .module,
+        value: "Subscribe Now",
+        comment: "Action button title that subscribe action for VPN purchase")
+
+    public static let subscribeVPNDiscountPopOverTitle =
+      NSLocalizedString("vpn.subscribeVPNDiscountPopOverTitle", tableName: "BraveShared", bundle: .module,
+        value: "Give Brave VPN another try and get 20% off for 3 months!",
+        comment: "Pop up title for subscribing VPN with discount")
+
+    public static let subscribeVPNProtectionPopOverTitle =
+      NSLocalizedString("vpn.subscribeVPNProtectionPopOverTitle", tableName: "BraveShared", bundle: .module,
+        value: "Did you know that Brave VPN protects you outside of Brave Browser?",
+        comment: "Pop up title for subscribing VPN explaning VPN protects user outside the Brave")
+
+    public static let subscribeVPNAllDevicesPopOverTitle =
+      NSLocalizedString("vpn.subscribeVPNAllDevicesPopOverTitle", tableName: "BraveShared", bundle: .module,
+        value: "Now, use Brave VPN on all your devices for the same price!",
+        comment: "Pop up title the subscription for VPN can be used for all platforms")
+
+    public static let subscribeVPNProtectionPopOverDescription =
+      NSLocalizedString("vpn.subscribeVPNProtectionPopOverDescription", tableName: "BraveShared", bundle: .module,
+        value: "Brave VPN has always blocked trackers on every app, even outside the Brave browser. Now you can see who tried to track you, with the Brave Privacy Hub.",
+        comment: "Pop up description for subscribing VPN explaning VPN protects user outside the Brave")
+
+    public static let subscribeVPNAllDevicesPopOverDescription =
+      NSLocalizedString("vpn.subscribeVPNAllDevicesPopOverDescription", tableName: "BraveShared", bundle: .module,
+        value: "That’s right. Your Brave VPN subscription is now good on up to 5 devices. So you can subscribe on iOS and use it on your Mac, Windows and Android devices for free.",
+        comment: "Pop up description the subscription for VPN can be used for all platforms")
+
+    public static let subscribeVPNPopOverSubDescription =
+      NSLocalizedString("vpn.subscribeVPNPopOverSubDescription", tableName: "BraveShared", bundle: .module,
+        value: "Ready to safeguard every app on your phone? Come back to Brave VPN and get 20% off for the next 3 months.",
+        comment: "Pop up sub description the subscription for VPN can be used for all platforms")
   }
 
 }

Sources/Onboarding/Assets/Images.xcassets/VPN/subscribe_all-devices_image.imageset/Contents.json

@@ -0,0 +1,54 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Illustration@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "Illustration@2x 1.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Illustration@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "Illustration@3x 1.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Sources/Onboarding/Assets/Images.xcassets/VPN/subscribe_protection_image.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "subscribe_voluntary_discount_image@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "subscribe_voluntary_discount_image@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Sources/Onboarding/VPNNotifications/VPNChurnPromoView.swift

@@ -15,7 +15,10 @@ public enum VPNChurnPromoType {
   case autoRenewFreeMonth
   case updateBillingSoonExpire
   case updateBillingExpired
-
+  case subscribeDiscount
+  case subscribeVPNProtection
+  case subscribeAllDevices
+
   var promoImage: String {
     switch self {
     case .autoRenewSoonExpire:
@@ -26,6 +29,12 @@ public enum VPNChurnPromoType {
       return "auto_renew _free_image"
     case .updateBillingSoonExpire, .updateBillingExpired:
       return "update_billing_expired"
+    case .subscribeDiscount:
+      return "auto_renew _soon_image"
+    case .subscribeVPNProtection:
+      return "subscribe_protection_image"
+    case .subscribeAllDevices:
+      return "subscribe_all-devices_image"
     }
   }
 
@@ -41,6 +50,12 @@ public enum VPNChurnPromoType {
       return Strings.VPN.updateBillingSoonExpirePopOverTitle
     case .updateBillingExpired:
       return Strings.VPN.updateBillingExpiredPopOverTitle
+    case .subscribeDiscount:
+      return Strings.VPN.subscribeVPNDiscountPopOverTitle
+    case .subscribeVPNProtection:
+      return Strings.VPN.subscribeVPNProtectionPopOverTitle
+    case .subscribeAllDevices:
+      return Strings.VPN.subscribeVPNAllDevicesPopOverTitle
     }
   }
 
@@ -52,6 +67,10 @@ public enum VPNChurnPromoType {
       return Strings.VPN.updateBillingSoonExpirePopOverDescription
     case .updateBillingExpired:
       return Strings.VPN.updateBillingExpiredPopOverDescription
+    case .subscribeVPNProtection:
+      return Strings.VPN.subscribeVPNProtectionPopOverDescription
+    case .subscribeAllDevices:
+      return Strings.VPN.subscribeVPNAllDevicesPopOverDescription
     default:
       return nil
     }
@@ -61,6 +80,8 @@ public enum VPNChurnPromoType {
     switch self {
     case .autoRenewSoonExpire:
       return Strings.VPN.autoReneSoonExpirePopOverSubDescription
+    case .subscribeVPNProtection, .subscribeAllDevices:
+      return Strings.VPN.subscribeVPNPopOverSubDescription
     default:
       return nil
     }
@@ -72,6 +93,8 @@ public enum VPNChurnPromoType {
       return Strings.VPN.autoRenewActionButtonTitle
     case .updateBillingSoonExpire, .updateBillingExpired:
       return Strings.VPN.updatePaymentActionButtonTitle
+    case .subscribeDiscount, .subscribeVPNProtection, .subscribeAllDevices:
+      return Strings.VPN.subscribeVPNActionButtonTitle
     }
   }
 }
@@ -159,7 +182,7 @@ public struct VPNChurnPromoView: View {
   @ViewBuilder
   private var detailView: some View {
     switch churnPromoType {
-    case .autoRenewSoonExpire:
+    case .autoRenewSoonExpire, .subscribeVPNProtection, .subscribeAllDevices:
       let description = churnPromoType.description ?? ""
       let subDescription = churnPromoType.subDescription ?? ""
 
@@ -171,7 +194,7 @@ public struct VPNChurnPromoView: View {
           .font(.callout)
           .multilineTextAlignment(.center)
       }
-    case .autoRenewDiscount, .autoRenewFreeMonth:
+    case .autoRenewDiscount, .autoRenewFreeMonth, .subscribeDiscount:
       VStack(alignment: .leading, spacing: 8) {
         ForEach(descriptionItems, id: \.self) { itemDescription in
           HStack(spacing: 8) {