rebase

sync adjustment timestamp and store in db
feat: add adjustmentTimestamp to platformasset
2025-12-10 01:10:21 +03:00 · 2025-11-24 22:21:30 +05:30 · 2025-11-24 22:17:55 +05:30 · 2025-11-24 22:15:03 +05:30
321 changed files with 7017 additions and 11621 deletions
--- a/.github/.nvmrc
+++ b/.github/.nvmrc
@@ -1 +1 @@
-24.11.1
+24.11.0
--- a/.github/package.json
+++ b/.github/package.json
@@ -4,6 +4,6 @@
    "format:fix": "prettier --write ."
  },
  "devDependencies": {
-    "prettier": "^3.7.4"
+    "prettier": "^3.5.3"
  }
 }
--- a/.github/workflows/cli.yml
+++ b/.github/workflows/cli.yml
@@ -105,7 +105,7 @@ jobs:

      - name: Generate docker image tags
        id: metadata
-        uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5.10.0
+        uses: docker/metadata-action@318604b99e75e41977312d83839a89be02ca4893 # v5.9.0
        with:
          flavor: |
            latest=false
--- a/.github/workflows/close-duplicates.yml
+++ b/.github/workflows/close-duplicates.yml
@@ -35,7 +35,7 @@ jobs:
    needs: [get_body, should_run]
    if: ${{ needs.should_run.outputs.should_run == 'true' }}
    container:
-      image: ghcr.io/immich-app/mdq:main@sha256:237cdae7783609c96f18037a513d38088713cf4a2e493a3aa136d0c45490749a
+      image: ghcr.io/immich-app/mdq:main@sha256:9c905a4ff69f00c4b2f98b40b6090ab3ab18d1a15ed1379733b8691aa1fcb271
    outputs:
      checked: ${{ steps.get_checkbox.outputs.checked }}
    steps:
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -57,7 +57,7 @@ jobs:

      # Initializes the CodeQL tools for scanning.
      - name: Initialize CodeQL
-        uses: github/codeql-action/init@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
+        uses: github/codeql-action/init@014f16e7ab1402f30e7c3329d33797e7948572db # v4.31.3
        with:
          languages: ${{ matrix.language }}
          # If you wish to specify custom queries, you can do so here or in a config file.
@@ -70,7 +70,7 @@ jobs:
      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
      # If this step fails, then you should remove it and run the build manually (see below)
      - name: Autobuild
-        uses: github/codeql-action/autobuild@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
+        uses: github/codeql-action/autobuild@014f16e7ab1402f30e7c3329d33797e7948572db # v4.31.3

      # ℹ️ Command-line programs to run using the OS shell.
      # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -83,6 +83,6 @@ jobs:
      #   ./location_of_script_within_repo/buildscript.sh

      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
+        uses: github/codeql-action/analyze@014f16e7ab1402f30e7c3329d33797e7948572db # v4.31.3
        with:
          category: '/language:${{matrix.language}}'
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -132,7 +132,7 @@ jobs:
            suffixes: '-rocm'
            platforms: linux/amd64
            runner-mapping: '{"linux/amd64": "mich"}'
-    uses: immich-app/devtools/.github/workflows/multi-runner-build.yml@0477486d82313fba68f7c82c034120a4b8981297 # multi-runner-build-workflow-v2.1.0
+    uses: immich-app/devtools/.github/workflows/multi-runner-build.yml@47a2ee86898ccff51592d6572391fb1abcd7f782 # multi-runner-build-workflow-v2.0.1
    permissions:
      contents: read
      actions: read
@@ -155,7 +155,7 @@ jobs:
    name: Build and Push Server
    needs: pre-job
    if: ${{ fromJSON(needs.pre-job.outputs.should_run).server == true }}
-    uses: immich-app/devtools/.github/workflows/multi-runner-build.yml@0477486d82313fba68f7c82c034120a4b8981297 # multi-runner-build-workflow-v2.1.0
+    uses: immich-app/devtools/.github/workflows/multi-runner-build.yml@47a2ee86898ccff51592d6572391fb1abcd7f782 # multi-runner-build-workflow-v2.0.1
    permissions:
      contents: read
      actions: read
--- a/.github/workflows/fix-format.yml
+++ b/.github/workflows/fix-format.yml
@@ -16,7 +16,7 @@ jobs:
    steps:
      - name: Generate a token
        id: generate-token
-        uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
+        uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
        with:
          app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
--- a/.github/workflows/merge-translations.yml
+++ b/.github/workflows/merge-translations.yml
@@ -31,7 +31,7 @@ jobs:
      - name: Generate a token
        id: generate_token
        if: ${{ inputs.skip != true }}
-        uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
+        uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
        with:
          app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -49,7 +49,7 @@ jobs:
    steps:
      - name: Generate a token
        id: generate-token
-        uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
+        uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
        with:
          app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -62,7 +62,7 @@ jobs:
          ref: main

      - name: Install uv
-        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+        uses: astral-sh/setup-uv@5a7eac68fb9809dea845d802897dc5c723910fa3 # v7.1.3

      - name: Setup pnpm
        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
@@ -126,7 +126,7 @@ jobs:
    steps:
      - name: Generate a token
        id: generate-token
-        uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
+        uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
        with:
          app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
--- a/.github/workflows/release-pr.yml
+++ b/.github/workflows/release-pr.yml
@@ -17,7 +17,7 @@ jobs:
    steps:
      - name: Generate a token
        id: generate-token
-        uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
+        uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
        with:
          app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -30,7 +30,7 @@ jobs:
          ref: main

      - name: Install uv
-        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+        uses: astral-sh/setup-uv@5a7eac68fb9809dea845d802897dc5c723910fa3 # v7.1.3

      - name: Setup pnpm
        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
@@ -159,7 +159,7 @@ jobs:

      - name: Create PR
        id: create-pr
-        uses: peter-evans/create-pull-request@84ae59a2cdc2258d6fa0732dd66352dddae2a412 # v7.0.9
+        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
        with:
          token: ${{ steps.generate-token.outputs.token }}
          commit-message: 'chore: release ${{ steps.bump-type.outputs.next }}'
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -52,7 +52,7 @@ jobs:
    steps:
      - name: Generate a token
        id: generate-token
-        uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
+        uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
        with:
          app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -74,7 +74,7 @@ jobs:
          echo "version=$VERSION" >> $GITHUB_OUTPUT

      - name: Download APK
-        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
        with:
          name: release-apk-signed
          github-token: ${{ steps.generate-token.outputs.token }}
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -571,8 +571,8 @@ jobs:
          persist-credentials: false
          token: ${{ steps.token.outputs.token }}
      - name: Install uv
-        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
-      - uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
+        uses: astral-sh/setup-uv@5a7eac68fb9809dea845d802897dc5c723910fa3 # v7.1.3
+      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
        # TODO: add caching when supported (https://github.com/actions/setup-python/pull/818)
        # with:
        #   python-version: 3.11
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -52,7 +52,7 @@
  },
  "cSpell.words": ["immich"],
  "editor.formatOnSave": true,
-  "eslint.validate": ["javascript", "typescript", "svelte"],
+  "eslint.validate": ["javascript", "svelte"],
  "explorer.fileNesting.enabled": true,
  "explorer.fileNesting.patterns": {
    "*.dart": "${capture}.g.dart,${capture}.gr.dart,${capture}.drift.dart",
--- a/cli/.nvmrc
+++ b/cli/.nvmrc
@@ -1 +1 @@
-24.11.1
+24.11.0
--- a/cli/Dockerfile
+++ b/cli/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:24.1.0-alpine3.20@sha256:8fe019e0d57dbdce5f5c27c0b63d2775cf34b00e3755a7dea969802d7e0c2b25 AS core
+FROM node:22.16.0-alpine3.20@sha256:2289fb1fba0f4633b08ec47b94a89c7e20b829fc5679f9b7b298eaa2f1ed8b7e AS core

 WORKDIR /usr/src/app
 COPY package* pnpm* .pnpmfile.cjs ./
--- a/cli/package.json
+++ b/cli/package.json
@@ -20,7 +20,7 @@
    "@types/lodash-es": "^4.17.12",
    "@types/micromatch": "^4.0.9",
    "@types/mock-fs": "^4.13.1",
-    "@types/node": "^24.10.1",
+    "@types/node": "^22.19.1",
    "@vitest/coverage-v8": "^3.0.0",
    "byte-size": "^9.0.0",
    "cli-progress": "^3.12.0",
@@ -28,10 +28,10 @@
    "eslint": "^9.14.0",
    "eslint-config-prettier": "^10.1.8",
    "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-unicorn": "^62.0.0",
+    "eslint-plugin-unicorn": "^60.0.0",
    "globals": "^16.0.0",
    "mock-fs": "^5.2.0",
-    "prettier": "^3.7.4",
+    "prettier": "^3.2.5",
    "prettier-plugin-organize-imports": "^4.0.0",
    "typescript": "^5.3.3",
    "typescript-eslint": "^8.28.0",
@@ -69,6 +69,6 @@
    "micromatch": "^4.0.8"
  },
  "volta": {
-    "node": "24.11.1"
+    "node": "24.11.0"
  }
 }
--- a/cli/src/utils.spec.ts
+++ b/cli/src/utils.spec.ts
@@ -299,7 +299,7 @@ describe('crawl', () => {
          .map(([file]) => file);

        // Compare file's content instead of path since a file can be represent in multiple ways.
-        expect(actual.map((path) => readContent(path)).toSorted()).toEqual(expected.toSorted());
+        expect(actual.map((path) => readContent(path)).sort()).toEqual(expected.sort());
      });
    }
  });
--- a/cli/src/utils.ts
+++ b/cli/src/utils.ts
@@ -160,7 +160,7 @@ export const crawl = async (options: CrawlOptions): Promise<string[]> => {
    ignore: [`**/${exclusionPattern}`],
  });
  globbedFiles.push(...crawledFiles);
-  return globbedFiles.toSorted();
+  return globbedFiles.sort();
 };

 export const sha1 = (filepath: string) => {
--- a/cli/tsconfig.json
+++ b/cli/tsconfig.json
@@ -9,7 +9,7 @@
    "experimentalDecorators": true,
    "allowSyntheticDefaultImports": true,
    "resolveJsonModule": true,
-    "target": "es2023",
+    "target": "es2022",
    "sourceMap": true,
    "outDir": "./dist",
    "incremental": true,
--- a/deployment/mise.toml
+++ b/deployment/mise.toml
@@ -1,6 +1,6 @@
 [tools]
-terragrunt = "0.93.10"
-opentofu = "1.10.7"
+terragrunt = "0.91.2"
+opentofu = "1.10.6"

 [tasks."tg:fmt"]
 run = "terragrunt hclfmt"
--- a/docker/docker-compose.dev.yml
+++ b/docker/docker-compose.dev.yml
@@ -58,6 +58,10 @@ services:
      IMMICH_THIRD_PARTY_BUG_FEATURE_URL: https://github.com/immich-app/immich/issues
      IMMICH_THIRD_PARTY_DOCUMENTATION_URL: https://docs.immich.app
      IMMICH_THIRD_PARTY_SUPPORT_URL: https://docs.immich.app/community-guides
+    ulimits:
+      nofile:
+        soft: 1048576
+        hard: 1048576
    ports:
      - 9230:9230
      - 9231:9231
@@ -96,6 +100,10 @@ services:
      - app-node_modules:/usr/src/app/node_modules
      - sveltekit:/usr/src/app/web/.svelte-kit
      - coverage:/usr/src/app/web/coverage
+    ulimits:
+      nofile:
+        soft: 1048576
+        hard: 1048576
    restart: unless-stopped
    depends_on:
      immich-server:
@@ -127,7 +135,7 @@ services:

  redis:
    container_name: immich_redis
-    image: docker.io/valkey/valkey:9@sha256:4503e204c900a00ad393bec83c8c7c4c76b0529cd629e23b34b52011aefd1d27
+    image: docker.io/valkey/valkey:8@sha256:81db6d39e1bba3b3ff32bd3a1b19a6d69690f94a3954ec131277b9a26b95b3aa
    healthcheck:
      test: redis-cli ping || exit 1

--- a/docker/docker-compose.prod.yml
+++ b/docker/docker-compose.prod.yml
@@ -56,7 +56,7 @@ services:

  redis:
    container_name: immich_redis
-    image: docker.io/valkey/valkey:9@sha256:4503e204c900a00ad393bec83c8c7c4c76b0529cd629e23b34b52011aefd1d27
+    image: docker.io/valkey/valkey:8@sha256:81db6d39e1bba3b3ff32bd3a1b19a6d69690f94a3954ec131277b9a26b95b3aa
    healthcheck:
      test: redis-cli ping || exit 1
    restart: always
@@ -95,7 +95,7 @@ services:
    command: ['./run.sh', '-disable-reporting']
    ports:
      - 3000:3000
-    image: grafana/grafana:12.3.0-ubuntu@sha256:cee936306135e1925ab21dffa16f8a411535d16ab086bef2309339a8e74d62df
+    image: grafana/grafana:12.2.1-ubuntu@sha256:797530c642f7b41ba7848c44cfda5e361ef1f3391a98bed1e5d448c472b6826a
    volumes:
      - grafana-data:/var/lib/grafana

--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -49,7 +49,7 @@ services:

  redis:
    container_name: immich_redis
-    image: docker.io/valkey/valkey:9@sha256:4503e204c900a00ad393bec83c8c7c4c76b0529cd629e23b34b52011aefd1d27
+    image: docker.io/valkey/valkey:8@sha256:81db6d39e1bba3b3ff32bd3a1b19a6d69690f94a3954ec131277b9a26b95b3aa
    healthcheck:
      test: redis-cli ping || exit 1
    restart: always
--- a/docs/.nvmrc
+++ b/docs/.nvmrc
@@ -1 +1 @@
-24.11.1
+24.11.0
--- a/docs/docs/FAQ.mdx
+++ b/docs/docs/FAQ.mdx
@@ -133,9 +133,9 @@ There are a few different scenarios that can lead to this situation. The solutio
 The job is only automatically run once per asset after upload. If metadata extraction originally failed, the jobs were cleared/canceled, etc.,
 the job may not have run automatically the first time.

-### How can I hide a photo or video from the timeline?
+### How can I hide photos from the timeline?

-You can _archive_ them. This will hide the asset from the main timeline and folder view, but it will still show up in searches. All archived assets can be found in the _Archive_ view
+You can _archive_ them.

 ### How can I backup data from Immich?

--- a/docs/docs/administration/backup-and-restore.md
+++ b/docs/docs/administration/backup-and-restore.md
@@ -41,7 +41,7 @@ By default, Immich will keep the last 14 database dumps and create a new dump ev

 #### Trigger Dump

-You are able to trigger a database dump in the [admin job status page](http://my.immich.app/admin/queues).
+You are able to trigger a database dump in the [admin job status page](http://my.immich.app/admin/jobs-status).
 Visit the page, open the "Create job" modal from the top right, select "Create Database Dump" and click "Confirm".
 A job will run and trigger a dump, you can verify this worked correctly by checking the logs or the `backups/` folder.
 This dumps will count towards the last `X` dumps that will be kept based on your settings.
--- a/docs/docs/administration/reverse-proxy.md
+++ b/docs/docs/administration/reverse-proxy.md
@@ -21,9 +21,6 @@ server {
    # allow large file uploads
    client_max_body_size 50000M;

-    # disable buffering uploads to prevent OOM on reverse proxy server and make uploads twice as fast (no pause)
-    proxy_request_buffering off;
-
    # Set headers
    proxy_set_header Host              $host;
    proxy_set_header X-Real-IP         $remote_addr;
@@ -32,6 +29,8 @@ server {

    # enable websockets: http://nginx.org/en/docs/http/websocket.html
    proxy_http_version 1.1;
+    proxy_set_header   Upgrade    $http_upgrade;
+    proxy_set_header   Connection "upgrade";
    proxy_redirect     off;

    # set timeout
@@ -41,8 +40,6 @@ server {

    location / {
        proxy_pass http://<backend_url>:2283;
-        proxy_set_header   Upgrade    $http_upgrade;
-        proxy_set_header   Connection "upgrade";
    }

    # useful when using Let's Encrypt http-01 challenge
--- a/docs/docs/developer/setup.md
+++ b/docs/docs/developer/setup.md
@@ -48,6 +48,7 @@ You can access the web from `http://your-machine-ip:3000` or `http://localhost:3
 **Notes:**

 - The "web" development container runs with uid 1000. If that uid does not have read/write permissions on the mounted volumes, you may encounter errors
+- In case of rootless docker setup, you need to use root within the container, otherwise you will encounter read/write permission related errors, see comments in `docker/docker-compose.dev.yml`.

 #### Connect web to a remote backend

--- a/docs/docs/developer/testing.md
+++ b/docs/docs/developer/testing.md
@@ -18,7 +18,6 @@ make e2e
 Before you can run the tests, you need to run the following commands _once_:

 - `pnpm install` (in `e2e/`)
- `pnpm run build` (in `cli/`)
 - `make open-api` (in the project root `/`)

 Once the test environment is running, the e2e tests can be run via:
--- a/docs/docs/features/searching.md
+++ b/docs/docs/features/searching.md
@@ -1222,4 +1222,4 @@ Feel free to make a feature request if there's a model you want to use that we d
 [huggingface-clip]: https://huggingface.co/collections/immich-app/clip-654eaefb077425890874cd07
 [huggingface-multilingual-clip]: https://huggingface.co/collections/immich-app/multilingual-clip-654eb08c2382f591eeb8c2a7
 [smart-search-settings]: https://my.immich.app/admin/system-settings?isOpen=machine-learning+smart-search
-[job-status-page]: https://my.immich.app/admin/queues
+[job-status-page]: https://my.immich.app/admin/jobs-status
--- a/docs/docs/guides/remote-machine-learning.md
+++ b/docs/docs/guides/remote-machine-learning.md
@@ -53,7 +53,7 @@ Version mismatches between both hosts may cause bugs and instability, so remembe

 Adding a new URL to the settings is recommended over replacing the existing URL. This is because it will allow machine learning tasks to be processed successfully when the remote server is down by falling back to the local machine learning container. If you do not want machine learning tasks to be processed locally when the remote server is not available, you can instead replace the existing URL and only provide the remote container's URL. If doing this, you can remove the `immich-machine-learning` section of the local `docker-compose.yml` file to save resources, as this service will never be used.

-Do note that this will mean that Smart Search and Face Detection jobs will fail to be processed when the remote instance is not available. This in turn means that tasks dependent on these features—Duplicate Detection and Facial Recognition—will not run for affected assets. If this occurs, you must manually click the _Missing_ button next to Smart Search and Face Detection in the [Job Status](http://my.immich.app/admin/queues) page for the jobs to be retried.
+Do note that this will mean that Smart Search and Face Detection jobs will fail to be processed when the remote instance is not available. This in turn means that tasks dependent on these features—Duplicate Detection and Facial Recognition—will not run for affected assets. If this occurs, you must manually click the _Missing_ button next to Smart Search and Face Detection in the [Job Status](http://my.immich.app/admin/jobs-status) page for the jobs to be retried.

 ## Load balancing

--- a/docs/docs/install/environment-variables.md
+++ b/docs/docs/install/environment-variables.md
@@ -62,10 +62,10 @@ Information on the current workers can be found [here](/administration/jobs-work

 ## Ports

-| Variable      | Description    |                  Default                   | Containers               |
-| :------------ | :------------- | :----------------------------------------: | :----------------------- |
-| `IMMICH_HOST` | Listening host |                 `0.0.0.0`                  | server, machine learning |
-| `IMMICH_PORT` | Listening port | `2283` (server), `3003` (machine learning) | server, machine learning |
+| Variable      | Description    |                  Default                   |
+| :------------ | :------------- | :----------------------------------------: |
+| `IMMICH_HOST` | Listening host |                 `0.0.0.0`                  |
+| `IMMICH_PORT` | Listening port | `2283` (server), `3003` (machine learning) |

 ## Database

@@ -80,7 +80,7 @@ Information on the current workers can be found [here](/administration/jobs-work
 | `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`    | database                       |
+| `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`.

--- a/docs/package.json
+++ b/docs/package.json
@@ -38,7 +38,7 @@
    "@docusaurus/module-type-aliases": "~3.9.0",
    "@docusaurus/tsconfig": "^3.7.0",
    "@docusaurus/types": "^3.7.0",
-    "prettier": "^3.7.4",
+    "prettier": "^3.2.4",
    "typescript": "^5.1.6"
  },
  "browserslist": {
@@ -57,6 +57,6 @@
    "node": ">=20"
  },
  "volta": {
-    "node": "24.11.1"
+    "node": "24.11.0"
  }
 }
--- a/e2e/.nvmrc
+++ b/e2e/.nvmrc
@@ -1 +1 @@
-24.11.1
+24.11.0
--- a/e2e/package.json
+++ b/e2e/package.json
@@ -26,7 +26,7 @@
    "@playwright/test": "^1.44.1",
    "@socket.io/component-emitter": "^3.1.2",
    "@types/luxon": "^3.4.2",
-    "@types/node": "^24.10.1",
+    "@types/node": "^22.19.1",
    "@types/oidc-provider": "^9.0.0",
    "@types/pg": "^8.15.1",
    "@types/pngjs": "^6.0.4",
@@ -35,17 +35,17 @@
    "eslint": "^9.14.0",
    "eslint-config-prettier": "^10.1.8",
    "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-unicorn": "^62.0.0",
-    "exiftool-vendored": "^33.0.0",
+    "eslint-plugin-unicorn": "^60.0.0",
+    "exiftool-vendored": "^31.1.0",
    "globals": "^16.0.0",
    "jose": "^5.6.3",
    "luxon": "^3.4.4",
    "oidc-provider": "^9.0.0",
    "pg": "^8.11.3",
    "pngjs": "^7.0.0",
-    "prettier": "^3.7.4",
+    "prettier": "^3.2.5",
    "prettier-plugin-organize-imports": "^4.0.0",
-    "sharp": "^0.34.5",
+    "sharp": "^0.34.4",
    "socket.io-client": "^4.7.4",
    "supertest": "^7.0.0",
    "typescript": "^5.3.3",
@@ -54,6 +54,6 @@
    "vitest": "^3.0.0"
  },
  "volta": {
-    "node": "24.11.1"
+    "node": "24.11.0"
  }
 }
--- a/e2e/src/api/specs/library.e2e-spec.ts
+++ b/e2e/src/api/specs/library.e2e-spec.ts
@@ -1006,7 +1006,7 @@ describe('/libraries', () => {
        rmSync(`${testAssetDir}/temp/xmp`, { recursive: true, force: true });
      });

-      it('should switch from using file metadata to file.ext.xmp metadata when asset refreshes', async () => {
+      it('should switch from using file metadata to file.xmp metadata when asset refreshes', async () => {
        const library = await utils.createLibrary(admin.accessToken, {
          ownerId: admin.userId,
          importPaths: [`${testAssetDirInternal}/temp/xmp`],
--- a/e2e/src/generators/timeline/utils.ts
+++ b/e2e/src/generators/timeline/utils.ts
@@ -61,7 +61,7 @@ export function selectRandomDays(daysInMonth: number, numDays: number, rng: Seed
    }
  }

-  return [...selectedDays].toSorted((a, b) => b - a);
+  return [...selectedDays].sort((a, b) => b - a);
 }

 /**
--- a/e2e/src/mock-network/timeline-network.ts
+++ b/e2e/src/mock-network/timeline-network.ts
@@ -62,60 +62,50 @@ export const setupTimelineMockApiRoutes = async (
    return route.continue();
  });

-  await context.route('**/api/assets/*', async (route, request) => {
-    const url = new URL(request.url());
-    const pathname = url.pathname;
-    const assetId = basename(pathname);
-    const asset = getAsset(timelineRestData, assetId);
-    return route.fulfill({
-      status: 200,
-      contentType: 'application/json',
-      json: asset,
-    });
-  });
-
-  await context.route('**/api/assets/*/ocr', async (route) => {
-    return route.fulfill({ status: 200, contentType: 'application/json', json: [] });
-  });
-
-  await context.route('**/api/assets/*/thumbnail?size=*', async (route, request) => {
+  await context.route('**/api/assets/**', async (route, request) => {
    const pattern = /\/api\/assets\/(?<assetId>[^/]+)\/thumbnail\?size=(?<size>preview|thumbnail)/;
    const match = request.url().match(pattern);
-    if (!match?.groups) {
-      throw new Error(`Invalid URL for thumbnail endpoint: ${request.url()}`);
+    if (!match) {
+      const url = new URL(request.url());
+      const pathname = url.pathname;
+      const assetId = basename(pathname);
+      const asset = getAsset(timelineRestData, assetId);
+      return route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        json: asset,
+      });
    }
-
-    if (match.groups.size === 'preview') {
+    if (match.groups?.size === 'preview') {
      if (!route.request().serviceWorker()) {
        return route.continue();
      }
-      const asset = getAsset(timelineRestData, match.groups.assetId);
+      const asset = getAsset(timelineRestData, match.groups?.assetId);
      return route.fulfill({
        status: 200,
        headers: { 'content-type': 'image/jpeg', ETag: 'abc123', 'Cache-Control': 'public, max-age=3600' },
        body: await randomPreview(
-          match.groups.assetId,
+          match.groups?.assetId,
          (asset?.exifInfo?.exifImageWidth ?? 0) / (asset?.exifInfo?.exifImageHeight ?? 1),
        ),
      });
    }
-    if (match.groups.size === 'thumbnail') {
+    if (match.groups?.size === 'thumbnail') {
      if (!route.request().serviceWorker()) {
        return route.continue();
      }
-      const asset = getAsset(timelineRestData, match.groups.assetId);
+      const asset = getAsset(timelineRestData, match.groups?.assetId);
      return route.fulfill({
        status: 200,
        headers: { 'content-type': 'image/jpeg' },
        body: await randomThumbnail(
-          match.groups.assetId,
+          match.groups?.assetId,
          (asset?.exifInfo?.exifImageWidth ?? 0) / (asset?.exifInfo?.exifImageHeight ?? 1),
        ),
      });
    }
    return route.continue();
  });
-
  await context.route('**/api/albums/**', async (route, request) => {
    const pattern = /\/api\/albums\/(?<albumId>[^/?]+)/;
    const match = request.url().match(pattern);
--- a/e2e/src/utils.ts
+++ b/e2e/src/utils.ts
@@ -12,7 +12,7 @@ import {
  PersonCreateDto,
  QueueCommandDto,
  QueueName,
-  QueuesResponseLegacyDto,
+  QueuesResponseDto,
  SharedLinkCreateDto,
  UpdateLibraryDto,
  UserAdminCreateDto,
@@ -564,13 +564,13 @@ export const utils = {
    await updateConfig({ systemConfigDto: defaultConfig }, { headers: asBearerAuth(accessToken) });
  },

-  isQueueEmpty: async (accessToken: string, queue: keyof QueuesResponseLegacyDto) => {
+  isQueueEmpty: async (accessToken: string, queue: keyof QueuesResponseDto) => {
    const queues = await getQueuesLegacy({ headers: asBearerAuth(accessToken) });
    const jobCounts = queues[queue].jobCounts;
    return !jobCounts.active && !jobCounts.waiting;
  },

-  waitForQueueFinish: (accessToken: string, queue: keyof QueuesResponseLegacyDto, ms?: number) => {
+  waitForQueueFinish: (accessToken: string, queue: keyof QueuesResponseDto, ms?: number) => {
    // eslint-disable-next-line no-async-promise-executor
    return new Promise<void>(async (resolve, reject) => {
      const timeout = setTimeout(() => reject(new Error('Timed out waiting for queue to empty')), ms || 10_000);
--- a/e2e/src/web/specs/timeline/timeline.parallel-e2e-spec.ts
+++ b/e2e/src/web/specs/timeline/timeline.parallel-e2e-spec.ts
@@ -611,53 +611,6 @@ test.describe('Timeline', () => {
      await page.getByText('Photos', { exact: true }).click();
      await thumbnailUtils.expectInViewport(page, assetToArchive.id);
    });
-    test('open /archive, favorite photo, unfavorite', async ({ page }) => {
-      const assetToFavorite = assets[0];
-      changes.assetArchivals.push(assetToFavorite.id);
-      await pageUtils.openArchivePage(page);
-      const favorite = pageRoutePromise(page, '**/api/assets', async (route, request) => {
-        const requestJson = request.postDataJSON();
-        if (requestJson.isFavorite === undefined) {
-          return await route.continue();
-        }
-        const isFavorite = requestJson.isFavorite;
-        if (isFavorite) {
-          changes.assetFavorites.push(...requestJson.ids);
-        }
-        await route.fulfill({
-          status: 204,
-        });
-      });
-      await thumbnailUtils.withAssetId(page, assetToFavorite.id).hover();
-      await thumbnailUtils.selectButton(page, assetToFavorite.id).click();
-      await page.getByLabel('Favorite').click();
-      await expect(favorite).resolves.toEqual({
-        isFavorite: true,
-        ids: [assetToFavorite.id],
-      });
-      await expect(thumbnailUtils.withAssetId(page, assetToFavorite.id)).toHaveCount(1);
-      await thumbnailUtils.expectInViewport(page, assetToFavorite.id);
-      await thumbnailUtils.expectThumbnailIsFavorite(page, assetToFavorite.id);
-      await thumbnailUtils.withAssetId(page, assetToFavorite.id).hover();
-      await thumbnailUtils.selectButton(page, assetToFavorite.id).click();
-      const unFavoriteRequest = pageRoutePromise(page, '**/api/assets', async (route, request) => {
-        const requestJson = request.postDataJSON();
-        if (requestJson.isFavorite === undefined) {
-          return await route.continue();
-        }
-        changes.assetFavorites = changes.assetFavorites.filter((id) => !requestJson.ids.includes(id));
-        await route.fulfill({
-          status: 204,
-        });
-      });
-      await page.getByLabel('Remove from favorites').click();
-      await expect(unFavoriteRequest).resolves.toEqual({
-        isFavorite: false,
-        ids: [assetToFavorite.id],
-      });
-      await expect(thumbnailUtils.withAssetId(page, assetToFavorite.id)).toHaveCount(1);
-      await thumbnailUtils.expectThumbnailIsNotFavorite(page, assetToFavorite.id);
-    });
    test('open album, archive photo, open album, unarchive', async ({ page }) => {
      const album = timelineRestData.album;
      await pageUtils.openAlbumPage(page, album.id);
@@ -680,7 +633,8 @@ test.describe('Timeline', () => {
        visibility: 'archive',
        ids: [assetToArchive.id],
      });
-      await thumbnailUtils.expectThumbnailIsArchive(page, assetToArchive.id);
+      console.log('Skipping assertion - TODO - fix that archiving in album doesnt add icon');
+      // await thumbnail.expectThumbnailIsArchive(page, assetToArchive.id);
      await page.locator('#asset-selection-app-bar').getByLabel('Close').click();
      await page.getByRole('link').getByText('Archive').click();
      await timelineUtils.waitForTimelineLoad(page);
@@ -702,7 +656,8 @@ test.describe('Timeline', () => {
        visibility: 'timeline',
        ids: [assetToArchive.id],
      });
-      await expect(thumbnailUtils.withAssetId(page, assetToArchive.id)).toHaveCount(0);
+      console.log('Skipping assertion - TODO - fix bug with not removing asset from timeline-manager after unarchive');
+      // await expect(thumbnail.withAssetId(page, assetToArchive.id)).toHaveCount(0);
      await pageUtils.openAlbumPage(page, album.id);
      await thumbnailUtils.expectInViewport(page, assetToArchive.id);
    });
@@ -757,50 +712,6 @@ test.describe('Timeline', () => {
      await page.getByText('Photos', { exact: true }).click();
      await thumbnailUtils.expectInViewport(page, assetToFavorite.id);
    });
-    test('open /favorites, archive photo, unarchive photo', async ({ page }) => {
-      await pageUtils.openFavorites(page);
-      const assetToArchive = getAsset(timelineRestData, 'ad31e29f-2069-4574-b9a9-ad86523c92cb')!;
-      await thumbnailUtils.withAssetId(page, assetToArchive.id).hover();
-      await thumbnailUtils.selectButton(page, assetToArchive.id).click();
-      await page.getByLabel('Menu').click();
-      const archive = pageRoutePromise(page, '**/api/assets', async (route, request) => {
-        const requestJson = request.postDataJSON();
-        if (requestJson.visibility !== 'archive') {
-          return await route.continue();
-        }
-        await route.fulfill({
-          status: 204,
-        });
-        changes.assetArchivals.push(...requestJson.ids);
-      });
-      await page.getByRole('menuitem').getByText('Archive').click();
-      await expect(archive).resolves.toEqual({
-        visibility: 'archive',
-        ids: [assetToArchive.id],
-      });
-      await page.getByRole('link').getByText('Archive').click();
-      await thumbnailUtils.expectInViewport(page, assetToArchive.id);
-      await thumbnailUtils.expectThumbnailIsNotArchive(page, assetToArchive.id);
-      await thumbnailUtils.withAssetId(page, assetToArchive.id).hover();
-      await thumbnailUtils.selectButton(page, assetToArchive.id).click();
-      const unarchiveRequest = pageRoutePromise(page, '**/api/assets', async (route, request) => {
-        const requestJson = request.postDataJSON();
-        if (requestJson.visibility !== 'timeline') {
-          return await route.continue();
-        }
-        changes.assetArchivals = changes.assetArchivals.filter((id) => !requestJson.ids.includes(id));
-        await route.fulfill({
-          status: 204,
-        });
-      });
-      await page.getByLabel('Unarchive').click();
-      await expect(unarchiveRequest).resolves.toEqual({
-        visibility: 'timeline',
-        ids: [assetToArchive.id],
-      });
-      await expect(thumbnailUtils.withAssetId(page, assetToArchive.id)).toHaveCount(0);
-      await thumbnailUtils.expectThumbnailIsNotArchive(page, assetToArchive.id);
-    });
    test('Open album, favorite photo, open /favorites, remove favorite, Open album', async ({ page }) => {
      const album = timelineRestData.album;
      await pageUtils.openAlbumPage(page, album.id);
--- a/e2e/src/web/specs/timeline/utils.ts
+++ b/e2e/src/web/specs/timeline/utils.ts
@@ -105,16 +105,20 @@ export const thumbnailUtils = {
    return await poll(page, () => thumbnailUtils.queryThumbnailInViewport(page, collector));
  },
  async expectThumbnailIsFavorite(page: Page, assetId: string) {
-    await expect(thumbnailUtils.withAssetId(page, assetId).locator('[data-icon-favorite]')).toHaveCount(1);
-  },
-  async expectThumbnailIsNotFavorite(page: Page, assetId: string) {
-    await expect(thumbnailUtils.withAssetId(page, assetId).locator('[data-icon-favorite]')).toHaveCount(0);
+    await expect(
+      thumbnailUtils
+        .withAssetId(page, assetId)
+        .locator(
+          'path[d="M12,21.35L10.55,20.03C5.4,15.36 2,12.27 2,8.5C2,5.41 4.42,3 7.5,3C9.24,3 10.91,3.81 12,5.08C13.09,3.81 14.76,3 16.5,3C19.58,3 22,5.41 22,8.5C22,12.27 18.6,15.36 13.45,20.03L12,21.35Z"]',
+        ),
+    ).toHaveCount(1);
  },
  async expectThumbnailIsArchive(page: Page, assetId: string) {
-    await expect(thumbnailUtils.withAssetId(page, assetId).locator('[data-icon-archive]')).toHaveCount(1);
-  },
-  async expectThumbnailIsNotArchive(page: Page, assetId: string) {
-    await expect(thumbnailUtils.withAssetId(page, assetId).locator('[data-icon-archive]')).toHaveCount(0);
+    await expect(
+      thumbnailUtils
+        .withAssetId(page, assetId)
+        .locator('path[d="M20 21H4V10H6V19H18V10H20V21M3 3H21V9H3V3M5 5V7H19V5M10.5 11V14H8L12 18L16 14H13.5V11"]'),
+    ).toHaveCount(1);
  },
  async expectSelectedReadonly(page: Page, assetId: string) {
    // todo - need a data attribute for selected
@@ -204,18 +208,10 @@ export const pageUtils = {
    await page.goto(`/photos`);
    await timelineUtils.waitForTimelineLoad(page);
  },
-  async openFavorites(page: Page) {
-    await page.goto(`/favorites`);
-    await timelineUtils.waitForTimelineLoad(page);
-  },
  async openAlbumPage(page: Page, albumId: string) {
    await page.goto(`/albums/${albumId}`);
    await timelineUtils.waitForTimelineLoad(page);
  },
-  async openArchivePage(page: Page) {
-    await page.goto(`/archive`);
-    await timelineUtils.waitForTimelineLoad(page);
-  },
  async deepLinkAlbumPage(page: Page, albumId: string, assetId: string) {
    await page.goto(`/albums/${albumId}?at=${assetId}`);
    await timelineUtils.waitForTimelineLoad(page);
--- a/e2e/src/web/specs/user-admin.e2e-spec.ts
+++ b/e2e/src/web/specs/user-admin.e2e-spec.ts
@@ -54,7 +54,7 @@ test.describe('User Administration', () => {

    await page.getByRole('button', { name: 'Edit' }).click();
    await expect(page.getByLabel('Admin User')).not.toBeChecked();
-    await page.getByLabel('Admin User').click();
+    await page.getByText('Admin User').click();
    await expect(page.getByLabel('Admin User')).toBeChecked();
    await page.getByRole('button', { name: 'Confirm' }).click();

@@ -83,7 +83,7 @@ test.describe('User Administration', () => {

    await page.getByRole('button', { name: 'Edit' }).click();
    await expect(page.getByLabel('Admin User')).toBeChecked();
-    await page.getByLabel('Admin User').click();
+    await page.getByText('Admin User').click();
    await expect(page.getByLabel('Admin User')).not.toBeChecked();
    await page.getByRole('button', { name: 'Confirm' }).click();

--- a/e2e/tsconfig.json
+++ b/e2e/tsconfig.json
@@ -9,7 +9,7 @@
    "experimentalDecorators": true,
    "allowSyntheticDefaultImports": true,
    "resolveJsonModule": true,
-    "target": "es2023",
+    "target": "es2022",
    "sourceMap": true,
    "outDir": "./dist",
    "incremental": true,
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -7,7 +7,6 @@
  "action_common_update": "Update",
  "actions": "Actions",
  "active": "Active",
-  "active_count": "Active: {count}",
  "activity": "Activity",
  "activity_changed": "Activity is {enabled, select, true {enabled} other {disabled}}",
  "add": "Add",
@@ -68,7 +67,6 @@
    "confirm_reprocess_all_faces": "Are you sure you want to reprocess all faces? This will also clear named people.",
    "confirm_user_password_reset": "Are you sure you want to reset {user}'s password?",
    "confirm_user_pin_code_reset": "Are you sure you want to reset {user}'s PIN code?",
-    "copy_config_to_clipboard_description": "Copy the current system config as a JSON object to the clipboard",
    "create_job": "Create job",
    "cron_expression": "Cron expression",
    "cron_expression_description": "Set the scanning interval using the cron format. For more information please refer to e.g. <link>Crontab Guru</link>",
@@ -76,8 +74,7 @@
    "disable_login": "Disable login",
    "duplicate_detection_job_description": "Run machine learning on assets to detect similar images. Relies on Smart Search",
    "exclusion_pattern_description": "Exclusion patterns lets you ignore files and folders when scanning your library. This is useful if you have folders that contain files you don't want to import, such as RAW files.",
-    "export_config_as_json_description": "Download the current system config as a JSON file",
-    "external_libraries_page_description": "Admin external library page",
+    "external_library_management": "External Library Management",
    "face_detection": "Face detection",
    "face_detection_description": "Detect the faces in assets using machine learning. For videos, only the thumbnail is considered. \"Refresh\" (re-)processes all assets. \"Reset\" additionally clears all current face data. \"Missing\" queues assets that haven't been processed yet. Detected faces will be queued for Facial Recognition after Face Detection is complete, grouping them into existing or new people.",
    "facial_recognition_job_description": "Group detected faces into people. This step runs after Face Detection is complete. \"Reset\" (re-)clusters all faces. \"Missing\" queues faces that don't have a person assigned.",
@@ -105,15 +102,14 @@
    "image_thumbnail_description": "Small thumbnail with stripped metadata, used when viewing groups of photos like the main timeline",
    "image_thumbnail_quality_description": "Thumbnail quality from 1-100. Higher is better, but produces larger files and can reduce app responsiveness.",
    "image_thumbnail_title": "Thumbnail Settings",
-    "import_config_from_json_description": "Import system config by uploading a JSON config file",
    "job_concurrency": "{job} concurrency",
    "job_created": "Job created",
    "job_not_concurrency_safe": "This job is not concurrency-safe.",
    "job_settings": "Job Settings",
    "job_settings_description": "Manage job concurrency",
+    "job_status": "Job Status",
    "jobs_delayed": "{jobCount, plural, other {# delayed}}",
    "jobs_failed": "{jobCount, plural, other {# failed}}",
-    "jobs_over_time": "Jobs over time",
    "library_created": "Created library: {library}",
    "library_deleted": "Library deleted",
    "library_details": "Library details",
@@ -186,7 +182,6 @@
    "maintenance_start": "Start maintenance mode",
    "maintenance_start_error": "Failed to start maintenance mode.",
    "manage_concurrency": "Manage Concurrency",
-    "manage_concurrency_description": "Navigate to the jobs page to manage job concurrency",
    "manage_log_settings": "Manage log settings",
    "map_dark_style": "Dark style",
    "map_enable_description": "Enable map features",
@@ -276,14 +271,10 @@
    "password_settings_description": "Manage password login settings",
    "paths_validated_successfully": "All paths validated successfully",
    "person_cleanup_job": "Person cleanup",
-    "queue_details": "Queue Details",
-    "queues": "Job Queues",
-    "queues_page_description": "Admin job queues page",
    "quota_size_gib": "Quota Size (GiB)",
    "refreshing_all_libraries": "Refreshing all libraries",
    "registration": "Admin Registration",
    "registration_description": "Since you are the first user on the system, you will be assigned as the Admin and are responsible for administrative tasks, and additional users will be created by you.",
-    "remove_failed_jobs": "Remove failed jobs",
    "require_password_change_on_login": "Require user to change password on first login",
    "reset_settings_to_default": "Reset settings to default",
    "reset_settings_to_recent_saved": "Reset settings to the recent saved settings",
@@ -296,10 +287,8 @@
    "server_public_users_description": "All users (name and email) are listed when adding a user to shared albums. When disabled, the user list will only be available to admin users.",
    "server_settings": "Server Settings",
    "server_settings_description": "Manage server settings",
-    "server_stats_page_description": "Admin server statistics page",
    "server_welcome_message": "Welcome message",
    "server_welcome_message_description": "A message that is displayed on the login page.",
-    "settings_page_description": "Admin settings page",
    "sidecar_job": "Sidecar metadata",
    "sidecar_job_description": "Discover or synchronize sidecar metadata from the filesystem",
    "slideshow_duration_description": "Number of seconds to display each image",
@@ -418,8 +407,6 @@
    "user_restore_scheduled_removal": "Restore user - scheduled removal on {date, date, long}",
    "user_settings": "User Settings",
    "user_settings_description": "Manage user settings",
-    "user_successfully_removed": "User {email} has been successfully removed.",
-    "users_page_description": "Admin users page",
    "version_check_enabled_description": "Enable version check",
    "version_check_implications": "The version check feature relies on periodic communication with github.com",
    "version_check_settings": "Version Check",
@@ -740,7 +727,6 @@
  "collapse_all": "Collapse all",
  "color": "Color",
  "color_theme": "Color theme",
-  "command": "Command",
  "comment_deleted": "Comment deleted",
  "comment_options": "Comment options",
  "comments_and_likes": "Comments & likes",
@@ -1105,7 +1091,6 @@
  "external_network_sheet_info": "When not on the preferred Wi-Fi network, the app will connect to the server through the first of the below URLs it can reach, starting from top to bottom",
  "face_unassigned": "Unassigned",
  "failed": "Failed",
-  "failed_count": "Failed: {count}",
  "failed_to_authenticate": "Failed to authenticate",
  "failed_to_load_assets": "Failed to load assets",
  "failed_to_load_folder": "Failed to load folder",
@@ -1526,7 +1511,6 @@
  "other_variables": "Other variables",
  "owned": "Owned",
  "owner": "Owner",
-  "page": "Page",
  "partner": "Partner",
  "partner_can_access": "{partner} can access",
  "partner_can_access_assets": "All your photos and videos except those in Archived and Deleted",
@@ -2087,7 +2071,6 @@
  "to_select": "to select",
  "to_trash": "Trash",
  "toggle_settings": "Toggle settings",
-  "toggle_theme_description": "Toggle theme",
  "total": "Total",
  "total_usage": "Total usage",
  "trash": "Trash",
@@ -2196,7 +2179,6 @@
  "view_album": "View Album",
  "view_all": "View All",
  "view_all_users": "View all users",
-  "view_asset_owners": "View asset owners",
  "view_details": "View Details",
  "view_in_timeline": "View in timeline",
  "view_link": "View link",
@@ -2213,7 +2195,6 @@
  "viewer_unstack": "Un-Stack",
  "visibility_changed": "Visibility changed for {count, plural, one {# person} other {# people}}",
  "waiting": "Waiting",
-  "waiting_count": "Waiting: {count}",
  "warning": "Warning",
  "week": "Week",
  "welcome": "Welcome",
--- a/machine-learning/Dockerfile
+++ b/machine-learning/Dockerfile
@@ -1,6 +1,6 @@
 ARG DEVICE=cpu

-FROM python:3.11-bookworm@sha256:e39286476f84ffedf7c3564b0b74e32c9e1193ec9ca32ee8a11f8c09dbf6aafe AS builder-cpu
+FROM python:3.11-bookworm@sha256:fc1f2e357c307c4044133952b203e66a47e7726821a664f603a180a0c5823844 AS builder-cpu

 FROM builder-cpu AS builder-openvino

@@ -22,10 +22,10 @@ FROM builder-cpu AS builder-rknn

 # Warning: 25GiB+ disk space required to pull this image
 # TODO: find a way to reduce the image size
-FROM rocm/dev-ubuntu-22.04:6.4.3-complete@sha256:6cda50e312f3aac068cea9ec06c560ca1f522ad546bc8b3d2cf06da0fe8e8a76 AS builder-rocm
+FROM rocm/dev-ubuntu-22.04:6.4.3-complete@sha256:1f7e92ca7e3a3785680473329ed1091fc99db3e90fcb3a1688f2933e870ed76b AS builder-rocm

 # renovate: datasource=github-releases depName=Microsoft/onnxruntime
-ARG ONNXRUNTIME_VERSION="v1.22.1"
+ARG ONNXRUNTIME_VERSION="v1.20.1"
 WORKDIR /code

 RUN apt-get update && apt-get install -y --no-install-recommends wget git python3.10-venv
@@ -68,12 +68,12 @@ RUN if [ "$DEVICE" = "rocm" ]; then \
    uv pip install /opt/onnxruntime_rocm-*.whl; \
    fi

-FROM python:3.11-slim-bookworm@sha256:2c5bc243b1cc47985ee4fb768bb0bbd4490481c5d0897a62da31b7f30b7304a7 AS prod-cpu
+FROM python:3.11-slim-bookworm@sha256:873f91540d53b36327ed4fb018c9669107a4e2a676719720edb4209c4b15d029 AS prod-cpu

 ENV LD_PRELOAD=/usr/lib/libmimalloc.so.2 \
    MACHINE_LEARNING_MODEL_ARENA=false

-FROM python:3.11-slim-bookworm@sha256:2c5bc243b1cc47985ee4fb768bb0bbd4490481c5d0897a62da31b7f30b7304a7 AS prod-openvino
+FROM python:3.11-slim-bookworm@sha256:873f91540d53b36327ed4fb018c9669107a4e2a676719720edb4209c4b15d029 AS prod-openvino

 RUN apt-get update && \
    apt-get install --no-install-recommends -yqq ocl-icd-libopencl1 wget && \
@@ -102,7 +102,7 @@ COPY --from=builder-cuda /usr/local/bin/python3 /usr/local/bin/python3
 COPY --from=builder-cuda /usr/local/lib/python3.11 /usr/local/lib/python3.11
 COPY --from=builder-cuda /usr/local/lib/libpython3.11.so /usr/local/lib/libpython3.11.so

-FROM rocm/dev-ubuntu-22.04:6.4.3-complete@sha256:6cda50e312f3aac068cea9ec06c560ca1f522ad546bc8b3d2cf06da0fe8e8a76 AS prod-rocm
+FROM rocm/dev-ubuntu-22.04:6.4.3-complete@sha256:1f7e92ca7e3a3785680473329ed1091fc99db3e90fcb3a1688f2933e870ed76b AS prod-rocm

 FROM prod-cpu AS prod-armnn

--- a/machine-learning/immich_ml/models/ocr/detection.py
+++ b/machine-learning/immich_ml/models/ocr/detection.py
@@ -82,7 +82,6 @@ class TextDetector(InferenceModel):
            ratio = float(self.max_resolution) / img.height
        else:
            ratio = float(self.max_resolution) / img.width
-        ratio = min(ratio, 1.0)

        resize_h = int(img.height * ratio)
        resize_w = int(img.width * ratio)
--- a/machine-learning/patches/0002-target-gfx900-gfx1102.patch
+++ b/machine-learning/patches/0002-target-gfx900-gfx1102.patch
@@ -1,13 +1,13 @@
 diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
-index 2714e6f59..a69da76b4 100644
+index d90a2a355..bb1a7de12 100644
 --- a/cmake/CMakeLists.txt
 +++ b/cmake/CMakeLists.txt
-@@ -338,7 +338,7 @@ if (onnxruntime_USE_ROCM)
-     if (ROCM_VERSION_DEV VERSION_LESS "6.2")
-       message(FATAL_ERROR "CMAKE_HIP_ARCHITECTURES is not set when ROCm version < 6.2")
-     else()
-      set(CMAKE_HIP_ARCHITECTURES "gfx908;gfx90a;gfx1030;gfx1100;gfx1101;gfx940;gfx941;gfx942;gfx1200;gfx1201")
-+      set(CMAKE_HIP_ARCHITECTURES "gfx900;gfx908;gfx90a;gfx1030;gfx1100;gfx1101;gfx1102;gfx940;gfx941;gfx942;gfx1200;gfx1201")
-     endif()
+@@ -295,7 +295,7 @@ if (onnxruntime_USE_ROCM)
   endif()
- 
+
+   if (NOT CMAKE_HIP_ARCHITECTURES)
+-    set(CMAKE_HIP_ARCHITECTURES "gfx908;gfx90a;gfx1030;gfx1100;gfx1101;gfx940;gfx941;gfx942;gfx1200;gfx1201")
+    set(CMAKE_HIP_ARCHITECTURES "gfx900;gfx908;gfx90a;gfx1030;gfx1100;gfx1101;gfx1102;gfx940;gfx941;gfx942;gfx1200;gfx1201")
+   endif()
+
+   file(GLOB rocm_cmake_components ${onnxruntime_ROCM_HOME}/lib/cmake/*)
--- a/machine-learning/uv.lock
+++ b/machine-learning/uv.lock
--- a/mise.toml
+++ b/mise.toml
@@ -1,12 +1,11 @@
 experimental_monorepo_root = true

 [tools]
-node = "24.11.1"
+node = "24.11.0"
 flutter = "3.35.7"
-pnpm = "10.24.0"
-terragrunt = "0.93.10"
-opentofu = "1.10.7"
-java = "25.0.1"
+pnpm = "10.20.0"
+terragrunt = "0.91.2"
+opentofu = "1.10.6"

 [tools."github:CQLabs/homebrew-dcm"]
 version = "1.30.0"
--- a/mobile/android/app/src/main/kotlin/app/alextran/immich/sync/Messages.g.kt
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/sync/Messages.g.kt
@@ -90,9 +90,7 @@ data class PlatformAsset (
  val durationInSeconds: Long,
  val orientation: Long,
  val isFavorite: Boolean,
-  val adjustmentTime: Long? = null,
-  val latitude: Double? = null,
-  val longitude: Double? = null
+  val adjustmentTimestamp: Long? = null
 )
 {
  companion object {
@@ -107,10 +105,8 @@ data class PlatformAsset (
      val durationInSeconds = pigeonVar_list[7] as Long
      val orientation = pigeonVar_list[8] as Long
      val isFavorite = pigeonVar_list[9] as Boolean
-      val adjustmentTime = pigeonVar_list[10] as Long?
-      val latitude = pigeonVar_list[11] as Double?
-      val longitude = pigeonVar_list[12] as Double?
-      return PlatformAsset(id, name, type, createdAt, updatedAt, width, height, durationInSeconds, orientation, isFavorite, adjustmentTime, latitude, longitude)
+      val adjustmentTimestamp = pigeonVar_list[10] as Long?
+      return PlatformAsset(id, name, type, createdAt, updatedAt, width, height, durationInSeconds, orientation, isFavorite, adjustmentTimestamp)
    }
  }
  fun toList(): List<Any?> {
@@ -125,9 +121,7 @@ data class PlatformAsset (
      durationInSeconds,
      orientation,
      isFavorite,
-      adjustmentTime,
-      latitude,
-      longitude,
+      adjustmentTimestamp,
    )
  }
  override fun equals(other: Any?): Boolean {
--- 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
@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.content.ContentUris
 import android.content.Context
 import android.database.Cursor
+import android.net.Uri
 import android.os.Bundle
 import android.provider.MediaStore
 import android.util.Base64
@@ -154,6 +155,7 @@ open class NativeSyncApiImplBase(context: Context) : ImmichPlugin() {
            duration,
            orientation.toLong(),
            isFavorite,
+            adjustmentTimestamp = null
          )
          yield(AssetResult.ValidAsset(asset, bucketId))
        }
--- a/mobile/drift_schemas/main/drift_schema_v14.json
+++ b/mobile/drift_schemas/main/drift_schema_v14.json
--- a/mobile/ios/Runner/Sync/Messages.g.swift
+++ b/mobile/ios/Runner/Sync/Messages.g.swift
@@ -140,9 +140,7 @@ struct PlatformAsset: Hashable {
  var durationInSeconds: Int64
  var orientation: Int64
  var isFavorite: Bool
-  var adjustmentTime: Int64? = nil
-  var latitude: Double? = nil
-  var longitude: Double? = nil
+  var adjustmentTimestamp: Int64? = nil


  // swift-format-ignore: AlwaysUseLowerCamelCase
@@ -157,9 +155,7 @@ struct PlatformAsset: Hashable {
    let durationInSeconds = pigeonVar_list[7] as! Int64
    let orientation = pigeonVar_list[8] as! Int64
    let isFavorite = pigeonVar_list[9] as! Bool
-    let adjustmentTime: Int64? = nilOrValue(pigeonVar_list[10])
-    let latitude: Double? = nilOrValue(pigeonVar_list[11])
-    let longitude: Double? = nilOrValue(pigeonVar_list[12])
+    let adjustmentTimestamp: Int64? = nilOrValue(pigeonVar_list[10])

    return PlatformAsset(
      id: id,
@@ -172,9 +168,7 @@ struct PlatformAsset: Hashable {
      durationInSeconds: durationInSeconds,
      orientation: orientation,
      isFavorite: isFavorite,
-      adjustmentTime: adjustmentTime,
-      latitude: latitude,
-      longitude: longitude
+      adjustmentTimestamp: adjustmentTimestamp
    )
  }
  func toList() -> [Any?] {
@@ -189,9 +183,7 @@ struct PlatformAsset: Hashable {
      durationInSeconds,
      orientation,
      isFavorite,
-      adjustmentTime,
-      latitude,
-      longitude,
+      adjustmentTimestamp,
    ]
  }
  static func == (lhs: PlatformAsset, rhs: PlatformAsset) -> Bool {
--- a/mobile/ios/Runner/Sync/PHAssetExtensions.swift
+++ b/mobile/ios/Runner/Sync/PHAssetExtensions.swift
@@ -13,9 +13,7 @@ extension PHAsset {
      durationInSeconds: Int64(duration),
      orientation: 0,
      isFavorite: isFavorite,
-      adjustmentTime: adjustmentTimestamp,
-      latitude: location?.coordinate.latitude,
-      longitude: location?.coordinate.longitude
+      adjustmentTimestamp: adjustmentTimestamp
    )
  }

@@ -27,11 +25,8 @@ extension PHAsset {
    return value(forKey: "filename") as? String
  }
  
-  var adjustmentTimestamp: Int64? {
-    if let date = value(forKey: "adjustmentTimestamp") as? Date {
-      return Int64(date.timeIntervalSince1970)
-    }
-    return nil
+  var adjustmentTimestamp: Int64 {
+    return (value(forKey: "adjustmentTimestamp") as? Date?).map( {Int64($0?.timeIntervalSince1970 ?? 0)} ) ?? 0
  }

  // This method is expected to be slow as it goes through the asset resources to fetch the originalFilename
--- a/mobile/lib/domain/models/asset/local_asset.model.dart
+++ b/mobile/lib/domain/models/asset/local_asset.model.dart
@@ -4,10 +4,7 @@ class LocalAsset extends BaseAsset {
  final String id;
  final String? remoteAssetId;
  final int orientation;
-
-  final DateTime? adjustmentTime;
-  final double? latitude;
-  final double? longitude;
+  final int? adjustmentTimestamp;

  const LocalAsset({
    required this.id,
@@ -23,9 +20,7 @@ class LocalAsset extends BaseAsset {
    super.isFavorite = false,
    super.livePhotoVideoId,
    this.orientation = 0,
-    this.adjustmentTime,
-    this.latitude,
-    this.longitude,
+    this.adjustmentTimestamp,
  }) : remoteAssetId = remoteId;

  @override
@@ -40,8 +35,6 @@ class LocalAsset extends BaseAsset {
  @override
  String get heroTag => '${id}_${remoteId ?? checksum}';

-  bool get hasCoordinates => latitude != null && longitude != null && latitude != 0 && longitude != 0;
-
  @override
  String toString() {
    return '''LocalAsset {
@@ -56,9 +49,7 @@ class LocalAsset extends BaseAsset {
   remoteId: ${remoteId ?? "<NA>"}
   isFavorite: $isFavorite,
  orientation: $orientation,
-  adjustmentTime: $adjustmentTime,
-  latitude: ${latitude ?? "<NA>"},
-  longitude: ${longitude ?? "<NA>"},
+  adjustmentTimestamp: ${adjustmentTimestamp ?? "<NA>"}
 }''';
  }

@@ -70,20 +61,12 @@ class LocalAsset extends BaseAsset {
    return super == other &&
        id == other.id &&
        orientation == other.orientation &&
-        adjustmentTime == other.adjustmentTime &&
-        latitude == other.latitude &&
-        longitude == other.longitude;
+        adjustmentTimestamp == other.adjustmentTimestamp;
  }

  @override
  int get hashCode =>
-      super.hashCode ^
-      id.hashCode ^
-      remoteId.hashCode ^
-      orientation.hashCode ^
-      adjustmentTime.hashCode ^
-      latitude.hashCode ^
-      longitude.hashCode;
+      super.hashCode ^ id.hashCode ^ remoteId.hashCode ^ orientation.hashCode ^ adjustmentTimestamp.hashCode;

  LocalAsset copyWith({
    String? id,
@@ -98,9 +81,7 @@ class LocalAsset extends BaseAsset {
    int? durationInSeconds,
    bool? isFavorite,
    int? orientation,
-    DateTime? adjustmentTime,
-    double? latitude,
-    double? longitude,
+    int? adjustmentTimestamp,
  }) {
    return LocalAsset(
      id: id ?? this.id,
@@ -115,9 +96,7 @@ class LocalAsset extends BaseAsset {
      durationInSeconds: durationInSeconds ?? this.durationInSeconds,
      isFavorite: isFavorite ?? this.isFavorite,
      orientation: orientation ?? this.orientation,
-      adjustmentTime: adjustmentTime ?? this.adjustmentTime,
-      latitude: latitude ?? this.latitude,
-      longitude: longitude ?? this.longitude,
+      adjustmentTimestamp: adjustmentTimestamp ?? this.adjustmentTimestamp,
    );
  }
 }
--- a/mobile/lib/domain/models/events.model.dart
+++ b/mobile/lib/domain/models/events.model.dart
@@ -1,32 +0,0 @@
-import 'package:immich_mobile/domain/utils/event_stream.dart';
-
-// Timeline Events
-class TimelineReloadEvent extends Event {
-  const TimelineReloadEvent();
-}
-
-class ScrollToTopEvent extends Event {
-  const ScrollToTopEvent();
-}
-
-class ScrollToDateEvent extends Event {
-  final DateTime date;
-
-  const ScrollToDateEvent(this.date);
-}
-
-// Asset Viewer Events
-class ViewerOpenBottomSheetEvent extends Event {
-  final bool activitiesMode;
-  const ViewerOpenBottomSheetEvent({this.activitiesMode = false});
-}
-
-class ViewerReloadAssetEvent extends Event {
-  const ViewerReloadAssetEvent();
-}
-
-// Multi-Select Events
-class MultiSelectToggleEvent extends Event {
-  final bool isEnabled;
-  const MultiSelectToggleEvent(this.isEnabled);
-}
--- a/mobile/lib/domain/models/exif.model.dart
+++ b/mobile/lib/domain/models/exif.model.dart
@@ -37,7 +37,7 @@ class ExifInfo {

  String get fNumber => f == null ? "" : f!.toStringAsFixed(1);

-  String get focalLength => mm == null ? "" : mm!.toStringAsFixed(3);
+  String get focalLength => mm == null ? "" : mm!.toStringAsFixed(1);

  const ExifInfo({
    this.assetId,
--- a/mobile/lib/domain/models/store.model.dart
+++ b/mobile/lib/domain/models/store.model.dart
@@ -71,7 +71,6 @@ enum StoreKey<T> {
  readonlyModeEnabled<bool>._(138),

  autoPlayVideo<bool>._(139),
-  albumGridView<bool>._(140),

  // Experimental stuff
  photoManagerCustomFilter<bool>._(1000),
--- a/mobile/lib/domain/models/timeline.model.dart
+++ b/mobile/lib/domain/models/timeline.model.dart
@@ -1,3 +1,5 @@
+import 'package:immich_mobile/domain/utils/event_stream.dart';
+
 enum GroupAssetsBy { day, month, auto, none }

 enum HeaderType { none, month, day, monthAndDay }
@@ -29,3 +31,17 @@ class TimeBucket extends Bucket {
  @override
  int get hashCode => super.hashCode ^ date.hashCode;
 }
+
+class TimelineReloadEvent extends Event {
+  const TimelineReloadEvent();
+}
+
+class ScrollToTopEvent extends Event {
+  const ScrollToTopEvent();
+}
+
+class ScrollToDateEvent extends Event {
+  final DateTime date;
+
+  const ScrollToDateEvent(this.date);
+}
--- a/mobile/lib/domain/services/local_sync.service.dart
+++ b/mobile/lib/domain/services/local_sync.service.dart
@@ -286,23 +286,11 @@ class LocalSyncService {
  }

  bool _assetsEqual(LocalAsset a, LocalAsset b) {
-    if (CurrentPlatform.isAndroid) {
-      return a.updatedAt.isAtSameMomentAs(b.updatedAt) &&
-          a.createdAt.isAtSameMomentAs(b.createdAt) &&
-          a.width == b.width &&
-          a.height == b.height &&
-          a.durationInSeconds == b.durationInSeconds;
-    }
-
-    final firstAdjustment = a.adjustmentTime?.millisecondsSinceEpoch ?? 0;
-    final secondAdjustment = b.adjustmentTime?.millisecondsSinceEpoch ?? 0;
-    return firstAdjustment == secondAdjustment &&
+    return a.updatedAt.isAtSameMomentAs(b.updatedAt) &&
        a.createdAt.isAtSameMomentAs(b.createdAt) &&
        a.width == b.width &&
        a.height == b.height &&
-        a.durationInSeconds == b.durationInSeconds &&
-        a.latitude == b.latitude &&
-        a.longitude == b.longitude;
+        a.durationInSeconds == b.durationInSeconds;
  }

  bool _albumsEqual(LocalAlbum a, LocalAlbum b) {
@@ -383,13 +371,11 @@ extension PlatformToLocalAsset on PlatformAsset {
    type: AssetType.values.elementAtOrNull(type) ?? AssetType.other,
    createdAt: tryFromSecondsSinceEpoch(createdAt, isUtc: true) ?? DateTime.timestamp(),
    updatedAt: tryFromSecondsSinceEpoch(updatedAt, isUtc: true) ?? DateTime.timestamp(),
+    adjustmentTimestamp: adjustmentTimestamp,
    width: width,
    height: height,
    durationInSeconds: durationInSeconds,
    isFavorite: isFavorite,
    orientation: orientation,
-    adjustmentTime: tryFromSecondsSinceEpoch(adjustmentTime, isUtc: true),
-    latitude: latitude,
-    longitude: longitude,
  );
 }
--- a/mobile/lib/domain/services/remote_album.service.dart
+++ b/mobile/lib/domain/services/remote_album.service.dart
@@ -7,7 +7,6 @@ import 'package:immich_mobile/domain/models/user.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/repositories/drift_album_api_repository.dart';
-import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';

 class RemoteAlbumService {
  final DriftRemoteAlbumRepository _repository;
@@ -33,16 +32,16 @@ class RemoteAlbumService {

  Future<List<RemoteAlbum>> sortAlbums(
    List<RemoteAlbum> albums,
-    AlbumSortMode sortMode, {
+    RemoteAlbumSortMode sortMode, {
    bool isReverse = false,
  }) async {
    final List<RemoteAlbum> sorted = switch (sortMode) {
-      AlbumSortMode.created => albums.sortedBy((album) => album.createdAt),
-      AlbumSortMode.title => albums.sortedBy((album) => album.name),
-      AlbumSortMode.lastModified => albums.sortedBy((album) => album.updatedAt),
-      AlbumSortMode.assetCount => albums.sortedBy((album) => album.assetCount),
-      AlbumSortMode.mostRecent => await _sortByNewestAsset(albums),
-      AlbumSortMode.mostOldest => await _sortByOldestAsset(albums),
+      RemoteAlbumSortMode.created => albums.sortedBy((album) => album.createdAt),
+      RemoteAlbumSortMode.title => albums.sortedBy((album) => album.name),
+      RemoteAlbumSortMode.lastModified => albums.sortedBy((album) => album.updatedAt),
+      RemoteAlbumSortMode.assetCount => albums.sortedBy((album) => album.assetCount),
+      RemoteAlbumSortMode.mostRecent => await _sortByNewestAsset(albums),
+      RemoteAlbumSortMode.mostOldest => await _sortByOldestAsset(albums),
    };

    return (isReverse ? sorted.reversed : sorted).toList();
@@ -212,3 +211,16 @@ class RemoteAlbumService {
    return sorted.reversed.toList();
  }
 }
+
+enum RemoteAlbumSortMode {
+  title("library_page_sort_title"),
+  assetCount("library_page_sort_asset_count"),
+  lastModified("library_page_sort_last_modified"),
+  created("library_page_sort_created"),
+  mostRecent("sort_newest"),
+  mostOldest("sort_oldest");
+
+  final String key;
+
+  const RemoteAlbumSortMode(this.key);
+}
--- a/mobile/lib/domain/services/timeline.service.dart
+++ b/mobile/lib/domain/services/timeline.service.dart
@@ -4,7 +4,6 @@ import 'dart:math' as math;
 import 'package:collection/collection.dart';
 import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/domain/models/events.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';
--- a/mobile/lib/extensions/asset_extensions.dart
+++ b/mobile/lib/extensions/asset_extensions.dart
@@ -1,5 +1,5 @@
 import 'package:immich_mobile/entities/asset.entity.dart';
-import 'package:immich_mobile/utils/timezone.dart';
+import 'package:timezone/timezone.dart';

 extension TZExtension on Asset {
  /// Returns the created time of the asset from the exif info (if available) or from
@@ -7,11 +7,24 @@ extension TZExtension on Asset {
  /// the timezone offset in [Duration]
  (DateTime, Duration) getTZAdjustedTimeAndOffset() {
    DateTime dt = fileCreatedAt.toLocal();
-
    if (exifInfo?.dateTimeOriginal != null) {
-      return applyTimezoneOffset(dateTime: exifInfo!.dateTimeOriginal!, timeZone: exifInfo?.timeZone);
+      dt = exifInfo!.dateTimeOriginal!;
+      if (exifInfo?.timeZone != null) {
+        dt = dt.toUtc();
+        try {
+          final location = getLocation(exifInfo!.timeZone!);
+          dt = TZDateTime.from(dt, location);
+        } on LocationNotFoundException {
+          RegExp re = RegExp(r'^utc(?:([+-]\d{1,2})(?::(\d{2}))?)?$', caseSensitive: false);
+          final m = re.firstMatch(exifInfo!.timeZone!);
+          if (m != null) {
+            final duration = Duration(hours: int.parse(m.group(1) ?? '0'), minutes: int.parse(m.group(2) ?? '0'));
+            dt = dt.add(duration);
+            return (dt, duration);
+          }
+        }
+      }
    }
-
    return (dt, dt.timeZoneOffset);
  }
 }
--- a/mobile/lib/infrastructure/entities/exif.entity.dart
+++ b/mobile/lib/infrastructure/entities/exif.entity.dart
@@ -166,6 +166,5 @@ extension RemoteExifEntityDataDomainEx on RemoteExifEntityData {
    mm: focalLength?.toDouble(),
    lens: lens,
    isFlipped: ExifDtoConverter.isOrientationFlipped(orientation),
-    exposureSeconds: ExifDtoConverter.exposureTimeToSeconds(exposureTime),
  );
 }
--- a/mobile/lib/infrastructure/entities/local_asset.entity.dart
+++ b/mobile/lib/infrastructure/entities/local_asset.entity.dart
@@ -16,11 +16,7 @@ class LocalAssetEntity extends Table with DriftDefaultsMixin, AssetEntityMixin {

  IntColumn get orientation => integer().withDefault(const Constant(0))();

-  DateTimeColumn get adjustmentTime => dateTime().nullable()();
-
-  RealColumn get latitude => real().nullable()();
-
-  RealColumn get longitude => real().nullable()();
+  IntColumn get adjustmentTimestamp => integer().nullable()();

  @override
  Set<Column> get primaryKey => {id};
@@ -40,8 +36,6 @@ extension LocalAssetEntityDataDomainExtension on LocalAssetEntityData {
    width: width,
    remoteId: remoteId,
    orientation: orientation,
-    adjustmentTime: adjustmentTime,
-    latitude: latitude,
-    longitude: longitude,
+    adjustmentTimestamp: adjustmentTimestamp,
  );
 }
--- a/mobile/lib/infrastructure/entities/local_asset.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/local_asset.entity.drift.dart
@@ -21,9 +21,7 @@ typedef $$LocalAssetEntityTableCreateCompanionBuilder =
      i0.Value<String?> checksum,
      i0.Value<bool> isFavorite,
      i0.Value<int> orientation,
-      i0.Value<DateTime?> adjustmentTime,
-      i0.Value<double?> latitude,
-      i0.Value<double?> longitude,
+      i0.Value<int?> adjustmentTimestamp,
    });
 typedef $$LocalAssetEntityTableUpdateCompanionBuilder =
    i1.LocalAssetEntityCompanion Function({
@@ -38,9 +36,7 @@ typedef $$LocalAssetEntityTableUpdateCompanionBuilder =
      i0.Value<String?> checksum,
      i0.Value<bool> isFavorite,
      i0.Value<int> orientation,
-      i0.Value<DateTime?> adjustmentTime,
-      i0.Value<double?> latitude,
-      i0.Value<double?> longitude,
+      i0.Value<int?> adjustmentTimestamp,
    });

 class $$LocalAssetEntityTableFilterComposer
@@ -108,18 +104,8 @@ class $$LocalAssetEntityTableFilterComposer
    builder: (column) => i0.ColumnFilters(column),
  );

-  i0.ColumnFilters<DateTime> get adjustmentTime => $composableBuilder(
-    column: $table.adjustmentTime,
-    builder: (column) => i0.ColumnFilters(column),
-  );
-
-  i0.ColumnFilters<double> get latitude => $composableBuilder(
-    column: $table.latitude,
-    builder: (column) => i0.ColumnFilters(column),
-  );
-
-  i0.ColumnFilters<double> get longitude => $composableBuilder(
-    column: $table.longitude,
+  i0.ColumnFilters<int> get adjustmentTimestamp => $composableBuilder(
+    column: $table.adjustmentTimestamp,
    builder: (column) => i0.ColumnFilters(column),
  );
 }
@@ -188,18 +174,8 @@ class $$LocalAssetEntityTableOrderingComposer
    builder: (column) => i0.ColumnOrderings(column),
  );

-  i0.ColumnOrderings<DateTime> get adjustmentTime => $composableBuilder(
-    column: $table.adjustmentTime,
-    builder: (column) => i0.ColumnOrderings(column),
-  );
-
-  i0.ColumnOrderings<double> get latitude => $composableBuilder(
-    column: $table.latitude,
-    builder: (column) => i0.ColumnOrderings(column),
-  );
-
-  i0.ColumnOrderings<double> get longitude => $composableBuilder(
-    column: $table.longitude,
+  i0.ColumnOrderings<int> get adjustmentTimestamp => $composableBuilder(
+    column: $table.adjustmentTimestamp,
    builder: (column) => i0.ColumnOrderings(column),
  );
 }
@@ -252,16 +228,10 @@ class $$LocalAssetEntityTableAnnotationComposer
    builder: (column) => column,
  );

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

 class $$LocalAssetEntityTableTableManager
@@ -315,9 +285,7 @@ class $$LocalAssetEntityTableTableManager
                i0.Value<String?> checksum = const i0.Value.absent(),
                i0.Value<bool> isFavorite = const i0.Value.absent(),
                i0.Value<int> orientation = const i0.Value.absent(),
-                i0.Value<DateTime?> adjustmentTime = const i0.Value.absent(),
-                i0.Value<double?> latitude = const i0.Value.absent(),
-                i0.Value<double?> longitude = const i0.Value.absent(),
+                i0.Value<int?> adjustmentTimestamp = const i0.Value.absent(),
              }) => i1.LocalAssetEntityCompanion(
                name: name,
                type: type,
@@ -330,9 +298,7 @@ class $$LocalAssetEntityTableTableManager
                checksum: checksum,
                isFavorite: isFavorite,
                orientation: orientation,
-                adjustmentTime: adjustmentTime,
-                latitude: latitude,
-                longitude: longitude,
+                adjustmentTimestamp: adjustmentTimestamp,
              ),
          createCompanionCallback:
              ({
@@ -347,9 +313,7 @@ class $$LocalAssetEntityTableTableManager
                i0.Value<String?> checksum = const i0.Value.absent(),
                i0.Value<bool> isFavorite = const i0.Value.absent(),
                i0.Value<int> orientation = const i0.Value.absent(),
-                i0.Value<DateTime?> adjustmentTime = const i0.Value.absent(),
-                i0.Value<double?> latitude = const i0.Value.absent(),
-                i0.Value<double?> longitude = const i0.Value.absent(),
+                i0.Value<int?> adjustmentTimestamp = const i0.Value.absent(),
              }) => i1.LocalAssetEntityCompanion.insert(
                name: name,
                type: type,
@@ -362,9 +326,7 @@ class $$LocalAssetEntityTableTableManager
                checksum: checksum,
                isFavorite: isFavorite,
                orientation: orientation,
-                adjustmentTime: adjustmentTime,
-                latitude: latitude,
-                longitude: longitude,
+                adjustmentTimestamp: adjustmentTimestamp,
              ),
          withReferenceMapper: (p0) => p0
              .map((e) => (e.readTable(table), i0.BaseReferences(db, table, e)))
@@ -532,39 +494,17 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
    requiredDuringInsert: false,
    defaultValue: const i4.Constant(0),
  );
-  static const i0.VerificationMeta _adjustmentTimeMeta =
-      const i0.VerificationMeta('adjustmentTime');
+  static const i0.VerificationMeta _adjustmentTimestampMeta =
+      const i0.VerificationMeta('adjustmentTimestamp');
  @override
-  late final i0.GeneratedColumn<DateTime> adjustmentTime =
-      i0.GeneratedColumn<DateTime>(
-        'adjustment_time',
+  late final i0.GeneratedColumn<int> adjustmentTimestamp =
+      i0.GeneratedColumn<int>(
+        'adjustment_timestamp',
        aliasedName,
        true,
-        type: i0.DriftSqlType.dateTime,
+        type: i0.DriftSqlType.int,
        requiredDuringInsert: false,
      );
-  static const i0.VerificationMeta _latitudeMeta = const i0.VerificationMeta(
-    'latitude',
-  );
-  @override
-  late final i0.GeneratedColumn<double> latitude = i0.GeneratedColumn<double>(
-    'latitude',
-    aliasedName,
-    true,
-    type: i0.DriftSqlType.double,
-    requiredDuringInsert: false,
-  );
-  static const i0.VerificationMeta _longitudeMeta = const i0.VerificationMeta(
-    'longitude',
-  );
-  @override
-  late final i0.GeneratedColumn<double> longitude = i0.GeneratedColumn<double>(
-    'longitude',
-    aliasedName,
-    true,
-    type: i0.DriftSqlType.double,
-    requiredDuringInsert: false,
-  );
  @override
  List<i0.GeneratedColumn> get $columns => [
    name,
@@ -578,9 +518,7 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
    checksum,
    isFavorite,
    orientation,
-    adjustmentTime,
-    latitude,
-    longitude,
+    adjustmentTimestamp,
  ];
  @override
  String get aliasedName => _alias ?? actualTableName;
@@ -661,27 +599,15 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
        ),
      );
    }
-    if (data.containsKey('adjustment_time')) {
+    if (data.containsKey('adjustment_timestamp')) {
      context.handle(
-        _adjustmentTimeMeta,
-        adjustmentTime.isAcceptableOrUnknown(
-          data['adjustment_time']!,
-          _adjustmentTimeMeta,
+        _adjustmentTimestampMeta,
+        adjustmentTimestamp.isAcceptableOrUnknown(
+          data['adjustment_timestamp']!,
+          _adjustmentTimestampMeta,
        ),
      );
    }
-    if (data.containsKey('latitude')) {
-      context.handle(
-        _latitudeMeta,
-        latitude.isAcceptableOrUnknown(data['latitude']!, _latitudeMeta),
-      );
-    }
-    if (data.containsKey('longitude')) {
-      context.handle(
-        _longitudeMeta,
-        longitude.isAcceptableOrUnknown(data['longitude']!, _longitudeMeta),
-      );
-    }
    return context;
  }

@@ -740,17 +666,9 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
        i0.DriftSqlType.int,
        data['${effectivePrefix}orientation'],
      )!,
-      adjustmentTime: attachedDatabase.typeMapping.read(
-        i0.DriftSqlType.dateTime,
-        data['${effectivePrefix}adjustment_time'],
-      ),
-      latitude: attachedDatabase.typeMapping.read(
-        i0.DriftSqlType.double,
-        data['${effectivePrefix}latitude'],
-      ),
-      longitude: attachedDatabase.typeMapping.read(
-        i0.DriftSqlType.double,
-        data['${effectivePrefix}longitude'],
+      adjustmentTimestamp: attachedDatabase.typeMapping.read(
+        i0.DriftSqlType.int,
+        data['${effectivePrefix}adjustment_timestamp'],
      ),
    );
  }
@@ -781,9 +699,7 @@ class LocalAssetEntityData extends i0.DataClass
  final String? checksum;
  final bool isFavorite;
  final int orientation;
-  final DateTime? adjustmentTime;
-  final double? latitude;
-  final double? longitude;
+  final int? adjustmentTimestamp;
  const LocalAssetEntityData({
    required this.name,
    required this.type,
@@ -796,9 +712,7 @@ class LocalAssetEntityData extends i0.DataClass
    this.checksum,
    required this.isFavorite,
    required this.orientation,
-    this.adjustmentTime,
-    this.latitude,
-    this.longitude,
+    this.adjustmentTimestamp,
  });
  @override
  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
@@ -826,14 +740,8 @@ class LocalAssetEntityData extends i0.DataClass
    }
    map['is_favorite'] = i0.Variable<bool>(isFavorite);
    map['orientation'] = i0.Variable<int>(orientation);
-    if (!nullToAbsent || adjustmentTime != null) {
-      map['adjustment_time'] = i0.Variable<DateTime>(adjustmentTime);
-    }
-    if (!nullToAbsent || latitude != null) {
-      map['latitude'] = i0.Variable<double>(latitude);
-    }
-    if (!nullToAbsent || longitude != null) {
-      map['longitude'] = i0.Variable<double>(longitude);
+    if (!nullToAbsent || adjustmentTimestamp != null) {
+      map['adjustment_timestamp'] = i0.Variable<int>(adjustmentTimestamp);
    }
    return map;
  }
@@ -857,9 +765,9 @@ class LocalAssetEntityData extends i0.DataClass
      checksum: serializer.fromJson<String?>(json['checksum']),
      isFavorite: serializer.fromJson<bool>(json['isFavorite']),
      orientation: serializer.fromJson<int>(json['orientation']),
-      adjustmentTime: serializer.fromJson<DateTime?>(json['adjustmentTime']),
-      latitude: serializer.fromJson<double?>(json['latitude']),
-      longitude: serializer.fromJson<double?>(json['longitude']),
+      adjustmentTimestamp: serializer.fromJson<int?>(
+        json['adjustmentTimestamp'],
+      ),
    );
  }
  @override
@@ -879,9 +787,7 @@ class LocalAssetEntityData extends i0.DataClass
      'checksum': serializer.toJson<String?>(checksum),
      'isFavorite': serializer.toJson<bool>(isFavorite),
      'orientation': serializer.toJson<int>(orientation),
-      'adjustmentTime': serializer.toJson<DateTime?>(adjustmentTime),
-      'latitude': serializer.toJson<double?>(latitude),
-      'longitude': serializer.toJson<double?>(longitude),
+      'adjustmentTimestamp': serializer.toJson<int?>(adjustmentTimestamp),
    };
  }

@@ -897,9 +803,7 @@ class LocalAssetEntityData extends i0.DataClass
    i0.Value<String?> checksum = const i0.Value.absent(),
    bool? isFavorite,
    int? orientation,
-    i0.Value<DateTime?> adjustmentTime = const i0.Value.absent(),
-    i0.Value<double?> latitude = const i0.Value.absent(),
-    i0.Value<double?> longitude = const i0.Value.absent(),
+    i0.Value<int?> adjustmentTimestamp = const i0.Value.absent(),
  }) => i1.LocalAssetEntityData(
    name: name ?? this.name,
    type: type ?? this.type,
@@ -914,11 +818,9 @@ class LocalAssetEntityData extends i0.DataClass
    checksum: checksum.present ? checksum.value : this.checksum,
    isFavorite: isFavorite ?? this.isFavorite,
    orientation: orientation ?? this.orientation,
-    adjustmentTime: adjustmentTime.present
-        ? adjustmentTime.value
-        : this.adjustmentTime,
-    latitude: latitude.present ? latitude.value : this.latitude,
-    longitude: longitude.present ? longitude.value : this.longitude,
+    adjustmentTimestamp: adjustmentTimestamp.present
+        ? adjustmentTimestamp.value
+        : this.adjustmentTimestamp,
  );
  LocalAssetEntityData copyWithCompanion(i1.LocalAssetEntityCompanion data) {
    return LocalAssetEntityData(
@@ -939,11 +841,9 @@ class LocalAssetEntityData extends i0.DataClass
      orientation: data.orientation.present
          ? data.orientation.value
          : this.orientation,
-      adjustmentTime: data.adjustmentTime.present
-          ? data.adjustmentTime.value
-          : this.adjustmentTime,
-      latitude: data.latitude.present ? data.latitude.value : this.latitude,
-      longitude: data.longitude.present ? data.longitude.value : this.longitude,
+      adjustmentTimestamp: data.adjustmentTimestamp.present
+          ? data.adjustmentTimestamp.value
+          : this.adjustmentTimestamp,
    );
  }

@@ -961,9 +861,7 @@ class LocalAssetEntityData extends i0.DataClass
          ..write('checksum: $checksum, ')
          ..write('isFavorite: $isFavorite, ')
          ..write('orientation: $orientation, ')
-          ..write('adjustmentTime: $adjustmentTime, ')
-          ..write('latitude: $latitude, ')
-          ..write('longitude: $longitude')
+          ..write('adjustmentTimestamp: $adjustmentTimestamp')
          ..write(')'))
        .toString();
  }
@@ -981,9 +879,7 @@ class LocalAssetEntityData extends i0.DataClass
    checksum,
    isFavorite,
    orientation,
-    adjustmentTime,
-    latitude,
-    longitude,
+    adjustmentTimestamp,
  );
  @override
  bool operator ==(Object other) =>
@@ -1000,9 +896,7 @@ class LocalAssetEntityData extends i0.DataClass
          other.checksum == this.checksum &&
          other.isFavorite == this.isFavorite &&
          other.orientation == this.orientation &&
-          other.adjustmentTime == this.adjustmentTime &&
-          other.latitude == this.latitude &&
-          other.longitude == this.longitude);
+          other.adjustmentTimestamp == this.adjustmentTimestamp);
 }

 class LocalAssetEntityCompanion
@@ -1018,9 +912,7 @@ class LocalAssetEntityCompanion
  final i0.Value<String?> checksum;
  final i0.Value<bool> isFavorite;
  final i0.Value<int> orientation;
-  final i0.Value<DateTime?> adjustmentTime;
-  final i0.Value<double?> latitude;
-  final i0.Value<double?> longitude;
+  final i0.Value<int?> adjustmentTimestamp;
  const LocalAssetEntityCompanion({
    this.name = const i0.Value.absent(),
    this.type = const i0.Value.absent(),
@@ -1033,9 +925,7 @@ class LocalAssetEntityCompanion
    this.checksum = const i0.Value.absent(),
    this.isFavorite = const i0.Value.absent(),
    this.orientation = const i0.Value.absent(),
-    this.adjustmentTime = const i0.Value.absent(),
-    this.latitude = const i0.Value.absent(),
-    this.longitude = const i0.Value.absent(),
+    this.adjustmentTimestamp = const i0.Value.absent(),
  });
  LocalAssetEntityCompanion.insert({
    required String name,
@@ -1049,9 +939,7 @@ class LocalAssetEntityCompanion
    this.checksum = const i0.Value.absent(),
    this.isFavorite = const i0.Value.absent(),
    this.orientation = const i0.Value.absent(),
-    this.adjustmentTime = const i0.Value.absent(),
-    this.latitude = const i0.Value.absent(),
-    this.longitude = const i0.Value.absent(),
+    this.adjustmentTimestamp = const i0.Value.absent(),
  }) : name = i0.Value(name),
       type = i0.Value(type),
       id = i0.Value(id);
@@ -1067,9 +955,7 @@ class LocalAssetEntityCompanion
    i0.Expression<String>? checksum,
    i0.Expression<bool>? isFavorite,
    i0.Expression<int>? orientation,
-    i0.Expression<DateTime>? adjustmentTime,
-    i0.Expression<double>? latitude,
-    i0.Expression<double>? longitude,
+    i0.Expression<int>? adjustmentTimestamp,
  }) {
    return i0.RawValuesInsertable({
      if (name != null) 'name': name,
@@ -1083,9 +969,8 @@ class LocalAssetEntityCompanion
      if (checksum != null) 'checksum': checksum,
      if (isFavorite != null) 'is_favorite': isFavorite,
      if (orientation != null) 'orientation': orientation,
-      if (adjustmentTime != null) 'adjustment_time': adjustmentTime,
-      if (latitude != null) 'latitude': latitude,
-      if (longitude != null) 'longitude': longitude,
+      if (adjustmentTimestamp != null)
+        'adjustment_timestamp': adjustmentTimestamp,
    });
  }

@@ -1101,9 +986,7 @@ class LocalAssetEntityCompanion
    i0.Value<String?>? checksum,
    i0.Value<bool>? isFavorite,
    i0.Value<int>? orientation,
-    i0.Value<DateTime?>? adjustmentTime,
-    i0.Value<double?>? latitude,
-    i0.Value<double?>? longitude,
+    i0.Value<int?>? adjustmentTimestamp,
  }) {
    return i1.LocalAssetEntityCompanion(
      name: name ?? this.name,
@@ -1117,9 +1000,7 @@ class LocalAssetEntityCompanion
      checksum: checksum ?? this.checksum,
      isFavorite: isFavorite ?? this.isFavorite,
      orientation: orientation ?? this.orientation,
-      adjustmentTime: adjustmentTime ?? this.adjustmentTime,
-      latitude: latitude ?? this.latitude,
-      longitude: longitude ?? this.longitude,
+      adjustmentTimestamp: adjustmentTimestamp ?? this.adjustmentTimestamp,
    );
  }

@@ -1161,14 +1042,8 @@ class LocalAssetEntityCompanion
    if (orientation.present) {
      map['orientation'] = i0.Variable<int>(orientation.value);
    }
-    if (adjustmentTime.present) {
-      map['adjustment_time'] = i0.Variable<DateTime>(adjustmentTime.value);
-    }
-    if (latitude.present) {
-      map['latitude'] = i0.Variable<double>(latitude.value);
-    }
-    if (longitude.present) {
-      map['longitude'] = i0.Variable<double>(longitude.value);
+    if (adjustmentTimestamp.present) {
+      map['adjustment_timestamp'] = i0.Variable<int>(adjustmentTimestamp.value);
    }
    return map;
  }
@@ -1187,9 +1062,7 @@ class LocalAssetEntityCompanion
          ..write('checksum: $checksum, ')
          ..write('isFavorite: $isFavorite, ')
          ..write('orientation: $orientation, ')
-          ..write('adjustmentTime: $adjustmentTime, ')
-          ..write('latitude: $latitude, ')
-          ..write('longitude: $longitude')
+          ..write('adjustmentTimestamp: $adjustmentTimestamp')
          ..write(')'))
        .toString();
  }
--- a/mobile/lib/infrastructure/repositories/db.repository.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.dart
@@ -186,9 +186,7 @@ class Drift extends $Drift implements IDatabaseRepository {
            await m.createIndex(v13.idxTrashedLocalAssetAlbum);
          },
          from13To14: (m, v14) async {
-            await m.addColumn(v14.localAssetEntity, v14.localAssetEntity.adjustmentTime);
-            await m.addColumn(v14.localAssetEntity, v14.localAssetEntity.latitude);
-            await m.addColumn(v14.localAssetEntity, v14.localAssetEntity.longitude);
+            await m.addColumn(v14.localAssetEntity, v14.localAssetEntity.adjustmentTimestamp);
          },
        ),
      );
--- a/mobile/lib/infrastructure/repositories/db.repository.steps.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.steps.dart
@@ -5596,8 +5596,6 @@ final class Schema14 extends i0.VersionedSchema {
        _column_14,
        _column_23,
        _column_96,
-        _column_46,
-        _column_47,
      ],
      attachedDatabase: database,
    ),
@@ -5926,20 +5924,16 @@ class Shape24 extends i0.VersionedTable {
      columnsByName['is_favorite']! as i1.GeneratedColumn<bool>;
  i1.GeneratedColumn<int> get orientation =>
      columnsByName['orientation']! as i1.GeneratedColumn<int>;
-  i1.GeneratedColumn<DateTime> get adjustmentTime =>
-      columnsByName['adjustment_time']! as i1.GeneratedColumn<DateTime>;
-  i1.GeneratedColumn<double> get latitude =>
-      columnsByName['latitude']! as i1.GeneratedColumn<double>;
-  i1.GeneratedColumn<double> get longitude =>
-      columnsByName['longitude']! as i1.GeneratedColumn<double>;
+  i1.GeneratedColumn<int> get adjustmentTimestamp =>
+      columnsByName['adjustment_timestamp']! as i1.GeneratedColumn<int>;
 }

-i1.GeneratedColumn<DateTime> _column_96(String aliasedName) =>
-    i1.GeneratedColumn<DateTime>(
-      'adjustment_time',
+i1.GeneratedColumn<int> _column_96(String aliasedName) =>
+    i1.GeneratedColumn<int>(
+      'adjustment_timestamp',
      aliasedName,
      true,
-      type: i1.DriftSqlType.dateTime,
+      type: i1.DriftSqlType.int,
    );
 i0.MigrationStepWithVersion migrationSteps({
  required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
--- a/mobile/lib/infrastructure/repositories/local_album.repository.dart
+++ b/mobile/lib/infrastructure/repositories/local_album.repository.dart
@@ -1,5 +1,3 @@
-import 'dart:async';
-
 import 'package:drift/drift.dart';
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
@@ -246,56 +244,7 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
    return query.map((row) => row.readTable(_db.localAssetEntity).toDto()).get();
  }

-  Future<void> Function(Iterable<LocalAsset>) get _upsertAssets =>
-      CurrentPlatform.isIOS ? _upsertAssetsDarwin : _upsertAssetsAndroid;
-
-  Future<void> _upsertAssetsDarwin(Iterable<LocalAsset> localAssets) async {
-    if (localAssets.isEmpty) {
-      return Future.value();
-    }
-
-    // Reset checksum if asset changed
-    await _db.batch((batch) async {
-      for (final asset in localAssets) {
-        final companion = LocalAssetEntityCompanion(
-          checksum: const Value(null),
-          adjustmentTime: Value(asset.adjustmentTime),
-        );
-        batch.update(
-          _db.localAssetEntity,
-          companion,
-          where: (row) => row.id.equals(asset.id) & row.adjustmentTime.isNotExp(Variable(asset.adjustmentTime)),
-        );
-      }
-    });
-
-    return _db.batch((batch) async {
-      for (final asset in localAssets) {
-        final companion = LocalAssetEntityCompanion.insert(
-          name: asset.name,
-          type: asset.type,
-          createdAt: Value(asset.createdAt),
-          updatedAt: Value(asset.updatedAt),
-          width: Value(asset.width),
-          height: Value(asset.height),
-          durationInSeconds: Value(asset.durationInSeconds),
-          id: asset.id,
-          orientation: Value(asset.orientation),
-          isFavorite: Value(asset.isFavorite),
-          latitude: Value(asset.latitude),
-          longitude: Value(asset.longitude),
-          adjustmentTime: Value(asset.adjustmentTime),
-        );
-        batch.insert<$LocalAssetEntityTable, LocalAssetEntityData>(
-          _db.localAssetEntity,
-          companion.copyWith(checksum: const Value(null)),
-          onConflict: DoUpdate((old) => companion),
-        );
-      }
-    });
-  }
-
-  Future<void> _upsertAssetsAndroid(Iterable<LocalAsset> localAssets) async {
+  Future<void> _upsertAssets(Iterable<LocalAsset> localAssets) {
    if (localAssets.isEmpty) {
      return Future.value();
    }
@@ -311,9 +260,9 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
          height: Value(asset.height),
          durationInSeconds: Value(asset.durationInSeconds),
          id: asset.id,
-          checksum: const Value(null),
          orientation: Value(asset.orientation),
          isFavorite: Value(asset.isFavorite),
+          adjustmentTimestamp: Value(asset.adjustmentTimestamp),
        );
        batch.insert<$LocalAssetEntityTable, LocalAssetEntityData>(
          _db.localAssetEntity,
--- a/mobile/lib/infrastructure/utils/exif.converter.dart
+++ b/mobile/lib/infrastructure/utils/exif.converter.dart
@@ -22,7 +22,7 @@ abstract final class ExifDtoConverter {
      f: dto.fNumber?.toDouble(),
      mm: dto.focalLength?.toDouble(),
      iso: dto.iso?.toInt(),
-      exposureSeconds: exposureTimeToSeconds(dto.exposureTime),
+      exposureSeconds: _exposureTimeToSeconds(dto.exposureTime),
    );
  }

@@ -36,15 +36,15 @@ abstract final class ExifDtoConverter {
    return isRotated90CW || isRotated270CW;
  }

-  static double? exposureTimeToSeconds(String? second) {
-    if (second == null) {
+  static double? _exposureTimeToSeconds(String? s) {
+    if (s == null) {
      return null;
    }
-    double? value = double.tryParse(second);
+    double? value = double.tryParse(s);
    if (value != null) {
      return value;
    }
-    final parts = second.split("/");
+    final parts = s.split("/");
    if (parts.length == 2) {
      final numerator = double.tryParse(parts.firstOrNull ?? "-");
      final denominator = double.tryParse(parts.lastOrNull ?? "-");
--- a/mobile/lib/pages/backup/drift_backup_asset_detail.page.dart
+++ b/mobile/lib/pages/backup/drift_backup_asset_detail.page.dart
@@ -3,7 +3,7 @@ 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/asset/base_asset.model.dart';
-import 'package:immich_mobile/domain/models/events.model.dart';
+import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/theme_extensions.dart';
--- a/mobile/lib/pages/common/settings.page.dart
+++ b/mobile/lib/pages/common/settings.page.dart
@@ -58,7 +58,7 @@ class SettingsPage extends StatelessWidget {
    context.locale;
    return Scaffold(
      appBar: AppBar(centerTitle: false, title: const Text('settings').tr()),
-      body: context.isMobile ? const _MobileLayout() : const _TabletLayout(),
+      body: context.isMobile ? const SafeArea(child: _MobileLayout()) : const SafeArea(child: _TabletLayout()),
    );
  }
 }
@@ -89,7 +89,11 @@ class _MobileLayout extends StatelessWidget {
                ],
        )
        .toList();
-    return ListView(padding: const EdgeInsets.only(top: 10.0, bottom: 16), children: [...settings]);
+    return ListView(
+      physics: const ClampingScrollPhysics(),
+      padding: const EdgeInsets.only(top: 10.0, bottom: 16),
+      children: [...settings],
+    );
  }
 }

--- a/mobile/lib/pages/common/tab_shell.page.dart
+++ b/mobile/lib/pages/common/tab_shell.page.dart
@@ -5,7 +5,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/constants.dart';
-import 'package:immich_mobile/domain/models/events.model.dart';
+import 'package:immich_mobile/domain/models/timeline.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/pages/search/paginated_search.provider.dart';
@@ -16,6 +16,7 @@ import 'package:immich_mobile/providers/infrastructure/people.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/readonly_mode.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()
--- a/mobile/lib/pages/search/map/map_location_picker.page.dart
+++ b/mobile/lib/pages/search/map/map_location_picker.page.dart
@@ -49,7 +49,7 @@ class MapLocationPickerPage extends HookConsumerWidget {

      var currentLatLng = LatLng(currentLocation.latitude, currentLocation.longitude);
      selectedLatLng.value = currentLatLng;
-      await controller.value?.animateCamera(CameraUpdate.newLatLngZoom(currentLatLng, 12));
+      await controller.value?.animateCamera(CameraUpdate.newLatLng(currentLatLng));
    }

    return MapThemeOverride(
@@ -66,10 +66,7 @@ class MapLocationPickerPage extends HookConsumerWidget {
                borderRadius: BorderRadius.only(bottomLeft: Radius.circular(40), bottomRight: Radius.circular(40)),
              ),
              child: MapLibreMap(
-                initialCameraPosition: CameraPosition(
-                  target: initialLatLng,
-                  zoom: (initialLatLng.latitude == 0 && initialLatLng.longitude == 0) ? 1 : 12,
-                ),
+                initialCameraPosition: CameraPosition(target: initialLatLng, zoom: 12),
                styleString: style,
                onMapCreated: (mapController) => controller.value = mapController,
                onStyleLoadedCallback: onStyleLoaded,
--- a/mobile/lib/platform/native_sync_api.g.dart
+++ b/mobile/lib/platform/native_sync_api.g.dart
@@ -41,9 +41,7 @@ class PlatformAsset {
    required this.durationInSeconds,
    required this.orientation,
    required this.isFavorite,
-    this.adjustmentTime,
-    this.latitude,
-    this.longitude,
+    this.adjustmentTimestamp,
  });

  String id;
@@ -66,11 +64,7 @@ class PlatformAsset {

  bool isFavorite;

-  int? adjustmentTime;
-
-  double? latitude;
-
-  double? longitude;
+  int? adjustmentTimestamp;

  List<Object?> _toList() {
    return <Object?>[
@@ -84,9 +78,7 @@ class PlatformAsset {
      durationInSeconds,
      orientation,
      isFavorite,
-      adjustmentTime,
-      latitude,
-      longitude,
+      adjustmentTimestamp,
    ];
  }

@@ -107,9 +99,7 @@ class PlatformAsset {
      durationInSeconds: result[7]! as int,
      orientation: result[8]! as int,
      isFavorite: result[9]! as bool,
-      adjustmentTime: result[10] as int?,
-      latitude: result[11] as double?,
-      longitude: result[12] as double?,
+      adjustmentTimestamp: result[10] as int?,
    );
  }

--- a/mobile/lib/presentation/pages/drift_activities.page.dart
+++ b/mobile/lib/presentation/pages/drift_activities.page.dart
@@ -37,7 +37,7 @@ class DriftActivitiesPage extends HookConsumerWidget {
      child: Scaffold(
        appBar: AppBar(
          title: Text(album.name),
-          actions: [const LikeActivityActionButton(iconOnly: true)],
+          actions: [const LikeActivityActionButton(menuItem: true)],
          actionsPadding: const EdgeInsets.only(right: 8),
        ),
        body: activities.widgetWhen(
--- a/mobile/lib/presentation/pages/drift_asset_troubleshoot.page.dart
+++ b/mobile/lib/presentation/pages/drift_asset_troubleshoot.page.dart
@@ -4,7 +4,6 @@ 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/platform_extensions.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';

@RoutePage()
@@ -130,15 +129,7 @@ class _AssetPropertiesSectionState extends ConsumerState<_AssetPropertiesSection
    properties.insert(4, _PropertyItem(label: 'Orientation', value: asset.orientation.toString()));
    final albums = await ref.read(assetServiceProvider).getSourceAlbums(asset.id);
    properties.add(_PropertyItem(label: 'Album', value: albums.map((a) => a.name).join(', ')));
-    if (CurrentPlatform.isIOS) {
-      properties.add(_PropertyItem(label: 'Adjustment Time', value: asset.adjustmentTime?.toString()));
-    }
-    properties.add(
-      _PropertyItem(
-        label: 'GPS Coordinates',
-        value: asset.hasCoordinates ? '${asset.latitude}, ${asset.longitude}' : null,
-      ),
-    );
+    properties.add(_PropertyItem(label: 'Adjustment Timestamp', value: asset.adjustmentTimestamp?.toString()));
  }

  Future<void> _addRemoteAssetProperties(RemoteAsset asset) async {
--- a/mobile/lib/presentation/widgets/action_buttons/add_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/add_action_button.widget.dart
@@ -21,34 +21,12 @@ import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_shee

 enum AddToMenuItem { album, archive, unarchive, lockedFolder }

-class AddActionButton extends ConsumerStatefulWidget {
+class AddActionButton extends ConsumerWidget {
  const AddActionButton({super.key});

-  @override
-  ConsumerState<AddActionButton> createState() => _AddActionButtonState();
-}
-
-class _AddActionButtonState extends ConsumerState<AddActionButton> {
-  void _handleMenuSelection(AddToMenuItem selected) {
-    switch (selected) {
-      case AddToMenuItem.album:
-        _openAlbumSelector();
-        break;
-      case AddToMenuItem.archive:
-        performArchiveAction(context, ref, source: ActionSource.viewer);
-        break;
-      case AddToMenuItem.unarchive:
-        performUnArchiveAction(context, ref, source: ActionSource.viewer);
-        break;
-      case AddToMenuItem.lockedFolder:
-        performMoveToLockFolderAction(context, ref, source: ActionSource.viewer);
-        break;
-    }
-  }
-
-  List<Widget> _buildMenuChildren() {
+  Future<void> _showAddOptions(BuildContext context, WidgetRef ref) async {
    final asset = ref.read(currentAssetNotifier);
-    if (asset == null) return [];
+    if (asset == null) return;

    final user = ref.read(currentUserProvider);
    final isOwner = asset is RemoteAsset && asset.ownerId == user?.id;
@@ -57,57 +35,93 @@ class _AddActionButtonState extends ConsumerState<AddActionButton> {
    final hasRemote = asset is RemoteAsset;
    final showArchive = isOwner && !isInLockedView && hasRemote && !isArchived;
    final showUnarchive = isOwner && !isInLockedView && hasRemote && isArchived;
+    final menuItemHeight = 30.0;

-    return [
-      Padding(
-        padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
-        child: Text("add_to_bottom_bar".tr(), style: context.textTheme.labelMedium),
+    final List<PopupMenuEntry<AddToMenuItem>> items = [
+      PopupMenuItem(
+        enabled: false,
+        textStyle: context.textTheme.labelMedium,
+        height: 40,
+        child: Text("add_to_bottom_bar".tr()),
      ),
-      BaseActionButton(
-        iconData: Icons.photo_album_outlined,
-        label: "album".tr(),
-        menuItem: true,
-        onPressed: () => _handleMenuSelection(AddToMenuItem.album),
+      PopupMenuItem(
+        height: menuItemHeight,
+        value: AddToMenuItem.album,
+        child: ListTile(leading: const Icon(Icons.photo_album_outlined), title: Text("album".tr())),
      ),
-
+      const PopupMenuDivider(),
+      PopupMenuItem(enabled: false, textStyle: context.textTheme.labelMedium, height: 40, child: Text("move_to".tr())),
      if (isOwner) ...[
-        const PopupMenuDivider(),
-        Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
-          child: Text("move_to".tr(), style: context.textTheme.labelMedium),
-        ),
        if (showArchive)
-          BaseActionButton(
-            iconData: Icons.archive_outlined,
-            label: "archive".tr(),
-            menuItem: true,
-            onPressed: () => _handleMenuSelection(AddToMenuItem.archive),
+          PopupMenuItem(
+            height: menuItemHeight,
+            value: AddToMenuItem.archive,
+            child: ListTile(leading: const Icon(Icons.archive_outlined), title: Text("archive".tr())),
          ),
        if (showUnarchive)
-          BaseActionButton(
-            iconData: Icons.unarchive_outlined,
-            label: "unarchive".tr(),
-            menuItem: true,
-            onPressed: () => _handleMenuSelection(AddToMenuItem.unarchive),
+          PopupMenuItem(
+            height: menuItemHeight,
+            value: AddToMenuItem.unarchive,
+            child: ListTile(leading: const Icon(Icons.unarchive_outlined), title: Text("unarchive".tr())),
          ),
-        BaseActionButton(
-          iconData: Icons.lock_outline,
-          label: "locked_folder".tr(),
-          menuItem: true,
-          onPressed: () => _handleMenuSelection(AddToMenuItem.lockedFolder),
+        PopupMenuItem(
+          height: menuItemHeight,
+          value: AddToMenuItem.lockedFolder,
+          child: ListTile(leading: const Icon(Icons.lock_outline), title: Text("locked_folder".tr())),
        ),
      ],
    ];
+
+    final AddToMenuItem? selected = await showMenu<AddToMenuItem>(
+      context: context,
+      color: context.themeData.scaffoldBackgroundColor,
+      position: _menuPosition(context),
+      items: items,
+      popUpAnimationStyle: AnimationStyle.noAnimation,
+    );
+
+    if (selected == null) {
+      return;
+    }
+
+    switch (selected) {
+      case AddToMenuItem.album:
+        _openAlbumSelector(context, ref);
+        break;
+      case AddToMenuItem.archive:
+        await performArchiveAction(context, ref, source: ActionSource.viewer);
+        break;
+      case AddToMenuItem.unarchive:
+        await performUnArchiveAction(context, ref, source: ActionSource.viewer);
+        break;
+      case AddToMenuItem.lockedFolder:
+        await performMoveToLockFolderAction(context, ref, source: ActionSource.viewer);
+        break;
+    }
  }

-  void _openAlbumSelector() {
+  RelativeRect _menuPosition(BuildContext context) {
+    final renderObject = context.findRenderObject();
+    if (renderObject is! RenderBox) {
+      return RelativeRect.fill;
+    }
+
+    final size = renderObject.size;
+    final position = renderObject.localToGlobal(Offset.zero);
+
+    return RelativeRect.fromLTRB(position.dx, position.dy - size.height - 200, position.dx + size.width, position.dy);
+  }
+
+  void _openAlbumSelector(BuildContext context, WidgetRef ref) {
    final currentAsset = ref.read(currentAssetNotifier);
    if (currentAsset == null) {
      ImmichToast.show(context: context, msg: "Cannot load asset information.", toastType: ToastType.error);
      return;
    }

-    final List<Widget> slivers = [AlbumSelector(onAlbumSelected: (album) => _addCurrentAssetToAlbum(album))];
+    final List<Widget> slivers = [
+      AlbumSelector(onAlbumSelected: (album) => _addCurrentAssetToAlbum(context, ref, album)),
+    ];

    showModalBottomSheet(
      context: context,
@@ -127,7 +141,7 @@ class _AddActionButtonState extends ConsumerState<AddActionButton> {
    );
  }

-  Future<void> _addCurrentAssetToAlbum(RemoteAlbum album) async {
+  Future<void> _addCurrentAssetToAlbum(BuildContext context, WidgetRef ref, RemoteAlbum album) async {
    final latest = ref.read(currentAssetNotifier);

    if (latest == null) {
@@ -160,27 +174,17 @@ class _AddActionButtonState extends ConsumerState<AddActionButton> {
  }

  @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
    final asset = ref.watch(currentAssetNotifier);
    if (asset == null) {
      return const SizedBox.shrink();
    }
-
-    return MenuAnchor(
-      consumeOutsideTap: true,
-      style: MenuStyle(
-        backgroundColor: WidgetStatePropertyAll(context.themeData.scaffoldBackgroundColor),
-        elevation: const WidgetStatePropertyAll(4),
-        shape: const WidgetStatePropertyAll(
-          RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(12))),
-        ),
-      ),
-      menuChildren: _buildMenuChildren(),
-      builder: (context, controller, child) {
+    return Builder(
+      builder: (buttonContext) {
        return BaseActionButton(
          iconData: Icons.add,
          label: "add_to_bottom_bar".tr(),
-          onPressed: () => controller.isOpen ? controller.close() : controller.open(),
+          onPressed: () => _showAddOptions(buttonContext, ref),
        );
      },
    );
--- a/mobile/lib/presentation/widgets/action_buttons/archive_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/archive_action_button.widget.dart
@@ -2,10 +2,10 @@ 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/domain/models/events.model.dart';
 import 'package:immich_mobile/domain/utils/event_stream.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/presentation/widgets/asset_viewer/asset_viewer.state.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';
--- a/mobile/lib/presentation/widgets/action_buttons/base_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/base_action_button.widget.dart
@@ -11,7 +11,6 @@ class BaseActionButton extends StatelessWidget {
    this.onLongPressed,
    this.maxWidth = 90.0,
    this.minWidth,
-    this.iconOnly = false,
    this.menuItem = false,
  });

@@ -20,11 +19,6 @@ class BaseActionButton extends StatelessWidget {
  final Color? iconColor;
  final double maxWidth;
  final double? minWidth;
-
-  /// When true, renders only an IconButton without text label
-  final bool iconOnly;
-
-  /// When true, renders as a MenuItemButton for use in MenuAnchor menus
  final bool menuItem;
  final void Function()? onPressed;
  final void Function()? onLongPressed;
@@ -37,26 +31,13 @@ class BaseActionButton extends StatelessWidget {
    final iconColor = this.iconColor ?? iconTheme.color ?? context.themeData.iconTheme.color;
    final textColor = context.themeData.textTheme.labelLarge?.color;

-    if (iconOnly) {
+    if (menuItem) {
      return IconButton(
        onPressed: onPressed,
        icon: Icon(iconData, size: iconSize, color: iconColor),
      );
    }

-    if (menuItem) {
-      final theme = context.themeData;
-      final effectiveStyle = theme.textTheme.labelLarge;
-      final effectiveIconColor = iconColor ?? theme.iconTheme.color ?? theme.colorScheme.onSurfaceVariant;
-
-      return MenuItemButton(
-        style: MenuItemButton.styleFrom(padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12)),
-        leadingIcon: Icon(iconData, color: effectiveIconColor, size: 20),
-        onPressed: onPressed,
-        child: Text(label, style: effectiveStyle),
-      );
-    }
-
    return ConstrainedBox(
      constraints: BoxConstraints(maxWidth: maxWidth),
      child: MaterialButton(
--- a/mobile/lib/presentation/widgets/action_buttons/cast_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/cast_action_button.widget.dart
@@ -7,9 +7,8 @@ import 'package:immich_mobile/providers/cast.provider.dart';
 import 'package:immich_mobile/widgets/asset_viewer/cast_dialog.dart';

 class CastActionButton extends ConsumerWidget {
-  const CastActionButton({super.key, this.iconOnly = true, this.menuItem = false});
+  const CastActionButton({super.key, this.menuItem = true});

-  final bool iconOnly;
  final bool menuItem;

  @override
@@ -23,7 +22,6 @@ class CastActionButton extends ConsumerWidget {
      onPressed: () {
        showDialog(context: context, builder: (context) => const CastDialog());
      },
-      iconOnly: iconOnly,
      menuItem: menuItem,
    );
  }
--- a/mobile/lib/presentation/widgets/action_buttons/delete_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/delete_action_button.widget.dart
@@ -2,11 +2,11 @@ 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/domain/models/events.model.dart';
 import 'package:immich_mobile/domain/utils/event_stream.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/base_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.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';
--- a/mobile/lib/presentation/widgets/action_buttons/delete_local_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/delete_local_action_button.widget.dart
@@ -2,10 +2,10 @@ 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/domain/models/events.model.dart';
 import 'package:immich_mobile/domain/utils/event_stream.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/presentation/widgets/asset_viewer/asset_viewer.state.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';
--- a/mobile/lib/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart
@@ -2,10 +2,10 @@ 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/domain/models/events.model.dart';
 import 'package:immich_mobile/domain/utils/event_stream.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/presentation/widgets/asset_viewer/asset_viewer.state.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';
--- a/mobile/lib/presentation/widgets/action_buttons/download_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/download_action_button.widget.dart
@@ -10,9 +10,8 @@ import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';

 class DownloadActionButton extends ConsumerWidget {
  final ActionSource source;
-  final bool iconOnly;
  final bool menuItem;
-  const DownloadActionButton({super.key, required this.source, this.iconOnly = false, this.menuItem = false});
+  const DownloadActionButton({super.key, required this.source, this.menuItem = false});

  void _onTap(BuildContext context, WidgetRef ref, BackgroundSyncManager backgroundSyncManager) async {
    if (!context.mounted) {
@@ -39,7 +38,6 @@ class DownloadActionButton extends ConsumerWidget {
      iconData: Icons.download,
      maxWidth: 95,
      label: "download".t(context: context),
-      iconOnly: iconOnly,
      menuItem: menuItem,
      onPressed: () => _onTap(context, ref, backgroundManager),
    );
--- a/mobile/lib/presentation/widgets/action_buttons/favorite_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/favorite_action_button.widget.dart
@@ -10,10 +10,9 @@ import 'package:immich_mobile/widgets/common/immich_toast.dart';

 class FavoriteActionButton extends ConsumerWidget {
  final ActionSource source;
-  final bool iconOnly;
  final bool menuItem;

-  const FavoriteActionButton({super.key, required this.source, this.iconOnly = false, this.menuItem = false});
+  const FavoriteActionButton({super.key, required this.source, this.menuItem = false});

  void _onTap(BuildContext context, WidgetRef ref) async {
    if (!context.mounted) {
@@ -45,7 +44,6 @@ class FavoriteActionButton extends ConsumerWidget {
    return BaseActionButton(
      iconData: Icons.favorite_border_rounded,
      label: "favorite".t(context: context),
-      iconOnly: iconOnly,
      menuItem: menuItem,
      onPressed: () => _onTap(context, ref),
    );
--- a/mobile/lib/presentation/widgets/action_buttons/like_activity_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/like_activity_action_button.widget.dart
@@ -12,9 +12,8 @@ import 'package:immich_mobile/providers/infrastructure/current_album.provider.da
 import 'package:immich_mobile/providers/user.provider.dart';

 class LikeActivityActionButton extends ConsumerWidget {
-  const LikeActivityActionButton({super.key, this.iconOnly = false, this.menuItem = false});
+  const LikeActivityActionButton({super.key, this.menuItem = false});

-  final bool iconOnly;
  final bool menuItem;

  @override
@@ -50,7 +49,6 @@ class LikeActivityActionButton extends ConsumerWidget {
          iconData: liked != null ? Icons.favorite : Icons.favorite_border,
          label: "like".t(context: context),
          onPressed: () => onTap(liked),
-          iconOnly: iconOnly,
          menuItem: menuItem,
        );
      },
@@ -59,7 +57,6 @@ class LikeActivityActionButton extends ConsumerWidget {
      loading: () => BaseActionButton(
        iconData: Icons.favorite_border,
        label: "like".t(context: context),
-        iconOnly: iconOnly,
        menuItem: menuItem,
      ),
      error: (error, stack) => Text('error_saving_image'.tr(args: [error.toString()])),
--- a/mobile/lib/presentation/widgets/action_buttons/motion_photo_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/motion_photo_action_button.widget.dart
@@ -5,9 +5,8 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_bu
 import 'package:immich_mobile/providers/asset_viewer/is_motion_video_playing.provider.dart';

 class MotionPhotoActionButton extends ConsumerWidget {
-  const MotionPhotoActionButton({super.key, this.iconOnly = true, this.menuItem = false});
+  const MotionPhotoActionButton({super.key, this.menuItem = true});

-  final bool iconOnly;
  final bool menuItem;

  @override
@@ -18,7 +17,6 @@ class MotionPhotoActionButton extends ConsumerWidget {
      iconData: isPlaying ? Icons.motion_photos_pause_outlined : Icons.play_circle_outline_rounded,
      label: "play_motion_photo".t(context: context),
      onPressed: ref.read(isPlayingMotionVideoProvider.notifier).toggle,
-      iconOnly: iconOnly,
      menuItem: menuItem,
    );
  }
--- 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
@@ -2,10 +2,10 @@ 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/domain/models/events.model.dart';
 import 'package:immich_mobile/domain/utils/event_stream.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/presentation/widgets/asset_viewer/asset_viewer.state.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';
--- a/mobile/lib/presentation/widgets/action_buttons/trash_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/trash_action_button.widget.dart
@@ -2,10 +2,10 @@ 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/domain/models/events.model.dart';
 import 'package:immich_mobile/domain/utils/event_stream.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/presentation/widgets/asset_viewer/asset_viewer.state.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';
--- a/mobile/lib/presentation/widgets/action_buttons/unarchive_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/unarchive_action_button.widget.dart
@@ -9,8 +9,8 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_bu
 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';
-import 'package:immich_mobile/domain/models/events.model.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
+import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';

 // used to allow performing unarchive action from different sources (without duplicating code)
 Future<void> performUnArchiveAction(BuildContext context, WidgetRef ref, {required ActionSource source}) async {
--- a/mobile/lib/presentation/widgets/action_buttons/unfavorite_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/unfavorite_action_button.widget.dart
@@ -10,10 +10,9 @@ import 'package:immich_mobile/widgets/common/immich_toast.dart';

 class UnFavoriteActionButton extends ConsumerWidget {
  final ActionSource source;
-  final bool iconOnly;
  final bool menuItem;

-  const UnFavoriteActionButton({super.key, required this.source, this.iconOnly = false, this.menuItem = false});
+  const UnFavoriteActionButton({super.key, required this.source, this.menuItem = false});

  void _onTap(BuildContext context, WidgetRef ref) async {
    if (!context.mounted) {
@@ -46,7 +45,6 @@ class UnFavoriteActionButton extends ConsumerWidget {
      iconData: Icons.favorite_rounded,
      label: "unfavorite".t(context: context),
      onPressed: () => _onTap(context, ref),
-      iconOnly: iconOnly,
      menuItem: menuItem,
    );
  }
--- a/mobile/lib/presentation/widgets/album/album_selector.widget.dart
+++ b/mobile/lib/presentation/widgets/album/album_selector.widget.dart
@@ -7,6 +7,7 @@ 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/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/services/remote_album.service.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';
@@ -16,9 +17,6 @@ import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart'
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
-import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';
-import 'package:immich_mobile/providers/app_settings.provider.dart';
-import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/utils/album_filter.utils.dart';
 import 'package:immich_mobile/widgets/common/confirm_dialog.dart';
@@ -47,28 +45,14 @@ class _AlbumSelectorState extends ConsumerState<AlbumSelector> {
  List<RemoteAlbum> shownAlbums = [];

  AlbumFilter filter = AlbumFilter(query: "", mode: QuickFilterMode.all);
-  AlbumSort sort = AlbumSort(mode: AlbumSortMode.lastModified, isReverse: true);
+  AlbumSort sort = AlbumSort(mode: RemoteAlbumSortMode.lastModified, isReverse: true);

  @override
  void initState() {
    super.initState();

+    // Load albums when component mounts
    WidgetsBinding.instance.addPostFrameCallback((_) {
-      final appSettings = ref.read(appSettingsServiceProvider);
-      final savedSortMode = appSettings.getSetting(AppSettingsEnum.selectedAlbumSortOrder);
-      final savedIsReverse = appSettings.getSetting(AppSettingsEnum.selectedAlbumSortReverse);
-      final savedIsGrid = appSettings.getSetting(AppSettingsEnum.albumGridView);
-
-      final albumSortMode = AlbumSortMode.values.firstWhere(
-        (e) => e.storeIndex == savedSortMode,
-        orElse: () => AlbumSortMode.lastModified,
-      );
-
-      setState(() {
-        sort = AlbumSort(mode: albumSortMode, isReverse: savedIsReverse);
-        isGrid = savedIsGrid;
-      });
-
      ref.read(remoteAlbumProvider.notifier).refresh();
    });

@@ -98,7 +82,6 @@ class _AlbumSelectorState extends ConsumerState<AlbumSelector> {
    setState(() {
      isGrid = !isGrid;
    });
-    ref.read(appSettingsServiceProvider).setSetting(AppSettingsEnum.albumGridView, isGrid);
  }

  void changeFilter(QuickFilterMode mode) {
@@ -114,10 +97,6 @@ class _AlbumSelectorState extends ConsumerState<AlbumSelector> {
      this.sort = sort;
    });

-    final appSettings = ref.read(appSettingsServiceProvider);
-    await appSettings.setSetting(AppSettingsEnum.selectedAlbumSortOrder, sort.mode.storeIndex);
-    await appSettings.setSetting(AppSettingsEnum.selectedAlbumSortReverse, sort.isReverse);
-
    await sortAlbums();
  }

@@ -202,8 +181,6 @@ class _AlbumSelectorState extends ConsumerState<AlbumSelector> {
            onToggleViewMode: toggleViewMode,
            onSortChanged: changeSort,
            controller: menuController,
-            currentSortMode: sort.mode,
-            currentIsReverse: sort.isReverse,
          ),
          isGrid
              ? _AlbumGrid(albums: shownAlbums, userId: userId, onAlbumSelected: widget.onAlbumSelected)
@@ -215,46 +192,21 @@ class _AlbumSelectorState extends ConsumerState<AlbumSelector> {
 }

 class _SortButton extends ConsumerStatefulWidget {
-  const _SortButton(
-    this.onSortChanged, {
-    required this.initialSortMode,
-    required this.initialIsReverse,
-    this.controller,
-  });
+  const _SortButton(this.onSortChanged, {this.controller});

  final Future<void> Function(AlbumSort) onSortChanged;
  final MenuController? controller;
-  final AlbumSortMode initialSortMode;
-  final bool initialIsReverse;

  @override
  ConsumerState<_SortButton> createState() => _SortButtonState();
 }

 class _SortButtonState extends ConsumerState<_SortButton> {
-  late AlbumSortMode albumSortOption;
-  late bool albumSortIsReverse;
+  RemoteAlbumSortMode albumSortOption = RemoteAlbumSortMode.lastModified;
+  bool albumSortIsReverse = true;
  bool isSorting = false;

-  @override
-  void initState() {
-    super.initState();
-    albumSortOption = widget.initialSortMode;
-    albumSortIsReverse = widget.initialIsReverse;
-  }
-
-  @override
-  void didUpdateWidget(_SortButton oldWidget) {
-    super.didUpdateWidget(oldWidget);
-    if (oldWidget.initialSortMode != widget.initialSortMode || oldWidget.initialIsReverse != widget.initialIsReverse) {
-      setState(() {
-        albumSortOption = widget.initialSortMode;
-        albumSortIsReverse = widget.initialIsReverse;
-      });
-    }
-  }
-
-  Future<void> onMenuTapped(AlbumSortMode sortMode) async {
+  Future<void> onMenuTapped(RemoteAlbumSortMode sortMode) async {
    final selected = albumSortOption == sortMode;
    // Switch direction
    if (selected) {
@@ -288,7 +240,7 @@ class _SortButtonState extends ConsumerState<_SortButton> {
        padding: const WidgetStatePropertyAll(EdgeInsets.all(4)),
      ),
      consumeOutsideTap: true,
-      menuChildren: AlbumSortMode.values
+      menuChildren: RemoteAlbumSortMode.values
          .map(
            (sortMode) => MenuItemButton(
              leadingIcon: albumSortOption == sortMode
@@ -317,7 +269,7 @@ class _SortButtonState extends ConsumerState<_SortButton> {
                ),
              ),
              child: Text(
-                sortMode.label.t(context: context),
+                sortMode.key.t(context: context),
                style: context.textTheme.titleSmall?.copyWith(
                  fontWeight: FontWeight.w600,
                  color: albumSortOption == sortMode
@@ -346,7 +298,7 @@ class _SortButtonState extends ConsumerState<_SortButton> {
                    : const Icon(Icons.keyboard_arrow_up_rounded),
              ),
              Text(
-                albumSortOption.label.t(context: context),
+                albumSortOption.key.t(context: context),
                style: context.textTheme.bodyLarge?.copyWith(
                  fontWeight: FontWeight.w500,
                  color: context.colorScheme.onSurface.withAlpha(225),
@@ -513,8 +465,6 @@ class _QuickSortAndViewMode extends StatelessWidget {
    required this.isGrid,
    required this.onToggleViewMode,
    required this.onSortChanged,
-    required this.currentSortMode,
-    required this.currentIsReverse,
    this.controller,
  });

@@ -522,8 +472,6 @@ class _QuickSortAndViewMode extends StatelessWidget {
  final VoidCallback onToggleViewMode;
  final MenuController? controller;
  final Future<void> Function(AlbumSort) onSortChanged;
-  final AlbumSortMode currentSortMode;
-  final bool currentIsReverse;

  @override
  Widget build(BuildContext context) {
@@ -533,12 +481,7 @@ class _QuickSortAndViewMode extends StatelessWidget {
        child: Row(
          mainAxisAlignment: MainAxisAlignment.spaceBetween,
          children: [
-            _SortButton(
-              onSortChanged,
-              controller: controller,
-              initialSortMode: currentSortMode,
-              initialIsReverse: currentIsReverse,
-            ),
+            _SortButton(onSortChanged, controller: controller),
            IconButton(
              icon: Icon(isGrid ? Icons.view_list_outlined : Icons.grid_view_outlined, size: 24),
              onPressed: onToggleViewMode,
--- a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
@@ -7,7 +7,7 @@ import 'package:flutter/services.dart';
 import 'package:hooks_riverpod/hooks_riverpod.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/events.model.dart';
+import 'package:immich_mobile/domain/models/timeline.model.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';
--- a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.state.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.state.dart
@@ -1,7 +1,17 @@
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/providers/asset_viewer/video_player_controls_provider.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';

+class ViewerOpenBottomSheetEvent extends Event {
+  final bool activitiesMode;
+  const ViewerOpenBottomSheetEvent({this.activitiesMode = false});
+}
+
+class ViewerReloadAssetEvent extends Event {
+  const ViewerReloadAssetEvent();
+}
+
 class AssetViewerState {
  final int backgroundOpacity;
  final bool showingBottomSheet;
--- a/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
@@ -10,7 +10,6 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/exif.model.dart';
 import 'package:immich_mobile/domain/models/setting.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/duration_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/album/album_tile.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
@@ -30,7 +29,6 @@ import 'package:immich_mobile/repositories/asset_media.repository.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/utils/action_button.utils.dart';
 import 'package:immich_mobile/utils/bytes_units.dart';
-import 'package:immich_mobile/utils/timezone.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';

 const _kSeparator = '  •  ';
@@ -87,21 +85,13 @@ class AssetDetailBottomSheet extends ConsumerWidget {
 class _AssetDetailBottomSheet extends ConsumerWidget {
  const _AssetDetailBottomSheet();

-  String _getDateTime(BuildContext ctx, BaseAsset asset, ExifInfo? exifInfo) {
-    DateTime dateTime = asset.createdAt.toLocal();
-    Duration timeZoneOffset = dateTime.timeZoneOffset;
-
-    // Use EXIF timezone information if available (matching web app behavior)
-    if (exifInfo?.dateTimeOriginal != null) {
-      (dateTime, timeZoneOffset) = applyTimezoneOffset(
-        dateTime: exifInfo!.dateTimeOriginal!,
-        timeZone: exifInfo.timeZone,
-      );
-    }
-
+  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);
-    final timezone = 'GMT${timeZoneOffset.formatAsOffset()}';
+    final timezone = dateTime.timeZoneOffset.isNegative
+        ? 'UTC-${dateTime.timeZoneOffset.inHours.abs().toString().padLeft(2, '0')}:${(dateTime.timeZoneOffset.inMinutes.abs() % 60).toString().padLeft(2, '0')}'
+        : 'UTC+${dateTime.timeZoneOffset.inHours.toString().padLeft(2, '0')}:${(dateTime.timeZoneOffset.inMinutes.abs() % 60).toString().padLeft(2, '0')}';
    return '$date$_kSeparator$time $timezone';
  }

@@ -251,8 +241,8 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
                color: context.textTheme.labelLarge?.color,
              ),
              subtitle: _getFileInfo(asset, exifInfo),
-              subtitleStyle: context.textTheme.labelMedium?.copyWith(
-                color: context.textTheme.labelMedium?.color?.withAlpha(200),
+              subtitleStyle: context.textTheme.bodyMedium?.copyWith(
+                color: context.textTheme.bodyMedium?.color?.withAlpha(155),
              ),
            );
          },
@@ -268,8 +258,8 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
            color: context.textTheme.labelLarge?.color,
          ),
          subtitle: _getFileInfo(asset, exifInfo),
-          subtitleStyle: context.textTheme.labelMedium?.copyWith(
-            color: context.textTheme.labelMedium?.color?.withAlpha(200),
+          subtitleStyle: context.textTheme.bodyMedium?.copyWith(
+            color: context.textTheme.bodyMedium?.color?.withAlpha(155),
          ),
        );
      }
@@ -279,8 +269,8 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
      children: [
        // Asset Date and Time
        SheetTile(
-          title: _getDateTime(context, asset, exifInfo),
-          titleStyle: context.textTheme.labelLarge,
+          title: _getDateTime(context, asset),
+          titleStyle: context.textTheme.bodyMedium?.copyWith(fontWeight: FontWeight.w600),
          trailing: asset.hasRemote && isOwner ? const Icon(Icons.edit, size: 18) : null,
          onTap: asset.hasRemote && isOwner ? () async => await _editDateTime(context, ref) : null,
        ),
@@ -289,7 +279,7 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
        const SheetLocationDetails(),
        // Details header
        SheetTile(
-          title: 'details'.t(context: context).toUpperCase(),
+          title: 'exif_bottom_sheet_details'.t(context: context),
          titleStyle: context.textTheme.labelMedium?.copyWith(
            color: context.textTheme.labelMedium?.color?.withAlpha(200),
            fontWeight: FontWeight.w600,
@@ -298,33 +288,29 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
        // File info
        buildFileInfoTile(),
        // Camera info
-        if (cameraTitle != null) ...[
-          const SizedBox(height: 16),
+        if (cameraTitle != null)
          SheetTile(
            title: cameraTitle,
            titleStyle: context.textTheme.labelLarge,
            leading: Icon(Icons.camera_alt_outlined, size: 24, color: context.textTheme.labelLarge?.color),
            subtitle: _getCameraInfoSubtitle(exifInfo),
-            subtitleStyle: context.textTheme.labelMedium?.copyWith(
-              color: context.textTheme.labelMedium?.color?.withAlpha(200),
+            subtitleStyle: context.textTheme.bodyMedium?.copyWith(
+              color: context.textTheme.bodyMedium?.color?.withAlpha(155),
            ),
          ),
-        ],
        // Lens info
-        if (lensTitle != null) ...[
-          const SizedBox(height: 16),
+        if (lensTitle != null)
          SheetTile(
            title: lensTitle,
            titleStyle: context.textTheme.labelLarge,
            leading: Icon(Icons.camera_outlined, size: 24, color: context.textTheme.labelLarge?.color),
            subtitle: _getLensInfoSubtitle(exifInfo),
-            subtitleStyle: context.textTheme.labelMedium?.copyWith(
-              color: context.textTheme.labelMedium?.color?.withAlpha(200),
+            subtitleStyle: context.textTheme.bodyMedium?.copyWith(
+              color: context.textTheme.bodyMedium?.color?.withAlpha(155),
            ),
          ),
-        ],
        // Appears in (Albums)
-        Padding(padding: const EdgeInsets.only(top: 16.0), child: _buildAppearsInList(ref, context)),
+        _buildAppearsInList(ref, context),
        // padding at the bottom to avoid cut-off
        const SizedBox(height: 100),
      ],
--- a/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet/sheet_location_details.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet/sheet_location_details.widget.dart
@@ -78,7 +78,7 @@ class _SheetLocationDetailsState extends ConsumerState<SheetLocationDetails> {
        crossAxisAlignment: CrossAxisAlignment.start,
        children: [
          SheetTile(
-            title: 'location'.t(context: context).toUpperCase(),
+            title: 'exif_bottom_sheet_location'.t(context: context),
            titleStyle: context.textTheme.labelMedium?.copyWith(
              color: context.textTheme.labelMedium?.color?.withAlpha(200),
              fontWeight: FontWeight.w600,
@@ -102,7 +102,7 @@ class _SheetLocationDetailsState extends ConsumerState<SheetLocationDetails> {
                  Text(
                    coordinates,
                    style: context.textTheme.labelMedium?.copyWith(
-                      color: context.textTheme.labelMedium?.color?.withAlpha(200),
+                      color: context.textTheme.labelMedium?.color?.withAlpha(150),
                    ),
                  ),
                ],
--- a/mobile/lib/presentation/widgets/asset_viewer/sheet_tile.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/sheet_tile.widget.dart
@@ -46,7 +46,7 @@ class SheetTile extends ConsumerWidget {
    } else {
      titleWidget = Container(
        width: double.infinity,
-        padding: const EdgeInsets.only(left: 15, right: 15),
+        padding: const EdgeInsets.only(left: 15),
        child: Text(title, style: titleStyle),
      );
    }
--- a/mobile/lib/presentation/widgets/asset_viewer/top_app_bar.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/top_app_bar.widget.dart
@@ -3,7 +3,7 @@ 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/events.model.dart';
+import 'package:immich_mobile/domain/models/timeline.model.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';
@@ -14,7 +14,6 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/favorite_actio
 import 'package:immich_mobile/presentation/widgets/action_buttons/motion_photo_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/presentation/widgets/asset_viewer/viewer_kebab_menu.widget.dart';
 import 'package:immich_mobile/providers/activity.provider.dart';
 import 'package:immich_mobile/providers/cast.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
@@ -66,8 +65,8 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
    final isCasting = ref.watch(castProvider.select((c) => c.isCasting));

    final actions = <Widget>[
-      if (asset.isRemoteOnly) const DownloadActionButton(source: ActionSource.viewer, iconOnly: true),
-      if (isCasting || (asset.hasRemote)) const CastActionButton(iconOnly: true),
+      if (asset.isRemoteOnly) const DownloadActionButton(source: ActionSource.viewer, menuItem: true),
+      if (isCasting || (asset.hasRemote)) const CastActionButton(menuItem: true),
      if (album != null && album.isActivityEnabled && album.isShared)
        IconButton(
          icon: const Icon(Icons.chat_outlined),
@@ -86,16 +85,16 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
          tooltip: 'view_in_timeline'.t(context: context),
        ),
      if (asset.hasRemote && isOwner && !asset.isFavorite)
-        const FavoriteActionButton(source: ActionSource.viewer, iconOnly: true),
+        const FavoriteActionButton(source: ActionSource.viewer, menuItem: true),
      if (asset.hasRemote && isOwner && asset.isFavorite)
-        const UnFavoriteActionButton(source: ActionSource.viewer, iconOnly: true),
-      if (asset.isMotionPhoto) const MotionPhotoActionButton(iconOnly: true),
-      const ViewerKebabMenu(),
+        const UnFavoriteActionButton(source: ActionSource.viewer, menuItem: true),
+      if (asset.isMotionPhoto) const MotionPhotoActionButton(menuItem: true),
+      const _KebabMenu(),
    ];

    final lockedViewActions = <Widget>[
-      if (isCasting || (asset.hasRemote)) const CastActionButton(iconOnly: true),
-      const ViewerKebabMenu(),
+      if (isCasting || (asset.hasRemote)) const CastActionButton(menuItem: true),
+      const _KebabMenu(),
    ];

    return IgnorePointer(
@@ -123,6 +122,20 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
  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();

--- a/mobile/lib/presentation/widgets/asset_viewer/viewer_kebab_menu.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/viewer_kebab_menu.widget.dart
@@ -1,47 +0,0 @@
-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/events.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/base_action_button.widget.dart';
-import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
-
-class ViewerKebabMenu extends ConsumerWidget {
-  const ViewerKebabMenu({super.key});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final asset = ref.watch(currentAssetNotifier);
-    if (asset == null) {
-      return const SizedBox.shrink();
-    }
-
-    final menuChildren = <Widget>[
-      BaseActionButton(
-        label: 'about'.tr(),
-        iconData: Icons.info_outline,
-        menuItem: true,
-        onPressed: () => EventStream.shared.emit(const ViewerOpenBottomSheetEvent()),
-      ),
-    ];
-
-    return MenuAnchor(
-      consumeOutsideTap: true,
-      style: MenuStyle(
-        backgroundColor: WidgetStatePropertyAll(context.themeData.scaffoldBackgroundColor),
-        elevation: const WidgetStatePropertyAll(4),
-        shape: const WidgetStatePropertyAll(
-          RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(12))),
-        ),
-      ),
-      menuChildren: menuChildren,
-      builder: (context, controller, child) {
-        return IconButton(
-          icon: const Icon(Icons.more_vert_rounded),
-          onPressed: () => controller.isOpen ? controller.close() : controller.open(),
-        );
-      },
-    );
-  }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
shenlong-tanwen	b9279485ff	rebase	2025-11-24 22:21:30 +05:30
shenlong-tanwen	6cf388af25	sync adjustment timestamp and store in db	2025-11-24 22:17:55 +05:30
shenlong-tanwen	d1845e498e	feat: add adjustmentTimestamp to platformasset # Conflicts: # mobile/lib/platform/native_sync_api.g.dart	2025-11-24 22:15:03 +05:30
@@ -1 +1 @@
 .11.1
 .11.0