From 479906b07b48a78c1ebb4ba71e334c373498f96c Mon Sep 17 00:00:00 2001
From: James Hugman <james@hugman.tv>
Date: Fri, 17 Nov 2023 18:17:46 +0000
Subject: [PATCH] =?UTF-8?q?Bug=201867901=20=E2=80=94=20Add=20string-alias?=
 =?UTF-8?q?=20to=20features=20in=20nimbus=20feature=20manifests?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/nimbus.fml.yaml     |  4 ++++
 app/onboarding.fml.yaml | 10 ++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/nimbus.fml.yaml b/app/nimbus.fml.yaml
index a99de68bac..b2b4d5dda1 100644
--- a/app/nimbus.fml.yaml
+++ b/app/nimbus.fml.yaml
@@ -103,6 +103,10 @@ import:
               NOTIFICATION:
                 priority: 50
                 max-display-count: 1
+            $$surfaces:
+              - homescreen
+              - notification
+              - survey
             messages:
               default-browser:
                 text: default_browser_experiment_card_text
diff --git a/app/onboarding.fml.yaml b/app/onboarding.fml.yaml
index ad74317722..dcd7be764a 100644
--- a/app/onboarding.fml.yaml
+++ b/app/onboarding.fml.yaml
@@ -10,14 +10,16 @@ features:
           A collection of out the box conditional expressions to be
           used in determining whether a card should show or not.
           Each entry maps to a valid JEXL expression.
-        type: Map<String, String>
+        type: Map<ConditionName, String>
+        string-alias: ConditionName
         default: {
           ALWAYS: "true",
           NEVER: "false"
         }
       cards:
         description: Collection of user facing onboarding cards.
-        type: Map<String, OnboardingCardData>
+        type: Map<OnboardingCardKey, OnboardingCardData>
+        string-alias: OnboardingCardKey
         default:
             default-browser:
               card-type: default-browser
@@ -109,7 +111,7 @@ objects:
         # This should never be defaulted.
         default: ""
       prerequisites:
-        type: List<String>
+        type: List<ConditionName>
         description: >
           A list of strings corresponding to targeting expressions.
           The card will be shown if all expressions are `true` and if
@@ -117,7 +119,7 @@ objects:
           if the `disqualifiers` table is empty.
         default: [ ALWAYS ]
       disqualifiers:
-        type: List<String>
+        type: List<ConditionName>
         description: >
           A list of strings corresponding to targeting expressions.
           The card will not be shown if any expression is `true`.