Merge branch 'master' into contact-gifting-current-user

src/views/HelpView.vue

@@ -18,6 +18,7 @@
       <!-- Heading -->
       <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
         Help
+        <span class="text-xs text-gray-500">{{ package.version }}</span>
       </h1>
     </div>
 
@@ -565,22 +566,22 @@
       <h2 class="text-xl font-semibold">What app version is this?</h2>
       <p>{{ package.version }} ({{ commitHash }})</p>
 
-      <div v-if="Capacitor.isNativePlatform()">
+      <div v-if="isCapacitor">
         <h2 class="text-xl font-semibold">
           Do I have the latest version?
         </h2>
-        <p v-if="Capacitor.getPlatform() === 'ios'">
+        <p v-if="capabilities.isIOS">
           <a href="https://apps.apple.com/us/app/time-safari/id6742664907" target="_blank" class="text-blue-500">
             Check the App Store.
           </a>
         </p>
-        <p v-else-if="Capacitor.getPlatform() === 'android'">
+        <p v-else-if="!capabilities.isIOS && capabilities.isMobile">
           <a href="https://play.google.com/store/apps/details?id=app.timesafari.app" target="_blank" class="text-blue-500">
             Check the Play Store.
           </a>
         </p>
         <p v-else>
-          Sorry, your platform of '{{ Capacitor.getPlatform() }}' is not recognized.
+          Sorry, your platform is not recognized.
         </p>
       </div>
     </div>
@@ -592,12 +593,13 @@
 import { Component, Vue } from "vue-facing-decorator";
 import { Router } from "vue-router";
 import { useClipboard } from "@vueuse/core";
-import { Capacitor } from "@capacitor/core";
+// Capacitor import removed - using QRNavigationService instead
 
 import * as Package from "../../package.json";
 import QuickNav from "../components/QuickNav.vue";
 import { APP_SERVER } from "../constants/app";
 import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
+import { QRNavigationService } from "@/services/QRNavigationService";
 import { UNNAMED_ENTITY_NAME } from "@/constants/entities";
 
 /**
@@ -644,7 +646,7 @@ export default class HelpView extends Vue {
   showVerifiable = false;
 
   APP_SERVER = APP_SERVER;
-  Capacitor = Capacitor;
+  // Capacitor reference removed - using QRNavigationService instead
 
   /**
    * Get the unnamed entity name constant
@@ -719,11 +721,10 @@ export default class HelpView extends Vue {
    * @private
    */
   private handleQRCodeClick(): void {
-    if (Capacitor.isNativePlatform()) {
-      this.$router.push({ name: "contact-qr-scan-full" });
-    } else {
-      this.$router.push({ name: "contact-qr" });
-    }
+    const qrNavigationService = QRNavigationService.getInstance();
+    const route = qrNavigationService.getQRScannerRoute();
+
+    this.$router.push(route);
   }
 
   /**