Merge pull request 'feat: replace authorized representative input with contact selection dialog' (#219) from project-representative-dialog into master

Reviewed-on: #219

BUILDING.md

@@ -1151,28 +1151,28 @@ If you need to build manually or want to understand the individual steps:
 
 - ... and you may have to fix these, especially with pkgx:
 
-   ```bash
-   gem_path=$(which gem)
-   shortened_path="${gem_path:h:h}"
-   export GEM_HOME=$shortened_path
-   export GEM_PATH=$shortened_path
-   ```
+```bash
+gem_path=$(which gem)
+shortened_path="${gem_path:h:h}"
+export GEM_HOME=$shortened_path
+export GEM_PATH=$shortened_path
+```
 
 ##### 1. Bump the version in package.json for `MARKETING_VERSION`, then `grep CURRENT_PROJECT_VERSION ios/App/App.xcodeproj/project.pbxproj` and add 1 for the numbered version;
 
-   ```bash
-   cd ios/App && xcrun agvtool new-version 46 && perl -p -i -e "s/MARKETING_VERSION = .*;/MARKETING_VERSION = 1.1.1;/g" App.xcodeproj/project.pbxproj && cd -
-   # Unfortunately this edits Info.plist directly.
-   #xcrun agvtool new-marketing-version 0.4.5
-   ```
+```bash
+cd ios/App && xcrun agvtool new-version 47 && perl -p -i -e "s/MARKETING_VERSION = .*;/MARKETING_VERSION = 1.1.2;/g" App.xcodeproj/project.pbxproj && cd -
+# Unfortunately this edits Info.plist directly.
+#xcrun agvtool new-marketing-version 0.4.5
+```
 
 ##### 2. Build
 
-  Here's prod. Also available: test, dev
+Here's prod. Also available: test, dev
 
-  ```bash
-  npm run build:ios:prod
-  ```
+```bash
+npm run build:ios:prod
+```
 
 3.1. Use Xcode to build and run on simulator or device.
 
@@ -1197,7 +1197,8 @@ If you need to build manually or want to understand the individual steps:
   - 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
+- Eventually it'll be "Ready for Distribution" which means it's live
+- When finished, bump package.json version
 
 ### Android Build
 
@@ -1315,26 +1316,26 @@ The recommended way to build for Android is using the automated build script:
 
 #### Android Manual Build Process
 
-##### 1. Bump the version in package.json, then here: android/app/build.gradle
+##### 1. Bump the version in package.json, then update these versions & run:
 
-  ```bash
-  perl -p -i -e 's/versionCode .*/versionCode 46/g' android/app/build.gradle
-  perl -p -i -e 's/versionName .*/versionName "1.1.1"/g' android/app/build.gradle
-  ```
+```bash
+perl -p -i -e 's/versionCode .*/versionCode 47/g' android/app/build.gradle
+perl -p -i -e 's/versionName .*/versionName "1.1.2"/g' android/app/build.gradle
+```
 
 ##### 2. Build
 
   Here's prod. Also available: test, dev
 
-  ```bash
-  npm run build:android:prod
-  ```
+```bash
+npm run build:android:prod
+```
 
 ##### 3. Open the project in Android Studio
 
-   ```bash
-   npx cap open android
-   ```
+```bash
+npx cap open android
+```
 
 ##### 4. Use Android Studio to build and run on emulator or device
 
@@ -1379,6 +1380,8 @@ At play.google.com/console:
 - Note that if you add testers, you have to go to "Publishing Overview" and send
   those changes or your (closed) testers won't see it.
 
+- When finished, bump package.json version
+
 ### Capacitor Operations
 
 ```bash

CHANGELOG.md

@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+## [1.1.2] - 2025.11.06
+
+### Fixed
+- Bad page when user follows prompt to backup seed
+
+
 ## [1.1.1] - 2025.11.03
 
 ### Added

android/app/build.gradle

@@ -31,8 +31,8 @@ android {
         applicationId "app.timesafari.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 46
-        versionName "1.1.1"
+        versionCode 47
+        versionName "1.1.2"
         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 = 46;
+				CURRENT_PROJECT_VERSION = 47;
 				DEVELOPMENT_TEAM = GM3FS5JQPH;
 				ENABLE_APP_SANDBOX = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -413,7 +413,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.1;
+				MARKETING_VERSION = 1.1.2;
 				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 = 46;
+				CURRENT_PROJECT_VERSION = 47;
 				DEVELOPMENT_TEAM = GM3FS5JQPH;
 				ENABLE_APP_SANDBOX = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -440,7 +440,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.1;
+				MARKETING_VERSION = 1.1.2;
 				PRODUCT_BUNDLE_IDENTIFIER = app.timesafari;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "timesafari",
-  "version": "1.1.2-beta",
+  "version": "1.1.3-beta",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "timesafari",
-      "version": "1.1.2-beta",
+      "version": "1.1.3-beta",
       "dependencies": {
         "@capacitor-community/electron": "^5.0.1",
         "@capacitor-community/sqlite": "6.0.2",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "timesafari",
-  "version": "1.1.2-beta",
+  "version": "1.1.3-beta",
   "description": "Time Safari Application",
   "author": {
     "name": "Time Safari Team"

scripts/build-android.sh

@@ -436,7 +436,21 @@ fi
 log_info "Cleaning dist directory..."
 clean_build_artifacts "dist"
 
-# Step 4: Build Capacitor version with mode
+# Step 4: Run TypeScript type checking for test and production builds
+if [ "$BUILD_MODE" = "production" ] || [ "$BUILD_MODE" = "test" ]; then
+    log_info "Running TypeScript type checking for $BUILD_MODE mode..."
+    
+    if ! measure_time npm run type-check; then
+        log_error "TypeScript type checking failed for $BUILD_MODE mode!"
+        exit 2
+    fi
+    
+    log_success "TypeScript type checking completed for $BUILD_MODE mode"
+else
+    log_debug "Skipping TypeScript type checking for development mode"
+fi
+
+# Step 5: Build Capacitor version with mode
 if [ "$BUILD_MODE" = "development" ]; then
     safe_execute "Building Capacitor version (development)" "npm run build:capacitor" || exit 3
 elif [ "$BUILD_MODE" = "test" ]; then
@@ -445,23 +459,23 @@ elif [ "$BUILD_MODE" = "production" ]; then
     safe_execute "Building Capacitor version (production)" "npm run build:capacitor -- --mode production" || exit 3
 fi
 
-# Step 5: Clean Gradle build
+# Step 6: Clean Gradle build
 safe_execute "Cleaning Gradle build" "cd android && ./gradlew clean && cd .." || exit 4
 
-# Step 6: Build based on type
+# Step 7: Build based on type
 if [ "$BUILD_TYPE" = "debug" ]; then
     safe_execute "Assembling debug build" "cd android && ./gradlew assembleDebug && cd .." || exit 5
 elif [ "$BUILD_TYPE" = "release" ]; then
     safe_execute "Assembling release build" "cd android && ./gradlew assembleRelease && cd .." || exit 5
 fi
 
-# Step 7: Sync with Capacitor
+# Step 8: Sync with Capacitor
 safe_execute "Syncing with Capacitor" "npx cap sync android" || exit 6
 
-# Step 8: Generate assets
+# Step 9: Generate assets
 safe_execute "Generating assets" "npx capacitor-assets generate --android" || exit 7
 
-# Step 9: Build APK/AAB if requested
+# Step 10: Build APK/AAB if requested
 if [ "$BUILD_APK" = true ]; then
     if [ "$BUILD_TYPE" = "debug" ]; then
         safe_execute "Building debug APK" "cd android && ./gradlew assembleDebug && cd .." || exit 5
@@ -474,7 +488,7 @@ if [ "$BUILD_AAB" = true ]; then
     safe_execute "Building AAB" "cd android && ./gradlew bundleRelease && cd .." || exit 5
 fi
 
-# Step 10: Auto-run app if requested
+# Step 11: Auto-run app if requested
 if [ "$AUTO_RUN" = true ]; then
     log_step "Auto-running Android app..."
     safe_execute "Launching app" "npx cap run android" || {
@@ -485,7 +499,7 @@ if [ "$AUTO_RUN" = true ]; then
     log_success "Android app launched successfully!"
 fi
 
-# Step 11: Open Android Studio if requested
+# Step 12: Open Android Studio if requested
 if [ "$OPEN_STUDIO" = true ]; then
     safe_execute "Opening Android Studio" "npx cap open android" || exit 8
 fi

scripts/build-ios.sh

@@ -381,7 +381,21 @@ safe_execute "Cleaning iOS build" "clean_ios_build" || exit 1
 log_info "Cleaning dist directory..."
 clean_build_artifacts "dist"
 
-# Step 4: Build Capacitor version with mode
+# Step 4: Run TypeScript type checking for test and production builds
+if [ "$BUILD_MODE" = "production" ] || [ "$BUILD_MODE" = "test" ]; then
+    log_info "Running TypeScript type checking for $BUILD_MODE mode..."
+    
+    if ! measure_time npm run type-check; then
+        log_error "TypeScript type checking failed for $BUILD_MODE mode!"
+        exit 2
+    fi
+    
+    log_success "TypeScript type checking completed for $BUILD_MODE mode"
+else
+    log_debug "Skipping TypeScript type checking for development mode"
+fi
+
+# Step 5: Build Capacitor version with mode
 if [ "$BUILD_MODE" = "development" ]; then
     safe_execute "Building Capacitor version (development)" "npm run build:capacitor" || exit 3
 elif [ "$BUILD_MODE" = "test" ]; then
@@ -390,16 +404,16 @@ elif [ "$BUILD_MODE" = "production" ]; then
     safe_execute "Building Capacitor version (production)" "npm run build:capacitor -- --mode production" || exit 3
 fi
 
-# Step 5: Sync with Capacitor
+# Step 6: Sync with Capacitor
 safe_execute "Syncing with Capacitor" "npx cap sync ios" || exit 6
 
-# Step 6: Generate assets
+# Step 7: Generate assets
 safe_execute "Generating assets" "npx capacitor-assets generate --ios" || exit 7
 
-# Step 7: Build iOS app
+# Step 8: Build iOS app
 safe_execute "Building iOS app" "build_ios_app" || exit 5
 
-# Step 8: Build IPA/App if requested
+# Step 9: Build IPA/App if requested
 if [ "$BUILD_IPA" = true ]; then
     log_info "Building IPA package..."
     cd ios/App
@@ -426,12 +440,12 @@ if [ "$BUILD_APP" = true ]; then
     log_success "App bundle built successfully"
 fi
 
-# Step 9: Auto-run app if requested
+# Step 10: Auto-run app if requested
 if [ "$AUTO_RUN" = true ]; then
     safe_execute "Auto-running iOS app" "auto_run_ios_app" || exit 9
 fi
 
-# Step 10: Open Xcode if requested
+# Step 11: Open Xcode if requested
 if [ "$OPEN_STUDIO" = true ]; then
     safe_execute "Opening Xcode" "npx cap open ios" || exit 8
 fi

src/libs/endorserServer.ts

@@ -1686,7 +1686,10 @@ export async function register(
         "Registration thrown error:",
         errorMessage || JSON.stringify(err),
       );
-      return { error: errorMessage || "Got a server error when registering." };
+      return {
+        error:
+          (errorMessage as string) || "Got a server error when registering.",
+      };
     }
     return { error: "Got a server error when registering." };
   }

src/services/platforms/CapacitorPlatformService.ts

@@ -91,16 +91,92 @@ export class CapacitorPlatformService
     }
 
     try {
-      // Create/Open database
-      this.db = await this.sqlite.createConnection(
-        this.dbName,
-        false,
-        "no-encryption",
-        1,
-        false,
-      );
+      // Try to create/Open database connection
+      try {
+        this.db = await this.sqlite.createConnection(
+          this.dbName,
+          false,
+          "no-encryption",
+          1,
+          false,
+        );
+      } catch (createError: unknown) {
+        // If connection already exists, try to retrieve it or handle gracefully
+        const errorMessage =
+          createError instanceof Error
+            ? createError.message
+            : String(createError);
+        const errorObj =
+          typeof createError === "object" && createError !== null
+            ? (createError as { errorMessage?: string; message?: string })
+            : {};
 
-      await this.db.open();
+        const fullErrorMessage =
+          errorObj.errorMessage || errorObj.message || errorMessage;
+
+        if (fullErrorMessage.includes("already exists")) {
+          logger.debug(
+            "[CapacitorPlatformService] Connection already exists on native side, attempting to retrieve",
+          );
+          // Check if connection exists in JavaScript Map
+          const isConnResult = await this.sqlite.isConnection(
+            this.dbName,
+            false,
+          );
+          if (isConnResult.result) {
+            // Connection exists in Map, retrieve it
+            this.db = await this.sqlite.retrieveConnection(this.dbName, false);
+            logger.debug(
+              "[CapacitorPlatformService] Successfully retrieved existing connection from Map",
+            );
+          } else {
+            // Connection exists on native side but not in JavaScript Map
+            // This can happen when the app is restarted but native connections persist
+            // Try to close the native connection first, then create a new one
+            logger.debug(
+              "[CapacitorPlatformService] Connection exists natively but not in Map, closing and recreating",
+            );
+            try {
+              await this.sqlite.closeConnection(this.dbName, false);
+            } catch (closeError) {
+              // Ignore close errors - connection might not be properly tracked
+              logger.debug(
+                "[CapacitorPlatformService] Error closing connection (may be expected):",
+                closeError,
+              );
+            }
+            // Now try to create the connection again
+            this.db = await this.sqlite.createConnection(
+              this.dbName,
+              false,
+              "no-encryption",
+              1,
+              false,
+            );
+            logger.debug(
+              "[CapacitorPlatformService] Successfully created connection after cleanup",
+            );
+          }
+        } else {
+          // Re-throw if it's a different error
+          throw createError;
+        }
+      }
+
+      // Open the connection if it's not already open
+      try {
+        await this.db.open();
+      } catch (openError: unknown) {
+        const openErrorMessage =
+          openError instanceof Error ? openError.message : String(openError);
+        // If already open, that's fine - continue
+        if (!openErrorMessage.includes("already open")) {
+          throw openError;
+        }
+        logger.debug(
+          "[CapacitorPlatformService] Database connection already open",
+        );
+      }
 
       // Set journal mode to WAL for better performance
       // await this.db.execute("PRAGMA journal_mode=WAL;");