Merge branch 'master' into build-improvement

BUILDING.md

@@ -1040,7 +1040,7 @@ If you need to build manually or want to understand the individual steps:
 4. Bump the version to match Android & package.json:
 
    ```
-   cd ios/App && xcrun agvtool new-version 35 && perl -p -i -e "s/MARKETING_VERSION = .*;/MARKETING_VERSION = 1.0.2;/g" App.xcodeproj/project.pbxproj && cd -
+   cd ios/App && xcrun agvtool new-version 39 && perl -p -i -e "s/MARKETING_VERSION = .*;/MARKETING_VERSION = 1.0.6;/g" App.xcodeproj/project.pbxproj && cd -
    # Unfortunately this edits Info.plist directly.
    #xcrun agvtool new-marketing-version 0.4.5
    ```
@@ -1063,11 +1063,12 @@ If you need to build manually or want to understand the individual steps:
     * This will trigger a build and take time, needing user's "login" keychain password (user's login password), repeatedly.
     * If it fails with `building for 'iOS', but linking in dylib (.../.pkgx/zlib.net/v1.3.0/lib/libz.1.3.dylib) built for 'macOS'` then run XCode outside that terminal (ie. not with `npx cap open ios`).
     * Click Distribute -> App Store Connect
-  * In AppStoreConnect, add the build to the distribution: remove the current build with the "-" when you hover over it, then "Add Build" with the new build.
+  * In AppStoreConnect, add the build to the distribution. You may have to remove the current build with the "-" when you hover over it, then "Add Build" with the new build.
     * May have to go to App Review, click Submission, then hover over the build and click "-".
     * It can take 15 minutes for the build to show up in the list of builds.
     * You'll probably have to "Manage" something about encryption, disallowed in France.
     * Then "Save" and "Add to Review" and "Resubmit to App Review".
+  * Eventually it'll be "Ready for Distribution" which means
 
 ### Android Build
 

CHANGELOG.md

@@ -12,9 +12,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Deep link URLs (and other prod settings)
 - Error in BVC begin view
 
-## [Unreleased]
+## [1.0.6] - 2025.08.09
+### Fixed
+- Deep link errors where none would validate
+
+
+## [1.0.5] - 2025.07.24
+### Fixed
+- Export & import of contacts corrupted contact methods
+
+
+## [1.0.4] - 2025.07.20 - 002f2407208d56cc59c0aa7c880535ae4cbace8b
+### Fixed
+- Deep link for invite-one-accept
+
+
+## [1.0.3] - 2025.07.12 - a9a8ba217cd6015321911e98e6843e988dc2c4ae
 ### Changed
 - Photo is pinned to profile mode
+### Fixed
+- Deep link URLs (and other prod settings)
+- Error in BVC begin view
 
 
 ## [1.0.2] - 2025.06.20 - 276e0a741bc327de3380c4e508cccb7fee58c06d

README.md

@@ -137,7 +137,7 @@ See [TESTING.md](test-playwright/TESTING.md) for detailed test instructions.
 
 Application icons are in the `assets` directory, processed by the `capacitor-assets` command.
 
-To add a Font Awesome icon, add to main.ts and reference with `font-awesome` element and `icon` attribute with the hyphenated name.
+To add a Font Awesome icon, add to fontawesome.ts and reference with `font-awesome` element and `icon` attribute with the hyphenated name.
 
 ## Other
 

android/app/build.gradle

@@ -31,8 +31,8 @@ android {
         applicationId "app.timesafari.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 35
-        versionName "1.0.2"
+        versionCode 39
+        versionName "1.0.6"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

ios/App/App.xcodeproj/project.pbxproj

@@ -403,7 +403,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 37;
+				CURRENT_PROJECT_VERSION = 39;
 				DEVELOPMENT_TEAM = GM3FS5JQPH;
 				ENABLE_APP_SANDBOX = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -413,7 +413,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.4;
+				MARKETING_VERSION = 1.0.6;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = app.timesafari;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -430,7 +430,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 37;
+				CURRENT_PROJECT_VERSION = 39;
 				DEVELOPMENT_TEAM = GM3FS5JQPH;
 				ENABLE_APP_SANDBOX = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -440,7 +440,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.4;
+				MARKETING_VERSION = 1.0.6;
 				PRODUCT_BUNDLE_IDENTIFIER = app.timesafari;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";

src/components/DataExportSection.vue

@@ -54,7 +54,10 @@ messages * - Conditional UI based on platform capabilities * * @component *
 
 <script lang="ts">
 import { Component, Prop, Vue } from "vue-facing-decorator";
+import * as R from "ramda";
+
 import { AppString, NotificationIface } from "../constants/app";
+import { Contact } from "../db/tables/contacts";
 
 import { logger } from "../utils/logger";
 import { contactsToExportJson } from "../libs/util";
@@ -175,11 +178,21 @@ export default class DataExportSection extends Vue {
     try {
       this.isExporting = true;
 
-      // Fetch contacts from database using mixin's cached method
-      const allContacts = await this.$contacts();
+      // Fetch contacts from database using database utility
+      const allContacts = await this.$databaseUtil.getContacts();
 
       // Convert contacts to export format
-      const exportData = contactsToExportJson(allContacts);
+      const processedContacts: Contact[] = allContacts.map((contact) => {
+        // first remove the contactMethods field, mostly to cast to a clear type (that will end up with JSON objects)
+        const exContact: Contact = R.omit(["contactMethods"], contact);
+        // now add contactMethods as a true array of ContactMethod objects
+        exContact.contactMethods = contact.contactMethods
+          ? JSON.parse(contact.contactMethods as string)
+          : undefined;
+        return exContact;
+      });
+
+      const exportData = contactsToExportJson(processedContacts);
       const jsonStr = JSON.stringify(exportData, null, 2);
 
       // Use platform service to handle export (no platform-specific logic here!)

src/interfaces/deepLinks.ts

@@ -33,7 +33,6 @@ export const deepLinkSchemas = {
     id: z.string(),
   }),
   "claim-add-raw": z.object({
-    id: z.string(),
     claim: z.string().optional(),
     claimJwtId: z.string().optional(),
   }),

src/libs/util.ts

@@ -893,7 +893,7 @@ export interface DatabaseExport {
 }
 
 /**
- * Converts an array of contacts to the standardized database export JSON format.
+ * Converts an array of contacts to the export JSON format.
  * This format is used for data migration and backup purposes.
  *
  * @param contacts - Array of Contact objects to convert

src/services/deepLinks.ts

@@ -149,6 +149,10 @@ export class DeepLinkHandler {
       params[routeConfig.paramKey ?? "id"] = pathParams.join("/");
     }
 
+    // logConsoleAndDb(
+    //   `[DeepLink] Debug: Route Path: ${routePath} Path Params: ${JSON.stringify(params)} Query String: ${JSON.stringify(query)}`,
+    //   false,
+    // );
     return { path: routePath, params, query };
   }
 
@@ -195,14 +199,14 @@ export class DeepLinkHandler {
     // Continue with parameter validation as before...
     const schema = deepLinkSchemas[path as keyof typeof deepLinkSchemas];
 
-    let validatedParams, validatedQuery;
+    let validatedParams;
     try {
       validatedParams = await schema.parseAsync(params);
-      validatedQuery = await schema.parseAsync(query);
     } catch (error) {
       // For parameter validation errors, provide specific error feedback
-      console.error(
+      logConsoleAndDb(
         `[DeepLink] Invalid parameters for route name ${routeName} for path: ${path}: ${JSON.stringify(error)} ... with params: ${JSON.stringify(params)} ... and query: ${JSON.stringify(query)}`,
+        true,
       );
       await this.router.replace({
         name: "deep-link-error",
@@ -223,11 +227,11 @@ export class DeepLinkHandler {
       await this.router.replace({
         name: routeName,
         params: validatedParams,
-        query: validatedQuery,
       });
     } catch (error) {
-      console.error(
-        `[DeepLink] Error routing to route name ${routeName} for path: ${path}: ${JSON.stringify(error)} ... with validated params: ${JSON.stringify(validatedParams)} ... and validated query: ${JSON.stringify(validatedQuery)}`,
+      logConsoleAndDb(
+        `[DeepLink] Error routing to route name ${routeName} for path: ${path}: ${JSON.stringify(error)} ... with validated params: ${JSON.stringify(validatedParams)}`,
+        true,
       );
       // For parameter validation errors, provide specific error feedback
       await this.router.replace({
@@ -237,7 +241,6 @@ export class DeepLinkHandler {
           originalPath: path,
           errorCode: "ROUTING_ERROR",
           errorMessage: `Error routing to ${routeName}: ${JSON.stringify(error)}`,
-          ...validatedQuery,
         },
       });
     }
@@ -260,8 +263,9 @@ export class DeepLinkHandler {
       await this.validateAndRoute(path, sanitizedParams, query);
     } catch (error) {
       const deepLinkError = error as DeepLinkError;
-      console.error(
+      logConsoleAndDb(
         `[DeepLink] Error (${deepLinkError.code}): ${deepLinkError.details}`,
+        true,
       );
 
       throw {

src/views/OnboardMeetingListView.vue

@@ -115,7 +115,6 @@ import {
   serverMessageForUser,
 } from "../libs/endorserServer";
 import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
-import { logger } from "@/utils/logger";
 import { createNotifyHelpers, TIMEOUTS } from "@/utils/notify";
 import { NotificationIface } from "@/constants/app";
 
@@ -413,7 +412,8 @@ export default class OnboardMeetingListView extends Vue {
         true,
       );
       this.notify.error(
-        serverMessageForUser(error) || "There was a problem joining the meeting.",
+        serverMessageForUser(error) ||
+          "There was a problem joining the meeting.",
         TIMEOUTS.LONG,
       );
     }
@@ -471,7 +471,8 @@ export default class OnboardMeetingListView extends Vue {
             true,
           );
           this.notify.error(
-            serverMessageForUser(error) || "There was a problem leaving the meeting.",
+            serverMessageForUser(error) ||
+              "There was a problem leaving the meeting.",
             TIMEOUTS.LONG,
           );
         }

vite.config.common.mts

@@ -6,7 +6,9 @@ import path from "path";
 import { fileURLToPath } from 'url';
 
 // Load environment variables
-dotenv.config();
+console.log('NODE_ENV:', process.env.NODE_ENV)
+dotenv.config({ path: `.env.${process.env.NODE_ENV}` })
+
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);