Merge pull request #117 from corona-warn-app/chore/revert-changes-for…

…-testing-only Chore: revert "testing-only" changes
corona-warn-app · Sep 26, 2022 · 3da0a75 · 3da0a75
2 parents 08070b1 + 66186b0
commit 3da0a75
Show file tree

Hide file tree

Showing 4 changed files with 218 additions and 150 deletions.
diff --git a/lib/ccl/functions/__analyzeDccWallet.js b/lib/ccl/functions/__analyzeDccWallet.js
@@ -1829,21 +1829,28 @@ const descriptor = {
       },
 
       // mask state
+
+      {
+        declare: [
+          'maskStateScenarioIdentifier',
+          'OTHER'
+        ]
+      },
       {
         declare: [
           'maskState',
           {
             if: [
               {
                 in: [
-                  { var: 'scenarioIdentifier' },
+                  { var: 'maskStateScenarioIdentifier' },
                   ['NO_SELECTION', 'NO_MANDATE']
                 ]
               },
-              { var: 'scenarioIdentifier' },
+              { var: 'maskStateScenarioIdentifier' },
               {
                 '===': [
-                  { var: 'scenarioIdentifier' },
+                  { var: 'maskStateScenarioIdentifier' },
                   'EXTENDED'
                 ]
               },
@@ -1890,9 +1897,9 @@ const descriptor = {
               },
               // basic
               {
-                in: [
-                  { var: 'scenarioIdentifier' },
-                  [...constants.FEDERAL_STATE_IDS, 'DE', 'BASIC']
+                '===': [
+                  { var: 'maskStateScenarioIdentifier' },
+                  'BASIC'
                 ]
               },
               {