fix: standardize app package name to app.timesafari.app

Update package name consistently across all configurations to fix deep linking and app identification issues. Changes: - Update appId in package.json build config from "app.timesafari" to "app.timesafari.app" - Update force-stop commands in test scripts to use correct package name - Update URL scheme registration in iOS Info.plist to use consistent bundle ID - Update app identifier fallback values in iOS test script - Update serve script to use production mode with host flag Technical Details: - Standardized package name to "app.timesafari.app" across all configurations - Fixed ADB commands in test scripts to use correct package identifier - Updated iOS URL scheme registration to match Android package name - Added proper NODE_ENV and host configuration for serve command Benefits: - Fixes deep linking functionality by using consistent package identifiers - Ensures correct app identification across Android and iOS platforms - Improves test reliability with correct package references - Enables proper cross-platform URL scheme handling
on home page: fix images for all persons, remove excessive verbiage, fix project icon, allow click on image to close
2025-03-25 08:53:24 +00:00 · 2025-03-24 20:51:16 -06:00 · 2025-03-24 19:29:01 -06:00 · 2025-03-24 19:26:47 -06:00
17 changed files with 956 additions and 816 deletions
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -442,13 +442,13 @@ mv time-safari/dist time-safari-dist-prev.0 && mv crowd-funder-for-time-pwa/dist
 adb shell pm list packages | grep timesafari

 # Force stop the app (if it's running)
-adb shell am force-stop app.timesafari
+adb shell am force-stop app.timesafari.app

 # Clear app data (if you don't want to fully uninstall)
-adb shell pm clear app.timesafari
+adb shell pm clear app.timesafari.app

 # Uninstall for all users
-adb shell pm uninstall -k --user 0 app.timesafari
+adb shell pm uninstall -k --user 0 app.timesafari.app

 # Check if app is installed
-adb shell pm path app.timesafari
+adb shell pm path app.timesafari.app
--- a/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock
+++ b/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock
--- a/android/.gradle/file-system.probe
+++ b/android/.gradle/file-system.probe
--- a/android/app/src/main/assets/public/index.html
+++ b/android/app/src/main/assets/public/index.html
@@ -6,7 +6,7 @@
    <meta name="viewport" content="width=device-width,initial-scale=1.0">
    <link rel="icon" href="/favicon.ico">
    <title>TimeSafari</title>
-    <script type="module" crossorigin src="/assets/index-CZMUlUNO.js"></script>
+    <script type="module" crossorigin src="/assets/index-DHTxVcAY.js"></script>
  </head>
  <body>
    <noscript>
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
  },
  "scripts": {
    "dev": "vite --config vite.config.dev.mts",
-    "serve": "vite preview",
+    "serve": "NODE_ENV=production vite preview --mode production --host",
    "build": "VITE_GIT_HASH=`git log -1 --pretty=format:%h` vite build --config vite.config.mts",
    "lint": "eslint --ext .js,.ts,.vue --ignore-path .gitignore src",
    "lint-fix": "eslint --ext .js,.ts,.vue --ignore-path .gitignore --fix src",
@@ -155,7 +155,7 @@
  },
  "main": "./dist-electron/main.js",
  "build": {
-    "appId": "app.timesafari",
+    "appId": "app.timesafari.app",
    "productName": "TimeSafari",
    "directories": {
      "output": "dist-electron-packages"
--- a/scripts/test-android.js
+++ b/scripts/test-android.js
@@ -170,7 +170,7 @@ const executeDeeplink = async (url, description, log) => {
    
    try {
        // Stop the app before executing the deep link
-        execSync('adb shell am force-stop app.timesafari');
+        execSync('adb shell am force-stop app.timesafari.app');
        await new Promise(resolve => setTimeout(resolve, 1000)); // Wait 1s
        
        execSync(`adb shell am start -W -a android.intent.action.VIEW -d "${url}" -c android.intent.category.BROWSABLE`);
@@ -207,10 +207,6 @@ const runDeeplinkTests = async (log) => {

        // Test URLs
        const deeplinkTests = [
-            {
-                url: `timesafari://claim/${claimDetails.claim_id}`,
-                description: 'Claim view'
-            },
            {
                url: `timesafari://claim-cert/${claimDetails.claim_id}`,
                description: 'Claim certificate view'
--- a/scripts/test-ios.js
+++ b/scripts/test-ios.js
@@ -800,7 +800,7 @@ const checkAndRegisterUrlScheme = (log) => {
 	<array>
 		<dict>
 			<key>CFBundleURLName</key>
-			<string>app.timesafari</string>
+			<string>app.timesafari.app</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
 				<string>timesafari</string>
@@ -855,10 +855,10 @@ const getAppIdentifier = () => {
        }
        
        // Default fallback
-        return 'app.timesafari';
+        return 'app.timesafari.app';
    } catch (error) {
        console.error('Error getting app identifier:', error);
-        return 'app.timesafari'; // Default fallback
+        return 'app.timesafari.app'; // Default fallback
    }
 };

--- a/src/components/ActivityListItem.vue
+++ b/src/components/ActivityListItem.vue
@@ -12,15 +12,21 @@

    <div class="bg-slate-100 rounded-t-md border border-slate-300 p-3 sm:p-4">
      <div class="flex items-center gap-2 mb-6">
-        <img
-          src="https://a.fsdn.com/con/app/proj/identicons/screenshots/225506.jpg"
-          class="size-8 object-cover rounded-full"
-        />
+
+        <div v-if="record.issuerDid">
+          <EntityIcon
+            :entity-id="record.issuerDid"
+            class="rounded size-[3rem] sm:size-[4rem] object-cover"
+          />
+        </div>
+        <div v-else>
+          <font-awesome icon="person-circle-question" class="text-slate-300 text-[3rem] sm:text-[4rem]" />
+        </div>

        <div>
          <h3 class="font-semibold">
            {{
-              record.giver.known ? record.giver.displayName : "Anonymous Giver"
+              record.issuer.known ? record.issuer.displayName : ""
            }}
          </h3>
          <p class="ms-auto text-xs text-slate-500 italic">
@@ -54,48 +60,40 @@
          class="w-28 sm:w-40 text-center bg-white border border-slate-200 rounded p-2 sm:p-3"
        >
          <div class="relative w-fit mx-auto">
-            <template v-if="record.giver.profileImageUrl">
-              <EntityIcon
-                :profile-image-url="record.giver.profileImageUrl"
-                :class="[
-                  !record.providerPlanName
-                    ? 'rounded-full size-[3rem] sm:size-[4rem] object-cover'
-                    : 'rounded size-[3rem] sm:size-[4rem] object-cover',
-                ]"
-              />
-            </template>
-            <template v-else>
+            <div>
              <!-- Project Icon -->
-              <template v-if="record.providerPlanName">
+              <div v-if="record.providerPlanName">
                <ProjectIcon
                  :entity-id="record.providerPlanName"
                  :icon-size="48"
                  class="rounded size-[3rem] sm:size-[4rem] *:w-full *:h-full"
                />
-              </template>
+              </div>
              <!-- Identicon for DIDs -->
-              <template v-else-if="record.giver.did">
-                <img
-                  :src="`https://a.fsdn.com/con/app/proj/identicons/screenshots/225506.jpg`"
-                  class="rounded-full size-[3rem] sm:size-[4rem]"
-                  alt="Identicon"
+              <div v-else-if="record.agentDid">
+                <EntityIcon
+                  :entity-id="record.agentDid"
+                  :profile-image-url="record.issuer.profileImageUrl"
+                  class="rounded size-[3rem] sm:size-[4rem]"
                />
-              </template>
+              </div>
              <!-- Unknown Person -->
-              <template v-else>
-                <fa
+              <div v-else>
+                <font-awesome
                  icon="person-circle-question"
                  class="text-slate-300 text-[3rem] sm:text-[4rem]"
                />
-              </template>
-            </template>
+              </div>
+            </div>
          </div>
          <div class="text-xs mt-2 line-clamp-3 sm:line-clamp-2">
-            <fa
-              :icon="record.providerPlanName ? 'building' : 'user'"
-              class="fa-fw text-slate-400"
-            />
-            {{ record.giver.displayName }}
+            <div v-if="record.providerPlanName || record.giver.known">
+              <font-awesome
+                :icon="record.providerPlanName ? 'users' : 'user'"
+                class="fa-fw text-slate-400"
+              />
+              {{ record.providerPlanName || record.giver.displayName }}
+            </div>
          </div>
        </div>

@@ -123,48 +121,40 @@
          class="w-28 sm:w-40 text-center bg-white border border-slate-200 rounded p-2 sm:p-3"
        >
          <div class="relative w-fit mx-auto">
-            <template v-if="record.receiver.profileImageUrl">
-              <EntityIcon
-                :profile-image-url="record.receiver.profileImageUrl"
-                :class="[
-                  !record.recipientProjectName
-                    ? 'rounded-full size-[3rem] sm:size-[4rem] object-cover'
-                    : 'rounded size-[3rem] sm:size-[4rem] object-cover',
-                ]"
-              />
-            </template>
-            <template v-else>
+            <div>
              <!-- Project Icon -->
-              <template v-if="record.recipientProjectName">
+              <div v-if="record.recipientProjectName">
                <ProjectIcon
                  :entity-id="record.recipientProjectName"
                  :icon-size="48"
                  class="rounded size-[3rem] sm:size-[4rem] *:w-full *:h-full"
                />
-              </template>
+              </div>
              <!-- Identicon for DIDs -->
-              <template v-else-if="record.receiver.did">
-                <img
-                  :src="`https://a.fsdn.com/con/app/proj/identicons/screenshots/225506.jpg`"
-                  class="rounded-full size-[3rem] sm:size-[4rem]"
-                  alt="Identicon"
+              <div v-else-if="record.recipientDid">
+                <EntityIcon
+                  :entity-id="record.recipientDid"
+                  :profile-image-url="record.receiver.profileImageUrl"
+                  class="rounded size-[3rem] sm:size-[4rem]"
                />
-              </template>
+              </div>
              <!-- Unknown Person -->
-              <template v-else>
-                <fa
+              <div v-else>
+                <font-awesome
                  icon="person-circle-question"
                  class="text-slate-300 text-[3rem] sm:text-[4rem]"
                />
-              </template>
-            </template>
+              </div>
+            </div>
          </div>
          <div class="text-xs mt-2 line-clamp-3 sm:line-clamp-2">
-            <fa
-              :icon="record.recipientProjectName ? 'building' : 'user'"
-              class="fa-fw text-slate-400"
-            />
-            {{ record.receiver.displayName }}
+            <div v-if="record.recipientProjectName || record.receiver.known">
+              <font-awesome
+                :icon="record.recipientProjectName ? 'users' : 'user'"
+                class="fa-fw text-slate-400"
+              />
+              {{ record.recipientProjectName || record.receiver.displayName }}
+            </div>
          </div>
        </div>
      </div>
@@ -175,14 +165,13 @@
          {{ description }}
        </a>
      </p>
-      <p class="text-sm">{{ subDescription }}</p>
    </div>

    <div
      class="flex items-center gap-2 text-lg bg-slate-300 rounded-b-md px-3 sm:px-4 py-1 sm:py-2"
    >
      <a class="cursor-pointer" @click="$emit('loadClaim', record.jwtId)">
-        <fa icon="circle-info" class="fa-fw text-slate-500" />
+        <font-awesome icon="circle-info" class="fa-fw text-slate-500" />
      </a>
    </div>
  </li>
@@ -220,53 +209,6 @@ export default class ActivityListItem extends Vue {
    return amount;
  }

-  private formatParticipantInfo(): string {
-    const { giver, receiver } = this.record;
-
-    // Both participants are known contacts
-    if (giver.known && receiver.known) {
-      return `${giver.displayName} gave to ${receiver.displayName}`;
-    }
-
-    // Only giver is known
-    if (giver.known) {
-      const recipient = this.record.recipientProjectName
-        ? `the project "${this.record.recipientProjectName}"`
-        : receiver.displayName;
-      return `${giver.displayName} gave to ${recipient}`;
-    }
-
-    // Only receiver is known
-    if (receiver.known) {
-      const provider = this.record.providerPlanName
-        ? `the project "${this.record.providerPlanName}"`
-        : giver.displayName;
-      return `${receiver.displayName} received from ${provider}`;
-    }
-
-    // Neither is known
-    return this.formatUnknownParticipants();
-  }
-
-  private formatUnknownParticipants(): string {
-    const { giver, receiver, providerPlanName, recipientProjectName } =
-      this.record;
-
-    if (providerPlanName || recipientProjectName) {
-      const from = providerPlanName
-        ? `the project "${providerPlanName}"`
-        : giver.displayName;
-      const to = recipientProjectName
-        ? `the project "${recipientProjectName}"`
-        : receiver.displayName;
-      return `from ${from} to ${to}`;
-    }
-
-    return giver.displayName === receiver.displayName
-      ? `between two who are ${giver.displayName}`
-      : `from ${giver.displayName} to ${receiver.displayName}`;
-  }
-
  get description(): string {
    const claim =
      (this.record.fullClaim as unknown).claim || this.record.fullClaim;
@@ -278,12 +220,6 @@ export default class ActivityListItem extends Vue {
    return `${claim.description}`;
  }

-  get subDescription(): string {
-    const participants = this.formatParticipantInfo();
-
-    return `${participants}`;
-  }
-
  private displayAmount(code: string, amt: number) {
    return `${amt} ${this.currencyShortWordForCode(code, amt === 1)}`;
  }
@@ -292,11 +228,6 @@ export default class ActivityListItem extends Vue {
    return unitCode === "HUR" ? (single ? "hour" : "hours") : unitCode;
  }

-  get formattedTimestamp() {
-    // Add your timestamp formatting logic here
-    return this.record.timestamp;
-  }
-
  get canConfirm(): boolean {
    if (!this.isRegistered) return false;
    if (!isGiveClaimType(this.record.fullClaim?.["@type"])) return false;
--- a/src/components/ImageViewer.vue
+++ b/src/components/ImageViewer.vue
@@ -28,7 +28,7 @@
              :src="imageUrl"
              class="max-h-[calc(100vh-5rem)] w-full h-full object-contain"
              alt="expanded shared content"
-              @click.stop
+              @click="close"
            />
          </div>
        </div>
--- a/src/db/index.ts
+++ b/src/db/index.ts
@@ -112,7 +112,6 @@ db.on("populate", async () => {
 // ended up throwing lots of errors to the user... and they'd end up in a state
 // where they couldn't take action because they couldn't unlock that identity.)

-// check for the secret in storage
 async function useSecretAndInitializeAccountsDB(
  secretDB: SecretDexie,
  accountsDB: SensitiveDexie,
@@ -214,6 +213,22 @@ export async function updateAccountSettings(
  }
 }

+export async function logToDb(message: string): Promise<void> {
+  await db.open();
+  const todayKey = new Date().toDateString();
+  // only keep one day's worth of logs
+  const previous = await db.logs.get(todayKey);
+  if (!previous) {
+    // when this is today's first log, clear out everything previous
+    // to avoid the log table getting too large
+    // (let's limit a different way someday)
+    await db.logs.clear();
+  }
+  const prevMessages = (previous && previous.message) || "";
+  const fullMessage = `${prevMessages}\n${new Date().toISOString()} ${message}`;
+  await db.logs.update(todayKey, { message: fullMessage });
+}
+
 // similar method is in the sw_scripts/additional-scripts.js file
 export async function logConsoleAndDb(
  message: string,
@@ -224,16 +239,5 @@ export async function logConsoleAndDb(
  } else {
    logger.log(`${new Date().toISOString()} ${message}`);
  }
-
-  await db.open();
-  const todayKey = new Date().toDateString();
-  // only keep one day's worth of logs
-  const previous = await db.logs.get(todayKey);
-  if (!previous) {
-    // when this is today's first log, clear out everything previous
-    await db.logs.clear();
-  }
-  const prevMessages = (previous && previous.message) || "";
-  const fullMessage = `${prevMessages}\n${new Date().toISOString()} ${message}`;
-  await db.logs.update(todayKey, { message: fullMessage });
+  await logToDb(message);
 }
--- a/src/main.ts
+++ b/src/main.ts
@@ -87,7 +87,6 @@ import {
  faUser,
  faUsers,
  faXmark,
-  faBuilding,
 } from "@fortawesome/free-solid-svg-icons";

 library.add(
@@ -168,7 +167,6 @@ library.add(
  faUser,
  faUsers,
  faXmark,
-  faBuilding,
 );

 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -1,11 +1,18 @@
-export interface GiveRecordWithContactInfo {
+import { GiveSummaryRecord, GiveVerifiableCredential } from "interfaces";
+
+export interface GiveRecordWithContactInfo extends GiveSummaryRecord {
  jwtId: string;
-  fullClaim: unknown; // Replace with proper type
+  fullClaim: GiveVerifiableCredential;
  giver: {
    known: boolean;
    displayName: string;
    profileImageUrl?: string;
  };
+  issuer: {
+    known: boolean;
+    displayName: string;
+    profileImageUrl?: string;
+  };
  receiver: {
    known: boolean;
    displayName: string;
@@ -13,8 +20,6 @@ export interface GiveRecordWithContactInfo {
  };
  providerPlanName?: string;
  recipientProjectName?: string;
-  description?: string;
-  subDescription?: string;
+  description: string;
  image?: string;
-  timestamp: string;
 }
--- a/src/utils/logger.ts
+++ b/src/utils/logger.ts
@@ -1,18 +1,46 @@
+import { logToDb } from "../db";
+
+function safeStringify(obj: unknown) {
+  const seen = new WeakSet();
+
+  return JSON.stringify(obj, (key, value) => {
+    if (typeof value === "object" && value !== null) {
+      if (seen.has(value)) {
+        return "[Circular]";
+      }
+      seen.add(value);
+    }
+
+    if (typeof value === "function") {
+      return `[Function: ${value.name || "anonymous"}]`;
+    }
+
+    return value;
+  });
+}
+
 export const logger = {
  log: (message: string, ...args: unknown[]) => {
    if (process.env.NODE_ENV !== "production") {
      // eslint-disable-next-line no-console
      console.log(message, ...args);
+      const argsString = args.length > 0 ? " - " + safeStringify(args) : "";
+      logToDb(message + argsString);
    }
  },
  warn: (message: string, ...args: unknown[]) => {
    if (process.env.NODE_ENV !== "production") {
      // eslint-disable-next-line no-console
      console.warn(message, ...args);
+      const argsString = args.length > 0 ? " - " + safeStringify(args) : "";
+      logToDb(message + argsString);
    }
  },
  error: (message: string, ...args: unknown[]) => {
+    // Errors will always be logged
    // eslint-disable-next-line no-console
-    console.error(message, ...args); // Errors should always be logged
+    console.error(message, ...args);
+    const argsString = args.length > 0 ? " - " + safeStringify(args) : "";
+    logToDb(message + argsString);
  },
 };
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -196,14 +196,14 @@
            class="bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] px-3 py-1.5 rounded-md text-xs text-white"
            @click="openFeedFilters()"
          >
-            <fa icon="filter" class="fa-fw" />
+            <font-awesome icon="filter" class="fa-fw" />
          </button>
          <button
            v-else
            class="bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] px-3 py-1.5 rounded-md text-xs text-white"
            @click="openFeedFilters()"
          >
-            <fa icon="filter" class="fa-fw" />
+            <font-awesome icon="filter" class="fa-fw" />
          </button>
        </h2>
      </div>
@@ -341,25 +341,10 @@ import {
 } from "../libs/util";
 import { GiveSummaryRecord } from "../interfaces";
 import * as serverUtil from "../libs/endorserServer";
-// import { fa0 } from "@fortawesome/free-solid-svg-icons";
-
-interface GiveRecordWithContactInfo extends GiveSummaryRecord {
-  jwtId: string;
-  giver: {
-    displayName: string;
-    known: boolean;
-    profileImageUrl?: string;
-  };
-  image?: string;
-  providerPlanName?: string;
-  recipientProjectName?: string;
-  receiver: {
-    displayName: string;
-    known: boolean;
-    profileImageUrl?: string;
-  };
-}
 import { logger } from "../utils/logger";
+import { GiveRecordWithContactInfo } from "types";
+
+
 /**
 * HomeView - Main view component for the application's home page
 *
@@ -821,6 +806,12 @@ export default class HomeView extends Vue {
                this.allMyDids,
              ),
              image: claim.image,
+              issuer: didInfoForContact(
+                record.issuerDid,
+                this.activeDid,
+                contactForDid(record.issuerDid, this.allContacts),
+                this.allMyDids,
+              ),
              providerPlanHandleId: provider?.identifier as string,
              providerPlanName: providedByPlan?.name as string,
              recipientProjectName: fulfillsPlan?.name as string,
--- a/test-scripts/run-deeplink-tests.sh
+++ b/test-scripts/run-deeplink-tests.sh
@@ -74,7 +74,7 @@ execute_deeplink() {
        echo "---"
    else
        # Stop the app before executing the deep link
-        adb shell am force-stop app.timesafari
+        adb shell am force-stop app.timesafari.app
        sleep 1  # Give it a moment to fully stop
        
        if adb shell am start -W -a android.intent.action.VIEW \
--- a/vite.config.js
+++ b/vite.config.js
@@ -0,0 +1,6 @@
+export default {
+  preview: {
+    host: true,
+    port: 4173
+  }
+}
Author	SHA1	Message	Date
Matthew Raymer	cd32c37cfb	fix: standardize app package name to app.timesafari.app Update package name consistently across all configurations to fix deep linking and app identification issues. Changes: - Update appId in package.json build config from "app.timesafari" to "app.timesafari.app" - Update force-stop commands in test scripts to use correct package name - Update URL scheme registration in iOS Info.plist to use consistent bundle ID - Update app identifier fallback values in iOS test script - Update serve script to use production mode with host flag Technical Details: - Standardized package name to "app.timesafari.app" across all configurations - Fixed ADB commands in test scripts to use correct package identifier - Updated iOS URL scheme registration to match Android package name - Added proper NODE_ENV and host configuration for serve command Benefits: - Fixes deep linking functionality by using consistent package identifiers - Ensures correct app identification across Android and iOS platforms - Improves test reliability with correct package references - Enables proper cross-platform URL scheme handling	2025-03-25 08:53:24 +00:00
Trent Larson	071792b97c	on home page: fix images for all persons, remove excessive verbiage, fix project icon, allow click on image to close	2025-03-24 20:51:16 -06:00
Trent Larson	bf2f23021f	change 'fa' to 'font-awesome'	2025-03-24 19:29:01 -06:00
Trent Larson	829870b16c	add some logging to the DB (especially for iOS app feed debugging)	2025-03-24 19:26:47 -06:00