chore: more roburst local sync execution

docs: fix typo of webp listed under jpeg (#19743 )
fix(web): viewing asset lock (#19499 )
2025-12-15 17:21:16 -08:00 · 2025-07-05 14:33:50 -05:00 · 2025-07-05 15:52:22 +00:00 · 2025-07-05 02:52:39 +00:00 · 2025-07-04 14:08:06 -05:00 · 2025-07-04 13:49:15 -05:00
456 changed files with 16694 additions and 7514 deletions
--- a/.devcontainer/server/container-common.sh
+++ b/.devcontainer/server/container-common.sh
@@ -73,10 +73,8 @@ install_dependencies() {
    log "Installing dependencies"
    (
        cd "${IMMICH_WORKSPACE}" || exit 1
-        run_cmd make ci-server
-        run_cmd make ci-sdk
-        run_cmd make build-sdk
-        run_cmd make ci-web
+        export CI=1 FROZEN=1 OFFLINE=1
+        run_cmd make setup-dev
    )
    log ""
 }
--- a/.devcontainer/server/container-compose-overrides.yml
+++ b/.devcontainer/server/container-compose-overrides.yml
@@ -22,7 +22,7 @@ services:

  immich-machine-learning:
    env_file: !reset []
-    
+
  database:
    env_file: !reset []
    environment: !override
@@ -31,7 +31,7 @@ services:
      POSTGRES_DB: ${DB_DATABASE_NAME-immich}
      POSTGRES_INITDB_ARGS: '--data-checksums'
      POSTGRES_HOST_AUTH_METHOD: md5
-    volumes: 
+    volumes:
      - ${UPLOAD_LOCATION:-postgres-devcontainer-volume}${UPLOAD_LOCATION:+/postgres}:/var/lib/postgresql/data

  redis:
--- a/.dockerignore
+++ b/.dockerignore
@@ -4,6 +4,7 @@

 design/
 docker/
+Dockerfile
 !docker/scripts
 docs/
 !docs/package.json
@@ -19,6 +20,7 @@ mobile/
 cli/coverage/
 cli/dist/
 cli/node_modules/
+cli/Dockerfile

 open-api/typescript-sdk/build/
 open-api/typescript-sdk/node_modules/
@@ -29,9 +31,11 @@ server/upload/
 server/src/queries
 server/dist/
 server/www/
+server/Dockerfile

 web/node_modules/
 web/coverage/
 web/.svelte-kit
 web/build/
 web/.env
+web/Dockerfile
--- a/.github/.nvmrc
+++ b/.github/.nvmrc
@@ -1 +1 @@
-22.16.0
+22.17.0
--- a/.github/.prettierignore
+++ b/.github/.prettierignore
@@ -0,0 +1,4 @@
+# Ignore files for PNPM, NPM and YARN
+pnpm-lock.yaml
+package-lock.json
+yarn.lock
--- a/.github/package-lock.json
+++ b/.github/package-lock.json
@@ -9,9 +9,9 @@
      }
    },
    "node_modules/prettier": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz",
-      "integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==",
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.1.tgz",
+      "integrity": "sha512-5xGWRa90Sp2+x1dQtNpIpeOQpTDBs9cZDmA/qs2vDNN2i18PdapqY7CmBeyLlMuGqXJRIOPaCaVZTLNQRWUH/A==",
      "dev": true,
      "license": "MIT",
      "bin": {
--- a/.github/workflows/build-mobile.yml
+++ b/.github/workflows/build-mobile.yml
@@ -66,12 +66,6 @@ jobs:
          ref: ${{ inputs.ref || github.sha }}
          persist-credentials: false

-      - name: Install missing deps
-        run: |
-          sudo add-apt-repository ppa:rmescandon/yq
-          sudo apt-get update
-          sudo apt-get install -y yq xz-utils ninja-build zstd
-
      - name: Create the Keystore
        env:
          KEY_JKS: ${{ secrets.KEY_JKS }}
@@ -96,7 +90,7 @@ jobs:
          key: build-mobile-gradle-${{ runner.os }}-main

      - name: Setup Flutter SDK
-        uses: subosito/flutter-action@395322a6cded4e9ed503aebd4cc1965625f8e59a # v2.20.0
+        uses: subosito/flutter-action@fd55f4c5af5b953cc57a2be44cb082c8f6635e8e # v2.21.0
        with:
          channel: 'stable'
          flutter-version-file: ./mobile/pubspec.yaml
--- a/.github/workflows/pr-label-validation.yml
+++ b/.github/workflows/pr-label-validation.yml
@@ -14,7 +14,7 @@ jobs:
      pull-requests: write
    steps:
      - name: Require PR to have a changelog label
-        uses: mheap/github-action-required-labels@fb29a14a076b0f74099f6198f77750e8fc236016 # v5.5.0
+        uses: mheap/github-action-required-labels@8afbe8ae6ab7647d0c9f0cfa7c2f939650d22509 # v5.5.1
        with:
          mode: exactly
          count: 1
--- a/.github/workflows/static_analysis.yml
+++ b/.github/workflows/static_analysis.yml
@@ -49,7 +49,7 @@ jobs:
          persist-credentials: false

      - name: Setup Flutter SDK
-        uses: subosito/flutter-action@395322a6cded4e9ed503aebd4cc1965625f8e59a # v2.20.0
+        uses: subosito/flutter-action@fd55f4c5af5b953cc57a2be44cb082c8f6635e8e # v2.21.0
        with:
          channel: 'stable'
          flutter-version-file: ./mobile/pubspec.yaml
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -516,7 +516,7 @@ jobs:
          persist-credentials: false

      - name: Setup Flutter SDK
-        uses: subosito/flutter-action@395322a6cded4e9ed503aebd4cc1965625f8e59a # v2.20.0
+        uses: subosito/flutter-action@fd55f4c5af5b953cc57a2be44cb082c8f6635e8e # v2.21.0
        with:
          channel: 'stable'
          flutter-version-file: ./mobile/pubspec.yaml
--- a/26
+++ b/26
@@ -1,27 +1,33 @@
 dev:
-	docker compose -f ./docker/docker-compose.dev.yml up --remove-orphans || make dev-down
+	@trap 'make dev-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.dev.yml up --remove-orphans

 dev-down:
 	docker compose -f ./docker/docker-compose.dev.yml down --remove-orphans

 dev-update:
-	docker compose -f ./docker/docker-compose.dev.yml up --build -V --remove-orphans
+	@trap 'make dev-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.dev.yml up --build -V --remove-orphans

 dev-scale:
-	docker compose -f ./docker/docker-compose.dev.yml up --build -V  --scale immich-server=3 --remove-orphans
+	@trap 'make dev-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.dev.yml up --build -V  --scale immich-server=3 --remove-orphans

 .PHONY: e2e
 e2e:
-	docker compose -f ./e2e/docker-compose.yml up --build -V --remove-orphans
+	@trap 'make e2e-down' EXIT; COMPOSE_BAKE=true docker compose -f ./e2e/docker-compose.yml up --build -V --remove-orphans
+
+e2e-update:
+	@trap 'make e2e-down' EXIT; COMPOSE_BAKE=true docker compose -f ./e2e/docker-compose.yml up --build -V --remove-orphans
+
+e2e-down:
+	docker compose -f ./e2e/docker-compose.yml down --remove-orphans

 prod:
-	docker compose -f ./docker/docker-compose.prod.yml up --build -V --remove-orphans
+	@trap 'make prod-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.prod.yml up --build -V --remove-orphans

 prod-down:
 	docker compose -f ./docker/docker-compose.prod.yml down --remove-orphans

 prod-scale:
-	docker compose -f ./docker/docker-compose.prod.yml up --build -V --scale immich-server=3 --scale immich-microservices=3 --remove-orphans
+	@trap 'make prod-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.prod.yml up --build -V --scale immich-server=3 --scale immich-microservices=3 --remove-orphans

 .PHONY: open-api
 open-api:
@@ -93,9 +99,11 @@ hygiene-all: lint-all format-all check-all sql audit-all;
 test-all: $(foreach M,$(filter-out sdk docs .github,$(MODULES)),test-$M) ;

 clean:
-	find . -name "node_modules" -type d -prune -exec rm -rf '{}' +
+	find . -name "node_modules" -type d -prune -exec rm -rf {} +
 	find . -name "dist" -type d -prune -exec rm -rf '{}' +
 	find . -name "build" -type d -prune -exec rm -rf '{}' +
 	find . -name "svelte-kit" -type d -prune -exec rm -rf '{}' +
-	docker compose -f ./docker/docker-compose.dev.yml rm -v -f || true
-	docker compose -f ./e2e/docker-compose.yml rm -v -f || true
+	command -v docker >/dev/null 2>&1 && docker compose -f ./docker/docker-compose.dev.yml rm -v -f || true
+	command -v docker >/dev/null 2>&1 && docker compose -f ./e2e/docker-compose.yml rm -v -f || true
+
+setup-dev: install-server install-sdk build-sdk install-web
--- a/cli/.nvmrc
+++ b/cli/.nvmrc
@@ -1 +1 @@
-22.16.0
+22.17.0
--- a/cli/bin/immich
+++ b/cli/bin/immich
@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+import '../dist/index.js';
--- a/cli/package-lock.json
+++ b/cli/package-lock.json
@@ -27,7 +27,7 @@
        "@types/lodash-es": "^4.17.12",
        "@types/micromatch": "^4.0.9",
        "@types/mock-fs": "^4.13.1",
-        "@types/node": "^22.15.32",
+        "@types/node": "^22.15.33",
        "@vitest/coverage-v8": "^3.0.0",
        "byte-size": "^9.0.0",
        "cli-progress": "^3.12.0",
@@ -61,7 +61,7 @@
        "@oazapfts/runtime": "^1.0.2"
      },
      "devDependencies": {
-        "@types/node": "^22.15.32",
+        "@types/node": "^22.15.33",
        "typescript": "^5.3.3"
      }
    },
@@ -607,9 +607,9 @@
      }
    },
    "node_modules/@eslint/config-array": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.0.tgz",
-      "integrity": "sha512-fxlS1kkIjx8+vy2SjuCB94q3htSNrufYTXubwiBFeaQHbH6Ipi43gFJq2zCMt6PHhImH3Xmr0NksKDvchWlpQQ==",
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.1.tgz",
+      "integrity": "sha512-OL0RJzC/CBzli0DrrR31qzj6d6i6Mm3HByuhflhl4LOBiWxN+3i6/t/ZQQNii4tjksXi8r2CRW1wMpWA2ULUEw==",
      "dev": true,
      "license": "Apache-2.0",
      "dependencies": {
@@ -682,9 +682,9 @@
      }
    },
    "node_modules/@eslint/js": {
-      "version": "9.27.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.27.0.tgz",
-      "integrity": "sha512-G5JD9Tu5HJEu4z2Uo4aHY2sLV64B7CDMXxFzqzjl3NKd6RVzSXNoE80jk7Y0lJkTTkjiIhBAqmlYwjuBY3tvpA==",
+      "version": "9.29.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.29.0.tgz",
+      "integrity": "sha512-3PIF4cBw/y+1u2EazflInpV+lYsSG0aByVIQzAgb1m1MhHFSbqTyNqtBKHgWf/9Ykud+DhILS9EGkmekVhbKoQ==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -1276,6 +1276,16 @@
      "dev": true,
      "license": "MIT"
    },
+    "node_modules/@types/chai": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.2.2.tgz",
+      "integrity": "sha512-8kB30R7Hwqf40JPiKhVzodJs2Qc1ZJ5zuT3uzw5Hq/dhNCl3G3l83jfpdI1e20BP348+fV7VIL/+FxaXkqBmWg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/deep-eql": "*"
+      }
+    },
    "node_modules/@types/cli-progress": {
      "version": "3.11.6",
      "resolved": "https://registry.npmjs.org/@types/cli-progress/-/cli-progress-3.11.6.tgz",
@@ -1286,6 +1296,13 @@
        "@types/node": "*"
      }
    },
+    "node_modules/@types/deep-eql": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@types/deep-eql/-/deep-eql-4.0.2.tgz",
+      "integrity": "sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==",
+      "dev": true,
+      "license": "MIT"
+    },
    "node_modules/@types/estree": {
      "version": "1.0.7",
      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz",
@@ -1338,9 +1355,9 @@
      }
    },
    "node_modules/@types/node": {
-      "version": "22.15.32",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.32.tgz",
-      "integrity": "sha512-3jigKqgSjsH6gYZv2nEsqdXfZqIFGAV36XYYjf9KGZ3PSG+IhLecqPnI310RvjutyMwifE2hhhNEklOUrvx/wA==",
+      "version": "22.15.34",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.34.tgz",
+      "integrity": "sha512-8Y6E5WUupYy1Dd0II32BsWAx5MWdcnRd8L84Oys3veg1YrYtNtzgO4CFhiBg6MDSjk7Ay36HYOnU7/tuOzIzcw==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -1348,17 +1365,17 @@
      }
    },
    "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.32.1.tgz",
-      "integrity": "sha512-6u6Plg9nP/J1GRpe/vcjjabo6Uc5YQPAMxsgQyGC/I0RuukiG1wIe3+Vtg3IrSCVJDmqK3j8adrtzXSENRtFgg==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.35.0.tgz",
+      "integrity": "sha512-ijItUYaiWuce0N1SoSMrEd0b6b6lYkYt99pqCPfybd+HKVXtEvYhICfLdwp42MhiI5mp0oq7PKEL+g1cNiz/Eg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.32.1",
-        "@typescript-eslint/type-utils": "8.32.1",
-        "@typescript-eslint/utils": "8.32.1",
-        "@typescript-eslint/visitor-keys": "8.32.1",
+        "@typescript-eslint/scope-manager": "8.35.0",
+        "@typescript-eslint/type-utils": "8.35.0",
+        "@typescript-eslint/utils": "8.35.0",
+        "@typescript-eslint/visitor-keys": "8.35.0",
        "graphemer": "^1.4.0",
        "ignore": "^7.0.0",
        "natural-compare": "^1.4.0",
@@ -1372,7 +1389,7 @@
        "url": "https://opencollective.com/typescript-eslint"
      },
      "peerDependencies": {
-        "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
+        "@typescript-eslint/parser": "^8.35.0",
        "eslint": "^8.57.0 || ^9.0.0",
        "typescript": ">=4.8.4 <5.9.0"
      }
@@ -1388,16 +1405,16 @@
      }
    },
    "node_modules/@typescript-eslint/parser": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.32.1.tgz",
-      "integrity": "sha512-LKMrmwCPoLhM45Z00O1ulb6jwyVr2kr3XJp+G+tSEZcbauNnScewcQwtJqXDhXeYPDEjZ8C1SjXm015CirEmGg==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.35.0.tgz",
+      "integrity": "sha512-6sMvZePQrnZH2/cJkwRpkT7DxoAWh+g6+GFRK6bV3YQo7ogi3SX5rgF6099r5Q53Ma5qeT7LGmOmuIutF4t3lA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/scope-manager": "8.32.1",
-        "@typescript-eslint/types": "8.32.1",
-        "@typescript-eslint/typescript-estree": "8.32.1",
-        "@typescript-eslint/visitor-keys": "8.32.1",
+        "@typescript-eslint/scope-manager": "8.35.0",
+        "@typescript-eslint/types": "8.35.0",
+        "@typescript-eslint/typescript-estree": "8.35.0",
+        "@typescript-eslint/visitor-keys": "8.35.0",
        "debug": "^4.3.4"
      },
      "engines": {
@@ -1412,15 +1429,37 @@
        "typescript": ">=4.8.4 <5.9.0"
      }
    },
-    "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.32.1.tgz",
-      "integrity": "sha512-7IsIaIDeZn7kffk7qXC3o6Z4UblZJKV3UBpkvRNpr5NSyLji7tvTcvmnMNYuYLyh26mN8W723xpo3i4MlD33vA==",
+    "node_modules/@typescript-eslint/project-service": {
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.35.0.tgz",
+      "integrity": "sha512-41xatqRwWZuhUMF/aZm2fcUsOFKNcG28xqRSS6ZVr9BVJtGExosLAm5A1OxTjRMagx8nJqva+P5zNIGt8RIgbQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/types": "8.32.1",
-        "@typescript-eslint/visitor-keys": "8.32.1"
+        "@typescript-eslint/tsconfig-utils": "^8.35.0",
+        "@typescript-eslint/types": "^8.35.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/@typescript-eslint/scope-manager": {
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.35.0.tgz",
+      "integrity": "sha512-+AgL5+mcoLxl1vGjwNfiWq5fLDZM1TmTPYs2UkyHfFhgERxBbqHlNjRzhThJqz+ktBqTChRYY6zwbMwy0591AA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.35.0",
+        "@typescript-eslint/visitor-keys": "8.35.0"
      },
      "engines": {
        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1430,15 +1469,32 @@
        "url": "https://opencollective.com/typescript-eslint"
      }
    },
+    "node_modules/@typescript-eslint/tsconfig-utils": {
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.35.0.tgz",
+      "integrity": "sha512-04k/7247kZzFraweuEirmvUj+W3bJLI9fX6fbo1Qm2YykuBvEhRTPl8tcxlYO8kZZW+HIXfkZNoasVb8EV4jpA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
    "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.32.1.tgz",
-      "integrity": "sha512-mv9YpQGA8iIsl5KyUPi+FGLm7+bA4fgXaeRcFKRDRwDMu4iwrSHeDPipwueNXhdIIZltwCJv+NkxftECbIZWfA==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.35.0.tgz",
+      "integrity": "sha512-ceNNttjfmSEoM9PW87bWLDEIaLAyR+E6BoYJQ5PfaDau37UGca9Nyq3lBk8Bw2ad0AKvYabz6wxc7DMTO2jnNA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.32.1",
-        "@typescript-eslint/utils": "8.32.1",
+        "@typescript-eslint/typescript-estree": "8.35.0",
+        "@typescript-eslint/utils": "8.35.0",
        "debug": "^4.3.4",
        "ts-api-utils": "^2.1.0"
      },
@@ -1455,9 +1511,9 @@
      }
    },
    "node_modules/@typescript-eslint/types": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.32.1.tgz",
-      "integrity": "sha512-YmybwXUJcgGqgAp6bEsgpPXEg6dcCyPyCSr0CAAueacR/CCBi25G3V8gGQ2kRzQRBNol7VQknxMs9HvVa9Rvfg==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.0.tgz",
+      "integrity": "sha512-0mYH3emanku0vHw2aRLNGqe7EXh9WHEhi7kZzscrMDf6IIRUQ5Jk4wp1QrledE/36KtdZrVfKnE32eZCf/vaVQ==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -1469,14 +1525,16 @@
      }
    },
    "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.32.1.tgz",
-      "integrity": "sha512-Y3AP9EIfYwBb4kWGb+simvPaqQoT5oJuzzj9m0i6FCY6SPvlomY2Ei4UEMm7+FXtlNJbor80ximyslzaQF6xhg==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.35.0.tgz",
+      "integrity": "sha512-F+BhnaBemgu1Qf8oHrxyw14wq6vbL8xwWKKMwTMwYIRmFFY/1n/9T/jpbobZL8vp7QyEUcC6xGrnAO4ua8Kp7w==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/types": "8.32.1",
-        "@typescript-eslint/visitor-keys": "8.32.1",
+        "@typescript-eslint/project-service": "8.35.0",
+        "@typescript-eslint/tsconfig-utils": "8.35.0",
+        "@typescript-eslint/types": "8.35.0",
+        "@typescript-eslint/visitor-keys": "8.35.0",
        "debug": "^4.3.4",
        "fast-glob": "^3.3.2",
        "is-glob": "^4.0.3",
@@ -1496,9 +1554,9 @@
      }
    },
    "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -1522,16 +1580,16 @@
      }
    },
    "node_modules/@typescript-eslint/utils": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.32.1.tgz",
-      "integrity": "sha512-DsSFNIgLSrc89gpq1LJB7Hm1YpuhK086DRDJSNrewcGvYloWW1vZLHBTIvarKZDcAORIy/uWNx8Gad+4oMpkSA==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.35.0.tgz",
+      "integrity": "sha512-nqoMu7WWM7ki5tPgLVsmPM8CkqtoPUG6xXGeefM5t4x3XumOEKMoUZPdi+7F+/EotukN4R9OWdmDxN80fqoZeg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.32.1",
-        "@typescript-eslint/types": "8.32.1",
-        "@typescript-eslint/typescript-estree": "8.32.1"
+        "@typescript-eslint/scope-manager": "8.35.0",
+        "@typescript-eslint/types": "8.35.0",
+        "@typescript-eslint/typescript-estree": "8.35.0"
      },
      "engines": {
        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1546,14 +1604,14 @@
      }
    },
    "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.32.1.tgz",
-      "integrity": "sha512-ar0tjQfObzhSaW3C3QNmTc5ofj0hDoNQ5XWrCy6zDyabdr0TWhCkClp+rywGNj/odAFBVzzJrK4tEq5M4Hmu4w==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.0.tgz",
+      "integrity": "sha512-zTh2+1Y8ZpmeQaQVIc/ZZxsx8UzgKJyNg1PTvjzC7WMhPSVS8bfDX34k1SrwOf016qd5RU3az2UxUNue3IfQ5g==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/types": "8.32.1",
-        "eslint-visitor-keys": "^4.2.0"
+        "@typescript-eslint/types": "8.35.0",
+        "eslint-visitor-keys": "^4.2.1"
      },
      "engines": {
        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1564,15 +1622,16 @@
      }
    },
    "node_modules/@vitest/coverage-v8": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-3.1.4.tgz",
-      "integrity": "sha512-G4p6OtioySL+hPV7Y6JHlhpsODbJzt1ndwHAFkyk6vVjpK03PFsKnauZIzcd0PrK4zAbc5lc+jeZ+eNGiMA+iw==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-3.2.4.tgz",
+      "integrity": "sha512-EyF9SXU6kS5Ku/U82E259WSnvg6c8KTjppUncuNdm5QHpe17mwREHnjDzozC8x9MZ0xfBUFSaLkRv4TMA75ALQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@ampproject/remapping": "^2.3.0",
        "@bcoe/v8-coverage": "^1.0.2",
-        "debug": "^4.4.0",
+        "ast-v8-to-istanbul": "^0.3.3",
+        "debug": "^4.4.1",
        "istanbul-lib-coverage": "^3.2.2",
        "istanbul-lib-report": "^3.0.1",
        "istanbul-lib-source-maps": "^5.0.6",
@@ -1587,8 +1646,8 @@
        "url": "https://opencollective.com/vitest"
      },
      "peerDependencies": {
-        "@vitest/browser": "3.1.4",
-        "vitest": "3.1.4"
+        "@vitest/browser": "3.2.4",
+        "vitest": "3.2.4"
      },
      "peerDependenciesMeta": {
        "@vitest/browser": {
@@ -1597,14 +1656,15 @@
      }
    },
    "node_modules/@vitest/expect": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.1.4.tgz",
-      "integrity": "sha512-xkD/ljeliyaClDYqHPNCiJ0plY5YIcM0OlRiZizLhlPmpXWpxnGMyTZXOHFhFeG7w9P5PBeL4IdtJ/HeQwTbQA==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.2.4.tgz",
+      "integrity": "sha512-Io0yyORnB6sikFlt8QW5K7slY4OjqNX9jmJQ02QDda8lyM6B5oNgVWoSoKPac8/kgnCUzuHQKrSLtu/uOqqrig==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@vitest/spy": "3.1.4",
-        "@vitest/utils": "3.1.4",
+        "@types/chai": "^5.2.2",
+        "@vitest/spy": "3.2.4",
+        "@vitest/utils": "3.2.4",
        "chai": "^5.2.0",
        "tinyrainbow": "^2.0.0"
      },
@@ -1613,13 +1673,13 @@
      }
    },
    "node_modules/@vitest/mocker": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.1.4.tgz",
-      "integrity": "sha512-8IJ3CvwtSw/EFXqWFL8aCMu+YyYXG2WUSrQbViOZkWTKTVicVwZ/YiEZDSqD00kX+v/+W+OnxhNWoeVKorHygA==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.2.4.tgz",
+      "integrity": "sha512-46ryTE9RZO/rfDd7pEqFl7etuyzekzEhUbTW3BvmeO/BcCMEgq59BKhek3dXDWgAj4oMK6OZi+vRr1wPW6qjEQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@vitest/spy": "3.1.4",
+        "@vitest/spy": "3.2.4",
        "estree-walker": "^3.0.3",
        "magic-string": "^0.30.17"
      },
@@ -1628,7 +1688,7 @@
      },
      "peerDependencies": {
        "msw": "^2.4.9",
-        "vite": "^5.0.0 || ^6.0.0"
+        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0"
      },
      "peerDependenciesMeta": {
        "msw": {
@@ -1640,9 +1700,9 @@
      }
    },
    "node_modules/@vitest/pretty-format": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.1.4.tgz",
-      "integrity": "sha512-cqv9H9GvAEoTaoq+cYqUTCGscUjKqlJZC7PRwY5FMySVj5J+xOm1KQcCiYHJOEzOKRUhLH4R2pTwvFlWCEScsg==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.2.4.tgz",
+      "integrity": "sha512-IVNZik8IVRJRTr9fxlitMKeJeXFFFN0JaB9PHPGQ8NKQbGpfjlTx9zO4RefN8gp7eqjNy8nyK3NZmBzOPeIxtA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -1653,27 +1713,28 @@
      }
    },
    "node_modules/@vitest/runner": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.1.4.tgz",
-      "integrity": "sha512-djTeF1/vt985I/wpKVFBMWUlk/I7mb5hmD5oP8K9ACRmVXgKTae3TUOtXAEBfslNKPzUQvnKhNd34nnRSYgLNQ==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.2.4.tgz",
+      "integrity": "sha512-oukfKT9Mk41LreEW09vt45f8wx7DordoWUZMYdY/cyAk7w5TWkTRCNZYF7sX7n2wB7jyGAl74OxgwhPgKaqDMQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@vitest/utils": "3.1.4",
-        "pathe": "^2.0.3"
+        "@vitest/utils": "3.2.4",
+        "pathe": "^2.0.3",
+        "strip-literal": "^3.0.0"
      },
      "funding": {
        "url": "https://opencollective.com/vitest"
      }
    },
    "node_modules/@vitest/snapshot": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.1.4.tgz",
-      "integrity": "sha512-JPHf68DvuO7vilmvwdPr9TS0SuuIzHvxeaCkxYcCD4jTk67XwL45ZhEHFKIuCm8CYstgI6LZ4XbwD6ANrwMpFg==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.2.4.tgz",
+      "integrity": "sha512-dEYtS7qQP2CjU27QBC5oUOxLE/v5eLkGqPE0ZKEIDGMs4vKWe7IjgLOeauHsR0D5YuuycGRO5oSRXnwnmA78fQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@vitest/pretty-format": "3.1.4",
+        "@vitest/pretty-format": "3.2.4",
        "magic-string": "^0.30.17",
        "pathe": "^2.0.3"
      },
@@ -1682,27 +1743,27 @@
      }
    },
    "node_modules/@vitest/spy": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.1.4.tgz",
-      "integrity": "sha512-Xg1bXhu+vtPXIodYN369M86K8shGLouNjoVI78g8iAq2rFoHFdajNvJJ5A/9bPMFcfQqdaCpOgWKEoMQg/s0Yg==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.2.4.tgz",
+      "integrity": "sha512-vAfasCOe6AIK70iP5UD11Ac4siNUNJ9i/9PZ3NKx07sG6sUxeag1LWdNrMWeKKYBLlzuK+Gn65Yd5nyL6ds+nw==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "tinyspy": "^3.0.2"
+        "tinyspy": "^4.0.3"
      },
      "funding": {
        "url": "https://opencollective.com/vitest"
      }
    },
    "node_modules/@vitest/utils": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.1.4.tgz",
-      "integrity": "sha512-yriMuO1cfFhmiGc8ataN51+9ooHRuURdfAZfwFd3usWynjzpLslZdYnRegTv32qdgtJTsj15FoeZe2g15fY1gg==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.2.4.tgz",
+      "integrity": "sha512-fB2V0JFrQSMsCo9HiSq3Ezpdv4iYaXRG1Sx8edX3MwxfyNn83mKiGzOcH+Fkxt4MHxr3y42fQi1oeAInqgX2QA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@vitest/pretty-format": "3.1.4",
-        "loupe": "^3.1.3",
+        "@vitest/pretty-format": "3.2.4",
+        "loupe": "^3.1.4",
        "tinyrainbow": "^2.0.0"
      },
      "funding": {
@@ -1710,9 +1771,9 @@
      }
    },
    "node_modules/acorn": {
-      "version": "8.14.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
-      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
+      "version": "8.15.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
+      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
      "dev": true,
      "license": "MIT",
      "bin": {
@@ -1792,6 +1853,18 @@
        "node": ">=12"
      }
    },
+    "node_modules/ast-v8-to-istanbul": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/ast-v8-to-istanbul/-/ast-v8-to-istanbul-0.3.3.tgz",
+      "integrity": "sha512-MuXMrSLVVoA6sYN/6Hke18vMzrT4TZNbZIj/hvh0fnYFpO+/kFXcLIaiPwXXWaQUPg4yJD8fj+lfJ7/1EBconw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "estree-walker": "^3.0.3",
+        "js-tokens": "^9.0.1"
+      }
+    },
    "node_modules/balanced-match": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -2105,9 +2178,9 @@
      }
    },
    "node_modules/debug": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
-      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -2232,19 +2305,19 @@
      }
    },
    "node_modules/eslint": {
-      "version": "9.27.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.27.0.tgz",
-      "integrity": "sha512-ixRawFQuMB9DZ7fjU3iGGganFDp3+45bPOdaRurcFHSXO1e/sYwUX/FtQZpLZJR6SjMoJH8hR2pPEAfDyCoU2Q==",
+      "version": "9.29.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.29.0.tgz",
+      "integrity": "sha512-GsGizj2Y1rCWDu6XoEekL3RLilp0voSePurjZIkxL3wlm5o5EC9VpgaP7lrCvjnkuLvzFBQWB3vWB3K5KQTveQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@eslint-community/eslint-utils": "^4.2.0",
        "@eslint-community/regexpp": "^4.12.1",
-        "@eslint/config-array": "^0.20.0",
+        "@eslint/config-array": "^0.20.1",
        "@eslint/config-helpers": "^0.2.1",
        "@eslint/core": "^0.14.0",
        "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.27.0",
+        "@eslint/js": "9.29.0",
        "@eslint/plugin-kit": "^0.3.1",
        "@humanfs/node": "^0.16.6",
        "@humanwhocodes/module-importer": "^1.0.1",
@@ -2256,9 +2329,9 @@
        "cross-spawn": "^7.0.6",
        "debug": "^4.3.2",
        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^8.3.0",
-        "eslint-visitor-keys": "^4.2.0",
-        "espree": "^10.3.0",
+        "eslint-scope": "^8.4.0",
+        "eslint-visitor-keys": "^4.2.1",
+        "espree": "^10.4.0",
        "esquery": "^1.5.0",
        "esutils": "^2.0.2",
        "fast-deep-equal": "^3.1.3",
@@ -2309,14 +2382,14 @@
      }
    },
    "node_modules/eslint-plugin-prettier": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.4.0.tgz",
-      "integrity": "sha512-BvQOvUhkVQM1i63iMETK9Hjud9QhqBnbtT1Zc642p9ynzBuCe5pybkOnvqZIBypXmMlsGcnU4HZ8sCTPfpAexA==",
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.5.1.tgz",
+      "integrity": "sha512-dobTkHT6XaEVOo8IO90Q4DOSxnm3Y151QxPJlM/vKC0bVy+d6cVWQZLlFiuZPP0wS6vZwSKeJgKkcS+KfMBlRw==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "prettier-linter-helpers": "^1.0.0",
-        "synckit": "^0.11.0"
+        "synckit": "^0.11.7"
      },
      "engines": {
        "node": "^14.18.0 || >=16.0.0"
@@ -2402,9 +2475,9 @@
      }
    },
    "node_modules/eslint-scope": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz",
-      "integrity": "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz",
+      "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==",
      "dev": true,
      "license": "BSD-2-Clause",
      "dependencies": {
@@ -2419,9 +2492,9 @@
      }
    },
    "node_modules/eslint-visitor-keys": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
      "dev": true,
      "license": "Apache-2.0",
      "engines": {
@@ -2432,15 +2505,15 @@
      }
    },
    "node_modules/espree": {
-      "version": "10.3.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
-      "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz",
+      "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==",
      "dev": true,
      "license": "BSD-2-Clause",
      "dependencies": {
-        "acorn": "^8.14.0",
+        "acorn": "^8.15.0",
        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^4.2.0"
+        "eslint-visitor-keys": "^4.2.1"
      },
      "engines": {
        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2749,9 +2822,9 @@
      }
    },
    "node_modules/globals": {
-      "version": "16.1.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-16.1.0.tgz",
-      "integrity": "sha512-aibexHNbb/jiUSObBgpHLj+sIuUmJnYcgXBlrfsiDZ9rt4aF2TFRbyLgZ2iFQuVZ1K5Mx3FVkbKRSgKrbK3K2g==",
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-16.2.0.tgz",
+      "integrity": "sha512-O+7l9tPdHCU320IigZZPj5zmRCFG9xHmx9cU8FqU2Rp+JN714seHV+2S9+JslCpY4gJwU2vOGox0wzgae/MCEg==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -2975,6 +3048,13 @@
        "@pkgjs/parseargs": "^0.11.0"
      }
    },
+    "node_modules/js-tokens": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-9.0.1.tgz",
+      "integrity": "sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==",
+      "dev": true,
+      "license": "MIT"
+    },
    "node_modules/js-yaml": {
      "version": "4.1.0",
      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -3076,9 +3156,9 @@
      "license": "MIT"
    },
    "node_modules/loupe": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.3.tgz",
-      "integrity": "sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.4.tgz",
+      "integrity": "sha512-wJzkKwJrheKtknCOKNEtDK4iqg/MxmZheEMtSTYvnzRdEYaZzmgH976nenp8WdJRdx5Vc1X/9MO0Oszl6ezeXg==",
      "dev": true,
      "license": "MIT"
    },
@@ -3347,9 +3427,9 @@
      "license": "MIT"
    },
    "node_modules/pathval": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.0.tgz",
-      "integrity": "sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.1.tgz",
+      "integrity": "sha512-//nshmD55c46FuFw26xV/xFAaB5HF9Xdap7HJBBnrKdAd6/GxDBaNA1870O79+9ueg61cZLSVc+OaFlfmObYVQ==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -3425,9 +3505,9 @@
      }
    },
    "node_modules/prettier": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz",
-      "integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==",
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.1.tgz",
+      "integrity": "sha512-5xGWRa90Sp2+x1dQtNpIpeOQpTDBs9cZDmA/qs2vDNN2i18PdapqY7CmBeyLlMuGqXJRIOPaCaVZTLNQRWUH/A==",
      "dev": true,
      "license": "MIT",
      "bin": {
@@ -3799,6 +3879,19 @@
        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
+    "node_modules/strip-literal": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-3.0.0.tgz",
+      "integrity": "sha512-TcccoMhJOM3OebGhSBEmp3UZ2SfDMZUEBdRA/9ynfLi8yYajyWX3JiXArcJt4Umh4vISpspkQIY8ZZoCqjbviA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "js-tokens": "^9.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
    "node_modules/supports-color": {
      "version": "7.2.0",
      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -3813,14 +3906,13 @@
      }
    },
    "node_modules/synckit": {
-      "version": "0.11.4",
-      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.4.tgz",
-      "integrity": "sha512-Q/XQKRaJiLiFIBNN+mndW7S/RHxvwzuZS6ZwmRzUBqJBv/5QIKCEwkBC8GBf8EQJKYnaFs0wOZbKTXBPj8L9oQ==",
+      "version": "0.11.8",
+      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.8.tgz",
+      "integrity": "sha512-+XZ+r1XGIJGeQk3VvXhT6xx/VpbHsRzsTkGgF6E5RX9TTXD0118l87puaEBZ566FhqblC6U0d4XnubznJDm30A==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@pkgr/core": "^0.2.3",
-        "tslib": "^2.8.1"
+        "@pkgr/core": "^0.2.4"
      },
      "engines": {
        "node": "^14.18.0 || >=16.0.0"
@@ -3885,9 +3977,9 @@
      "license": "MIT"
    },
    "node_modules/tinyglobby": {
-      "version": "0.2.13",
-      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.13.tgz",
-      "integrity": "sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==",
+      "version": "0.2.14",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz",
+      "integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -3930,9 +4022,9 @@
      }
    },
    "node_modules/tinypool": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.0.2.tgz",
-      "integrity": "sha512-al6n+QEANGFOMf/dmUMsuS5/r9B06uwlyNjZZql/zv8J7ybHCgoihBNORZCY2mzUuAnomQa2JdhyHKzZxPCrFA==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.1.1.tgz",
+      "integrity": "sha512-Zba82s87IFq9A9XmjiX5uZA/ARWDrB03OHlq+Vw1fSdt0I+4/Kutwy8BP4Y/y/aORMo61FQ0vIb5j44vSo5Pkg==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -3950,9 +4042,9 @@
      }
    },
    "node_modules/tinyspy": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-3.0.2.tgz",
-      "integrity": "sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-4.0.3.tgz",
+      "integrity": "sha512-t2T/WLB2WRgZ9EpE4jgPJ9w+i66UZfDc8wHh0xrwiRNN+UwH98GIJkTeZqX9rg0i0ptwzqW+uYeIF0T4F8LR7A==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -4005,13 +4097,6 @@
        }
      }
    },
-    "node_modules/tslib": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
-      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
-      "dev": true,
-      "license": "0BSD"
-    },
    "node_modules/type-check": {
      "version": "0.4.0",
      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -4040,15 +4125,15 @@
      }
    },
    "node_modules/typescript-eslint": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.32.1.tgz",
-      "integrity": "sha512-D7el+eaDHAmXvrZBy1zpzSNIRqnCOrkwTgZxTu3MUqRWk8k0q9m9Ho4+vPf7iHtgUfrK/o8IZaEApsxPlHTFCg==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.35.0.tgz",
+      "integrity": "sha512-uEnz70b7kBz6eg/j0Czy6K5NivaYopgxRjsnAJ2Fx5oTLo3wefTHIbL7AkQr1+7tJCRVpTs/wiM8JR/11Loq9A==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.32.1",
-        "@typescript-eslint/parser": "8.32.1",
-        "@typescript-eslint/utils": "8.32.1"
+        "@typescript-eslint/eslint-plugin": "8.35.0",
+        "@typescript-eslint/parser": "8.35.0",
+        "@typescript-eslint/utils": "8.35.0"
      },
      "engines": {
        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4186,17 +4271,17 @@
      }
    },
    "node_modules/vite-node": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.1.4.tgz",
-      "integrity": "sha512-6enNwYnpyDo4hEgytbmc6mYWHXDHYEn0D1/rw4Q+tnHUGtKTJsn8T1YkX6Q18wI5LCrS8CTYlBaiCqxOy2kvUA==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.2.4.tgz",
+      "integrity": "sha512-EbKSKh+bh1E1IFxeO0pg1n4dvoOTt0UDiXMd/qn++r98+jPO1xtJilvXldeuQ8giIB5IkpjCgMleHMNEsGH6pg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "cac": "^6.7.14",
-        "debug": "^4.4.0",
+        "debug": "^4.4.1",
        "es-module-lexer": "^1.7.0",
        "pathe": "^2.0.3",
-        "vite": "^5.0.0 || ^6.0.0"
+        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0"
      },
      "bin": {
        "vite-node": "vite-node.mjs"
@@ -4257,32 +4342,34 @@
      }
    },
    "node_modules/vitest": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.1.4.tgz",
-      "integrity": "sha512-Ta56rT7uWxCSJXlBtKgIlApJnT6e6IGmTYxYcmxjJ4ujuZDI59GUQgVDObXXJujOmPDBYXHK1qmaGtneu6TNIQ==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.2.4.tgz",
+      "integrity": "sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@vitest/expect": "3.1.4",
-        "@vitest/mocker": "3.1.4",
-        "@vitest/pretty-format": "^3.1.4",
-        "@vitest/runner": "3.1.4",
-        "@vitest/snapshot": "3.1.4",
-        "@vitest/spy": "3.1.4",
-        "@vitest/utils": "3.1.4",
+        "@types/chai": "^5.2.2",
+        "@vitest/expect": "3.2.4",
+        "@vitest/mocker": "3.2.4",
+        "@vitest/pretty-format": "^3.2.4",
+        "@vitest/runner": "3.2.4",
+        "@vitest/snapshot": "3.2.4",
+        "@vitest/spy": "3.2.4",
+        "@vitest/utils": "3.2.4",
        "chai": "^5.2.0",
-        "debug": "^4.4.0",
+        "debug": "^4.4.1",
        "expect-type": "^1.2.1",
        "magic-string": "^0.30.17",
        "pathe": "^2.0.3",
+        "picomatch": "^4.0.2",
        "std-env": "^3.9.0",
        "tinybench": "^2.9.0",
        "tinyexec": "^0.3.2",
-        "tinyglobby": "^0.2.13",
-        "tinypool": "^1.0.2",
+        "tinyglobby": "^0.2.14",
+        "tinypool": "^1.1.1",
        "tinyrainbow": "^2.0.0",
-        "vite": "^5.0.0 || ^6.0.0",
-        "vite-node": "3.1.4",
+        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0",
+        "vite-node": "3.2.4",
        "why-is-node-running": "^2.3.0"
      },
      "bin": {
@@ -4298,8 +4385,8 @@
        "@edge-runtime/vm": "*",
        "@types/debug": "^4.1.12",
        "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
-        "@vitest/browser": "3.1.4",
-        "@vitest/ui": "3.1.4",
+        "@vitest/browser": "3.2.4",
+        "@vitest/ui": "3.2.4",
        "happy-dom": "*",
        "jsdom": "*"
      },
@@ -4340,6 +4427,19 @@
        "vitest": ">=2.0.0"
      }
    },
+    "node_modules/vitest/node_modules/picomatch": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
+      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
    "node_modules/which": {
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
--- a/cli/package.json
+++ b/cli/package.json
@@ -5,7 +5,7 @@
  "type": "module",
  "exports": "./dist/index.js",
  "bin": {
-    "immich": "dist/index.js"
+    "immich": "./bin/immich"
  },
  "license": "GNU Affero General Public License version 3",
  "keywords": [
@@ -21,7 +21,7 @@
    "@types/lodash-es": "^4.17.12",
    "@types/micromatch": "^4.0.9",
    "@types/mock-fs": "^4.13.1",
-    "@types/node": "^22.15.32",
+    "@types/node": "^22.15.33",
    "@vitest/coverage-v8": "^3.0.0",
    "byte-size": "^9.0.0",
    "cli-progress": "^3.12.0",
@@ -69,6 +69,6 @@
    "micromatch": "^4.0.8"
  },
  "volta": {
-    "node": "22.16.0"
+    "node": "22.17.0"
  }
 }
--- a/docker/docker-compose.prod.yml
+++ b/docker/docker-compose.prod.yml
@@ -83,7 +83,7 @@ services:
    container_name: immich_prometheus
    ports:
      - 9090:9090
-    image: prom/prometheus@sha256:9abc6cf6aea7710d163dbb28d8eeb7dc5baef01e38fa4cd146a406dd9f07f70d
+    image: prom/prometheus@sha256:7a34573f0b9c952286b33d537f233cd5b708e12263733aa646e50c33f598f16c
    volumes:
      - ./prometheus.yml:/etc/prometheus/prometheus.yml
      - prometheus-data:/prometheus
--- a/docs/.nvmrc
+++ b/docs/.nvmrc
@@ -1 +1 @@
-22.16.0
+22.17.0
--- a/docs/docs/administration/backup-and-restore.md
+++ b/docs/docs/administration/backup-and-restore.md
@@ -150,12 +150,10 @@ for more info read the [release notes](https://github.com/immich-app/immich/rele
  - Preview images (small thumbnails and large previews) for each asset and thumbnails for recognized faces.
  - Stored in `UPLOAD_LOCATION/thumbs/<userID>`.
 - **Encoded Assets:**
-
  - Videos that have been re-encoded from the original for wider compatibility. The original is not removed.
  - Stored in `UPLOAD_LOCATION/encoded-video/<userID>`.

 - **Postgres**
-
  - The Immich database containing all the information to allow the system to function properly.  
    **Note:** This folder will only appear to users who have made the changes mentioned in [v1.102.0](https://github.com/immich-app/immich/discussions/8930) (an optional, non-mandatory change) or who started with this version.
  - Stored in `DB_DATA_LOCATION`.
@@ -201,7 +199,6 @@ When you turn off the storage template engine, it will leave the assets in `UPLO
  - Temporarily located in `UPLOAD_LOCATION/upload/<userID>`.
  - Transferred to `UPLOAD_LOCATION/library/<userID>` upon successful upload.
 - **Postgres**
-
  - The Immich database containing all the information to allow the system to function properly.  
    **Note:** This folder will only appear to users who have made the changes mentioned in [v1.102.0](https://github.com/immich-app/immich/discussions/8930) (an optional, non-mandatory change) or who started with this version.
  - Stored in `DB_DATA_LOCATION`.
--- a/docs/docs/administration/oauth.md
+++ b/docs/docs/administration/oauth.md
@@ -20,7 +20,6 @@ Immich supports 3rd party authentication via [OpenID Connect][oidc] (OIDC), an i
 Before enabling OAuth in Immich, a new client application needs to be configured in the 3rd-party authentication server. While the specifics of this setup vary from provider to provider, the general approach should be the same.

 1. Create a new (Client) Application
-
   1. The **Provider** type should be `OpenID Connect` or `OAuth2`
   2. The **Client type** should be `Confidential`
   3. The **Application** type should be `Web`
@@ -29,7 +28,6 @@ Before enabling OAuth in Immich, a new client application needs to be configured
 2. Configure Redirect URIs/Origins

   The **Sign-in redirect URIs** should include:
-
   - `app.immich:///oauth-callback` - for logging in with OAuth from the [Mobile App](/docs/features/mobile-app.mdx)
   - `http://DOMAIN:PORT/auth/login` - for logging in with OAuth from the Web Client
   - `http://DOMAIN:PORT/user-settings` - for manually linking OAuth in the Web Client
@@ -37,21 +35,17 @@ Before enabling OAuth in Immich, a new client application needs to be configured
   Redirect URIs should contain all the domains you will be using to access Immich. Some examples include:

   Mobile
-
   - `app.immich:///oauth-callback` (You **MUST** include this for iOS and Android mobile apps to work properly)

   Localhost
-
   - `http://localhost:2283/auth/login`
   - `http://localhost:2283/user-settings`

   Local IP
-
   - `http://192.168.0.200:2283/auth/login`
   - `http://192.168.0.200:2283/user-settings`

   Hostname
-
   - `https://immich.example.com/auth/login`
   - `https://immich.example.com/user-settings`

--- a/docs/docs/developer/devcontainers.md
+++ b/docs/docs/developer/devcontainers.md
@@ -199,13 +199,11 @@ To use your SSH key for commit signing, see the [GitHub guide on SSH commit sign
 When the Dev Container starts, it automatically:

 1. **Runs post-create script** (`container-server-post-create.sh`):
-
   - Adjusts file permissions for the `node` user
   - Installs dependencies: `npm install` in all packages
   - Builds TypeScript SDK: `npm run build` in `open-api/typescript-sdk`

 2. **Starts development servers** via VS Code tasks:
-
   - `Immich API Server (Nest)` - API server with hot-reloading on port 2283
   - `Immich Web Server (Vite)` - Web frontend with hot-reloading on port 3000
   - Both servers watch for file changes and recompile automatically
@@ -335,14 +333,12 @@ make install-all      # Install all dependencies
 The Dev Container is pre-configured for debugging:

 1. **API Server Debugging**:
-
   - Set breakpoints in VS Code
   - Press `F5` or use "Run and Debug" panel
   - Select "Attach to Server" configuration
   - Debug port: 9231

 2. **Worker Debugging**:
-
   - Use "Attach to Workers" configuration
   - Debug port: 9230

@@ -428,7 +424,6 @@ While the Dev Container focuses on server and web development, you can connect m
   ```

 2. **Configure mobile app**:
-
   - Server URL: `http://YOUR_IP:2283/api`
   - Ensure firewall allows port 2283

--- a/docs/docs/features/supported-formats.md
+++ b/docs/docs/features/supported-formats.md
@@ -16,7 +16,7 @@ For the full list, refer to the [Immich source code](https://github.com/immich-a
 | `HEIC`      | `.heic`                       | :white_check_mark: |                 |
 | `HEIF`      | `.heif`                       | :white_check_mark: |                 |
 | `JPEG 2000` | `.jp2`                        | :white_check_mark: |                 |
-| `JPEG`      | `.webp` `.jpg` `.jpe` `.insp` | :white_check_mark: |                 |
+| `JPEG`      | `.jpeg` `.jpg` `.jpe` `.insp` | :white_check_mark: |                 |
 | `JPEG XL`   | `.jxl`                        | :white_check_mark: |                 |
 | `PNG`       | `.png`                        | :white_check_mark: |                 |
 | `PSD`       | `.psd`                        | :white_check_mark: | Adobe Photoshop |
--- a/docs/docs/install/environment-variables.md
+++ b/docs/docs/install/environment-variables.md
@@ -72,22 +72,25 @@ Information on the current workers can be found [here](/docs/administration/jobs

 ## Database

-| Variable                            | Description                                                                  |  Default   | Containers                     |
-| :---------------------------------- | :--------------------------------------------------------------------------- | :--------: | :----------------------------- |
-| `DB_URL`                            | Database URL                                                                 |            | server                         |
-| `DB_HOSTNAME`                       | Database host                                                                | `database` | server                         |
-| `DB_PORT`                           | Database port                                                                |   `5432`   | server                         |
-| `DB_USERNAME`                       | Database user                                                                | `postgres` | server, database<sup>\*1</sup> |
-| `DB_PASSWORD`                       | Database password                                                            | `postgres` | server, database<sup>\*1</sup> |
-| `DB_DATABASE_NAME`                  | Database name                                                                |  `immich`  | server, database<sup>\*1</sup> |
-| `DB_SSL_MODE`                       | Database SSL mode                                                            |            | server                         |
-| `DB_VECTOR_EXTENSION`<sup>\*2</sup> | Database vector extension (one of [`vectorchord`, `pgvector`, `pgvecto.rs`]) |            | server                         |
-| `DB_SKIP_MIGRATIONS`                | Whether to skip running migrations on startup (one of [`true`, `false`])     |  `false`   | server                         |
+| Variable                            | Description                                                                            |  Default   | Containers                     |
+| :---------------------------------- | :------------------------------------------------------------------------------------- | :--------: | :----------------------------- |
+| `DB_URL`                            | Database URL                                                                           |            | server                         |
+| `DB_HOSTNAME`                       | Database host                                                                          | `database` | server                         |
+| `DB_PORT`                           | Database port                                                                          |   `5432`   | server                         |
+| `DB_USERNAME`                       | Database user                                                                          | `postgres` | server, database<sup>\*1</sup> |
+| `DB_PASSWORD`                       | Database password                                                                      | `postgres` | server, database<sup>\*1</sup> |
+| `DB_DATABASE_NAME`                  | Database name                                                                          |  `immich`  | server, database<sup>\*1</sup> |
+| `DB_SSL_MODE`                       | Database SSL mode                                                                      |            | server                         |
+| `DB_VECTOR_EXTENSION`<sup>\*2</sup> | Database vector extension (one of [`vectorchord`, `pgvector`, `pgvecto.rs`])           |            | server                         |
+| `DB_SKIP_MIGRATIONS`                | Whether to skip running migrations on startup (one of [`true`, `false`])               |  `false`   | server                         |
+| `DB_STORAGE_TYPE`                   | Optimize concurrent IO on SSDs or sequential IO on HDDs ([`SSD`, `HDD`])<sup>\*3</sup> |   `SSD`    | server                         |

 \*1: The values of `DB_USERNAME`, `DB_PASSWORD`, and `DB_DATABASE_NAME` are passed to the Postgres container as the variables `POSTGRES_USER`, `POSTGRES_PASSWORD`, and `POSTGRES_DB` in `docker-compose.yml`.

 \*2: If not provided, the appropriate extension to use is auto-detected at startup by introspecting the database. When multiple extensions are installed, the order of preference is VectorChord, pgvecto.rs, pgvector.

+\*3: Uses either [`postgresql.ssd.conf`](https://github.com/immich-app/base-images/blob/main/postgres/postgresql.ssd.conf) or [`postgresql.hdd.conf`](https://github.com/immich-app/base-images/blob/main/postgres/postgresql.hdd.conf) which mainly controls the Postgres `effective_io_concurrency` setting to allow for concurrenct IO on SSDs and sequential IO on HDDs.
+
 :::info

 All `DB_` variables must be provided to all Immich workers, including `api` and `microservices`.
--- a/docs/docs/install/unraid.md
+++ b/docs/docs/install/unraid.md
@@ -75,7 +75,6 @@ alt="Select Plugins > Compose.Manager > Add New Stack > Label it Immich"
 5.  Click "**Save Changes**", you will be prompted to edit stack UI labels, just leave this blank and click "**Ok**"
 6.  Select the cog ⚙️ next to Immich, click "**Edit Stack**", then click "**Env File**"
 7.  Paste the entire contents of the [Immich example.env](https://github.com/immich-app/immich/releases/latest/download/example.env) file into the Unraid editor, then **before saving** edit the following:
-
    - `UPLOAD_LOCATION`: Create a folder in your Images Unraid share and place the **absolute** location here > For example my _"images"_ share has a folder within it called _"immich"_. If I browse to this directory in the terminal and type `pwd` the output is `/mnt/user/images/immich`. This is the exact value I need to enter as my `UPLOAD_LOCATION`
    - `DB_DATA_LOCATION`: Change this to use an Unraid share (preferably a cache pool, e.g. `/mnt/user/appdata/postgresql/data`). This uses the `appdata` share. Do also create the `postgresql` folder, by running `mkdir /mnt/user/{share_location}/postgresql/data`. If left at default it will try to use Unraid's `/boot/config/plugins/compose.manager/projects/[stack_name]/postgres` folder which it doesn't have permissions to, resulting in this container continuously restarting.

--- a/docs/package-lock.json
+++ b/docs/package-lock.json
--- a/docs/package.json
+++ b/docs/package.json
@@ -16,8 +16,9 @@
    "write-heading-ids": "docusaurus write-heading-ids"
  },
  "dependencies": {
-    "@docusaurus/core": "~3.7.0",
-    "@docusaurus/preset-classic": "~3.7.0",
+    "@docusaurus/core": "~3.8.0",
+    "@docusaurus/preset-classic": "~3.8.0",
+    "@docusaurus/theme-common": "~3.8.0",
    "@mdi/js": "^7.3.67",
    "@mdi/react": "^1.6.1",
    "@mdx-js/react": "^3.0.0",
@@ -26,6 +27,7 @@
    "clsx": "^2.0.0",
    "docusaurus-lunr-search": "^3.3.2",
    "docusaurus-preset-openapi": "^0.7.5",
+    "lunr": "^2.3.9",
    "postcss": "^8.4.25",
    "prism-react-renderer": "^2.3.1",
    "raw-loader": "^4.0.2",
@@ -35,7 +37,7 @@
    "url": "^0.11.0"
  },
  "devDependencies": {
-    "@docusaurus/module-type-aliases": "~3.7.0",
+    "@docusaurus/module-type-aliases": "~3.8.0",
    "@docusaurus/tsconfig": "^3.7.0",
    "@docusaurus/types": "^3.7.0",
    "prettier": "^3.2.4",
@@ -57,6 +59,6 @@
    "node": ">=20"
  },
  "volta": {
-    "node": "22.16.0"
+    "node": "22.17.0"
  }
 }
--- a/docs/src/components/community-guides.tsx
+++ b/docs/src/components/community-guides.tsx
@@ -58,6 +58,12 @@ const guides: CommunityGuidesProps[] = [
    description: 'Access Immich with an end-to-end encrypted connection.',
    url: 'https://meshnet.nordvpn.com/how-to/remote-files-media-access/immich-remote-access',
  },
+  {
+    title: 'Trust Self Signed Certificates with Immich - OAuth Setup',
+    description:
+      'Set up Certificate Authority trust with Immich, and your private OAuth2/OpenID service, while using a private CA for HTTPS commication.',
+    url: 'https://github.com/immich-app/immich/discussions/18614',
+  },
 ];

 function CommunityGuide({ title, description, url }: CommunityGuidesProps): JSX.Element {
--- a/e2e/.nvmrc
+++ b/e2e/.nvmrc
@@ -1 +1 @@
-22.16.0
+22.17.0
--- a/e2e/package-lock.json
+++ b/e2e/package-lock.json
--- a/e2e/package.json
+++ b/e2e/package.json
@@ -25,7 +25,7 @@
    "@immich/sdk": "file:../open-api/typescript-sdk",
    "@playwright/test": "^1.44.1",
    "@types/luxon": "^3.4.2",
-    "@types/node": "^22.15.32",
+    "@types/node": "^22.15.33",
    "@types/oidc-provider": "^9.0.0",
    "@types/pg": "^8.15.1",
    "@types/pngjs": "^6.0.4",
@@ -44,7 +44,7 @@
    "pngjs": "^7.0.0",
    "prettier": "^3.2.5",
    "prettier-plugin-organize-imports": "^4.0.0",
-    "sharp": "^0.33.5",
+    "sharp": "^0.34.0",
    "socket.io-client": "^4.7.4",
    "supertest": "^7.0.0",
    "typescript": "^5.3.3",
@@ -53,6 +53,6 @@
    "vitest": "^3.0.0"
  },
  "volta": {
-    "node": "22.16.0"
+    "node": "22.17.0"
  }
 }
--- a/e2e/src/api/specs/shared-link.e2e-spec.ts
+++ b/e2e/src/api/specs/shared-link.e2e-spec.ts
@@ -117,6 +117,13 @@ describe('/shared-links', () => {
      const resp = await request(shareUrl).get(`/${linkWithAssets.key}`);
      expect(resp.status).toBe(200);
      expect(resp.header['content-type']).toContain('text/html');
+      expect(resp.text).toContain(`<meta property="og:image" content="http://127.0.0.1:2285`);
+    });
+
+    it('should fall back to my.immich.app og:image meta tag for shared asset if Host header is not present', async () => {
+      const resp = await request(shareUrl).get(`/${linkWithAssets.key}`).set('Host', '');
+      expect(resp.status).toBe(200);
+      expect(resp.header['content-type']).toContain('text/html');
      expect(resp.text).toContain(`<meta property="og:image" content="https://my.immich.app`);
    });

--- a/e2e/src/api/specs/timeline.e2e-spec.ts
+++ b/e2e/src/api/specs/timeline.e2e-spec.ts
@@ -1,230 +0,0 @@
-import {
-  AssetMediaResponseDto,
-  AssetVisibility,
-  LoginResponseDto,
-  SharedLinkType,
-  TimeBucketAssetResponseDto,
-} from '@immich/sdk';
-import { DateTime } from 'luxon';
-import { createUserDto } from 'src/fixtures';
-import { errorDto } from 'src/responses';
-import { app, utils } from 'src/utils';
-import request from 'supertest';
-import { beforeAll, describe, expect, it } from 'vitest';
-
-// TODO this should probably be a test util function
-const today = DateTime.fromObject({
-  year: 2023,
-  month: 11,
-  day: 3,
-}) as DateTime<true>;
-const yesterday = today.minus({ days: 1 });
-
-describe('/timeline', () => {
-  let admin: LoginResponseDto;
-  let user: LoginResponseDto;
-  let timeBucketUser: LoginResponseDto;
-
-  let user1Assets: AssetMediaResponseDto[];
-  let user2Assets: AssetMediaResponseDto[];
-
-  beforeAll(async () => {
-    await utils.resetDatabase();
-    admin = await utils.adminSetup({ onboarding: false });
-    [user, timeBucketUser] = await Promise.all([
-      utils.userSetup(admin.accessToken, createUserDto.create('1')),
-      utils.userSetup(admin.accessToken, createUserDto.create('time-bucket')),
-    ]);
-
-    user1Assets = await Promise.all([
-      utils.createAsset(user.accessToken),
-      utils.createAsset(user.accessToken),
-      utils.createAsset(user.accessToken, {
-        isFavorite: true,
-        fileCreatedAt: yesterday.toISO(),
-        fileModifiedAt: yesterday.toISO(),
-        assetData: { filename: 'example.mp4' },
-      }),
-      utils.createAsset(user.accessToken),
-      utils.createAsset(user.accessToken),
-    ]);
-
-    user2Assets = await Promise.all([
-      utils.createAsset(timeBucketUser.accessToken, { fileCreatedAt: new Date('1970-01-01').toISOString() }),
-      utils.createAsset(timeBucketUser.accessToken, { fileCreatedAt: new Date('1970-02-10').toISOString() }),
-      utils.createAsset(timeBucketUser.accessToken, { fileCreatedAt: new Date('1970-02-11').toISOString() }),
-      utils.createAsset(timeBucketUser.accessToken, { fileCreatedAt: new Date('1970-02-11').toISOString() }),
-      utils.createAsset(timeBucketUser.accessToken, { fileCreatedAt: new Date('1970-02-12').toISOString() }),
-    ]);
-
-    await utils.deleteAssets(timeBucketUser.accessToken, [user2Assets[4].id]);
-  });
-
-  describe('GET /timeline/buckets', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).get('/timeline/buckets');
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should get time buckets by month', async () => {
-      const { status, body } = await request(app)
-        .get('/timeline/buckets')
-        .set('Authorization', `Bearer ${timeBucketUser.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toEqual(
-        expect.arrayContaining([
-          { count: 3, timeBucket: '1970-02-01' },
-          { count: 1, timeBucket: '1970-01-01' },
-        ]),
-      );
-    });
-
-    it('should not allow access for unrelated shared links', async () => {
-      const sharedLink = await utils.createSharedLink(user.accessToken, {
-        type: SharedLinkType.Individual,
-        assetIds: user1Assets.map(({ id }) => id),
-      });
-
-      const { status, body } = await request(app).get('/timeline/buckets').query({ key: sharedLink.key });
-
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.noPermission);
-    });
-
-    it('should return error if time bucket is requested with partners asset and archived', async () => {
-      const req1 = await request(app)
-        .get('/timeline/buckets')
-        .set('Authorization', `Bearer ${timeBucketUser.accessToken}`)
-        .query({ withPartners: true, visibility: AssetVisibility.Archive });
-
-      expect(req1.status).toBe(400);
-      expect(req1.body).toEqual(errorDto.badRequest());
-
-      const req2 = await request(app)
-        .get('/timeline/buckets')
-        .set('Authorization', `Bearer ${user.accessToken}`)
-        .query({ withPartners: true, visibility: undefined });
-
-      expect(req2.status).toBe(400);
-      expect(req2.body).toEqual(errorDto.badRequest());
-    });
-
-    it('should return error if time bucket is requested with partners asset and favorite', async () => {
-      const req1 = await request(app)
-        .get('/timeline/buckets')
-        .set('Authorization', `Bearer ${timeBucketUser.accessToken}`)
-        .query({ withPartners: true, isFavorite: true });
-
-      expect(req1.status).toBe(400);
-      expect(req1.body).toEqual(errorDto.badRequest());
-
-      const req2 = await request(app)
-        .get('/timeline/buckets')
-        .set('Authorization', `Bearer ${timeBucketUser.accessToken}`)
-        .query({ withPartners: true, isFavorite: false });
-
-      expect(req2.status).toBe(400);
-      expect(req2.body).toEqual(errorDto.badRequest());
-    });
-
-    it('should return error if time bucket is requested with partners asset and trash', async () => {
-      const req = await request(app)
-        .get('/timeline/buckets')
-        .set('Authorization', `Bearer ${user.accessToken}`)
-        .query({ withPartners: true, isTrashed: true });
-
-      expect(req.status).toBe(400);
-      expect(req.body).toEqual(errorDto.badRequest());
-    });
-  });
-
-  describe('GET /timeline/bucket', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).get('/timeline/bucket').query({
-        timeBucket: '1900-01-01',
-      });
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should handle 5 digit years', async () => {
-      const { status, body } = await request(app)
-        .get('/timeline/bucket')
-        .query({ timeBucket: '012345-01-01' })
-        .set('Authorization', `Bearer ${timeBucketUser.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toEqual({
-        city: [],
-        country: [],
-        duration: [],
-        id: [],
-        visibility: [],
-        isFavorite: [],
-        isImage: [],
-        isTrashed: [],
-        livePhotoVideoId: [],
-        fileCreatedAt: [],
-        localOffsetHours: [],
-        ownerId: [],
-        projectionType: [],
-        ratio: [],
-        status: [],
-        thumbhash: [],
-      });
-    });
-
-    // TODO enable date string validation while still accepting 5 digit years
-    // it('should fail if time bucket is invalid', async () => {
-    //   const { status, body } = await request(app)
-    //     .get('/timeline/bucket')
-    //     .set('Authorization', `Bearer ${user.accessToken}`)
-    //     .query({  timeBucket: 'foo' });
-
-    //   expect(status).toBe(400);
-    //   expect(body).toEqual(errorDto.badRequest);
-    // });
-
-    it('should return time bucket', async () => {
-      const { status, body } = await request(app)
-        .get('/timeline/bucket')
-        .set('Authorization', `Bearer ${timeBucketUser.accessToken}`)
-        .query({ timeBucket: '1970-02-10' });
-
-      expect(status).toBe(200);
-      expect(body).toEqual({
-        city: [],
-        country: [],
-        duration: [],
-        id: [],
-        visibility: [],
-        isFavorite: [],
-        isImage: [],
-        isTrashed: [],
-        livePhotoVideoId: [],
-        fileCreatedAt: [],
-        localOffsetHours: [],
-        ownerId: [],
-        projectionType: [],
-        ratio: [],
-        status: [],
-        thumbhash: [],
-      });
-    });
-
-    it('should return time bucket in trash', async () => {
-      const { status, body } = await request(app)
-        .get('/timeline/bucket')
-        .set('Authorization', `Bearer ${timeBucketUser.accessToken}`)
-        .query({ timeBucket: '1970-02-01T00:00:00.000Z', isTrashed: true });
-
-      expect(status).toBe(200);
-
-      const timeBucket: TimeBucketAssetResponseDto = body;
-      expect(timeBucket.isTrashed).toEqual([true]);
-    });
-  });
-});
--- a/e2e/src/utils.ts
+++ b/e2e/src/utils.ts
@@ -60,6 +60,7 @@ import { io, type Socket } from 'socket.io-client';
 import { loginDto, signupDto } from 'src/fixtures';
 import { makeRandomImage } from 'src/generators';
 import request from 'supertest';
+export type { Emitter } from '@socket.io/component-emitter';

 type CommandResponse = { stdout: string; stderr: string; exitCode: number | null };
 type EventType = 'assetUpload' | 'assetUpdate' | 'assetDelete' | 'userDelete' | 'assetHidden';
@@ -84,10 +85,10 @@ export const immichAdmin = (args: string[]) =>
 export const specialCharStrings = ["'", '"', ',', '{', '}', '*'];
 export const TEN_TIMES = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];

-const executeCommand = (command: string, args: string[]) => {
+const executeCommand = (command: string, args: string[], options?: { cwd?: string }) => {
  let _resolve: (value: CommandResponse) => void;
  const promise = new Promise<CommandResponse>((resolve) => (_resolve = resolve));
-  const child = spawn(command, args, { stdio: 'pipe' });
+  const child = spawn(command, args, { stdio: 'pipe', cwd: options?.cwd });

  let stdout = '';
  let stderr = '';
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -427,6 +427,7 @@
  "app_settings": "App Settings",
  "appears_in": "Appears in",
  "archive": "Archive",
+  "archive_action_prompt": "{count} added to Archive",
  "archive_or_unarchive_photo": "Archive or unarchive photo",
  "archive_page_no_archived_assets": "No archived assets found",
  "archive_page_title": "Archive ({count})",
@@ -702,7 +703,7 @@
  "daily_title_text_date": "E, MMM dd",
  "daily_title_text_date_year": "E, MMM dd, yyyy",
  "dark": "Dark",
-  "darkTheme": "Toggle dark theme",
+  "dark_theme": "Toggle dark theme",
  "date_after": "Date after",
  "date_and_time": "Date and Time",
  "date_before": "Date before",
@@ -718,6 +719,7 @@
  "default_locale": "Default Locale",
  "default_locale_description": "Format dates and numbers based on your browser locale",
  "delete": "Delete",
+  "delete_action_prompt": "{count} deleted permanently",
  "delete_album": "Delete album",
  "delete_api_key_prompt": "Are you sure you want to delete this API key?",
  "delete_dialog_alert": "These items will be permanently deleted from Immich and from your device",
@@ -798,6 +800,7 @@
  "edit_key": "Edit key",
  "edit_link": "Edit link",
  "edit_location": "Edit location",
+  "edit_location_action_prompt": "{count} location edited",
  "edit_location_dialog_title": "Location",
  "edit_name": "Edit name",
  "edit_people": "Edit people",
@@ -983,6 +986,7 @@
  "failed_to_load_assets": "Failed to load assets",
  "failed_to_load_folder": "Failed to load folder",
  "favorite": "Favorite",
+  "favorite_action_prompt": "{count} added to Favorites",
  "favorite_or_unfavorite_photo": "Favorite or unfavorite photo",
  "favorites": "Favorites",
  "favorites_page_no_favorites": "No favorite assets found",
@@ -1245,6 +1249,7 @@
  "more": "More",
  "move": "Move",
  "move_off_locked_folder": "Move out of locked folder",
+  "move_to_lock_folder_action_prompt": "{count} added to the locked folder",
  "move_to_locked_folder": "Move to locked folder",
  "move_to_locked_folder_confirmation": "These photos and video will be removed from all albums, and only viewable from the locked folder",
  "moved_to_archive": "Moved {count, plural, one {# asset} other {# assets}} to archive",
@@ -1495,6 +1500,7 @@
  "remove_deleted_assets": "Remove Deleted Assets",
  "remove_from_album": "Remove from album",
  "remove_from_favorites": "Remove from favorites",
+  "remove_from_lock_folder_action_prompt": "{count} removed from the locked folder",
  "remove_from_locked_folder": "Remove from locked folder",
  "remove_from_locked_folder_confirmation": "Are you sure you want to move these photos and videos out of the locked folder? They will be visible in your library.",
  "remove_from_shared_link": "Remove from shared link",
@@ -1837,6 +1843,7 @@
  "total": "Total",
  "total_usage": "Total usage",
  "trash": "Trash",
+  "trash_action_prompt": "{count} moved to trash",
  "trash_all": "Trash All",
  "trash_count": "Trash {count, number}",
  "trash_delete_asset": "Trash/Delete Asset",
@@ -1854,9 +1861,11 @@
  "unable_to_change_pin_code": "Unable to change PIN code",
  "unable_to_setup_pin_code": "Unable to setup PIN code",
  "unarchive": "Unarchive",
+  "unarchive_action_prompt": "{count} removed from Archive",
  "unarchived_count": "{count, plural, other {Unarchived #}}",
  "undo": "Undo",
  "unfavorite": "Unfavorite",
+  "unfavorite_action_prompt": "{count} removed from Favorites",
  "unhide_person": "Unhide person",
  "unknown": "Unknown",
  "unknown_country": "Unknown Country",
--- a/machine-learning/uv.lock
+++ b/machine-learning/uv.lock
@@ -517,16 +517,16 @@ wheels = [

 [[package]]
 name = "fastapi"
-version = "0.115.13"
+version = "0.115.14"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
    { name = "pydantic" },
    { name = "starlette" },
    { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/20/64/ec0788201b5554e2a87c49af26b77a4d132f807a0fa9675257ac92c6aa0e/fastapi-0.115.13.tar.gz", hash = "sha256:55d1d25c2e1e0a0a50aceb1c8705cd932def273c102bff0b1c1da88b3c6eb307", size = 295680, upload-time = "2025-06-17T11:49:45.575Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/ca/53/8c38a874844a8b0fa10dd8adf3836ac154082cf88d3f22b544e9ceea0a15/fastapi-0.115.14.tar.gz", hash = "sha256:b1de15cdc1c499a4da47914db35d0e4ef8f1ce62b624e94e0e5824421df99739", size = 296263, upload-time = "2025-06-26T15:29:08.21Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/59/4a/e17764385382062b0edbb35a26b7cf76d71e27e456546277a42ba6545c6e/fastapi-0.115.13-py3-none-any.whl", hash = "sha256:0a0cab59afa7bab22f5eb347f8c9864b681558c278395e94035a741fc10cd865", size = 95315, upload-time = "2025-06-17T11:49:44.106Z" },
+    { url = "https://files.pythonhosted.org/packages/53/50/b1222562c6d270fea83e9c9075b8e8600b8479150a18e4516a6138b980d1/fastapi-0.115.14-py3-none-any.whl", hash = "sha256:6c0c8bf9420bd58f565e585036d971872472b4f7d3f6c73b698e10cffdefb3ca", size = 95514, upload-time = "2025-06-26T15:29:06.49Z" },
 ]

 [[package]]
@@ -900,7 +900,7 @@ wheels = [

 [[package]]
 name = "huggingface-hub"
-version = "0.33.0"
+version = "0.33.2"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
    { name = "filelock" },
@@ -912,9 +912,9 @@ dependencies = [
    { name = "tqdm" },
    { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/91/8a/1362d565fefabaa4185cf3ae842a98dbc5b35146f5694f7080f043a6952f/huggingface_hub-0.33.0.tar.gz", hash = "sha256:aa31f70d29439d00ff7a33837c03f1f9dd83971ce4e29ad664d63ffb17d3bb97", size = 426179, upload-time = "2025-06-11T17:08:07.913Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/fa/42/8a95c5632080ae312c0498744b2b852195e10b05a20b1be11c5141092f4c/huggingface_hub-0.33.2.tar.gz", hash = "sha256:84221defaec8fa09c090390cd68c78b88e3c4c2b7befba68d3dc5aacbc3c2c5f", size = 426637, upload-time = "2025-07-02T06:26:05.156Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/33/fb/53587a89fbc00799e4179796f51b3ad713c5de6bb680b2becb6d37c94649/huggingface_hub-0.33.0-py3-none-any.whl", hash = "sha256:e8668875b40c68f9929150d99727d39e5ebb8a05a98e4191b908dc7ded9074b3", size = 514799, upload-time = "2025-06-11T17:08:05.757Z" },
+    { url = "https://files.pythonhosted.org/packages/44/f4/5f3f22e762ad1965f01122b42dae5bf0e009286e2dba601ce1d0dba72424/huggingface_hub-0.33.2-py3-none-any.whl", hash = "sha256:3749498bfa91e8cde2ddc2c1db92c79981f40e66434c20133b39e5928ac9bcc5", size = 515373, upload-time = "2025-07-02T06:26:03.072Z" },
 ]

 [[package]]
@@ -1044,7 +1044,7 @@ requires-dist = [
    { name = "onnxruntime", marker = "extra == 'armnn'", specifier = ">=1.15.0,<2" },
    { name = "onnxruntime", marker = "extra == 'cpu'", specifier = ">=1.15.0,<2" },
    { name = "onnxruntime", marker = "extra == 'rknn'", specifier = ">=1.15.0,<2" },
-    { name = "onnxruntime-gpu", marker = "extra == 'cuda'", specifier = ">=1.17.0,<2", index = "https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-12/pypi/simple/" },
+    { name = "onnxruntime-gpu", marker = "extra == 'cuda'", specifier = ">=1.17.0,<2", index = "https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-12/pypi/simple" },
    { name = "onnxruntime-openvino", marker = "extra == 'openvino'", specifier = ">=1.17.1,<1.19.0" },
    { name = "opencv-python-headless", specifier = ">=4.7.0.72,<5.0" },
    { name = "orjson", specifier = ">=3.9.5" },
@@ -1568,7 +1568,7 @@ wheels = [
 [[package]]
 name = "onnxruntime-gpu"
 version = "1.19.2"
-source = { registry = "https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-12/pypi/simple/" }
+source = { registry = "https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-12/pypi/simple" }
 dependencies = [
    { name = "coloredlogs" },
    { name = "flatbuffers" },
@@ -1936,16 +1936,16 @@ wheels = [

 [[package]]
 name = "pydantic-settings"
-version = "2.9.1"
+version = "2.10.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
    { name = "pydantic" },
    { name = "python-dotenv" },
    { name = "typing-inspection" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/67/1d/42628a2c33e93f8e9acbde0d5d735fa0850f3e6a2f8cb1eb6c40b9a732ac/pydantic_settings-2.9.1.tar.gz", hash = "sha256:c509bf79d27563add44e8446233359004ed85066cd096d8b510f715e6ef5d268", size = 163234, upload-time = "2025-04-18T16:44:48.265Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/68/85/1ea668bbab3c50071ca613c6ab30047fb36ab0da1b92fa8f17bbc38fd36c/pydantic_settings-2.10.1.tar.gz", hash = "sha256:06f0062169818d0f5524420a360d632d5857b83cffd4d42fe29597807a1614ee", size = 172583, upload-time = "2025-06-24T13:26:46.841Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/b6/5f/d6d641b490fd3ec2c4c13b4244d68deea3a1b970a97be64f34fb5504ff72/pydantic_settings-2.9.1-py3-none-any.whl", hash = "sha256:59b4f431b1defb26fe620c71a7d3968a710d719f5f4cdbbdb7926edeb770f6ef", size = 44356, upload-time = "2025-04-18T16:44:46.617Z" },
+    { url = "https://files.pythonhosted.org/packages/58/f0/427018098906416f580e3cf1366d3b1abfb408a0652e9f31600c24a1903c/pydantic_settings-2.10.1-py3-none-any.whl", hash = "sha256:a60952460b99cf661dc25c29c0ef171721f98bfcb52ef8d9ea4c943d7c8cc796", size = 45235, upload-time = "2025-06-24T13:26:45.485Z" },
 ]

 [[package]]
@@ -2304,27 +2304,27 @@ wheels = [

 [[package]]
 name = "ruff"
-version = "0.12.0"
+version = "0.12.2"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/24/90/5255432602c0b196a0da6720f6f76b93eb50baef46d3c9b0025e2f9acbf3/ruff-0.12.0.tar.gz", hash = "sha256:4d047db3662418d4a848a3fdbfaf17488b34b62f527ed6f10cb8afd78135bc5c", size = 4376101, upload-time = "2025-06-17T15:19:26.217Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/6c/3d/d9a195676f25d00dbfcf3cf95fdd4c685c497fcfa7e862a44ac5e4e96480/ruff-0.12.2.tar.gz", hash = "sha256:d7b4f55cd6f325cb7621244f19c873c565a08aff5a4ba9c69aa7355f3f7afd3e", size = 4432239, upload-time = "2025-07-03T16:40:19.566Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/e6/fd/b46bb20e14b11ff49dbc74c61de352e0dc07fb650189513631f6fb5fc69f/ruff-0.12.0-py3-none-linux_armv6l.whl", hash = "sha256:5652a9ecdb308a1754d96a68827755f28d5dfb416b06f60fd9e13f26191a8848", size = 10311554, upload-time = "2025-06-17T15:18:45.792Z" },
-    { url = "https://files.pythonhosted.org/packages/e7/d3/021dde5a988fa3e25d2468d1dadeea0ae89dc4bc67d0140c6e68818a12a1/ruff-0.12.0-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:05ed0c914fabc602fc1f3b42c53aa219e5736cb030cdd85640c32dbc73da74a6", size = 11118435, upload-time = "2025-06-17T15:18:49.064Z" },
-    { url = "https://files.pythonhosted.org/packages/07/a2/01a5acf495265c667686ec418f19fd5c32bcc326d4c79ac28824aecd6a32/ruff-0.12.0-py3-none-macosx_11_0_arm64.whl", hash = "sha256:07a7aa9b69ac3fcfda3c507916d5d1bca10821fe3797d46bad10f2c6de1edda0", size = 10466010, upload-time = "2025-06-17T15:18:51.341Z" },
-    { url = "https://files.pythonhosted.org/packages/4c/57/7caf31dd947d72e7aa06c60ecb19c135cad871a0a8a251723088132ce801/ruff-0.12.0-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e7731c3eec50af71597243bace7ec6104616ca56dda2b99c89935fe926bdcd48", size = 10661366, upload-time = "2025-06-17T15:18:53.29Z" },
-    { url = "https://files.pythonhosted.org/packages/e9/ba/aa393b972a782b4bc9ea121e0e358a18981980856190d7d2b6187f63e03a/ruff-0.12.0-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:952d0630eae628250ab1c70a7fffb641b03e6b4a2d3f3ec6c1d19b4ab6c6c807", size = 10173492, upload-time = "2025-06-17T15:18:55.262Z" },
-    { url = "https://files.pythonhosted.org/packages/d7/50/9349ee777614bc3062fc6b038503a59b2034d09dd259daf8192f56c06720/ruff-0.12.0-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c021f04ea06966b02614d442e94071781c424ab8e02ec7af2f037b4c1e01cc82", size = 11761739, upload-time = "2025-06-17T15:18:58.906Z" },
-    { url = "https://files.pythonhosted.org/packages/04/8f/ad459de67c70ec112e2ba7206841c8f4eb340a03ee6a5cabc159fe558b8e/ruff-0.12.0-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:7d235618283718ee2fe14db07f954f9b2423700919dc688eacf3f8797a11315c", size = 12537098, upload-time = "2025-06-17T15:19:01.316Z" },
-    { url = "https://files.pythonhosted.org/packages/ed/50/15ad9c80ebd3c4819f5bd8883e57329f538704ed57bac680d95cb6627527/ruff-0.12.0-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0c0758038f81beec8cc52ca22de9685b8ae7f7cc18c013ec2050012862cc9165", size = 12154122, upload-time = "2025-06-17T15:19:03.727Z" },
-    { url = "https://files.pythonhosted.org/packages/76/e6/79b91e41bc8cc3e78ee95c87093c6cacfa275c786e53c9b11b9358026b3d/ruff-0.12.0-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:139b3d28027987b78fc8d6cfb61165447bdf3740e650b7c480744873688808c2", size = 11363374, upload-time = "2025-06-17T15:19:05.875Z" },
-    { url = "https://files.pythonhosted.org/packages/db/c3/82b292ff8a561850934549aa9dc39e2c4e783ab3c21debe55a495ddf7827/ruff-0.12.0-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:68853e8517b17bba004152aebd9dd77d5213e503a5f2789395b25f26acac0da4", size = 11587647, upload-time = "2025-06-17T15:19:08.246Z" },
-    { url = "https://files.pythonhosted.org/packages/2b/42/d5760d742669f285909de1bbf50289baccb647b53e99b8a3b4f7ce1b2001/ruff-0.12.0-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:3a9512af224b9ac4757f7010843771da6b2b0935a9e5e76bb407caa901a1a514", size = 10527284, upload-time = "2025-06-17T15:19:10.37Z" },
-    { url = "https://files.pythonhosted.org/packages/19/f6/fcee9935f25a8a8bba4adbae62495c39ef281256693962c2159e8b284c5f/ruff-0.12.0-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:b08df3d96db798e5beb488d4df03011874aff919a97dcc2dd8539bb2be5d6a88", size = 10158609, upload-time = "2025-06-17T15:19:12.286Z" },
-    { url = "https://files.pythonhosted.org/packages/37/fb/057febf0eea07b9384787bfe197e8b3384aa05faa0d6bd844b94ceb29945/ruff-0.12.0-py3-none-musllinux_1_2_i686.whl", hash = "sha256:6a315992297a7435a66259073681bb0d8647a826b7a6de45c6934b2ca3a9ed51", size = 11141462, upload-time = "2025-06-17T15:19:15.195Z" },
-    { url = "https://files.pythonhosted.org/packages/10/7c/1be8571011585914b9d23c95b15d07eec2d2303e94a03df58294bc9274d4/ruff-0.12.0-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:1e55e44e770e061f55a7dbc6e9aed47feea07731d809a3710feda2262d2d4d8a", size = 11641616, upload-time = "2025-06-17T15:19:17.6Z" },
-    { url = "https://files.pythonhosted.org/packages/6a/ef/b960ab4818f90ff59e571d03c3f992828d4683561095e80f9ef31f3d58b7/ruff-0.12.0-py3-none-win32.whl", hash = "sha256:7162a4c816f8d1555eb195c46ae0bd819834d2a3f18f98cc63819a7b46f474fb", size = 10525289, upload-time = "2025-06-17T15:19:19.688Z" },
-    { url = "https://files.pythonhosted.org/packages/34/93/8b16034d493ef958a500f17cda3496c63a537ce9d5a6479feec9558f1695/ruff-0.12.0-py3-none-win_amd64.whl", hash = "sha256:d00b7a157b8fb6d3827b49d3324da34a1e3f93492c1f97b08e222ad7e9b291e0", size = 11598311, upload-time = "2025-06-17T15:19:21.785Z" },
-    { url = "https://files.pythonhosted.org/packages/d0/33/4d3e79e4a84533d6cd526bfb42c020a23256ae5e4265d858bd1287831f7d/ruff-0.12.0-py3-none-win_arm64.whl", hash = "sha256:8cd24580405ad8c1cc64d61725bca091d6b6da7eb3d36f72cc605467069d7e8b", size = 10724946, upload-time = "2025-06-17T15:19:23.952Z" },
+    { url = "https://files.pythonhosted.org/packages/74/b6/2098d0126d2d3318fd5bec3ad40d06c25d377d95749f7a0c5af17129b3b1/ruff-0.12.2-py3-none-linux_armv6l.whl", hash = "sha256:093ea2b221df1d2b8e7ad92fc6ffdca40a2cb10d8564477a987b44fd4008a7be", size = 10369761, upload-time = "2025-07-03T16:39:38.847Z" },
+    { url = "https://files.pythonhosted.org/packages/b1/4b/5da0142033dbe155dc598cfb99262d8ee2449d76920ea92c4eeb9547c208/ruff-0.12.2-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:09e4cf27cc10f96b1708100fa851e0daf21767e9709e1649175355280e0d950e", size = 11155659, upload-time = "2025-07-03T16:39:42.294Z" },
+    { url = "https://files.pythonhosted.org/packages/3e/21/967b82550a503d7c5c5c127d11c935344b35e8c521f52915fc858fb3e473/ruff-0.12.2-py3-none-macosx_11_0_arm64.whl", hash = "sha256:8ae64755b22f4ff85e9c52d1f82644abd0b6b6b6deedceb74bd71f35c24044cc", size = 10537769, upload-time = "2025-07-03T16:39:44.75Z" },
+    { url = "https://files.pythonhosted.org/packages/33/91/00cff7102e2ec71a4890fb7ba1803f2cdb122d82787c7d7cf8041fe8cbc1/ruff-0.12.2-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3eb3a6b2db4d6e2c77e682f0b988d4d61aff06860158fdb413118ca133d57922", size = 10717602, upload-time = "2025-07-03T16:39:47.652Z" },
+    { url = "https://files.pythonhosted.org/packages/9b/eb/928814daec4e1ba9115858adcda44a637fb9010618721937491e4e2283b8/ruff-0.12.2-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:73448de992d05517170fc37169cbca857dfeaeaa8c2b9be494d7bcb0d36c8f4b", size = 10198772, upload-time = "2025-07-03T16:39:49.641Z" },
+    { url = "https://files.pythonhosted.org/packages/50/fa/f15089bc20c40f4f72334f9145dde55ab2b680e51afb3b55422effbf2fb6/ruff-0.12.2-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3b8b94317cbc2ae4a2771af641739f933934b03555e51515e6e021c64441532d", size = 11845173, upload-time = "2025-07-03T16:39:52.069Z" },
+    { url = "https://files.pythonhosted.org/packages/43/9f/1f6f98f39f2b9302acc161a4a2187b1e3a97634fe918a8e731e591841cf4/ruff-0.12.2-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:45fc42c3bf1d30d2008023a0a9a0cfb06bf9835b147f11fe0679f21ae86d34b1", size = 12553002, upload-time = "2025-07-03T16:39:54.551Z" },
+    { url = "https://files.pythonhosted.org/packages/d8/70/08991ac46e38ddd231c8f4fd05ef189b1b94be8883e8c0c146a025c20a19/ruff-0.12.2-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ce48f675c394c37e958bf229fb5c1e843e20945a6d962cf3ea20b7a107dcd9f4", size = 12171330, upload-time = "2025-07-03T16:39:57.55Z" },
+    { url = "https://files.pythonhosted.org/packages/88/a9/5a55266fec474acfd0a1c73285f19dd22461d95a538f29bba02edd07a5d9/ruff-0.12.2-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:793d8859445ea47591272021a81391350205a4af65a9392401f418a95dfb75c9", size = 11774717, upload-time = "2025-07-03T16:39:59.78Z" },
+    { url = "https://files.pythonhosted.org/packages/87/e5/0c270e458fc73c46c0d0f7cf970bb14786e5fdb88c87b5e423a4bd65232b/ruff-0.12.2-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6932323db80484dda89153da3d8e58164d01d6da86857c79f1961934354992da", size = 11646659, upload-time = "2025-07-03T16:40:01.934Z" },
+    { url = "https://files.pythonhosted.org/packages/b7/b6/45ab96070c9752af37f0be364d849ed70e9ccede07675b0ec4e3ef76b63b/ruff-0.12.2-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:6aa7e623a3a11538108f61e859ebf016c4f14a7e6e4eba1980190cacb57714ce", size = 10604012, upload-time = "2025-07-03T16:40:04.363Z" },
+    { url = "https://files.pythonhosted.org/packages/86/91/26a6e6a424eb147cc7627eebae095cfa0b4b337a7c1c413c447c9ebb72fd/ruff-0.12.2-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:2a4a20aeed74671b2def096bdf2eac610c7d8ffcbf4fb0e627c06947a1d7078d", size = 10176799, upload-time = "2025-07-03T16:40:06.514Z" },
+    { url = "https://files.pythonhosted.org/packages/f5/0c/9f344583465a61c8918a7cda604226e77b2c548daf8ef7c2bfccf2b37200/ruff-0.12.2-py3-none-musllinux_1_2_i686.whl", hash = "sha256:71a4c550195612f486c9d1f2b045a600aeba851b298c667807ae933478fcef04", size = 11241507, upload-time = "2025-07-03T16:40:08.708Z" },
+    { url = "https://files.pythonhosted.org/packages/1c/b7/99c34ded8fb5f86c0280278fa89a0066c3760edc326e935ce0b1550d315d/ruff-0.12.2-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:4987b8f4ceadf597c927beee65a5eaf994c6e2b631df963f86d8ad1bdea99342", size = 11717609, upload-time = "2025-07-03T16:40:10.836Z" },
+    { url = "https://files.pythonhosted.org/packages/51/de/8589fa724590faa057e5a6d171e7f2f6cffe3287406ef40e49c682c07d89/ruff-0.12.2-py3-none-win32.whl", hash = "sha256:369ffb69b70cd55b6c3fc453b9492d98aed98062db9fec828cdfd069555f5f1a", size = 10523823, upload-time = "2025-07-03T16:40:13.203Z" },
+    { url = "https://files.pythonhosted.org/packages/94/47/8abf129102ae4c90cba0c2199a1a9b0fa896f6f806238d6f8c14448cc748/ruff-0.12.2-py3-none-win_amd64.whl", hash = "sha256:dca8a3b6d6dc9810ed8f328d406516bf4d660c00caeaef36eb831cf4871b0639", size = 11629831, upload-time = "2025-07-03T16:40:15.478Z" },
+    { url = "https://files.pythonhosted.org/packages/e2/1f/72d2946e3cc7456bb837e88000eb3437e55f80db339c840c04015a11115d/ruff-0.12.2-py3-none-win_arm64.whl", hash = "sha256:48d6c6bfb4761df68bc05ae630e24f506755e702d4fb08f08460be778c7ccb12", size = 10735334, upload-time = "2025-07-03T16:40:17.677Z" },
 ]

 [[package]]
@@ -2504,27 +2504,27 @@ wheels = [

 [[package]]
 name = "tokenizers"
-version = "0.21.1"
+version = "0.21.2"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
    { name = "huggingface-hub" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/92/76/5ac0c97f1117b91b7eb7323dcd61af80d72f790b4df71249a7850c195f30/tokenizers-0.21.1.tar.gz", hash = "sha256:a1bb04dc5b448985f86ecd4b05407f5a8d97cb2c0532199b2a302a604a0165ab", size = 343256, upload-time = "2025-03-13T10:51:18.189Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/ab/2d/b0fce2b8201635f60e8c95990080f58461cc9ca3d5026de2e900f38a7f21/tokenizers-0.21.2.tar.gz", hash = "sha256:fdc7cffde3e2113ba0e6cc7318c40e3438a4d74bbc62bf04bcc63bdfb082ac77", size = 351545, upload-time = "2025-06-24T10:24:52.449Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/a5/1f/328aee25f9115bf04262e8b4e5a2050b7b7cf44b59c74e982db7270c7f30/tokenizers-0.21.1-cp39-abi3-macosx_10_12_x86_64.whl", hash = "sha256:e78e413e9e668ad790a29456e677d9d3aa50a9ad311a40905d6861ba7692cf41", size = 2780767, upload-time = "2025-03-13T10:51:09.459Z" },
-    { url = "https://files.pythonhosted.org/packages/ae/1a/4526797f3719b0287853f12c5ad563a9be09d446c44ac784cdd7c50f76ab/tokenizers-0.21.1-cp39-abi3-macosx_11_0_arm64.whl", hash = "sha256:cd51cd0a91ecc801633829fcd1fda9cf8682ed3477c6243b9a095539de4aecf3", size = 2650555, upload-time = "2025-03-13T10:51:07.692Z" },
-    { url = "https://files.pythonhosted.org/packages/4d/7a/a209b29f971a9fdc1da86f917fe4524564924db50d13f0724feed37b2a4d/tokenizers-0.21.1-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:28da6b72d4fb14ee200a1bd386ff74ade8992d7f725f2bde2c495a9a98cf4d9f", size = 2937541, upload-time = "2025-03-13T10:50:56.679Z" },
-    { url = "https://files.pythonhosted.org/packages/3c/1e/b788b50ffc6191e0b1fc2b0d49df8cff16fe415302e5ceb89f619d12c5bc/tokenizers-0.21.1-cp39-abi3-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:34d8cfde551c9916cb92014e040806122295a6800914bab5865deb85623931cf", size = 2819058, upload-time = "2025-03-13T10:50:59.525Z" },
-    { url = "https://files.pythonhosted.org/packages/36/aa/3626dfa09a0ecc5b57a8c58eeaeb7dd7ca9a37ad9dd681edab5acd55764c/tokenizers-0.21.1-cp39-abi3-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:aaa852d23e125b73d283c98f007e06d4595732104b65402f46e8ef24b588d9f8", size = 3133278, upload-time = "2025-03-13T10:51:04.678Z" },
-    { url = "https://files.pythonhosted.org/packages/a4/4d/8fbc203838b3d26269f944a89459d94c858f5b3f9a9b6ee9728cdcf69161/tokenizers-0.21.1-cp39-abi3-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a21a15d5c8e603331b8a59548bbe113564136dc0f5ad8306dd5033459a226da0", size = 3144253, upload-time = "2025-03-13T10:51:01.261Z" },
-    { url = "https://files.pythonhosted.org/packages/d8/1b/2bd062adeb7c7511b847b32e356024980c0ffcf35f28947792c2d8ad2288/tokenizers-0.21.1-cp39-abi3-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2fdbd4c067c60a0ac7eca14b6bd18a5bebace54eb757c706b47ea93204f7a37c", size = 3398225, upload-time = "2025-03-13T10:51:03.243Z" },
-    { url = "https://files.pythonhosted.org/packages/8a/63/38be071b0c8e06840bc6046991636bcb30c27f6bb1e670f4f4bc87cf49cc/tokenizers-0.21.1-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2dd9a0061e403546f7377df940e866c3e678d7d4e9643d0461ea442b4f89e61a", size = 3038874, upload-time = "2025-03-13T10:51:06.235Z" },
-    { url = "https://files.pythonhosted.org/packages/ec/83/afa94193c09246417c23a3c75a8a0a96bf44ab5630a3015538d0c316dd4b/tokenizers-0.21.1-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:db9484aeb2e200c43b915a1a0150ea885e35f357a5a8fabf7373af333dcc8dbf", size = 9014448, upload-time = "2025-03-13T10:51:10.927Z" },
-    { url = "https://files.pythonhosted.org/packages/ae/b3/0e1a37d4f84c0f014d43701c11eb8072704f6efe8d8fc2dcdb79c47d76de/tokenizers-0.21.1-cp39-abi3-musllinux_1_2_armv7l.whl", hash = "sha256:ed248ab5279e601a30a4d67bdb897ecbe955a50f1e7bb62bd99f07dd11c2f5b6", size = 8937877, upload-time = "2025-03-13T10:51:12.688Z" },
-    { url = "https://files.pythonhosted.org/packages/ac/33/ff08f50e6d615eb180a4a328c65907feb6ded0b8f990ec923969759dc379/tokenizers-0.21.1-cp39-abi3-musllinux_1_2_i686.whl", hash = "sha256:9ac78b12e541d4ce67b4dfd970e44c060a2147b9b2a21f509566d556a509c67d", size = 9186645, upload-time = "2025-03-13T10:51:14.723Z" },
-    { url = "https://files.pythonhosted.org/packages/5f/aa/8ae85f69a9f6012c6f8011c6f4aa1c96154c816e9eea2e1b758601157833/tokenizers-0.21.1-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:e5a69c1a4496b81a5ee5d2c1f3f7fbdf95e90a0196101b0ee89ed9956b8a168f", size = 9384380, upload-time = "2025-03-13T10:51:16.526Z" },
-    { url = "https://files.pythonhosted.org/packages/e8/5b/a5d98c89f747455e8b7a9504910c865d5e51da55e825a7ae641fb5ff0a58/tokenizers-0.21.1-cp39-abi3-win32.whl", hash = "sha256:1039a3a5734944e09de1d48761ade94e00d0fa760c0e0551151d4dd851ba63e3", size = 2239506, upload-time = "2025-03-13T10:51:20.643Z" },
-    { url = "https://files.pythonhosted.org/packages/e6/b6/072a8e053ae600dcc2ac0da81a23548e3b523301a442a6ca900e92ac35be/tokenizers-0.21.1-cp39-abi3-win_amd64.whl", hash = "sha256:0f0dcbcc9f6e13e675a66d7a5f2f225a736745ce484c1a4e07476a89ccdad382", size = 2435481, upload-time = "2025-03-13T10:51:19.243Z" },
+    { url = "https://files.pythonhosted.org/packages/1d/cc/2936e2d45ceb130a21d929743f1e9897514691bec123203e10837972296f/tokenizers-0.21.2-cp39-abi3-macosx_10_12_x86_64.whl", hash = "sha256:342b5dfb75009f2255ab8dec0041287260fed5ce00c323eb6bab639066fef8ec", size = 2875206, upload-time = "2025-06-24T10:24:42.755Z" },
+    { url = "https://files.pythonhosted.org/packages/6c/e6/33f41f2cc7861faeba8988e7a77601407bf1d9d28fc79c5903f8f77df587/tokenizers-0.21.2-cp39-abi3-macosx_11_0_arm64.whl", hash = "sha256:126df3205d6f3a93fea80c7a8a266a78c1bd8dd2fe043386bafdd7736a23e45f", size = 2732655, upload-time = "2025-06-24T10:24:41.56Z" },
+    { url = "https://files.pythonhosted.org/packages/33/2b/1791eb329c07122a75b01035b1a3aa22ad139f3ce0ece1b059b506d9d9de/tokenizers-0.21.2-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4a32cd81be21168bd0d6a0f0962d60177c447a1aa1b1e48fa6ec9fc728ee0b12", size = 3019202, upload-time = "2025-06-24T10:24:31.791Z" },
+    { url = "https://files.pythonhosted.org/packages/05/15/fd2d8104faa9f86ac68748e6f7ece0b5eb7983c7efc3a2c197cb98c99030/tokenizers-0.21.2-cp39-abi3-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:8bd8999538c405133c2ab999b83b17c08b7fc1b48c1ada2469964605a709ef91", size = 2934539, upload-time = "2025-06-24T10:24:34.567Z" },
+    { url = "https://files.pythonhosted.org/packages/a5/2e/53e8fd053e1f3ffbe579ca5f9546f35ac67cf0039ed357ad7ec57f5f5af0/tokenizers-0.21.2-cp39-abi3-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5e9944e61239b083a41cf8fc42802f855e1dca0f499196df37a8ce219abac6eb", size = 3248665, upload-time = "2025-06-24T10:24:39.024Z" },
+    { url = "https://files.pythonhosted.org/packages/00/15/79713359f4037aa8f4d1f06ffca35312ac83629da062670e8830917e2153/tokenizers-0.21.2-cp39-abi3-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:514cd43045c5d546f01142ff9c79a96ea69e4b5cda09e3027708cb2e6d5762ab", size = 3451305, upload-time = "2025-06-24T10:24:36.133Z" },
+    { url = "https://files.pythonhosted.org/packages/38/5f/959f3a8756fc9396aeb704292777b84f02a5c6f25c3fc3ba7530db5feb2c/tokenizers-0.21.2-cp39-abi3-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b1b9405822527ec1e0f7d8d2fdb287a5730c3a6518189c968254a8441b21faae", size = 3214757, upload-time = "2025-06-24T10:24:37.784Z" },
+    { url = "https://files.pythonhosted.org/packages/c5/74/f41a432a0733f61f3d21b288de6dfa78f7acff309c6f0f323b2833e9189f/tokenizers-0.21.2-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fed9a4d51c395103ad24f8e7eb976811c57fbec2af9f133df471afcd922e5020", size = 3121887, upload-time = "2025-06-24T10:24:40.293Z" },
+    { url = "https://files.pythonhosted.org/packages/3c/6a/bc220a11a17e5d07b0dfb3b5c628621d4dcc084bccd27cfaead659963016/tokenizers-0.21.2-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:2c41862df3d873665ec78b6be36fcc30a26e3d4902e9dd8608ed61d49a48bc19", size = 9091965, upload-time = "2025-06-24T10:24:44.431Z" },
+    { url = "https://files.pythonhosted.org/packages/6c/bd/ac386d79c4ef20dc6f39c4706640c24823dca7ebb6f703bfe6b5f0292d88/tokenizers-0.21.2-cp39-abi3-musllinux_1_2_armv7l.whl", hash = "sha256:ed21dc7e624e4220e21758b2e62893be7101453525e3d23264081c9ef9a6d00d", size = 9053372, upload-time = "2025-06-24T10:24:46.455Z" },
+    { url = "https://files.pythonhosted.org/packages/63/7b/5440bf203b2a5358f074408f7f9c42884849cd9972879e10ee6b7a8c3b3d/tokenizers-0.21.2-cp39-abi3-musllinux_1_2_i686.whl", hash = "sha256:0e73770507e65a0e0e2a1affd6b03c36e3bc4377bd10c9ccf51a82c77c0fe365", size = 9298632, upload-time = "2025-06-24T10:24:48.446Z" },
+    { url = "https://files.pythonhosted.org/packages/a4/d2/faa1acac3f96a7427866e94ed4289949b2524f0c1878512516567d80563c/tokenizers-0.21.2-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:106746e8aa9014a12109e58d540ad5465b4c183768ea96c03cbc24c44d329958", size = 9470074, upload-time = "2025-06-24T10:24:50.378Z" },
+    { url = "https://files.pythonhosted.org/packages/d8/a5/896e1ef0707212745ae9f37e84c7d50269411aef2e9ccd0de63623feecdf/tokenizers-0.21.2-cp39-abi3-win32.whl", hash = "sha256:cabda5a6d15d620b6dfe711e1af52205266d05b379ea85a8a301b3593c60e962", size = 2330115, upload-time = "2025-06-24T10:24:55.069Z" },
+    { url = "https://files.pythonhosted.org/packages/13/c3/cc2755ee10be859c4338c962a35b9a663788c0c0b50c0bdd8078fb6870cf/tokenizers-0.21.2-cp39-abi3-win_amd64.whl", hash = "sha256:58747bb898acdb1007f37a7bbe614346e98dc28708ffb66a3fd50ce169ac6c98", size = 2509918, upload-time = "2025-06-24T10:24:53.71Z" },
 ]

 [[package]]
@@ -2628,16 +2628,16 @@ wheels = [

 [[package]]
 name = "uvicorn"
-version = "0.34.3"
+version = "0.35.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
    { name = "click" },
    { name = "h11" },
    { name = "typing-extensions", marker = "python_full_version < '3.11'" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/de/ad/713be230bcda622eaa35c28f0d328c3675c371238470abdea52417f17a8e/uvicorn-0.34.3.tar.gz", hash = "sha256:35919a9a979d7a59334b6b10e05d77c1d0d574c50e0fc98b8b1a0f165708b55a", size = 76631, upload-time = "2025-06-01T07:48:17.531Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/5e/42/e0e305207bb88c6b8d3061399c6a961ffe5fbb7e2aa63c9234df7259e9cd/uvicorn-0.35.0.tar.gz", hash = "sha256:bc662f087f7cf2ce11a1d7fd70b90c9f98ef2e2831556dd078d131b96cc94a01", size = 78473, upload-time = "2025-06-28T16:15:46.058Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/6d/0d/8adfeaa62945f90d19ddc461c55f4a50c258af7662d34b6a3d5d1f8646f6/uvicorn-0.34.3-py3-none-any.whl", hash = "sha256:16246631db62bdfbf069b0645177d6e8a77ba950cfedbfd093acef9444e4d885", size = 62431, upload-time = "2025-06-01T07:48:15.664Z" },
+    { url = "https://files.pythonhosted.org/packages/d2/e2/dc81b1bd1dcfe91735810265e9d26bc8ec5da45b4c0f6237e286819194c3/uvicorn-0.35.0-py3-none-any.whl", hash = "sha256:197535216b25ff9b785e29a0b79199f55222193d47f820816e7da751e9bc8d4a", size = 66406, upload-time = "2025-06-28T16:15:44.816Z" },
 ]

 [package.optional-dependencies]
--- a/mobile/android/app/src/main/kotlin/app/alextran/immich/sync/MessagesImplBase.kt
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/sync/MessagesImplBase.kt
@@ -5,6 +5,7 @@ import android.content.Context
 import android.database.Cursor
 import android.provider.MediaStore
 import android.util.Log
+import androidx.core.database.getStringOrNull
 import java.io.File
 import java.io.FileInputStream
 import java.security.MessageDigest
@@ -152,7 +153,8 @@ open class NativeSyncApiImplBase(context: Context) {
          continue
        }

-        val name = cursor.getString(bucketNameColumn)
+        // MediaStore might return null for bucket name (commonly for the Root Directory), so default to "Internal Storage"
+        val name = cursor.getStringOrNull(bucketNameColumn) ?: "Internal Storage"
        val updatedAt = cursor.getLong(dateModified)
        albums.add(PlatformAlbum(id, name, updatedAt, false, 0))
        albumsCount[id] = 1
--- a/mobile/drift_schemas/main/drift_schema_v1.json
+++ b/mobile/drift_schemas/main/drift_schema_v1.json
--- a/mobile/lib/constants/enums.dart
+++ b/mobile/lib/constants/enums.dart
@@ -12,3 +12,5 @@ enum TextSearchType {
 enum AssetVisibilityEnum { timeline, hidden, archive, locked }

 enum SortUserBy { id }
+
+enum ActionSource { timeline, viewer }
--- a/mobile/lib/domain/models/album/album.model.dart
+++ b/mobile/lib/domain/models/album/album.model.dart
@@ -21,6 +21,8 @@ class Album {
  final String? thumbnailAssetId;
  final bool isActivityEnabled;
  final AlbumAssetOrder order;
+  final int assetCount;
+  final String ownerName;

  const Album({
    required this.id,
@@ -32,20 +34,24 @@ class Album {
    this.thumbnailAssetId,
    required this.isActivityEnabled,
    required this.order,
+    required this.assetCount,
+    required this.ownerName,
  });

  @override
  String toString() {
    return '''Album {
-   id: $id,
-   name: $name,
-   ownerId: $ownerId,
-   description: $description,
-   createdAt: $createdAt,
-   updatedAt: $updatedAt,
-   isActivityEnabled: $isActivityEnabled,
-   order: $order,
-   thumbnailAssetId: ${thumbnailAssetId ?? "<NA>"}
+    id: $id,
+    name: $name,
+    ownerId: $ownerId,
+    description: $description,
+    createdAt: $createdAt,
+    updatedAt: $updatedAt,
+    isActivityEnabled: $isActivityEnabled,
+    order: $order,
+    thumbnailAssetId: ${thumbnailAssetId ?? "<NA>"}
+    assetCount: $assetCount
+    ownerName: $ownerName
 }''';
  }

@@ -61,7 +67,9 @@ class Album {
        updatedAt == other.updatedAt &&
        thumbnailAssetId == other.thumbnailAssetId &&
        isActivityEnabled == other.isActivityEnabled &&
-        order == other.order;
+        order == other.order &&
+        assetCount == other.assetCount &&
+        ownerName == other.ownerName;
  }

  @override
@@ -74,6 +82,8 @@ class Album {
        updatedAt.hashCode ^
        thumbnailAssetId.hashCode ^
        isActivityEnabled.hashCode ^
-        order.hashCode;
+        order.hashCode ^
+        assetCount.hashCode ^
+        ownerName.hashCode;
  }
 }
--- a/mobile/lib/domain/models/asset/asset.model.dart
+++ b/mobile/lib/domain/models/asset/asset.model.dart
@@ -1,73 +0,0 @@
-part of 'base_asset.model.dart';
-
-enum AssetVisibility {
-  timeline,
-  hidden,
-  archive,
-  locked,
-}
-
-// Model for an asset stored in the server
-class Asset extends BaseAsset {
-  final String id;
-  final String? localId;
-  final String? thumbHash;
-  final AssetVisibility visibility;
-
-  const Asset({
-    required this.id,
-    this.localId,
-    required super.name,
-    required super.checksum,
-    required super.type,
-    required super.createdAt,
-    required super.updatedAt,
-    super.width,
-    super.height,
-    super.durationInSeconds,
-    super.isFavorite = false,
-    this.thumbHash,
-    this.visibility = AssetVisibility.timeline,
-  });
-
-  @override
-  AssetState get storage =>
-      localId == null ? AssetState.remote : AssetState.merged;
-
-  @override
-  String toString() {
-    return '''Asset {
-   id: $id,
-   name: $name,
-   type: $type,
-   createdAt: $createdAt,
-   updatedAt: $updatedAt,
-   width: ${width ?? "<NA>"},
-   height: ${height ?? "<NA>"},
-   durationInSeconds: ${durationInSeconds ?? "<NA>"},
-   localId: ${localId ?? "<NA>"},
-   isFavorite: $isFavorite,
-    thumbHash: ${thumbHash ?? "<NA>"},
-    visibility: $visibility,
- }''';
-  }
-
-  @override
-  bool operator ==(Object other) {
-    if (other is! Asset) return false;
-    if (identical(this, other)) return true;
-    return super == other &&
-        id == other.id &&
-        localId == other.localId &&
-        thumbHash == other.thumbHash &&
-        visibility == other.visibility;
-  }
-
-  @override
-  int get hashCode =>
-      super.hashCode ^
-      id.hashCode ^
-      localId.hashCode ^
-      thumbHash.hashCode ^
-      visibility.hashCode;
-}
--- a/mobile/lib/domain/models/asset/base_asset.model.dart
+++ b/mobile/lib/domain/models/asset/base_asset.model.dart
@@ -1,5 +1,5 @@
-part 'asset.model.dart';
 part 'local_asset.model.dart';
+part 'remote_asset.model.dart';

 enum AssetType {
  // do not change this order!
@@ -40,7 +40,24 @@ sealed class BaseAsset {

  bool get isImage => type == AssetType.image;
  bool get isVideo => type == AssetType.video;
+
+  double? get aspectRatio {
+    if (width != null && height != null && height! > 0) {
+      return width! / height!;
+    }
+    return null;
+  }
+
+  bool get hasRemote =>
+      storage == AssetState.remote || storage == AssetState.merged;
+  bool get hasLocal =>
+      storage == AssetState.local || storage == AssetState.merged;
+  bool get isLocalOnly => storage == AssetState.local;
+  bool get isRemoteOnly => storage == AssetState.remote;
+
+  // Overridden in subclasses
  AssetState get storage;
+  String get heroTag;

  @override
  String toString() {
--- a/mobile/lib/domain/models/asset/local_asset.model.dart
+++ b/mobile/lib/domain/models/asset/local_asset.model.dart
@@ -22,6 +22,9 @@ class LocalAsset extends BaseAsset {
  AssetState get storage =>
      remoteId == null ? AssetState.local : AssetState.merged;

+  @override
+  String get heroTag => '${id}_${remoteId ?? checksum}';
+
  @override
  String toString() {
    return '''LocalAsset {
--- a/mobile/lib/domain/models/asset/remote_asset.model.dart
+++ b/mobile/lib/domain/models/asset/remote_asset.model.dart
@@ -0,0 +1,115 @@
+part of 'base_asset.model.dart';
+
+enum AssetVisibility {
+  timeline,
+  hidden,
+  archive,
+  locked,
+}
+
+// Model for an asset stored in the server
+class RemoteAsset extends BaseAsset {
+  final String id;
+  final String? localId;
+  final String? thumbHash;
+  final AssetVisibility visibility;
+  final String ownerId;
+
+  const RemoteAsset({
+    required this.id,
+    this.localId,
+    required super.name,
+    required this.ownerId,
+    required super.checksum,
+    required super.type,
+    required super.createdAt,
+    required super.updatedAt,
+    super.width,
+    super.height,
+    super.durationInSeconds,
+    super.isFavorite = false,
+    this.thumbHash,
+    this.visibility = AssetVisibility.timeline,
+  });
+
+  @override
+  AssetState get storage =>
+      localId == null ? AssetState.remote : AssetState.merged;
+
+  @override
+  String get heroTag => '${localId ?? checksum}_$id';
+
+  @override
+  String toString() {
+    return '''Asset {
+    id: $id,
+    name: $name,
+    ownerId: $ownerId,
+    type: $type,
+    createdAt: $createdAt,
+    updatedAt: $updatedAt,
+    width: ${width ?? "<NA>"},
+    height: ${height ?? "<NA>"},
+    durationInSeconds: ${durationInSeconds ?? "<NA>"},
+    localId: ${localId ?? "<NA>"},
+    isFavorite: $isFavorite,
+    thumbHash: ${thumbHash ?? "<NA>"},
+    visibility: $visibility,
+ }''';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    if (other is! RemoteAsset) return false;
+    if (identical(this, other)) return true;
+    return super == other &&
+        id == other.id &&
+        ownerId == other.ownerId &&
+        localId == other.localId &&
+        thumbHash == other.thumbHash &&
+        visibility == other.visibility;
+  }
+
+  @override
+  int get hashCode =>
+      super.hashCode ^
+      id.hashCode ^
+      ownerId.hashCode ^
+      localId.hashCode ^
+      thumbHash.hashCode ^
+      visibility.hashCode;
+
+  RemoteAsset copyWith({
+    String? id,
+    String? localId,
+    String? name,
+    String? ownerId,
+    String? checksum,
+    AssetType? type,
+    DateTime? createdAt,
+    DateTime? updatedAt,
+    int? width,
+    int? height,
+    int? durationInSeconds,
+    bool? isFavorite,
+    String? thumbHash,
+    AssetVisibility? visibility,
+  }) {
+    return RemoteAsset(
+      id: id ?? this.id,
+      localId: localId ?? this.localId,
+      name: name ?? this.name,
+      ownerId: ownerId ?? this.ownerId,
+      checksum: checksum ?? this.checksum,
+      type: type ?? this.type,
+      createdAt: createdAt ?? this.createdAt,
+      updatedAt: updatedAt ?? this.updatedAt,
+      width: width ?? this.width,
+      height: height ?? this.height,
+      durationInSeconds: durationInSeconds ?? this.durationInSeconds,
+      isFavorite: isFavorite ?? this.isFavorite,
+      thumbHash: thumbHash ?? this.thumbHash,
+      visibility: visibility ?? this.visibility,
+    );
+  }
+}
--- a/mobile/lib/domain/models/exif.model.dart
+++ b/mobile/lib/domain/models/exif.model.dart
@@ -3,6 +3,8 @@ class ExifInfo {
  final int? fileSize;
  final String? description;
  final bool isFlipped;
+  final double? width;
+  final double? height;
  final String? orientation;
  final String? timeZone;
  final DateTime? dateTimeOriginal;
@@ -45,6 +47,8 @@ class ExifInfo {
    this.fileSize,
    this.description,
    this.orientation,
+    this.width,
+    this.height,
    this.timeZone,
    this.dateTimeOriginal,
    this.isFlipped = false,
@@ -68,6 +72,9 @@ class ExifInfo {

    return other.fileSize == fileSize &&
        other.description == description &&
+        other.isFlipped == isFlipped &&
+        other.width == width &&
+        other.height == height &&
        other.orientation == orientation &&
        other.timeZone == timeZone &&
        other.dateTimeOriginal == dateTimeOriginal &&
@@ -91,6 +98,9 @@ class ExifInfo {
    return fileSize.hashCode ^
        description.hashCode ^
        orientation.hashCode ^
+        isFlipped.hashCode ^
+        width.hashCode ^
+        height.hashCode ^
        timeZone.hashCode ^
        dateTimeOriginal.hashCode ^
        latitude.hashCode ^
@@ -114,6 +124,9 @@ class ExifInfo {
 fileSize: ${fileSize ?? 'NA'},
 description: ${description ?? 'NA'},
 orientation: ${orientation ?? 'NA'},
+width: ${width ?? 'NA'},
+height: ${height ?? 'NA'},
+isFlipped: $isFlipped,
 timeZone: ${timeZone ?? 'NA'},
 dateTimeOriginal: ${dateTimeOriginal ?? 'NA'},
 latitude: ${latitude ?? 'NA'},
--- a/mobile/lib/domain/models/memory.model.dart
+++ b/mobile/lib/domain/models/memory.model.dart
@@ -0,0 +1,166 @@
+// ignore_for_file: public_member_api_docs, sort_constructors_first
+import 'dart:convert';
+
+import 'package:collection/collection.dart';
+
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+
+enum MemoryTypeEnum {
+  // do not change this order!
+  onThisDay,
+}
+
+class MemoryData {
+  final int year;
+
+  const MemoryData({
+    required this.year,
+  });
+
+  MemoryData copyWith({
+    int? year,
+  }) {
+    return MemoryData(
+      year: year ?? this.year,
+    );
+  }
+
+  Map<String, dynamic> toMap() {
+    return <String, dynamic>{
+      'year': year,
+    };
+  }
+
+  factory MemoryData.fromMap(Map<String, dynamic> map) {
+    return MemoryData(
+      year: map['year'] as int,
+    );
+  }
+
+  String toJson() => json.encode(toMap());
+
+  factory MemoryData.fromJson(String source) =>
+      MemoryData.fromMap(json.decode(source) as Map<String, dynamic>);
+
+  @override
+  String toString() => 'MemoryData(year: $year)';
+
+  @override
+  bool operator ==(covariant MemoryData other) {
+    if (identical(this, other)) return true;
+
+    return other.year == year;
+  }
+
+  @override
+  int get hashCode => year.hashCode;
+}
+
+// Model for a memory stored in the server
+class DriftMemory {
+  final String id;
+  final DateTime createdAt;
+  final DateTime updatedAt;
+  final DateTime? deletedAt;
+  final String ownerId;
+
+  // enum
+  final MemoryTypeEnum type;
+  final MemoryData data;
+  final bool isSaved;
+  final DateTime memoryAt;
+  final DateTime? seenAt;
+  final DateTime? showAt;
+  final DateTime? hideAt;
+  final List<RemoteAsset> assets;
+
+  const DriftMemory({
+    required this.id,
+    required this.createdAt,
+    required this.updatedAt,
+    this.deletedAt,
+    required this.ownerId,
+    required this.type,
+    required this.data,
+    required this.isSaved,
+    required this.memoryAt,
+    this.seenAt,
+    this.showAt,
+    this.hideAt,
+    required this.assets,
+  });
+
+  DriftMemory copyWith({
+    String? id,
+    DateTime? createdAt,
+    DateTime? updatedAt,
+    DateTime? deletedAt,
+    String? ownerId,
+    MemoryTypeEnum? type,
+    MemoryData? data,
+    bool? isSaved,
+    DateTime? memoryAt,
+    DateTime? seenAt,
+    DateTime? showAt,
+    DateTime? hideAt,
+    List<RemoteAsset>? assets,
+  }) {
+    return DriftMemory(
+      id: id ?? this.id,
+      createdAt: createdAt ?? this.createdAt,
+      updatedAt: updatedAt ?? this.updatedAt,
+      deletedAt: deletedAt ?? this.deletedAt,
+      ownerId: ownerId ?? this.ownerId,
+      type: type ?? this.type,
+      data: data ?? this.data,
+      isSaved: isSaved ?? this.isSaved,
+      memoryAt: memoryAt ?? this.memoryAt,
+      seenAt: seenAt ?? this.seenAt,
+      showAt: showAt ?? this.showAt,
+      hideAt: hideAt ?? this.hideAt,
+      assets: assets ?? this.assets,
+    );
+  }
+
+  @override
+  String toString() {
+    return 'Memory(id: $id, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, ownerId: $ownerId, type: $type, data: $data, isSaved: $isSaved, memoryAt: $memoryAt, seenAt: $seenAt, showAt: $showAt, hideAt: $hideAt, assets: $assets)';
+  }
+
+  @override
+  bool operator ==(covariant DriftMemory other) {
+    if (identical(this, other)) return true;
+    final listEquals = const DeepCollectionEquality().equals;
+
+    return other.id == id &&
+        other.createdAt == createdAt &&
+        other.updatedAt == updatedAt &&
+        other.deletedAt == deletedAt &&
+        other.ownerId == ownerId &&
+        other.type == type &&
+        other.data == data &&
+        other.isSaved == isSaved &&
+        other.memoryAt == memoryAt &&
+        other.seenAt == seenAt &&
+        other.showAt == showAt &&
+        other.hideAt == hideAt &&
+        listEquals(other.assets, assets);
+  }
+
+  @override
+  int get hashCode {
+    return id.hashCode ^
+        createdAt.hashCode ^
+        updatedAt.hashCode ^
+        deletedAt.hashCode ^
+        ownerId.hashCode ^
+        type.hashCode ^
+        data.hashCode ^
+        isSaved.hashCode ^
+        memoryAt.hashCode ^
+        seenAt.hashCode ^
+        showAt.hashCode ^
+        hideAt.hashCode ^
+        assets.hashCode;
+  }
+}
--- a/mobile/lib/domain/models/setting.model.dart
+++ b/mobile/lib/domain/models/setting.model.dart
@@ -3,7 +3,11 @@ import 'package:immich_mobile/domain/models/store.model.dart';
 enum Setting<T> {
  tilesPerRow<int>(StoreKey.tilesPerRow, 4),
  groupAssetsBy<int>(StoreKey.groupAssetsBy, 0),
-  showStorageIndicator<bool>(StoreKey.storageIndicator, true);
+  showStorageIndicator<bool>(StoreKey.storageIndicator, true),
+  loadOriginal<bool>(StoreKey.loadOriginal, false),
+  preferRemoteImage<bool>(StoreKey.preferRemoteImage, false),
+  advancedTroubleshooting<bool>(StoreKey.advancedTroubleshooting, false),
+  ;

  const Setting(this.storeKey, this.defaultValue);

--- a/mobile/lib/domain/services/asset.service.dart
+++ b/mobile/lib/domain/services/asset.service.dart
@@ -0,0 +1,30 @@
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/models/exif.model.dart';
+import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/remote_asset.repository.dart';
+
+class AssetService {
+  final RemoteAssetRepository _remoteAssetRepository;
+  final DriftLocalAssetRepository _localAssetRepository;
+
+  const AssetService({
+    required RemoteAssetRepository remoteAssetRepository,
+    required DriftLocalAssetRepository localAssetRepository,
+  })  : _remoteAssetRepository = remoteAssetRepository,
+        _localAssetRepository = localAssetRepository;
+
+  Stream<BaseAsset?> watchAsset(BaseAsset asset) {
+    final id = asset is LocalAsset ? asset.id : (asset as RemoteAsset).id;
+    return asset is LocalAsset
+        ? _localAssetRepository.watchAsset(id)
+        : _remoteAssetRepository.watchAsset(id);
+  }
+
+  Future<ExifInfo?> getExif(BaseAsset asset) async {
+    if (asset is LocalAsset || asset is! RemoteAsset) {
+      return null;
+    }
+
+    return _remoteAssetRepository.getExif(asset.id);
+  }
+}
--- a/mobile/lib/domain/services/memory.service.dart
+++ b/mobile/lib/domain/services/memory.service.dart
@@ -0,0 +1,15 @@
+import 'package:immich_mobile/domain/models/memory.model.dart';
+import 'package:immich_mobile/infrastructure/repositories/memory.repository.dart';
+import 'package:logging/logging.dart';
+
+class DriftMemoryService {
+  final log = Logger("DriftMemoryService");
+
+  final DriftMemoryRepository _repository;
+
+  DriftMemoryService(this._repository);
+
+  Future<List<DriftMemory>> getMemoryLane(String ownerId) {
+    return _repository.getAll(ownerId);
+  }
+}
--- a/mobile/lib/domain/services/remote_album.service.dart
+++ b/mobile/lib/domain/services/remote_album.service.dart
@@ -0,0 +1,60 @@
+import 'package:immich_mobile/domain/models/album/album.model.dart';
+import 'package:immich_mobile/infrastructure/repositories/remote_album.repository.dart';
+import 'package:immich_mobile/models/albums/album_search.model.dart';
+import 'package:immich_mobile/utils/remote_album.utils.dart';
+
+class RemoteAlbumService {
+  final DriftRemoteAlbumRepository _repository;
+
+  const RemoteAlbumService(this._repository);
+
+  Future<List<Album>> getAll() {
+    return _repository.getAll();
+  }
+
+  List<Album> sortAlbums(
+    List<Album> albums,
+    RemoteAlbumSortMode sortMode, {
+    bool isReverse = false,
+  }) {
+    return sortMode.sortFn(albums, isReverse);
+  }
+
+  List<Album> searchAlbums(
+    List<Album> albums,
+    String query,
+    String? userId, [
+    QuickFilterMode filterMode = QuickFilterMode.all,
+  ]) {
+    final lowerQuery = query.toLowerCase();
+    List<Album> filtered = albums;
+
+    // Apply text search filter
+    if (query.isNotEmpty) {
+      filtered = filtered
+          .where(
+            (album) =>
+                album.name.toLowerCase().contains(lowerQuery) ||
+                album.description.toLowerCase().contains(lowerQuery),
+          )
+          .toList();
+    }
+
+    if (userId != null) {
+      switch (filterMode) {
+        case QuickFilterMode.myAlbums:
+          filtered =
+              filtered.where((album) => album.ownerId == userId).toList();
+          break;
+        case QuickFilterMode.sharedWithMe:
+          filtered =
+              filtered.where((album) => album.ownerId != userId).toList();
+          break;
+        case QuickFilterMode.all:
+          break;
+      }
+    }
+
+    return filtered;
+  }
+}
--- a/mobile/lib/domain/services/setting.service.dart
+++ b/mobile/lib/domain/services/setting.service.dart
@@ -1,6 +1,11 @@
 import 'package:immich_mobile/domain/models/setting.model.dart';
 import 'package:immich_mobile/domain/services/store.service.dart';

+// Singleton instance of SettingsService, to use in places
+// where reactivity is not required
+// ignore: non_constant_identifier_names
+final AppSetting = SettingsService(storeService: StoreService.I);
+
 class SettingsService {
  final StoreService _storeService;

--- a/mobile/lib/domain/services/sync_stream.service.dart
+++ b/mobile/lib/domain/services/sync_stream.service.dart
@@ -146,6 +146,14 @@ class SyncStreamService {
      // to acknowledge that the client has processed all the backfill events
      case SyncEntityType.syncAckV1:
        return;
+      case SyncEntityType.memoryV1:
+        return _syncStreamRepository.updateMemoriesV1(data.cast());
+      case SyncEntityType.memoryDeleteV1:
+        return _syncStreamRepository.deleteMemoriesV1(data.cast());
+      case SyncEntityType.memoryToAssetV1:
+        return _syncStreamRepository.updateMemoryAssetsV1(data.cast());
+      case SyncEntityType.memoryToAssetDeleteV1:
+        return _syncStreamRepository.deleteMemoryAssetsV1(data.cast());
      default:
        _logger.warning("Unknown sync data type: $type");
    }
--- a/mobile/lib/domain/services/timeline.service.dart
+++ b/mobile/lib/domain/services/timeline.service.dart
@@ -7,6 +7,7 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/setting.model.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/domain/services/setting.service.dart';
+import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/infrastructure/repositories/timeline.repository.dart';
 import 'package:immich_mobile/utils/async_mutex.dart';

@@ -57,14 +58,19 @@ class TimelineFactory {
 class TimelineService {
  final TimelineAssetSource _assetSource;
  final TimelineBucketSource _bucketSource;
+  int _totalAssets = 0;
+  int get totalAssets => _totalAssets;

  TimelineService({
    required TimelineAssetSource assetSource,
    required TimelineBucketSource bucketSource,
  })  : _assetSource = assetSource,
        _bucketSource = bucketSource {
-    _bucketSubscription =
-        _bucketSource().listen((_) => unawaited(_reloadBucket()));
+    _bucketSubscription = _bucketSource().listen((buckets) {
+      _totalAssets =
+          buckets.fold<int>(0, (acc, bucket) => acc + bucket.assetCount);
+      unawaited(_reloadBucket());
+    });
  }

  final AsyncMutex _mutex = AsyncMutex();
@@ -76,6 +82,7 @@ class TimelineService {

  Future<void> _reloadBucket() => _mutex.run(() async {
        _buffer = await _assetSource(_bufferOffset, _buffer.length);
+        EventStream.shared.emit(const TimelineReloadEvent());
      });

  Future<List<BaseAsset>> loadAssets(int index, int count) =>
@@ -117,6 +124,7 @@ class TimelineService {
      index >= _bufferOffset && index + count <= _bufferOffset + _buffer.length;

  List<BaseAsset> getAssets(int index, int count) {
+    assert(index + count <= totalAssets);
    if (!hasRange(index, count)) {
      throw RangeError('TimelineService::getAssets Index out of range');
    }
@@ -124,6 +132,17 @@ class TimelineService {
    return _buffer.slice(start, start + count);
  }

+  // Pre-cache assets around the given index for asset viewer
+  Future<void> preCacheAssets(int index) =>
+      _mutex.run(() => _loadAssets(index, 5));
+
+  BaseAsset getAsset(int index) {
+    if (!hasRange(index, 1)) {
+      throw RangeError('TimelineService::getAsset Index out of range');
+    }
+    return _buffer.elementAt(index - _bufferOffset);
+  }
+
  Future<void> dispose() async {
    await _bucketSubscription?.cancel();
    _bucketSubscription = null;
--- a/mobile/lib/domain/utils/background_sync.dart
+++ b/mobile/lib/domain/utils/background_sync.dart
@@ -9,8 +9,57 @@ class BackgroundSyncManager {
  Cancelable<void>? _deviceAlbumSyncTask;
  Cancelable<void>? _hashTask;

+  Completer<void>? _localSyncMutex;
+  Completer<void>? _remoteSyncMutex;
+  Completer<void>? _hashMutex;
+
  BackgroundSyncManager();

+  Future<T> _withMutex<T>(
+    Completer<void>? Function() getMutex,
+    void Function(Completer<void>?) setMutex,
+    Future<T> Function() operation,
+  ) async {
+    while (getMutex() != null) {
+      await getMutex()!.future;
+    }
+
+    final mutex = Completer<void>();
+    setMutex(mutex);
+
+    try {
+      final result = await operation();
+      return result;
+    } finally {
+      setMutex(null);
+      mutex.complete();
+    }
+  }
+
+  Future<T> _withLocalSyncMutex<T>(Future<T> Function() operation) {
+    return _withMutex(
+      () => _localSyncMutex,
+      (mutex) => _localSyncMutex = mutex,
+      operation,
+    );
+  }
+
+  Future<T> _withRemoteSyncMutex<T>(Future<T> Function() operation) {
+    return _withMutex(
+      () => _remoteSyncMutex,
+      (mutex) => _remoteSyncMutex = mutex,
+      operation,
+    );
+  }
+
+  Future<T> _withHashMutex<T>(Future<T> Function() operation) {
+    return _withMutex(
+      () => _hashMutex,
+      (mutex) => _hashMutex = mutex,
+      operation,
+    );
+  }
+
  Future<void> cancel() {
    final futures = <Future>[];

@@ -25,51 +74,57 @@ class BackgroundSyncManager {

  // No need to cancel the task, as it can also be run when the user logs out
  Future<void> syncLocal({bool full = false}) {
-    if (_deviceAlbumSyncTask != null) {
-      return _deviceAlbumSyncTask!.future;
-    }
+    return _withLocalSyncMutex(() async {
+      if (_deviceAlbumSyncTask != null) {
+        return _deviceAlbumSyncTask!.future;
+      }

-    // We use a ternary operator to avoid [_deviceAlbumSyncTask] from being
-    // captured by the closure passed to [runInIsolateGentle].
-    _deviceAlbumSyncTask = full
-        ? runInIsolateGentle(
-            computation: (ref) =>
-                ref.read(localSyncServiceProvider).sync(full: true),
-          )
-        : runInIsolateGentle(
-            computation: (ref) =>
-                ref.read(localSyncServiceProvider).sync(full: false),
-          );
+      // We use a ternary operator to avoid [_deviceAlbumSyncTask] from being
+      // captured by the closure passed to [runInIsolateGentle].
+      _deviceAlbumSyncTask = full
+          ? runInIsolateGentle(
+              computation: (ref) =>
+                  ref.read(localSyncServiceProvider).sync(full: true),
+            )
+          : runInIsolateGentle(
+              computation: (ref) =>
+                  ref.read(localSyncServiceProvider).sync(full: false),
+            );

-    return _deviceAlbumSyncTask!.whenComplete(() {
-      _deviceAlbumSyncTask = null;
+      return _deviceAlbumSyncTask!.whenComplete(() {
+        _deviceAlbumSyncTask = null;
+      });
    });
  }

 // No need to cancel the task, as it can also be run when the user logs out
  Future<void> hashAssets() {
-    if (_hashTask != null) {
-      return _hashTask!.future;
-    }
+    return _withHashMutex(() async {
+      if (_hashTask != null) {
+        return _hashTask!.future;
+      }

-    _hashTask = runInIsolateGentle(
-      computation: (ref) => ref.read(hashServiceProvider).hashAssets(),
-    );
-    return _hashTask!.whenComplete(() {
-      _hashTask = null;
+      _hashTask = runInIsolateGentle(
+        computation: (ref) => ref.read(hashServiceProvider).hashAssets(),
+      );
+      return _hashTask!.whenComplete(() {
+        _hashTask = null;
+      });
    });
  }

  Future<void> syncRemote() {
-    if (_syncTask != null) {
-      return _syncTask!.future;
-    }
+    return _withRemoteSyncMutex(() async {
+      if (_syncTask != null) {
+        return _syncTask!.future;
+      }

-    _syncTask = runInIsolateGentle(
-      computation: (ref) => ref.read(syncStreamServiceProvider).sync(),
-    );
-    return _syncTask!.whenComplete(() {
-      _syncTask = null;
+      _syncTask = runInIsolateGentle(
+        computation: (ref) => ref.read(syncStreamServiceProvider).sync(),
+      );
+      return _syncTask!.whenComplete(() {
+        _syncTask = null;
+      });
    });
  }
 }
--- a/mobile/lib/domain/utils/event_stream.dart
+++ b/mobile/lib/domain/utils/event_stream.dart
@@ -0,0 +1,52 @@
+import 'dart:async';
+
+sealed class Event {
+  const Event();
+}
+
+class TimelineReloadEvent extends Event {
+  const TimelineReloadEvent();
+}
+
+class ViewerOpenBottomSheetEvent extends Event {
+  const ViewerOpenBottomSheetEvent();
+}
+
+class EventStream {
+  EventStream._();
+
+  static final EventStream shared = EventStream._();
+
+  final StreamController<Event> _controller =
+      StreamController<Event>.broadcast();
+
+  void emit(Event event) {
+    _controller.add(event);
+  }
+
+  Stream<T> where<T extends Event>() {
+    if (T == Event) {
+      return _controller.stream as Stream<T>;
+    }
+    return _controller.stream.where((event) => event is T).cast<T>();
+  }
+
+  StreamSubscription<T> listen<T extends Event>(
+    void Function(T event)? onData, {
+    Function? onError,
+    void Function()? onDone,
+    bool? cancelOnError,
+  }) {
+    return where<T>().listen(
+      onData,
+      onError: onError,
+      onDone: onDone,
+      cancelOnError: cancelOnError,
+    );
+  }
+
+  /// Closes the stream controller
+  void dispose() {
+    _controller.close();
+  }
+}
--- a/mobile/lib/infrastructure/entities/exif.entity.dart
+++ b/mobile/lib/infrastructure/entities/exif.entity.dart
@@ -1,5 +1,6 @@
 import 'package:drift/drift.dart' hide Query;
 import 'package:immich_mobile/domain/models/exif.model.dart' as domain;
+import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
 import 'package:immich_mobile/infrastructure/utils/exif.converter.dart';
@@ -116,15 +117,15 @@ class RemoteExifEntity extends Table with DriftDefaultsMixin {

  TextColumn get exposureTime => text().nullable()();

-  IntColumn get fNumber => integer().nullable()();
+  RealColumn get fNumber => real().nullable()();

  IntColumn get fileSize => integer().nullable()();

-  IntColumn get focalLength => integer().nullable()();
+  RealColumn get focalLength => real().nullable()();

-  IntColumn get latitude => integer().nullable()();
+  RealColumn get latitude => real().nullable()();

-  IntColumn get longitude => integer().nullable()();
+  RealColumn get longitude => real().nullable()();

  IntColumn get iso => integer().nullable()();

@@ -132,6 +133,8 @@ class RemoteExifEntity extends Table with DriftDefaultsMixin {

  TextColumn get model => text().nullable()();

+  TextColumn get lens => text().nullable()();
+
  TextColumn get orientation => text().nullable()();

  TextColumn get timeZone => text().nullable()();
@@ -143,3 +146,27 @@ class RemoteExifEntity extends Table with DriftDefaultsMixin {
  @override
  Set<Column> get primaryKey => {assetId};
 }
+
+extension RemoteExifEntityDataDomainEx on RemoteExifEntityData {
+  domain.ExifInfo toDto() => domain.ExifInfo(
+        fileSize: fileSize,
+        dateTimeOriginal: dateTimeOriginal,
+        timeZone: timeZone,
+        make: make,
+        model: model,
+        iso: iso,
+        city: city,
+        state: state,
+        country: country,
+        description: description,
+        orientation: orientation,
+        latitude: latitude,
+        longitude: longitude,
+        f: fNumber?.toDouble(),
+        mm: focalLength?.toDouble(),
+        lens: lens,
+        width: width?.toDouble(),
+        height: height?.toDouble(),
+        isFlipped: ExifDtoConverter.isOrientationFlipped(orientation),
+      );
+}
--- a/mobile/lib/infrastructure/entities/exif.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/exif.entity.drift.dart
@@ -19,14 +19,15 @@ typedef $$RemoteExifEntityTableCreateCompanionBuilder
  i0.Value<int?> height,
  i0.Value<int?> width,
  i0.Value<String?> exposureTime,
-  i0.Value<int?> fNumber,
+  i0.Value<double?> fNumber,
  i0.Value<int?> fileSize,
-  i0.Value<int?> focalLength,
-  i0.Value<int?> latitude,
-  i0.Value<int?> longitude,
+  i0.Value<double?> focalLength,
+  i0.Value<double?> latitude,
+  i0.Value<double?> longitude,
  i0.Value<int?> iso,
  i0.Value<String?> make,
  i0.Value<String?> model,
+  i0.Value<String?> lens,
  i0.Value<String?> orientation,
  i0.Value<String?> timeZone,
  i0.Value<int?> rating,
@@ -43,14 +44,15 @@ typedef $$RemoteExifEntityTableUpdateCompanionBuilder
  i0.Value<int?> height,
  i0.Value<int?> width,
  i0.Value<String?> exposureTime,
-  i0.Value<int?> fNumber,
+  i0.Value<double?> fNumber,
  i0.Value<int?> fileSize,
-  i0.Value<int?> focalLength,
-  i0.Value<int?> latitude,
-  i0.Value<int?> longitude,
+  i0.Value<double?> focalLength,
+  i0.Value<double?> latitude,
+  i0.Value<double?> longitude,
  i0.Value<int?> iso,
  i0.Value<String?> make,
  i0.Value<String?> model,
+  i0.Value<String?> lens,
  i0.Value<String?> orientation,
  i0.Value<String?> timeZone,
  i0.Value<int?> rating,
@@ -125,20 +127,20 @@ class $$RemoteExifEntityTableFilterComposer
      column: $table.exposureTime,
      builder: (column) => i0.ColumnFilters(column));

-  i0.ColumnFilters<int> get fNumber => $composableBuilder(
+  i0.ColumnFilters<double> get fNumber => $composableBuilder(
      column: $table.fNumber, builder: (column) => i0.ColumnFilters(column));

  i0.ColumnFilters<int> get fileSize => $composableBuilder(
      column: $table.fileSize, builder: (column) => i0.ColumnFilters(column));

-  i0.ColumnFilters<int> get focalLength => $composableBuilder(
+  i0.ColumnFilters<double> get focalLength => $composableBuilder(
      column: $table.focalLength,
      builder: (column) => i0.ColumnFilters(column));

-  i0.ColumnFilters<int> get latitude => $composableBuilder(
+  i0.ColumnFilters<double> get latitude => $composableBuilder(
      column: $table.latitude, builder: (column) => i0.ColumnFilters(column));

-  i0.ColumnFilters<int> get longitude => $composableBuilder(
+  i0.ColumnFilters<double> get longitude => $composableBuilder(
      column: $table.longitude, builder: (column) => i0.ColumnFilters(column));

  i0.ColumnFilters<int> get iso => $composableBuilder(
@@ -150,6 +152,9 @@ class $$RemoteExifEntityTableFilterComposer
  i0.ColumnFilters<String> get model => $composableBuilder(
      column: $table.model, builder: (column) => i0.ColumnFilters(column));

+  i0.ColumnFilters<String> get lens => $composableBuilder(
+      column: $table.lens, builder: (column) => i0.ColumnFilters(column));
+
  i0.ColumnFilters<String> get orientation => $composableBuilder(
      column: $table.orientation,
      builder: (column) => i0.ColumnFilters(column));
@@ -223,20 +228,20 @@ class $$RemoteExifEntityTableOrderingComposer
      column: $table.exposureTime,
      builder: (column) => i0.ColumnOrderings(column));

-  i0.ColumnOrderings<int> get fNumber => $composableBuilder(
+  i0.ColumnOrderings<double> get fNumber => $composableBuilder(
      column: $table.fNumber, builder: (column) => i0.ColumnOrderings(column));

  i0.ColumnOrderings<int> get fileSize => $composableBuilder(
      column: $table.fileSize, builder: (column) => i0.ColumnOrderings(column));

-  i0.ColumnOrderings<int> get focalLength => $composableBuilder(
+  i0.ColumnOrderings<double> get focalLength => $composableBuilder(
      column: $table.focalLength,
      builder: (column) => i0.ColumnOrderings(column));

-  i0.ColumnOrderings<int> get latitude => $composableBuilder(
+  i0.ColumnOrderings<double> get latitude => $composableBuilder(
      column: $table.latitude, builder: (column) => i0.ColumnOrderings(column));

-  i0.ColumnOrderings<int> get longitude => $composableBuilder(
+  i0.ColumnOrderings<double> get longitude => $composableBuilder(
      column: $table.longitude,
      builder: (column) => i0.ColumnOrderings(column));

@@ -249,6 +254,9 @@ class $$RemoteExifEntityTableOrderingComposer
  i0.ColumnOrderings<String> get model => $composableBuilder(
      column: $table.model, builder: (column) => i0.ColumnOrderings(column));

+  i0.ColumnOrderings<String> get lens => $composableBuilder(
+      column: $table.lens, builder: (column) => i0.ColumnOrderings(column));
+
  i0.ColumnOrderings<String> get orientation => $composableBuilder(
      column: $table.orientation,
      builder: (column) => i0.ColumnOrderings(column));
@@ -321,19 +329,19 @@ class $$RemoteExifEntityTableAnnotationComposer
  i0.GeneratedColumn<String> get exposureTime => $composableBuilder(
      column: $table.exposureTime, builder: (column) => column);

-  i0.GeneratedColumn<int> get fNumber =>
+  i0.GeneratedColumn<double> get fNumber =>
      $composableBuilder(column: $table.fNumber, builder: (column) => column);

  i0.GeneratedColumn<int> get fileSize =>
      $composableBuilder(column: $table.fileSize, builder: (column) => column);

-  i0.GeneratedColumn<int> get focalLength => $composableBuilder(
+  i0.GeneratedColumn<double> get focalLength => $composableBuilder(
      column: $table.focalLength, builder: (column) => column);

-  i0.GeneratedColumn<int> get latitude =>
+  i0.GeneratedColumn<double> get latitude =>
      $composableBuilder(column: $table.latitude, builder: (column) => column);

-  i0.GeneratedColumn<int> get longitude =>
+  i0.GeneratedColumn<double> get longitude =>
      $composableBuilder(column: $table.longitude, builder: (column) => column);

  i0.GeneratedColumn<int> get iso =>
@@ -345,6 +353,9 @@ class $$RemoteExifEntityTableAnnotationComposer
  i0.GeneratedColumn<String> get model =>
      $composableBuilder(column: $table.model, builder: (column) => column);

+  i0.GeneratedColumn<String> get lens =>
+      $composableBuilder(column: $table.lens, builder: (column) => column);
+
  i0.GeneratedColumn<String> get orientation => $composableBuilder(
      column: $table.orientation, builder: (column) => column);

@@ -416,14 +427,15 @@ class $$RemoteExifEntityTableTableManager extends i0.RootTableManager<
            i0.Value<int?> height = const i0.Value.absent(),
            i0.Value<int?> width = const i0.Value.absent(),
            i0.Value<String?> exposureTime = const i0.Value.absent(),
-            i0.Value<int?> fNumber = const i0.Value.absent(),
+            i0.Value<double?> fNumber = const i0.Value.absent(),
            i0.Value<int?> fileSize = const i0.Value.absent(),
-            i0.Value<int?> focalLength = const i0.Value.absent(),
-            i0.Value<int?> latitude = const i0.Value.absent(),
-            i0.Value<int?> longitude = const i0.Value.absent(),
+            i0.Value<double?> focalLength = const i0.Value.absent(),
+            i0.Value<double?> latitude = const i0.Value.absent(),
+            i0.Value<double?> longitude = const i0.Value.absent(),
            i0.Value<int?> iso = const i0.Value.absent(),
            i0.Value<String?> make = const i0.Value.absent(),
            i0.Value<String?> model = const i0.Value.absent(),
+            i0.Value<String?> lens = const i0.Value.absent(),
            i0.Value<String?> orientation = const i0.Value.absent(),
            i0.Value<String?> timeZone = const i0.Value.absent(),
            i0.Value<int?> rating = const i0.Value.absent(),
@@ -447,6 +459,7 @@ class $$RemoteExifEntityTableTableManager extends i0.RootTableManager<
            iso: iso,
            make: make,
            model: model,
+            lens: lens,
            orientation: orientation,
            timeZone: timeZone,
            rating: rating,
@@ -462,14 +475,15 @@ class $$RemoteExifEntityTableTableManager extends i0.RootTableManager<
            i0.Value<int?> height = const i0.Value.absent(),
            i0.Value<int?> width = const i0.Value.absent(),
            i0.Value<String?> exposureTime = const i0.Value.absent(),
-            i0.Value<int?> fNumber = const i0.Value.absent(),
+            i0.Value<double?> fNumber = const i0.Value.absent(),
            i0.Value<int?> fileSize = const i0.Value.absent(),
-            i0.Value<int?> focalLength = const i0.Value.absent(),
-            i0.Value<int?> latitude = const i0.Value.absent(),
-            i0.Value<int?> longitude = const i0.Value.absent(),
+            i0.Value<double?> focalLength = const i0.Value.absent(),
+            i0.Value<double?> latitude = const i0.Value.absent(),
+            i0.Value<double?> longitude = const i0.Value.absent(),
            i0.Value<int?> iso = const i0.Value.absent(),
            i0.Value<String?> make = const i0.Value.absent(),
            i0.Value<String?> model = const i0.Value.absent(),
+            i0.Value<String?> lens = const i0.Value.absent(),
            i0.Value<String?> orientation = const i0.Value.absent(),
            i0.Value<String?> timeZone = const i0.Value.absent(),
            i0.Value<int?> rating = const i0.Value.absent(),
@@ -493,6 +507,7 @@ class $$RemoteExifEntityTableTableManager extends i0.RootTableManager<
            iso: iso,
            make: make,
            model: model,
+            lens: lens,
            orientation: orientation,
            timeZone: timeZone,
            rating: rating,
@@ -622,9 +637,9 @@ class $RemoteExifEntityTable extends i2.RemoteExifEntity
  static const i0.VerificationMeta _fNumberMeta =
      const i0.VerificationMeta('fNumber');
  @override
-  late final i0.GeneratedColumn<int> fNumber = i0.GeneratedColumn<int>(
+  late final i0.GeneratedColumn<double> fNumber = i0.GeneratedColumn<double>(
      'f_number', aliasedName, true,
-      type: i0.DriftSqlType.int, requiredDuringInsert: false);
+      type: i0.DriftSqlType.double, requiredDuringInsert: false);
  static const i0.VerificationMeta _fileSizeMeta =
      const i0.VerificationMeta('fileSize');
  @override
@@ -634,21 +649,21 @@ class $RemoteExifEntityTable extends i2.RemoteExifEntity
  static const i0.VerificationMeta _focalLengthMeta =
      const i0.VerificationMeta('focalLength');
  @override
-  late final i0.GeneratedColumn<int> focalLength = i0.GeneratedColumn<int>(
-      'focal_length', aliasedName, true,
-      type: i0.DriftSqlType.int, requiredDuringInsert: false);
+  late final i0.GeneratedColumn<double> focalLength =
+      i0.GeneratedColumn<double>('focal_length', aliasedName, true,
+          type: i0.DriftSqlType.double, requiredDuringInsert: false);
  static const i0.VerificationMeta _latitudeMeta =
      const i0.VerificationMeta('latitude');
  @override
-  late final i0.GeneratedColumn<int> latitude = i0.GeneratedColumn<int>(
+  late final i0.GeneratedColumn<double> latitude = i0.GeneratedColumn<double>(
      'latitude', aliasedName, true,
-      type: i0.DriftSqlType.int, requiredDuringInsert: false);
+      type: i0.DriftSqlType.double, requiredDuringInsert: false);
  static const i0.VerificationMeta _longitudeMeta =
      const i0.VerificationMeta('longitude');
  @override
-  late final i0.GeneratedColumn<int> longitude = i0.GeneratedColumn<int>(
+  late final i0.GeneratedColumn<double> longitude = i0.GeneratedColumn<double>(
      'longitude', aliasedName, true,
-      type: i0.DriftSqlType.int, requiredDuringInsert: false);
+      type: i0.DriftSqlType.double, requiredDuringInsert: false);
  static const i0.VerificationMeta _isoMeta = const i0.VerificationMeta('iso');
  @override
  late final i0.GeneratedColumn<int> iso = i0.GeneratedColumn<int>(
@@ -666,6 +681,12 @@ class $RemoteExifEntityTable extends i2.RemoteExifEntity
  late final i0.GeneratedColumn<String> model = i0.GeneratedColumn<String>(
      'model', aliasedName, true,
      type: i0.DriftSqlType.string, requiredDuringInsert: false);
+  static const i0.VerificationMeta _lensMeta =
+      const i0.VerificationMeta('lens');
+  @override
+  late final i0.GeneratedColumn<String> lens = i0.GeneratedColumn<String>(
+      'lens', aliasedName, true,
+      type: i0.DriftSqlType.string, requiredDuringInsert: false);
  static const i0.VerificationMeta _orientationMeta =
      const i0.VerificationMeta('orientation');
  @override
@@ -709,6 +730,7 @@ class $RemoteExifEntityTable extends i2.RemoteExifEntity
        iso,
        make,
        model,
+        lens,
        orientation,
        timeZone,
        rating,
@@ -803,6 +825,10 @@ class $RemoteExifEntityTable extends i2.RemoteExifEntity
      context.handle(
          _modelMeta, model.isAcceptableOrUnknown(data['model']!, _modelMeta));
    }
+    if (data.containsKey('lens')) {
+      context.handle(
+          _lensMeta, lens.isAcceptableOrUnknown(data['lens']!, _lensMeta));
+    }
    if (data.containsKey('orientation')) {
      context.handle(
          _orientationMeta,
@@ -853,21 +879,23 @@ class $RemoteExifEntityTable extends i2.RemoteExifEntity
      exposureTime: attachedDatabase.typeMapping.read(
          i0.DriftSqlType.string, data['${effectivePrefix}exposure_time']),
      fNumber: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.int, data['${effectivePrefix}f_number']),
+          .read(i0.DriftSqlType.double, data['${effectivePrefix}f_number']),
      fileSize: attachedDatabase.typeMapping
          .read(i0.DriftSqlType.int, data['${effectivePrefix}file_size']),
      focalLength: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.int, data['${effectivePrefix}focal_length']),
+          .read(i0.DriftSqlType.double, data['${effectivePrefix}focal_length']),
      latitude: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.int, data['${effectivePrefix}latitude']),
+          .read(i0.DriftSqlType.double, data['${effectivePrefix}latitude']),
      longitude: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.int, data['${effectivePrefix}longitude']),
+          .read(i0.DriftSqlType.double, data['${effectivePrefix}longitude']),
      iso: attachedDatabase.typeMapping
          .read(i0.DriftSqlType.int, data['${effectivePrefix}iso']),
      make: attachedDatabase.typeMapping
          .read(i0.DriftSqlType.string, data['${effectivePrefix}make']),
      model: attachedDatabase.typeMapping
          .read(i0.DriftSqlType.string, data['${effectivePrefix}model']),
+      lens: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}lens']),
      orientation: attachedDatabase.typeMapping
          .read(i0.DriftSqlType.string, data['${effectivePrefix}orientation']),
      timeZone: attachedDatabase.typeMapping
@@ -901,14 +929,15 @@ class RemoteExifEntityData extends i0.DataClass
  final int? height;
  final int? width;
  final String? exposureTime;
-  final int? fNumber;
+  final double? fNumber;
  final int? fileSize;
-  final int? focalLength;
-  final int? latitude;
-  final int? longitude;
+  final double? focalLength;
+  final double? latitude;
+  final double? longitude;
  final int? iso;
  final String? make;
  final String? model;
+  final String? lens;
  final String? orientation;
  final String? timeZone;
  final int? rating;
@@ -931,6 +960,7 @@ class RemoteExifEntityData extends i0.DataClass
      this.iso,
      this.make,
      this.model,
+      this.lens,
      this.orientation,
      this.timeZone,
      this.rating,
@@ -964,19 +994,19 @@ class RemoteExifEntityData extends i0.DataClass
      map['exposure_time'] = i0.Variable<String>(exposureTime);
    }
    if (!nullToAbsent || fNumber != null) {
-      map['f_number'] = i0.Variable<int>(fNumber);
+      map['f_number'] = i0.Variable<double>(fNumber);
    }
    if (!nullToAbsent || fileSize != null) {
      map['file_size'] = i0.Variable<int>(fileSize);
    }
    if (!nullToAbsent || focalLength != null) {
-      map['focal_length'] = i0.Variable<int>(focalLength);
+      map['focal_length'] = i0.Variable<double>(focalLength);
    }
    if (!nullToAbsent || latitude != null) {
-      map['latitude'] = i0.Variable<int>(latitude);
+      map['latitude'] = i0.Variable<double>(latitude);
    }
    if (!nullToAbsent || longitude != null) {
-      map['longitude'] = i0.Variable<int>(longitude);
+      map['longitude'] = i0.Variable<double>(longitude);
    }
    if (!nullToAbsent || iso != null) {
      map['iso'] = i0.Variable<int>(iso);
@@ -987,6 +1017,9 @@ class RemoteExifEntityData extends i0.DataClass
    if (!nullToAbsent || model != null) {
      map['model'] = i0.Variable<String>(model);
    }
+    if (!nullToAbsent || lens != null) {
+      map['lens'] = i0.Variable<String>(lens);
+    }
    if (!nullToAbsent || orientation != null) {
      map['orientation'] = i0.Variable<String>(orientation);
    }
@@ -1016,14 +1049,15 @@ class RemoteExifEntityData extends i0.DataClass
      height: serializer.fromJson<int?>(json['height']),
      width: serializer.fromJson<int?>(json['width']),
      exposureTime: serializer.fromJson<String?>(json['exposureTime']),
-      fNumber: serializer.fromJson<int?>(json['fNumber']),
+      fNumber: serializer.fromJson<double?>(json['fNumber']),
      fileSize: serializer.fromJson<int?>(json['fileSize']),
-      focalLength: serializer.fromJson<int?>(json['focalLength']),
-      latitude: serializer.fromJson<int?>(json['latitude']),
-      longitude: serializer.fromJson<int?>(json['longitude']),
+      focalLength: serializer.fromJson<double?>(json['focalLength']),
+      latitude: serializer.fromJson<double?>(json['latitude']),
+      longitude: serializer.fromJson<double?>(json['longitude']),
      iso: serializer.fromJson<int?>(json['iso']),
      make: serializer.fromJson<String?>(json['make']),
      model: serializer.fromJson<String?>(json['model']),
+      lens: serializer.fromJson<String?>(json['lens']),
      orientation: serializer.fromJson<String?>(json['orientation']),
      timeZone: serializer.fromJson<String?>(json['timeZone']),
      rating: serializer.fromJson<int?>(json['rating']),
@@ -1043,14 +1077,15 @@ class RemoteExifEntityData extends i0.DataClass
      'height': serializer.toJson<int?>(height),
      'width': serializer.toJson<int?>(width),
      'exposureTime': serializer.toJson<String?>(exposureTime),
-      'fNumber': serializer.toJson<int?>(fNumber),
+      'fNumber': serializer.toJson<double?>(fNumber),
      'fileSize': serializer.toJson<int?>(fileSize),
-      'focalLength': serializer.toJson<int?>(focalLength),
-      'latitude': serializer.toJson<int?>(latitude),
-      'longitude': serializer.toJson<int?>(longitude),
+      'focalLength': serializer.toJson<double?>(focalLength),
+      'latitude': serializer.toJson<double?>(latitude),
+      'longitude': serializer.toJson<double?>(longitude),
      'iso': serializer.toJson<int?>(iso),
      'make': serializer.toJson<String?>(make),
      'model': serializer.toJson<String?>(model),
+      'lens': serializer.toJson<String?>(lens),
      'orientation': serializer.toJson<String?>(orientation),
      'timeZone': serializer.toJson<String?>(timeZone),
      'rating': serializer.toJson<int?>(rating),
@@ -1068,14 +1103,15 @@ class RemoteExifEntityData extends i0.DataClass
          i0.Value<int?> height = const i0.Value.absent(),
          i0.Value<int?> width = const i0.Value.absent(),
          i0.Value<String?> exposureTime = const i0.Value.absent(),
-          i0.Value<int?> fNumber = const i0.Value.absent(),
+          i0.Value<double?> fNumber = const i0.Value.absent(),
          i0.Value<int?> fileSize = const i0.Value.absent(),
-          i0.Value<int?> focalLength = const i0.Value.absent(),
-          i0.Value<int?> latitude = const i0.Value.absent(),
-          i0.Value<int?> longitude = const i0.Value.absent(),
+          i0.Value<double?> focalLength = const i0.Value.absent(),
+          i0.Value<double?> latitude = const i0.Value.absent(),
+          i0.Value<double?> longitude = const i0.Value.absent(),
          i0.Value<int?> iso = const i0.Value.absent(),
          i0.Value<String?> make = const i0.Value.absent(),
          i0.Value<String?> model = const i0.Value.absent(),
+          i0.Value<String?> lens = const i0.Value.absent(),
          i0.Value<String?> orientation = const i0.Value.absent(),
          i0.Value<String?> timeZone = const i0.Value.absent(),
          i0.Value<int?> rating = const i0.Value.absent(),
@@ -1101,6 +1137,7 @@ class RemoteExifEntityData extends i0.DataClass
        iso: iso.present ? iso.value : this.iso,
        make: make.present ? make.value : this.make,
        model: model.present ? model.value : this.model,
+        lens: lens.present ? lens.value : this.lens,
        orientation: orientation.present ? orientation.value : this.orientation,
        timeZone: timeZone.present ? timeZone.value : this.timeZone,
        rating: rating.present ? rating.value : this.rating,
@@ -1132,6 +1169,7 @@ class RemoteExifEntityData extends i0.DataClass
      iso: data.iso.present ? data.iso.value : this.iso,
      make: data.make.present ? data.make.value : this.make,
      model: data.model.present ? data.model.value : this.model,
+      lens: data.lens.present ? data.lens.value : this.lens,
      orientation:
          data.orientation.present ? data.orientation.value : this.orientation,
      timeZone: data.timeZone.present ? data.timeZone.value : this.timeZone,
@@ -1162,6 +1200,7 @@ class RemoteExifEntityData extends i0.DataClass
          ..write('iso: $iso, ')
          ..write('make: $make, ')
          ..write('model: $model, ')
+          ..write('lens: $lens, ')
          ..write('orientation: $orientation, ')
          ..write('timeZone: $timeZone, ')
          ..write('rating: $rating, ')
@@ -1189,6 +1228,7 @@ class RemoteExifEntityData extends i0.DataClass
        iso,
        make,
        model,
+        lens,
        orientation,
        timeZone,
        rating,
@@ -1215,6 +1255,7 @@ class RemoteExifEntityData extends i0.DataClass
          other.iso == this.iso &&
          other.make == this.make &&
          other.model == this.model &&
+          other.lens == this.lens &&
          other.orientation == this.orientation &&
          other.timeZone == this.timeZone &&
          other.rating == this.rating &&
@@ -1232,14 +1273,15 @@ class RemoteExifEntityCompanion
  final i0.Value<int?> height;
  final i0.Value<int?> width;
  final i0.Value<String?> exposureTime;
-  final i0.Value<int?> fNumber;
+  final i0.Value<double?> fNumber;
  final i0.Value<int?> fileSize;
-  final i0.Value<int?> focalLength;
-  final i0.Value<int?> latitude;
-  final i0.Value<int?> longitude;
+  final i0.Value<double?> focalLength;
+  final i0.Value<double?> latitude;
+  final i0.Value<double?> longitude;
  final i0.Value<int?> iso;
  final i0.Value<String?> make;
  final i0.Value<String?> model;
+  final i0.Value<String?> lens;
  final i0.Value<String?> orientation;
  final i0.Value<String?> timeZone;
  final i0.Value<int?> rating;
@@ -1262,6 +1304,7 @@ class RemoteExifEntityCompanion
    this.iso = const i0.Value.absent(),
    this.make = const i0.Value.absent(),
    this.model = const i0.Value.absent(),
+    this.lens = const i0.Value.absent(),
    this.orientation = const i0.Value.absent(),
    this.timeZone = const i0.Value.absent(),
    this.rating = const i0.Value.absent(),
@@ -1285,6 +1328,7 @@ class RemoteExifEntityCompanion
    this.iso = const i0.Value.absent(),
    this.make = const i0.Value.absent(),
    this.model = const i0.Value.absent(),
+    this.lens = const i0.Value.absent(),
    this.orientation = const i0.Value.absent(),
    this.timeZone = const i0.Value.absent(),
    this.rating = const i0.Value.absent(),
@@ -1300,14 +1344,15 @@ class RemoteExifEntityCompanion
    i0.Expression<int>? height,
    i0.Expression<int>? width,
    i0.Expression<String>? exposureTime,
-    i0.Expression<int>? fNumber,
+    i0.Expression<double>? fNumber,
    i0.Expression<int>? fileSize,
-    i0.Expression<int>? focalLength,
-    i0.Expression<int>? latitude,
-    i0.Expression<int>? longitude,
+    i0.Expression<double>? focalLength,
+    i0.Expression<double>? latitude,
+    i0.Expression<double>? longitude,
    i0.Expression<int>? iso,
    i0.Expression<String>? make,
    i0.Expression<String>? model,
+    i0.Expression<String>? lens,
    i0.Expression<String>? orientation,
    i0.Expression<String>? timeZone,
    i0.Expression<int>? rating,
@@ -1331,6 +1376,7 @@ class RemoteExifEntityCompanion
      if (iso != null) 'iso': iso,
      if (make != null) 'make': make,
      if (model != null) 'model': model,
+      if (lens != null) 'lens': lens,
      if (orientation != null) 'orientation': orientation,
      if (timeZone != null) 'time_zone': timeZone,
      if (rating != null) 'rating': rating,
@@ -1348,14 +1394,15 @@ class RemoteExifEntityCompanion
      i0.Value<int?>? height,
      i0.Value<int?>? width,
      i0.Value<String?>? exposureTime,
-      i0.Value<int?>? fNumber,
+      i0.Value<double?>? fNumber,
      i0.Value<int?>? fileSize,
-      i0.Value<int?>? focalLength,
-      i0.Value<int?>? latitude,
-      i0.Value<int?>? longitude,
+      i0.Value<double?>? focalLength,
+      i0.Value<double?>? latitude,
+      i0.Value<double?>? longitude,
      i0.Value<int?>? iso,
      i0.Value<String?>? make,
      i0.Value<String?>? model,
+      i0.Value<String?>? lens,
      i0.Value<String?>? orientation,
      i0.Value<String?>? timeZone,
      i0.Value<int?>? rating,
@@ -1378,6 +1425,7 @@ class RemoteExifEntityCompanion
      iso: iso ?? this.iso,
      make: make ?? this.make,
      model: model ?? this.model,
+      lens: lens ?? this.lens,
      orientation: orientation ?? this.orientation,
      timeZone: timeZone ?? this.timeZone,
      rating: rating ?? this.rating,
@@ -1416,19 +1464,19 @@ class RemoteExifEntityCompanion
      map['exposure_time'] = i0.Variable<String>(exposureTime.value);
    }
    if (fNumber.present) {
-      map['f_number'] = i0.Variable<int>(fNumber.value);
+      map['f_number'] = i0.Variable<double>(fNumber.value);
    }
    if (fileSize.present) {
      map['file_size'] = i0.Variable<int>(fileSize.value);
    }
    if (focalLength.present) {
-      map['focal_length'] = i0.Variable<int>(focalLength.value);
+      map['focal_length'] = i0.Variable<double>(focalLength.value);
    }
    if (latitude.present) {
-      map['latitude'] = i0.Variable<int>(latitude.value);
+      map['latitude'] = i0.Variable<double>(latitude.value);
    }
    if (longitude.present) {
-      map['longitude'] = i0.Variable<int>(longitude.value);
+      map['longitude'] = i0.Variable<double>(longitude.value);
    }
    if (iso.present) {
      map['iso'] = i0.Variable<int>(iso.value);
@@ -1439,6 +1487,9 @@ class RemoteExifEntityCompanion
    if (model.present) {
      map['model'] = i0.Variable<String>(model.value);
    }
+    if (lens.present) {
+      map['lens'] = i0.Variable<String>(lens.value);
+    }
    if (orientation.present) {
      map['orientation'] = i0.Variable<String>(orientation.value);
    }
@@ -1474,6 +1525,7 @@ class RemoteExifEntityCompanion
          ..write('iso: $iso, ')
          ..write('make: $make, ')
          ..write('model: $model, ')
+          ..write('lens: $lens, ')
          ..write('orientation: $orientation, ')
          ..write('timeZone: $timeZone, ')
          ..write('rating: $rating, ')
--- a/mobile/lib/infrastructure/entities/local_asset.entity.dart
+++ b/mobile/lib/infrastructure/entities/local_asset.entity.dart
@@ -28,5 +28,8 @@ extension LocalAssetEntityDataDomainEx on LocalAssetEntityData {
        updatedAt: updatedAt,
        durationInSeconds: durationInSeconds,
        isFavorite: isFavorite,
+        height: height,
+        width: width,
+        remoteId: null,
      );
 }
--- a/mobile/lib/infrastructure/entities/memory.entity.dart
+++ b/mobile/lib/infrastructure/entities/memory.entity.dart
@@ -0,0 +1,36 @@
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/domain/models/memory.model.dart';
+import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
+import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
+
+class MemoryEntity extends Table with DriftDefaultsMixin {
+  const MemoryEntity();
+
+  TextColumn get id => text()();
+
+  DateTimeColumn get createdAt => dateTime().withDefault(currentDateAndTime)();
+
+  DateTimeColumn get updatedAt => dateTime().withDefault(currentDateAndTime)();
+
+  DateTimeColumn get deletedAt => dateTime().nullable()();
+
+  TextColumn get ownerId =>
+      text().references(UserEntity, #id, onDelete: KeyAction.cascade)();
+
+  IntColumn get type => intEnum<MemoryTypeEnum>()();
+
+  TextColumn get data => text()();
+
+  BoolColumn get isSaved => boolean().withDefault(const Constant(false))();
+
+  DateTimeColumn get memoryAt => dateTime()();
+
+  DateTimeColumn get seenAt => dateTime().nullable()();
+
+  DateTimeColumn get showAt => dateTime().nullable()();
+
+  DateTimeColumn get hideAt => dateTime().nullable()();
+
+  @override
+  Set<Column> get primaryKey => {id};
+}
--- a/mobile/lib/infrastructure/entities/memory.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/memory.entity.drift.dart
@@ -0,0 +1,970 @@
+// dart format width=80
+// ignore_for_file: type=lint
+import 'package:drift/drift.dart' as i0;
+import 'package:immich_mobile/infrastructure/entities/memory.entity.drift.dart'
+    as i1;
+import 'package:immich_mobile/domain/models/memory.model.dart' as i2;
+import 'package:immich_mobile/infrastructure/entities/memory.entity.dart' as i3;
+import 'package:drift/src/runtime/query_builder/query_builder.dart' as i4;
+import 'package:immich_mobile/infrastructure/entities/user.entity.drift.dart'
+    as i5;
+import 'package:drift/internal/modular.dart' as i6;
+
+typedef $$MemoryEntityTableCreateCompanionBuilder = i1.MemoryEntityCompanion
+    Function({
+  required String id,
+  i0.Value<DateTime> createdAt,
+  i0.Value<DateTime> updatedAt,
+  i0.Value<DateTime?> deletedAt,
+  required String ownerId,
+  required i2.MemoryTypeEnum type,
+  required String data,
+  i0.Value<bool> isSaved,
+  required DateTime memoryAt,
+  i0.Value<DateTime?> seenAt,
+  i0.Value<DateTime?> showAt,
+  i0.Value<DateTime?> hideAt,
+});
+typedef $$MemoryEntityTableUpdateCompanionBuilder = i1.MemoryEntityCompanion
+    Function({
+  i0.Value<String> id,
+  i0.Value<DateTime> createdAt,
+  i0.Value<DateTime> updatedAt,
+  i0.Value<DateTime?> deletedAt,
+  i0.Value<String> ownerId,
+  i0.Value<i2.MemoryTypeEnum> type,
+  i0.Value<String> data,
+  i0.Value<bool> isSaved,
+  i0.Value<DateTime> memoryAt,
+  i0.Value<DateTime?> seenAt,
+  i0.Value<DateTime?> showAt,
+  i0.Value<DateTime?> hideAt,
+});
+
+final class $$MemoryEntityTableReferences extends i0.BaseReferences<
+    i0.GeneratedDatabase, i1.$MemoryEntityTable, i1.MemoryEntityData> {
+  $$MemoryEntityTableReferences(super.$_db, super.$_table, super.$_typedResult);
+
+  static i5.$UserEntityTable _ownerIdTable(i0.GeneratedDatabase db) =>
+      i6.ReadDatabaseContainer(db)
+          .resultSet<i5.$UserEntityTable>('user_entity')
+          .createAlias(i0.$_aliasNameGenerator(
+              i6.ReadDatabaseContainer(db)
+                  .resultSet<i1.$MemoryEntityTable>('memory_entity')
+                  .ownerId,
+              i6.ReadDatabaseContainer(db)
+                  .resultSet<i5.$UserEntityTable>('user_entity')
+                  .id));
+
+  i5.$$UserEntityTableProcessedTableManager get ownerId {
+    final $_column = $_itemColumn<String>('owner_id')!;
+
+    final manager = i5
+        .$$UserEntityTableTableManager(
+            $_db,
+            i6.ReadDatabaseContainer($_db)
+                .resultSet<i5.$UserEntityTable>('user_entity'))
+        .filter((f) => f.id.sqlEquals($_column));
+    final item = $_typedResult.readTableOrNull(_ownerIdTable($_db));
+    if (item == null) return manager;
+    return i0.ProcessedTableManager(
+        manager.$state.copyWith(prefetchedData: [item]));
+  }
+}
+
+class $$MemoryEntityTableFilterComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$MemoryEntityTable> {
+  $$MemoryEntityTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.ColumnFilters<String> get id => $composableBuilder(
+      column: $table.id, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<DateTime> get createdAt => $composableBuilder(
+      column: $table.createdAt, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<DateTime> get updatedAt => $composableBuilder(
+      column: $table.updatedAt, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<DateTime> get deletedAt => $composableBuilder(
+      column: $table.deletedAt, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnWithTypeConverterFilters<i2.MemoryTypeEnum, i2.MemoryTypeEnum, int>
+      get type => $composableBuilder(
+          column: $table.type,
+          builder: (column) => i0.ColumnWithTypeConverterFilters(column));
+
+  i0.ColumnFilters<String> get data => $composableBuilder(
+      column: $table.data, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<bool> get isSaved => $composableBuilder(
+      column: $table.isSaved, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<DateTime> get memoryAt => $composableBuilder(
+      column: $table.memoryAt, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<DateTime> get seenAt => $composableBuilder(
+      column: $table.seenAt, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<DateTime> get showAt => $composableBuilder(
+      column: $table.showAt, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<DateTime> get hideAt => $composableBuilder(
+      column: $table.hideAt, builder: (column) => i0.ColumnFilters(column));
+
+  i5.$$UserEntityTableFilterComposer get ownerId {
+    final i5.$$UserEntityTableFilterComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.ownerId,
+        referencedTable: i6.ReadDatabaseContainer($db)
+            .resultSet<i5.$UserEntityTable>('user_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i5.$$UserEntityTableFilterComposer(
+              $db: $db,
+              $table: i6.ReadDatabaseContainer($db)
+                  .resultSet<i5.$UserEntityTable>('user_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+}
+
+class $$MemoryEntityTableOrderingComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$MemoryEntityTable> {
+  $$MemoryEntityTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.ColumnOrderings<String> get id => $composableBuilder(
+      column: $table.id, builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<DateTime> get createdAt => $composableBuilder(
+      column: $table.createdAt,
+      builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<DateTime> get updatedAt => $composableBuilder(
+      column: $table.updatedAt,
+      builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<DateTime> get deletedAt => $composableBuilder(
+      column: $table.deletedAt,
+      builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<int> get type => $composableBuilder(
+      column: $table.type, builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<String> get data => $composableBuilder(
+      column: $table.data, builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<bool> get isSaved => $composableBuilder(
+      column: $table.isSaved, builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<DateTime> get memoryAt => $composableBuilder(
+      column: $table.memoryAt, builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<DateTime> get seenAt => $composableBuilder(
+      column: $table.seenAt, builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<DateTime> get showAt => $composableBuilder(
+      column: $table.showAt, builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<DateTime> get hideAt => $composableBuilder(
+      column: $table.hideAt, builder: (column) => i0.ColumnOrderings(column));
+
+  i5.$$UserEntityTableOrderingComposer get ownerId {
+    final i5.$$UserEntityTableOrderingComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.ownerId,
+        referencedTable: i6.ReadDatabaseContainer($db)
+            .resultSet<i5.$UserEntityTable>('user_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i5.$$UserEntityTableOrderingComposer(
+              $db: $db,
+              $table: i6.ReadDatabaseContainer($db)
+                  .resultSet<i5.$UserEntityTable>('user_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+}
+
+class $$MemoryEntityTableAnnotationComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$MemoryEntityTable> {
+  $$MemoryEntityTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.GeneratedColumn<String> get id =>
+      $composableBuilder(column: $table.id, builder: (column) => column);
+
+  i0.GeneratedColumn<DateTime> get createdAt =>
+      $composableBuilder(column: $table.createdAt, builder: (column) => column);
+
+  i0.GeneratedColumn<DateTime> get updatedAt =>
+      $composableBuilder(column: $table.updatedAt, builder: (column) => column);
+
+  i0.GeneratedColumn<DateTime> get deletedAt =>
+      $composableBuilder(column: $table.deletedAt, builder: (column) => column);
+
+  i0.GeneratedColumnWithTypeConverter<i2.MemoryTypeEnum, int> get type =>
+      $composableBuilder(column: $table.type, builder: (column) => column);
+
+  i0.GeneratedColumn<String> get data =>
+      $composableBuilder(column: $table.data, builder: (column) => column);
+
+  i0.GeneratedColumn<bool> get isSaved =>
+      $composableBuilder(column: $table.isSaved, builder: (column) => column);
+
+  i0.GeneratedColumn<DateTime> get memoryAt =>
+      $composableBuilder(column: $table.memoryAt, builder: (column) => column);
+
+  i0.GeneratedColumn<DateTime> get seenAt =>
+      $composableBuilder(column: $table.seenAt, builder: (column) => column);
+
+  i0.GeneratedColumn<DateTime> get showAt =>
+      $composableBuilder(column: $table.showAt, builder: (column) => column);
+
+  i0.GeneratedColumn<DateTime> get hideAt =>
+      $composableBuilder(column: $table.hideAt, builder: (column) => column);
+
+  i5.$$UserEntityTableAnnotationComposer get ownerId {
+    final i5.$$UserEntityTableAnnotationComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.ownerId,
+        referencedTable: i6.ReadDatabaseContainer($db)
+            .resultSet<i5.$UserEntityTable>('user_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i5.$$UserEntityTableAnnotationComposer(
+              $db: $db,
+              $table: i6.ReadDatabaseContainer($db)
+                  .resultSet<i5.$UserEntityTable>('user_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+}
+
+class $$MemoryEntityTableTableManager extends i0.RootTableManager<
+    i0.GeneratedDatabase,
+    i1.$MemoryEntityTable,
+    i1.MemoryEntityData,
+    i1.$$MemoryEntityTableFilterComposer,
+    i1.$$MemoryEntityTableOrderingComposer,
+    i1.$$MemoryEntityTableAnnotationComposer,
+    $$MemoryEntityTableCreateCompanionBuilder,
+    $$MemoryEntityTableUpdateCompanionBuilder,
+    (i1.MemoryEntityData, i1.$$MemoryEntityTableReferences),
+    i1.MemoryEntityData,
+    i0.PrefetchHooks Function({bool ownerId})> {
+  $$MemoryEntityTableTableManager(
+      i0.GeneratedDatabase db, i1.$MemoryEntityTable table)
+      : super(i0.TableManagerState(
+          db: db,
+          table: table,
+          createFilteringComposer: () =>
+              i1.$$MemoryEntityTableFilterComposer($db: db, $table: table),
+          createOrderingComposer: () =>
+              i1.$$MemoryEntityTableOrderingComposer($db: db, $table: table),
+          createComputedFieldComposer: () =>
+              i1.$$MemoryEntityTableAnnotationComposer($db: db, $table: table),
+          updateCompanionCallback: ({
+            i0.Value<String> id = const i0.Value.absent(),
+            i0.Value<DateTime> createdAt = const i0.Value.absent(),
+            i0.Value<DateTime> updatedAt = const i0.Value.absent(),
+            i0.Value<DateTime?> deletedAt = const i0.Value.absent(),
+            i0.Value<String> ownerId = const i0.Value.absent(),
+            i0.Value<i2.MemoryTypeEnum> type = const i0.Value.absent(),
+            i0.Value<String> data = const i0.Value.absent(),
+            i0.Value<bool> isSaved = const i0.Value.absent(),
+            i0.Value<DateTime> memoryAt = const i0.Value.absent(),
+            i0.Value<DateTime?> seenAt = const i0.Value.absent(),
+            i0.Value<DateTime?> showAt = const i0.Value.absent(),
+            i0.Value<DateTime?> hideAt = const i0.Value.absent(),
+          }) =>
+              i1.MemoryEntityCompanion(
+            id: id,
+            createdAt: createdAt,
+            updatedAt: updatedAt,
+            deletedAt: deletedAt,
+            ownerId: ownerId,
+            type: type,
+            data: data,
+            isSaved: isSaved,
+            memoryAt: memoryAt,
+            seenAt: seenAt,
+            showAt: showAt,
+            hideAt: hideAt,
+          ),
+          createCompanionCallback: ({
+            required String id,
+            i0.Value<DateTime> createdAt = const i0.Value.absent(),
+            i0.Value<DateTime> updatedAt = const i0.Value.absent(),
+            i0.Value<DateTime?> deletedAt = const i0.Value.absent(),
+            required String ownerId,
+            required i2.MemoryTypeEnum type,
+            required String data,
+            i0.Value<bool> isSaved = const i0.Value.absent(),
+            required DateTime memoryAt,
+            i0.Value<DateTime?> seenAt = const i0.Value.absent(),
+            i0.Value<DateTime?> showAt = const i0.Value.absent(),
+            i0.Value<DateTime?> hideAt = const i0.Value.absent(),
+          }) =>
+              i1.MemoryEntityCompanion.insert(
+            id: id,
+            createdAt: createdAt,
+            updatedAt: updatedAt,
+            deletedAt: deletedAt,
+            ownerId: ownerId,
+            type: type,
+            data: data,
+            isSaved: isSaved,
+            memoryAt: memoryAt,
+            seenAt: seenAt,
+            showAt: showAt,
+            hideAt: hideAt,
+          ),
+          withReferenceMapper: (p0) => p0
+              .map((e) => (
+                    e.readTable(table),
+                    i1.$$MemoryEntityTableReferences(db, table, e)
+                  ))
+              .toList(),
+          prefetchHooksCallback: ({ownerId = false}) {
+            return i0.PrefetchHooks(
+              db: db,
+              explicitlyWatchedTables: [],
+              addJoins: <
+                  T extends i0.TableManagerState<
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic>>(state) {
+                if (ownerId) {
+                  state = state.withJoin(
+                    currentTable: table,
+                    currentColumn: table.ownerId,
+                    referencedTable:
+                        i1.$$MemoryEntityTableReferences._ownerIdTable(db),
+                    referencedColumn:
+                        i1.$$MemoryEntityTableReferences._ownerIdTable(db).id,
+                  ) as T;
+                }
+
+                return state;
+              },
+              getPrefetchedDataCallback: (items) async {
+                return [];
+              },
+            );
+          },
+        ));
+}
+
+typedef $$MemoryEntityTableProcessedTableManager = i0.ProcessedTableManager<
+    i0.GeneratedDatabase,
+    i1.$MemoryEntityTable,
+    i1.MemoryEntityData,
+    i1.$$MemoryEntityTableFilterComposer,
+    i1.$$MemoryEntityTableOrderingComposer,
+    i1.$$MemoryEntityTableAnnotationComposer,
+    $$MemoryEntityTableCreateCompanionBuilder,
+    $$MemoryEntityTableUpdateCompanionBuilder,
+    (i1.MemoryEntityData, i1.$$MemoryEntityTableReferences),
+    i1.MemoryEntityData,
+    i0.PrefetchHooks Function({bool ownerId})>;
+
+class $MemoryEntityTable extends i3.MemoryEntity
+    with i0.TableInfo<$MemoryEntityTable, i1.MemoryEntityData> {
+  @override
+  final i0.GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  $MemoryEntityTable(this.attachedDatabase, [this._alias]);
+  static const i0.VerificationMeta _idMeta = const i0.VerificationMeta('id');
+  @override
+  late final i0.GeneratedColumn<String> id = i0.GeneratedColumn<String>(
+      'id', aliasedName, false,
+      type: i0.DriftSqlType.string, requiredDuringInsert: true);
+  static const i0.VerificationMeta _createdAtMeta =
+      const i0.VerificationMeta('createdAt');
+  @override
+  late final i0.GeneratedColumn<DateTime> createdAt =
+      i0.GeneratedColumn<DateTime>('created_at', aliasedName, false,
+          type: i0.DriftSqlType.dateTime,
+          requiredDuringInsert: false,
+          defaultValue: i4.currentDateAndTime);
+  static const i0.VerificationMeta _updatedAtMeta =
+      const i0.VerificationMeta('updatedAt');
+  @override
+  late final i0.GeneratedColumn<DateTime> updatedAt =
+      i0.GeneratedColumn<DateTime>('updated_at', aliasedName, false,
+          type: i0.DriftSqlType.dateTime,
+          requiredDuringInsert: false,
+          defaultValue: i4.currentDateAndTime);
+  static const i0.VerificationMeta _deletedAtMeta =
+      const i0.VerificationMeta('deletedAt');
+  @override
+  late final i0.GeneratedColumn<DateTime> deletedAt =
+      i0.GeneratedColumn<DateTime>('deleted_at', aliasedName, true,
+          type: i0.DriftSqlType.dateTime, requiredDuringInsert: false);
+  static const i0.VerificationMeta _ownerIdMeta =
+      const i0.VerificationMeta('ownerId');
+  @override
+  late final i0.GeneratedColumn<String> ownerId = i0.GeneratedColumn<String>(
+      'owner_id', aliasedName, false,
+      type: i0.DriftSqlType.string,
+      requiredDuringInsert: true,
+      defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
+          'REFERENCES user_entity (id) ON DELETE CASCADE'));
+  @override
+  late final i0.GeneratedColumnWithTypeConverter<i2.MemoryTypeEnum, int> type =
+      i0.GeneratedColumn<int>('type', aliasedName, false,
+              type: i0.DriftSqlType.int, requiredDuringInsert: true)
+          .withConverter<i2.MemoryTypeEnum>(
+              i1.$MemoryEntityTable.$convertertype);
+  static const i0.VerificationMeta _dataMeta =
+      const i0.VerificationMeta('data');
+  @override
+  late final i0.GeneratedColumn<String> data = i0.GeneratedColumn<String>(
+      'data', aliasedName, false,
+      type: i0.DriftSqlType.string, requiredDuringInsert: true);
+  static const i0.VerificationMeta _isSavedMeta =
+      const i0.VerificationMeta('isSaved');
+  @override
+  late final i0.GeneratedColumn<bool> isSaved = i0.GeneratedColumn<bool>(
+      'is_saved', aliasedName, false,
+      type: i0.DriftSqlType.bool,
+      requiredDuringInsert: false,
+      defaultConstraints:
+          i0.GeneratedColumn.constraintIsAlways('CHECK ("is_saved" IN (0, 1))'),
+      defaultValue: const i4.Constant(false));
+  static const i0.VerificationMeta _memoryAtMeta =
+      const i0.VerificationMeta('memoryAt');
+  @override
+  late final i0.GeneratedColumn<DateTime> memoryAt =
+      i0.GeneratedColumn<DateTime>('memory_at', aliasedName, false,
+          type: i0.DriftSqlType.dateTime, requiredDuringInsert: true);
+  static const i0.VerificationMeta _seenAtMeta =
+      const i0.VerificationMeta('seenAt');
+  @override
+  late final i0.GeneratedColumn<DateTime> seenAt = i0.GeneratedColumn<DateTime>(
+      'seen_at', aliasedName, true,
+      type: i0.DriftSqlType.dateTime, requiredDuringInsert: false);
+  static const i0.VerificationMeta _showAtMeta =
+      const i0.VerificationMeta('showAt');
+  @override
+  late final i0.GeneratedColumn<DateTime> showAt = i0.GeneratedColumn<DateTime>(
+      'show_at', aliasedName, true,
+      type: i0.DriftSqlType.dateTime, requiredDuringInsert: false);
+  static const i0.VerificationMeta _hideAtMeta =
+      const i0.VerificationMeta('hideAt');
+  @override
+  late final i0.GeneratedColumn<DateTime> hideAt = i0.GeneratedColumn<DateTime>(
+      'hide_at', aliasedName, true,
+      type: i0.DriftSqlType.dateTime, requiredDuringInsert: false);
+  @override
+  List<i0.GeneratedColumn> get $columns => [
+        id,
+        createdAt,
+        updatedAt,
+        deletedAt,
+        ownerId,
+        type,
+        data,
+        isSaved,
+        memoryAt,
+        seenAt,
+        showAt,
+        hideAt
+      ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'memory_entity';
+  @override
+  i0.VerificationContext validateIntegrity(
+      i0.Insertable<i1.MemoryEntityData> instance,
+      {bool isInserting = false}) {
+    final context = i0.VerificationContext();
+    final data = instance.toColumns(true);
+    if (data.containsKey('id')) {
+      context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta));
+    } else if (isInserting) {
+      context.missing(_idMeta);
+    }
+    if (data.containsKey('created_at')) {
+      context.handle(_createdAtMeta,
+          createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta));
+    }
+    if (data.containsKey('updated_at')) {
+      context.handle(_updatedAtMeta,
+          updatedAt.isAcceptableOrUnknown(data['updated_at']!, _updatedAtMeta));
+    }
+    if (data.containsKey('deleted_at')) {
+      context.handle(_deletedAtMeta,
+          deletedAt.isAcceptableOrUnknown(data['deleted_at']!, _deletedAtMeta));
+    }
+    if (data.containsKey('owner_id')) {
+      context.handle(_ownerIdMeta,
+          ownerId.isAcceptableOrUnknown(data['owner_id']!, _ownerIdMeta));
+    } else if (isInserting) {
+      context.missing(_ownerIdMeta);
+    }
+    if (data.containsKey('data')) {
+      context.handle(
+          _dataMeta, this.data.isAcceptableOrUnknown(data['data']!, _dataMeta));
+    } else if (isInserting) {
+      context.missing(_dataMeta);
+    }
+    if (data.containsKey('is_saved')) {
+      context.handle(_isSavedMeta,
+          isSaved.isAcceptableOrUnknown(data['is_saved']!, _isSavedMeta));
+    }
+    if (data.containsKey('memory_at')) {
+      context.handle(_memoryAtMeta,
+          memoryAt.isAcceptableOrUnknown(data['memory_at']!, _memoryAtMeta));
+    } else if (isInserting) {
+      context.missing(_memoryAtMeta);
+    }
+    if (data.containsKey('seen_at')) {
+      context.handle(_seenAtMeta,
+          seenAt.isAcceptableOrUnknown(data['seen_at']!, _seenAtMeta));
+    }
+    if (data.containsKey('show_at')) {
+      context.handle(_showAtMeta,
+          showAt.isAcceptableOrUnknown(data['show_at']!, _showAtMeta));
+    }
+    if (data.containsKey('hide_at')) {
+      context.handle(_hideAtMeta,
+          hideAt.isAcceptableOrUnknown(data['hide_at']!, _hideAtMeta));
+    }
+    return context;
+  }
+
+  @override
+  Set<i0.GeneratedColumn> get $primaryKey => {id};
+  @override
+  i1.MemoryEntityData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return i1.MemoryEntityData(
+      id: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}id'])!,
+      createdAt: attachedDatabase.typeMapping.read(
+          i0.DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!,
+      updatedAt: attachedDatabase.typeMapping.read(
+          i0.DriftSqlType.dateTime, data['${effectivePrefix}updated_at'])!,
+      deletedAt: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.dateTime, data['${effectivePrefix}deleted_at']),
+      ownerId: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}owner_id'])!,
+      type: i1.$MemoryEntityTable.$convertertype.fromSql(attachedDatabase
+          .typeMapping
+          .read(i0.DriftSqlType.int, data['${effectivePrefix}type'])!),
+      data: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}data'])!,
+      isSaved: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.bool, data['${effectivePrefix}is_saved'])!,
+      memoryAt: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.dateTime, data['${effectivePrefix}memory_at'])!,
+      seenAt: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.dateTime, data['${effectivePrefix}seen_at']),
+      showAt: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.dateTime, data['${effectivePrefix}show_at']),
+      hideAt: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.dateTime, data['${effectivePrefix}hide_at']),
+    );
+  }
+
+  @override
+  $MemoryEntityTable createAlias(String alias) {
+    return $MemoryEntityTable(attachedDatabase, alias);
+  }
+
+  static i0.JsonTypeConverter2<i2.MemoryTypeEnum, int, int> $convertertype =
+      const i0.EnumIndexConverter<i2.MemoryTypeEnum>(i2.MemoryTypeEnum.values);
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class MemoryEntityData extends i0.DataClass
+    implements i0.Insertable<i1.MemoryEntityData> {
+  final String id;
+  final DateTime createdAt;
+  final DateTime updatedAt;
+  final DateTime? deletedAt;
+  final String ownerId;
+  final i2.MemoryTypeEnum type;
+  final String data;
+  final bool isSaved;
+  final DateTime memoryAt;
+  final DateTime? seenAt;
+  final DateTime? showAt;
+  final DateTime? hideAt;
+  const MemoryEntityData(
+      {required this.id,
+      required this.createdAt,
+      required this.updatedAt,
+      this.deletedAt,
+      required this.ownerId,
+      required this.type,
+      required this.data,
+      required this.isSaved,
+      required this.memoryAt,
+      this.seenAt,
+      this.showAt,
+      this.hideAt});
+  @override
+  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    map['id'] = i0.Variable<String>(id);
+    map['created_at'] = i0.Variable<DateTime>(createdAt);
+    map['updated_at'] = i0.Variable<DateTime>(updatedAt);
+    if (!nullToAbsent || deletedAt != null) {
+      map['deleted_at'] = i0.Variable<DateTime>(deletedAt);
+    }
+    map['owner_id'] = i0.Variable<String>(ownerId);
+    {
+      map['type'] =
+          i0.Variable<int>(i1.$MemoryEntityTable.$convertertype.toSql(type));
+    }
+    map['data'] = i0.Variable<String>(data);
+    map['is_saved'] = i0.Variable<bool>(isSaved);
+    map['memory_at'] = i0.Variable<DateTime>(memoryAt);
+    if (!nullToAbsent || seenAt != null) {
+      map['seen_at'] = i0.Variable<DateTime>(seenAt);
+    }
+    if (!nullToAbsent || showAt != null) {
+      map['show_at'] = i0.Variable<DateTime>(showAt);
+    }
+    if (!nullToAbsent || hideAt != null) {
+      map['hide_at'] = i0.Variable<DateTime>(hideAt);
+    }
+    return map;
+  }
+
+  factory MemoryEntityData.fromJson(Map<String, dynamic> json,
+      {i0.ValueSerializer? serializer}) {
+    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
+    return MemoryEntityData(
+      id: serializer.fromJson<String>(json['id']),
+      createdAt: serializer.fromJson<DateTime>(json['createdAt']),
+      updatedAt: serializer.fromJson<DateTime>(json['updatedAt']),
+      deletedAt: serializer.fromJson<DateTime?>(json['deletedAt']),
+      ownerId: serializer.fromJson<String>(json['ownerId']),
+      type: i1.$MemoryEntityTable.$convertertype
+          .fromJson(serializer.fromJson<int>(json['type'])),
+      data: serializer.fromJson<String>(json['data']),
+      isSaved: serializer.fromJson<bool>(json['isSaved']),
+      memoryAt: serializer.fromJson<DateTime>(json['memoryAt']),
+      seenAt: serializer.fromJson<DateTime?>(json['seenAt']),
+      showAt: serializer.fromJson<DateTime?>(json['showAt']),
+      hideAt: serializer.fromJson<DateTime?>(json['hideAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({i0.ValueSerializer? serializer}) {
+    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'id': serializer.toJson<String>(id),
+      'createdAt': serializer.toJson<DateTime>(createdAt),
+      'updatedAt': serializer.toJson<DateTime>(updatedAt),
+      'deletedAt': serializer.toJson<DateTime?>(deletedAt),
+      'ownerId': serializer.toJson<String>(ownerId),
+      'type': serializer
+          .toJson<int>(i1.$MemoryEntityTable.$convertertype.toJson(type)),
+      'data': serializer.toJson<String>(data),
+      'isSaved': serializer.toJson<bool>(isSaved),
+      'memoryAt': serializer.toJson<DateTime>(memoryAt),
+      'seenAt': serializer.toJson<DateTime?>(seenAt),
+      'showAt': serializer.toJson<DateTime?>(showAt),
+      'hideAt': serializer.toJson<DateTime?>(hideAt),
+    };
+  }
+
+  i1.MemoryEntityData copyWith(
+          {String? id,
+          DateTime? createdAt,
+          DateTime? updatedAt,
+          i0.Value<DateTime?> deletedAt = const i0.Value.absent(),
+          String? ownerId,
+          i2.MemoryTypeEnum? type,
+          String? data,
+          bool? isSaved,
+          DateTime? memoryAt,
+          i0.Value<DateTime?> seenAt = const i0.Value.absent(),
+          i0.Value<DateTime?> showAt = const i0.Value.absent(),
+          i0.Value<DateTime?> hideAt = const i0.Value.absent()}) =>
+      i1.MemoryEntityData(
+        id: id ?? this.id,
+        createdAt: createdAt ?? this.createdAt,
+        updatedAt: updatedAt ?? this.updatedAt,
+        deletedAt: deletedAt.present ? deletedAt.value : this.deletedAt,
+        ownerId: ownerId ?? this.ownerId,
+        type: type ?? this.type,
+        data: data ?? this.data,
+        isSaved: isSaved ?? this.isSaved,
+        memoryAt: memoryAt ?? this.memoryAt,
+        seenAt: seenAt.present ? seenAt.value : this.seenAt,
+        showAt: showAt.present ? showAt.value : this.showAt,
+        hideAt: hideAt.present ? hideAt.value : this.hideAt,
+      );
+  MemoryEntityData copyWithCompanion(i1.MemoryEntityCompanion data) {
+    return MemoryEntityData(
+      id: data.id.present ? data.id.value : this.id,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+      updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt,
+      deletedAt: data.deletedAt.present ? data.deletedAt.value : this.deletedAt,
+      ownerId: data.ownerId.present ? data.ownerId.value : this.ownerId,
+      type: data.type.present ? data.type.value : this.type,
+      data: data.data.present ? data.data.value : this.data,
+      isSaved: data.isSaved.present ? data.isSaved.value : this.isSaved,
+      memoryAt: data.memoryAt.present ? data.memoryAt.value : this.memoryAt,
+      seenAt: data.seenAt.present ? data.seenAt.value : this.seenAt,
+      showAt: data.showAt.present ? data.showAt.value : this.showAt,
+      hideAt: data.hideAt.present ? data.hideAt.value : this.hideAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MemoryEntityData(')
+          ..write('id: $id, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('updatedAt: $updatedAt, ')
+          ..write('deletedAt: $deletedAt, ')
+          ..write('ownerId: $ownerId, ')
+          ..write('type: $type, ')
+          ..write('data: $data, ')
+          ..write('isSaved: $isSaved, ')
+          ..write('memoryAt: $memoryAt, ')
+          ..write('seenAt: $seenAt, ')
+          ..write('showAt: $showAt, ')
+          ..write('hideAt: $hideAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(id, createdAt, updatedAt, deletedAt, ownerId,
+      type, data, isSaved, memoryAt, seenAt, showAt, hideAt);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is i1.MemoryEntityData &&
+          other.id == this.id &&
+          other.createdAt == this.createdAt &&
+          other.updatedAt == this.updatedAt &&
+          other.deletedAt == this.deletedAt &&
+          other.ownerId == this.ownerId &&
+          other.type == this.type &&
+          other.data == this.data &&
+          other.isSaved == this.isSaved &&
+          other.memoryAt == this.memoryAt &&
+          other.seenAt == this.seenAt &&
+          other.showAt == this.showAt &&
+          other.hideAt == this.hideAt);
+}
+
+class MemoryEntityCompanion extends i0.UpdateCompanion<i1.MemoryEntityData> {
+  final i0.Value<String> id;
+  final i0.Value<DateTime> createdAt;
+  final i0.Value<DateTime> updatedAt;
+  final i0.Value<DateTime?> deletedAt;
+  final i0.Value<String> ownerId;
+  final i0.Value<i2.MemoryTypeEnum> type;
+  final i0.Value<String> data;
+  final i0.Value<bool> isSaved;
+  final i0.Value<DateTime> memoryAt;
+  final i0.Value<DateTime?> seenAt;
+  final i0.Value<DateTime?> showAt;
+  final i0.Value<DateTime?> hideAt;
+  const MemoryEntityCompanion({
+    this.id = const i0.Value.absent(),
+    this.createdAt = const i0.Value.absent(),
+    this.updatedAt = const i0.Value.absent(),
+    this.deletedAt = const i0.Value.absent(),
+    this.ownerId = const i0.Value.absent(),
+    this.type = const i0.Value.absent(),
+    this.data = const i0.Value.absent(),
+    this.isSaved = const i0.Value.absent(),
+    this.memoryAt = const i0.Value.absent(),
+    this.seenAt = const i0.Value.absent(),
+    this.showAt = const i0.Value.absent(),
+    this.hideAt = const i0.Value.absent(),
+  });
+  MemoryEntityCompanion.insert({
+    required String id,
+    this.createdAt = const i0.Value.absent(),
+    this.updatedAt = const i0.Value.absent(),
+    this.deletedAt = const i0.Value.absent(),
+    required String ownerId,
+    required i2.MemoryTypeEnum type,
+    required String data,
+    this.isSaved = const i0.Value.absent(),
+    required DateTime memoryAt,
+    this.seenAt = const i0.Value.absent(),
+    this.showAt = const i0.Value.absent(),
+    this.hideAt = const i0.Value.absent(),
+  })  : id = i0.Value(id),
+        ownerId = i0.Value(ownerId),
+        type = i0.Value(type),
+        data = i0.Value(data),
+        memoryAt = i0.Value(memoryAt);
+  static i0.Insertable<i1.MemoryEntityData> custom({
+    i0.Expression<String>? id,
+    i0.Expression<DateTime>? createdAt,
+    i0.Expression<DateTime>? updatedAt,
+    i0.Expression<DateTime>? deletedAt,
+    i0.Expression<String>? ownerId,
+    i0.Expression<int>? type,
+    i0.Expression<String>? data,
+    i0.Expression<bool>? isSaved,
+    i0.Expression<DateTime>? memoryAt,
+    i0.Expression<DateTime>? seenAt,
+    i0.Expression<DateTime>? showAt,
+    i0.Expression<DateTime>? hideAt,
+  }) {
+    return i0.RawValuesInsertable({
+      if (id != null) 'id': id,
+      if (createdAt != null) 'created_at': createdAt,
+      if (updatedAt != null) 'updated_at': updatedAt,
+      if (deletedAt != null) 'deleted_at': deletedAt,
+      if (ownerId != null) 'owner_id': ownerId,
+      if (type != null) 'type': type,
+      if (data != null) 'data': data,
+      if (isSaved != null) 'is_saved': isSaved,
+      if (memoryAt != null) 'memory_at': memoryAt,
+      if (seenAt != null) 'seen_at': seenAt,
+      if (showAt != null) 'show_at': showAt,
+      if (hideAt != null) 'hide_at': hideAt,
+    });
+  }
+
+  i1.MemoryEntityCompanion copyWith(
+      {i0.Value<String>? id,
+      i0.Value<DateTime>? createdAt,
+      i0.Value<DateTime>? updatedAt,
+      i0.Value<DateTime?>? deletedAt,
+      i0.Value<String>? ownerId,
+      i0.Value<i2.MemoryTypeEnum>? type,
+      i0.Value<String>? data,
+      i0.Value<bool>? isSaved,
+      i0.Value<DateTime>? memoryAt,
+      i0.Value<DateTime?>? seenAt,
+      i0.Value<DateTime?>? showAt,
+      i0.Value<DateTime?>? hideAt}) {
+    return i1.MemoryEntityCompanion(
+      id: id ?? this.id,
+      createdAt: createdAt ?? this.createdAt,
+      updatedAt: updatedAt ?? this.updatedAt,
+      deletedAt: deletedAt ?? this.deletedAt,
+      ownerId: ownerId ?? this.ownerId,
+      type: type ?? this.type,
+      data: data ?? this.data,
+      isSaved: isSaved ?? this.isSaved,
+      memoryAt: memoryAt ?? this.memoryAt,
+      seenAt: seenAt ?? this.seenAt,
+      showAt: showAt ?? this.showAt,
+      hideAt: hideAt ?? this.hideAt,
+    );
+  }
+
+  @override
+  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    if (id.present) {
+      map['id'] = i0.Variable<String>(id.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = i0.Variable<DateTime>(createdAt.value);
+    }
+    if (updatedAt.present) {
+      map['updated_at'] = i0.Variable<DateTime>(updatedAt.value);
+    }
+    if (deletedAt.present) {
+      map['deleted_at'] = i0.Variable<DateTime>(deletedAt.value);
+    }
+    if (ownerId.present) {
+      map['owner_id'] = i0.Variable<String>(ownerId.value);
+    }
+    if (type.present) {
+      map['type'] = i0.Variable<int>(
+          i1.$MemoryEntityTable.$convertertype.toSql(type.value));
+    }
+    if (data.present) {
+      map['data'] = i0.Variable<String>(data.value);
+    }
+    if (isSaved.present) {
+      map['is_saved'] = i0.Variable<bool>(isSaved.value);
+    }
+    if (memoryAt.present) {
+      map['memory_at'] = i0.Variable<DateTime>(memoryAt.value);
+    }
+    if (seenAt.present) {
+      map['seen_at'] = i0.Variable<DateTime>(seenAt.value);
+    }
+    if (showAt.present) {
+      map['show_at'] = i0.Variable<DateTime>(showAt.value);
+    }
+    if (hideAt.present) {
+      map['hide_at'] = i0.Variable<DateTime>(hideAt.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MemoryEntityCompanion(')
+          ..write('id: $id, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('updatedAt: $updatedAt, ')
+          ..write('deletedAt: $deletedAt, ')
+          ..write('ownerId: $ownerId, ')
+          ..write('type: $type, ')
+          ..write('data: $data, ')
+          ..write('isSaved: $isSaved, ')
+          ..write('memoryAt: $memoryAt, ')
+          ..write('seenAt: $seenAt, ')
+          ..write('showAt: $showAt, ')
+          ..write('hideAt: $hideAt')
+          ..write(')'))
+        .toString();
+  }
+}
--- a/mobile/lib/infrastructure/entities/memory_asset.entity.dart
+++ b/mobile/lib/infrastructure/entities/memory_asset.entity.dart
@@ -0,0 +1,17 @@
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/infrastructure/entities/memory.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
+import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
+
+class MemoryAssetEntity extends Table with DriftDefaultsMixin {
+  const MemoryAssetEntity();
+
+  TextColumn get assetId =>
+      text().references(RemoteAssetEntity, #id, onDelete: KeyAction.cascade)();
+
+  TextColumn get memoryId =>
+      text().references(MemoryEntity, #id, onDelete: KeyAction.cascade)();
+
+  @override
+  Set<Column> get primaryKey => {assetId, memoryId};
+}
--- a/mobile/lib/infrastructure/entities/memory_asset.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/memory_asset.entity.drift.dart
@@ -0,0 +1,550 @@
+// dart format width=80
+// ignore_for_file: type=lint
+import 'package:drift/drift.dart' as i0;
+import 'package:immich_mobile/infrastructure/entities/memory_asset.entity.drift.dart'
+    as i1;
+import 'package:immich_mobile/infrastructure/entities/memory_asset.entity.dart'
+    as i2;
+import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart'
+    as i3;
+import 'package:drift/internal/modular.dart' as i4;
+import 'package:immich_mobile/infrastructure/entities/memory.entity.drift.dart'
+    as i5;
+
+typedef $$MemoryAssetEntityTableCreateCompanionBuilder
+    = i1.MemoryAssetEntityCompanion Function({
+  required String assetId,
+  required String memoryId,
+});
+typedef $$MemoryAssetEntityTableUpdateCompanionBuilder
+    = i1.MemoryAssetEntityCompanion Function({
+  i0.Value<String> assetId,
+  i0.Value<String> memoryId,
+});
+
+final class $$MemoryAssetEntityTableReferences extends i0.BaseReferences<
+    i0.GeneratedDatabase,
+    i1.$MemoryAssetEntityTable,
+    i1.MemoryAssetEntityData> {
+  $$MemoryAssetEntityTableReferences(
+      super.$_db, super.$_table, super.$_typedResult);
+
+  static i3.$RemoteAssetEntityTable _assetIdTable(i0.GeneratedDatabase db) =>
+      i4.ReadDatabaseContainer(db)
+          .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity')
+          .createAlias(i0.$_aliasNameGenerator(
+              i4.ReadDatabaseContainer(db)
+                  .resultSet<i1.$MemoryAssetEntityTable>('memory_asset_entity')
+                  .assetId,
+              i4.ReadDatabaseContainer(db)
+                  .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity')
+                  .id));
+
+  i3.$$RemoteAssetEntityTableProcessedTableManager get assetId {
+    final $_column = $_itemColumn<String>('asset_id')!;
+
+    final manager = i3
+        .$$RemoteAssetEntityTableTableManager(
+            $_db,
+            i4.ReadDatabaseContainer($_db)
+                .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'))
+        .filter((f) => f.id.sqlEquals($_column));
+    final item = $_typedResult.readTableOrNull(_assetIdTable($_db));
+    if (item == null) return manager;
+    return i0.ProcessedTableManager(
+        manager.$state.copyWith(prefetchedData: [item]));
+  }
+
+  static i5.$MemoryEntityTable _memoryIdTable(i0.GeneratedDatabase db) =>
+      i4.ReadDatabaseContainer(db)
+          .resultSet<i5.$MemoryEntityTable>('memory_entity')
+          .createAlias(i0.$_aliasNameGenerator(
+              i4.ReadDatabaseContainer(db)
+                  .resultSet<i1.$MemoryAssetEntityTable>('memory_asset_entity')
+                  .memoryId,
+              i4.ReadDatabaseContainer(db)
+                  .resultSet<i5.$MemoryEntityTable>('memory_entity')
+                  .id));
+
+  i5.$$MemoryEntityTableProcessedTableManager get memoryId {
+    final $_column = $_itemColumn<String>('memory_id')!;
+
+    final manager = i5
+        .$$MemoryEntityTableTableManager(
+            $_db,
+            i4.ReadDatabaseContainer($_db)
+                .resultSet<i5.$MemoryEntityTable>('memory_entity'))
+        .filter((f) => f.id.sqlEquals($_column));
+    final item = $_typedResult.readTableOrNull(_memoryIdTable($_db));
+    if (item == null) return manager;
+    return i0.ProcessedTableManager(
+        manager.$state.copyWith(prefetchedData: [item]));
+  }
+}
+
+class $$MemoryAssetEntityTableFilterComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$MemoryAssetEntityTable> {
+  $$MemoryAssetEntityTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i3.$$RemoteAssetEntityTableFilterComposer get assetId {
+    final i3.$$RemoteAssetEntityTableFilterComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.assetId,
+        referencedTable: i4.ReadDatabaseContainer($db)
+            .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i3.$$RemoteAssetEntityTableFilterComposer(
+              $db: $db,
+              $table: i4.ReadDatabaseContainer($db)
+                  .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+
+  i5.$$MemoryEntityTableFilterComposer get memoryId {
+    final i5.$$MemoryEntityTableFilterComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.memoryId,
+        referencedTable: i4.ReadDatabaseContainer($db)
+            .resultSet<i5.$MemoryEntityTable>('memory_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i5.$$MemoryEntityTableFilterComposer(
+              $db: $db,
+              $table: i4.ReadDatabaseContainer($db)
+                  .resultSet<i5.$MemoryEntityTable>('memory_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+}
+
+class $$MemoryAssetEntityTableOrderingComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$MemoryAssetEntityTable> {
+  $$MemoryAssetEntityTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i3.$$RemoteAssetEntityTableOrderingComposer get assetId {
+    final i3.$$RemoteAssetEntityTableOrderingComposer composer =
+        $composerBuilder(
+            composer: this,
+            getCurrentColumn: (t) => t.assetId,
+            referencedTable: i4.ReadDatabaseContainer($db)
+                .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
+            getReferencedColumn: (t) => t.id,
+            builder: (joinBuilder,
+                    {$addJoinBuilderToRootComposer,
+                    $removeJoinBuilderFromRootComposer}) =>
+                i3.$$RemoteAssetEntityTableOrderingComposer(
+                  $db: $db,
+                  $table: i4.ReadDatabaseContainer($db)
+                      .resultSet<i3.$RemoteAssetEntityTable>(
+                          'remote_asset_entity'),
+                  $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+                  joinBuilder: joinBuilder,
+                  $removeJoinBuilderFromRootComposer:
+                      $removeJoinBuilderFromRootComposer,
+                ));
+    return composer;
+  }
+
+  i5.$$MemoryEntityTableOrderingComposer get memoryId {
+    final i5.$$MemoryEntityTableOrderingComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.memoryId,
+        referencedTable: i4.ReadDatabaseContainer($db)
+            .resultSet<i5.$MemoryEntityTable>('memory_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i5.$$MemoryEntityTableOrderingComposer(
+              $db: $db,
+              $table: i4.ReadDatabaseContainer($db)
+                  .resultSet<i5.$MemoryEntityTable>('memory_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+}
+
+class $$MemoryAssetEntityTableAnnotationComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$MemoryAssetEntityTable> {
+  $$MemoryAssetEntityTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i3.$$RemoteAssetEntityTableAnnotationComposer get assetId {
+    final i3.$$RemoteAssetEntityTableAnnotationComposer composer =
+        $composerBuilder(
+            composer: this,
+            getCurrentColumn: (t) => t.assetId,
+            referencedTable: i4.ReadDatabaseContainer($db)
+                .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
+            getReferencedColumn: (t) => t.id,
+            builder: (joinBuilder,
+                    {$addJoinBuilderToRootComposer,
+                    $removeJoinBuilderFromRootComposer}) =>
+                i3.$$RemoteAssetEntityTableAnnotationComposer(
+                  $db: $db,
+                  $table: i4.ReadDatabaseContainer($db)
+                      .resultSet<i3.$RemoteAssetEntityTable>(
+                          'remote_asset_entity'),
+                  $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+                  joinBuilder: joinBuilder,
+                  $removeJoinBuilderFromRootComposer:
+                      $removeJoinBuilderFromRootComposer,
+                ));
+    return composer;
+  }
+
+  i5.$$MemoryEntityTableAnnotationComposer get memoryId {
+    final i5.$$MemoryEntityTableAnnotationComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.memoryId,
+        referencedTable: i4.ReadDatabaseContainer($db)
+            .resultSet<i5.$MemoryEntityTable>('memory_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i5.$$MemoryEntityTableAnnotationComposer(
+              $db: $db,
+              $table: i4.ReadDatabaseContainer($db)
+                  .resultSet<i5.$MemoryEntityTable>('memory_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+}
+
+class $$MemoryAssetEntityTableTableManager extends i0.RootTableManager<
+    i0.GeneratedDatabase,
+    i1.$MemoryAssetEntityTable,
+    i1.MemoryAssetEntityData,
+    i1.$$MemoryAssetEntityTableFilterComposer,
+    i1.$$MemoryAssetEntityTableOrderingComposer,
+    i1.$$MemoryAssetEntityTableAnnotationComposer,
+    $$MemoryAssetEntityTableCreateCompanionBuilder,
+    $$MemoryAssetEntityTableUpdateCompanionBuilder,
+    (i1.MemoryAssetEntityData, i1.$$MemoryAssetEntityTableReferences),
+    i1.MemoryAssetEntityData,
+    i0.PrefetchHooks Function({bool assetId, bool memoryId})> {
+  $$MemoryAssetEntityTableTableManager(
+      i0.GeneratedDatabase db, i1.$MemoryAssetEntityTable table)
+      : super(i0.TableManagerState(
+          db: db,
+          table: table,
+          createFilteringComposer: () =>
+              i1.$$MemoryAssetEntityTableFilterComposer($db: db, $table: table),
+          createOrderingComposer: () => i1
+              .$$MemoryAssetEntityTableOrderingComposer($db: db, $table: table),
+          createComputedFieldComposer: () =>
+              i1.$$MemoryAssetEntityTableAnnotationComposer(
+                  $db: db, $table: table),
+          updateCompanionCallback: ({
+            i0.Value<String> assetId = const i0.Value.absent(),
+            i0.Value<String> memoryId = const i0.Value.absent(),
+          }) =>
+              i1.MemoryAssetEntityCompanion(
+            assetId: assetId,
+            memoryId: memoryId,
+          ),
+          createCompanionCallback: ({
+            required String assetId,
+            required String memoryId,
+          }) =>
+              i1.MemoryAssetEntityCompanion.insert(
+            assetId: assetId,
+            memoryId: memoryId,
+          ),
+          withReferenceMapper: (p0) => p0
+              .map((e) => (
+                    e.readTable(table),
+                    i1.$$MemoryAssetEntityTableReferences(db, table, e)
+                  ))
+              .toList(),
+          prefetchHooksCallback: ({assetId = false, memoryId = false}) {
+            return i0.PrefetchHooks(
+              db: db,
+              explicitlyWatchedTables: [],
+              addJoins: <
+                  T extends i0.TableManagerState<
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic>>(state) {
+                if (assetId) {
+                  state = state.withJoin(
+                    currentTable: table,
+                    currentColumn: table.assetId,
+                    referencedTable:
+                        i1.$$MemoryAssetEntityTableReferences._assetIdTable(db),
+                    referencedColumn: i1.$$MemoryAssetEntityTableReferences
+                        ._assetIdTable(db)
+                        .id,
+                  ) as T;
+                }
+                if (memoryId) {
+                  state = state.withJoin(
+                    currentTable: table,
+                    currentColumn: table.memoryId,
+                    referencedTable: i1.$$MemoryAssetEntityTableReferences
+                        ._memoryIdTable(db),
+                    referencedColumn: i1.$$MemoryAssetEntityTableReferences
+                        ._memoryIdTable(db)
+                        .id,
+                  ) as T;
+                }
+
+                return state;
+              },
+              getPrefetchedDataCallback: (items) async {
+                return [];
+              },
+            );
+          },
+        ));
+}
+
+typedef $$MemoryAssetEntityTableProcessedTableManager
+    = i0.ProcessedTableManager<
+        i0.GeneratedDatabase,
+        i1.$MemoryAssetEntityTable,
+        i1.MemoryAssetEntityData,
+        i1.$$MemoryAssetEntityTableFilterComposer,
+        i1.$$MemoryAssetEntityTableOrderingComposer,
+        i1.$$MemoryAssetEntityTableAnnotationComposer,
+        $$MemoryAssetEntityTableCreateCompanionBuilder,
+        $$MemoryAssetEntityTableUpdateCompanionBuilder,
+        (i1.MemoryAssetEntityData, i1.$$MemoryAssetEntityTableReferences),
+        i1.MemoryAssetEntityData,
+        i0.PrefetchHooks Function({bool assetId, bool memoryId})>;
+
+class $MemoryAssetEntityTable extends i2.MemoryAssetEntity
+    with i0.TableInfo<$MemoryAssetEntityTable, i1.MemoryAssetEntityData> {
+  @override
+  final i0.GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  $MemoryAssetEntityTable(this.attachedDatabase, [this._alias]);
+  static const i0.VerificationMeta _assetIdMeta =
+      const i0.VerificationMeta('assetId');
+  @override
+  late final i0.GeneratedColumn<String> assetId = i0.GeneratedColumn<String>(
+      'asset_id', aliasedName, false,
+      type: i0.DriftSqlType.string,
+      requiredDuringInsert: true,
+      defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
+          'REFERENCES remote_asset_entity (id) ON DELETE CASCADE'));
+  static const i0.VerificationMeta _memoryIdMeta =
+      const i0.VerificationMeta('memoryId');
+  @override
+  late final i0.GeneratedColumn<String> memoryId = i0.GeneratedColumn<String>(
+      'memory_id', aliasedName, false,
+      type: i0.DriftSqlType.string,
+      requiredDuringInsert: true,
+      defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
+          'REFERENCES memory_entity (id) ON DELETE CASCADE'));
+  @override
+  List<i0.GeneratedColumn> get $columns => [assetId, memoryId];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'memory_asset_entity';
+  @override
+  i0.VerificationContext validateIntegrity(
+      i0.Insertable<i1.MemoryAssetEntityData> instance,
+      {bool isInserting = false}) {
+    final context = i0.VerificationContext();
+    final data = instance.toColumns(true);
+    if (data.containsKey('asset_id')) {
+      context.handle(_assetIdMeta,
+          assetId.isAcceptableOrUnknown(data['asset_id']!, _assetIdMeta));
+    } else if (isInserting) {
+      context.missing(_assetIdMeta);
+    }
+    if (data.containsKey('memory_id')) {
+      context.handle(_memoryIdMeta,
+          memoryId.isAcceptableOrUnknown(data['memory_id']!, _memoryIdMeta));
+    } else if (isInserting) {
+      context.missing(_memoryIdMeta);
+    }
+    return context;
+  }
+
+  @override
+  Set<i0.GeneratedColumn> get $primaryKey => {assetId, memoryId};
+  @override
+  i1.MemoryAssetEntityData map(Map<String, dynamic> data,
+      {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return i1.MemoryAssetEntityData(
+      assetId: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}asset_id'])!,
+      memoryId: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}memory_id'])!,
+    );
+  }
+
+  @override
+  $MemoryAssetEntityTable createAlias(String alias) {
+    return $MemoryAssetEntityTable(attachedDatabase, alias);
+  }
+
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class MemoryAssetEntityData extends i0.DataClass
+    implements i0.Insertable<i1.MemoryAssetEntityData> {
+  final String assetId;
+  final String memoryId;
+  const MemoryAssetEntityData({required this.assetId, required this.memoryId});
+  @override
+  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    map['asset_id'] = i0.Variable<String>(assetId);
+    map['memory_id'] = i0.Variable<String>(memoryId);
+    return map;
+  }
+
+  factory MemoryAssetEntityData.fromJson(Map<String, dynamic> json,
+      {i0.ValueSerializer? serializer}) {
+    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
+    return MemoryAssetEntityData(
+      assetId: serializer.fromJson<String>(json['assetId']),
+      memoryId: serializer.fromJson<String>(json['memoryId']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({i0.ValueSerializer? serializer}) {
+    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'assetId': serializer.toJson<String>(assetId),
+      'memoryId': serializer.toJson<String>(memoryId),
+    };
+  }
+
+  i1.MemoryAssetEntityData copyWith({String? assetId, String? memoryId}) =>
+      i1.MemoryAssetEntityData(
+        assetId: assetId ?? this.assetId,
+        memoryId: memoryId ?? this.memoryId,
+      );
+  MemoryAssetEntityData copyWithCompanion(i1.MemoryAssetEntityCompanion data) {
+    return MemoryAssetEntityData(
+      assetId: data.assetId.present ? data.assetId.value : this.assetId,
+      memoryId: data.memoryId.present ? data.memoryId.value : this.memoryId,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MemoryAssetEntityData(')
+          ..write('assetId: $assetId, ')
+          ..write('memoryId: $memoryId')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(assetId, memoryId);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is i1.MemoryAssetEntityData &&
+          other.assetId == this.assetId &&
+          other.memoryId == this.memoryId);
+}
+
+class MemoryAssetEntityCompanion
+    extends i0.UpdateCompanion<i1.MemoryAssetEntityData> {
+  final i0.Value<String> assetId;
+  final i0.Value<String> memoryId;
+  const MemoryAssetEntityCompanion({
+    this.assetId = const i0.Value.absent(),
+    this.memoryId = const i0.Value.absent(),
+  });
+  MemoryAssetEntityCompanion.insert({
+    required String assetId,
+    required String memoryId,
+  })  : assetId = i0.Value(assetId),
+        memoryId = i0.Value(memoryId);
+  static i0.Insertable<i1.MemoryAssetEntityData> custom({
+    i0.Expression<String>? assetId,
+    i0.Expression<String>? memoryId,
+  }) {
+    return i0.RawValuesInsertable({
+      if (assetId != null) 'asset_id': assetId,
+      if (memoryId != null) 'memory_id': memoryId,
+    });
+  }
+
+  i1.MemoryAssetEntityCompanion copyWith(
+      {i0.Value<String>? assetId, i0.Value<String>? memoryId}) {
+    return i1.MemoryAssetEntityCompanion(
+      assetId: assetId ?? this.assetId,
+      memoryId: memoryId ?? this.memoryId,
+    );
+  }
+
+  @override
+  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    if (assetId.present) {
+      map['asset_id'] = i0.Variable<String>(assetId.value);
+    }
+    if (memoryId.present) {
+      map['memory_id'] = i0.Variable<String>(memoryId.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MemoryAssetEntityCompanion(')
+          ..write('assetId: $assetId, ')
+          ..write('memoryId: $memoryId')
+          ..write(')'))
+        .toString();
+  }
+}
--- a/mobile/lib/infrastructure/entities/merged_asset.drift
+++ b/mobile/lib/infrastructure/entities/merged_asset.drift
@@ -1,7 +1,7 @@
 import 'remote_asset.entity.dart';
 import 'local_asset.entity.dart';

-mergedAsset: SELECT * FROM 
+mergedAsset: SELECT * FROM
 (
 	SELECT
 		rae.id as remote_id,
@@ -22,7 +22,7 @@ mergedAsset: SELECT * FROM
 	LEFT JOIN
 		local_asset_entity lae ON rae.checksum  = lae.checksum
 	WHERE
-		rae.visibility = 0 AND rae.owner_id in ?
+		rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id in ?
 	UNION ALL
 	SELECT
 		NULL as remote_id,
@@ -48,12 +48,12 @@ mergedAsset: SELECT * FROM
 ORDER BY created_at DESC
 LIMIT $limit;

-mergedBucket(:group_by AS INTEGER): 
-SELECT 
+mergedBucket(:group_by AS INTEGER):
+SELECT
 	COUNT(*) as asset_count,
 	 CASE
-        WHEN :group_by = 0 THEN STRFTIME('%Y-%m-%d', created_at) -- day
-        WHEN :group_by = 1 THEN STRFTIME('%Y-%m', created_at) -- month
+        WHEN :group_by = 0 THEN STRFTIME('%Y-%m-%d', created_at, 'localtime') -- day
+        WHEN :group_by = 1 THEN STRFTIME('%Y-%m', created_at, 'localtime') -- month
    END AS bucket_date
 FROM
 (
@@ -65,7 +65,7 @@ FROM
 	LEFT JOIN
 		local_asset_entity lae  ON rae.checksum  = lae.checksum
 	WHERE
-		rae.visibility = 0 AND rae.owner_id in ?
+		rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id in ?
 	UNION ALL
 	SELECT
 		lae.name,
--- a/mobile/lib/infrastructure/entities/merged_asset.drift.dart
+++ b/mobile/lib/infrastructure/entities/merged_asset.drift.dart
@@ -18,7 +18,7 @@ class MergedAssetDrift extends i1.ModularAccessor {
    final generatedlimit = $write(limit, startIndex: $arrayStartIndex);
    $arrayStartIndex += generatedlimit.amountOfVariables;
    return customSelect(
-        'SELECT * FROM (SELECT rae.id AS remote_id, lae.id AS local_id, rae.name, rae.type, rae.created_at, rae.updated_at, rae.width, rae.height, rae.duration_in_seconds, rae.is_favorite, rae.thumb_hash, rae.checksum, rae.owner_id FROM remote_asset_entity AS rae LEFT JOIN local_asset_entity AS lae ON rae.checksum = lae.checksum WHERE rae.visibility = 0 AND rae.owner_id IN ($expandedvar1) UNION ALL SELECT NULL AS remote_id, lae.id AS local_id, lae.name, lae.type, lae.created_at, lae.updated_at, lae.width, lae.height, lae.duration_in_seconds, lae.is_favorite, NULL AS thumb_hash, lae.checksum, NULL AS owner_id FROM local_asset_entity AS lae LEFT JOIN remote_asset_entity AS rae ON rae.checksum = lae.checksum WHERE rae.id IS NULL) ORDER BY created_at DESC ${generatedlimit.sql}',
+        'SELECT * FROM (SELECT rae.id AS remote_id, lae.id AS local_id, rae.name, rae.type, rae.created_at, rae.updated_at, rae.width, rae.height, rae.duration_in_seconds, rae.is_favorite, rae.thumb_hash, rae.checksum, rae.owner_id FROM remote_asset_entity AS rae LEFT JOIN local_asset_entity AS lae ON rae.checksum = lae.checksum WHERE rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id IN ($expandedvar1) UNION ALL SELECT NULL AS remote_id, lae.id AS local_id, lae.name, lae.type, lae.created_at, lae.updated_at, lae.width, lae.height, lae.duration_in_seconds, lae.is_favorite, NULL AS thumb_hash, lae.checksum, NULL AS owner_id FROM local_asset_entity AS lae LEFT JOIN remote_asset_entity AS rae ON rae.checksum = lae.checksum WHERE rae.id IS NULL) ORDER BY created_at DESC ${generatedlimit.sql}',
        variables: [
          for (var $ in var1) i0.Variable<String>($),
          ...generatedlimit.introducedVariables
@@ -51,7 +51,7 @@ class MergedAssetDrift extends i1.ModularAccessor {
    final expandedvar2 = $expandVar($arrayStartIndex, var2.length);
    $arrayStartIndex += var2.length;
    return customSelect(
-        'SELECT COUNT(*) AS asset_count, CASE WHEN ?1 = 0 THEN STRFTIME(\'%Y-%m-%d\', created_at) WHEN ?1 = 1 THEN STRFTIME(\'%Y-%m\', created_at) END AS bucket_date FROM (SELECT rae.name, rae.created_at FROM remote_asset_entity AS rae LEFT JOIN local_asset_entity AS lae ON rae.checksum = lae.checksum WHERE rae.visibility = 0 AND rae.owner_id IN ($expandedvar2) UNION ALL SELECT lae.name, lae.created_at FROM local_asset_entity AS lae LEFT JOIN remote_asset_entity AS rae ON rae.checksum = lae.checksum WHERE rae.id IS NULL) GROUP BY bucket_date ORDER BY bucket_date DESC',
+        'SELECT COUNT(*) AS asset_count, CASE WHEN ?1 = 0 THEN STRFTIME(\'%Y-%m-%d\', created_at, \'localtime\') WHEN ?1 = 1 THEN STRFTIME(\'%Y-%m\', created_at, \'localtime\') END AS bucket_date FROM (SELECT rae.name, rae.created_at FROM remote_asset_entity AS rae LEFT JOIN local_asset_entity AS lae ON rae.checksum = lae.checksum WHERE rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id IN ($expandedvar2) UNION ALL SELECT lae.name, lae.created_at FROM local_asset_entity AS lae LEFT JOIN remote_asset_entity AS rae ON rae.checksum = lae.checksum WHERE rae.id IS NULL) GROUP BY bucket_date ORDER BY bucket_date DESC',
        variables: [
          i0.Variable<int>(groupBy),
          for (var $ in var2) i0.Variable<String>($)
--- a/mobile/lib/infrastructure/entities/remote_asset.entity.dart
+++ b/mobile/lib/infrastructure/entities/remote_asset.entity.dart
@@ -37,9 +37,10 @@ class RemoteAssetEntity extends Table
 }

 extension RemoteAssetEntityDataDomainEx on RemoteAssetEntityData {
-  Asset toDto() => Asset(
+  RemoteAsset toDto() => RemoteAsset(
        id: id,
        name: name,
+        ownerId: ownerId,
        checksum: checksum,
        type: type,
        createdAt: createdAt,
--- a/mobile/lib/infrastructure/repositories/db.repository.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.dart
@@ -7,6 +7,8 @@ import 'package:immich_mobile/infrastructure/entities/exif.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_album.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_album_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_asset.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/memory.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/memory_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/partner.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.dart';
@@ -46,6 +48,8 @@ class IsarDatabaseRepository implements IDatabaseRepository {
    RemoteAlbumEntity,
    RemoteAlbumAssetEntity,
    RemoteAlbumUserEntity,
+    MemoryEntity,
+    MemoryAssetEntity,
  ],
  include: {
    'package:immich_mobile/infrastructure/entities/merged_asset.drift',
--- a/mobile/lib/infrastructure/repositories/db.repository.drift.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.drift.dart
@@ -23,9 +23,13 @@ import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.
    as i10;
 import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.drift.dart'
    as i11;
-import 'package:immich_mobile/infrastructure/entities/merged_asset.drift.dart'
+import 'package:immich_mobile/infrastructure/entities/memory.entity.drift.dart'
    as i12;
-import 'package:drift/internal/modular.dart' as i13;
+import 'package:immich_mobile/infrastructure/entities/memory_asset.entity.drift.dart'
+    as i13;
+import 'package:immich_mobile/infrastructure/entities/merged_asset.drift.dart'
+    as i14;
+import 'package:drift/internal/modular.dart' as i15;

 abstract class $Drift extends i0.GeneratedDatabase {
  $Drift(i0.QueryExecutor e) : super(e);
@@ -51,8 +55,11 @@ abstract class $Drift extends i0.GeneratedDatabase {
      i10.$RemoteAlbumAssetEntityTable(this);
  late final i11.$RemoteAlbumUserEntityTable remoteAlbumUserEntity =
      i11.$RemoteAlbumUserEntityTable(this);
-  i12.MergedAssetDrift get mergedAssetDrift => i13.ReadDatabaseContainer(this)
-      .accessor<i12.MergedAssetDrift>(i12.MergedAssetDrift.new);
+  late final i12.$MemoryEntityTable memoryEntity = i12.$MemoryEntityTable(this);
+  late final i13.$MemoryAssetEntityTable memoryAssetEntity =
+      i13.$MemoryAssetEntityTable(this);
+  i14.MergedAssetDrift get mergedAssetDrift => i15.ReadDatabaseContainer(this)
+      .accessor<i14.MergedAssetDrift>(i14.MergedAssetDrift.new);
  @override
  Iterable<i0.TableInfo<i0.Table, Object?>> get allTables =>
      allSchemaEntities.whereType<i0.TableInfo<i0.Table, Object?>>();
@@ -71,7 +78,9 @@ abstract class $Drift extends i0.GeneratedDatabase {
        remoteExifEntity,
        remoteAlbumEntity,
        remoteAlbumAssetEntity,
-        remoteAlbumUserEntity
+        remoteAlbumUserEntity,
+        memoryEntity,
+        memoryAssetEntity
      ];
  @override
  i0.StreamQueryUpdateRules get streamUpdateRules =>
@@ -175,6 +184,27 @@ abstract class $Drift extends i0.GeneratedDatabase {
                  kind: i0.UpdateKind.delete),
            ],
          ),
+          i0.WritePropagation(
+            on: i0.TableUpdateQuery.onTableName('user_entity',
+                limitUpdateKind: i0.UpdateKind.delete),
+            result: [
+              i0.TableUpdate('memory_entity', kind: i0.UpdateKind.delete),
+            ],
+          ),
+          i0.WritePropagation(
+            on: i0.TableUpdateQuery.onTableName('remote_asset_entity',
+                limitUpdateKind: i0.UpdateKind.delete),
+            result: [
+              i0.TableUpdate('memory_asset_entity', kind: i0.UpdateKind.delete),
+            ],
+          ),
+          i0.WritePropagation(
+            on: i0.TableUpdateQuery.onTableName('memory_entity',
+                limitUpdateKind: i0.UpdateKind.delete),
+            result: [
+              i0.TableUpdate('memory_asset_entity', kind: i0.UpdateKind.delete),
+            ],
+          ),
        ],
      );
  @override
@@ -208,4 +238,8 @@ class $DriftManager {
          _db, _db.remoteAlbumAssetEntity);
  i11.$$RemoteAlbumUserEntityTableTableManager get remoteAlbumUserEntity => i11
      .$$RemoteAlbumUserEntityTableTableManager(_db, _db.remoteAlbumUserEntity);
+  i12.$$MemoryEntityTableTableManager get memoryEntity =>
+      i12.$$MemoryEntityTableTableManager(_db, _db.memoryEntity);
+  i13.$$MemoryAssetEntityTableTableManager get memoryAssetEntity =>
+      i13.$$MemoryAssetEntityTableTableManager(_db, _db.memoryAssetEntity);
 }
--- a/mobile/lib/infrastructure/repositories/local_asset.repository.dart
+++ b/mobile/lib/infrastructure/repositories/local_asset.repository.dart
@@ -1,5 +1,6 @@
 import 'package:drift/drift.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/infrastructure/entities/local_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';

@@ -7,6 +8,26 @@ class DriftLocalAssetRepository extends DriftDatabaseRepository {
  final Drift _db;
  const DriftLocalAssetRepository(this._db) : super(_db);

+  Stream<LocalAsset?> watchAsset(String id) {
+    final query = _db.localAssetEntity
+        .select()
+        .addColumns([_db.localAssetEntity.id]).join([
+      leftOuterJoin(
+        _db.remoteAssetEntity,
+        _db.localAssetEntity.checksum.equalsExp(_db.remoteAssetEntity.checksum),
+        useColumns: false,
+      ),
+    ])
+      ..where(_db.localAssetEntity.id.equals(id));
+
+    return query.map((row) {
+      final asset = row.readTable(_db.localAssetEntity).toDto();
+      return asset.copyWith(
+        remoteId: row.read(_db.remoteAssetEntity.id),
+      );
+    }).watchSingleOrNull();
+  }
+
  Future<void> updateHashes(Iterable<LocalAsset> hashes) {
    if (hashes.isEmpty) {
      return Future.value();
--- a/mobile/lib/infrastructure/repositories/memory.repository.dart
+++ b/mobile/lib/infrastructure/repositories/memory.repository.dart
@@ -0,0 +1,81 @@
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/models/memory.model.dart';
+import 'package:immich_mobile/infrastructure/entities/memory.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
+import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+
+class DriftMemoryRepository extends DriftDatabaseRepository {
+  final Drift _db;
+  const DriftMemoryRepository(this._db) : super(_db);
+
+  Future<List<DriftMemory>> getAll(String ownerId) async {
+    final now = DateTime.now();
+    final localUtc = DateTime.utc(now.year, now.month, now.day, 0, 0, 0);
+
+    final query = _db.select(_db.memoryEntity).join([
+      leftOuterJoin(
+        _db.memoryAssetEntity,
+        _db.memoryAssetEntity.memoryId.equalsExp(_db.memoryEntity.id),
+      ),
+      leftOuterJoin(
+        _db.remoteAssetEntity,
+        _db.remoteAssetEntity.id.equalsExp(_db.memoryAssetEntity.assetId) &
+            _db.remoteAssetEntity.deletedAt.isNull() &
+            _db.remoteAssetEntity.visibility
+                .equalsValue(AssetVisibility.timeline),
+      ),
+    ])
+      ..where(_db.memoryEntity.ownerId.equals(ownerId))
+      ..where(_db.memoryEntity.deletedAt.isNull())
+      ..where(
+        _db.memoryEntity.showAt.isSmallerOrEqualValue(localUtc),
+      )
+      ..where(
+        _db.memoryEntity.hideAt.isBiggerOrEqualValue(localUtc),
+      )
+      ..orderBy([
+        OrderingTerm.desc(_db.memoryEntity.memoryAt),
+        OrderingTerm.asc(_db.remoteAssetEntity.createdAt),
+      ]);
+
+    final rows = await query.get();
+
+    final Map<String, DriftMemory> memoriesMap = {};
+
+    for (final row in rows) {
+      final memory = row.readTable(_db.memoryEntity);
+      final asset = row.readTable(_db.remoteAssetEntity);
+
+      final existingMemory = memoriesMap[memory.id];
+      if (existingMemory != null) {
+        existingMemory.assets.add(asset.toDto());
+      } else {
+        final assets = [asset.toDto()];
+        memoriesMap[memory.id] = memory.toDto().copyWith(assets: assets);
+      }
+    }
+
+    return memoriesMap.values.toList();
+  }
+}
+
+extension on MemoryEntityData {
+  DriftMemory toDto() {
+    return DriftMemory(
+      id: id,
+      createdAt: createdAt,
+      updatedAt: updatedAt,
+      deletedAt: deletedAt,
+      ownerId: ownerId,
+      type: type,
+      data: MemoryData.fromJson(data),
+      isSaved: isSaved,
+      memoryAt: memoryAt,
+      seenAt: seenAt,
+      showAt: showAt,
+      hideAt: hideAt,
+      assets: [],
+    );
+  }
+}
--- a/mobile/lib/infrastructure/repositories/remote_album.repository.dart
+++ b/mobile/lib/infrastructure/repositories/remote_album.repository.dart
@@ -10,26 +10,48 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
  const DriftRemoteAlbumRepository(this._db) : super(_db);

  Future<List<Album>> getAll({Set<SortRemoteAlbumsBy> sortBy = const {}}) {
-    final query = _db.remoteAlbumEntity.select();
+    final assetCount = _db.remoteAlbumAssetEntity.assetId.count();
+
+    final query = _db.remoteAlbumEntity.select().join([
+      leftOuterJoin(
+        _db.remoteAlbumAssetEntity,
+        _db.remoteAlbumAssetEntity.albumId.equalsExp(_db.remoteAlbumEntity.id),
+        useColumns: false,
+      ),
+      leftOuterJoin(
+        _db.userEntity,
+        _db.userEntity.id.equalsExp(_db.remoteAlbumEntity.ownerId),
+      ),
+    ]);
+    query
+      ..addColumns([assetCount])
+      ..groupBy([_db.remoteAlbumEntity.id]);

    if (sortBy.isNotEmpty) {
-      final orderings = <OrderClauseGenerator<$RemoteAlbumEntityTable>>[];
+      final orderings = <OrderingTerm>[];
      for (final sort in sortBy) {
        orderings.add(
          switch (sort) {
-            SortRemoteAlbumsBy.id => (row) => OrderingTerm.asc(row.id),
+            SortRemoteAlbumsBy.id => OrderingTerm.asc(_db.remoteAlbumEntity.id),
          },
        );
      }
      query.orderBy(orderings);
    }

-    return query.map((row) => row.toDto()).get();
+    return query
+        .map(
+          (row) => row.readTable(_db.remoteAlbumEntity).toDto(
+                assetCount: row.read(assetCount) ?? 0,
+                ownerName: row.readTable(_db.userEntity).name,
+              ),
+        )
+        .get();
  }
 }

 extension on RemoteAlbumEntityData {
-  Album toDto() {
+  Album toDto({int assetCount = 0, required String ownerName}) {
    return Album(
      id: id,
      name: name,
@@ -40,6 +62,8 @@ extension on RemoteAlbumEntityData {
      thumbnailAssetId: thumbnailAssetId,
      isActivityEnabled: isActivityEnabled,
      order: order,
+      assetCount: assetCount,
+      ownerName: ownerName,
    );
  }
 }
--- a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
+++ b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
@@ -0,0 +1,97 @@
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/models/exif.model.dart';
+import 'package:immich_mobile/infrastructure/entities/exif.entity.dart'
+    hide ExifInfo;
+import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+import 'package:maplibre_gl/maplibre_gl.dart';
+
+class RemoteAssetRepository extends DriftDatabaseRepository {
+  final Drift _db;
+  const RemoteAssetRepository(this._db) : super(_db);
+
+  Stream<RemoteAsset?> watchAsset(String id) {
+    final query = _db.remoteAssetEntity
+        .select()
+        .addColumns([_db.localAssetEntity.id]).join([
+      leftOuterJoin(
+        _db.localAssetEntity,
+        _db.remoteAssetEntity.checksum.equalsExp(_db.localAssetEntity.checksum),
+        useColumns: false,
+      ),
+    ])
+      ..where(_db.remoteAssetEntity.id.equals(id));
+
+    return query.map((row) {
+      final asset = row.readTable(_db.remoteAssetEntity).toDto();
+      return asset.copyWith(
+        localId: row.read(_db.localAssetEntity.id),
+      );
+    }).watchSingleOrNull();
+  }
+
+  Future<ExifInfo?> getExif(String id) {
+    return _db.managers.remoteExifEntity
+        .filter((row) => row.assetId.id.equals(id))
+        .map((row) => row.toDto())
+        .getSingleOrNull();
+  }
+
+  Future<void> updateFavorite(List<String> ids, bool isFavorite) {
+    return _db.batch((batch) async {
+      for (final id in ids) {
+        batch.update(
+          _db.remoteAssetEntity,
+          RemoteAssetEntityCompanion(isFavorite: Value(isFavorite)),
+          where: (e) => e.id.equals(id),
+        );
+      }
+    });
+  }
+
+  Future<void> updateVisibility(List<String> ids, AssetVisibility visibility) {
+    return _db.batch((batch) async {
+      for (final id in ids) {
+        batch.update(
+          _db.remoteAssetEntity,
+          RemoteAssetEntityCompanion(visibility: Value(visibility)),
+          where: (e) => e.id.equals(id),
+        );
+      }
+    });
+  }
+
+  Future<void> trash(List<String> ids) {
+    return _db.batch((batch) async {
+      for (final id in ids) {
+        batch.update(
+          _db.remoteAssetEntity,
+          RemoteAssetEntityCompanion(deletedAt: Value(DateTime.now())),
+          where: (e) => e.id.equals(id),
+        );
+      }
+    });
+  }
+
+  Future<void> delete(List<String> ids) {
+    return _db.remoteAssetEntity.deleteWhere((row) => row.id.isIn(ids));
+  }
+
+  Future<void> updateLocation(List<String> ids, LatLng location) {
+    return _db.batch((batch) async {
+      for (final id in ids) {
+        batch.update(
+          _db.remoteExifEntity,
+          RemoteExifEntityCompanion(
+            latitude: Value(location.latitude),
+            longitude: Value(location.longitude),
+          ),
+          where: (e) => e.assetId.equals(id),
+        );
+      }
+    });
+  }
+}
--- a/mobile/lib/infrastructure/repositories/storage.repository.dart
+++ b/mobile/lib/infrastructure/repositories/storage.repository.dart
@@ -5,20 +5,21 @@ import 'package:logging/logging.dart';
 import 'package:photo_manager/photo_manager.dart';

 class StorageRepository {
-  final _log = Logger('StorageRepository');
+  const StorageRepository();

  Future<File?> getFileForAsset(LocalAsset asset) async {
+    final log = Logger('StorageRepository');
    File? file;
    try {
      final entity = await AssetEntity.fromId(asset.id);
      file = await entity?.originFile;
      if (file == null) {
-        _log.warning(
+        log.warning(
          "Cannot get file for asset ${asset.id}, name: ${asset.name}, created on: ${asset.createdAt}",
        );
      }
    } catch (error, stackTrace) {
-      _log.warning(
+      log.warning(
        "Error getting file for asset ${asset.id}, name: ${asset.name}, created on: ${asset.createdAt}",
        error,
        stackTrace,
--- a/mobile/lib/infrastructure/repositories/sync_api.repository.dart
+++ b/mobile/lib/infrastructure/repositories/sync_api.repository.dart
@@ -52,6 +52,8 @@ class SyncApiRepository {
          SyncRequestType.albumAssetsV1,
          SyncRequestType.albumAssetExifsV1,
          SyncRequestType.albumToAssetsV1,
+          SyncRequestType.memoriesV1,
+          SyncRequestType.memoryToAssetsV1,
        ],
      ).toJson(),
    );
@@ -157,6 +159,10 @@ const _kResponseMap = <SyncEntityType, Function(Object)>{
  SyncEntityType.albumToAssetBackfillV1: SyncAlbumToAssetV1.fromJson,
  SyncEntityType.albumToAssetDeleteV1: SyncAlbumToAssetDeleteV1.fromJson,
  SyncEntityType.syncAckV1: _SyncAckV1.fromJson,
+  SyncEntityType.memoryV1: SyncMemoryV1.fromJson,
+  SyncEntityType.memoryDeleteV1: SyncMemoryDeleteV1.fromJson,
+  SyncEntityType.memoryToAssetV1: SyncMemoryAssetV1.fromJson,
+  SyncEntityType.memoryToAssetDeleteV1: SyncMemoryAssetDeleteV1.fromJson,
 };

 class _SyncAckV1 {
--- a/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
+++ b/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
@@ -1,12 +1,17 @@
+import 'dart:convert';
+
 import 'package:drift/drift.dart';
 import 'package:immich_mobile/domain/models/album/album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/models/memory.model.dart';
 import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/entities/memory_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/partner.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/entities/memory.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:logging/logging.dart';
@@ -64,8 +69,8 @@ class SyncStreamRepository extends DriftDatabaseRepository {
          );
        }
      });
-    } catch (e, s) {
-      _logger.severe('Error: SyncPartnerDeleteV1', e, s);
+    } catch (error, stackTrace) {
+      _logger.severe('Error: SyncPartnerDeleteV1', error, stackTrace);
      rethrow;
    }
  }
@@ -87,8 +92,8 @@ class SyncStreamRepository extends DriftDatabaseRepository {
          );
        }
      });
-    } catch (e, s) {
-      _logger.severe('Error: SyncPartnerV1', e, s);
+    } catch (error, stackTrace) {
+      _logger.severe('Error: SyncPartnerV1', error, stackTrace);
      rethrow;
    }
  }
@@ -98,10 +103,11 @@ class SyncStreamRepository extends DriftDatabaseRepository {
    String debugLabel = 'user',
  }) async {
    try {
-      await _db.remoteAssetEntity
-          .deleteWhere((row) => row.id.isIn(data.map((e) => e.assetId)));
-    } catch (e, s) {
-      _logger.severe('Error: deleteAssetsV1 - $debugLabel', e, s);
+      await _db.remoteAssetEntity.deleteWhere(
+        (row) => row.id.isIn(data.map((error) => error.assetId)),
+      );
+    } catch (error, stackTrace) {
+      _logger.severe('Error: deleteAssetsV1 - $debugLabel', error, stackTrace);
      rethrow;
    }
  }
@@ -136,8 +142,8 @@ class SyncStreamRepository extends DriftDatabaseRepository {
          );
        }
      });
-    } catch (e, s) {
-      _logger.severe('Error: updateAssetsV1 - $debugLabel', e, s);
+    } catch (error, stackTrace) {
+      _logger.severe('Error: updateAssetsV1 - $debugLabel', error, stackTrace);
      rethrow;
    }
  }
@@ -161,8 +167,8 @@ class SyncStreamRepository extends DriftDatabaseRepository {
            fNumber: Value(exif.fNumber),
            fileSize: Value(exif.fileSizeInByte),
            focalLength: Value(exif.focalLength),
-            latitude: Value(exif.latitude),
-            longitude: Value(exif.longitude),
+            latitude: Value(exif.latitude?.toDouble()),
+            longitude: Value(exif.longitude?.toDouble()),
            iso: Value(exif.iso),
            make: Value(exif.make),
            model: Value(exif.model),
@@ -170,6 +176,7 @@ class SyncStreamRepository extends DriftDatabaseRepository {
            timeZone: Value(exif.timeZone),
            rating: Value(exif.rating),
            projectionType: Value(exif.projectionType),
+            lens: Value(exif.lensModel),
          );

          batch.insert(
@@ -179,18 +186,23 @@ class SyncStreamRepository extends DriftDatabaseRepository {
          );
        }
      });
-    } catch (e, s) {
-      _logger.severe('Error: updateAssetsExifV1 - $debugLabel', e, s);
+    } catch (error, stackTrace) {
+      _logger.severe(
+        'Error: updateAssetsExifV1 - $debugLabel',
+        error,
+        stackTrace,
+      );
      rethrow;
    }
  }

  Future<void> deleteAlbumsV1(Iterable<SyncAlbumDeleteV1> data) async {
    try {
-      await _db.remoteAlbumEntity
-          .deleteWhere((row) => row.id.isIn(data.map((e) => e.albumId)));
-    } catch (e, s) {
-      _logger.severe('Error: deleteAlbumsV1', e, s);
+      await _db.remoteAlbumEntity.deleteWhere(
+        (row) => row.id.isIn(data.map((e) => e.albumId)),
+      );
+    } catch (error, stackTrace) {
+      _logger.severe('Error: deleteAlbumsV1', error, stackTrace);
      rethrow;
    }
  }
@@ -217,8 +229,8 @@ class SyncStreamRepository extends DriftDatabaseRepository {
          );
        }
      });
-    } catch (e, s) {
-      _logger.severe('Error: updateAlbumsV1', e, s);
+    } catch (error, stackTrace) {
+      _logger.severe('Error: updateAlbumsV1', error, stackTrace);
      rethrow;
    }
  }
@@ -236,8 +248,8 @@ class SyncStreamRepository extends DriftDatabaseRepository {
          );
        }
      });
-    } catch (e, s) {
-      _logger.severe('Error: deleteAlbumUsersV1', e, s);
+    } catch (error, stackTrace) {
+      _logger.severe('Error: deleteAlbumUsersV1', error, stackTrace);
      rethrow;
    }
  }
@@ -263,8 +275,12 @@ class SyncStreamRepository extends DriftDatabaseRepository {
          );
        }
      });
-    } catch (e, s) {
-      _logger.severe('Error: updateAlbumUsersV1 - $debugLabel', e, s);
+    } catch (error, stackTrace) {
+      _logger.severe(
+        'Error: updateAlbumUsersV1 - $debugLabel',
+        error,
+        stackTrace,
+      );
      rethrow;
    }
  }
@@ -284,8 +300,8 @@ class SyncStreamRepository extends DriftDatabaseRepository {
          );
        }
      });
-    } catch (e, s) {
-      _logger.severe('Error: deleteAlbumToAssetsV1', e, s);
+    } catch (error, stackTrace) {
+      _logger.severe('Error: deleteAlbumToAssetsV1', error, stackTrace);
      rethrow;
    }
  }
@@ -309,8 +325,96 @@ class SyncStreamRepository extends DriftDatabaseRepository {
          );
        }
      });
-    } catch (e, s) {
-      _logger.severe('Error: updateAlbumToAssetsV1 - $debugLabel', e, s);
+    } catch (error, stackTrace) {
+      _logger.severe(
+        'Error: updateAlbumToAssetsV1 - $debugLabel',
+        error,
+        stackTrace,
+      );
+      rethrow;
+    }
+  }
+
+  Future<void> updateMemoriesV1(Iterable<SyncMemoryV1> data) async {
+    try {
+      await _db.batch((batch) {
+        for (final memory in data) {
+          final companion = MemoryEntityCompanion(
+            createdAt: Value(memory.createdAt),
+            deletedAt: Value(memory.deletedAt),
+            ownerId: Value(memory.ownerId),
+            type: Value(memory.type.toMemoryType()),
+            data: Value(jsonEncode(memory.data)),
+            isSaved: Value(memory.isSaved),
+            memoryAt: Value(memory.memoryAt),
+            seenAt: Value.absentIfNull(memory.seenAt),
+            showAt: Value.absentIfNull(memory.showAt),
+            hideAt: Value.absentIfNull(memory.hideAt),
+          );
+
+          batch.insert(
+            _db.memoryEntity,
+            companion.copyWith(id: Value(memory.id)),
+            onConflict: DoUpdate((_) => companion),
+          );
+        }
+      });
+    } catch (error, stackTrace) {
+      _logger.severe('Error: updateMemoriesV1', error, stackTrace);
+      rethrow;
+    }
+  }
+
+  Future<void> deleteMemoriesV1(Iterable<SyncMemoryDeleteV1> data) async {
+    try {
+      await _db.memoryEntity.deleteWhere(
+        (row) => row.id.isIn(data.map((e) => e.memoryId)),
+      );
+    } catch (error, stackTrace) {
+      _logger.severe('Error: deleteMemoriesV1', error, stackTrace);
+      rethrow;
+    }
+  }
+
+  Future<void> updateMemoryAssetsV1(Iterable<SyncMemoryAssetV1> data) async {
+    try {
+      await _db.batch((batch) {
+        for (final asset in data) {
+          final companion = MemoryAssetEntityCompanion(
+            memoryId: Value(asset.memoryId),
+            assetId: Value(asset.assetId),
+          );
+
+          batch.insert(
+            _db.memoryAssetEntity,
+            companion,
+            onConflict: DoNothing(),
+          );
+        }
+      });
+    } catch (error, stackTrace) {
+      _logger.severe('Error: updateMemoryAssetsV1', error, stackTrace);
+      rethrow;
+    }
+  }
+
+  Future<void> deleteMemoryAssetsV1(
+    Iterable<SyncMemoryAssetDeleteV1> data,
+  ) async {
+    try {
+      await _db.batch((batch) {
+        for (final asset in data) {
+          batch.delete(
+            _db.memoryAssetEntity,
+            MemoryAssetEntityCompanion(
+              memoryId: Value(asset.memoryId),
+              assetId: Value(asset.assetId),
+            ),
+          );
+        }
+      });
+    } catch (error, stackTrace) {
+      _logger.severe('Error: deleteMemoryAssetsV1', error, stackTrace);
      rethrow;
    }
  }
@@ -334,6 +438,13 @@ extension on AssetOrder {
      };
 }

+extension on MemoryType {
+  MemoryTypeEnum toMemoryType() => switch (this) {
+        MemoryType.onThisDay => MemoryTypeEnum.onThisDay,
+        _ => throw Exception('Unknown MemoryType value: $this'),
+      };
+}
+
 extension on api.AlbumUserRole {
  AlbumUserRole toAlbumUserRole() => switch (this) {
        api.AlbumUserRole.editor => AlbumUserRole.editor,
@@ -356,7 +467,7 @@ extension on String {
  Duration? toDuration() {
    try {
      final parts = split(':')
-          .map((e) => double.parse(e).toInt())
+          .map((error) => double.parse(error).toInt())
          .toList(growable: false);

      return Duration(hours: parts[0], minutes: parts[1], seconds: parts[2]);
--- a/mobile/lib/infrastructure/repositories/timeline.repository.dart
+++ b/mobile/lib/infrastructure/repositories/timeline.repository.dart
@@ -70,36 +70,38 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
    return _db.mergedAssetDrift
        .mergedAsset(userIds, limit: Limit(count, offset))
        .map(
-          (row) => row.remoteId != null
-              ? Asset(
-                  id: row.remoteId!,
-                  localId: row.localId,
-                  name: row.name,
-                  checksum: row.checksum,
-                  type: row.type,
-                  createdAt: row.createdAt,
-                  updatedAt: row.updatedAt,
-                  thumbHash: row.thumbHash,
-                  width: row.width,
-                  height: row.height,
-                  isFavorite: row.isFavorite,
-                  durationInSeconds: row.durationInSeconds,
-                )
-              : LocalAsset(
-                  id: row.localId!,
-                  remoteId: row.remoteId,
-                  name: row.name,
-                  checksum: row.checksum,
-                  type: row.type,
-                  createdAt: row.createdAt,
-                  updatedAt: row.updatedAt,
-                  width: row.width,
-                  height: row.height,
-                  isFavorite: row.isFavorite,
-                  durationInSeconds: row.durationInSeconds,
-                ),
-        )
-        .get();
+      (row) {
+        return row.remoteId != null && row.ownerId != null
+            ? RemoteAsset(
+                id: row.remoteId!,
+                localId: row.localId,
+                name: row.name,
+                ownerId: row.ownerId!,
+                checksum: row.checksum,
+                type: row.type,
+                createdAt: row.createdAt,
+                updatedAt: row.updatedAt,
+                thumbHash: row.thumbHash,
+                width: row.width,
+                height: row.height,
+                isFavorite: row.isFavorite,
+                durationInSeconds: row.durationInSeconds,
+              )
+            : LocalAsset(
+                id: row.localId!,
+                remoteId: row.remoteId,
+                name: row.name,
+                checksum: row.checksum,
+                type: row.type,
+                createdAt: row.createdAt,
+                updatedAt: row.updatedAt,
+                width: row.width,
+                height: row.height,
+                isFavorite: row.isFavorite,
+                durationInSeconds: row.durationInSeconds,
+              );
+      },
+    ).get();
  }

  Stream<List<Bucket>> watchLocalBucket(
--- a/mobile/lib/pages/common/gallery_viewer.page.dart
+++ b/mobile/lib/pages/common/gallery_viewer.page.dart
@@ -238,7 +238,7 @@ class GalleryViewerPage extends HookConsumerWidget {

    PhotoViewGalleryPageOptions buildImage(Asset asset) {
      return PhotoViewGalleryPageOptions(
-        onDragStart: (_, details, __) {
+        onDragStart: (_, details, __, ___) {
          localPosition.value = details.localPosition;
        },
        onDragUpdate: (_, details, __) {
@@ -267,7 +267,7 @@ class GalleryViewerPage extends HookConsumerWidget {

    PhotoViewGalleryPageOptions buildVideo(BuildContext context, Asset asset) {
      return PhotoViewGalleryPageOptions.customChild(
-        onDragStart: (_, details, __) =>
+        onDragStart: (_, details, __, ___) =>
            localPosition.value = details.localPosition,
        onDragUpdate: (_, details, __) => handleSwipeUpDown(details),
        heroAttributes: _getHeroAttributes(asset),
@@ -370,7 +370,7 @@ class GalleryViewerPage extends HookConsumerWidget {
                  ),
              itemCount: totalAssets.value,
              scrollDirection: Axis.horizontal,
-              onPageChanged: (value) {
+              onPageChanged: (value, _) {
                final next = currentIndex.value < value ? value + 1 : value - 1;

                ref.read(hapticFeedbackProvider.notifier).selectionClick();
--- a/mobile/lib/pages/common/tab_shell.page.dart
+++ b/mobile/lib/pages/common/tab_shell.page.dart
@@ -4,11 +4,11 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/providers/asset_viewer/scroll_notifier.provider.dart';
-import 'package:immich_mobile/providers/multiselect.provider.dart';
-import 'package:immich_mobile/providers/search/search_input_focus.provider.dart';
-import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
+import 'package:immich_mobile/providers/search/search_input_focus.provider.dart';
 import 'package:immich_mobile/providers/tab.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/routing/router.dart';

@RoutePage()
 class TabShellPage extends ConsumerWidget {
@@ -42,22 +42,6 @@ class TabShellPage extends ConsumerWidget {
      );
    }

-    void onNavigationSelected(TabsRouter router, int index) {
-      // On Photos page menu tapped
-      if (router.activeIndex == 0 && index == 0) {
-        scrollToTopNotifierProvider.scrollToTop();
-      }
-
-      // On Search page tapped
-      if (router.activeIndex == 1 && index == 1) {
-        ref.read(searchInputFocusProvider).requestFocus();
-      }
-
-      ref.read(hapticFeedbackProvider.notifier).selectionClick();
-      router.setActiveIndex(index);
-      ref.read(tabProvider.notifier).state = TabEnum.values[index];
-    }
-
    final navigationDestinations = [
      NavigationDestination(
        label: 'photos'.tr(),
@@ -110,15 +94,6 @@ class TabShellPage extends ConsumerWidget {
      ),
    ];

-    Widget bottomNavigationBar(TabsRouter tabsRouter) {
-      return NavigationBar(
-        selectedIndex: tabsRouter.activeIndex,
-        onDestinationSelected: (index) =>
-            onNavigationSelected(tabsRouter, index),
-        destinations: navigationDestinations,
-      );
-    }
-
    Widget navigationRail(TabsRouter tabsRouter) {
      return NavigationRail(
        destinations: navigationDestinations
@@ -131,19 +106,18 @@ class TabShellPage extends ConsumerWidget {
            )
            .toList(),
        onDestinationSelected: (index) =>
-            onNavigationSelected(tabsRouter, index),
+            _onNavigationSelected(tabsRouter, index, ref),
        selectedIndex: tabsRouter.activeIndex,
        labelType: NavigationRailLabelType.all,
        groupAlignment: 0.0,
      );
    }

-    final multiselectEnabled = ref.watch(multiselectProvider);
    return AutoTabsRouter(
      routes: [
        const MainTimelineRoute(),
        SearchRoute(),
-        const AlbumsRoute(),
+        const DriftAlbumsRoute(),
        const LibraryRoute(),
      ],
      duration: const Duration(milliseconds: 600),
@@ -172,12 +146,57 @@ class TabShellPage extends ConsumerWidget {
                    ],
                  )
                : heroedChild,
-            bottomNavigationBar: multiselectEnabled || isScreenLandscape
-                ? null
-                : bottomNavigationBar(tabsRouter),
+            bottomNavigationBar: _BottomNavigationBar(
+              tabsRouter: tabsRouter,
+              destinations: navigationDestinations,
+            ),
          ),
        );
      },
    );
  }
 }
+
+void _onNavigationSelected(TabsRouter router, int index, WidgetRef ref) {
+  // On Photos page menu tapped
+  if (router.activeIndex == 0 && index == 0) {
+    scrollToTopNotifierProvider.scrollToTop();
+  }
+
+  // On Search page tapped
+  if (router.activeIndex == 1 && index == 1) {
+    ref.read(searchInputFocusProvider).requestFocus();
+  }
+
+  ref.read(hapticFeedbackProvider.notifier).selectionClick();
+  router.setActiveIndex(index);
+  ref.read(tabProvider.notifier).state = TabEnum.values[index];
+}
+
+class _BottomNavigationBar extends ConsumerWidget {
+  const _BottomNavigationBar({
+    required this.tabsRouter,
+    required this.destinations,
+  });
+
+  final List<Widget> destinations;
+  final TabsRouter tabsRouter;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final isScreenLandscape = context.orientation == Orientation.landscape;
+    final isMultiselectEnabled =
+        ref.watch(multiSelectProvider.select((s) => s.isEnabled));
+
+    if (isScreenLandscape || isMultiselectEnabled) {
+      return const SizedBox.shrink();
+    }
+
+    return NavigationBar(
+      selectedIndex: tabsRouter.activeIndex,
+      onDestinationSelected: (index) =>
+          _onNavigationSelected(tabsRouter, index, ref),
+      destinations: destinations,
+    );
+  }
+}
--- a/mobile/lib/presentation/pages/dev/local_timeline.page.dart
+++ b/mobile/lib/presentation/pages/dev/local_timeline.page.dart
@@ -1,5 +1,3 @@
-import 'dart:async';
-
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/widgets.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -20,7 +18,7 @@ class LocalTimelinePage extends StatelessWidget {
          (ref) {
            final timelineService =
                ref.watch(timelineFactoryProvider).localAlbum(albumId: albumId);
-            ref.onDispose(() => unawaited(timelineService.dispose()));
+            ref.onDispose(timelineService.dispose);
            return timelineService;
          },
        ),
--- a/mobile/lib/presentation/pages/dev/main_timeline.page.dart
+++ b/mobile/lib/presentation/pages/dev/main_timeline.page.dart
@@ -1,31 +1,32 @@
-import 'dart:async';
-
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/presentation/widgets/memory/memory_lane.widget.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';
-import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/memory.provider.dart';

@RoutePage()
-class MainTimelinePage extends StatelessWidget {
+class MainTimelinePage extends ConsumerWidget {
  const MainTimelinePage({super.key});

  @override
-  Widget build(BuildContext context) {
-    return ProviderScope(
-      overrides: [
-        timelineServiceProvider.overrideWith(
-          (ref) {
-            final timelineUsers =
-                ref.watch(timelineUsersProvider).valueOrNull ?? [];
-            final timelineService =
-                ref.watch(timelineFactoryProvider).main(timelineUsers);
-            ref.onDispose(() => unawaited(timelineService.dispose()));
-            return timelineService;
-          },
-        ),
-      ],
-      child: const Timeline(),
+  Widget build(BuildContext context, WidgetRef ref) {
+    final memoryLaneProvider = ref.watch(driftMemoryFutureProvider);
+
+    return memoryLaneProvider.when(
+      data: (memories) {
+        return memories.isEmpty
+            ? const Timeline()
+            : Timeline(
+                topSliverWidget: SliverToBoxAdapter(
+                  key: Key('memory-lane-${memories.first.assets.first.id}'),
+                  child: DriftMemoryLane(memories: memories),
+                ),
+                topSliverWidgetHeight: 200,
+              );
+      },
+      loading: () => const Timeline(),
+      error: (error, stackTrace) => const Timeline(),
    );
  }
 }
--- a/mobile/lib/presentation/pages/dev/media_stat.page.dart
+++ b/mobile/lib/presentation/pages/dev/media_stat.page.dart
@@ -154,6 +154,14 @@ final _remoteStats = [
    name: 'Remote Albums',
    load: (db) => db.managers.remoteAlbumEntity.count(),
  ),
+  _Stat(
+    name: 'Memories',
+    load: (db) => db.managers.memoryEntity.count(),
+  ),
+  _Stat(
+    name: 'Memories Assets',
+    load: (db) => db.managers.memoryAssetEntity.count(),
+  ),
 ];

@RoutePage()
--- a/mobile/lib/presentation/pages/dev/remote_timeline.page.dart
+++ b/mobile/lib/presentation/pages/dev/remote_timeline.page.dart
@@ -1,5 +1,3 @@
-import 'dart:async';
-
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/widgets.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -21,7 +19,7 @@ class RemoteTimelinePage extends StatelessWidget {
            final timelineService = ref
                .watch(timelineFactoryProvider)
                .remoteAlbum(albumId: albumId);
-            ref.onDispose(() => unawaited(timelineService.dispose()));
+            ref.onDispose(timelineService.dispose);
            return timelineService;
          },
        ),
--- a/mobile/lib/presentation/pages/drift_album.page.dart
+++ b/mobile/lib/presentation/pages/drift_album.page.dart
@@ -0,0 +1,767 @@
+import 'dart:async';
+import 'dart:math';
+
+import 'package:auto_route/auto_route.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/album/album.model.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/extensions/theme_extensions.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/models/albums/album_search.model.dart';
+import 'package:immich_mobile/pages/common/large_leading_tile.dart';
+import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/utils/remote_album.utils.dart';
+import 'package:immich_mobile/widgets/common/immich_sliver_app_bar.dart';
+import 'package:immich_mobile/widgets/common/search_field.dart';
+
+@RoutePage()
+class DriftAlbumsPage extends ConsumerStatefulWidget {
+  const DriftAlbumsPage({super.key});
+
+  @override
+  ConsumerState<DriftAlbumsPage> createState() => _DriftAlbumsPageState();
+}
+
+class _DriftAlbumsPageState extends ConsumerState<DriftAlbumsPage> {
+  bool isGrid = false;
+  final searchController = TextEditingController();
+  QuickFilterMode filterMode = QuickFilterMode.all;
+  final searchFocusNode = FocusNode();
+
+  @override
+  void initState() {
+    super.initState();
+
+    // Load albums when component mounts
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      ref.read(remoteAlbumProvider.notifier).getAll();
+    });
+
+    searchController.addListener(() {
+      onSearch(searchController.text, filterMode);
+    });
+  }
+
+  void onSearch(String searchTerm, QuickFilterMode sortMode) {
+    final userId = ref.watch(currentUserProvider)?.id;
+    ref
+        .read(remoteAlbumProvider.notifier)
+        .searchAlbums(searchTerm, userId, sortMode);
+  }
+
+  Future<void> onRefresh() async {
+    await ref.read(remoteAlbumProvider.notifier).refresh();
+  }
+
+  void toggleViewMode() {
+    setState(() {
+      isGrid = !isGrid;
+    });
+  }
+
+  void changeFilter(QuickFilterMode sortMode) {
+    setState(() {
+      filterMode = sortMode;
+    });
+  }
+
+  void clearSearch() {
+    setState(() {
+      filterMode = QuickFilterMode.all;
+      searchController.clear();
+      ref.read(remoteAlbumProvider.notifier).clearSearch();
+    });
+  }
+
+  @override
+  void dispose() {
+    searchController.dispose();
+    searchFocusNode.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final albumState = ref.watch(remoteAlbumProvider);
+    final albums = albumState.filteredAlbums;
+    final isLoading = albumState.isLoading;
+    final error = albumState.error;
+    final userId = ref.watch(currentUserProvider)?.id;
+
+    return RefreshIndicator(
+      onRefresh: onRefresh,
+      child: CustomScrollView(
+        slivers: [
+          const ImmichSliverAppBar(),
+          _SearchBar(
+            searchController: searchController,
+            searchFocusNode: searchFocusNode,
+            onSearch: onSearch,
+            filterMode: filterMode,
+            onClearSearch: clearSearch,
+          ),
+          _QuickFilterButtonRow(
+            filterMode: filterMode,
+            onChangeFilter: changeFilter,
+            onSearch: onSearch,
+            searchController: searchController,
+          ),
+          _QuickSortAndViewMode(
+            isGrid: isGrid,
+            onToggleViewMode: toggleViewMode,
+          ),
+          isGrid
+              ? _AlbumGrid(
+                  albums: albums,
+                  userId: userId,
+                  isLoading: isLoading,
+                  error: error,
+                )
+              : _AlbumList(
+                  albums: albums,
+                  userId: userId,
+                  isLoading: isLoading,
+                  error: error,
+                ),
+        ],
+      ),
+    );
+  }
+}
+
+class _SortButton extends ConsumerStatefulWidget {
+  const _SortButton();
+
+  @override
+  ConsumerState<_SortButton> createState() => _SortButtonState();
+}
+
+class _SortButtonState extends ConsumerState<_SortButton> {
+  RemoteAlbumSortMode albumSortOption = RemoteAlbumSortMode.lastModified;
+  bool albumSortIsReverse = true;
+
+  void onMenuTapped(RemoteAlbumSortMode sortMode) {
+    final selected = albumSortOption == sortMode;
+    // Switch direction
+    if (selected) {
+      setState(() {
+        albumSortIsReverse = !albumSortIsReverse;
+      });
+      ref.read(remoteAlbumProvider.notifier).sortFilteredAlbums(
+            sortMode,
+            isReverse: albumSortIsReverse,
+          );
+    } else {
+      setState(() {
+        albumSortOption = sortMode;
+      });
+      ref.read(remoteAlbumProvider.notifier).sortFilteredAlbums(
+            sortMode,
+            isReverse: albumSortIsReverse,
+          );
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return MenuAnchor(
+      style: MenuStyle(
+        elevation: const WidgetStatePropertyAll(1),
+        shape: WidgetStateProperty.all(
+          const RoundedRectangleBorder(
+            borderRadius: BorderRadius.all(
+              Radius.circular(24),
+            ),
+          ),
+        ),
+        padding: const WidgetStatePropertyAll(
+          EdgeInsets.all(4),
+        ),
+      ),
+      consumeOutsideTap: true,
+      menuChildren: RemoteAlbumSortMode.values
+          .map(
+            (sortMode) => MenuItemButton(
+              leadingIcon: albumSortOption == sortMode
+                  ? albumSortIsReverse
+                      ? Icon(
+                          Icons.keyboard_arrow_down,
+                          color: albumSortOption == sortMode
+                              ? context.colorScheme.onPrimary
+                              : context.colorScheme.onSurface,
+                        )
+                      : Icon(
+                          Icons.keyboard_arrow_up_rounded,
+                          color: albumSortOption == sortMode
+                              ? context.colorScheme.onPrimary
+                              : context.colorScheme.onSurface,
+                        )
+                  : const Icon(Icons.abc, color: Colors.transparent),
+              onPressed: () => onMenuTapped(sortMode),
+              style: ButtonStyle(
+                padding: WidgetStateProperty.all(
+                  const EdgeInsets.fromLTRB(16, 16, 32, 16),
+                ),
+                backgroundColor: WidgetStateProperty.all(
+                  albumSortOption == sortMode
+                      ? context.colorScheme.primary
+                      : Colors.transparent,
+                ),
+                shape: WidgetStateProperty.all(
+                  const RoundedRectangleBorder(
+                    borderRadius: BorderRadius.all(
+                      Radius.circular(24),
+                    ),
+                  ),
+                ),
+              ),
+              child: Text(
+                sortMode.key.t(context: context),
+                style: context.textTheme.titleSmall?.copyWith(
+                  fontWeight: FontWeight.w600,
+                  color: albumSortOption == sortMode
+                      ? context.colorScheme.onPrimary
+                      : context.colorScheme.onSurface.withAlpha(185),
+                ),
+              ),
+            ),
+          )
+          .toList(),
+      builder: (context, controller, child) {
+        return GestureDetector(
+          onTap: () {
+            if (controller.isOpen) {
+              controller.close();
+            } else {
+              controller.open();
+            }
+          },
+          child: Row(
+            children: [
+              Padding(
+                padding: const EdgeInsets.only(right: 5),
+                child: albumSortIsReverse
+                    ? const Icon(
+                        Icons.keyboard_arrow_down,
+                      )
+                    : const Icon(
+                        Icons.keyboard_arrow_up_rounded,
+                      ),
+              ),
+              Text(
+                albumSortOption.key.t(context: context),
+                style: context.textTheme.bodyLarge?.copyWith(
+                  fontWeight: FontWeight.w500,
+                  color: context.colorScheme.onSurface.withAlpha(225),
+                ),
+              ),
+            ],
+          ),
+        );
+      },
+    );
+  }
+}
+
+class _SearchBar extends StatelessWidget {
+  const _SearchBar({
+    required this.searchController,
+    required this.searchFocusNode,
+    required this.onSearch,
+    required this.filterMode,
+    required this.onClearSearch,
+  });
+
+  final TextEditingController searchController;
+  final FocusNode searchFocusNode;
+  final void Function(String, QuickFilterMode) onSearch;
+  final QuickFilterMode filterMode;
+  final VoidCallback onClearSearch;
+
+  @override
+  Widget build(BuildContext context) {
+    return SliverPadding(
+      padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
+      sliver: SliverToBoxAdapter(
+        child: Container(
+          decoration: BoxDecoration(
+            border: Border.all(
+              color: context.colorScheme.onSurface.withAlpha(0),
+              width: 0,
+            ),
+            borderRadius: const BorderRadius.all(
+              Radius.circular(24),
+            ),
+            gradient: LinearGradient(
+              colors: [
+                context.colorScheme.primary.withValues(alpha: 0.075),
+                context.colorScheme.primary.withValues(alpha: 0.09),
+                context.colorScheme.primary.withValues(alpha: 0.075),
+              ],
+              begin: Alignment.topLeft,
+              end: Alignment.bottomRight,
+              transform: const GradientRotation(0.5 * pi),
+            ),
+          ),
+          child: SearchField(
+            autofocus: false,
+            contentPadding: const EdgeInsets.all(16),
+            hintText: 'search_albums'.tr(),
+            prefixIcon: const Icon(Icons.search_rounded),
+            suffixIcon: searchController.text.isNotEmpty
+                ? IconButton(
+                    icon: const Icon(Icons.clear_rounded),
+                    onPressed: onClearSearch,
+                  )
+                : null,
+            controller: searchController,
+            onChanged: (_) => onSearch(searchController.text, filterMode),
+            focusNode: searchFocusNode,
+            onTapOutside: (_) => searchFocusNode.unfocus(),
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _QuickFilterButtonRow extends StatelessWidget {
+  const _QuickFilterButtonRow({
+    required this.filterMode,
+    required this.onChangeFilter,
+    required this.onSearch,
+    required this.searchController,
+  });
+
+  final QuickFilterMode filterMode;
+  final void Function(QuickFilterMode) onChangeFilter;
+  final void Function(String, QuickFilterMode) onSearch;
+  final TextEditingController searchController;
+
+  @override
+  Widget build(BuildContext context) {
+    return SliverPadding(
+      padding: const EdgeInsets.symmetric(horizontal: 16),
+      sliver: SliverToBoxAdapter(
+        child: Wrap(
+          spacing: 4,
+          runSpacing: 4,
+          children: [
+            _QuickFilterButton(
+              label: 'all'.tr(),
+              isSelected: filterMode == QuickFilterMode.all,
+              onTap: () {
+                onChangeFilter(QuickFilterMode.all);
+                onSearch(searchController.text, QuickFilterMode.all);
+              },
+            ),
+            _QuickFilterButton(
+              label: 'shared_with_me'.tr(),
+              isSelected: filterMode == QuickFilterMode.sharedWithMe,
+              onTap: () {
+                onChangeFilter(QuickFilterMode.sharedWithMe);
+                onSearch(
+                  searchController.text,
+                  QuickFilterMode.sharedWithMe,
+                );
+              },
+            ),
+            _QuickFilterButton(
+              label: 'my_albums'.tr(),
+              isSelected: filterMode == QuickFilterMode.myAlbums,
+              onTap: () {
+                onChangeFilter(QuickFilterMode.myAlbums);
+                onSearch(
+                  searchController.text,
+                  QuickFilterMode.myAlbums,
+                );
+              },
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _QuickFilterButton extends StatelessWidget {
+  const _QuickFilterButton({
+    required this.isSelected,
+    required this.onTap,
+    required this.label,
+  });
+
+  final bool isSelected;
+  final VoidCallback onTap;
+  final String label;
+
+  @override
+  Widget build(BuildContext context) {
+    return TextButton(
+      onPressed: onTap,
+      style: ButtonStyle(
+        backgroundColor: WidgetStateProperty.all(
+          isSelected ? context.colorScheme.primary : Colors.transparent,
+        ),
+        shape: WidgetStateProperty.all(
+          RoundedRectangleBorder(
+            borderRadius: const BorderRadius.all(
+              Radius.circular(20),
+            ),
+            side: BorderSide(
+              color: context.colorScheme.onSurface.withAlpha(25),
+              width: 1,
+            ),
+          ),
+        ),
+      ),
+      child: Text(
+        label,
+        style: TextStyle(
+          color: isSelected
+              ? context.colorScheme.onPrimary
+              : context.colorScheme.onSurface,
+          fontSize: 14,
+        ),
+      ),
+    );
+  }
+}
+
+class _QuickSortAndViewMode extends StatelessWidget {
+  const _QuickSortAndViewMode({
+    required this.isGrid,
+    required this.onToggleViewMode,
+  });
+
+  final bool isGrid;
+  final VoidCallback onToggleViewMode;
+
+  @override
+  Widget build(BuildContext context) {
+    return SliverPadding(
+      padding: const EdgeInsets.symmetric(horizontal: 16),
+      sliver: SliverToBoxAdapter(
+        child: Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: [
+            const _SortButton(),
+            IconButton(
+              icon: Icon(
+                isGrid ? Icons.view_list_outlined : Icons.grid_view_outlined,
+                size: 24,
+              ),
+              onPressed: onToggleViewMode,
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _AlbumList extends StatelessWidget {
+  const _AlbumList({
+    required this.isLoading,
+    required this.error,
+    required this.albums,
+    required this.userId,
+  });
+
+  final bool isLoading;
+  final String? error;
+  final List<Album> albums;
+  final String? userId;
+
+  @override
+  Widget build(BuildContext context) {
+    if (isLoading) {
+      return const SliverToBoxAdapter(
+        child: Center(
+          child: Padding(
+            padding: EdgeInsets.all(20.0),
+            child: CircularProgressIndicator(),
+          ),
+        ),
+      );
+    }
+
+    if (error != null) {
+      return SliverToBoxAdapter(
+        child: Center(
+          child: Padding(
+            padding: const EdgeInsets.all(20.0),
+            child: Text(
+              'Error loading albums: $error',
+              style: TextStyle(
+                color: context.colorScheme.error,
+              ),
+            ),
+          ),
+        ),
+      );
+    }
+
+    if (albums.isEmpty) {
+      return const SliverToBoxAdapter(
+        child: Center(
+          child: Padding(
+            padding: EdgeInsets.all(20.0),
+            child: Text('No albums found'),
+          ),
+        ),
+      );
+    }
+
+    return SliverPadding(
+      padding: const EdgeInsets.symmetric(horizontal: 16.0),
+      sliver: SliverList.builder(
+        itemBuilder: (_, index) {
+          final album = albums[index];
+
+          return Padding(
+            padding: const EdgeInsets.only(
+              bottom: 8.0,
+            ),
+            child: LargeLeadingTile(
+              title: Text(
+                album.name,
+                maxLines: 2,
+                overflow: TextOverflow.ellipsis,
+                style: context.textTheme.titleSmall?.copyWith(
+                  fontWeight: FontWeight.w600,
+                ),
+              ),
+              subtitle: Text(
+                '${'items_count'.t(
+                  context: context,
+                  args: {
+                    'count': album.assetCount,
+                  },
+                )} • ${album.ownerId != userId ? 'shared_by_user'.t(
+                    context: context,
+                    args: {
+                      'user': album.ownerName,
+                    },
+                  ) : 'owned'.t(context: context)}',
+                overflow: TextOverflow.ellipsis,
+                style: context.textTheme.bodyMedium?.copyWith(
+                  color: context.colorScheme.onSurfaceSecondary,
+                ),
+              ),
+              onTap: () => context.router.push(
+                RemoteTimelineRoute(albumId: album.id),
+              ),
+              leadingPadding: const EdgeInsets.only(
+                right: 16,
+              ),
+              leading: album.thumbnailAssetId != null
+                  ? ClipRRect(
+                      borderRadius: const BorderRadius.all(
+                        Radius.circular(15),
+                      ),
+                      child: SizedBox(
+                        width: 80,
+                        height: 80,
+                        child: Thumbnail(
+                          remoteId: album.thumbnailAssetId,
+                        ),
+                      ),
+                    )
+                  : const SizedBox(
+                      width: 80,
+                      height: 80,
+                      child: Icon(
+                        Icons.photo_album_rounded,
+                        size: 40,
+                        color: Colors.grey,
+                      ),
+                    ),
+            ),
+          );
+        },
+        itemCount: albums.length,
+      ),
+    );
+  }
+}
+
+class _AlbumGrid extends StatelessWidget {
+  const _AlbumGrid({
+    required this.albums,
+    required this.userId,
+    required this.isLoading,
+    required this.error,
+  });
+
+  final List<Album> albums;
+  final String? userId;
+  final bool isLoading;
+  final String? error;
+
+  @override
+  Widget build(BuildContext context) {
+    if (isLoading) {
+      return const SliverToBoxAdapter(
+        child: Center(
+          child: Padding(
+            padding: EdgeInsets.all(20.0),
+            child: CircularProgressIndicator(),
+          ),
+        ),
+      );
+    }
+
+    if (error != null) {
+      return SliverToBoxAdapter(
+        child: Center(
+          child: Padding(
+            padding: const EdgeInsets.all(20.0),
+            child: Text(
+              'Error loading albums: $error',
+              style: TextStyle(
+                color: context.colorScheme.error,
+              ),
+            ),
+          ),
+        ),
+      );
+    }
+
+    if (albums.isEmpty) {
+      return const SliverToBoxAdapter(
+        child: Center(
+          child: Padding(
+            padding: EdgeInsets.all(20.0),
+            child: Text('No albums found'),
+          ),
+        ),
+      );
+    }
+
+    return SliverPadding(
+      padding: const EdgeInsets.symmetric(horizontal: 16.0),
+      sliver: SliverGrid(
+        gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent(
+          maxCrossAxisExtent: 250,
+          mainAxisSpacing: 4,
+          crossAxisSpacing: 4,
+          childAspectRatio: .7,
+        ),
+        delegate: SliverChildBuilderDelegate(
+          (context, index) {
+            final album = albums[index];
+            return _GridAlbumCard(
+              album: album,
+              userId: userId,
+            );
+          },
+          childCount: albums.length,
+        ),
+      ),
+    );
+  }
+}
+
+class _GridAlbumCard extends StatelessWidget {
+  const _GridAlbumCard({
+    required this.album,
+    required this.userId,
+  });
+
+  final Album album;
+  final String? userId;
+
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      onTap: () => context.router.push(
+        RemoteTimelineRoute(albumId: album.id),
+      ),
+      child: Card(
+        elevation: 0,
+        color: context.colorScheme.surfaceBright,
+        shape: RoundedRectangleBorder(
+          borderRadius: const BorderRadius.all(
+            Radius.circular(16),
+          ),
+          side: BorderSide(
+            color: context.colorScheme.onSurface.withAlpha(25),
+            width: 1,
+          ),
+        ),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Expanded(
+              flex: 2,
+              child: ClipRRect(
+                borderRadius: const BorderRadius.vertical(
+                  top: Radius.circular(15),
+                ),
+                child: SizedBox(
+                  width: double.infinity,
+                  child: album.thumbnailAssetId != null
+                      ? Thumbnail(
+                          remoteId: album.thumbnailAssetId,
+                        )
+                      : Container(
+                          color: context.colorScheme.surfaceContainerHighest,
+                          child: const Icon(
+                            Icons.photo_album_rounded,
+                            size: 40,
+                            color: Colors.grey,
+                          ),
+                        ),
+                ),
+              ),
+            ),
+            Expanded(
+              flex: 1,
+              child: Padding(
+                padding: const EdgeInsets.all(12.0),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                  children: [
+                    Text(
+                      album.name,
+                      maxLines: 2,
+                      overflow: TextOverflow.ellipsis,
+                      style: context.textTheme.titleSmall?.copyWith(
+                        fontWeight: FontWeight.w600,
+                      ),
+                    ),
+                    Text(
+                      '${'items_count'.t(
+                        context: context,
+                        args: {
+                          'count': album.assetCount,
+                        },
+                      )} • ${album.ownerId != userId ? 'shared_by_user'.t(
+                          context: context,
+                          args: {
+                            'user': album.ownerName,
+                          },
+                        ) : 'owned'.t(context: context)}',
+                      maxLines: 1,
+                      overflow: TextOverflow.ellipsis,
+                      style: context.textTheme.labelMedium?.copyWith(
+                        color: context.colorScheme.onSurfaceSecondary,
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
--- a/mobile/lib/presentation/pages/drift_memory.page.dart
+++ b/mobile/lib/presentation/pages/drift_memory.page.dart
@@ -0,0 +1,394 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/scheduler.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/models/memory.model.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
+import 'package:immich_mobile/presentation/widgets/memory/memory_bottom_info.widget.dart';
+import 'package:immich_mobile/presentation/widgets/memory/memory_card.widget.dart';
+import 'package:immich_mobile/providers/asset_viewer/video_player_value_provider.dart';
+import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
+import 'package:immich_mobile/widgets/memories/memory_epilogue.dart';
+import 'package:immich_mobile/widgets/memories/memory_progress_indicator.dart';
+
+/// Expects [currentAssetNotifier] to be set before navigating to this page
+@RoutePage()
+class DriftMemoryPage extends HookConsumerWidget {
+  final List<DriftMemory> memories;
+  final int memoryIndex;
+
+  const DriftMemoryPage({
+    required this.memories,
+    required this.memoryIndex,
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final currentMemory = useState(memories[memoryIndex]);
+    final currentAssetPage = useState(0);
+    final currentMemoryIndex = useState(memoryIndex);
+    final assetProgress = useState(
+      "${currentAssetPage.value + 1}|${currentMemory.value.assets.length}",
+    );
+    const bgColor = Colors.black;
+    final currentAsset = useState<RemoteAsset?>(null);
+
+    /// The list of all of the asset page controllers
+    final memoryAssetPageControllers =
+        List.generate(memories.length, (i) => usePageController());
+
+    /// The main vertically scrolling page controller with each list of memories
+    final memoryPageController = usePageController(initialPage: memoryIndex);
+
+    useEffect(() {
+      // Memories is an immersive activity
+      SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
+      return () {
+        // Clean up to normal edge to edge when we are done
+        SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
+      };
+    });
+
+    toNextMemory() {
+      memoryPageController.nextPage(
+        duration: const Duration(milliseconds: 500),
+        curve: Curves.easeIn,
+      );
+    }
+
+    void toPreviousMemory() {
+      if (currentMemoryIndex.value > 0) {
+        // Move to the previous memory page
+        memoryPageController.previousPage(
+          duration: const Duration(milliseconds: 500),
+          curve: Curves.easeIn,
+        );
+
+        // Wait for the next frame to ensure the page is built
+        SchedulerBinding.instance.addPostFrameCallback((_) {
+          final previousIndex = currentMemoryIndex.value - 1;
+          final previousMemoryController =
+              memoryAssetPageControllers[previousIndex];
+
+          // Ensure the controller is attached
+          if (previousMemoryController.hasClients) {
+            previousMemoryController
+                .jumpToPage(memories[previousIndex].assets.length - 1);
+          } else {
+            // Wait for the next frame until it is attached
+            SchedulerBinding.instance.addPostFrameCallback((_) {
+              if (previousMemoryController.hasClients) {
+                previousMemoryController
+                    .jumpToPage(memories[previousIndex].assets.length - 1);
+              }
+            });
+          }
+        });
+      }
+    }
+
+    toNextAsset(int currentAssetIndex) {
+      if (currentAssetIndex + 1 < currentMemory.value.assets.length) {
+        // Go to the next asset
+        PageController controller =
+            memoryAssetPageControllers[currentMemoryIndex.value];
+
+        controller.nextPage(
+          curve: Curves.easeInOut,
+          duration: const Duration(milliseconds: 500),
+        );
+      } else {
+        // Go to the next memory since we are at the end of our assets
+        toNextMemory();
+      }
+    }
+
+    toPreviousAsset(int currentAssetIndex) {
+      if (currentAssetIndex > 0) {
+        // Go to the previous asset
+        PageController controller =
+            memoryAssetPageControllers[currentMemoryIndex.value];
+
+        controller.previousPage(
+          curve: Curves.easeInOut,
+          duration: const Duration(milliseconds: 500),
+        );
+      } else {
+        // Go to the previous memory since we are at the end of our assets
+        toPreviousMemory();
+      }
+    }
+
+    updateProgressText() {
+      assetProgress.value =
+          "${currentAssetPage.value + 1}|${currentMemory.value.assets.length}";
+    }
+
+    /// Downloads and caches the image for the asset at this [currentMemory]'s index
+    precacheAsset(int index) async {
+      // Guard index out of range
+      if (index < 0) {
+        return;
+      }
+
+      // Context might be removed due to popping out of Memory Lane during Scroll handling
+      if (!context.mounted) {
+        return;
+      }
+
+      late RemoteAsset asset;
+      if (index < currentMemory.value.assets.length) {
+        // Uses the next asset in this current memory
+        asset = currentMemory.value.assets[index];
+      } else {
+        // Precache the first asset in the next memory if available
+        final currentMemoryIndex = memories.indexOf(currentMemory.value);
+
+        // Guard no memory found
+        if (currentMemoryIndex == -1) {
+          return;
+        }
+
+        final nextMemoryIndex = currentMemoryIndex + 1;
+        // Guard no next memory
+        if (nextMemoryIndex >= memories.length) {
+          return;
+        }
+
+        // Get the first asset from the next memory
+        asset = memories[nextMemoryIndex].assets.first;
+      }
+
+      // Precache the asset
+      final size = MediaQuery.sizeOf(context);
+      await precacheImage(
+        getFullImageProvider(
+          asset,
+          size: Size(size.width, size.height),
+        ),
+        context,
+        size: size,
+      );
+    }
+
+    // Precache the next page right away if we are on the first page
+    if (currentAssetPage.value == 0) {
+      Future.delayed(const Duration(milliseconds: 200))
+          .then((_) => precacheAsset(1));
+    }
+
+    Future<void> onAssetChanged(int otherIndex) async {
+      ref.read(hapticFeedbackProvider.notifier).selectionClick();
+      currentAssetPage.value = otherIndex;
+      updateProgressText();
+
+      // Wait for page change animation to finish
+      await Future.delayed(const Duration(milliseconds: 400));
+      // And then precache the next asset
+      await precacheAsset(otherIndex + 1);
+
+      final asset = currentMemory.value.assets[otherIndex];
+      currentAsset.value = asset;
+      ref.read(currentAssetNotifier.notifier).setAsset(asset);
+      // if (asset.isVideo || asset.isMotionPhoto) {
+      if (asset.isVideo) {
+        ref.read(videoPlaybackValueProvider.notifier).reset();
+      }
+    }
+
+    /* Notification listener is used instead of OnPageChanged callback since OnPageChanged is called
+     * when the page in the **center** of the viewer changes. We want to reset currentAssetPage only when the final
+     * page during the end of scroll is different than the current page
+     */
+    return NotificationListener<ScrollNotification>(
+      onNotification: (ScrollNotification notification) {
+        // Calculate OverScroll manually using the number of pixels away from maxScrollExtent
+        // maxScrollExtend contains the sum of horizontal pixels of all assets for depth = 1
+        // or sum of vertical pixels of all memories for depth = 0
+        if (notification is ScrollUpdateNotification) {
+          final isEpiloguePage =
+              (memoryPageController.page?.floor() ?? 0) >= memories.length;
+
+          final offset = notification.metrics.pixels;
+          if (isEpiloguePage &&
+              (offset > notification.metrics.maxScrollExtent + 150)) {
+            context.maybePop();
+            return true;
+          }
+        }
+
+        return false;
+      },
+      child: Scaffold(
+        backgroundColor: bgColor,
+        body: SafeArea(
+          child: PageView.builder(
+            physics: const BouncingScrollPhysics(
+              parent: AlwaysScrollableScrollPhysics(),
+            ),
+            scrollDirection: Axis.vertical,
+            controller: memoryPageController,
+            onPageChanged: (pageNumber) {
+              ref.read(hapticFeedbackProvider.notifier).mediumImpact();
+              if (pageNumber < memories.length) {
+                currentMemoryIndex.value = pageNumber;
+                currentMemory.value = memories[pageNumber];
+              }
+
+              currentAssetPage.value = 0;
+
+              updateProgressText();
+            },
+            itemCount: memories.length + 1,
+            itemBuilder: (context, mIndex) {
+              // Build last page
+              if (mIndex == memories.length) {
+                return MemoryEpilogue(
+                  onStartOver: () => memoryPageController.animateToPage(
+                    0,
+                    duration: const Duration(seconds: 1),
+                    curve: Curves.easeInOut,
+                  ),
+                );
+              }
+
+              final yearsAgo = DateTime.now().year - memories[mIndex].data.year;
+              final title = 'years_ago'.t(
+                context: context,
+                args: {
+                  'years': yearsAgo.toString(),
+                },
+              );
+              // Build horizontal page
+              final assetController = memoryAssetPageControllers[mIndex];
+              return Column(
+                children: [
+                  Padding(
+                    padding: const EdgeInsets.only(
+                      left: 24.0,
+                      right: 24.0,
+                      top: 8.0,
+                      bottom: 2.0,
+                    ),
+                    child: AnimatedBuilder(
+                      animation: assetController,
+                      builder: (context, child) {
+                        double value = 0.0;
+                        if (assetController.hasClients) {
+                          // We can only access [page] if this has clients
+                          value = assetController.page ?? 0;
+                        }
+                        return MemoryProgressIndicator(
+                          ticks: memories[mIndex].assets.length,
+                          value: (value + 1) / memories[mIndex].assets.length,
+                        );
+                      },
+                    ),
+                  ),
+                  Expanded(
+                    child: Stack(
+                      children: [
+                        PageView.builder(
+                          physics: const BouncingScrollPhysics(
+                            parent: AlwaysScrollableScrollPhysics(),
+                          ),
+                          controller: assetController,
+                          onPageChanged: onAssetChanged,
+                          scrollDirection: Axis.horizontal,
+                          itemCount: memories[mIndex].assets.length,
+                          itemBuilder: (context, index) {
+                            final asset = memories[mIndex].assets[index];
+                            return Stack(
+                              children: [
+                                Container(
+                                  color: Colors.black,
+                                  child: DriftMemoryCard(
+                                    asset: asset,
+                                    title: title,
+                                    showTitle: index == 0,
+                                  ),
+                                ),
+                                Positioned.fill(
+                                  child: Row(
+                                    children: [
+                                      // Left side of the screen
+                                      Expanded(
+                                        child: GestureDetector(
+                                          behavior: HitTestBehavior.translucent,
+                                          onTap: () {
+                                            toPreviousAsset(index);
+                                          },
+                                        ),
+                                      ),
+
+                                      // Right side of the screen
+                                      Expanded(
+                                        child: GestureDetector(
+                                          behavior: HitTestBehavior.translucent,
+                                          onTap: () {
+                                            toNextAsset(index);
+                                          },
+                                        ),
+                                      ),
+                                    ],
+                                  ),
+                                ),
+                              ],
+                            );
+                          },
+                        ),
+                        Positioned(
+                          top: 8,
+                          left: 8,
+                          child: MaterialButton(
+                            minWidth: 0,
+                            onPressed: () {
+                              // auto_route doesn't invoke pop scope, so
+                              // turn off full screen mode here
+                              // https://github.com/Milad-Akarie/auto_route_library/issues/1799
+                              context.maybePop();
+                              SystemChrome.setEnabledSystemUIMode(
+                                SystemUiMode.edgeToEdge,
+                              );
+                            },
+                            shape: const CircleBorder(),
+                            color: Colors.white.withValues(alpha: 0.2),
+                            elevation: 0,
+                            child: const Icon(
+                              Icons.close_rounded,
+                              color: Colors.white,
+                            ),
+                          ),
+                        ),
+                        if (currentAsset.value != null &&
+                            currentAsset.value!.isVideo)
+                          Positioned(
+                            bottom: 24,
+                            right: 32,
+                            child: Icon(
+                              Icons.videocam_outlined,
+                              color: Colors.grey[200],
+                            ),
+                          ),
+                      ],
+                    ),
+                  ),
+                  DriftMemoryBottomInfo(
+                    memory: memories[mIndex],
+                    title: title,
+                  ),
+                ],
+              );
+            },
+          ),
+        ),
+      ),
+    );
+  }
+}
--- a/mobile/lib/presentation/widgets/action_buttons/archive_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/archive_action_button.widget.dart
@@ -1,16 +1,49 @@
 import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';

 class ArchiveActionButton extends ConsumerWidget {
-  const ArchiveActionButton({super.key});
+  final ActionSource source;
+
+  const ArchiveActionButton({super.key, required this.source});
+
+  void _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    final result = await ref.read(actionProvider.notifier).archive(source);
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final successMessage = 'archive_action_prompt'.t(
+      context: context,
+      args: {'count': result.count.toString()},
+    );
+
+    if (context.mounted) {
+      ImmichToast.show(
+        context: context,
+        msg: result.success
+            ? successMessage
+            : 'scaffold_body_error_occurred'.t(context: context),
+        gravity: ToastGravity.BOTTOM,
+        toastType: result.success ? ToastType.success : ToastType.error,
+      );
+    }
+  }

  @override
  Widget build(BuildContext context, WidgetRef ref) {
    return BaseActionButton(
      iconData: Icons.archive_outlined,
      label: "archive".t(context: context),
+      onPressed: () => _onTap(context, ref),
    );
  }
 }
--- a/mobile/lib/presentation/widgets/action_buttons/base_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/base_action_button.widget.dart
@@ -9,17 +9,33 @@ class BaseActionButton extends StatelessWidget {
    this.onPressed,
    this.onLongPressed,
    this.maxWidth = 90.0,
+    this.minWidth,
+    this.menuItem = false,
  });

  final String label;
  final IconData iconData;
  final double maxWidth;
+  final double? minWidth;
+  final bool menuItem;
  final void Function()? onPressed;
  final void Function()? onLongPressed;

  @override
  Widget build(BuildContext context) {
-    final minWidth = context.isMobile ? context.width / 4.5 : 75.0;
+    final miniWidth =
+        minWidth ?? (context.isMobile ? context.width / 4.5 : 75.0);
+    final iconTheme = IconTheme.of(context);
+    final iconSize = iconTheme.size ?? 24.0;
+    final iconColor = iconTheme.color ?? context.themeData.iconTheme.color;
+    final textColor = context.themeData.textTheme.labelLarge?.color;
+
+    if (menuItem) {
+      return IconButton(
+        onPressed: onPressed,
+        icon: Icon(iconData, size: iconSize, color: iconColor),
+      );
+    }

    return ConstrainedBox(
      constraints: BoxConstraints(
@@ -30,19 +46,22 @@ class BaseActionButton extends StatelessWidget {
        shape: const RoundedRectangleBorder(
          borderRadius: BorderRadius.all(Radius.circular(20)),
        ),
+        textColor: textColor,
        onPressed: onPressed,
        onLongPress: onLongPressed,
-        minWidth: minWidth,
+        minWidth: miniWidth,
        child: Column(
          mainAxisAlignment: MainAxisAlignment.start,
          crossAxisAlignment: CrossAxisAlignment.center,
          children: [
-            Icon(iconData, size: 24),
+            Icon(iconData, size: iconSize, color: iconColor),
            const SizedBox(height: 8),
            Text(
              label,
-              style:
-                  const TextStyle(fontSize: 14.0, fontWeight: FontWeight.w400),
+              style: const TextStyle(
+                fontSize: 14.0,
+                fontWeight: FontWeight.w400,
+              ),
              maxLines: 3,
              textAlign: TextAlign.center,
            ),
--- a/mobile/lib/presentation/widgets/action_buttons/delete_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/delete_action_button.widget.dart
@@ -1,10 +1,42 @@
 import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';

 class DeletePermanentActionButton extends ConsumerWidget {
-  const DeletePermanentActionButton({super.key});
+  final ActionSource source;
+
+  const DeletePermanentActionButton({super.key, required this.source});
+
+  void _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    final result = await ref.read(actionProvider.notifier).delete(source);
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final successMessage = 'delete_action_prompt'.t(
+      context: context,
+      args: {'count': result.count.toString()},
+    );
+
+    if (context.mounted) {
+      ImmichToast.show(
+        context: context,
+        msg: result.success
+            ? successMessage
+            : 'scaffold_body_error_occurred'.t(context: context),
+        gravity: ToastGravity.BOTTOM,
+        toastType: result.success ? ToastType.success : ToastType.error,
+      );
+    }
+  }

  @override
  Widget build(BuildContext context, WidgetRef ref) {
@@ -12,6 +44,7 @@ class DeletePermanentActionButton extends ConsumerWidget {
      maxWidth: 110.0,
      iconData: Icons.delete_forever,
      label: "delete_dialog_title".t(context: context),
+      onPressed: () => _onTap(context, ref),
    );
  }
 }
--- a/mobile/lib/presentation/widgets/action_buttons/edit_location_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/edit_location_action_button.widget.dart
@@ -1,16 +1,54 @@
 import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';

 class EditLocationActionButton extends ConsumerWidget {
-  const EditLocationActionButton({super.key});
+  final ActionSource source;
+
+  const EditLocationActionButton({super.key, required this.source});
+
+  _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    final result =
+        await ref.read(actionProvider.notifier).editLocation(source, context);
+    if (result == null) {
+      return;
+    }
+
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final successMessage = 'edit_location_action_prompt'.t(
+      context: context,
+      args: {'count': result.count.toString()},
+    );
+
+    if (context.mounted) {
+      ImmichToast.show(
+        context: context,
+        msg: result.success
+            ? successMessage
+            : 'scaffold_body_error_occurred'.t(context: context),
+        gravity: ToastGravity.BOTTOM,
+        toastType: result.success ? ToastType.success : ToastType.error,
+      );
+    }
+  }

  @override
  Widget build(BuildContext context, WidgetRef ref) {
    return BaseActionButton(
      iconData: Icons.edit_location_alt_outlined,
      label: "control_bottom_app_bar_edit_location".t(context: context),
+      onPressed: () => _onTap(context, ref),
    );
  }
 }
--- a/mobile/lib/presentation/widgets/action_buttons/favorite_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/favorite_action_button.widget.dart
@@ -1,16 +1,60 @@
 import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';

 class FavoriteActionButton extends ConsumerWidget {
-  const FavoriteActionButton({super.key});
+  final ActionSource source;
+  final bool menuItem;
+
+  const FavoriteActionButton({
+    super.key,
+    required this.source,
+    this.menuItem = false,
+  });
+
+  void _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    final result = await ref.read(actionProvider.notifier).favorite(source);
+
+    if (source == ActionSource.viewer) {
+      return;
+    }
+
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final successMessage = 'favorite_action_prompt'.t(
+      context: context,
+      args: {'count': result.count.toString()},
+    );
+
+    if (context.mounted) {
+      ImmichToast.show(
+        context: context,
+        msg: result.success
+            ? successMessage
+            : 'scaffold_body_error_occurred'.t(context: context),
+        gravity: ToastGravity.BOTTOM,
+        toastType: result.success ? ToastType.success : ToastType.error,
+      );
+    }
+  }

  @override
  Widget build(BuildContext context, WidgetRef ref) {
    return BaseActionButton(
      iconData: Icons.favorite_border_rounded,
      label: "favorite".t(context: context),
+      menuItem: menuItem,
+      onPressed: () => _onTap(context, ref),
    );
  }
 }
--- a/mobile/lib/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart
@@ -1,10 +1,43 @@
 import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';

 class MoveToLockFolderActionButton extends ConsumerWidget {
-  const MoveToLockFolderActionButton({super.key});
+  final ActionSource source;
+
+  const MoveToLockFolderActionButton({super.key, required this.source});
+
+  void _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    final result =
+        await ref.read(actionProvider.notifier).moveToLockFolder(source);
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final successMessage = 'move_to_lock_folder_action_prompt'.t(
+      context: context,
+      args: {'count': result.count.toString()},
+    );
+
+    if (context.mounted) {
+      ImmichToast.show(
+        context: context,
+        msg: result.success
+            ? successMessage
+            : 'scaffold_body_error_occurred'.t(context: context),
+        gravity: ToastGravity.BOTTOM,
+        toastType: result.success ? ToastType.success : ToastType.error,
+      );
+    }
+  }

  @override
  Widget build(BuildContext context, WidgetRef ref) {
@@ -12,6 +45,7 @@ class MoveToLockFolderActionButton extends ConsumerWidget {
      maxWidth: 100.0,
      iconData: Icons.lock_outline_rounded,
      label: "move_to_locked_folder".t(context: context),
+      onPressed: () => _onTap(context, ref),
    );
  }
 }
--- a/mobile/lib/presentation/widgets/action_buttons/remove_from_lock_folder_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/remove_from_lock_folder_action_button.widget.dart
@@ -1,10 +1,43 @@
 import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';

 class RemoveFromLockFolderActionButton extends ConsumerWidget {
-  const RemoveFromLockFolderActionButton({super.key});
+  final ActionSource source;
+
+  const RemoveFromLockFolderActionButton({super.key, required this.source});
+
+  void _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    final result =
+        await ref.read(actionProvider.notifier).removeFromLockFolder(source);
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final successMessage = 'remove_from_lock_folder_action_prompt'.t(
+      context: context,
+      args: {'count': result.count.toString()},
+    );
+
+    if (context.mounted) {
+      ImmichToast.show(
+        context: context,
+        msg: result.success
+            ? successMessage
+            : 'scaffold_body_error_occurred'.t(context: context),
+        gravity: ToastGravity.BOTTOM,
+        toastType: result.success ? ToastType.success : ToastType.error,
+      );
+    }
+  }

  @override
  Widget build(BuildContext context, WidgetRef ref) {
@@ -12,6 +45,7 @@ class RemoveFromLockFolderActionButton extends ConsumerWidget {
      maxWidth: 100.0,
      iconData: Icons.lock_open_rounded,
      label: "remove_from_locked_folder".t(context: context),
+      onPressed: () => _onTap(context, ref),
    );
  }
 }
--- a/mobile/lib/presentation/widgets/action_buttons/share_link_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/share_link_action_button.widget.dart
@@ -1,16 +1,29 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';

 class ShareLinkActionButton extends ConsumerWidget {
-  const ShareLinkActionButton({super.key});
+  final ActionSource source;
+
+  const ShareLinkActionButton({super.key, required this.source});
+
+  _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    await ref.read(actionProvider.notifier).shareLink(source, context);
+  }

  @override
  Widget build(BuildContext context, WidgetRef ref) {
    return BaseActionButton(
      iconData: Icons.link_rounded,
      label: "share_link".t(context: context),
+      onPressed: () => _onTap(context, ref),
    );
  }
 }
--- a/mobile/lib/presentation/widgets/action_buttons/trash_action_buton.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/trash_action_buton.widget.dart
@@ -1,17 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
-
-class TrashActionButton extends ConsumerWidget {
-  const TrashActionButton({super.key});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    return BaseActionButton(
-      maxWidth: 85.0,
-      iconData: Icons.delete_outline_rounded,
-      label: "control_bottom_app_bar_trash_from_immich".t(context: context),
-    );
-  }
-}
--- a/mobile/lib/presentation/widgets/action_buttons/trash_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/trash_action_button.widget.dart
@@ -0,0 +1,50 @@
+import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
+
+class TrashActionButton extends ConsumerWidget {
+  final ActionSource source;
+
+  const TrashActionButton({super.key, required this.source});
+
+  void _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    final result = await ref.read(actionProvider.notifier).trash(source);
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final successMessage = 'trash_action_prompt'.t(
+      context: context,
+      args: {'count': result.count.toString()},
+    );
+
+    if (context.mounted) {
+      ImmichToast.show(
+        context: context,
+        msg: result.success
+            ? successMessage
+            : 'scaffold_body_error_occurred'.t(context: context),
+        gravity: ToastGravity.BOTTOM,
+        toastType: result.success ? ToastType.success : ToastType.error,
+      );
+    }
+  }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return BaseActionButton(
+      maxWidth: 85.0,
+      iconData: Icons.delete_outline_rounded,
+      label: "control_bottom_app_bar_trash_from_immich".t(context: context),
+      onPressed: () => _onTap(context, ref),
+    );
+  }
+}
--- a/mobile/lib/presentation/widgets/action_buttons/unarchive_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/unarchive_action_button.widget.dart
@@ -1,16 +1,49 @@
 import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';

 class UnarchiveActionButton extends ConsumerWidget {
-  const UnarchiveActionButton({super.key});
+  final ActionSource source;
+
+  const UnarchiveActionButton({super.key, required this.source});
+
+  void _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    final result = await ref.read(actionProvider.notifier).unArchive(source);
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final successMessage = 'unarchive_action_prompt'.t(
+      context: context,
+      args: {'count': result.count.toString()},
+    );
+
+    if (context.mounted) {
+      ImmichToast.show(
+        context: context,
+        msg: result.success
+            ? successMessage
+            : 'scaffold_body_error_occurred'.t(context: context),
+        gravity: ToastGravity.BOTTOM,
+        toastType: result.success ? ToastType.success : ToastType.error,
+      );
+    }
+  }

  @override
  Widget build(BuildContext context, WidgetRef ref) {
    return BaseActionButton(
      iconData: Icons.unarchive_outlined,
      label: "unarchive".t(context: context),
+      onPressed: () => _onTap(context, ref),
    );
  }
 }
--- a/mobile/lib/presentation/widgets/action_buttons/unfavorite_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/unfavorite_action_button.widget.dart
@@ -1,16 +1,60 @@
 import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';

 class UnFavoriteActionButton extends ConsumerWidget {
-  const UnFavoriteActionButton({super.key});
+  final ActionSource source;
+  final bool menuItem;
+
+  const UnFavoriteActionButton({
+    super.key,
+    required this.source,
+    this.menuItem = false,
+  });
+
+  void _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    final result = await ref.read(actionProvider.notifier).unFavorite(source);
+
+    if (source == ActionSource.viewer) {
+      return;
+    }
+
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final successMessage = 'unfavorite_action_prompt'.t(
+      context: context,
+      args: {'count': result.count.toString()},
+    );
+
+    if (context.mounted) {
+      ImmichToast.show(
+        context: context,
+        msg: result.success
+            ? successMessage
+            : 'scaffold_body_error_occurred'.t(context: context),
+        gravity: ToastGravity.BOTTOM,
+        toastType: result.success ? ToastType.success : ToastType.error,
+      );
+    }
+  }

  @override
  Widget build(BuildContext context, WidgetRef ref) {
    return BaseActionButton(
      iconData: Icons.favorite_rounded,
      label: "unfavorite".t(context: context),
+      onPressed: () => _onTap(context, ref),
+      menuItem: menuItem,
    );
  }
 }
--- a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
@@ -0,0 +1,529 @@
+import 'dart:async';
+
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/services/timeline.service.dart';
+import 'package:immich_mobile/domain/utils/event_stream.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/extensions/scroll_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
+import 'package:immich_mobile/presentation/widgets/asset_viewer/bottom_bar.widget.dart';
+import 'package:immich_mobile/presentation/widgets/asset_viewer/bottom_sheet.widget.dart';
+import 'package:immich_mobile/presentation/widgets/asset_viewer/top_app_bar.widget.dart';
+import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
+import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+import 'package:immich_mobile/widgets/photo_view/photo_view.dart';
+import 'package:immich_mobile/widgets/photo_view/photo_view_gallery.dart';
+import 'package:platform/platform.dart';
+
+@RoutePage()
+class AssetViewerPage extends StatelessWidget {
+  final int initialIndex;
+  final TimelineService timelineService;
+
+  const AssetViewerPage({
+    super.key,
+    required this.initialIndex,
+    required this.timelineService,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    // This is necessary to ensure that the timeline service is available
+    // since the Timeline and AssetViewer are on different routes / Widget subtrees.
+    return ProviderScope(
+      overrides: [timelineServiceProvider.overrideWithValue(timelineService)],
+      child: AssetViewer(initialIndex: initialIndex),
+    );
+  }
+}
+
+class AssetViewer extends ConsumerStatefulWidget {
+  final int initialIndex;
+  final Platform? platform;
+
+  const AssetViewer({
+    super.key,
+    required this.initialIndex,
+    this.platform,
+  });
+
+  @override
+  ConsumerState createState() => _AssetViewerState();
+}
+
+const double _kBottomSheetMinimumExtent = 0.4;
+const double _kBottomSheetSnapExtent = 0.7;
+
+class _AssetViewerState extends ConsumerState<AssetViewer> {
+  late PageController pageController;
+  late DraggableScrollableController bottomSheetController;
+  PersistentBottomSheetController? sheetCloseController;
+  // PhotoViewGallery takes care of disposing it's controllers
+  PhotoViewControllerBase? viewController;
+  StreamSubscription? reloadSubscription;
+
+  late Platform platform;
+  late PhotoViewControllerValue initialPhotoViewState;
+  bool? hasDraggedDown;
+  bool isSnapping = false;
+  bool blockGestures = false;
+  bool dragInProgress = false;
+  bool shouldPopOnDrag = false;
+  double? initialScale;
+  double previousExtent = _kBottomSheetMinimumExtent;
+  Offset dragDownPosition = Offset.zero;
+  int totalAssets = 0;
+  BuildContext? scaffoldContext;
+
+  // Delayed operations that should be cancelled on disposal
+  final List<Timer> _delayedOperations = [];
+
+  @override
+  void initState() {
+    super.initState();
+    pageController = PageController(initialPage: widget.initialIndex);
+    platform = widget.platform ?? const LocalPlatform();
+    totalAssets = ref.read(timelineServiceProvider).totalAssets;
+    bottomSheetController = DraggableScrollableController();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _onAssetChanged(widget.initialIndex);
+    });
+    reloadSubscription = EventStream.shared.listen(_onEvent);
+  }
+
+  @override
+  void dispose() {
+    pageController.dispose();
+    bottomSheetController.dispose();
+    _cancelTimers();
+    reloadSubscription?.cancel();
+    super.dispose();
+  }
+
+  bool get showingBottomSheet =>
+      ref.read(assetViewerProvider.select((s) => s.showingBottomSheet));
+
+  Color get backgroundColor {
+    final opacity =
+        ref.read(assetViewerProvider.select((s) => s.backgroundOpacity));
+    return Colors.black.withAlpha(opacity);
+  }
+
+  void _cancelTimers() {
+    for (final timer in _delayedOperations) {
+      timer.cancel();
+    }
+    _delayedOperations.clear();
+  }
+
+  // This is used to calculate the scale of the asset when the bottom sheet is showing.
+  // It is a small increment to ensure that the asset is slightly zoomed in when the
+  // bottom sheet is showing, which emulates the zoom effect.
+  double get _getScaleForBottomSheet =>
+      (viewController?.prevValue.scale ?? viewController?.value.scale ?? 1.0) +
+      0.01;
+
+  double _getVerticalOffsetForBottomSheet(double extent) =>
+      (context.height * extent) - (context.height * _kBottomSheetMinimumExtent);
+
+  Future<void> _precacheImage(int index) async {
+    if (!mounted || index < 0 || index >= totalAssets) {
+      return;
+    }
+
+    final asset = ref.read(timelineServiceProvider).getAsset(index);
+    final screenSize = Size(context.width, context.height);
+
+    // Precache both thumbnail and full image for smooth transitions
+    unawaited(
+      Future.wait([
+        precacheImage(
+          getThumbnailImageProvider(asset: asset, size: screenSize),
+          context,
+          onError: (_, __) {},
+        ),
+        precacheImage(
+          getFullImageProvider(asset, size: screenSize),
+          context,
+          onError: (_, __) {},
+        ),
+      ]),
+    );
+  }
+
+  void _onAssetChanged(int index) {
+    final asset = ref.read(timelineServiceProvider).getAsset(index);
+    ref.read(currentAssetNotifier.notifier).setAsset(asset);
+    unawaited(ref.read(timelineServiceProvider).preCacheAssets(index));
+    _cancelTimers();
+    // This will trigger the pre-caching of adjacent assets ensuring
+    // that they are ready when the user navigates to them.
+    final timer = Timer(Durations.medium4, () {
+      // Check if widget is still mounted before proceeding
+      if (!mounted) return;
+
+      for (final offset in [-1, 1]) {
+        unawaited(_precacheImage(index + offset));
+      }
+    });
+    _delayedOperations.add(timer);
+  }
+
+  void _onPageBuild(PhotoViewControllerBase controller) {
+    viewController ??= controller;
+    if (showingBottomSheet) {
+      final verticalOffset = (context.height * bottomSheetController.size) -
+          (context.height * _kBottomSheetMinimumExtent);
+      controller.position = Offset(0, -verticalOffset);
+    }
+  }
+
+  void _onPageChanged(int index, PhotoViewControllerBase? controller) {
+    _onAssetChanged(index);
+    viewController = controller;
+
+    // If the bottom sheet is showing, we need to adjust scale the asset to
+    // emulate the zoom effect
+    if (showingBottomSheet) {
+      initialScale = controller?.scale;
+      controller?.scale = _getScaleForBottomSheet;
+    }
+  }
+
+  void _onDragStart(
+    _,
+    DragStartDetails details,
+    PhotoViewControllerBase controller,
+    PhotoViewScaleStateController scaleStateController,
+  ) {
+    viewController = controller;
+    dragDownPosition = details.localPosition;
+    initialPhotoViewState = controller.value;
+    final isZoomed =
+        scaleStateController.scaleState == PhotoViewScaleState.zoomedIn ||
+            scaleStateController.scaleState == PhotoViewScaleState.covering;
+    if (!showingBottomSheet && isZoomed) {
+      blockGestures = true;
+    }
+  }
+
+  void _onDragEnd(BuildContext ctx, _, __) {
+    dragInProgress = false;
+
+    if (shouldPopOnDrag) {
+      // Dismiss immediately without state updates to avoid rebuilds
+      ctx.maybePop();
+      return;
+    }
+
+    // Do not reset the state if the bottom sheet is showing
+    if (showingBottomSheet) {
+      _snapBottomSheet();
+      return;
+    }
+
+    // If the gestures are blocked, do not reset the state
+    if (blockGestures) {
+      blockGestures = false;
+      return;
+    }
+
+    shouldPopOnDrag = false;
+    hasDraggedDown = null;
+    viewController?.animateMultiple(
+      position: initialPhotoViewState.position,
+      scale: initialPhotoViewState.scale,
+      rotation: initialPhotoViewState.rotation,
+    );
+    ref.read(assetViewerProvider.notifier).setOpacity(255);
+  }
+
+  void _onDragUpdate(BuildContext ctx, DragUpdateDetails details, _) {
+    if (blockGestures) {
+      return;
+    }
+
+    dragInProgress = true;
+    final delta = details.localPosition - dragDownPosition;
+    hasDraggedDown ??= delta.dy > 0;
+    if (!hasDraggedDown! || showingBottomSheet) {
+      _handleDragUp(ctx, delta);
+      return;
+    }
+
+    _handleDragDown(ctx, delta);
+  }
+
+  void _handleDragUp(BuildContext ctx, Offset delta) {
+    const double openThreshold = 50;
+
+    final position = initialPhotoViewState.position + Offset(0, delta.dy);
+    final distanceToOrigin = position.distance;
+
+    viewController?.updateMultiple(position: position);
+    // Moves the bottom sheet when the asset is being dragged up
+    if (showingBottomSheet && bottomSheetController.isAttached) {
+      final centre = (ctx.height * _kBottomSheetMinimumExtent);
+      bottomSheetController.jumpTo((centre + distanceToOrigin) / ctx.height);
+    }
+
+    if (distanceToOrigin > openThreshold && !showingBottomSheet) {
+      _openBottomSheet(ctx);
+    }
+  }
+
+  void _handleDragDown(BuildContext ctx, Offset delta) {
+    const double dragRatio = 0.2;
+    const double popThreshold = 75;
+
+    final distance = delta.distance;
+    shouldPopOnDrag = delta.dy > 0 && distance > popThreshold;
+
+    final maxScaleDistance = ctx.height * 0.5;
+    final scaleReduction = (distance / maxScaleDistance).clamp(0.0, dragRatio);
+    double? updatedScale;
+    if (initialPhotoViewState.scale != null) {
+      updatedScale = initialPhotoViewState.scale! * (1.0 - scaleReduction);
+    }
+
+    final backgroundOpacity =
+        (255 * (1.0 - (scaleReduction / dragRatio))).round();
+
+    viewController?.updateMultiple(
+      position: initialPhotoViewState.position + delta,
+      scale: updatedScale,
+    );
+    ref.read(assetViewerProvider.notifier).setOpacity(backgroundOpacity);
+  }
+
+  void _onTapDown(_, __, ___) {
+    if (!showingBottomSheet) {
+      ref.read(assetViewerProvider.notifier).toggleControls();
+    }
+  }
+
+  bool _onNotification(Notification delta) {
+    if (delta is DraggableScrollableNotification) {
+      _handleDraggableNotification(delta);
+    }
+
+    // Handle sheet snap manually so that the it snaps only at _kBottomSheetSnapExtent but not after
+    // the isSnapping guard is to prevent the notification from recursively handling the
+    // notification, eventually resulting in a heap overflow
+    if (!isSnapping && delta is ScrollEndNotification) {
+      _snapBottomSheet();
+    }
+    return false;
+  }
+
+  void _handleDraggableNotification(DraggableScrollableNotification delta) {
+    final currentExtent = delta.extent;
+    final isDraggingDown = currentExtent < previousExtent;
+    previousExtent = currentExtent;
+    // Closes the bottom sheet if the user is dragging down
+    if (isDraggingDown && delta.extent < 0.5) {
+      if (dragInProgress) {
+        blockGestures = true;
+      }
+      sheetCloseController?.close();
+    }
+
+    // If the asset is being dragged down, we do not want to update the asset position again
+    if (dragInProgress) {
+      return;
+    }
+
+    final verticalOffset = _getVerticalOffsetForBottomSheet(delta.extent);
+    // Moves the asset when the bottom sheet is being dragged
+    if (verticalOffset > 0) {
+      viewController?.position = Offset(0, -verticalOffset);
+    }
+  }
+
+  void _onEvent(Event event) {
+    if (event is TimelineReloadEvent) {
+      _onTimelineReload(event);
+      return;
+    }
+
+    if (event is ViewerOpenBottomSheetEvent) {
+      final extent = _kBottomSheetMinimumExtent + 0.3;
+      _openBottomSheet(scaffoldContext!, extent: extent);
+      final offset = _getVerticalOffsetForBottomSheet(extent);
+      viewController?.position = Offset(0, -offset);
+      return;
+    }
+  }
+
+  void _onTimelineReload(_) {
+    setState(() {
+      totalAssets = ref.read(timelineServiceProvider).totalAssets;
+      if (totalAssets == 0) {
+        context.maybePop();
+        return;
+      }
+
+      final index = pageController.page?.round() ?? 0;
+      final newAsset = ref.read(timelineServiceProvider).getAsset(index);
+      final currentAsset = ref.read(currentAssetNotifier);
+      // Do not reload / close the bottom sheet if the asset has not changed
+      if (newAsset.heroTag == currentAsset?.heroTag) {
+        return;
+      }
+
+      _onAssetChanged(pageController.page!.round());
+      sheetCloseController?.close();
+    });
+  }
+
+  void _openBottomSheet(
+    BuildContext ctx, {
+    double extent = _kBottomSheetMinimumExtent,
+  }) {
+    ref.read(assetViewerProvider.notifier).setBottomSheet(true);
+    initialScale = viewController?.scale;
+    viewController?.updateMultiple(scale: _getScaleForBottomSheet);
+    previousExtent = _kBottomSheetMinimumExtent;
+    sheetCloseController = showBottomSheet(
+      context: ctx,
+      sheetAnimationStyle: AnimationStyle(
+        duration: Durations.short4,
+        reverseDuration: Durations.short2,
+      ),
+      constraints: const BoxConstraints(maxWidth: double.infinity),
+      shape: const RoundedRectangleBorder(
+        borderRadius: BorderRadius.vertical(top: Radius.circular(20.0)),
+      ),
+      backgroundColor: ctx.colorScheme.surfaceContainerLowest,
+      builder: (_) {
+        return NotificationListener<Notification>(
+          onNotification: _onNotification,
+          child: AssetDetailBottomSheet(
+            controller: bottomSheetController,
+            initialChildSize: extent,
+          ),
+        );
+      },
+    );
+    sheetCloseController?.closed.then((_) => _handleSheetClose());
+  }
+
+  void _handleSheetClose() {
+    viewController?.animateMultiple(position: Offset.zero);
+    viewController?.updateMultiple(scale: initialScale);
+    ref.read(assetViewerProvider.notifier).setBottomSheet(false);
+    sheetCloseController = null;
+    shouldPopOnDrag = false;
+    hasDraggedDown = null;
+  }
+
+  void _snapBottomSheet() {
+    if (bottomSheetController.size > _kBottomSheetSnapExtent ||
+        bottomSheetController.size < 0.4) {
+      return;
+    }
+    isSnapping = true;
+    bottomSheetController.animateTo(
+      _kBottomSheetSnapExtent,
+      duration: Durations.short3,
+      curve: Curves.easeOut,
+    );
+  }
+
+  Widget _placeholderBuilder(
+    BuildContext ctx,
+    ImageChunkEvent? progress,
+    int index,
+  ) {
+    final asset = ref.read(timelineServiceProvider).getAsset(index);
+    return Container(
+      width: double.infinity,
+      height: double.infinity,
+      color: backgroundColor,
+      child: Thumbnail(
+        asset: asset,
+        fit: BoxFit.contain,
+        size: Size(
+          ctx.width,
+          ctx.height,
+        ),
+      ),
+    );
+  }
+
+  PhotoViewGalleryPageOptions _assetBuilder(BuildContext ctx, int index) {
+    scaffoldContext ??= ctx;
+    final asset = ref.read(timelineServiceProvider).getAsset(index);
+    final size = Size(ctx.width, ctx.height);
+
+    return PhotoViewGalleryPageOptions(
+      key: ValueKey(asset.heroTag),
+      imageProvider: getFullImageProvider(asset, size: size),
+      heroAttributes: PhotoViewHeroAttributes(tag: asset.heroTag),
+      filterQuality: FilterQuality.high,
+      tightMode: true,
+      initialScale: PhotoViewComputedScale.contained * 0.999,
+      minScale: PhotoViewComputedScale.contained * 0.999,
+      disableScaleGestures: showingBottomSheet,
+      onDragStart: _onDragStart,
+      onDragUpdate: _onDragUpdate,
+      onDragEnd: _onDragEnd,
+      onTapDown: _onTapDown,
+      errorBuilder: (_, __, ___) => Container(
+        width: ctx.width,
+        height: ctx.height,
+        color: backgroundColor,
+        child: Thumbnail(
+          asset: asset,
+          fit: BoxFit.contain,
+          size: size,
+        ),
+      ),
+    );
+  }
+
+  void _onPop<T>(bool didPop, T? result) {
+    ref.read(currentAssetNotifier.notifier).dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    // Rebuild the widget when the asset viewer state changes
+    // Using multiple selectors to avoid unnecessary rebuilds for other state changes
+    ref.watch(assetViewerProvider.select((s) => s.showingBottomSheet));
+    ref.watch(assetViewerProvider.select((s) => s.backgroundOpacity));
+
+    // Currently it is not possible to scroll the asset when the bottom sheet is open all the way.
+    // Issue: https://github.com/flutter/flutter/issues/109037
+    // TODO: Add a custom scrum builder once the fix lands on stable
+    return PopScope(
+      onPopInvokedWithResult: _onPop,
+      child: Scaffold(
+        backgroundColor: backgroundColor,
+        appBar: const ViewerTopAppBar(),
+        extendBody: true,
+        extendBodyBehindAppBar: true,
+        body: PhotoViewGallery.builder(
+          gaplessPlayback: true,
+          loadingBuilder: _placeholderBuilder,
+          pageController: pageController,
+          scrollPhysics: platform.isIOS
+              ? const FastScrollPhysics() // Use bouncing physics for iOS
+              : const FastClampingScrollPhysics() // Use heavy physics for Android
+          ,
+          itemCount: totalAssets,
+          onPageChanged: _onPageChanged,
+          onPageBuild: _onPageBuild,
+          builder: _assetBuilder,
+          backgroundDecoration: BoxDecoration(color: backgroundColor),
+          enablePanAlways: true,
+        ),
+        bottomNavigationBar: const ViewerBottomBar(),
+      ),
+    );
+  }
+}
--- a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.state.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.state.dart
@@ -0,0 +1,76 @@
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+
+class AssetViewerState {
+  final int backgroundOpacity;
+  final bool showingBottomSheet;
+  final bool showingControls;
+
+  const AssetViewerState({
+    this.backgroundOpacity = 255,
+    this.showingBottomSheet = false,
+    this.showingControls = true,
+  });
+
+  AssetViewerState copyWith({
+    int? backgroundOpacity,
+    bool? showingBottomSheet,
+    bool? showingControls,
+  }) {
+    return AssetViewerState(
+      backgroundOpacity: backgroundOpacity ?? this.backgroundOpacity,
+      showingBottomSheet: showingBottomSheet ?? this.showingBottomSheet,
+      showingControls: showingControls ?? this.showingControls,
+    );
+  }
+
+  @override
+  String toString() {
+    return 'AssetViewerState(opacity: $backgroundOpacity, bottomSheet: $showingBottomSheet, controls: $showingControls)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) return true;
+    if (other.runtimeType != runtimeType) return false;
+    return other is AssetViewerState &&
+        other.backgroundOpacity == backgroundOpacity &&
+        other.showingBottomSheet == showingBottomSheet &&
+        other.showingControls == showingControls;
+  }
+
+  @override
+  int get hashCode =>
+      backgroundOpacity.hashCode ^
+      showingBottomSheet.hashCode ^
+      showingControls.hashCode;
+}
+
+class AssetViewerStateNotifier extends AutoDisposeNotifier<AssetViewerState> {
+  @override
+  AssetViewerState build() {
+    return const AssetViewerState();
+  }
+
+  void setOpacity(int opacity) {
+    state = state.copyWith(
+      backgroundOpacity: opacity,
+      showingControls: opacity == 255 ? true : state.showingControls,
+    );
+  }
+
+  void setBottomSheet(bool showing) {
+    state = state.copyWith(
+      showingBottomSheet: showing,
+      showingControls: showing ? true : state.showingControls,
+    );
+  }
+
+  void toggleControls() {
+    state = state.copyWith(showingControls: !state.showingControls);
+  }
+}
+
+final assetViewerProvider =
+    AutoDisposeNotifierProvider<AssetViewerStateNotifier, AssetViewerState>(
+  AssetViewerStateNotifier.new,
+);
--- a/mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart
@@ -0,0 +1,93 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
+import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
+
+class ViewerBottomBar extends ConsumerWidget {
+  const ViewerBottomBar({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final asset = ref.watch(currentAssetNotifier);
+    if (asset == null) {
+      return const SizedBox.shrink();
+    }
+
+    final user = ref.watch(currentUserProvider);
+    final isOwner = asset is RemoteAsset && asset.ownerId == user?.id;
+    final isSheetOpen = ref.watch(
+      assetViewerProvider.select((s) => s.showingBottomSheet),
+    );
+    int opacity = ref.watch(
+      assetViewerProvider.select((state) => state.backgroundOpacity),
+    );
+    final showControls =
+        ref.watch(assetViewerProvider.select((s) => s.showingControls));
+
+    if (!showControls) {
+      opacity = 0;
+    }
+
+    final actions = <Widget>[
+      const ShareActionButton(),
+      const _EditActionButton(),
+      if (asset.hasRemote && isOwner)
+        const ArchiveActionButton(source: ActionSource.viewer),
+    ];
+
+    return IgnorePointer(
+      ignoring: opacity < 255,
+      child: AnimatedOpacity(
+        opacity: opacity / 255,
+        duration: Durations.short2,
+        child: AnimatedSwitcher(
+          duration: Durations.short4,
+          child: isSheetOpen
+              ? const SizedBox.shrink()
+              : SafeArea(
+                  child: Theme(
+                    data: context.themeData.copyWith(
+                      iconTheme:
+                          const IconThemeData(size: 22, color: Colors.white),
+                      textTheme: context.themeData.textTheme.copyWith(
+                        labelLarge:
+                            context.themeData.textTheme.labelLarge?.copyWith(
+                          color: Colors.white,
+                        ),
+                      ),
+                    ),
+                    child: Container(
+                      height: 80,
+                      color: Colors.black.withAlpha(125),
+                      child: Row(
+                        mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                        children: actions,
+                      ),
+                    ),
+                  ),
+                ),
+        ),
+      ),
+    );
+  }
+}
+
+class _EditActionButton extends ConsumerWidget {
+  const _EditActionButton();
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return BaseActionButton(
+      iconData: Icons.tune_outlined,
+      label: 'edit'.t(context: context),
+    );
+  }
+}
--- a/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
@@ -0,0 +1,253 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/models/exif.model.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/share_link_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/trash_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/asset_viewer/bottom_sheet/location_details.widget.dart';
+import 'package:immich_mobile/presentation/widgets/bottom_app_bar/base_bottom_sheet.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
+import 'package:immich_mobile/providers/server_info.provider.dart';
+import 'package:immich_mobile/utils/bytes_units.dart';
+
+const _kSeparator = '  •  ';
+
+class AssetDetailBottomSheet extends ConsumerWidget {
+  final DraggableScrollableController? controller;
+  final double initialChildSize;
+
+  const AssetDetailBottomSheet({
+    this.controller,
+    this.initialChildSize = 0.35,
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final asset = ref.watch(currentAssetNotifier);
+    if (asset == null) {
+      return const SizedBox.shrink();
+    }
+
+    final isTrashEnable = ref.watch(
+      serverInfoProvider.select((state) => state.serverFeatures.trash),
+    );
+
+    final actions = <Widget>[
+      const ShareActionButton(),
+      if (asset.hasRemote) ...[
+        const ShareLinkActionButton(source: ActionSource.viewer),
+        const ArchiveActionButton(source: ActionSource.viewer),
+        if (!asset.hasLocal) const DownloadActionButton(),
+        isTrashEnable
+            ? const TrashActionButton(source: ActionSource.viewer)
+            : const DeletePermanentActionButton(source: ActionSource.viewer),
+        const MoveToLockFolderActionButton(
+          source: ActionSource.viewer,
+        ),
+      ],
+      if (asset.storage == AssetState.local) ...[
+        const DeleteLocalActionButton(),
+        const UploadActionButton(),
+      ],
+    ];
+
+    return BaseBottomSheet(
+      actions: actions,
+      slivers: const [_AssetDetailBottomSheet()],
+      controller: controller,
+      initialChildSize: initialChildSize,
+      minChildSize: 0.1,
+      maxChildSize: 0.88,
+      expand: false,
+      shouldCloseOnMinExtent: false,
+      resizeOnScroll: false,
+    );
+  }
+}
+
+class _AssetDetailBottomSheet extends ConsumerWidget {
+  const _AssetDetailBottomSheet();
+
+  String _getDateTime(BuildContext ctx, BaseAsset asset) {
+    final dateTime = asset.createdAt.toLocal();
+    final date = DateFormat.yMMMEd(ctx.locale.toLanguageTag()).format(dateTime);
+    final time = DateFormat.jm(ctx.locale.toLanguageTag()).format(dateTime);
+    return '$date$_kSeparator$time';
+  }
+
+  String _getFileInfo(BaseAsset asset, ExifInfo? exifInfo) {
+    final height = asset.height ?? exifInfo?.height;
+    final width = asset.width ?? exifInfo?.width;
+    final resolution =
+        (width != null && height != null) ? "$width x $height" : null;
+    final fileSize =
+        exifInfo?.fileSize != null ? formatBytes(exifInfo!.fileSize!) : null;
+
+    return switch ((fileSize, resolution)) {
+      (null, null) => '',
+      (String fileSize, null) => fileSize,
+      (null, String resolution) => resolution,
+      (String fileSize, String resolution) =>
+        '$fileSize$_kSeparator$resolution',
+    };
+  }
+
+  String? _getCameraInfoTitle(ExifInfo? exifInfo) {
+    if (exifInfo == null) {
+      return null;
+    }
+
+    return switch ((exifInfo.make, exifInfo.model)) {
+      (null, null) => null,
+      (String make, null) => make,
+      (null, String model) => model,
+      (String make, String model) => '$make $model',
+    };
+  }
+
+  String? _getCameraInfoSubtitle(ExifInfo? exifInfo) {
+    if (exifInfo == null) {
+      return null;
+    }
+
+    final fNumber =
+        exifInfo.fNumber.isNotEmpty ? 'ƒ/${exifInfo.fNumber}' : null;
+    final exposureTime =
+        exifInfo.exposureTime.isNotEmpty ? exifInfo.exposureTime : null;
+    final focalLength =
+        exifInfo.focalLength.isNotEmpty ? '${exifInfo.focalLength} mm' : null;
+    final iso = exifInfo.iso != null ? 'ISO ${exifInfo.iso}' : null;
+
+    return [fNumber, exposureTime, focalLength, iso]
+        .where((spec) => spec != null && spec.isNotEmpty)
+        .join(_kSeparator);
+  }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final asset = ref.watch(currentAssetNotifier);
+    if (asset == null) {
+      return const SliverToBoxAdapter(child: SizedBox.shrink());
+    }
+
+    final exifInfo = ref.watch(currentAssetExifProvider).valueOrNull;
+    final cameraTitle = _getCameraInfoTitle(exifInfo);
+
+    return SliverList.list(
+      children: [
+        // Asset Date and Time
+        _SheetTile(
+          title: _getDateTime(context, asset),
+          titleStyle: context.textTheme.bodyLarge?.copyWith(
+            fontWeight: FontWeight.w500,
+            fontSize: 16,
+          ),
+        ),
+        const SheetLocationDetails(),
+        // Details header
+        _SheetTile(
+          title: 'exif_bottom_sheet_details'.t(context: context),
+          titleStyle: context.textTheme.labelLarge,
+        ),
+        // File info
+        _SheetTile(
+          title: asset.name,
+          titleStyle: context.textTheme.labelLarge
+              ?.copyWith(fontWeight: FontWeight.w600),
+          leading: Icon(
+            asset.isImage ? Icons.image_outlined : Icons.videocam_outlined,
+            size: 30,
+            color: context.textTheme.labelLarge?.color,
+          ),
+          subtitle: _getFileInfo(asset, exifInfo),
+          subtitleStyle: context.textTheme.labelLarge?.copyWith(
+            color: context.textTheme.labelLarge?.color?.withAlpha(200),
+          ),
+        ),
+        // Camera info
+        if (cameraTitle != null)
+          _SheetTile(
+            title: cameraTitle,
+            titleStyle: context.textTheme.labelLarge
+                ?.copyWith(fontWeight: FontWeight.w600),
+            leading: Icon(
+              Icons.camera_outlined,
+              size: 30,
+              color: context.textTheme.labelLarge?.color,
+            ),
+            subtitle: _getCameraInfoSubtitle(exifInfo),
+            subtitleStyle: context.textTheme.labelLarge?.copyWith(
+              color: context.textTheme.labelLarge?.color?.withAlpha(200),
+            ),
+          ),
+      ],
+    );
+  }
+}
+
+class _SheetTile extends StatelessWidget {
+  final String title;
+  final Widget? leading;
+  final String? subtitle;
+  final TextStyle? titleStyle;
+  final TextStyle? subtitleStyle;
+
+  const _SheetTile({
+    required this.title,
+    this.titleStyle,
+    this.leading,
+    this.subtitle,
+    this.subtitleStyle,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final Widget titleWidget;
+    if (leading == null) {
+      titleWidget = LimitedBox(
+        maxWidth: double.infinity,
+        child: Text(title, style: titleStyle),
+      );
+    } else {
+      titleWidget = Container(
+        width: double.infinity,
+        padding: const EdgeInsets.only(left: 15),
+        child: Text(title, style: titleStyle),
+      );
+    }
+
+    final Widget? subtitleWidget;
+    if (leading == null && subtitle != null) {
+      subtitleWidget = Text(subtitle!, style: subtitleStyle);
+    } else if (leading != null && subtitle != null) {
+      subtitleWidget = Padding(
+        padding: const EdgeInsets.only(left: 15),
+        child: Text(subtitle!, style: subtitleStyle),
+      );
+    } else {
+      subtitleWidget = null;
+    }
+
+    return ListTile(
+      dense: true,
+      visualDensity: VisualDensity.compact,
+      title: titleWidget,
+      titleAlignment: ListTileTitleAlignment.center,
+      leading: leading,
+      contentPadding: leading == null ? null : const EdgeInsets.only(left: 25),
+      subtitle: subtitleWidget,
+    );
+  }
+}
--- a/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet/location_details.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet/location_details.widget.dart
@@ -0,0 +1,127 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/models/exif.model.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
+import 'package:immich_mobile/widgets/asset_viewer/detail_panel/exif_map.dart';
+import 'package:maplibre_gl/maplibre_gl.dart';
+
+class SheetLocationDetails extends ConsumerStatefulWidget {
+  const SheetLocationDetails({super.key});
+
+  @override
+  ConsumerState createState() => _SheetLocationDetailsState();
+}
+
+class _SheetLocationDetailsState extends ConsumerState<SheetLocationDetails> {
+  BaseAsset? asset;
+  ExifInfo? exifInfo;
+  MapLibreMapController? _mapController;
+
+  String? _getLocationName(ExifInfo? exifInfo) {
+    if (exifInfo == null) {
+      return null;
+    }
+
+    final cityName = exifInfo.city;
+    final stateName = exifInfo.state;
+
+    if (cityName != null && stateName != null) {
+      return "$cityName, $stateName";
+    }
+    return null;
+  }
+
+  void _onMapCreated(MapLibreMapController controller) {
+    _mapController = controller;
+  }
+
+  void _onExifChanged(
+    AsyncValue<ExifInfo?>? previous,
+    AsyncValue<ExifInfo?> current,
+  ) {
+    asset = ref.read(currentAssetNotifier);
+    setState(() {
+      exifInfo = current.valueOrNull;
+      final hasCoordinates = exifInfo?.hasCoordinates ?? false;
+      if (exifInfo != null && hasCoordinates) {
+        _mapController?.moveCamera(
+          CameraUpdate.newLatLng(
+            LatLng(exifInfo!.latitude!, exifInfo!.longitude!),
+          ),
+        );
+      }
+    });
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    ref.listenManual(
+      currentAssetExifProvider,
+      _onExifChanged,
+      fireImmediately: true,
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final hasCoordinates = exifInfo?.hasCoordinates ?? false;
+
+    // Guard no lat/lng
+    if (!hasCoordinates ||
+        (asset is LocalAsset && !(asset as LocalAsset).hasRemote)) {
+      return const SizedBox.shrink();
+    }
+
+    final remoteId = asset is LocalAsset
+        ? (asset as LocalAsset).remoteId
+        : (asset as RemoteAsset).id;
+    final locationName = _getLocationName(exifInfo);
+    final coordinates =
+        "${exifInfo!.latitude!.toStringAsFixed(4)}, ${exifInfo!.longitude!.toStringAsFixed(4)}";
+
+    return Padding(
+      padding: EdgeInsets.symmetric(
+        vertical: 16.0,
+        horizontal: context.isMobile ? 16.0 : 56.0,
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Padding(
+            padding: const EdgeInsets.only(bottom: 16),
+            child: Text(
+              "exif_bottom_sheet_location".t(context: context),
+              style: context.textTheme.labelLarge,
+            ),
+          ),
+          ExifMap(
+            exifInfo: exifInfo!,
+            markerId: remoteId,
+            onMapCreated: _onMapCreated,
+          ),
+          const SizedBox(height: 15),
+          if (locationName != null)
+            Padding(
+              padding: const EdgeInsets.only(bottom: 4.0),
+              child: Text(
+                locationName,
+                style: context.textTheme.bodyLarge?.copyWith(
+                  fontWeight: FontWeight.w500,
+                ),
+              ),
+            ),
+          Text(
+            coordinates,
+            style: context.textTheme.labelLarge?.copyWith(
+              color: context.textTheme.labelLarge?.color?.withAlpha(150),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
--- a/mobile/lib/presentation/widgets/asset_viewer/top_app_bar.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/top_app_bar.widget.dart
@@ -0,0 +1,114 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/utils/event_stream.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/favorite_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/unfavorite_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
+import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
+
+class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
+  const ViewerTopAppBar({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final asset = ref.watch(currentAssetNotifier);
+    if (asset == null) {
+      return const SizedBox.shrink();
+    }
+
+    final user = ref.watch(currentUserProvider);
+    final isOwner = asset is RemoteAsset && asset.ownerId == user?.id;
+
+    final isShowingSheet = ref
+        .watch(assetViewerProvider.select((state) => state.showingBottomSheet));
+    int opacity = ref.watch(
+      assetViewerProvider.select((state) => state.backgroundOpacity),
+    );
+    final showControls =
+        ref.watch(assetViewerProvider.select((s) => s.showingControls));
+
+    if (!showControls) {
+      opacity = 0;
+    }
+
+    final actions = <Widget>[
+      if (asset.hasRemote && isOwner && !asset.isFavorite)
+        const FavoriteActionButton(source: ActionSource.viewer, menuItem: true),
+      if (asset.hasRemote && isOwner && asset.isFavorite)
+        const UnFavoriteActionButton(
+          source: ActionSource.viewer,
+          menuItem: true,
+        ),
+      const _KebabMenu(),
+    ];
+
+    return IgnorePointer(
+      ignoring: opacity < 255,
+      child: AnimatedOpacity(
+        opacity: opacity / 255,
+        duration: Durations.short2,
+        child: AppBar(
+          backgroundColor:
+              isShowingSheet ? Colors.transparent : Colors.black.withAlpha(125),
+          leading: const _AppBarBackButton(),
+          iconTheme: const IconThemeData(size: 22, color: Colors.white),
+          actionsIconTheme: const IconThemeData(size: 22, color: Colors.white),
+          shape: const Border(),
+          actions: isShowingSheet ? null : actions,
+        ),
+      ),
+    );
+  }
+
+  @override
+  Size get preferredSize => const Size.fromHeight(60.0);
+}
+
+class _KebabMenu extends ConsumerWidget {
+  const _KebabMenu();
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return IconButton(
+      onPressed: () {
+        EventStream.shared.emit(const ViewerOpenBottomSheetEvent());
+      },
+      icon: const Icon(Icons.more_vert_rounded),
+    );
+  }
+}
+
+class _AppBarBackButton extends ConsumerWidget {
+  const _AppBarBackButton();
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final isShowingSheet = ref
+        .watch(assetViewerProvider.select((state) => state.showingBottomSheet));
+    final backgroundColor =
+        isShowingSheet && !context.isDarkTheme ? Colors.white : Colors.black;
+    final foregroundColor =
+        isShowingSheet && !context.isDarkTheme ? Colors.black : Colors.white;
+
+    return Padding(
+      padding: const EdgeInsets.only(left: 12.0),
+      child: ElevatedButton(
+        style: ElevatedButton.styleFrom(
+          backgroundColor: backgroundColor,
+          shape: const CircleBorder(),
+          iconSize: 22,
+          iconColor: foregroundColor,
+          padding: EdgeInsets.zero,
+          elevation: isShowingSheet ? 4 : 0,
+        ),
+        onPressed: context.maybePop,
+        child: const Icon(Icons.arrow_back_rounded),
+      ),
+    );
+  }
+}
--- a/mobile/lib/presentation/widgets/bottom_app_bar/base_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_app_bar/base_bottom_sheet.widget.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/extensions/theme_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.state.dart';

 class BaseBottomSheet extends ConsumerStatefulWidget {
@@ -74,10 +75,7 @@ class _BaseDraggableScrollableSheetState
          clipBehavior: Clip.antiAlias,
          elevation: 6.0,
          shape: const RoundedRectangleBorder(
-            borderRadius: BorderRadius.only(
-              topLeft: Radius.circular(6),
-              topRight: Radius.circular(6),
-            ),
+            borderRadius: BorderRadius.vertical(top: Radius.circular(18)),
          ),
          margin: const EdgeInsets.symmetric(horizontal: 0),
          child: CustomScrollView(
@@ -86,17 +84,22 @@ class _BaseDraggableScrollableSheetState
              SliverToBoxAdapter(
                child: Column(
                  children: [
-                    const SizedBox(height: 16),
+                    const SizedBox(height: 10),
                    const _DragHandle(),
-                    const SizedBox(height: 16),
-                    SizedBox(
-                      height: 120,
-                      child: ListView(
-                        shrinkWrap: true,
-                        scrollDirection: Axis.horizontal,
-                        children: widget.actions,
+                    const SizedBox(height: 14),
+                    if (widget.actions.isNotEmpty)
+                      SizedBox(
+                        height: 115,
+                        child: ListView(
+                          shrinkWrap: true,
+                          scrollDirection: Axis.horizontal,
+                          children: widget.actions,
+                        ),
                      ),
-                    ),
+                    if (widget.actions.isNotEmpty) ...[
+                      const Divider(indent: 16, endIndent: 16),
+                      const SizedBox(height: 16),
+                    ],
                  ],
                ),
              ),
@@ -118,7 +121,7 @@ class _DragHandle extends StatelessWidget {
      height: 6,
      width: 32,
      decoration: BoxDecoration(
-        color: context.themeData.dividerColor,
+        color: context.themeData.dividerColor.lighten(amount: 0.6),
        borderRadius: const BorderRadius.all(Radius.circular(20)),
      ),
    );
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Alex	f5f38f3a6c	chore: more roburst local sync execution	2025-07-05 14:33:50 -05:00
OffsetMonkey538	2f5d75ce21	docs: fix typo of webp listed under jpeg (#19743 )	2025-07-05 15:52:22 +00:00
Daimolean	fb384fe90b	fix(web): viewing asset lock (#19499 ) * fix(web): viewing asset lock * fix: lint * make mutex stateless --------- Co-authored-by: Alex Tran <alex.tran1502@gmail.com>	2025-07-05 02:52:39 +00:00
shenlong	73733370a2	feat: adds bottom sheet map and actions (#19726 ) * reduce timeline rebuilds * feat: adds bottom sheet map and actions (#19692) * adds bottom sheet map and actions * PR feedbacks * only reload the asset viewer if asset is changed * styling tweak --------- Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com> Co-authored-by: Alex <alex.tran1502@gmail.com> * rename singleton and remove event prefix * adds bottom sheet map and actions * PR feedbacks * refactor: use provider for viewer state * feat: adds top and bottom app bar * add safe area to bottom app bar * change app and bottom bar color * viewer - always have black background * use the full width for the bottom sheet on landscape as well * constraint the bottom sheet to not expand all the way * add padding for location details in landscape --------- Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com> Co-authored-by: Alex <alex.tran1502@gmail.com>	2025-07-04 14:08:06 -05:00
Alex	4a2cf28882	feat: memories in new timeline (#19720 ) * feat: memories sliver * memories lane * display and show memory * fix: get correct memories * naming * pr feedback * use equalsValue for visibility --------- Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>	2025-07-04 13:49:15 -05:00
shenlong	181efb9010	refactor: reduce timeline rebuilds (#19704 ) * reduce timeline rebuilds * feat: adds bottom sheet map and actions (#19692) * adds bottom sheet map and actions * PR feedbacks * only reload the asset viewer if asset is changed * styling tweak --------- Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com> Co-authored-by: Alex <alex.tran1502@gmail.com> * rename singleton and remove event prefix --------- Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com> Co-authored-by: Alex <alex.tran1502@gmail.com>	2025-07-04 10:30:34 -05:00
renovate[bot]	b00d44a00c	fix(deps): update machine-learning (#19647 )	2025-07-03 20:28:34 +00:00
Jason Rasmussen	6044663e26	refactor: sql-tools (#19717 )	2025-07-03 10:59:17 -04:00
aviv926	484529e61e	feat(server): add immich and postgres version to the database backup name (#19603 )	2025-07-03 10:35:24 +01:00
Alex	445f9174ea	feat: memories sync (#19644 ) * feat: memories sync * Update mobile/lib/infrastructure/repositories/sync_stream.repository.dart Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update mobile/lib/infrastructure/repositories/sync_stream.repository.dart Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * show sync information * tests and pr feedback * pr feedback --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-07-02 19:18:37 +00:00
shenlong	7855974a29	feat(mobile): sqlite asset viewer (#19552 ) * add full image provider and refactor thumb providers * photo_view updates * wip: asset-viewer * fix controller dispose on page change * wip: bottom sheet * fix interactions * more bottomsheet changes * generate schema * PR feedback * refactor asset viewer * never rotate and fix background on page change * use photoview as the loading builder * precache after delay * claude: optimizing rebuild of image provider * claude: optimizing image decoding and caching * use proper cache for new full size image providers * chore: load local HEIC fullsize for iOS * make controller callbacks nullable * remove imageprovider cache * do not handle drag gestures when zoomed * use loadOriginal setting for HEIC / larger images * preload assets outside timer * never use same controllers in photo-view gallery * fix: cannot scroll down once swipe with bottom sheet --------- Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com> Co-authored-by: Alex <alex.tran1502@gmail.com>	2025-07-02 18:24:37 +00:00
Daimolean	ec603a008c	feat(mobile): unarchive and unfavorite action (#19678 )	2025-07-02 12:27:30 -05:00
shenlong	14276f41d8	fix: handle null bucket name during android sync (#19685 ) Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>	2025-07-02 12:26:42 -05:00
Daimolean	a644cabab6	feat(mobile): trash and delete action (#19681 ) * feat(mobile): trash and delete action * fix lint	2025-07-02 12:26:07 -05:00
Daimolean	b8e67d0ef9	fix(mobile): filter deleted assets (#19683 )	2025-07-02 12:25:14 -05:00
Min Idzelis	ca78bc91b6	feat: fully qualified path in error msg (#19674 ) * feat: fully qualified path in error msg * import style	2025-07-02 09:31:20 -04:00
shenlong	f2f3db3a79	refactor: action provider (#19677 ) Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>	2025-07-01 23:08:52 -05:00
Jason Rasmussen	c435bdb5d3	refactor: sql-tools readers (#19672 )	2025-07-01 22:57:17 -04:00
Min Idzelis	15da0d5a71	fix: email button (#19675 )	2025-07-01 22:48:41 -04:00
Min Idzelis	090d87f82e	chore: dev environment improvements and dependency updates (#19676 )	2025-07-01 22:47:59 -04:00
Alex	25efba8fe6	chore: remove share link success prompt (#19671 )	2025-07-01 16:55:17 +00:00
Daimolean	83afd49f5c	feat(mobile): edit location action (#19645 ) * change dto from integer to double * feat(mobile): edit location action * patch openapi * refactor in provider * fix lint * chore: not showing success prompt if dimissed * i18n --------- Co-authored-by: Alex <alex.tran1502@gmail.com>	2025-07-01 16:52:11 +00:00
Ramon Smits	639ede78c2	docs: document `DB_STORAGE_TYPE` environment variable (#19609 ) Co-authored-by: Zack Pollard <github@zackpollard.uk>	2025-07-01 16:13:24 +00:00
shenlong	15be3437bf	fix: timeline service uninitialised across routes (#19544 )	2025-07-01 10:23:20 -05:00
Daimolean	f59b0bab5a	refactor(mobile): action provider (#19669 ) * refactor action provider * fix lint	2025-07-01 10:18:23 -05:00
Alex	fa418d778b	feat: lock folder action (#19634 ) * feat: lock folder action * refactor	2025-07-01 14:03:45 +00:00
bo0tzz	e0c4b8df6f	chore: remove runner deps install step (#19527 ) Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>	2025-07-01 14:18:14 +01:00
Min Idzelis	7f9689b4bc	feat: bin for cli (#19648 )	2025-07-01 08:00:41 -04:00
seifer44	e6f8bfdf5e	chore(docs): add instruction for trusting self-signed certificates with Immich and an OAuth server (#18624 )	2025-07-01 11:21:57 +00:00
Min Idzelis	8ccca04e27	fix(web): improve request cancellation handling in service worker cache (#19217 )	2025-07-01 11:53:04 +01:00
Daniel Dietzler	53f80393bf	chore: upgrade to cron v4 (#19664 )	2025-07-01 12:47:04 +02:00
renovate[bot]	e5e857edc3	chore(deps): update prom/prometheus docker digest to 7a34573 (#19646 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-07-01 11:33:39 +01:00
renovate[bot]	590f96246d	chore(deps): update github-actions (#19654 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-07-01 11:33:01 +01:00
renovate[bot]	38d73f2bc6	chore(deps): update dependency @types/node to ^22.15.33 (#19653 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-07-01 11:32:11 +01:00
renovate[bot]	96e3b96d57	fix(deps): update dependency nestjs-otel to v7 (#19662 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-07-01 11:02:46 +01:00
renovate[bot]	36b018e355	fix(deps): update typescript-projects (#18898 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Zack Pollard <zackpollard@ymail.com>	2025-07-01 10:00:35 +00:00
renovate[bot]	214ca50406	chore(deps): update node.js to v22.17.0 (#19656 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-07-01 10:59:31 +01:00
renovate[bot]	29b3981609	fix(deps): update dependency nestjs-kysely to v3 (#19660 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-07-01 10:27:20 +01:00
Mert	a068a41c06	fix(server): prevent duplicate geodata temp table (#18580 ) drop tmp table, create gist index first	2025-06-30 23:28:30 -04:00
bo0tzz	3c6e9e1191	feat: use request host as default SSR domain (#19485 ) fix: hostname and domain confusion chore: e2e test	2025-06-30 23:24:44 -04:00
Min Idzelis	db0415bbcc	chore: undeclared versions/updates (#19649 )	2025-06-30 23:23:41 -04:00
shenlong	a5c431fbf5	refactor: animate bottom sheet (#19655 ) * refactor: animate bottom sheet * rebase on main --------- Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>	2025-06-30 22:23:38 -05:00
Min Idzelis	a3d588f6bd	feat: makefile improvements (#19650 )	2025-06-30 21:40:42 -05:00
shenlong	21f500191a	refactor: actions provider (#19651 ) * refactor: actions provider * chore: rename error and stack * remove empty checks --------- Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>	2025-07-01 08:10:25 +05:30
shenlong	5011636d95	refactor: header - bulk select icon (#19652 ) Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>	2025-06-30 21:33:37 -05:00
Alex	3f330c6476	feat: drift album page (#19564 ) * feat: drift album page * feat: page renderred * feat: asset count * refactor: use statefulwidget * refactor: private widgets * refactor: service layer * refactor: import * feat: get owner name * pr feedback * pr feedback * pr feedback * pr feedback	2025-07-01 07:54:50 +05:30
Daimolean	bb8755021d	revert: timeout (#19639 )	2025-06-30 17:02:50 -05:00
Jason Rasmussen	93f9e118ad	refactor: timeline tests (#19641 )	2025-06-30 17:43:45 -04:00
Jason Rasmussen	58ca1402ed	feat: sync partner stacks (#19635 )	2025-06-30 16:41:06 -04:00
Daimolean	32a7087883	feat(mobile): archive action (#19630 ) * feat(mobile): archive action * fix: lint * Update i18n/en.json Co-authored-by: Alex <alex.tran1502@gmail.com> * fix: lint * fix: lint --------- Co-authored-by: Alex <alex.tran1502@gmail.com>	2025-06-30 14:38:15 -05:00
Daimolean	53020852ec	fix(web): modal race condition (#19625 ) * fix(web): modal race condition * fix: translation * fix: translation	2025-06-30 14:33:47 -05:00
Jason Rasmussen	181a7e115f	feat: sync stacks (#19629 )	2025-06-30 14:26:41 -05:00
Alex	095ace8687	feat: shared link action (#19610 )	2025-06-30 17:32:18 +00:00
Alex	4c3fcdc745	feat: favorite action (#19623 )	2025-06-30 12:21:09 -05:00
Alex	fa5f30d9ca	fix: timeline service mismatch state (#19612 )	2025-06-30 12:20:13 -05:00
Jason Rasmussen	e60bc3c304	refactor: database types (#19624 )	2025-06-30 13:19:16 -04:00
@@ -1 +1 @@
 .16.0
 .17.0