chore(release): v0.9.3

.cursorignore

@@ -0,0 +1,3 @@
+# Add directories or file patterns to ignore during indexing (e.g. foo/ or *.csv)
+AGENTS/
+AGENTS.md

.devcontainer/devcontainer.json

@@ -1,16 +1,21 @@
 {
     "name": "flutter_docker",
     "context": "..",
-    "dockerFile": "Dockerfile",
+    "dockerFile": "../.docker/komodo-wallet-android.dockerfile",
     "remoteUser": "komodo",
     "workspaceFolder": "/workspaces/komodo-wallet",
-    "postCreateCommand": "sudo chown -R komodo:komodo /workspaces/komodo-wallet",
-    "postAttachCommand": "flutter pub get",
-    "runArgs": [
-        "--privileged",
-        "-v",
-        "/dev/bus/usb:/dev/bus/usb"
-    ],
+    "initializeCommand": "docker build -t komodo/android-sdk:35 -f ${localWorkspaceFolder}/.docker/android-sdk.dockerfile ${localWorkspaceFolder}",
+    "postCreateCommand": "bash -lc '.devcontainer/postCreate.sh'",
+    "postAttachCommand": "flutter pub get --enforce-lockfile",
+    // Security Note: The following runArgs are commented out for security reasons.
+    // Uncomment these lines only when you need to debug Android apps via USB connection
+    // through the dev container. The --privileged flag grants extended privileges to
+    // the container, and USB device mounting allows direct hardware access.
+    // "runArgs": [
+    //     "--privileged",
+    //     "-v",
+    //     "/dev/bus/usb:/dev/bus/usb"
+    // ],
     "forwardPorts": [
         8081,
         5037

.devcontainer/postCreate.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+# Initialize and pin submodules to the recorded commits
+git submodule sync --recursive
+git submodule update --init --recursive --checkout
+
+# Recommended git settings for submodules
+git config fetch.recurseSubmodules on-demand
+git config submodule.sdk.ignore dirty
+
+echo "postCreate: completed submodule initialization and permissions setup"

.docker/android-sdk.dockerfile

@@ -26,11 +26,11 @@ ENV ANDROID_SDK_ROOT=$ANDROID_HOME \
 ENV ANDROID_SDK_TOOLS_VERSION=11076708
 
 # https://developer.android.com/studio/releases/build-tools
-ENV ANDROID_PLATFORM_VERSION=35
+ENV ANDROID_PLATFORM_VERSION=36
 ENV ANDROID_BUILD_TOOLS_VERSION=35.0.1
 
 # https://developer.android.com/ndk/downloads
-ENV ANDROID_NDK_VERSION=27.2.12479018
+ENV ANDROID_NDK_VERSION=27.3.13750724
 
 RUN set -o xtrace \
     && sudo chown -R $USER:$USER /opt \

.docker/build.sh

@@ -16,6 +16,19 @@ fi
 
 echo "Building with target: $BUILD_TARGET, mode: $BUILD_MODE"
 
+# Ensure submodule is initialized and pinned to the recorded commit
+if command -v git >/dev/null 2>&1; then
+    echo "Ensuring SDK submodule is initialized and pinned..."
+    # Keep local submodule config in sync with .gitmodules (e.g., update=checkout)
+    git submodule sync --recursive || true
+    # Clean submodules to discard local changes and untracked files
+    git submodule foreach --recursive "git reset --hard && git clean -fdx" || true
+    # Initialize and checkout recorded commits (pinned)
+    git submodule update --init --recursive --checkout || true
+    # Enable on-demand fetch for submodules (helps when switching branches)
+    git config fetch.recurseSubmodules on-demand || true
+fi
+
 if [ "$(uname)" = "Darwin" ]; then
     PLATFORM_FLAG="--platform linux/amd64"
 else
@@ -42,34 +55,72 @@ mkdir -p ./build
 
 COMMIT_HASH=$(git rev-parse --short HEAD | cut -c1-7)
 
+# Only pass GITHUB_API_PUBLIC_READONLY_TOKEN as environment variable
 ENV_ARGS=""
-ENV_VARS="GITHUB_API_PUBLIC_READONLY_TOKEN TRELLO_API_KEY \
-TRELLO_TOKEN TRELLO_BOARD_ID TRELLO_LIST_ID \
-FEEDBACK_API_KEY FEEDBACK_PRODUCTION_URL FEEDBACK_TEST_URL \
-COMMIT_HASH"
+if [ -n "$GITHUB_API_PUBLIC_READONLY_TOKEN" ]; then
+    ENV_ARGS="-e GITHUB_API_PUBLIC_READONLY_TOKEN=$GITHUB_API_PUBLIC_READONLY_TOKEN"
+fi
 
-for VAR in $ENV_VARS; do
-  case "$VAR" in
-    GITHUB_API_PUBLIC_READONLY_TOKEN) VALUE=$GITHUB_API_PUBLIC_READONLY_TOKEN ;;
-    TRELLO_API_KEY) VALUE=$TRELLO_API_KEY ;;
-    TRELLO_TOKEN) VALUE=$TRELLO_TOKEN ;;
-    TRELLO_BOARD_ID) VALUE=$TRELLO_BOARD_ID ;;
-    TRELLO_LIST_ID) VALUE=$TRELLO_LIST_ID ;;
-    FEEDBACK_API_KEY) VALUE=$FEEDBACK_API_KEY ;;
-    FEEDBACK_PRODUCTION_URL) VALUE=$FEEDBACK_PRODUCTION_URL ;;
-    FEEDBACK_TEST_URL) VALUE=$FEEDBACK_TEST_URL ;;
-    COMMIT_HASH) VALUE=$COMMIT_HASH ;;
-    *) VALUE= ;;
-  esac
+# Build command logic
+BUILD_COMMAND="flutter build $BUILD_TARGET --no-pub --$BUILD_MODE"
+# Prepare build command with feedback service credentials
+BUILD_CMD="$BUILD_COMMAND"
+# Add commit hash to build command
+BUILD_CMD="$BUILD_CMD --dart-define=COMMIT_HASH=$COMMIT_HASH"
 
-  [ -n "$VALUE" ] && ENV_ARGS="$ENV_ARGS -e $VAR=$VALUE"
-done
+# Check and add the shared Trello board and list IDs if they are available
+HAVE_TRELLO_IDS=false
+if [ -n "$TRELLO_BOARD_ID" ] && [ -n "$TRELLO_LIST_ID" ]; then
+  HAVE_TRELLO_IDS=true
+  # Add these shared IDs to the build command
+  BUILD_CMD="$BUILD_CMD --dart-define=TRELLO_BOARD_ID=$TRELLO_BOARD_ID"
+  BUILD_CMD="$BUILD_CMD --dart-define=TRELLO_LIST_ID=$TRELLO_LIST_ID"
+fi
+
+# Add Trello feedback service variables if ALL required values are provided
+if [ "$HAVE_TRELLO_IDS" = true ] && [ -n "$TRELLO_API_KEY" ] && [ -n "$TRELLO_TOKEN" ]; then
+  echo "Adding Trello feedback service configuration"
+  BUILD_CMD="$BUILD_CMD --dart-define=TRELLO_API_KEY=$TRELLO_API_KEY"
+  BUILD_CMD="$BUILD_CMD --dart-define=TRELLO_TOKEN=$TRELLO_TOKEN"
+else
+  # If any Trello credential is missing, log a message but continue the build
+  if [ -n "$TRELLO_API_KEY" ] || [ -n "$TRELLO_TOKEN" ] || [ -n "$TRELLO_BOARD_ID" ] || [ -n "$TRELLO_LIST_ID" ]; then
+    echo "Warning: Incomplete Trello credentials provided. All Trello credentials must be present to include them in the build."
+  fi
+fi
 
+# Add Cloudflare feedback service variables if ALL required values are provided
+# Note: Cloudflare also needs the Trello board and list IDs to be available
+if [ "$HAVE_TRELLO_IDS" = true ] && [ -n "$FEEDBACK_API_KEY" ] && [ -n "$FEEDBACK_PRODUCTION_URL" ]; then
+  echo "Adding Cloudflare feedback service configuration"
+  BUILD_CMD="$BUILD_CMD --dart-define=FEEDBACK_API_KEY=$FEEDBACK_API_KEY"
+  BUILD_CMD="$BUILD_CMD --dart-define=FEEDBACK_PRODUCTION_URL=$FEEDBACK_PRODUCTION_URL"
+else
+  # If any Cloudflare credential is missing, log a message but continue the build
+  if [ -n "$FEEDBACK_API_KEY" ] || [ -n "$FEEDBACK_PRODUCTION_URL" ] ||
+     ([ -n "$TRELLO_BOARD_ID" ] || [ -n "$TRELLO_LIST_ID" ]); then
+    echo "Warning: Incomplete Cloudflare feedback credentials provided. All Cloudflare credentials and Trello board/list IDs must be present to include them in the build."
+  fi
+fi
+# Add Matomo tracking variables if ALL required values are provided
+# Matomo configuration only used when both are non-empty
+if [ -n "$MATOMO_URL" ] && [ -n "$MATOMO_SITE_ID" ]; then
+  echo "Adding Matomo tracking configuration"
+  BUILD_CMD="$BUILD_CMD --dart-define=MATOMO_URL=$MATOMO_URL"
+  BUILD_CMD="$BUILD_CMD --dart-define=MATOMO_SITE_ID=$MATOMO_SITE_ID"
+else
+  echo "Warning: Missing Matomo parameters. Both MATOMO_URL and MATOMO_SITE_ID must be provided."
+fi
+# Add web-specific build arguments if the target is web
+if [ "$BUILD_TARGET" = "web" ]; then
+    echo "Adding web-specific build arguments: --no-web-resources-cdn"
+    BUILD_CMD="$BUILD_CMD --no-web-resources-cdn"
+fi
 # Use the provided arguments for flutter build
 # Build a second time if needed, as asset downloads will require a rebuild on the first attempt
 docker run $PLATFORM_FLAG --rm -v ./build:/app/build \
   -v $(pwd):/app \
   -u "$HOST_UID:$HOST_GID" \
   $ENV_ARGS \
   komodo/komodo-wallet:latest sh -c \
-  "sudo chown -R komodo:komodo /app/build; flutter pub get --enforce-lockfile; flutter build web --no-pub || true; flutter build $BUILD_TARGET --config-only; flutter build $BUILD_TARGET --no-pub --dart-define=COMMIT_HASH=$COMMIT_HASH --$BUILD_MODE"
+  "sudo chown -R komodo:komodo /app/build; flutter pub get --enforce-lockfile; $BUILD_COMMAND || true; flutter build $BUILD_TARGET --config-only; $BUILD_CMD"

.docker/komodo-wallet-android.dockerfile

@@ -1,6 +1,6 @@
 FROM komodo/android-sdk:35 AS final
 
-ENV FLUTTER_VERSION="3.32.5"
+ENV FLUTTER_VERSION="3.35.3"
 ENV HOME="/home/komodo"
 ENV USER="komodo"
 ENV PATH=$PATH:$HOME/flutter/bin
@@ -14,4 +14,4 @@ RUN curl -O https://storage.googleapis.com/flutter_infra_release/releases/stable
     rm flutter_linux_${FLUTTER_VERSION}-stable.tar.xz && \
     flutter config --no-analytics  && \
     yes "y" | flutter doctor --android-licenses && \
-    flutter doctor
+    flutter doctor

.github/actions/flutter-deps/action.yml

@@ -7,7 +7,7 @@ runs:
       uses: subosito/flutter-action@v2
       with:
         # NB! Keep up-to-date with the flutter version used for development
-        flutter-version: "3.32.5"
+        flutter-version: "3.35.3"
         channel: "stable"
 
     - name: Prepare build directory

.github/actions/generate-assets/action.yml

@@ -1,5 +1,5 @@
-name: "Generates assets"
-description: "Runs the flutter build command to transform and generate assets for the deployment build"
+name: "Fetch packages, generate assets, and build"
+description: "Runs a dry-run flutter build to fetch/register assets, then runs the actual build for deployment"
 
 inputs:
   GITHUB_TOKEN:
@@ -37,8 +37,18 @@ inputs:
     description: "Production URL for Cloudflare feedback service"
     required: false
     default: ""
-  FEEDBACK_TEST_URL:
-    description: "Test URL for Cloudflare feedback service (debug mode)"
+
+  # Optional Matomo analytics configuration
+  MATOMO_URL:
+    description: "Matomo server base URL"
+    required: false
+    default: ""
+  MATOMO_SITE_ID:
+    description: "Matomo site ID"
+    required: false
+    default: ""
+  ANALYTICS_DISABLED:
+    description: "Disable analytics collection (true/false)"
     required: false
     default: ""
 
@@ -71,7 +81,9 @@ runs:
         TRELLO_LIST_ID: ${{ inputs.TRELLO_LIST_ID }}
         FEEDBACK_API_KEY: ${{ inputs.FEEDBACK_API_KEY }}
         FEEDBACK_PRODUCTION_URL: ${{ inputs.FEEDBACK_PRODUCTION_URL }}
-        FEEDBACK_TEST_URL: ${{ inputs.FEEDBACK_TEST_URL }}
+        MATOMO_URL: ${{ inputs.MATOMO_URL }}
+        MATOMO_SITE_ID: ${{ inputs.MATOMO_SITE_ID }}
+        ANALYTICS_DISABLED: ${{ inputs.ANALYTICS_DISABLED }}
       run: |
         echo "Running \`flutter build\` to generate assets for the deployment build"
 
@@ -113,19 +125,34 @@ runs:
 
         # Add Cloudflare feedback service variables if ALL required values are provided
         # Note: Cloudflare also needs the Trello board and list IDs to be available
-        if [ "$HAVE_TRELLO_IDS" = true ] && [ -n "$FEEDBACK_API_KEY" ] && [ -n "$FEEDBACK_PRODUCTION_URL" ] && [ -n "$FEEDBACK_TEST_URL" ]; then
+        if [ "$HAVE_TRELLO_IDS" = true ] && [ -n "$FEEDBACK_API_KEY" ] && [ -n "$FEEDBACK_PRODUCTION_URL" ]; then
           echo "Adding Cloudflare feedback service configuration"
           BUILD_CMD="$BUILD_CMD --dart-define=FEEDBACK_API_KEY=$FEEDBACK_API_KEY"
           BUILD_CMD="$BUILD_CMD --dart-define=FEEDBACK_PRODUCTION_URL=$FEEDBACK_PRODUCTION_URL"
-          BUILD_CMD="$BUILD_CMD --dart-define=FEEDBACK_TEST_URL=$FEEDBACK_TEST_URL"
         else
           # If any Cloudflare credential is missing, log a message but continue the build
-          if [ -n "$FEEDBACK_API_KEY" ] || [ -n "$FEEDBACK_PRODUCTION_URL" ] || [ -n "$FEEDBACK_TEST_URL" ] || 
+          if [ -n "$FEEDBACK_API_KEY" ] || [ -n "$FEEDBACK_PRODUCTION_URL" ] ||
              ([ -n "$TRELLO_BOARD_ID" ] || [ -n "$TRELLO_LIST_ID" ]); then
             echo "Warning: Incomplete Cloudflare feedback credentials provided. All Cloudflare credentials and Trello board/list IDs must be present to include them in the build."
           fi
         fi
 
+        HAS_MATOMO_CONFIG=false
+        if [ -n "$MATOMO_URL" ] && [ -n "$MATOMO_SITE_ID" ]; then
+          HAS_MATOMO_CONFIG=true
+          echo "Adding Matomo analytics configuration"
+          BUILD_CMD="$BUILD_CMD --dart-define=MATOMO_URL=$MATOMO_URL"
+          BUILD_CMD="$BUILD_CMD --dart-define=MATOMO_SITE_ID=$MATOMO_SITE_ID"
+        fi
+
+        if [ "$ANALYTICS_DISABLED" = "true" ]; then
+          echo "Disabling analytics via ANALYTICS_DISABLED input"
+          BUILD_CMD="$BUILD_CMD --dart-define=ANALYTICS_DISABLED=true"
+        elif [ "$CI" = "true" ] && [ "$HAS_MATOMO_CONFIG" != "true" ]; then
+          echo "CI environment detected without Matomo config. Disabling analytics for this build."
+          BUILD_CMD="$BUILD_CMD --dart-define=CI=true --dart-define=ANALYTICS_DISABLED=true"
+        fi
+
         # Run flutter build once to download coin icons and config files. 
         # This step is expected to "fail", since flutter build has to run again 
         # after the assets are downloaded to register them in AssetManifest.bin