From 4523b59e3cba5bc33c039954fc02db14706ada00 Mon Sep 17 00:00:00 2001
From: David Losada <david@tuxpiper.com>
Date: Wed, 17 Apr 2024 11:55:45 +0200
Subject: [PATCH 01/23] chore(e2e): update the snapshot for E2E tests (#1019)

---
 .github/workflows/test-and-ship.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-and-ship.yml b/.github/workflows/test-and-ship.yml
index b013f04095..19bcc5ebef 100644
--- a/.github/workflows/test-and-ship.yml
+++ b/.github/workflows/test-and-ship.yml
@@ -137,7 +137,7 @@ jobs:
         run: |
           set -ex;
 
-          SNAPSHOT_URL="https://ushahidi-static-web-assets.s3.eu-west-1.amazonaws.com/ushahidi-e2e-data-2023.07.05.sql.gz"
+          SNAPSHOT_URL="https://ushahidi-static-web-assets.s3.eu-west-1.amazonaws.com/ushahidi-e2e-data.sql.gz"
           wget -O sql-snapshot.sql.gz ${SNAPSHOT_URL} 2>/dev/null || { echo "Failed downloading snapshot!" && exit 1; }
 
           tmp_defaults=`mktemp`

From 23a19f49287d5e30d29eefc1fadcd1d1baa752cf Mon Sep 17 00:00:00 2001
From: ushahidlee <152860706+ushahidlee@users.noreply.github.com>
Date: Wed, 17 Apr 2024 12:50:07 +0200
Subject: [PATCH 02/23] Added new "hidden" field type for data source settings
 (#1008)

---
 .../data-source-item.component.html           | 106 ++++++++++--------
 1 file changed, 57 insertions(+), 49 deletions(-)

diff --git a/apps/web-mzima-client/src/app/settings/data-sources/data-source-item/data-source-item.component.html b/apps/web-mzima-client/src/app/settings/data-sources/data-source-item/data-source-item.component.html
index e96f9c789e..b6e112c9f6 100644
--- a/apps/web-mzima-client/src/app/settings/data-sources/data-source-item/data-source-item.component.html
+++ b/apps/web-mzima-client/src/app/settings/data-sources/data-source-item/data-source-item.component.html
@@ -135,58 +135,66 @@ <h2>{{ 'survey.choose_survey_field' | translate }}</h2>
   <br />
 
   <div *ngFor="let control of provider?.options" [data-qa]="'provider-options'">
-    <ng-container *ngIf="control.input === 'read-only-text'">
-      <h2 *ngIf="control.label?.length">{{ control.label }}</h2>
-      <p *ngIf="control.description?.length" [innerHTML]="control.description"></p>
-    </ng-container>
-
-    <ng-container *ngIf="control.input !== 'read-only-text'">
-      <div class="form-row">
-        <mat-label>
-          {{ control.label }}
-          <span class="color-accent" *ngIf="control.rules?.indexOf('required') > -1">*</span>
-        </mat-label>
-        <mat-form-field
-          *ngIf="control.input === 'text'"
-          appearance="outline"
-          [data-qa]="'control-type-text'"
-        >
-          <input
-            matInput
-            [placeholder]="control.description"
-            [formControlName]="control.id"
-            [type]="control.input"
-            [data-qa]="'control-text' + control.id"
-          />
-          <mat-hint
-            *ngIf="control.description?.length"
-            [innerHTML]="control.description"
-          ></mat-hint>
-          <mat-error
-            *ngIf="
-              (form.get(control.id)?.touched || form.get(control.id)?.dirty) &&
-              form.get(control.id)?.hasError('required')
-            "
+    <ng-container [ngSwitch]="control.input">
+      <ng-container *ngSwitchCase="'read-only-text'">
+        <h2 *ngIf="control.label?.length">{{ control.label }}</h2>
+        <p *ngIf="control.description?.length" [innerHTML]="control.description"></p>
+      </ng-container>
+      <ng-container *ngSwitchCase="'hidden'">
+        <input
+          [formControlName]="control.id"
+          type="hidden"
+          [data-qa]="'control-text' + control.id"
+        />
+      </ng-container>
+      <ng-container *ngSwitchDefault>
+        <div class="form-row">
+          <mat-label>
+            {{ control.label }}
+            <span class="color-accent" *ngIf="control.rules?.indexOf('required') > -1">*</span>
+          </mat-label>
+          <mat-form-field
+            *ngIf="control.input === 'text'"
+            appearance="outline"
+            [data-qa]="'control-type-text'"
           >
-            {{ 'form.field_required' | translate }}
-          </mat-error>
-        </mat-form-field>
+            <input
+              matInput
+              [placeholder]="control.description"
+              [formControlName]="control.id"
+              [type]="control.input"
+              [data-qa]="'control-text' + control.id"
+            />
+            <mat-hint
+              *ngIf="control.description?.length"
+              [innerHTML]="control.description"
+            ></mat-hint>
+            <mat-error
+              *ngIf="
+                (form.get(control.id)?.touched || form.get(control.id)?.dirty) &&
+                form.get(control.id)?.hasError('required')
+              "
+            >
+              {{ 'form.field_required' | translate }}
+            </mat-error>
+          </mat-form-field>
 
-        <mat-radio-group
-          *ngIf="control.input === 'radio'"
-          aria-label="Select an option"
-          [formControlName]="control.id"
-          [data-qa]="'control-type-radio'"
-        >
-          <mat-radio-button
-            *ngFor="let item of control.options"
-            [value]="item"
-            [data-qa]="'control-text' + item"
+          <mat-radio-group
+            *ngIf="control.input === 'radio'"
+            aria-label="Select an option"
+            [formControlName]="control.id"
+            [data-qa]="'control-type-radio'"
           >
-            {{ item }}
-          </mat-radio-button>
-        </mat-radio-group>
-      </div>
+            <mat-radio-button
+              *ngFor="let item of control.options"
+              [value]="item"
+              [data-qa]="'control-text' + item"
+            >
+              {{ item }}
+            </mat-radio-button>
+          </mat-radio-group>
+        </div>
+      </ng-container>
     </ng-container>
   </div>
 

From 06b2673eed226b3339b22b17d9c6e32c556c6094 Mon Sep 17 00:00:00 2001
From: AmTryingMyBest <38259840+AmTryingMyBest@users.noreply.github.com>
Date: Wed, 17 Apr 2024 14:13:35 +0300
Subject: [PATCH 03/23] update login credentials (#1020)

---
 e2e-testing/cypress.env.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/e2e-testing/cypress.env.json b/e2e-testing/cypress.env.json
index b840b6fb12..951358c3e8 100644
--- a/e2e-testing/cypress.env.json
+++ b/e2e-testing/cypress.env.json
@@ -1,9 +1,9 @@
 {
   "baseUrl": "http://localhost:4200/",
-  "ush_admin_email": "",
-  "ush_admin_pwd": "",
-  "ush_admin_name": "",
-  "ush_user_name": "",
-  "ush_user_email": "",
-  "ush_user_pwd": ""
+  "ush_admin_email": "automation_admin@ushahidi.com",
+  "ush_admin_pwd": "1234567",
+  "ush_admin_name": "Automation User Admin Role",
+  "ush_user_email": "automation_member@ushahidi.com",
+  "ush_user_pwd": "1234567",
+  "ush_user_name": "Automation User Member Role"
 }

From f9b07034ce87ad17aee9e4b5def12756e2a6218c Mon Sep 17 00:00:00 2001
From: ushahidlee <152860706+ushahidlee@users.noreply.github.com>
Date: Wed, 17 Apr 2024 13:24:44 +0200
Subject: [PATCH 04/23] Fixed bug and updated dependencies (#1006)

---
 .../form-control/form-control.component.scss  |    8 +
 package-lock.json                             | 1390 ++++++++++++++---
 package.json                                  |   14 +
 3 files changed, 1224 insertions(+), 188 deletions(-)

diff --git a/apps/mobile-mzima-client/src/app/shared/components/form-control/form-control.component.scss b/apps/mobile-mzima-client/src/app/shared/components/form-control/form-control.component.scss
index 4608d24109..be0e460b22 100644
--- a/apps/mobile-mzima-client/src/app/shared/components/form-control/form-control.component.scss
+++ b/apps/mobile-mzima-client/src/app/shared/components/form-control/form-control.component.scss
@@ -81,6 +81,14 @@
   }
 }
 
+::ng-deep label.textarea-wrapper {
+  .label-text-wrapper {
+    .label-text {
+      white-space: normal;
+    }
+  }
+}
+
 .form-control {
   --background: transparent;
   --border-radius: 4px 4px 0 0;
diff --git a/package-lock.json b/package-lock.json
index b44770663b..a425f9adfe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,6 +23,19 @@
         "@angular/router": "~14.2.7",
         "@asymmetrik/ngx-leaflet": "^14.0.1",
         "@asymmetrik/ngx-leaflet-markercluster": "^14.0.1",
+        "@capacitor-community/intercom": "^5.0.1",
+        "@capacitor/android": "^5.7.4",
+        "@capacitor/app": "^5.0.7",
+        "@capacitor/camera": "^5.0.9",
+        "@capacitor/cli": "^5.7.4",
+        "@capacitor/core": "^5.7.4",
+        "@capacitor/device": "^5.0.7",
+        "@capacitor/dialog": "^5.0.7",
+        "@capacitor/filesystem": "^5.2.1",
+        "@capacitor/geolocation": "^5.0.7",
+        "@capacitor/network": "^5.0.7",
+        "@capacitor/share": "^5.0.7",
+        "@capacitor/status-bar": "^5.0.7",
         "@ionic/angular": "^7.1.1",
         "@ionic/pwa-elements": "^3.1.1",
         "@ionic/storage-angular": "^4.0.0",
@@ -92,6 +105,7 @@
         "@types/quill": "^1.3.10",
         "@typescript-eslint/eslint-plugin": "5.59.2",
         "@typescript-eslint/parser": "5.59.2",
+        "cross-env": "^7.0.3",
         "eslint": "~8.18.0",
         "eslint-config-airbnb-typescript": "^17.0.0",
         "eslint-config-prettier": "^8.7.0",
@@ -4030,6 +4044,243 @@
       "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
       "dev": true
     },
+    "node_modules/@capacitor-community/intercom": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@capacitor-community/intercom/-/intercom-5.0.1.tgz",
+      "integrity": "sha512-24EOiSwII1/OGRL3s22yke/WGSzXf6fdIHyIaYMaV8e3uO8n++y9GOsCcDeYChCCRQVNxMBQhNWU6MCL7OnLdA==",
+      "peerDependencies": {
+        "@capacitor/core": "^5.0.0"
+      }
+    },
+    "node_modules/@capacitor/android": {
+      "version": "5.7.4",
+      "resolved": "https://registry.npmjs.org/@capacitor/android/-/android-5.7.4.tgz",
+      "integrity": "sha512-9ETwrCaLaimLHbwGpgfsPS9cHcPMFLmKFdlYsFsYIusMO6aOrcQTA9Q4xVAkr55ava4Wk+pVRniRYsekrbOLdw==",
+      "peerDependencies": {
+        "@capacitor/core": "^5.7.0"
+      }
+    },
+    "node_modules/@capacitor/app": {
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/@capacitor/app/-/app-5.0.7.tgz",
+      "integrity": "sha512-oad0jwQu+vgQDukeS9UV56yG10dlxkAGGl26IQpZlTmg3dTI9qSJtvhmlLfkF0nEtoj5IsVQUPE+NLH1oZkgGQ==",
+      "peerDependencies": {
+        "@capacitor/core": "^5.0.0"
+      }
+    },
+    "node_modules/@capacitor/camera": {
+      "version": "5.0.9",
+      "resolved": "https://registry.npmjs.org/@capacitor/camera/-/camera-5.0.9.tgz",
+      "integrity": "sha512-ibuctDzQWVABnJCtIuiFdVYvLbiQNln9gKMZGNN0bZ6oSqoxzDlN7etueJwyFaaRZZlVrXc/sMWuhOkeVJEHcQ==",
+      "peerDependencies": {
+        "@capacitor/core": "^5.0.0"
+      }
+    },
+    "node_modules/@capacitor/cli": {
+      "version": "5.7.4",
+      "resolved": "https://registry.npmjs.org/@capacitor/cli/-/cli-5.7.4.tgz",
+      "integrity": "sha512-Cn7ndfMHWfMT+A/wRoeac4/mAxZWNTlZoD1Mn7UQyVV+iGxZB2JpS9omqha7gBN4xrAuTi/X9FqkzrmR+1V96A==",
+      "dependencies": {
+        "@ionic/cli-framework-output": "^2.2.5",
+        "@ionic/utils-fs": "^3.1.6",
+        "@ionic/utils-subprocess": "^2.1.11",
+        "@ionic/utils-terminal": "^2.3.3",
+        "commander": "^9.3.0",
+        "debug": "^4.3.4",
+        "env-paths": "^2.2.0",
+        "kleur": "^4.1.4",
+        "native-run": "^2.0.0",
+        "open": "^8.4.0",
+        "plist": "^3.0.5",
+        "prompts": "^2.4.2",
+        "rimraf": "^4.4.1",
+        "semver": "^7.3.7",
+        "tar": "^6.1.11",
+        "tslib": "^2.4.0",
+        "xml2js": "^0.5.0"
+      },
+      "bin": {
+        "cap": "bin/capacitor",
+        "capacitor": "bin/capacitor"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@capacitor/cli/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@capacitor/cli/node_modules/commander": {
+      "version": "9.5.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz",
+      "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==",
+      "engines": {
+        "node": "^12.20.0 || >=14"
+      }
+    },
+    "node_modules/@capacitor/cli/node_modules/glob": {
+      "version": "9.3.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-9.3.5.tgz",
+      "integrity": "sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "minimatch": "^8.0.2",
+        "minipass": "^4.2.4",
+        "path-scurry": "^1.6.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@capacitor/cli/node_modules/kleur": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz",
+      "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@capacitor/cli/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@capacitor/cli/node_modules/minimatch": {
+      "version": "8.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-8.0.4.tgz",
+      "integrity": "sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@capacitor/cli/node_modules/minipass": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.8.tgz",
+      "integrity": "sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@capacitor/cli/node_modules/rimraf": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-4.4.1.tgz",
+      "integrity": "sha512-Gk8NlF062+T9CqNGn6h4tls3k6T1+/nXdOcSZVikNVtlRdYpA7wRJJMoXmuvOnLW844rPjdQ7JgXCYM6PPC/og==",
+      "dependencies": {
+        "glob": "^9.2.0"
+      },
+      "bin": {
+        "rimraf": "dist/cjs/src/bin.js"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@capacitor/cli/node_modules/semver": {
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
+      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@capacitor/cli/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    },
+    "node_modules/@capacitor/core": {
+      "version": "5.7.4",
+      "resolved": "https://registry.npmjs.org/@capacitor/core/-/core-5.7.4.tgz",
+      "integrity": "sha512-iZBgvx3o4amzKv5ttA+QHB6i7cxK+/mYpCQd1tnSdipg6ZkvfBhg1HkzhEqHk+I7MNur+QwgYDZho9+ycHRwOw==",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
+    "node_modules/@capacitor/device": {
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/@capacitor/device/-/device-5.0.7.tgz",
+      "integrity": "sha512-sTYzGktRVK6giQCsoFtw+IGkEPGmFvIwi0pfFej5TRND1UHidkNZSpgMFBbjCYPbwsqXTcR3boYPcmxvl5iuJg==",
+      "peerDependencies": {
+        "@capacitor/core": "^5.0.0"
+      }
+    },
+    "node_modules/@capacitor/dialog": {
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/@capacitor/dialog/-/dialog-5.0.7.tgz",
+      "integrity": "sha512-lWNBHXOtt7V+Jk4YiShvnb+/4Ouo+yF1NKTOFpQXfVbsjrmmlXhd3ZSXSgMukEtyr0wr0phFUKDyamY08cYBOg==",
+      "peerDependencies": {
+        "@capacitor/core": "^5.0.0"
+      }
+    },
+    "node_modules/@capacitor/filesystem": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/@capacitor/filesystem/-/filesystem-5.2.1.tgz",
+      "integrity": "sha512-mexkJHUbNhydzfJywEUTIGARlB/HRogrtbjCZdA+mQxOi07T2887a70CwFaYRu1nKLMoKoliTM5UsLSsdl0PlA==",
+      "peerDependencies": {
+        "@capacitor/core": "^5.1.1"
+      }
+    },
+    "node_modules/@capacitor/geolocation": {
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/@capacitor/geolocation/-/geolocation-5.0.7.tgz",
+      "integrity": "sha512-LfCA08hjWhrBnygBVg8Q3OybbTpdmkAfW6ii+V/BO/UcO72kVsjXRnLQJH6G/U/BOu5qlwzPoNLuFKReF7t/CQ==",
+      "peerDependencies": {
+        "@capacitor/core": "^5.0.0"
+      }
+    },
+    "node_modules/@capacitor/network": {
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/@capacitor/network/-/network-5.0.7.tgz",
+      "integrity": "sha512-g+8SkNmkOyidaHnfKI9Ly8GNcx3VEwboehDXcTs5WU8bPuhCOEzbZnC0kFL5wwix3AoUQl8gEos6MtCey5cUIg==",
+      "peerDependencies": {
+        "@capacitor/core": "^5.0.0"
+      }
+    },
+    "node_modules/@capacitor/share": {
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/@capacitor/share/-/share-5.0.7.tgz",
+      "integrity": "sha512-4GraggRRxwhstxIdF9JyOEBq4QTufqFOekdB4P9GeiQYWJoA5VraSR1mwy4Trke1VFfaBjz/nGi4WQOJdHIAgg==",
+      "peerDependencies": {
+        "@capacitor/core": "^5.0.0"
+      }
+    },
+    "node_modules/@capacitor/status-bar": {
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/@capacitor/status-bar/-/status-bar-5.0.7.tgz",
+      "integrity": "sha512-KblB3gV2LDMEjx3fQoNBAzxb+Tr+2mv68SfFLLDCMiMUD3Eile2TAWRWd1yxy496pDFTOs2BJtup8++iuuuJ/w==",
+      "peerDependencies": {
+        "@capacitor/core": "^5.0.0"
+      }
+    },
     "node_modules/@colors/colors": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
@@ -4734,6 +4985,19 @@
       "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
       "dev": true
     },
+    "node_modules/@ionic/cli-framework-output": {
+      "version": "2.2.8",
+      "resolved": "https://registry.npmjs.org/@ionic/cli-framework-output/-/cli-framework-output-2.2.8.tgz",
+      "integrity": "sha512-TshtaFQsovB4NWRBydbNFawql6yul7d5bMiW1WYYf17hd99V6xdDdk3vtF51bw6sLkxON3bDQpWsnUc9/hVo3g==",
+      "dependencies": {
+        "@ionic/utils-terminal": "2.3.5",
+        "debug": "^4.0.0",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
     "node_modules/@ionic/core": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.1.1.tgz",
@@ -4782,6 +5046,209 @@
         "rxjs": "*"
       }
     },
+    "node_modules/@ionic/utils-array": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-array/-/utils-array-2.1.6.tgz",
+      "integrity": "sha512-0JZ1Zkp3wURnv8oq6Qt7fMPo5MpjbLoUoa9Bu2Q4PJuSDWM8H8gwF3dQO7VTeUj3/0o1IB1wGkFWZZYgUXZMUg==",
+      "dependencies": {
+        "debug": "^4.0.0",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@ionic/utils-fs": {
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-3.1.7.tgz",
+      "integrity": "sha512-2EknRvMVfhnyhL1VhFkSLa5gOcycK91VnjfrTB0kbqkTFCOXyXgVLI5whzq7SLrgD9t1aqos3lMMQyVzaQ5gVA==",
+      "dependencies": {
+        "@types/fs-extra": "^8.0.0",
+        "debug": "^4.0.0",
+        "fs-extra": "^9.0.0",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@ionic/utils-fs/node_modules/fs-extra": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+      "dependencies": {
+        "at-least-node": "^1.0.0",
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@ionic/utils-object": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-object/-/utils-object-2.1.6.tgz",
+      "integrity": "sha512-vCl7sl6JjBHFw99CuAqHljYJpcE88YaH2ZW4ELiC/Zwxl5tiwn4kbdP/gxi2OT3MQb1vOtgAmSNRtusvgxI8ww==",
+      "dependencies": {
+        "debug": "^4.0.0",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@ionic/utils-process": {
+      "version": "2.1.11",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-process/-/utils-process-2.1.11.tgz",
+      "integrity": "sha512-Uavxn+x8j3rDlZEk1X7YnaN6wCgbCwYQOeIjv/m94i1dzslqWhqIHEqxEyeE8HsT5Negboagg7GtQiABy+BLbA==",
+      "dependencies": {
+        "@ionic/utils-object": "2.1.6",
+        "@ionic/utils-terminal": "2.3.4",
+        "debug": "^4.0.0",
+        "signal-exit": "^3.0.3",
+        "tree-kill": "^1.2.2",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@ionic/utils-process/node_modules/@ionic/utils-terminal": {
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-2.3.4.tgz",
+      "integrity": "sha512-cEiMFl3jklE0sW60r8JHH3ijFTwh/jkdEKWbylSyExQwZ8pPuwoXz7gpkWoJRLuoRHHSvg+wzNYyPJazIHfoJA==",
+      "dependencies": {
+        "@types/slice-ansi": "^4.0.0",
+        "debug": "^4.0.0",
+        "signal-exit": "^3.0.3",
+        "slice-ansi": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "tslib": "^2.0.1",
+        "untildify": "^4.0.0",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@ionic/utils-process/node_modules/slice-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@ionic/utils-stream": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-stream/-/utils-stream-3.1.6.tgz",
+      "integrity": "sha512-4+Kitey1lTA1yGtnigeYNhV/0tggI3lWBMjC7tBs1K9GXa/q7q4CtOISppdh8QgtOhrhAXS2Igp8rbko/Cj+lA==",
+      "dependencies": {
+        "debug": "^4.0.0",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@ionic/utils-subprocess": {
+      "version": "2.1.14",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-2.1.14.tgz",
+      "integrity": "sha512-nGYvyGVjU0kjPUcSRFr4ROTraT3w/7r502f5QJEsMRKTqa4eEzCshtwRk+/mpASm0kgBN5rrjYA5A/OZg8ahqg==",
+      "dependencies": {
+        "@ionic/utils-array": "2.1.6",
+        "@ionic/utils-fs": "3.1.7",
+        "@ionic/utils-process": "2.1.11",
+        "@ionic/utils-stream": "3.1.6",
+        "@ionic/utils-terminal": "2.3.4",
+        "cross-spawn": "^7.0.3",
+        "debug": "^4.0.0",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@ionic/utils-subprocess/node_modules/@ionic/utils-terminal": {
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-2.3.4.tgz",
+      "integrity": "sha512-cEiMFl3jklE0sW60r8JHH3ijFTwh/jkdEKWbylSyExQwZ8pPuwoXz7gpkWoJRLuoRHHSvg+wzNYyPJazIHfoJA==",
+      "dependencies": {
+        "@types/slice-ansi": "^4.0.0",
+        "debug": "^4.0.0",
+        "signal-exit": "^3.0.3",
+        "slice-ansi": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "tslib": "^2.0.1",
+        "untildify": "^4.0.0",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@ionic/utils-subprocess/node_modules/slice-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@ionic/utils-terminal": {
+      "version": "2.3.5",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-2.3.5.tgz",
+      "integrity": "sha512-3cKScz9Jx2/Pr9ijj1OzGlBDfcmx7OMVBt4+P1uRR0SSW4cm1/y3Mo4OY3lfkuaYifMNBW8Wz6lQHbs1bihr7A==",
+      "dependencies": {
+        "@types/slice-ansi": "^4.0.0",
+        "debug": "^4.0.0",
+        "signal-exit": "^3.0.3",
+        "slice-ansi": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "tslib": "^2.0.1",
+        "untildify": "^4.0.0",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@ionic/utils-terminal/node_modules/slice-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+      }
+    },
     "node_modules/@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
@@ -6843,6 +7310,14 @@
         "@types/range-parser": "*"
       }
     },
+    "node_modules/@types/fs-extra": {
+      "version": "8.1.5",
+      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-8.1.5.tgz",
+      "integrity": "sha512-0dzKcwO+S8s2kuF5Z9oUWatQJj5Uq/iqphEtE3GQJVRRYm/tD1LglU2UnXi2A8jLq5umkGouOXOR9y0n613ZwQ==",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/geojson": {
       "version": "7946.0.10",
       "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.10.tgz",
@@ -6981,8 +7456,7 @@
     "node_modules/@types/node": {
       "version": "16.11.7",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.7.tgz",
-      "integrity": "sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw==",
-      "dev": true
+      "integrity": "sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw=="
     },
     "node_modules/@types/parse-json": {
       "version": "4.0.0",
@@ -7064,6 +7538,11 @@
       "optional": true,
       "peer": true
     },
+    "node_modules/@types/slice-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@types/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-+OpjSaq85gvlZAYINyzKpLeiFkSC4EsC6IIiT6v6TLSU5k5U83fHGj9Lel8oKEXM0HqgrMVCjXPDPVICtxF7EQ=="
+    },
     "node_modules/@types/sockjs": {
       "version": "0.3.33",
       "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz",
@@ -7770,6 +8249,14 @@
         "@xtuc/long": "4.2.2"
       }
     },
+    "node_modules/@xmldom/xmldom": {
+      "version": "0.8.10",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz",
+      "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==",
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
     "node_modules/@xtuc/ieee754": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
@@ -8067,7 +8554,6 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
       "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -8076,7 +8562,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -8292,7 +8777,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
       "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -8313,9 +8797,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
       "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
       "engines": {
         "node": ">= 4.0.0"
       }
@@ -8678,14 +9159,12 @@
     "node_modules/balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
     },
     "node_modules/base64-js": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
       "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -8736,6 +9215,14 @@
         "tweetnacl": "^0.14.3"
       }
     },
+    "node_modules/big-integer": {
+      "version": "1.6.52",
+      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.52.tgz",
+      "integrity": "sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg==",
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
     "node_modules/big.js": {
       "version": "5.2.2",
       "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
@@ -8851,6 +9338,17 @@
       "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
       "dev": true
     },
+    "node_modules/bplist-parser": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.3.2.tgz",
+      "integrity": "sha512-apC2+fspHGI3mMKj+dGevkGo/tCqVB8jMb6i+OX+E29p0Iposz07fABkRIfVUPNd5A5VbuOz1bZbnmkKLYF+wQ==",
+      "dependencies": {
+        "big-integer": "1.6.x"
+      },
+      "engines": {
+        "node": ">= 5.10.0"
+      }
+    },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -8950,9 +9448,6 @@
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
       "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
       "engines": {
         "node": "*"
       }
@@ -9217,7 +9712,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
       "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       }
@@ -9383,7 +9877,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -9394,8 +9887,7 @@
     "node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/color-support": {
       "version": "1.1.3",
@@ -9767,11 +10259,28 @@
       "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
       "dev": true
     },
+    "node_modules/cross-env": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
+      "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.1"
+      },
+      "bin": {
+        "cross-env": "src/bin/cross-env.js",
+        "cross-env-shell": "src/bin/cross-env-shell.js"
+      },
+      "engines": {
+        "node": ">=10.14",
+        "npm": ">=6",
+        "yarn": ">=1"
+      }
+    },
     "node_modules/cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
       "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dev": true,
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -10625,7 +11134,6 @@
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
       "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -10718,7 +11226,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
       "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -11008,6 +11515,22 @@
       "integrity": "sha512-h70iRscrNluMZPVICXYl5SSB+rBKo22XfuIS1ER0OQxQZpKTnFpuS6coj7wY9M/3trv7OR88rRMOlKmRvDty7Q==",
       "dev": true
     },
+    "node_modules/elementtree": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.7.tgz",
+      "integrity": "sha512-wkgGT6kugeQk/P6VZ/f4T+4HB41BVgNBq5CDIZVbQ02nvTVqAiVTbskxxu3eA/X96lMlfYOwnLQpN2v5E1zDEg==",
+      "dependencies": {
+        "sax": "1.1.4"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/elementtree/node_modules/sax": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz",
+      "integrity": "sha512-5f3k2PbGGp+YtKJjOItpg3P99IMD84E4HOvcfleTb5joCHNXYLsR9yWFPOYGgaeMPDubQILTCMdsFb2OMeOjtg=="
+    },
     "node_modules/emittery": {
       "version": "0.13.1",
       "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
@@ -11023,8 +11546,7 @@
     "node_modules/emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
     },
     "node_modules/emojis-list": {
       "version": "3.0.0",
@@ -11101,7 +11623,6 @@
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
       "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
-      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -12562,9 +13083,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
       "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
       "dependencies": {
         "pend": "~1.2.0"
       }
@@ -13045,7 +13563,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
       "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
-      "dev": true,
       "dependencies": {
         "minipass": "^3.0.0"
       },
@@ -13062,8 +13579,7 @@
     "node_modules/fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
     },
     "node_modules/fsevents": {
       "version": "2.3.2",
@@ -13368,8 +13884,7 @@
     "node_modules/graceful-fs": {
       "version": "4.2.10",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-      "dev": true
+      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
     },
     "node_modules/grapheme-splitter": {
       "version": "1.0.4",
@@ -13962,8 +14477,7 @@
     "node_modules/inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "node_modules/ini": {
       "version": "3.0.1",
@@ -14184,7 +14698,6 @@
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
       "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
-      "dev": true,
       "bin": {
         "is-docker": "cli.js"
       },
@@ -14208,7 +14721,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
       "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -14514,7 +15026,6 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
       "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-      "dev": true,
       "dependencies": {
         "is-docker": "^2.0.0"
       },
@@ -14531,8 +15042,7 @@
     "node_modules/isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "dev": true
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
     },
     "node_modules/isobject": {
       "version": "3.0.1",
@@ -15480,7 +15990,6 @@
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
       "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "dev": true,
       "dependencies": {
         "universalify": "^2.0.0"
       },
@@ -15536,7 +16045,6 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
       "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
-      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -16622,7 +17130,6 @@
       "version": "3.3.6",
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
       "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-      "dev": true,
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -16708,14 +17215,12 @@
     "node_modules/minipass/node_modules/yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     },
     "node_modules/minizlib": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
       "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
-      "dev": true,
       "dependencies": {
         "minipass": "^3.0.0",
         "yallist": "^4.0.0"
@@ -16727,14 +17232,12 @@
     "node_modules/minizlib/node_modules/yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     },
     "node_modules/mkdirp": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
       "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "dev": true,
       "bin": {
         "mkdirp": "bin/cmd.js"
       },
@@ -16754,8 +17257,7 @@
     "node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "node_modules/multicast-dns": {
       "version": "7.2.5",
@@ -16794,6 +17296,38 @@
         "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
       }
     },
+    "node_modules/native-run": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/native-run/-/native-run-2.0.1.tgz",
+      "integrity": "sha512-XfG1FBZLM50J10xH9361whJRC9SHZ0Bub4iNRhhI61C8Jv0e1ud19muex6sNKB51ibQNUJNuYn25MuYET/rE6w==",
+      "dependencies": {
+        "@ionic/utils-fs": "^3.1.7",
+        "@ionic/utils-terminal": "^2.3.4",
+        "bplist-parser": "^0.3.2",
+        "debug": "^4.3.4",
+        "elementtree": "^0.1.7",
+        "ini": "^4.1.1",
+        "plist": "^3.1.0",
+        "split2": "^4.2.0",
+        "through2": "^4.0.2",
+        "tslib": "^2.6.2",
+        "yauzl": "^2.10.0"
+      },
+      "bin": {
+        "native-run": "bin/native-run"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/native-run/node_modules/ini": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.2.tgz",
+      "integrity": "sha512-AMB1mvwR1pyBFY/nSevUX6y8nJWS63/SzUKD3JyQn97s4xgIdgQPT75IRouIiBAN4yLQBUShNYVW0+UG25daCw==",
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
     "node_modules/natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -17828,7 +18362,6 @@
       "version": "8.4.2",
       "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
       "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
-      "dev": true,
       "dependencies": {
         "define-lazy-prop": "^2.0.0",
         "is-docker": "^2.1.1",
@@ -18348,7 +18881,6 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -18359,6 +18891,37 @@
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
       "dev": true
     },
+    "node_modules/path-scurry": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.2.tgz",
+      "integrity": "sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==",
+      "dependencies": {
+        "lru-cache": "^10.2.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/path-scurry/node_modules/lru-cache": {
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz",
+      "integrity": "sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==",
+      "engines": {
+        "node": "14 || >=16.14"
+      }
+    },
+    "node_modules/path-scurry/node_modules/minipass": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
+      "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==",
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
     "node_modules/path-to-regexp": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
@@ -18377,10 +18940,7 @@
     "node_modules/pend": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
-      "dev": true,
-      "optional": true,
-      "peer": true
+      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="
     },
     "node_modules/performance-now": {
       "version": "2.1.0",
@@ -18464,6 +19024,19 @@
         "node": ">=8"
       }
     },
+    "node_modules/plist": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/plist/-/plist-3.1.0.tgz",
+      "integrity": "sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ==",
+      "dependencies": {
+        "@xmldom/xmldom": "^0.8.8",
+        "base64-js": "^1.5.1",
+        "xmlbuilder": "^15.1.1"
+      },
+      "engines": {
+        "node": ">=10.4.0"
+      }
+    },
     "node_modules/portfinder": {
       "version": "1.0.32",
       "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.32.tgz",
@@ -19783,7 +20356,6 @@
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
       "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
-      "dev": true,
       "dependencies": {
         "kleur": "^3.0.3",
         "sisteransi": "^1.0.5"
@@ -20109,7 +20681,6 @@
       "version": "3.6.1",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.1.tgz",
       "integrity": "sha512-+rQmrWMYGA90yenhTYsLWAsLsqVC8osOw6PKE1HDYiO0gdPeKe/xDHNzIAIn4C91YQ6oenEhfYqqc1883qHbjQ==",
-      "dev": true,
       "dependencies": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -20444,7 +21015,6 @@
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
       "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -20538,8 +21108,7 @@
     "node_modules/sax": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-      "dev": true
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
     },
     "node_modules/saxes": {
       "version": "6.0.0",
@@ -20834,7 +21403,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
       "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dev": true,
       "dependencies": {
         "shebang-regex": "^3.0.0"
       },
@@ -20846,7 +21414,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -20877,8 +21444,7 @@
     "node_modules/signal-exit": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "dev": true
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
     },
     "node_modules/sigstore": {
       "version": "1.0.0",
@@ -21117,8 +21683,7 @@
     "node_modules/sisteransi": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
-      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
-      "dev": true
+      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg=="
     },
     "node_modules/slash": {
       "version": "3.0.0",
@@ -21323,6 +21888,14 @@
         "wbuf": "^1.7.3"
       }
     },
+    "node_modules/split2": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz",
+      "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==",
+      "engines": {
+        "node": ">= 10.x"
+      }
+    },
     "node_modules/sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
@@ -21426,7 +21999,6 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
       "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dev": true,
       "dependencies": {
         "safe-buffer": "~5.2.0"
       }
@@ -21457,7 +22029,6 @@
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -21499,7 +22070,6 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
       "dependencies": {
         "ansi-regex": "^5.0.1"
       },
@@ -21805,7 +22375,6 @@
       "version": "6.1.11",
       "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
       "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
-      "dev": true,
       "dependencies": {
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
@@ -21837,8 +22406,7 @@
     "node_modules/tar/node_modules/yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     },
     "node_modules/terser": {
       "version": "5.16.5",
@@ -22020,6 +22588,14 @@
       "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
       "dev": true
     },
+    "node_modules/through2": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz",
+      "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==",
+      "dependencies": {
+        "readable-stream": "3"
+      }
+    },
     "node_modules/thunky": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
@@ -22114,7 +22690,6 @@
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
       "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
-      "dev": true,
       "bin": {
         "tree-kill": "cli.js"
       }
@@ -22703,7 +23278,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
       "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-      "dev": true,
       "engines": {
         "node": ">= 10.0.0"
       }
@@ -22721,9 +23295,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
       "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
       "engines": {
         "node": ">=8"
       }
@@ -22782,8 +23353,7 @@
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-      "dev": true
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
     },
     "node_modules/utils-merge": {
       "version": "1.0.1",
@@ -23432,7 +24002,6 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
       "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
       "dependencies": {
         "isexe": "^2.0.0"
       },
@@ -23522,7 +24091,6 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -23584,6 +24152,34 @@
         "node": ">=12"
       }
     },
+    "node_modules/xml2js": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz",
+      "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==",
+      "dependencies": {
+        "sax": ">=0.6.0",
+        "xmlbuilder": "~11.0.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/xml2js/node_modules/xmlbuilder": {
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+      "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/xmlbuilder": {
+      "version": "15.1.1",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz",
+      "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==",
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
     "node_modules/xmlchars": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
@@ -23667,9 +24263,6 @@
       "version": "2.10.0",
       "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
       "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
       "dependencies": {
         "buffer-crc32": "~0.2.3",
         "fd-slicer": "~1.1.0"
@@ -26457,6 +27050,177 @@
       "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
       "dev": true
     },
+    "@capacitor-community/intercom": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@capacitor-community/intercom/-/intercom-5.0.1.tgz",
+      "integrity": "sha512-24EOiSwII1/OGRL3s22yke/WGSzXf6fdIHyIaYMaV8e3uO8n++y9GOsCcDeYChCCRQVNxMBQhNWU6MCL7OnLdA==",
+      "requires": {}
+    },
+    "@capacitor/android": {
+      "version": "5.7.4",
+      "resolved": "https://registry.npmjs.org/@capacitor/android/-/android-5.7.4.tgz",
+      "integrity": "sha512-9ETwrCaLaimLHbwGpgfsPS9cHcPMFLmKFdlYsFsYIusMO6aOrcQTA9Q4xVAkr55ava4Wk+pVRniRYsekrbOLdw==",
+      "requires": {}
+    },
+    "@capacitor/app": {
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/@capacitor/app/-/app-5.0.7.tgz",
+      "integrity": "sha512-oad0jwQu+vgQDukeS9UV56yG10dlxkAGGl26IQpZlTmg3dTI9qSJtvhmlLfkF0nEtoj5IsVQUPE+NLH1oZkgGQ==",
+      "requires": {}
+    },
+    "@capacitor/camera": {
+      "version": "5.0.9",
+      "resolved": "https://registry.npmjs.org/@capacitor/camera/-/camera-5.0.9.tgz",
+      "integrity": "sha512-ibuctDzQWVABnJCtIuiFdVYvLbiQNln9gKMZGNN0bZ6oSqoxzDlN7etueJwyFaaRZZlVrXc/sMWuhOkeVJEHcQ==",
+      "requires": {}
+    },
+    "@capacitor/cli": {
+      "version": "5.7.4",
+      "resolved": "https://registry.npmjs.org/@capacitor/cli/-/cli-5.7.4.tgz",
+      "integrity": "sha512-Cn7ndfMHWfMT+A/wRoeac4/mAxZWNTlZoD1Mn7UQyVV+iGxZB2JpS9omqha7gBN4xrAuTi/X9FqkzrmR+1V96A==",
+      "requires": {
+        "@ionic/cli-framework-output": "^2.2.5",
+        "@ionic/utils-fs": "^3.1.6",
+        "@ionic/utils-subprocess": "^2.1.11",
+        "@ionic/utils-terminal": "^2.3.3",
+        "commander": "^9.3.0",
+        "debug": "^4.3.4",
+        "env-paths": "^2.2.0",
+        "kleur": "^4.1.4",
+        "native-run": "^2.0.0",
+        "open": "^8.4.0",
+        "plist": "^3.0.5",
+        "prompts": "^2.4.2",
+        "rimraf": "^4.4.1",
+        "semver": "^7.3.7",
+        "tar": "^6.1.11",
+        "tslib": "^2.4.0",
+        "xml2js": "^0.5.0"
+      },
+      "dependencies": {
+        "brace-expansion": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+          "requires": {
+            "balanced-match": "^1.0.0"
+          }
+        },
+        "commander": {
+          "version": "9.5.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz",
+          "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ=="
+        },
+        "glob": {
+          "version": "9.3.5",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-9.3.5.tgz",
+          "integrity": "sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==",
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "minimatch": "^8.0.2",
+            "minipass": "^4.2.4",
+            "path-scurry": "^1.6.1"
+          }
+        },
+        "kleur": {
+          "version": "4.1.5",
+          "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz",
+          "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ=="
+        },
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "minimatch": {
+          "version": "8.0.4",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-8.0.4.tgz",
+          "integrity": "sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==",
+          "requires": {
+            "brace-expansion": "^2.0.1"
+          }
+        },
+        "minipass": {
+          "version": "4.2.8",
+          "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.8.tgz",
+          "integrity": "sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ=="
+        },
+        "rimraf": {
+          "version": "4.4.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-4.4.1.tgz",
+          "integrity": "sha512-Gk8NlF062+T9CqNGn6h4tls3k6T1+/nXdOcSZVikNVtlRdYpA7wRJJMoXmuvOnLW844rPjdQ7JgXCYM6PPC/og==",
+          "requires": {
+            "glob": "^9.2.0"
+          }
+        },
+        "semver": {
+          "version": "7.6.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
+          "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+        }
+      }
+    },
+    "@capacitor/core": {
+      "version": "5.7.4",
+      "resolved": "https://registry.npmjs.org/@capacitor/core/-/core-5.7.4.tgz",
+      "integrity": "sha512-iZBgvx3o4amzKv5ttA+QHB6i7cxK+/mYpCQd1tnSdipg6ZkvfBhg1HkzhEqHk+I7MNur+QwgYDZho9+ycHRwOw==",
+      "requires": {
+        "tslib": "^2.1.0"
+      }
+    },
+    "@capacitor/device": {
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/@capacitor/device/-/device-5.0.7.tgz",
+      "integrity": "sha512-sTYzGktRVK6giQCsoFtw+IGkEPGmFvIwi0pfFej5TRND1UHidkNZSpgMFBbjCYPbwsqXTcR3boYPcmxvl5iuJg==",
+      "requires": {}
+    },
+    "@capacitor/dialog": {
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/@capacitor/dialog/-/dialog-5.0.7.tgz",
+      "integrity": "sha512-lWNBHXOtt7V+Jk4YiShvnb+/4Ouo+yF1NKTOFpQXfVbsjrmmlXhd3ZSXSgMukEtyr0wr0phFUKDyamY08cYBOg==",
+      "requires": {}
+    },
+    "@capacitor/filesystem": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/@capacitor/filesystem/-/filesystem-5.2.1.tgz",
+      "integrity": "sha512-mexkJHUbNhydzfJywEUTIGARlB/HRogrtbjCZdA+mQxOi07T2887a70CwFaYRu1nKLMoKoliTM5UsLSsdl0PlA==",
+      "requires": {}
+    },
+    "@capacitor/geolocation": {
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/@capacitor/geolocation/-/geolocation-5.0.7.tgz",
+      "integrity": "sha512-LfCA08hjWhrBnygBVg8Q3OybbTpdmkAfW6ii+V/BO/UcO72kVsjXRnLQJH6G/U/BOu5qlwzPoNLuFKReF7t/CQ==",
+      "requires": {}
+    },
+    "@capacitor/network": {
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/@capacitor/network/-/network-5.0.7.tgz",
+      "integrity": "sha512-g+8SkNmkOyidaHnfKI9Ly8GNcx3VEwboehDXcTs5WU8bPuhCOEzbZnC0kFL5wwix3AoUQl8gEos6MtCey5cUIg==",
+      "requires": {}
+    },
+    "@capacitor/share": {
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/@capacitor/share/-/share-5.0.7.tgz",
+      "integrity": "sha512-4GraggRRxwhstxIdF9JyOEBq4QTufqFOekdB4P9GeiQYWJoA5VraSR1mwy4Trke1VFfaBjz/nGi4WQOJdHIAgg==",
+      "requires": {}
+    },
+    "@capacitor/status-bar": {
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/@capacitor/status-bar/-/status-bar-5.0.7.tgz",
+      "integrity": "sha512-KblB3gV2LDMEjx3fQoNBAzxb+Tr+2mv68SfFLLDCMiMUD3Eile2TAWRWd1yxy496pDFTOs2BJtup8++iuuuJ/w==",
+      "requires": {}
+    },
     "@colors/colors": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
@@ -26916,6 +27680,16 @@
         }
       }
     },
+    "@ionic/cli-framework-output": {
+      "version": "2.2.8",
+      "resolved": "https://registry.npmjs.org/@ionic/cli-framework-output/-/cli-framework-output-2.2.8.tgz",
+      "integrity": "sha512-TshtaFQsovB4NWRBydbNFawql6yul7d5bMiW1WYYf17hd99V6xdDdk3vtF51bw6sLkxON3bDQpWsnUc9/hVo3g==",
+      "requires": {
+        "@ionic/utils-terminal": "2.3.5",
+        "debug": "^4.0.0",
+        "tslib": "^2.0.1"
+      }
+    },
     "@ionic/core": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.1.1.tgz",
@@ -26955,6 +27729,169 @@
         "tslib": "^2.3.0"
       }
     },
+    "@ionic/utils-array": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-array/-/utils-array-2.1.6.tgz",
+      "integrity": "sha512-0JZ1Zkp3wURnv8oq6Qt7fMPo5MpjbLoUoa9Bu2Q4PJuSDWM8H8gwF3dQO7VTeUj3/0o1IB1wGkFWZZYgUXZMUg==",
+      "requires": {
+        "debug": "^4.0.0",
+        "tslib": "^2.0.1"
+      }
+    },
+    "@ionic/utils-fs": {
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-3.1.7.tgz",
+      "integrity": "sha512-2EknRvMVfhnyhL1VhFkSLa5gOcycK91VnjfrTB0kbqkTFCOXyXgVLI5whzq7SLrgD9t1aqos3lMMQyVzaQ5gVA==",
+      "requires": {
+        "@types/fs-extra": "^8.0.0",
+        "debug": "^4.0.0",
+        "fs-extra": "^9.0.0",
+        "tslib": "^2.0.1"
+      },
+      "dependencies": {
+        "fs-extra": {
+          "version": "9.1.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+          "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+          "requires": {
+            "at-least-node": "^1.0.0",
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^6.0.1",
+            "universalify": "^2.0.0"
+          }
+        }
+      }
+    },
+    "@ionic/utils-object": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-object/-/utils-object-2.1.6.tgz",
+      "integrity": "sha512-vCl7sl6JjBHFw99CuAqHljYJpcE88YaH2ZW4ELiC/Zwxl5tiwn4kbdP/gxi2OT3MQb1vOtgAmSNRtusvgxI8ww==",
+      "requires": {
+        "debug": "^4.0.0",
+        "tslib": "^2.0.1"
+      }
+    },
+    "@ionic/utils-process": {
+      "version": "2.1.11",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-process/-/utils-process-2.1.11.tgz",
+      "integrity": "sha512-Uavxn+x8j3rDlZEk1X7YnaN6wCgbCwYQOeIjv/m94i1dzslqWhqIHEqxEyeE8HsT5Negboagg7GtQiABy+BLbA==",
+      "requires": {
+        "@ionic/utils-object": "2.1.6",
+        "@ionic/utils-terminal": "2.3.4",
+        "debug": "^4.0.0",
+        "signal-exit": "^3.0.3",
+        "tree-kill": "^1.2.2",
+        "tslib": "^2.0.1"
+      },
+      "dependencies": {
+        "@ionic/utils-terminal": {
+          "version": "2.3.4",
+          "resolved": "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-2.3.4.tgz",
+          "integrity": "sha512-cEiMFl3jklE0sW60r8JHH3ijFTwh/jkdEKWbylSyExQwZ8pPuwoXz7gpkWoJRLuoRHHSvg+wzNYyPJazIHfoJA==",
+          "requires": {
+            "@types/slice-ansi": "^4.0.0",
+            "debug": "^4.0.0",
+            "signal-exit": "^3.0.3",
+            "slice-ansi": "^4.0.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0",
+            "tslib": "^2.0.1",
+            "untildify": "^4.0.0",
+            "wrap-ansi": "^7.0.0"
+          }
+        },
+        "slice-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+          "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "astral-regex": "^2.0.0",
+            "is-fullwidth-code-point": "^3.0.0"
+          }
+        }
+      }
+    },
+    "@ionic/utils-stream": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-stream/-/utils-stream-3.1.6.tgz",
+      "integrity": "sha512-4+Kitey1lTA1yGtnigeYNhV/0tggI3lWBMjC7tBs1K9GXa/q7q4CtOISppdh8QgtOhrhAXS2Igp8rbko/Cj+lA==",
+      "requires": {
+        "debug": "^4.0.0",
+        "tslib": "^2.0.1"
+      }
+    },
+    "@ionic/utils-subprocess": {
+      "version": "2.1.14",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-2.1.14.tgz",
+      "integrity": "sha512-nGYvyGVjU0kjPUcSRFr4ROTraT3w/7r502f5QJEsMRKTqa4eEzCshtwRk+/mpASm0kgBN5rrjYA5A/OZg8ahqg==",
+      "requires": {
+        "@ionic/utils-array": "2.1.6",
+        "@ionic/utils-fs": "3.1.7",
+        "@ionic/utils-process": "2.1.11",
+        "@ionic/utils-stream": "3.1.6",
+        "@ionic/utils-terminal": "2.3.4",
+        "cross-spawn": "^7.0.3",
+        "debug": "^4.0.0",
+        "tslib": "^2.0.1"
+      },
+      "dependencies": {
+        "@ionic/utils-terminal": {
+          "version": "2.3.4",
+          "resolved": "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-2.3.4.tgz",
+          "integrity": "sha512-cEiMFl3jklE0sW60r8JHH3ijFTwh/jkdEKWbylSyExQwZ8pPuwoXz7gpkWoJRLuoRHHSvg+wzNYyPJazIHfoJA==",
+          "requires": {
+            "@types/slice-ansi": "^4.0.0",
+            "debug": "^4.0.0",
+            "signal-exit": "^3.0.3",
+            "slice-ansi": "^4.0.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0",
+            "tslib": "^2.0.1",
+            "untildify": "^4.0.0",
+            "wrap-ansi": "^7.0.0"
+          }
+        },
+        "slice-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+          "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "astral-regex": "^2.0.0",
+            "is-fullwidth-code-point": "^3.0.0"
+          }
+        }
+      }
+    },
+    "@ionic/utils-terminal": {
+      "version": "2.3.5",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-2.3.5.tgz",
+      "integrity": "sha512-3cKScz9Jx2/Pr9ijj1OzGlBDfcmx7OMVBt4+P1uRR0SSW4cm1/y3Mo4OY3lfkuaYifMNBW8Wz6lQHbs1bihr7A==",
+      "requires": {
+        "@types/slice-ansi": "^4.0.0",
+        "debug": "^4.0.0",
+        "signal-exit": "^3.0.3",
+        "slice-ansi": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "tslib": "^2.0.1",
+        "untildify": "^4.0.0",
+        "wrap-ansi": "^7.0.0"
+      },
+      "dependencies": {
+        "slice-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+          "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "astral-regex": "^2.0.0",
+            "is-fullwidth-code-point": "^3.0.0"
+          }
+        }
+      }
+    },
     "@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
@@ -28645,6 +29582,14 @@
         "@types/range-parser": "*"
       }
     },
+    "@types/fs-extra": {
+      "version": "8.1.5",
+      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-8.1.5.tgz",
+      "integrity": "sha512-0dzKcwO+S8s2kuF5Z9oUWatQJj5Uq/iqphEtE3GQJVRRYm/tD1LglU2UnXi2A8jLq5umkGouOXOR9y0n613ZwQ==",
+      "requires": {
+        "@types/node": "*"
+      }
+    },
     "@types/geojson": {
       "version": "7946.0.10",
       "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.10.tgz",
@@ -28776,8 +29721,7 @@
     "@types/node": {
       "version": "16.11.7",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.7.tgz",
-      "integrity": "sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw==",
-      "dev": true
+      "integrity": "sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw=="
     },
     "@types/parse-json": {
       "version": "4.0.0",
@@ -28859,6 +29803,11 @@
       "optional": true,
       "peer": true
     },
+    "@types/slice-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@types/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-+OpjSaq85gvlZAYINyzKpLeiFkSC4EsC6IIiT6v6TLSU5k5U83fHGj9Lel8oKEXM0HqgrMVCjXPDPVICtxF7EQ=="
+    },
     "@types/sockjs": {
       "version": "0.3.33",
       "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz",
@@ -29364,6 +30313,11 @@
         "@xtuc/long": "4.2.2"
       }
     },
+    "@xmldom/xmldom": {
+      "version": "0.8.10",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz",
+      "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw=="
+    },
     "@xtuc/ieee754": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
@@ -29588,14 +30542,12 @@
     "ansi-regex": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
     },
     "ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "requires": {
         "color-convert": "^2.0.1"
       }
@@ -29759,8 +30711,7 @@
     "astral-regex": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-      "dev": true
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="
     },
     "async": {
       "version": "3.2.4",
@@ -29777,10 +30728,7 @@
     "at-least-node": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
-      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
-      "dev": true,
-      "optional": true,
-      "peer": true
+      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="
     },
     "atob": {
       "version": "2.1.2",
@@ -30058,14 +31006,12 @@
     "balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
     },
     "base64-js": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "dev": true
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
     },
     "basic-auth": {
       "version": "2.0.1",
@@ -30101,6 +31047,11 @@
         "tweetnacl": "^0.14.3"
       }
     },
+    "big-integer": {
+      "version": "1.6.52",
+      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.52.tgz",
+      "integrity": "sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg=="
+    },
     "big.js": {
       "version": "5.2.2",
       "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
@@ -30202,6 +31153,14 @@
       "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
       "dev": true
     },
+    "bplist-parser": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.3.2.tgz",
+      "integrity": "sha512-apC2+fspHGI3mMKj+dGevkGo/tCqVB8jMb6i+OX+E29p0Iposz07fABkRIfVUPNd5A5VbuOz1bZbnmkKLYF+wQ==",
+      "requires": {
+        "big-integer": "1.6.x"
+      }
+    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -30264,10 +31223,7 @@
     "buffer-crc32": {
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
-      "dev": true,
-      "optional": true,
-      "peer": true
+      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ=="
     },
     "buffer-from": {
       "version": "1.1.2",
@@ -30465,8 +31421,7 @@
     "chownr": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
-      "dev": true
+      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="
     },
     "chrome-trace-event": {
       "version": "1.0.3",
@@ -30581,7 +31536,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "requires": {
         "color-name": "~1.1.4"
       }
@@ -30589,8 +31543,7 @@
     "color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "color-support": {
       "version": "1.1.3",
@@ -30882,11 +31835,19 @@
         }
       }
     },
+    "cross-env": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
+      "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "^7.0.1"
+      }
+    },
     "cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
       "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dev": true,
       "requires": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -31519,7 +32480,6 @@
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
       "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
       "requires": {
         "ms": "2.1.2"
       }
@@ -31588,8 +32548,7 @@
     "define-lazy-prop": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
-      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
-      "dev": true
+      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og=="
     },
     "define-properties": {
       "version": "1.2.0",
@@ -31805,6 +32764,21 @@
       "integrity": "sha512-h70iRscrNluMZPVICXYl5SSB+rBKo22XfuIS1ER0OQxQZpKTnFpuS6coj7wY9M/3trv7OR88rRMOlKmRvDty7Q==",
       "dev": true
     },
+    "elementtree": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.7.tgz",
+      "integrity": "sha512-wkgGT6kugeQk/P6VZ/f4T+4HB41BVgNBq5CDIZVbQ02nvTVqAiVTbskxxu3eA/X96lMlfYOwnLQpN2v5E1zDEg==",
+      "requires": {
+        "sax": "1.1.4"
+      },
+      "dependencies": {
+        "sax": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz",
+          "integrity": "sha512-5f3k2PbGGp+YtKJjOItpg3P99IMD84E4HOvcfleTb5joCHNXYLsR9yWFPOYGgaeMPDubQILTCMdsFb2OMeOjtg=="
+        }
+      }
+    },
     "emittery": {
       "version": "0.13.1",
       "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
@@ -31814,8 +32788,7 @@
     "emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
     },
     "emojis-list": {
       "version": "3.0.0",
@@ -31876,8 +32849,7 @@
     "env-paths": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
-      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
-      "dev": true
+      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="
     },
     "err-code": {
       "version": "2.0.3",
@@ -32914,9 +33886,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
       "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
       "requires": {
         "pend": "~1.2.0"
       }
@@ -33274,7 +34243,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
       "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
-      "dev": true,
       "requires": {
         "minipass": "^3.0.0"
       }
@@ -33288,8 +34256,7 @@
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
     },
     "fsevents": {
       "version": "2.3.2",
@@ -33519,8 +34486,7 @@
     "graceful-fs": {
       "version": "4.2.10",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-      "dev": true
+      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
     },
     "grapheme-splitter": {
       "version": "1.0.4",
@@ -33969,8 +34935,7 @@
     "inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "ini": {
       "version": "3.0.1",
@@ -34134,8 +35099,7 @@
     "is-docker": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
-      "dev": true
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="
     },
     "is-extglob": {
       "version": "2.1.1",
@@ -34146,8 +35110,7 @@
     "is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
     },
     "is-generator-fn": {
       "version": "2.1.0",
@@ -34354,7 +35317,6 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
       "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-      "dev": true,
       "requires": {
         "is-docker": "^2.0.0"
       }
@@ -34368,8 +35330,7 @@
     "isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "dev": true
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
     },
     "isobject": {
       "version": "3.0.1",
@@ -35099,7 +36060,6 @@
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
       "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "dev": true,
       "requires": {
         "graceful-fs": "^4.1.6",
         "universalify": "^2.0.0"
@@ -35143,8 +36103,7 @@
     "kleur": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
-      "dev": true
+      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w=="
     },
     "klona": {
       "version": "2.0.6",
@@ -35924,7 +36883,6 @@
       "version": "3.3.6",
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
       "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-      "dev": true,
       "requires": {
         "yallist": "^4.0.0"
       },
@@ -35932,8 +36890,7 @@
         "yallist": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-          "dev": true
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
         }
       }
     },
@@ -35999,7 +36956,6 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
       "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
-      "dev": true,
       "requires": {
         "minipass": "^3.0.0",
         "yallist": "^4.0.0"
@@ -36008,16 +36964,14 @@
         "yallist": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-          "dev": true
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
         }
       }
     },
     "mkdirp": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "dev": true
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
     },
     "moment": {
       "version": "2.29.4",
@@ -36028,8 +36982,7 @@
     "ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "multicast-dns": {
       "version": "7.2.5",
@@ -36053,6 +37006,31 @@
       "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
       "dev": true
     },
+    "native-run": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/native-run/-/native-run-2.0.1.tgz",
+      "integrity": "sha512-XfG1FBZLM50J10xH9361whJRC9SHZ0Bub4iNRhhI61C8Jv0e1ud19muex6sNKB51ibQNUJNuYn25MuYET/rE6w==",
+      "requires": {
+        "@ionic/utils-fs": "^3.1.7",
+        "@ionic/utils-terminal": "^2.3.4",
+        "bplist-parser": "^0.3.2",
+        "debug": "^4.3.4",
+        "elementtree": "^0.1.7",
+        "ini": "^4.1.1",
+        "plist": "^3.1.0",
+        "split2": "^4.2.0",
+        "through2": "^4.0.2",
+        "tslib": "^2.6.2",
+        "yauzl": "^2.10.0"
+      },
+      "dependencies": {
+        "ini": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.2.tgz",
+          "integrity": "sha512-AMB1mvwR1pyBFY/nSevUX6y8nJWS63/SzUKD3JyQn97s4xgIdgQPT75IRouIiBAN4yLQBUShNYVW0+UG25daCw=="
+        }
+      }
+    },
     "natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -36839,7 +37817,6 @@
       "version": "8.4.2",
       "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
       "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
-      "dev": true,
       "requires": {
         "define-lazy-prop": "^2.0.0",
         "is-docker": "^2.1.1",
@@ -37255,8 +38232,7 @@
     "path-key": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
     },
     "path-parse": {
       "version": "1.0.7",
@@ -37264,6 +38240,27 @@
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
       "dev": true
     },
+    "path-scurry": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.2.tgz",
+      "integrity": "sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==",
+      "requires": {
+        "lru-cache": "^10.2.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "10.2.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz",
+          "integrity": "sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q=="
+        },
+        "minipass": {
+          "version": "7.0.4",
+          "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
+          "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ=="
+        }
+      }
+    },
     "path-to-regexp": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
@@ -37279,10 +38276,7 @@
     "pend": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
-      "dev": true,
-      "optional": true,
-      "peer": true
+      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="
     },
     "performance-now": {
       "version": "2.1.0",
@@ -37343,6 +38337,16 @@
         "find-up": "^4.0.0"
       }
     },
+    "plist": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/plist/-/plist-3.1.0.tgz",
+      "integrity": "sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ==",
+      "requires": {
+        "@xmldom/xmldom": "^0.8.8",
+        "base64-js": "^1.5.1",
+        "xmlbuilder": "^15.1.1"
+      }
+    },
     "portfinder": {
       "version": "1.0.32",
       "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.32.tgz",
@@ -38155,7 +39159,6 @@
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
       "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
-      "dev": true,
       "requires": {
         "kleur": "^3.0.3",
         "sisteransi": "^1.0.5"
@@ -38410,7 +39413,6 @@
       "version": "3.6.1",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.1.tgz",
       "integrity": "sha512-+rQmrWMYGA90yenhTYsLWAsLsqVC8osOw6PKE1HDYiO0gdPeKe/xDHNzIAIn4C91YQ6oenEhfYqqc1883qHbjQ==",
-      "dev": true,
       "requires": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -38658,8 +39660,7 @@
     "safe-buffer": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
     },
     "safe-regex-test": {
       "version": "1.0.0",
@@ -38702,8 +39703,7 @@
     "sax": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-      "dev": true
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
     },
     "saxes": {
       "version": "6.0.0",
@@ -38959,7 +39959,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
       "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dev": true,
       "requires": {
         "shebang-regex": "^3.0.0"
       }
@@ -38967,8 +39966,7 @@
     "shebang-regex": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "dev": true
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
     },
     "shell-quote": {
       "version": "1.8.1",
@@ -38990,8 +39988,7 @@
     "signal-exit": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "dev": true
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
     },
     "sigstore": {
       "version": "1.0.0",
@@ -39178,8 +40175,7 @@
     "sisteransi": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
-      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
-      "dev": true
+      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg=="
     },
     "slash": {
       "version": "3.0.0",
@@ -39346,6 +40342,11 @@
         "wbuf": "^1.7.3"
       }
     },
+    "split2": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz",
+      "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg=="
+    },
     "sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
@@ -39427,7 +40428,6 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
       "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dev": true,
       "requires": {
         "safe-buffer": "~5.2.0"
       }
@@ -39452,7 +40452,6 @@
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
       "requires": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -39485,7 +40484,6 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
       "requires": {
         "ansi-regex": "^5.0.1"
       }
@@ -39690,7 +40688,6 @@
       "version": "6.1.11",
       "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
       "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
-      "dev": true,
       "requires": {
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
@@ -39703,8 +40700,7 @@
         "yallist": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-          "dev": true
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
         }
       }
     },
@@ -39853,6 +40849,14 @@
       "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
       "dev": true
     },
+    "through2": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz",
+      "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==",
+      "requires": {
+        "readable-stream": "3"
+      }
+    },
     "thunky": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
@@ -39927,8 +40931,7 @@
     "tree-kill": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
-      "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
-      "dev": true
+      "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A=="
     },
     "ts-jest": {
       "version": "29.1.0",
@@ -40352,8 +41355,7 @@
     "universalify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-      "dev": true
+      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="
     },
     "unpipe": {
       "version": "1.0.0",
@@ -40364,10 +41366,7 @@
     "untildify": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
-      "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
-      "dev": true,
-      "optional": true,
-      "peer": true
+      "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw=="
     },
     "update-browserslist-db": {
       "version": "1.0.10",
@@ -40407,8 +41406,7 @@
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-      "dev": true
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
     },
     "utils-merge": {
       "version": "1.0.1",
@@ -40929,7 +41927,6 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
       "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
       "requires": {
         "isexe": "^2.0.0"
       }
@@ -40998,7 +41995,6 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dev": true,
       "requires": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -41034,6 +42030,27 @@
       "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
       "dev": true
     },
+    "xml2js": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz",
+      "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==",
+      "requires": {
+        "sax": ">=0.6.0",
+        "xmlbuilder": "~11.0.0"
+      },
+      "dependencies": {
+        "xmlbuilder": {
+          "version": "11.0.1",
+          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+          "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="
+        }
+      }
+    },
+    "xmlbuilder": {
+      "version": "15.1.1",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz",
+      "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg=="
+    },
     "xmlchars": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
@@ -41104,9 +42121,6 @@
       "version": "2.10.0",
       "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
       "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
       "requires": {
         "buffer-crc32": "~0.2.3",
         "fd-slicer": "~1.1.0"
diff --git a/package.json b/package.json
index 96d64ba3e3..5599098a18 100644
--- a/package.json
+++ b/package.json
@@ -36,6 +36,19 @@
     "@angular/router": "~14.2.7",
     "@asymmetrik/ngx-leaflet": "^14.0.1",
     "@asymmetrik/ngx-leaflet-markercluster": "^14.0.1",
+    "@capacitor-community/intercom": "^5.0.1",
+    "@capacitor/android": "^5.7.4",
+    "@capacitor/app": "^5.0.7",
+    "@capacitor/camera": "^5.0.9",
+    "@capacitor/cli": "^5.7.4",
+    "@capacitor/core": "^5.7.4",
+    "@capacitor/device": "^5.0.7",
+    "@capacitor/dialog": "^5.0.7",
+    "@capacitor/filesystem": "^5.2.1",
+    "@capacitor/geolocation": "^5.0.7",
+    "@capacitor/network": "^5.0.7",
+    "@capacitor/share": "^5.0.7",
+    "@capacitor/status-bar": "^5.0.7",
     "@ionic/angular": "^7.1.1",
     "@ionic/pwa-elements": "^3.1.1",
     "@ionic/storage-angular": "^4.0.0",
@@ -47,6 +60,7 @@
     "@supy-io/ngx-intercom": "^14.2.12",
     "@swimlane/ngx-charts": "^20.1.2",
     "angular-google-tag-manager": "^1.6.1",
+    "capacitor-native-settings": "^5.0.1",
     "dayjs": "^1.11.7",
     "ion2-calendar": "^3.5.0",
     "ionicons": "^7.1.0",

From 25e11bbd9c05e671a4bb1749d2e1f317f18ef5a5 Mon Sep 17 00:00:00 2001
From: AmTryingMyBest <38259840+AmTryingMyBest@users.noreply.github.com>
Date: Wed, 17 Apr 2024 14:57:38 +0300
Subject: [PATCH 05/23] Chore/update login creds for e2e tests (#1023)

* update login credentials

* update login tests
---
 e2e-testing/cypress/functions/LoginFunctions.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/e2e-testing/cypress/functions/LoginFunctions.js b/e2e-testing/cypress/functions/LoginFunctions.js
index 6d7c3f1a47..bd0b177512 100644
--- a/e2e-testing/cypress/functions/LoginFunctions.js
+++ b/e2e-testing/cypress/functions/LoginFunctions.js
@@ -10,15 +10,15 @@ class LoginFunctions {
 
   type_email(email) {
     cy.wait(1000);
-    cy.get(LoginLocators.emailField).type(email, {force: true}).should('have.value', email);
+    cy.get(LoginLocators.emailField).type(email, { force: true }).should('have.value', email);
   }
 
   type_password(password) {
     cy.get(LoginLocators.passwordField)
-      .clear({force: true})
-      .type(password, {force: true})
+      .clear({ force: true })
+      .type(password, { force: true })
       .invoke('val')
-      .should('have.length.gte', 12);
+      .should('have.length.gte', 7);
   }
 
   click_login_button() {

From 9520851c00ced5bda592f44e3ee7575d050c380f Mon Sep 17 00:00:00 2001
From: Shakira Ndagire Seruwagi <ndagire.shakira@gmail.com>
Date: Thu, 18 Apr 2024 10:31:09 +0300
Subject: [PATCH 06/23] E2e tests for Survey Configuration - Hide author
 information (#919)

* Add e2e tests for hiding author information

* Rearrangethe e2e tests for hiding author information

* Rename the locator name for login button

* Fix the login details

* Fix failing tests when accessing functions

* Change email and password in test

* Change function to login new signed up user

* Fix the login credentials

* Change password for user

* Add env variables for email and password

* Fix the locators

* Fix formatting issues and removing the unnecessary import

* Fix merge conflict issues

* Add missed functions and rename function names

* correct failing test

* correct failing test

* correct failing test

* add steps for login as member user

* re-organize login tests

* update survey configuration tests

* update hide author information test

* update hide author information test

* update hide author information test

* change target survey

* change target survey

* change target survey

* change target survey

* change target survey

* change target survey

* rerun tests

* adjust hidden author test

* remove repeated locator

* add step to toggle post review required

---------

Co-authored-by: Shakira <shakira@Shakiras-MacBook-Pro.local>
Co-authored-by: AmTryingMyBest <38259840+AmTryingMyBest@users.noreply.github.com>
Co-authored-by: Walter <w.obadha@gmail.com>
---
 .prettierignore                               |  1 -
 .../post-metadata.component.html              |  2 +-
 .../survey-task/survey-task.component.html    | 24 +++++-
 e2e-testing/cypress/e2e/1-login/login.cy.js   | 20 ++++-
 .../cypress/e2e/1-login/negative-login.cy.js  |  9 ---
 .../survey-configurations.cy.js               |  6 +-
 .../cypress/functions/LoginFunctions.js       | 14 ++++
 .../functions/SurveyConfigurationFunctions.js | 74 +++++++++++++++++--
 .../cypress/locators/CollectionLocators.js    | 49 ++++++------
 .../PostsLocators/EditPostLocators.js         | 32 ++++----
 .../PostsLocators/ShareButtonPostLocators.js  | 20 ++---
 .../locators/SurveyConfigurationLocators.js   | 47 ++++++------
 12 files changed, 196 insertions(+), 102 deletions(-)
 delete mode 100644 e2e-testing/cypress/e2e/1-login/negative-login.cy.js
 rename e2e-testing/cypress/e2e/{12-survey-configurations => 13-survey-configurations}/survey-configurations.cy.js (71%)

diff --git a/.prettierignore b/.prettierignore
index 64b5bfc1ee..405e0cf95b 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,6 +1,5 @@
 node_modules
 documentation
-e2e
 
 package-lock.json
 
diff --git a/apps/web-mzima-client/src/app/post/post-metadata/post-metadata.component.html b/apps/web-mzima-client/src/app/post/post-metadata/post-metadata.component.html
index 93df4a8a59..a9edab848b 100644
--- a/apps/web-mzima-client/src/app/post/post-metadata/post-metadata.component.html
+++ b/apps/web-mzima-client/src/app/post/post-metadata/post-metadata.component.html
@@ -10,7 +10,7 @@
     />
   </div>
   <div class="post-info__content">
-    <span *ngIf="author" class="post-info__username">
+    <span *ngIf="author" class="post-info__username" [data-qa]="'author'">
       {{ author }}
     </span>
 
diff --git a/apps/web-mzima-client/src/app/settings/surveys/survey-task/survey-task.component.html b/apps/web-mzima-client/src/app/settings/surveys/survey-task/survey-task.component.html
index 2b270d2388..9094b727ed 100644
--- a/apps/web-mzima-client/src/app/settings/surveys/survey-task/survey-task.component.html
+++ b/apps/web-mzima-client/src/app/settings/surveys/survey-task/survey-task.component.html
@@ -214,7 +214,11 @@ <h2>
       <ng-container *ngIf="survey">
         <div class="form-row">
           <div class="toggle">
-            <mat-slide-toggle [(ngModel)]="survey.require_approval" name="accept-survey">
+            <mat-slide-toggle
+              [data-qa]="'toggle-posts-require-review'"
+              [(ngModel)]="survey.require_approval"
+              name="accept-survey"
+            >
               {{ 'survey.require_review' | translate }}
             </mat-slide-toggle>
             <p *ngIf="survey.require_approval" class="toggle__description">
@@ -222,7 +226,11 @@ <h2>
             </p>
           </div>
           <div class="toggle">
-            <mat-slide-toggle [(ngModel)]="survey.hide_author" name="import-to-survey">
+            <mat-slide-toggle
+              [data-qa]="'toggle-hide-author'"
+              [(ngModel)]="survey.hide_author"
+              name="import-to-survey"
+            >
               {{ 'survey.hide_author_information' | translate }}
             </mat-slide-toggle>
             <p *ngIf="survey.hide_author" class="toggle__description">
@@ -230,7 +238,11 @@ <h2>
             </p>
           </div>
           <div class="toggle" *ngIf="anonymiseReportersEnabled">
-            <mat-slide-toggle [(ngModel)]="survey.hide_location" name="import-to-survey">
+            <mat-slide-toggle
+              [data-qa]="'toggle-hide-location'"
+              [(ngModel)]="survey.hide_location"
+              name="import-to-survey"
+            >
               {{ 'survey.hide_location_information' | translate }}
             </mat-slide-toggle>
             <p
@@ -241,7 +253,11 @@ <h2>
             ></p>
           </div>
           <div class="toggle" *ngIf="anonymiseReportersEnabled">
-            <mat-slide-toggle [(ngModel)]="survey.hide_time" name="import-to-survey">
+            <mat-slide-toggle
+              [data-qa]="'toggle-hide-time'"
+              [(ngModel)]="survey.hide_time"
+              name="import-to-survey"
+            >
               {{ 'survey.hide_time_information' | translate }}
             </mat-slide-toggle>
             <p *ngIf="survey.hide_time" class="toggle__description">
diff --git a/e2e-testing/cypress/e2e/1-login/login.cy.js b/e2e-testing/cypress/e2e/1-login/login.cy.js
index 51bbae6071..7e7fbfe04d 100644
--- a/e2e-testing/cypress/e2e/1-login/login.cy.js
+++ b/e2e-testing/cypress/e2e/1-login/login.cy.js
@@ -1,9 +1,21 @@
-import LoginFunctions from "../../functions/LoginFunctions";
+import LoginFunctions from '../../functions/LoginFunctions';
 
-describe("Login as Admin", () => {
-  const loginFunctions = new LoginFunctions();
+const loginFunctions = new LoginFunctions();
 
-  it("Logs in as admin user", () => {
+describe('Login as Admin', () => {
+  it('Logs in as admin user', () => {
     loginFunctions.login_as_admin();
   });
 });
+
+describe('Login as Member', () => {
+  it('Logs in as member user', () => {
+    loginFunctions.login_member_user();
+  });
+});
+
+describe('Verify Invalid Login Credentials', () => {
+  it('Attempts login with invalid credentials', () => {
+    loginFunctions.verify_negative_login();
+  });
+});
diff --git a/e2e-testing/cypress/e2e/1-login/negative-login.cy.js b/e2e-testing/cypress/e2e/1-login/negative-login.cy.js
deleted file mode 100644
index 66cbc15359..0000000000
--- a/e2e-testing/cypress/e2e/1-login/negative-login.cy.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import LoginFunctions from "../../functions/LoginFunctions";
-
-describe("Verify Invalid Credentials on Login", () => {
-  const loginFunctions = new LoginFunctions();
-
-  it("Logs in with invalid credentials", () => {
-    loginFunctions.verify_negative_login();
-  });
-});
diff --git a/e2e-testing/cypress/e2e/12-survey-configurations/survey-configurations.cy.js b/e2e-testing/cypress/e2e/13-survey-configurations/survey-configurations.cy.js
similarity index 71%
rename from e2e-testing/cypress/e2e/12-survey-configurations/survey-configurations.cy.js
rename to e2e-testing/cypress/e2e/13-survey-configurations/survey-configurations.cy.js
index 838a122316..24e6aefbb6 100644
--- a/e2e-testing/cypress/e2e/12-survey-configurations/survey-configurations.cy.js
+++ b/e2e-testing/cypress/e2e/13-survey-configurations/survey-configurations.cy.js
@@ -10,7 +10,11 @@ describe("Automated Tests for Survey Configurations", () => {
     cy.visit(Cypress.env('baseUrl'));
   });
 
-  it("Verify posts go into Published state as configured", () => {
+  it.skip("Verify posts go into Published state as configured", () => {
     surveyConfigurationFunctions.require_posts_reviewed_before_published()
   });
+
+  it("Verifies author information stays hidden", () => {
+    surveyConfigurationFunctions.hide_author_information_and_verify()
+  });
 });
\ No newline at end of file
diff --git a/e2e-testing/cypress/functions/LoginFunctions.js b/e2e-testing/cypress/functions/LoginFunctions.js
index bd0b177512..2326caec2f 100644
--- a/e2e-testing/cypress/functions/LoginFunctions.js
+++ b/e2e-testing/cypress/functions/LoginFunctions.js
@@ -94,6 +94,20 @@ class LoginFunctions {
       { cacheAcrossSpecs: true },
     );
   }
+
+  login_member_user() {
+    cy.session(
+      [Cypress.env('ush_user_email'), Cypress.env('ush_user_pwd')],
+      () => {
+        this.launch_login_modal(Cypress.env('baseUrl'));
+        this.type_email(Cypress.env('ush_user_email'));
+        this.type_password(Cypress.env('ush_user_pwd'));
+        this.click_login_button();
+        this.verify_login();
+      },
+      { cacheAcrossSpecs: true },
+    );
+  }
 }
 
 export default LoginFunctions;
diff --git a/e2e-testing/cypress/functions/SurveyConfigurationFunctions.js b/e2e-testing/cypress/functions/SurveyConfigurationFunctions.js
index c327decf89..2000b48448 100644
--- a/e2e-testing/cypress/functions/SurveyConfigurationFunctions.js
+++ b/e2e-testing/cypress/functions/SurveyConfigurationFunctions.js
@@ -1,4 +1,7 @@
 import SurveyConfigurationLocators from '../locators/SurveyConfigurationLocators';
+import LoginFunctions from '../functions/LoginFunctions';
+
+const loginFunctions = new LoginFunctions();
 
 class SurveyConfigurationFunctions {
   open_settings() {
@@ -9,8 +12,8 @@ class SurveyConfigurationFunctions {
     cy.get(SurveyConfigurationLocators.surveyBtn).click();
   }
 
-  open_particular_survey() {
-    cy.get(SurveyConfigurationLocators.survey).click();
+  open_survey_to_configure() {
+    cy.get(SurveyConfigurationLocators.configurationTestSurvey).click();
   }
 
   open_survey_configurations() {
@@ -18,7 +21,14 @@ class SurveyConfigurationFunctions {
   }
 
   toggle_survey_review_required() {
-    cy.get('#mat-slide-toggle-1-input').click({ force: true });
+    cy.get(SurveyConfigurationLocators.reviewRqrdTgl).click();
+  }
+
+  toggle_require_posts_review() {
+    cy.get(SurveyConfigurationLocators.requirePostsReviewTgl).click();
+  }
+  toggle_hide_author_information() {
+    cy.get(SurveyConfigurationLocators.hideAuthorTgl).click();
   }
 
   save_survey_configurations() {
@@ -41,6 +51,9 @@ class SurveyConfigurationFunctions {
     cy.get(SurveyConfigurationLocators.surveyItemBtn).click();
     cy.wait(1000);
   }
+  open_survey_to_submit() {
+    cy.get(SurveyConfigurationLocators.surveyToSubmit).click();
+  }
 
   type_post_title(title) {
     cy.get(SurveyConfigurationLocators.postTitleField).type(title, { force: true });
@@ -55,10 +68,10 @@ class SurveyConfigurationFunctions {
   }
   add_post() {
     this.click_add_post_btn();
-    this.select_survey();
+    this.open_survey_to_submit();
     this.type_post_title('New Post Title');
+    // cy.get('[data-qa="null"]').type('New Title');
     this.type_post_description('New Post Description');
-    cy.get(SurveyConfigurationLocators.postCheckBox).click({ force: true });
     this.save_post();
     cy.get(SurveyConfigurationLocators.successBtn).click();
   }
@@ -66,7 +79,7 @@ class SurveyConfigurationFunctions {
   check_for_added_post_being_published() {
     cy.get(SurveyConfigurationLocators.clearBtn).click();
     cy.get(SurveyConfigurationLocators.surveySelectionList)
-      .children(SurveyConfigurationLocators.surveySelectItem)
+      .children(SurveyConfigurationLocators.surveyToVerify)
       .eq(0)
       .click({ force: true });
     cy.wait(3000);
@@ -76,19 +89,64 @@ class SurveyConfigurationFunctions {
     cy.get(SurveyConfigurationLocators.postStatus).contains('Published');
   }
 
+  check_for_accurate_author_name() {
+    cy.get(SurveyConfigurationLocators.clearBtn).click();
+    cy.get(SurveyConfigurationLocators.surveyToVerify).click();
+    // cy.wait(3000);
+    cy.get(SurveyConfigurationLocators.postPreview)
+      .children(SurveyConfigurationLocators.postItem)
+      .contains('New Post Title');
+    cy.get('.post-info__username').contains('Automation User Member Role').should('be.visible');
+  }
+
+  check_for_anonymous_author_name() {
+    cy.get(SurveyConfigurationLocators.clearBtn).click();
+    cy.get('[data-qa="btn-data"]').click();
+    cy.get(SurveyConfigurationLocators.surveyToVerify).click();
+    // cy.wait(3000);
+    cy.get(SurveyConfigurationLocators.postPreview)
+      .children(SurveyConfigurationLocators.postItem)
+      .contains('New Post Title');
+    cy.get('.post-info__username').contains('Anonymous').should('be.visible');
+  }
+
   require_posts_reviewed_before_published() {
     this.open_settings();
     this.open_surveys();
-    this.open_particular_survey();
+    this.open_survey_to_configure();
     this.open_survey_configurations();
     this.toggle_survey_review_required();
     this.save_survey_configurations();
-    this.open_particular_survey();
+    this.open_survey_to_configure();
     this.reopen_survey_configure_tab();
     this.verify_button_toggled();
     this.add_post();
     this.check_for_added_post_being_published();
   }
+
+  hide_author_information_and_verify() {
+    //change configuration survey
+    this.open_settings();
+    this.open_surveys();
+    this.open_survey_to_configure();
+    this.open_survey_configurations();
+    this.toggle_survey_review_required();
+    this.toggle_hide_author_information();
+    this.save_survey_configurations();
+    loginFunctions.logout();
+    //login as a member
+    loginFunctions.login_member_user();
+
+    cy.visit(Cypress.env('baseUrl'));
+    this.add_post();
+    //skip checking for accurate author name since the user we are using for this test lacks the privilege to have the name show
+    // this.check_for_accurate_author_name();
+
+    loginFunctions.logout();
+
+    cy.visit(Cypress.env('baseUrl'));
+    this.check_for_anonymous_author_name();
+  }
 }
 
 export default SurveyConfigurationFunctions;
diff --git a/e2e-testing/cypress/locators/CollectionLocators.js b/e2e-testing/cypress/locators/CollectionLocators.js
index e9c4c31458..b15b1c0739 100644
--- a/e2e-testing/cypress/locators/CollectionLocators.js
+++ b/e2e-testing/cypress/locators/CollectionLocators.js
@@ -1,27 +1,26 @@
 const CollectionLocators = {
-    collectionBtn: '[data-qa="btn-collections"]',
-    addcollectionBtn: '[data-qa="add-collection"]',
-    collectionNameField: '[data-qa="name"]',
-    collectionDescField: '[data-qa="description"]',
-    onlyMeRadio: '[data-qa="only-me"]',
-    saveCollectionBtn: '[data-qa="save-collection-btn"]',
-    selectCollection: '[data-qa="collection-item"]',
-    surveyItem: '[data-qa="add-post-modal-surveys-item2"]',
-    submitPostButton: '[data-qa="submit-post-button"]',
-    surveySelectionList: '[data-qa="survey-selection-list"]',
-    selectedSurveyItem: '[data-qa="survey-select-item2"]',
-    postTitleField: '[data-qa="null"]',
-    postDescField: '[data-qa="description"]',
-    postCheckBox: '[data-qa="nature-of-this-incident-failure-to-announce-results-by-iebc-officials"]',
-    savePostBtn: '[data-qa="btn-post-item-submit"]',
-    successBtn: '[data-qa="btn-confirm-success"]',
-    surveySelectionList: '[data-qa="survey-selection-list"]',
-    surveySelectItem: '[data-qa="survey-select-item2"]',
-    addPostButton: '[data-qa="submit-post-button"]',
-    saveCollectionButton: '[data-qa="save-collection-btn"]',
-    collectionItem: '[data-qa="collection-item"]',
-    visibilityOption: '[data-qa="option"]'
-  };
-  
+  collectionBtn: '[data-qa="btn-collections"]',
+  addcollectionBtn: '[data-qa="add-collection"]',
+  collectionNameField: '[data-qa="name"]',
+  collectionDescField: '[data-qa="description"]',
+  onlyMeRadio: '[data-qa="only-me"]',
+  saveCollectionBtn: '[data-qa="save-collection-btn"]',
+  selectCollection: '[data-qa="collection-item"]',
+  surveyItem: '[data-qa="add-post-modal-surveys-item2"]',
+  submitPostButton: '[data-qa="submit-post-button"]',
+  surveySelectionList: '[data-qa="survey-selection-list"]',
+  selectedSurveyItem: '[data-qa="survey-select-item2"]',
+  postTitleField: '[data-qa="null"]',
+  postDescField: '[data-qa="description"]',
+  postCheckBox: '[data-qa="nature-of-this-incident-failure-to-announce-results-by-iebc-officials"]',
+  savePostBtn: '[data-qa="btn-post-item-submit"]',
+  successBtn: '[data-qa="btn-confirm-success"]',
+  surveySelectionList: '[data-qa="survey-selection-list"]',
+  surveySelectItem: '[data-qa="survey-select-item2"]',
+  addPostButton: '[data-qa="submit-post-button"]',
+  saveCollectionButton: '[data-qa="save-collection-btn"]',
+  collectionItem: '[data-qa="collection-item"]',
+  visibilityOption: '[data-qa="option"]',
+};
+
 export default CollectionLocators;
-  
\ No newline at end of file
diff --git a/e2e-testing/cypress/locators/PostsLocators/EditPostLocators.js b/e2e-testing/cypress/locators/PostsLocators/EditPostLocators.js
index 63e25c800a..4b3ae0e1d9 100644
--- a/e2e-testing/cypress/locators/PostsLocators/EditPostLocators.js
+++ b/e2e-testing/cypress/locators/PostsLocators/EditPostLocators.js
@@ -1,18 +1,16 @@
+const EditPostLocators = {
+  surveyItem: '[data-qa="add-post-modal-surveys-item2"]',
+  addPostBtn: '[data-qa="submit-post-button"]',
+  postTitleField: '[data-qa="null"]',
+  postDescField: '[data-qa="description"]',
+  postCheckBox: '[data-qa="nature-of-this-incident-failure-to-announce-results-by-iebc-officials"]',
+  savePostBtn: '[data-qa="btn-post-item-submit"]',
+  successBtn: '[data-qa="btn-confirm-success"]',
+  postPreview: '[data-qa="post-preview"]',
+  postItem: '[data-qa="post-item"]',
+  surveySelectionList: '[data-qa="survey-selection-list"]',
+  surveySelectItem: '[data-qa="survey-select-item2"]',
+  editPostBtn: '[data-qa="edit-post"]',
+};
 
-    const EditPostLocators = {
-        surveyItem: '[data-qa="add-post-modal-surveys-item2"]',
-        addPostBtn: '[data-qa="submit-post-button"]',
-        postTitleField: '[data-qa="null"]',
-        postDescField: '[data-qa="description"]',
-        postCheckBox: '[data-qa="nature-of-this-incident-failure-to-announce-results-by-iebc-officials"]',
-        savePostBtn: '[data-qa="btn-post-item-submit"]',
-        successBtn: '[data-qa="btn-confirm-success"]',
-        postPreview: '[data-qa="post-preview"]',
-        postItem: '[data-qa="post-item"]',
-        surveySelectionList: '[data-qa="survey-selection-list"]',
-        surveySelectItem: '[data-qa="survey-select-item2"]',
-        editPostBtn: '[data-qa="edit-post"]',
-      };
-    
-    export default EditPostLocators;
-
+export default EditPostLocators;
diff --git a/e2e-testing/cypress/locators/PostsLocators/ShareButtonPostLocators.js b/e2e-testing/cypress/locators/PostsLocators/ShareButtonPostLocators.js
index 210fd84d43..5c5558b013 100644
--- a/e2e-testing/cypress/locators/PostsLocators/ShareButtonPostLocators.js
+++ b/e2e-testing/cypress/locators/PostsLocators/ShareButtonPostLocators.js
@@ -1,13 +1,13 @@
 const ShareButtonPostLocators = {
-    dataViewBtn: '[data-qa="btn-data"]',
-    surveySelectionList: '[data-qa="survey-selection-list"]',
-    surveySelectItem: '[data-qa="survey-select-item2"]',
-    postPreview: '[data-qa="post-preview"]',
-    postItem: '[data-qa="post-item"]',
-    postHead: '[data-qa="post-head"]',
-    postShare: '[data-qa="share-post"]',
-    postDetails: '[data-qa="post-details"]',
-    surveyWebAddress: '[data-qa="survey-web-address"]',
+  dataViewBtn: '[data-qa="btn-data"]',
+  surveySelectionList: '[data-qa="survey-selection-list"]',
+  surveySelectItem: '[data-qa="survey-select-item2"]',
+  postPreview: '[data-qa="post-preview"]',
+  postItem: '[data-qa="post-item"]',
+  postHead: '[data-qa="post-head"]',
+  postShare: '[data-qa="share-post"]',
+  postDetails: '[data-qa="post-details"]',
+  surveyWebAddress: '[data-qa="survey-web-address"]',
 };
 
-export default ShareButtonPostLocators;
\ No newline at end of file
+export default ShareButtonPostLocators;
diff --git a/e2e-testing/cypress/locators/SurveyConfigurationLocators.js b/e2e-testing/cypress/locators/SurveyConfigurationLocators.js
index d10c8c5aa6..1bc8a5143f 100644
--- a/e2e-testing/cypress/locators/SurveyConfigurationLocators.js
+++ b/e2e-testing/cypress/locators/SurveyConfigurationLocators.js
@@ -1,23 +1,26 @@
 const SurveyConfigurationLocators = {
-    surveyList: '[data-qa="survey-list"]',
-    survey: '[data-qa="counting-and-results"]',
-    saveSurveyBtn: '[data-qa="btn-save-survey-item"]',
-    settingsBtn: '[data-qa="btn-settings"]',
-    surveyBtn: '[data-qa="btn-surveys"]',
-    addPostBtn: '[data-qa="submit-post-button"]',
-    postTitleField: '[ng-reflect-data-qa="title"]',
-    postDescField: '[data-qa="description"]',
-    postCheckBox: '[data-qa="nature-of-this-incident-failure-to-announce-results-by-iebc-officials"]',
-    savePostBtn: '[data-qa="btn-post-item-submit"]',
-    successBtn: '[data-qa="btn-confirm-success"]',
-    postPreview: '[data-qa="post-preview"]',
-    postItem: '[data-qa="post-item"]',
-    clearBtn: '[data-qa="clear"]',
-    surveyItemBtn: '[data-qa="add-post-modal-surveys-item2"]',
-    surveySelectionList: '[data-qa="survey-selection-list"]',
-    surveySelectItem: '[data-qa="survey-select-item2"]',
-    postStatus: '[data-qa="status"]'
-  };
-  
-  export default SurveyConfigurationLocators;
-  
\ No newline at end of file
+  surveyList: '[data-qa="survey-list"]',
+  configurationTestSurvey: '[data-qa="full-length-survey-with-image-field--don\'t-delete"]',
+  survey: '[data-qa="counting-and-results"]',
+  saveSurveyBtn: '[data-qa="btn-save-survey-item"]',
+  settingsBtn: '[data-qa="btn-settings"]',
+  surveyBtn: '[data-qa="btn-surveys"]',
+  addPostBtn: '[data-qa="submit-post-button"]',
+  postTitleField: '[ng-reflect-data-qa="title"]',
+  postDescField: '[data-qa="description"]',
+  postCheckBox: '[data-qa="nature-of-this-incident-failure-to-announce-results-by-iebc-officials"]',
+  savePostBtn: '[data-qa="btn-post-item-submit"]',
+  successBtn: '[data-qa="btn-confirm-success"]',
+  postPreview: '[data-qa="post-preview"]',
+  postItem: '[data-qa="post-item"]',
+  clearBtn: '[data-qa="clear"]',
+  surveyItemBtn: '[data-qa="automation-survey---to-test-survey-configuration"]',
+  surveySelectionList: '[data-qa="survey-selection-list"]',
+  surveyToSubmit: '[data-qa="add-post-modal-surveys-item125"]',
+  surveyToVerify: '[data-qa="survey-select-item125"]',
+  postStatus: '[data-qa="status"]',
+  reviewRqrdTgl: '[data-qa="toggle-posts-require-review"]',
+  hideAuthorTgl: '[data-qa="toggle-hide-author"]',
+};
+
+export default SurveyConfigurationLocators;

From f3fc654a913427574a66d0d9c974ebd340a96fbb Mon Sep 17 00:00:00 2001
From: ushahidlee <152860706+ushahidlee@users.noreply.github.com>
Date: Thu, 18 Apr 2024 09:42:37 +0200
Subject: [PATCH 07/23] Ush 1275 & some pagination issues  (#1025)

* Bugs fixed

* tidied up a few things

* tiny change
---
 libs/sdk/src/lib/services/posts.service.ts | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/libs/sdk/src/lib/services/posts.service.ts b/libs/sdk/src/lib/services/posts.service.ts
index 5a5da6a3e3..090b516953 100644
--- a/libs/sdk/src/lib/services/posts.service.ts
+++ b/libs/sdk/src/lib/services/posts.service.ts
@@ -170,15 +170,19 @@ export class PostsService extends ResourceService<any> {
 
   public getPostStatistics(queryParams?: any): Observable<PostStatsResponse> {
     const params = { ...queryParams, group_by: 'form', enable_group_by_source: true };
-    const filters = this.postParamsMapper(params, this.postsFilters.value);
+    const filters = this.postParamsMapper(params, this.postsFilters.value, true);
 
     return super.get('stats', filters);
   }
 
-  private postParamsMapper(params: any, filter?: GeoJsonFilter) {
+  private postParamsMapper(params: any, filter?: GeoJsonFilter, isStats: boolean = false) {
     // Combine new parameters with existing filter
     const postParams: any = { ...filter, ...params };
+
+    // Some parameters should always come from the filter (if they exist)
+    postParams.page = filter?.page;
     postParams.currentView = filter?.currentView;
+    postParams.limit = filter?.limit;
 
     // Allocate start and end dates, and remove originals
     if (postParams.date?.start) {
@@ -227,9 +231,11 @@ export class PostsService extends ResourceService<any> {
       delete postParams.place;
     }
 
-    // Clean up whatevers left, removing empty arrays and values
+    // Remove the 'Unknown Form' form
     postParams['form[]'] = postParams['form[]'].filter((formId: any) => formId !== 0);
-    if (postParams['form[]']?.length === 0 || postParams['form[]'][0] === 'none') {
+
+    // Clean up whatevers left, removing empty arrays and values
+    if (postParams['form[]']?.length === 0 || isStats) {
       delete postParams['form[]'];
     }
 
@@ -244,9 +250,11 @@ export class PostsService extends ResourceService<any> {
     if (postParams['tags[]']?.length === 0) {
       delete postParams['tags[]'];
     }
+
     if (postParams.set?.length === 0) {
       delete postParams.set;
     }
+
     if (postParams.query?.length === 0) {
       delete postParams.query;
     }

From 2837b68c392f9327d30c7b9ff736d218c819d394 Mon Sep 17 00:00:00 2001
From: AmTryingMyBest <38259840+AmTryingMyBest@users.noreply.github.com>
Date: Thu, 18 Apr 2024 12:03:22 +0300
Subject: [PATCH 08/23] E2e fix filter tests (#1027)

* fix filter by Survey test

* skip filter by survey until fixed
---
 .../cypress/e2e/12-data-view/data-view.cy.js   | 12 ++++++------
 .../functions/DataViewFilterFunctions.js       | 18 +++++++++---------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/e2e-testing/cypress/e2e/12-data-view/data-view.cy.js b/e2e-testing/cypress/e2e/12-data-view/data-view.cy.js
index 1b5b4efaa6..a0145e0421 100644
--- a/e2e-testing/cypress/e2e/12-data-view/data-view.cy.js
+++ b/e2e-testing/cypress/e2e/12-data-view/data-view.cy.js
@@ -1,7 +1,7 @@
-import LoginFunctions from "../../functions/LoginFunctions";
-import DataViewFilterFunctions from "../../functions/DataViewFilterFunctions";
+import LoginFunctions from '../../functions/LoginFunctions';
+import DataViewFilterFunctions from '../../functions/DataViewFilterFunctions';
 
-describe("Automated Tests for Post Filters in Data View", () => {
+describe('Automated Tests for Post Filters in Data View', () => {
   const loginFunctions = new LoginFunctions();
   const dataViewFilterFunctions = new DataViewFilterFunctions();
 
@@ -10,15 +10,15 @@ describe("Automated Tests for Post Filters in Data View", () => {
     cy.visit(Cypress.env('baseUrl'));
   });
 
-  it("Filter posts by survey", () => {
+  it('Filter posts by survey', () => {
     dataViewFilterFunctions.click_data_view_btn();
     dataViewFilterFunctions.check_post_filter_by_survey();
     dataViewFilterFunctions.verify_count_on_results();
   });
 
-  it("Filter posts by status", () => {
+  //skipping this until filter by status are fixed
+  it.skip('Filter posts by status', () => {
     dataViewFilterFunctions.click_data_view_btn();
     dataViewFilterFunctions.check_post_filter_by_status();
   });
-  
 });
diff --git a/e2e-testing/cypress/functions/DataViewFilterFunctions.js b/e2e-testing/cypress/functions/DataViewFilterFunctions.js
index 3bf8aee4e3..e8b7e23111 100644
--- a/e2e-testing/cypress/functions/DataViewFilterFunctions.js
+++ b/e2e-testing/cypress/functions/DataViewFilterFunctions.js
@@ -11,8 +11,8 @@ class DataViewFilterFunctions {
 
   verify_count_on_results() {
     //verify results on landing on Data view
-    cy.get(DataViewLocators.mainResultsTotal).contains('Results: 513');
-    cy.get(DataViewLocators.feedPageResults).contains('Current results: 20 / 513');
+    cy.get(DataViewLocators.mainResultsTotal).contains('Results: 512');
+    cy.get(DataViewLocators.feedPageResults).contains('Current results: 20 / 512');
 
     //clear all selected surveys
     cy.get(DataViewLocators.clearBtn).click();
@@ -20,29 +20,29 @@ class DataViewFilterFunctions {
     //select only first survey
     cy.get('[data-qa="survey-select-item2"]').click();
     //verify count
-    cy.get(DataViewLocators.mainResultsTotal).contains('Results: 357');
+    cy.get(DataViewLocators.mainResultsTotal).contains('Results: 356');
 
     //select second survey
     cy.get('[data-qa="survey-select-item3"]').click();
-    cy.get(DataViewLocators.mainResultsTotal).contains('Results: 360');
+    cy.get(DataViewLocators.mainResultsTotal).contains('Results: 359');
 
     //select third survey
     cy.get('[data-qa="survey-select-item4"]').click();
-    cy.get(DataViewLocators.mainResultsTotal).contains('Results: 370');
-    cy.get(DataViewLocators.feedPageResults).contains('Current results: 20 / 370');
+    cy.get(DataViewLocators.mainResultsTotal).contains('Results: 369');
+    cy.get(DataViewLocators.feedPageResults).contains('Current results: 20 / 369');
 
     //reveal filters button
     cy.get(DataViewLocators.revealFiltersBtn).click();
     //click clear all filters button
     cy.get(DataViewLocators.clearFiltersBtn).click();
-    cy.get(DataViewLocators.mainResultsTotal).contains('Results: 513');
-    cy.get(DataViewLocators.feedPageResults).contains('Current results: 20 / 513');
+    cy.get(DataViewLocators.mainResultsTotal).contains('Results: 512');
+    cy.get(DataViewLocators.feedPageResults).contains('Current results: 20 / 512');
   }
 
   check_post_filter_by_status() {
     //click search form filter button
     cy.get(DataViewLocators.revealFiltersBtn).click();
-    cy.get(DataViewLocators.feedPageResults).contains('Current results: 20 / 513');
+    cy.get(DataViewLocators.feedPageResults).contains('Current results: 20 / 512');
     //click status filter button
     // cy.get(DataViewLocators.statusBtn).click();
     cy.get('button:contains("Status")').click();

From 93ae33870d62edd0c50ca12f2f969fcaf5a76d8a Mon Sep 17 00:00:00 2001
From: Anna Iosif <anna.iosif@me.com>
Date: Thu, 18 Apr 2024 11:40:18 +0200
Subject: [PATCH 09/23] Checking for correct permission-values for collections
 (#1021)

---
 .../shared/components/collections/collections.component.ts    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/web-mzima-client/src/app/shared/components/collections/collections.component.ts b/apps/web-mzima-client/src/app/shared/components/collections/collections.component.ts
index 0ae9f63341..e7e33241d3 100644
--- a/apps/web-mzima-client/src/app/shared/components/collections/collections.component.ts
+++ b/apps/web-mzima-client/src/app/shared/components/collections/collections.component.ts
@@ -109,7 +109,7 @@ export class CollectionsComponent extends BaseComponent implements OnInit {
       visible_to: [
         {
           value: 'everyone',
-          options: ['everyone'],
+          options: [],
           disabled: false,
         },
       ],
@@ -167,7 +167,7 @@ export class CollectionsComponent extends BaseComponent implements OnInit {
 
           function checkReadPrivilege() {
             // If the collection's role allows everyone to view or the specific role of the current user to view it.
-            if (item.role?.includes('everyone') || item.role?.includes(userRole)) {
+            if (item.role?.includes('everyone') || item.role?.includes(userRole) || !item.role) {
               return true;
             }
 

From 6dc6265f5ea116287107a6e22e8d7056bfef4d93 Mon Sep 17 00:00:00 2001
From: ushahidlee <152860706+ushahidlee@users.noreply.github.com>
Date: Thu, 18 Apr 2024 11:42:32 +0200
Subject: [PATCH 10/23] USH-1266 - Deployment map + data still visible after
 Deletion (#1014)

* Bug fixed.

* fixed another bug
---
 .../choose-deployment.component.ts            | 27 +++++++++++--------
 libs/sdk/src/lib/services/posts.service.ts    | 10 ++++---
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/apps/mobile-mzima-client/src/app/shared/components/choose-deployment/choose-deployment.component.ts b/apps/mobile-mzima-client/src/app/shared/components/choose-deployment/choose-deployment.component.ts
index 18bc378a28..d12e4bfbcc 100644
--- a/apps/mobile-mzima-client/src/app/shared/components/choose-deployment/choose-deployment.component.ts
+++ b/apps/mobile-mzima-client/src/app/shared/components/choose-deployment/choose-deployment.component.ts
@@ -1,17 +1,11 @@
 import { Component, EventEmitter, Input, Output, ViewChild } from '@angular/core';
+import { Router } from '@angular/router';
 import { Platform } from '@ionic/angular';
 import { App } from '@capacitor/app';
 import { MainLayoutComponent } from '../main-layout/main-layout.component';
 import { Deployment } from '@mzima-client/sdk';
 import { Subject, debounceTime } from 'rxjs';
-import {
-  AlertService,
-  AuthService,
-  ConfigService,
-  DeploymentService,
-  EnvService,
-  // IntercomService,
-} from '@services';
+import { AlertService, AuthService, ConfigService, DeploymentService, EnvService } from '@services';
 import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
 import { ToastService } from '@services';
 
@@ -40,11 +34,12 @@ export class ChooseDeploymentComponent {
   tap = 0;
 
   constructor(
+    private router: Router,
     private envService: EnvService,
     private configService: ConfigService,
     private deploymentService: DeploymentService,
     private alertService: AlertService,
-    private authService: AuthService, // private intercomService: IntercomService,
+    private authService: AuthService,
     protected toastService: ToastService,
     protected platform: Platform,
   ) {
@@ -119,9 +114,19 @@ export class ChooseDeploymentComponent {
   }
 
   public removeDeployment(deploymentId: number) {
-    const index = this.deploymentList.findIndex((i: any) => i.id === deploymentId);
-    if (index !== -1) this.deploymentList.splice(index, 1);
+    this.deploymentList = this.deploymentList.filter(
+      (deployment) => deployment.id !== deploymentId,
+    );
     this.deploymentService.setDeployments(this.deploymentList);
+    if (this.deploymentList.length === 0) {
+      this.currentDeploymentId = undefined;
+      this.authService.logout();
+      this.deploymentService.setDeployment(null);
+      if (this.isProfile) this.router.navigate(['deployment']);
+    } else if (this.currentDeploymentId === deploymentId) {
+      this.currentDeploymentId = this.deploymentList[0].id;
+      this.chooseDeployment(this.deploymentList[0]);
+    }
   }
 
   public async chooseDeployment(deployment: Deployment) {
diff --git a/libs/sdk/src/lib/services/posts.service.ts b/libs/sdk/src/lib/services/posts.service.ts
index 090b516953..fd87a40d83 100644
--- a/libs/sdk/src/lib/services/posts.service.ts
+++ b/libs/sdk/src/lib/services/posts.service.ts
@@ -231,11 +231,13 @@ export class PostsService extends ResourceService<any> {
       delete postParams.place;
     }
 
-    // Remove the 'Unknown Form' form
-    postParams['form[]'] = postParams['form[]'].filter((formId: any) => formId !== 0);
-
     // Clean up whatevers left, removing empty arrays and values
-    if (postParams['form[]']?.length === 0 || isStats) {
+    postParams['form[]'] = postParams['form[]']?.filter((formId: any) => formId !== 0);
+    if (
+      postParams['form[]']?.length === 0 ||
+      postParams['form[]'] === undefined ||
+      isStats
+    ) {
       delete postParams['form[]'];
     }
 

From 3debe72de9c90c02cea2b17e905a70639c35c89e Mon Sep 17 00:00:00 2001
From: ushahidlee <152860706+ushahidlee@users.noreply.github.com>
Date: Thu, 18 Apr 2024 11:42:47 +0200
Subject: [PATCH 11/23] Bug fixed (#1015)

---
 .../src/app/auth/signup/signup.page.html                  | 8 ++++++--
 .../src/app/auth/signup/signup.page.ts                    | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/apps/mobile-mzima-client/src/app/auth/signup/signup.page.html b/apps/mobile-mzima-client/src/app/auth/signup/signup.page.html
index 3bedf9e1dc..3f3078826f 100644
--- a/apps/mobile-mzima-client/src/app/auth/signup/signup.page.html
+++ b/apps/mobile-mzima-client/src/app/auth/signup/signup.page.html
@@ -44,9 +44,13 @@
         <div class="agreement">
           <app-checkbox formControlName="agreement">
             I agree to Ushahidi
-            <a (click)="openLink($event, 'Privacy Policy')">Privacy Policy</a>
+            <a (click)="openLink($event, 'https://www.ushahidi.com/privacy-policy')"
+              >Privacy Policy</a
+            >
             the <br />
-            <a (click)="openLink($event, 'Privacy Policy')">Terms and Conditions</a>.
+            <a (click)="openLink($event, 'https://www.ushahidi.com/terms-of-service')"
+              >Terms and Conditions</a
+            >.
           </app-checkbox>
         </div>
         <ion-text *ngIf="signupError?.length" class="form-error ion-text-center" color="danger">
diff --git a/apps/mobile-mzima-client/src/app/auth/signup/signup.page.ts b/apps/mobile-mzima-client/src/app/auth/signup/signup.page.ts
index aa48d10332..49585b6c25 100644
--- a/apps/mobile-mzima-client/src/app/auth/signup/signup.page.ts
+++ b/apps/mobile-mzima-client/src/app/auth/signup/signup.page.ts
@@ -92,7 +92,7 @@ export class SignupPage {
   public openLink(event: Event, link: string): void {
     event.preventDefault();
     event.stopPropagation();
-    console.log('open: ', link);
+    window.open(link);
   }
 
   public chooseDeployment(): void {

From 9726702832b22778768f12776895a6a363bd2a82 Mon Sep 17 00:00:00 2001
From: ushahidlee <152860706+ushahidlee@users.noreply.github.com>
Date: Thu, 18 Apr 2024 15:27:10 +0200
Subject: [PATCH 12/23] Fixed a couple of little issues (#1028)

---
 libs/sdk/src/lib/services/posts.service.ts | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/libs/sdk/src/lib/services/posts.service.ts b/libs/sdk/src/lib/services/posts.service.ts
index fd87a40d83..d63742418a 100644
--- a/libs/sdk/src/lib/services/posts.service.ts
+++ b/libs/sdk/src/lib/services/posts.service.ts
@@ -180,9 +180,9 @@ export class PostsService extends ResourceService<any> {
     const postParams: any = { ...filter, ...params };
 
     // Some parameters should always come from the filter (if they exist)
-    postParams.page = filter?.page;
-    postParams.currentView = filter?.currentView;
-    postParams.limit = filter?.limit;
+    postParams.page = filter?.page ?? postParams.page;
+    postParams.currentView = filter?.currentView ?? postParams.currentView;
+    postParams.limit = filter?.limit ?? postParams.limit;
 
     // Allocate start and end dates, and remove originals
     if (postParams.date?.start) {
@@ -231,13 +231,11 @@ export class PostsService extends ResourceService<any> {
       delete postParams.place;
     }
 
-    // Clean up whatevers left, removing empty arrays and values
+    // Remove 'unknown form' from the form list if it exists.
     postParams['form[]'] = postParams['form[]']?.filter((formId: any) => formId !== 0);
-    if (
-      postParams['form[]']?.length === 0 ||
-      postParams['form[]'] === undefined ||
-      isStats
-    ) {
+
+    // Clean up whatevers left, removing empty arrays and values
+    if (postParams['form[]']?.length === 0 || postParams['form[]'] === undefined || isStats) {
       delete postParams['form[]'];
     }
 

From ab9bd3d2d70c55a3f7a8478625b4b560dfb54014 Mon Sep 17 00:00:00 2001
From: AmTryingMyBest <38259840+AmTryingMyBest@users.noreply.github.com>
Date: Thu, 18 Apr 2024 18:56:30 +0300
Subject: [PATCH 13/23] add check to contact email change test (#1024)

* add check contact email change test

* update contact email tests
---
 .../change-contact-email-address.cy.js        | 11 +++----
 .../ChangeContactEmailAddressFunctions.js     | 33 ++++++++-----------
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/e2e-testing/cypress/e2e/11-change-contact-email-address/change-contact-email-address.cy.js b/e2e-testing/cypress/e2e/11-change-contact-email-address/change-contact-email-address.cy.js
index 00f8526678..f635d6c411 100644
--- a/e2e-testing/cypress/e2e/11-change-contact-email-address/change-contact-email-address.cy.js
+++ b/e2e-testing/cypress/e2e/11-change-contact-email-address/change-contact-email-address.cy.js
@@ -1,7 +1,7 @@
-import LoginFunctions from "../../functions/LoginFunctions";
-import ChangeContactEmailAddressFunctions from "../../functions/ChangeContactEmailAddressFunctions";
+import LoginFunctions from '../../functions/LoginFunctions';
+import ChangeContactEmailAddressFunctions from '../../functions/ChangeContactEmailAddressFunctions';
 
-describe("Automated Tests for change contact email address", () => {
+describe('Automated Tests for change contact email address', () => {
   const loginFunctions = new LoginFunctions();
   const changeContactEmailAddressFunctions = new ChangeContactEmailAddressFunctions();
 
@@ -10,11 +10,10 @@ describe("Automated Tests for change contact email address", () => {
     cy.visit(Cypress.env('baseUrl'));
   });
 
-  it("Steps to change contact email address", () => {
+  it('Steps to change contact email address', () => {
     changeContactEmailAddressFunctions.open_general_settings();
     changeContactEmailAddressFunctions.change_contact_email_address();
     changeContactEmailAddressFunctions.click_save_button();
-    changeContactEmailAddressFunctions.reload_page();
     changeContactEmailAddressFunctions.check_new_contact_email_address_shows();
   });
-});
\ No newline at end of file
+});
diff --git a/e2e-testing/cypress/functions/ChangeContactEmailAddressFunctions.js b/e2e-testing/cypress/functions/ChangeContactEmailAddressFunctions.js
index 0017bb840d..79c461c9a1 100644
--- a/e2e-testing/cypress/functions/ChangeContactEmailAddressFunctions.js
+++ b/e2e-testing/cypress/functions/ChangeContactEmailAddressFunctions.js
@@ -1,26 +1,21 @@
 import GeneralSettingsLocator from '../locators/GeneralSettingsLocator';
 
 class ChangeContactEmailAddressFunctions {
-    open_general_settings() {
-      cy.get(GeneralSettingsLocator.settingsBtn).click(); 
-    }
-    change_contact_email_address(){
-        cy.get(GeneralSettingsLocator.emailField)
-        .clear()
-        .type("testnew@gmail.com")
-    }
-
-    click_save_button() {
-      cy.get(GeneralSettingsLocator.saveButton).click();
-    }
+  open_general_settings() {
+    cy.get(GeneralSettingsLocator.settingsBtn).click();
+  }
+  change_contact_email_address() {
+    cy.get(GeneralSettingsLocator.emailField).should('not.be.empty');
+    cy.get(GeneralSettingsLocator.emailField).clear().type('testnew@gmail.com');
+  }
 
-    check_new_contact_email_address_shows(){
-        cy.get(GeneralSettingsLocator.contactEmail).contains('testnew@gmail.com')
-    }
+  click_save_button() {
+    cy.get(GeneralSettingsLocator.saveButton).click();
+  }
 
-    reload_page(){
-      cy.reload()
-    }
+  check_new_contact_email_address_shows() {
+    cy.get(GeneralSettingsLocator.contactEmail).contains('testnew@gmail.com');
   }
+}
 
-  export default ChangeContactEmailAddressFunctions;
\ No newline at end of file
+export default ChangeContactEmailAddressFunctions;

From f5621c77445109a7e4b2d445d242136981607158 Mon Sep 17 00:00:00 2001
From: Walter <w.obadha@gmail.com>
Date: Fri, 19 Apr 2024 08:36:06 +0300
Subject: [PATCH 14/23] rerun tests


From c0a0d58185082bb69507d0d8e5dcd570b5db13fb Mon Sep 17 00:00:00 2001
From: AmTryingMyBest <38259840+AmTryingMyBest@users.noreply.github.com>
Date: Fri, 19 Apr 2024 13:59:23 +0300
Subject: [PATCH 15/23] remove stand-alone tests that verify posts review
 before publishing (#1029)

* remove stand-alone tests that verify posts review before publishing

* remove waits
---
 .../survey-configurations.cy.js               |  4 ---
 .../functions/SurveyConfigurationFunctions.js | 33 -------------------
 2 files changed, 37 deletions(-)

diff --git a/e2e-testing/cypress/e2e/13-survey-configurations/survey-configurations.cy.js b/e2e-testing/cypress/e2e/13-survey-configurations/survey-configurations.cy.js
index 24e6aefbb6..668bfe53a5 100644
--- a/e2e-testing/cypress/e2e/13-survey-configurations/survey-configurations.cy.js
+++ b/e2e-testing/cypress/e2e/13-survey-configurations/survey-configurations.cy.js
@@ -10,10 +10,6 @@ describe("Automated Tests for Survey Configurations", () => {
     cy.visit(Cypress.env('baseUrl'));
   });
 
-  it.skip("Verify posts go into Published state as configured", () => {
-    surveyConfigurationFunctions.require_posts_reviewed_before_published()
-  });
-
   it("Verifies author information stays hidden", () => {
     surveyConfigurationFunctions.hide_author_information_and_verify()
   });
diff --git a/e2e-testing/cypress/functions/SurveyConfigurationFunctions.js b/e2e-testing/cypress/functions/SurveyConfigurationFunctions.js
index 2000b48448..5e163cd7f4 100644
--- a/e2e-testing/cypress/functions/SurveyConfigurationFunctions.js
+++ b/e2e-testing/cypress/functions/SurveyConfigurationFunctions.js
@@ -39,10 +39,6 @@ class SurveyConfigurationFunctions {
     cy.get('#mat-tab-label-6-1').click({ force: true });
   }
 
-  verify_button_toggled() {
-    cy.get('#mat-slide-toggle-20-input').should('not.be.checked');
-  }
-
   click_add_post_btn() {
     cy.get(SurveyConfigurationLocators.addPostBtn).click();
   }
@@ -76,23 +72,9 @@ class SurveyConfigurationFunctions {
     cy.get(SurveyConfigurationLocators.successBtn).click();
   }
 
-  check_for_added_post_being_published() {
-    cy.get(SurveyConfigurationLocators.clearBtn).click();
-    cy.get(SurveyConfigurationLocators.surveySelectionList)
-      .children(SurveyConfigurationLocators.surveyToVerify)
-      .eq(0)
-      .click({ force: true });
-    cy.wait(3000);
-    cy.get(SurveyConfigurationLocators.postPreview)
-      .children(SurveyConfigurationLocators.postItem)
-      .contains('New Post Title');
-    cy.get(SurveyConfigurationLocators.postStatus).contains('Published');
-  }
-
   check_for_accurate_author_name() {
     cy.get(SurveyConfigurationLocators.clearBtn).click();
     cy.get(SurveyConfigurationLocators.surveyToVerify).click();
-    // cy.wait(3000);
     cy.get(SurveyConfigurationLocators.postPreview)
       .children(SurveyConfigurationLocators.postItem)
       .contains('New Post Title');
@@ -103,27 +85,12 @@ class SurveyConfigurationFunctions {
     cy.get(SurveyConfigurationLocators.clearBtn).click();
     cy.get('[data-qa="btn-data"]').click();
     cy.get(SurveyConfigurationLocators.surveyToVerify).click();
-    // cy.wait(3000);
     cy.get(SurveyConfigurationLocators.postPreview)
       .children(SurveyConfigurationLocators.postItem)
       .contains('New Post Title');
     cy.get('.post-info__username').contains('Anonymous').should('be.visible');
   }
 
-  require_posts_reviewed_before_published() {
-    this.open_settings();
-    this.open_surveys();
-    this.open_survey_to_configure();
-    this.open_survey_configurations();
-    this.toggle_survey_review_required();
-    this.save_survey_configurations();
-    this.open_survey_to_configure();
-    this.reopen_survey_configure_tab();
-    this.verify_button_toggled();
-    this.add_post();
-    this.check_for_added_post_being_published();
-  }
-
   hide_author_information_and_verify() {
     //change configuration survey
     this.open_settings();

From 80f9c73fde08cd6e61605a599f8a34b40e4cdbd2 Mon Sep 17 00:00:00 2001
From: Walter <w.obadha@gmail.com>
Date: Sat, 20 Apr 2024 07:57:41 +0300
Subject: [PATCH 16/23] rerun tests


From a05cccb51203e891fc87b7f7d51a54274c06157c Mon Sep 17 00:00:00 2001
From: ushahidlee <152860706+ushahidlee@users.noreply.github.com>
Date: Mon, 22 Apr 2024 11:29:23 +0200
Subject: [PATCH 17/23] Filter Undefined Issue (#1030)

* another sanity check for filters

* added limit default
---
 apps/web-mzima-client/src/app/map/map.component.ts | 1 +
 libs/sdk/src/lib/services/posts.service.ts         | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/apps/web-mzima-client/src/app/map/map.component.ts b/apps/web-mzima-client/src/app/map/map.component.ts
index bba84fb826..3087936509 100644
--- a/apps/web-mzima-client/src/app/map/map.component.ts
+++ b/apps/web-mzima-client/src/app/map/map.component.ts
@@ -147,6 +147,7 @@ export class MapComponent extends MainViewComponent implements OnInit {
 
   private reInitParams() {
     this.params.page = 1;
+    this.params.limit = 500;
     this.params.currentView = 'map';
     this.mapLayers.map((layer) => {
       this.map.removeLayer(layer);
diff --git a/libs/sdk/src/lib/services/posts.service.ts b/libs/sdk/src/lib/services/posts.service.ts
index d63742418a..3ba487d811 100644
--- a/libs/sdk/src/lib/services/posts.service.ts
+++ b/libs/sdk/src/lib/services/posts.service.ts
@@ -268,6 +268,12 @@ export class PostsService extends ResourceService<any> {
     delete postParams.status;
     delete postParams.form;
 
+    for (const key in postParams) {
+      if (postParams[key] === undefined) {
+        delete postParams[key];
+      }
+    }
+
     return postParams;
   }
 

From 1b57cc68eef3423c4b76e1bd2f98dafb3d5b0398 Mon Sep 17 00:00:00 2001
From: Shakira Ndagire Seruwagi <ndagire.shakira@gmail.com>
Date: Mon, 22 Apr 2024 20:26:37 +0300
Subject: [PATCH 18/23] E2e tests for Survey Configuration - Hide exact Time
 information (#931)

* Add e2e tests for Survey Configuration - Hide exact Time information

* Update locators for other tests

* Add timer to the test

* Remove duplicate file

* Update the function

* Fix failing test

* Refactor the function for hiding exact time and verify

* Refactor the code

* complete steps for hide time test

* reorganize files to determine run order

* fix test

* 3 second wait is a lot - let's see if 1second works

* better yet, let's remove the explicit wait and add an assertion instead

* whoops! correct typo

* Rename the data-qa attribute

---------

Co-authored-by: Shakira <shakira@Shakiras-MacBook-Pro.local>
Co-authored-by: AmTryingMyBest <38259840+AmTryingMyBest@users.noreply.github.com>
Co-authored-by: Walter <w.obadha@gmail.com>
---
 .../post-metadata.component.html              |  2 +-
 .../survey-configurations.cy.js               | 15 ++++---
 .../functions/SurveyConfigurationFunctions.js | 44 ++++++++++++++++++-
 .../locators/SurveyConfigurationLocators.js   |  1 +
 4 files changed, 53 insertions(+), 9 deletions(-)

diff --git a/apps/web-mzima-client/src/app/post/post-metadata/post-metadata.component.html b/apps/web-mzima-client/src/app/post/post-metadata/post-metadata.component.html
index a9edab848b..b117beabb7 100644
--- a/apps/web-mzima-client/src/app/post/post-metadata/post-metadata.component.html
+++ b/apps/web-mzima-client/src/app/post/post-metadata/post-metadata.component.html
@@ -15,7 +15,7 @@
     </span>
 
     <div class="post-info__list">
-      <span class="post-info__item">
+      <span class="post-info__item" [data-qa]="'post-date'">
         {{ post.post_date | dateAgo }}
       </span>
 
diff --git a/e2e-testing/cypress/e2e/13-survey-configurations/survey-configurations.cy.js b/e2e-testing/cypress/e2e/13-survey-configurations/survey-configurations.cy.js
index 668bfe53a5..8cfdf59c55 100644
--- a/e2e-testing/cypress/e2e/13-survey-configurations/survey-configurations.cy.js
+++ b/e2e-testing/cypress/e2e/13-survey-configurations/survey-configurations.cy.js
@@ -1,7 +1,7 @@
-import LoginFunctions from "../../functions/LoginFunctions";
-import SurveyConfigurationFunctions from "../../functions/SurveyConfigurationFunctions";
+import LoginFunctions from '../../functions/LoginFunctions';
+import SurveyConfigurationFunctions from '../../functions/SurveyConfigurationFunctions';
 
-describe("Automated Tests for Survey Configurations", () => {
+describe('Automated Tests for Survey Configurations', () => {
   const loginFunctions = new LoginFunctions();
   const surveyConfigurationFunctions = new SurveyConfigurationFunctions();
 
@@ -10,7 +10,10 @@ describe("Automated Tests for Survey Configurations", () => {
     cy.visit(Cypress.env('baseUrl'));
   });
 
-  it("Verifies author information stays hidden", () => {
-    surveyConfigurationFunctions.hide_author_information_and_verify()
+  it('Verifies author information stays hidden', () => {
+    surveyConfigurationFunctions.hide_author_information_and_verify();
   });
-});
\ No newline at end of file
+  it('Steps to require posts to hide exact time information', () => {
+    surveyConfigurationFunctions.hide_exact_time_information_and_verify();
+  });
+});
diff --git a/e2e-testing/cypress/functions/SurveyConfigurationFunctions.js b/e2e-testing/cypress/functions/SurveyConfigurationFunctions.js
index 5e163cd7f4..8e4ca01d08 100644
--- a/e2e-testing/cypress/functions/SurveyConfigurationFunctions.js
+++ b/e2e-testing/cypress/functions/SurveyConfigurationFunctions.js
@@ -31,6 +31,10 @@ class SurveyConfigurationFunctions {
     cy.get(SurveyConfigurationLocators.hideAuthorTgl).click();
   }
 
+  toggle_hide_exact_time_information() {
+    cy.get('#mat-slide-toggle-4-input').click({ force: true });
+  }
+
   save_survey_configurations() {
     cy.get(SurveyConfigurationLocators.saveSurveyBtn).click();
   }
@@ -52,7 +56,9 @@ class SurveyConfigurationFunctions {
   }
 
   type_post_title(title) {
-    cy.get(SurveyConfigurationLocators.postTitleField).type(title, { force: true });
+    cy.get(SurveyConfigurationLocators.postTitleField)
+      .should('be.visible')
+      .type(title, { force: true });
   }
 
   type_post_description(description) {
@@ -65,8 +71,8 @@ class SurveyConfigurationFunctions {
   add_post() {
     this.click_add_post_btn();
     this.open_survey_to_submit();
+    cy.wait(1000);
     this.type_post_title('New Post Title');
-    // cy.get('[data-qa="null"]').type('New Title');
     this.type_post_description('New Post Description');
     this.save_post();
     cy.get(SurveyConfigurationLocators.successBtn).click();
@@ -91,6 +97,29 @@ class SurveyConfigurationFunctions {
     cy.get('.post-info__username').contains('Anonymous').should('be.visible');
   }
 
+  check_for_time_post_was_added() {
+    //to verify, while logged in(as admin) verify time is displayed correctly
+    cy.get(SurveyConfigurationLocators.clearBtn).click();
+    cy.get(SurveyConfigurationLocators.surveySelectionList)
+      .children(SurveyConfigurationLocators.surveyToVerify)
+      .eq(0)
+      .click({ force: true });
+    // cy.wait(3000);
+    cy.get(SurveyConfigurationLocators.postPreview)
+      .children(SurveyConfigurationLocators.postItem)
+      .contains('New Post Title');
+    cy.get(SurveyConfigurationLocators.postDate).contains('just now');
+    //logout and verify as non-logged in user, time is shown not the same as shown for admin user
+    loginFunctions.logout();
+    cy.get('[data-qa="btn-data"]').click();
+    cy.get(SurveyConfigurationLocators.surveyToVerify).click();
+    cy.get(SurveyConfigurationLocators.postPreview)
+      .children(SurveyConfigurationLocators.postItem)
+      .contains('New Post Title');
+    //we'll check time doesn't say "just now" as it says when a privileged user is viewing
+    cy.get(SurveyConfigurationLocators.postDate).should('not.contain', 'just now');
+  }
+
   hide_author_information_and_verify() {
     //change configuration survey
     this.open_settings();
@@ -114,6 +143,17 @@ class SurveyConfigurationFunctions {
     cy.visit(Cypress.env('baseUrl'));
     this.check_for_anonymous_author_name();
   }
+
+  hide_exact_time_information_and_verify() {
+    this.open_settings();
+    this.open_surveys();
+    this.open_survey_to_configure();
+    this.open_survey_configurations();
+    this.toggle_hide_exact_time_information();
+    this.save_survey_configurations();
+    this.add_post();
+    this.check_for_time_post_was_added();
+  }
 }
 
 export default SurveyConfigurationFunctions;
diff --git a/e2e-testing/cypress/locators/SurveyConfigurationLocators.js b/e2e-testing/cypress/locators/SurveyConfigurationLocators.js
index 1bc8a5143f..1ea09003e1 100644
--- a/e2e-testing/cypress/locators/SurveyConfigurationLocators.js
+++ b/e2e-testing/cypress/locators/SurveyConfigurationLocators.js
@@ -14,6 +14,7 @@ const SurveyConfigurationLocators = {
   postPreview: '[data-qa="post-preview"]',
   postItem: '[data-qa="post-item"]',
   clearBtn: '[data-qa="clear"]',
+  postDate: '[data-qa="post-date"]',
   surveyItemBtn: '[data-qa="automation-survey---to-test-survey-configuration"]',
   surveySelectionList: '[data-qa="survey-selection-list"]',
   surveyToSubmit: '[data-qa="add-post-modal-surveys-item125"]',

From ba593d1c053cce7fa3e8b1c5e4be84647b710c07 Mon Sep 17 00:00:00 2001
From: Maxwell Mwandigha <47903907+MMwandigha@users.noreply.github.com>
Date: Tue, 23 Apr 2024 08:50:37 +0000
Subject: [PATCH 19/23] Fixed Privacy Policy typo (#1032)

---
 apps/mobile-mzima-client/src/app/auth/signup/signup.page.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/mobile-mzima-client/src/app/auth/signup/signup.page.html b/apps/mobile-mzima-client/src/app/auth/signup/signup.page.html
index 3f3078826f..703c329c93 100644
--- a/apps/mobile-mzima-client/src/app/auth/signup/signup.page.html
+++ b/apps/mobile-mzima-client/src/app/auth/signup/signup.page.html
@@ -47,7 +47,7 @@
             <a (click)="openLink($event, 'https://www.ushahidi.com/privacy-policy')"
               >Privacy Policy</a
             >
-            the <br />
+            and <br />
             <a (click)="openLink($event, 'https://www.ushahidi.com/terms-of-service')"
               >Terms and Conditions</a
             >.

From 70420be811fd3d55808ae62e971874dabd8c0209 Mon Sep 17 00:00:00 2001
From: Mugo Brian <mikanmuchiri@gmail.com>
Date: Thu, 25 Apr 2024 07:22:37 +0300
Subject: [PATCH 20/23] [USH-873] & [USH-890] Changed Text From Delete 1 posts
 to Delete 1 Post. (#1001)

* centralize "Success" text alignment.

* Say "....deleted 1 post..." instead of "...deleted 1 posts..." after deleting 1 post. "OK, sounds good" text changed.

* Changed backticks to quotes

---------

Co-authored-by: AmTryingMyBest <38259840+AmTryingMyBest@users.noreply.github.com>
---
 apps/web-mzima-client/src/app/feed/feed.component.ts          | 3 ++-
 .../src/app/post/post-head/post-head.component.ts             | 2 +-
 .../components/confirm-modal/confirm-modal.component.scss     | 4 ----
 apps/web-mzima-client/src/assets/locales/en.json              | 4 ++--
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/apps/web-mzima-client/src/app/feed/feed.component.ts b/apps/web-mzima-client/src/app/feed/feed.component.ts
index dc954ee610..c31f151c9e 100644
--- a/apps/web-mzima-client/src/app/feed/feed.component.ts
+++ b/apps/web-mzima-client/src/app/feed/feed.component.ts
@@ -488,11 +488,12 @@ export class FeedComponent extends MainViewComponent implements OnInit {
     }
     this.selectedPosts = [];
     if (count) {
+      const postWord = count === 1 ? 'post' : 'posts';
       this.confirmModalService.open({
         title: this.translate.instant('notify.confirm_modal.deleted.success'),
         description: `<p>${this.translate.instant(
           'notify.confirm_modal.deleted.success_description',
-          { count },
+          { count: `${count} ${postWord}` },
         )}</p>`,
         buttonSuccess: this.translate.instant('notify.confirm_modal.deleted.success_button'),
       });
diff --git a/apps/web-mzima-client/src/app/post/post-head/post-head.component.ts b/apps/web-mzima-client/src/app/post/post-head/post-head.component.ts
index acfcd96c58..7d6a184385 100644
--- a/apps/web-mzima-client/src/app/post/post-head/post-head.component.ts
+++ b/apps/web-mzima-client/src/app/post/post-head/post-head.component.ts
@@ -102,7 +102,7 @@ export class PostHeadComponent extends BaseComponent {
         title: this.translate.instant('notify.confirm_modal.deleted.success'),
         description: `<p>${this.translate.instant(
           'notify.confirm_modal.deleted.success_description',
-          { count: 1 },
+          { count: '1 post' },
         )}</p>`,
         buttonSuccess: this.translate.instant('notify.confirm_modal.deleted.success_button'),
       });
diff --git a/apps/web-mzima-client/src/app/shared/components/confirm-modal/confirm-modal.component.scss b/apps/web-mzima-client/src/app/shared/components/confirm-modal/confirm-modal.component.scss
index a56719b1f5..e899e09e92 100644
--- a/apps/web-mzima-client/src/app/shared/components/confirm-modal/confirm-modal.component.scss
+++ b/apps/web-mzima-client/src/app/shared/components/confirm-modal/confirm-modal.component.scss
@@ -11,10 +11,6 @@
     margin-bottom: 16px;
     color: var(--color-dark);
 
-    @include breakpoint-min($tablet) {
-      padding-right: 48px;
-    }
-
     @include breakpoint-max($tablet) {
       font-size: 20px;
       line-height: 1.28;
diff --git a/apps/web-mzima-client/src/assets/locales/en.json b/apps/web-mzima-client/src/assets/locales/en.json
index ed5af65211..f987657a2f 100644
--- a/apps/web-mzima-client/src/assets/locales/en.json
+++ b/apps/web-mzima-client/src/assets/locales/en.json
@@ -1885,8 +1885,8 @@
       },
       "deleted": {
         "success": "Success!",
-        "success_description": "You've permanently deleted {{count}} posts.",
-        "success_button": "OK, sounds good"
+        "success_description": "You've permanently deleted {{count}}.",
+        "success_button": "OK"
       }
     },
     "language": {

From cdccd4e622cd63aaae109b4862be63988e6464d6 Mon Sep 17 00:00:00 2001
From: Walter <w.obadha@gmail.com>
Date: Thu, 25 Apr 2024 13:29:11 +0300
Subject: [PATCH 21/23] run tests


From 5f47c11c824b5b99e451bd5a003880feaa3b475e Mon Sep 17 00:00:00 2001
From: AmTryingMyBest <38259840+AmTryingMyBest@users.noreply.github.com>
Date: Thu, 25 Apr 2024 14:24:25 +0300
Subject: [PATCH 22/23] ush-1312-update-typo-in-sign-up-page (#1035)

* correct typo on sign up form

* rerun tests
---
 .../src/assets/locales/en.json                | 32 +++++++++----------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/apps/web-mzima-client/src/assets/locales/en.json b/apps/web-mzima-client/src/assets/locales/en.json
index f987657a2f..bf440871d6 100644
--- a/apps/web-mzima-client/src/assets/locales/en.json
+++ b/apps/web-mzima-client/src/assets/locales/en.json
@@ -914,7 +914,7 @@
       "previous_page": "<< Previous page",
       "next_page": "Next page >>",
       "empty_message_error": "You must add a message",
-      "no_messages":"There are no messages yet. Start a conversation with the author by sending a message below."
+      "no_messages": "There are no messages yet. Start a conversation with the author by sending a message below."
     },
     "valid": {
       "no_changes": "You haven’t made any changes",
@@ -1082,7 +1082,6 @@
     "collection_saved": "Collection saved.",
     "collection_updated": "Collection updated.",
     "collection_description": "You can add posts to your collection from the Data view"
-    
   },
   "category": {
     "add_tag": "Add Category",
@@ -1209,8 +1208,8 @@
       "HDX": "Humanitarian Data Exchange",
       "please_enter_maintainer_id": "Please enter maintainer id",
       "please_enter_api_key": "Please enter API key",
-      "hdx_maintainer_id_min_length" : "HDX Maintainer Id is too short",
-      "api_key_min_length" : "API key is too short"
+      "hdx_maintainer_id_min_length": "HDX Maintainer Id is too short",
+      "api_key_min_length": "API key is too short"
     },
     "webhooks": {
       "use_webhook_for": "Use webhook for",
@@ -1650,17 +1649,17 @@
     "nav": {
       "account_settings": "Account settings",
       "notifications_settings": "Notifications settings",
-      "delete_contact" : {
-        "title" : "Delete your",
-        "title_subject" : {
-          "email" : "Email",
-          "phone" : "Phone"
+      "delete_contact": {
+        "title": "Delete your",
+        "title_subject": {
+          "email": "Email",
+          "phone": "Phone"
         },
-        "instructions" : "Deleting means that from now you will not be able to receive notifications on your phone number. But you can switch notifications to a contact method below.",
-        "button" : {
-          "delete" : "Delete",
-          "cancel" : "Cancel"
-        }  
+        "instructions": "Deleting means that from now you will not be able to receive notifications on your phone number. But you can switch notifications to a contact method below.",
+        "button": {
+          "delete": "Delete",
+          "cancel": "Cancel"
+        }
       }
     }
   },
@@ -1709,7 +1708,7 @@
       "csv_import_cancel": "CSV import cancelled",
       "csv_import_cancel_confirm": "Are you sure you want to cancel importing?",
       "csv_import_error": "Some of the data in your CSV file does not match the format of the mapped survey field. Please review the data and try again.",
-      "csv_import_success" : "The data from your CSV file was successfully imported!"
+      "csv_import_success": "The data from your CSV file was successfully imported!"
     },
     "general_settings": {
       "save_success": "General settings saved"
@@ -1967,7 +1966,7 @@
     "terms_of_service": "We have updated our <a href=\"https://www.ushahidi.com/terms-of-service\" target=\"_blank\">Terms and Conditions</a> and <a href=\"https://www.ushahidi.com/privacy-policy\" target=\"_blank\">Privacy Policy</a>. Please review these documents carefully and accept the terms in order to continue to use Ushahidi's services.",
     "agree": "I agree to Ushahidi's Terms of Service.",
     "accept_and_continue": "Accept and Continue",
-    "i_agree": "I agree to Ushahidi <a href=\"https://www.ushahidi.com/privacy-policy\" target=\"_blank\">Privacy Policy</a> the\n<a href=\"https://www.ushahidi.com/terms-of-service\" target=\"_blank\">Terms and Conditions</a>."
+    "i_agree": "I agree to Ushahidi's <a href=\"https://www.ushahidi.com/privacy-policy\" target=\"_blank\">Privacy Policy</a> and\n<a href=\"https://www.ushahidi.com/terms-of-service\" target=\"_blank\">Terms and Conditions</a>."
   },
   "translations": {
     "languages": "Languages",
@@ -2727,4 +2726,3 @@
     "adminUserLimitReached": "limit:{{:admin}}"
   }
 }
-

From e49b0084b5fda15e8f43b5bec0f160d6536b136b Mon Sep 17 00:00:00 2001
From: Walter <w.obadha@gmail.com>
Date: Fri, 26 Apr 2024 13:45:31 +0300
Subject: [PATCH 23/23] run tests